Merge pull request #189 from DNNMonster/bugfix/portal-id-usage

leedavi · web-flow · commit 60da642a1be4 · 2021-08-31T12:24:51.000+02:00
Enhance portal id usage
diff --git a/Components/GrpCatController.cs b/Components/GrpCatController.cs
@@ -338,10 +338,15 @@ public List<GroupCategoryData> GetProductCategories(int productid, String groupr
                 notcat = "cat";
             }
 
-            var joinItems = (from d1 in GrpCategoryList
+            var joinItems = new List<GroupCategoryData>();
+            if (GrpCategoryList != null)
+            {
+                joinItems = (from d1 in GrpCategoryList
                              join d2 in catxrefList on d1.categoryid equals d2.XrefItemId
                              where (d1.grouptyperef == groupref || groupref == "") && d1.grouptyperef != notcat
                              select d1).OrderBy(d1 => d1.grouptyperef).ThenBy(d1 => d1.breadcrumb).ToList<GroupCategoryData>();
+
+            }
             return joinItems;
         }
 
diff --git a/Components/NBrightBuyController.cs b/Components/NBrightBuyController.cs
@@ -915,28 +915,33 @@ private static NBrightInfo UpdateLangNodeFields(String xmlname, NBrightInfo base
             return dlang;
         }
 
-        /// <summary>
-            /// Get current portal StoreSettings
-            /// </summary>
-            /// <returns></returns>
-        public static StoreSettings GetCurrentPortalData()
-	    {
+        public static StoreSettings GetPortalData(int portalId)
+        {
             StoreSettings objPortalSettings = null;
             if (HttpContext.Current != null)
             {
                 // build StoreSettings and place in httpcontext
-                if (HttpContext.Current.Items["NBBStoreSettings" + PortalSettings.Current.PortalId.ToString("")] == null)
+                if (HttpContext.Current.Items["NBBStoreSettings" + portalId.ToString()] == null)
                 {
-                    HttpContext.Current.Items.Add("NBBStoreSettings" + PortalSettings.Current.PortalId.ToString(""),GetStaticStoreSettings(PortalSettings.Current.PortalId));
+                    HttpContext.Current.Items.Add("NBBStoreSettings" + portalId.ToString(), GetStaticStoreSettings(portalId));
                 }
-                objPortalSettings = (StoreSettings)HttpContext.Current.Items["NBBStoreSettings" + PortalSettings.Current.PortalId.ToString("")];
+                objPortalSettings = (StoreSettings)HttpContext.Current.Items["NBBStoreSettings" + portalId.ToString()];
             }
             else
             {
                 // capture all to ensure we pass something.
-                objPortalSettings = GetStaticStoreSettings(PortalSettings.Current.PortalId);
+                objPortalSettings = GetStaticStoreSettings(portalId);
             }
             return objPortalSettings;
+        }
+
+        /// <summary>
+        /// Get current portal StoreSettings
+        /// </summary>
+        /// <returns></returns>
+        public static StoreSettings GetCurrentPortalData()
+	    {
+            return GetPortalData(PortalSettings.Current.PortalId);
 	    }
 
         /// <summary>
diff --git a/Components/Product/ProductData.cs b/Components/Product/ProductData.cs
@@ -444,14 +444,15 @@ public NBrightInfo GetOptionValue(String optionid, String optionvalueid)
         /// <summary>
         /// Select categories linked to product, by groupref
         /// </summary>
+        /// <param name="portalId"></param>
         /// <param name="groupref">groupref for select, "" = all, "cat"= Category only, "!cat" = all non-category, "{groupref}"=this group only</param>
         /// <param name="cascade">get all cascade records to get all parent categories</param>
         /// <returns></returns>
-        public List<GroupCategoryData> GetCategories(String groupref = "", Boolean cascade = false)
+        public List<GroupCategoryData> GetCategories(int portalId, String groupref = "", Boolean cascade = false)
         {
             if (Info == null) return new List<GroupCategoryData>(); // stop throwing an error no product exists,
 
-            var objGrpCtrl = new GrpCatController(_lang);
+            var objGrpCtrl = new GrpCatController(_lang, portalId);
             var catl = objGrpCtrl.GetProductCategories(Info.ItemID, groupref, cascade);
             if (Utils.IsNumeric(DataRecord.GetXmlProperty("genxml/defaultcatid")) && catl.Count > 0)
             {
@@ -468,6 +469,19 @@ public List<GroupCategoryData> GetCategories(String groupref = "", Boolean casca
             return catl;
         }
 
+
+        /// <summary>
+        /// Select categories linked to product, by groupref
+        /// </summary>
+        /// <param name="groupref">groupref for select, "" = all, "cat"= Category only, "!cat" = all non-category, "{groupref}"=this group only</param>
+        /// <param name="cascade">get all cascade records to get all parent categories</param>
+        /// <returns></returns>
+        public List<GroupCategoryData> GetCategories(String groupref = "", Boolean cascade = false)
+        {
+            var portalId = PortalSettings.Current.PortalId;
+            return GetCategories(portalId, groupref, cascade);
+        }
+
         /// <summary>
         /// Select properties linked to product, by groupref
         /// </summary>
@@ -689,6 +703,7 @@ public void Save(bool triggerevent, bool newrecord)
                 DataRecord = objCtrl.Get(productid);
                 DataLangRecord = objCtrl.Get(plangid);
             }
+
         }
 
         private void UpdateDisplayCalcPrices()
@@ -1744,6 +1759,7 @@ public int Validate()
                 }
                 lp += 1;
             }
+
             //Fix document paths
             lp = 1;
             foreach (var d in Docs)
@@ -1794,7 +1810,7 @@ public int Validate()
             }
 
             // remove duplicate category xrefs.
-            var catlist = GetCategories();
+            var catlist = GetCategories(_portalId);
             foreach (var c in catlist)
             {
                 var l = objCtrl.GetList(_portalId, -1, "CATXREF", " and NB1.ParentItemId = " + Info.ItemID.ToString("") + " and NB1.XrefItemId = " + c.categoryid.ToString(""));
@@ -1835,6 +1851,7 @@ public int Validate()
                 objCtrl.Delete(c.ItemID);
                 errorcount += 1;
             }
+
             // remove catcascade record that have no catxref record for the product.
             var caslist = new List<int>();
             var catcascadelist = objCtrl.GetList(_portalId, -1, "CATCASCADE", " and nb1.ParentItemId = '" + Info.ItemID + "' ");
@@ -1843,10 +1860,10 @@ public int Validate()
                 caslist.Add(n.XrefItemId);
             }
 
-            var catlist2 = GetCategories();
+            var catlist2 = GetCategories(_portalId);
             if (catlist2.Any())
             {
-                var objGrpCtrl = new GrpCatController(_lang, true);
+                var objGrpCtrl = new GrpCatController(_lang, _portalId, true);
                 foreach (var cat in catlist2)
                 {
                     var parentcats = objGrpCtrl.GetCategory(cat.categoryid);
@@ -1876,10 +1893,9 @@ public int Validate()
                 }
             }
 
-
-
             // update shared product if flagged
-            if (StoreSettings.Current.GetBool("shareproducts") && DataRecord.PortalId >= 0)
+            StoreSettings storeSettings  = (System.Web.HttpContext.Current != null) ? StoreSettings.Current : new StoreSettings(_portalId);
+            if (storeSettings.GetBool("shareproducts") && DataRecord.PortalId >= 0)
             {
                 upd = true;
                 DataRecord.PortalId = -1;
@@ -1889,7 +1905,7 @@ public int Validate()
                 }
             }
 
-            // check if we have empty model name ()
+            // check if we have empty model name
             var modellp = 1;
             foreach (var m in Models)
             {
@@ -1975,13 +1991,11 @@ public int Validate()
                 }
             }
 
-
             return errorcount;
         }
 
         public int Copy()
         {
-
             var objCtrl = new NBrightBuyController();
 
             //Copy Base record 
@@ -2083,7 +2097,6 @@ public void FillEmptyLanguageFields()
                         }
                     }
 
-
                     // models
                     var nodList1 = DataLangRecord.XMLDoc.SelectNodes("genxml/models/genxml");
                     if (nodList1 != null)
@@ -2214,15 +2227,11 @@ public void FillEmptyLanguageFields()
             }
         }
 
-
         public void OutputDebugFile(String filePathName)
         {
             Info.XMLDoc.Save(filePathName);
         }
 
-
-
-
         #endregion
 
         #region " private functions"
@@ -2311,7 +2320,6 @@ private void LoadData(int productId, Boolean hydrateLists = true)
 
         private int AddNew()
         {
-
             var nbi = new NBrightInfo(true);
             if (StoreSettings.Current.Get("shareproducts") == "True") // option in storesetting to share products created here across all portals.
                 _portalId = -1;
@@ -2468,7 +2476,6 @@ public Double GetDealerSalePriceDouble()
             return price;
         }
 
-
         private bool CheckClientFileUpload()
         {
             return Info.GetXmlPropertyBool("genxml/checkbox/chkfileupload");
diff --git a/Components/Product/ProductUtils.cs b/Components/Product/ProductUtils.cs
@@ -455,29 +455,48 @@ private static List<string> BuildModelCodes(List<NBrightInfo> optList, int lpPos
             return mcList;
         }
 
-
         /// <summary>
         /// Get ProductData class with cacheing
         /// </summary>
         /// <param name="productId"></param>
+        /// <param name="portalId"></param>
         /// <param name="lang"></param>
         /// <param name="hydrateLists"></param>
         /// <param name="typeCode">Typecode of record default "PRD"</param>
         /// <param name="typeLangCode">Langauge Typecode of record default "PRDLANG"</param>
         /// <returns></returns>
-        public static ProductData GetProductData(int productId, String lang, Boolean hydrateLists = true, String typeCode = "PRD")
+        public static ProductData GetProductData(int productId, int portalId, String lang, Boolean hydrateLists = true, String typeCode = "PRD")
         {
             ProductData prdData;
             var cacheKey = "NBSProductData*" + productId.ToString("") + "*" + lang;
             prdData = (ProductData)Utils.GetCache(cacheKey);
             if ((prdData == null) || (productId == -1))
             {
-                prdData = new ProductData(productId, lang, hydrateLists, typeCode);
+                prdData = new ProductData(productId, portalId, lang, hydrateLists, typeCode);
                 Utils.SetCache(cacheKey, prdData);
             }
             return prdData;
         }
 
+
+        /// <summary>
+        /// Get ProductData class with cacheing
+        /// </summary>
+        /// <param name="productId"></param>
+        /// <param name="lang"></param>
+        /// <param name="hydrateLists"></param>
+        /// <param name="typeCode">Typecode of record default "PRD"</param>
+        /// <param name="typeLangCode">Langauge Typecode of record default "PRDLANG"</param>
+        /// <returns></returns>
+        public static ProductData GetProductData(int productId, String lang, Boolean hydrateLists = true, String typeCode = "PRD")
+        {
+            if (Utils.IsNumeric(productId))
+            {
+                return GetProductData(Convert.ToInt32(productId), PortalSettings.Current.PortalId, lang, hydrateLists, typeCode);
+            }
+            return null;
+        }
+
 	    public static ProductData GetProductData(String productId, String lang, Boolean hydrateLists = true)
 	    {
 	        if (Utils.IsNumeric(productId))
diff --git a/Providers/PromoProvider/PromoProvider.cs b/Providers/PromoProvider/PromoProvider.cs
@@ -1,16 +1,8 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Web.Hosting;
-using System.Web.UI.WebControls;
-using System.Xml;
-using DotNetNuke.Common.Utilities;
-using DotNetNuke.Entities.Portals;
-using NBrightCore.common;
+﻿using NBrightCore.common;
 using NBrightDNN;
 using Nevoweb.DNN.NBrightBuy.Components;
+using System;
+using System.Collections.Generic;
 
 namespace Nevoweb.DNN.NBrightBuy.Providers.PromoProvider
 {
@@ -20,17 +12,14 @@ public override string DoWork(int portalId)
         {
             return PromoUtils.CalcGroupPromo(portalId);
         }
-
     }
 
-
     public class MultiBuyPromoScheudler : Components.Interfaces.SchedulerInterface
     {
         public override string DoWork(int portalId)
         {
             return PromoUtils.CalcMultiBuyPromo(portalId);
         }
-
     }
 
     public class CalcPromo : Components.Interfaces.PromoInterface
@@ -59,7 +48,7 @@ public override NBrightInfo CalculatePromotion(int portalId, NBrightInfo cartInf
                         var promoData = objCtrl.GetData(promoid);
                         if (promoData != null)
                         {
-                            //NOTE: WE nedd to process disabld promotions so they can be removed from cart
+                            //NOTE: WE need to process disabld promotions so they can be removed from cart
 
                             var buyqty = promoData.GetXmlPropertyInt("genxml/textbox/buyqty");
                             var validfrom = promoData.GetXmlProperty("genxml/textbox/validfrom");
@@ -69,8 +58,7 @@ public override NBrightInfo CalculatePromotion(int portalId, NBrightInfo cartInf
                             var amounttype = promoData.GetXmlProperty("genxml/radiobuttonlist/amounttype");
                             var amount = promoData.GetXmlPropertyDouble("genxml/textbox/amount");
 
-
-                                // Applied discount to this single cart item
+                            // Applied discount to this single cart item
                             if (!promoData.GetXmlPropertyBool("genxml/checkbox/disabled") && cartItemInfo.GetXmlPropertyInt("genxml/qty") >= buyqty && Utils.IsDate(validfrom) && Utils.IsDate(validuntil)) // check we have correct qty to activate promo
                             {
                                 var dteF = Convert.ToDateTime(validfrom).Date;
@@ -155,7 +143,7 @@ public override NBrightInfo AfterProductSave(NBrightInfo nbrightInfo)
             var promoid = nbrightInfo.GetXmlPropertyInt("genxml/hidden/promoid"); // legacy promo flag
             if (nbrightInfo.GetXmlPropertyBool("genxml/hidden/promoflag") || promoid > 0)
             {
-                var prdData = ProductUtils.GetProductData(nbrightInfo.ItemID, nbrightInfo.Lang);
+                var prdData = ProductUtils.GetProductData(nbrightInfo.ItemID, nbrightInfo.PortalId, nbrightInfo.Lang);
                 // loop on models to get all promoid at model level.
                 var modelpromoids = new List<int>();
                 if (promoid > 0) modelpromoids.Add(promoid);
@@ -183,7 +171,7 @@ public override NBrightInfo AfterProductSave(NBrightInfo nbrightInfo)
                     var propapplygroupid = promoData.GetXmlPropertyInt("genxml/dropdownlist/propapply");
 
                     var removepromo = true;
-                    foreach (var c in prdData.GetCategories())
+                    foreach (var c in prdData.GetCategories(nbrightInfo.PortalId))
                     {
                         if (c.categoryid == catgroupid) removepromo = false;
                         if (c.categoryid == propgroupid) removepromo = false;
diff --git a/Providers/PromoProvider/PromoUtils.cs b/Providers/PromoProvider/PromoUtils.cs

Original file line number	Diff line number	Diff line change
`@@ -915,28 +915,33 @@ private static NBrightInfo UpdateLangNodeFields(String xmlname, NBrightInfo base`
`915`	`915`	`return dlang;`
`916`	`916`	`}`
`917`	`917`
`918`		`- /// <summary>`
`919`		`- /// Get current portal StoreSettings`
`920`		`- /// </summary>`
`921`		`- /// <returns></returns>`
`922`		`- public static StoreSettings GetCurrentPortalData()`
`923`		`- {`
	`918`	`+ public static StoreSettings GetPortalData(int portalId)`
	`919`	`+ {`
`924`	`920`	`StoreSettings objPortalSettings = null;`
`925`	`921`	`if (HttpContext.Current != null)`
`926`	`922`	`{`
`927`	`923`	`// build StoreSettings and place in httpcontext`
`928`		`- if (HttpContext.Current.Items["NBBStoreSettings" + PortalSettings.Current.PortalId.ToString("")] == null)`
	`924`	`+ if (HttpContext.Current.Items["NBBStoreSettings" + portalId.ToString()] == null)`
`929`	`925`	`{`
`930`		`- HttpContext.Current.Items.Add("NBBStoreSettings" + PortalSettings.Current.PortalId.ToString(""),GetStaticStoreSettings(PortalSettings.Current.PortalId));`
	`926`	`+ HttpContext.Current.Items.Add("NBBStoreSettings" + portalId.ToString(), GetStaticStoreSettings(portalId));`
`931`	`927`	`}`
`932`		`- objPortalSettings = (StoreSettings)HttpContext.Current.Items["NBBStoreSettings" + PortalSettings.Current.PortalId.ToString("")];`
	`928`	`+ objPortalSettings = (StoreSettings)HttpContext.Current.Items["NBBStoreSettings" + portalId.ToString()];`
`933`	`929`	`}`
`934`	`930`	`else`
`935`	`931`	`{`
`936`	`932`	`// capture all to ensure we pass something.`
`937`		`- objPortalSettings = GetStaticStoreSettings(PortalSettings.Current.PortalId);`
	`933`	`+ objPortalSettings = GetStaticStoreSettings(portalId);`
`938`	`934`	`}`
`939`	`935`	`return objPortalSettings;`
	`936`	`+ }`
	`937`	`+`
	`938`	`+ /// <summary>`
	`939`	`+ /// Get current portal StoreSettings`
	`940`	`+ /// </summary>`
	`941`	`+ /// <returns></returns>`
	`942`	`+ public static StoreSettings GetCurrentPortalData()`
	`943`	`+ {`
	`944`	`+ return GetPortalData(PortalSettings.Current.PortalId);`
`940`	`945`	`}`
`941`	`946`
`942`	`947`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -444,14 +444,15 @@ public NBrightInfo GetOptionValue(String optionid, String optionvalueid)`
`444`	`444`	`/// <summary>`
`445`	`445`	`/// Select categories linked to product, by groupref`
`446`	`446`	`/// </summary>`
	`447`	`+ /// <param name="portalId"></param>`
`447`	`448`	`/// <param name="groupref">groupref for select, "" = all, "cat"= Category only, "!cat" = all non-category, "{groupref}"=this group only</param>`
`448`	`449`	`/// <param name="cascade">get all cascade records to get all parent categories</param>`
`449`	`450`	`/// <returns></returns>`
`450`		`- public List<GroupCategoryData> GetCategories(String groupref = "", Boolean cascade = false)`
	`451`	`+ public List<GroupCategoryData> GetCategories(int portalId, String groupref = "", Boolean cascade = false)`
`451`	`452`	`{`
`452`	`453`	`if (Info == null) return new List<GroupCategoryData>(); // stop throwing an error no product exists,`
`453`	`454`
`454`		`- var objGrpCtrl = new GrpCatController(_lang);`
	`455`	`+ var objGrpCtrl = new GrpCatController(_lang, portalId);`
`455`	`456`	`var catl = objGrpCtrl.GetProductCategories(Info.ItemID, groupref, cascade);`
`456`	`457`	`if (Utils.IsNumeric(DataRecord.GetXmlProperty("genxml/defaultcatid")) && catl.Count > 0)`
`457`	`458`	`{`
`@@ -468,6 +469,19 @@ public List<GroupCategoryData> GetCategories(String groupref = "", Boolean casca`
`468`	`469`	`return catl;`
`469`	`470`	`}`
`470`	`471`
	`472`	`+`
	`473`	`+ /// <summary>`
	`474`	`+ /// Select categories linked to product, by groupref`
	`475`	`+ /// </summary>`
	`476`	`+ /// <param name="groupref">groupref for select, "" = all, "cat"= Category only, "!cat" = all non-category, "{groupref}"=this group only</param>`
	`477`	`+ /// <param name="cascade">get all cascade records to get all parent categories</param>`
	`478`	`+ /// <returns></returns>`
	`479`	`+ public List<GroupCategoryData> GetCategories(String groupref = "", Boolean cascade = false)`
	`480`	`+ {`
	`481`	`+ var portalId = PortalSettings.Current.PortalId;`
	`482`	`+ return GetCategories(portalId, groupref, cascade);`
	`483`	`+ }`
	`484`	`+`
`471`	`485`	`/// <summary>`
`472`	`486`	`/// Select properties linked to product, by groupref`
`473`	`487`	`/// </summary>`
`@@ -689,6 +703,7 @@ public void Save(bool triggerevent, bool newrecord)`
`689`	`703`	`DataRecord = objCtrl.Get(productid);`
`690`	`704`	`DataLangRecord = objCtrl.Get(plangid);`
`691`	`705`	`}`
	`706`	`+`
`692`	`707`	`}`
`693`	`708`
`694`	`709`	`private void UpdateDisplayCalcPrices()`
`@@ -1744,6 +1759,7 @@ public int Validate()`
`1744`	`1759`	`}`
`1745`	`1760`	`lp += 1;`
`1746`	`1761`	`}`
	`1762`	`+`
`1747`	`1763`	`//Fix document paths`
`1748`	`1764`	`lp = 1;`
`1749`	`1765`	`foreach (var d in Docs)`
`@@ -1794,7 +1810,7 @@ public int Validate()`
`1794`	`1810`	`}`
`1795`	`1811`
`1796`	`1812`	`// remove duplicate category xrefs.`
`1797`		`- var catlist = GetCategories();`
	`1813`	`+ var catlist = GetCategories(_portalId);`
`1798`	`1814`	`foreach (var c in catlist)`
`1799`	`1815`	`{`
`1800`	`1816`	`var l = objCtrl.GetList(_portalId, -1, "CATXREF", " and NB1.ParentItemId = " + Info.ItemID.ToString("") + " and NB1.XrefItemId = " + c.categoryid.ToString(""));`
`@@ -1835,6 +1851,7 @@ public int Validate()`
`1835`	`1851`	`objCtrl.Delete(c.ItemID);`
`1836`	`1852`	`errorcount += 1;`
`1837`	`1853`	`}`
	`1854`	`+`
`1838`	`1855`	`// remove catcascade record that have no catxref record for the product.`
`1839`	`1856`	`var caslist = new List<int>();`
`1840`	`1857`	`var catcascadelist = objCtrl.GetList(_portalId, -1, "CATCASCADE", " and nb1.ParentItemId = '" + Info.ItemID + "' ");`
`@@ -1843,10 +1860,10 @@ public int Validate()`
`1843`	`1860`	`caslist.Add(n.XrefItemId);`
`1844`	`1861`	`}`
`1845`	`1862`
`1846`		`- var catlist2 = GetCategories();`
	`1863`	`+ var catlist2 = GetCategories(_portalId);`
`1847`	`1864`	`if (catlist2.Any())`
`1848`	`1865`	`{`
`1849`		`- var objGrpCtrl = new GrpCatController(_lang, true);`
	`1866`	`+ var objGrpCtrl = new GrpCatController(_lang, _portalId, true);`
`1850`	`1867`	`foreach (var cat in catlist2)`
`1851`	`1868`	`{`
`1852`	`1869`	`var parentcats = objGrpCtrl.GetCategory(cat.categoryid);`
`@@ -1876,10 +1893,9 @@ public int Validate()`
`1876`	`1893`	`}`
`1877`	`1894`	`}`
`1878`	`1895`
`1879`		`-`
`1880`		`-`
`1881`	`1896`	`// update shared product if flagged`
`1882`		`- if (StoreSettings.Current.GetBool("shareproducts") && DataRecord.PortalId >= 0)`
	`1897`	`+ StoreSettings storeSettings = (System.Web.HttpContext.Current != null) ? StoreSettings.Current : new StoreSettings(_portalId);`
	`1898`	`+ if (storeSettings.GetBool("shareproducts") && DataRecord.PortalId >= 0)`
`1883`	`1899`	`{`
`1884`	`1900`	`upd = true;`
`1885`	`1901`	`DataRecord.PortalId = -1;`
`@@ -1889,7 +1905,7 @@ public int Validate()`
`1889`	`1905`	`}`
`1890`	`1906`	`}`
`1891`	`1907`
`1892`		`- // check if we have empty model name ()`
	`1908`	`+ // check if we have empty model name`
`1893`	`1909`	`var modellp = 1;`
`1894`	`1910`	`foreach (var m in Models)`
`1895`	`1911`	`{`
`@@ -1975,13 +1991,11 @@ public int Validate()`
`1975`	`1991`	`}`
`1976`	`1992`	`}`
`1977`	`1993`
`1978`		`-`
`1979`	`1994`	`return errorcount;`
`1980`	`1995`	`}`
`1981`	`1996`
`1982`	`1997`	`public int Copy()`
`1983`	`1998`	`{`
`1984`		`-`
`1985`	`1999`	`var objCtrl = new NBrightBuyController();`
`1986`	`2000`
`1987`	`2001`	`//Copy Base record`
`@@ -2083,7 +2097,6 @@ public void FillEmptyLanguageFields()`
`2083`	`2097`	`}`
`2084`	`2098`	`}`
`2085`	`2099`
`2086`		`-`
`2087`	`2100`	`// models`
`2088`	`2101`	`var nodList1 = DataLangRecord.XMLDoc.SelectNodes("genxml/models/genxml");`
`2089`	`2102`	`if (nodList1 != null)`
`@@ -2214,15 +2227,11 @@ public void FillEmptyLanguageFields()`
`2214`	`2227`	`}`
`2215`	`2228`	`}`
`2216`	`2229`
`2217`		`-`
`2218`	`2230`	`public void OutputDebugFile(String filePathName)`
`2219`	`2231`	`{`
`2220`	`2232`	`Info.XMLDoc.Save(filePathName);`
`2221`	`2233`	`}`
`2222`	`2234`
`2223`		`-`
`2224`		`-`
`2225`		`-`
`2226`	`2235`	`#endregion`
`2227`	`2236`
`2228`	`2237`	`#region " private functions"`
`@@ -2311,7 +2320,6 @@ private void LoadData(int productId, Boolean hydrateLists = true)`
`2311`	`2320`
`2312`	`2321`	`private int AddNew()`
`2313`	`2322`	`{`
`2314`		`-`
`2315`	`2323`	`var nbi = new NBrightInfo(true);`
`2316`	`2324`	`if (StoreSettings.Current.Get("shareproducts") == "True") // option in storesetting to share products created here across all portals.`
`2317`	`2325`	`_portalId = -1;`
`@@ -2468,7 +2476,6 @@ public Double GetDealerSalePriceDouble()`
`2468`	`2476`	`return price;`
`2469`	`2477`	`}`
`2470`	`2478`
`2471`		`-`
`2472`	`2479`	`private bool CheckClientFileUpload()`
`2473`	`2480`	`{`
`2474`	`2481`	`return Info.GetXmlPropertyBool("genxml/checkbox/chkfileupload");`
Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,8 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.Globalization;`
`4`		`-using System.Linq;`
`5`		`-using System.Text;`
`6`		`-using System.Web.Hosting;`
`7`		`-using System.Web.UI.WebControls;`
`8`		`-using System.Xml;`
`9`		`-using DotNetNuke.Common.Utilities;`
`10`		`-using DotNetNuke.Entities.Portals;`
`11`		`-using NBrightCore.common;`
	`1`	`+using NBrightCore.common;`
`12`	`2`	`using NBrightDNN;`
`13`	`3`	`using Nevoweb.DNN.NBrightBuy.Components;`
	`4`	`+using System;`
	`5`	`+using System.Collections.Generic;`
`14`	`6`
`15`	`7`	`namespace Nevoweb.DNN.NBrightBuy.Providers.PromoProvider`
`16`	`8`	`{`
`@@ -20,17 +12,14 @@ public override string DoWork(int portalId)`
`20`	`12`	`{`
`21`	`13`	`return PromoUtils.CalcGroupPromo(portalId);`
`22`	`14`	`}`
`23`		`-`
`24`	`15`	`}`
`25`	`16`
`26`		`-`
`27`	`17`	`public class MultiBuyPromoScheudler : Components.Interfaces.SchedulerInterface`
`28`	`18`	`{`
`29`	`19`	`public override string DoWork(int portalId)`
`30`	`20`	`{`
`31`	`21`	`return PromoUtils.CalcMultiBuyPromo(portalId);`
`32`	`22`	`}`
`33`		`-`
`34`	`23`	`}`
`35`	`24`
`36`	`25`	`public class CalcPromo : Components.Interfaces.PromoInterface`
`@@ -59,7 +48,7 @@ public override NBrightInfo CalculatePromotion(int portalId, NBrightInfo cartInf`
`59`	`48`	`var promoData = objCtrl.GetData(promoid);`
`60`	`49`	`if (promoData != null)`
`61`	`50`	`{`
`62`		`- //NOTE: WE nedd to process disabld promotions so they can be removed from cart`
	`51`	`+ //NOTE: WE need to process disabld promotions so they can be removed from cart`
`63`	`52`
`64`	`53`	`var buyqty = promoData.GetXmlPropertyInt("genxml/textbox/buyqty");`
`65`	`54`	`var validfrom = promoData.GetXmlProperty("genxml/textbox/validfrom");`
`@@ -69,8 +58,7 @@ public override NBrightInfo CalculatePromotion(int portalId, NBrightInfo cartInf`
`69`	`58`	`var amounttype = promoData.GetXmlProperty("genxml/radiobuttonlist/amounttype");`
`70`	`59`	`var amount = promoData.GetXmlPropertyDouble("genxml/textbox/amount");`
`71`	`60`
`72`		`-`
`73`		`- // Applied discount to this single cart item`
	`61`	`+ // Applied discount to this single cart item`
`74`	`62`	`if (!promoData.GetXmlPropertyBool("genxml/checkbox/disabled") && cartItemInfo.GetXmlPropertyInt("genxml/qty") >= buyqty && Utils.IsDate(validfrom) && Utils.IsDate(validuntil)) // check we have correct qty to activate promo`
`75`	`63`	`{`
`76`	`64`	`var dteF = Convert.ToDateTime(validfrom).Date;`
`@@ -155,7 +143,7 @@ public override NBrightInfo AfterProductSave(NBrightInfo nbrightInfo)`
`155`	`143`	`var promoid = nbrightInfo.GetXmlPropertyInt("genxml/hidden/promoid"); // legacy promo flag`
`156`	`144`	`if (nbrightInfo.GetXmlPropertyBool("genxml/hidden/promoflag") \|\| promoid > 0)`
`157`	`145`	`{`
`158`		`- var prdData = ProductUtils.GetProductData(nbrightInfo.ItemID, nbrightInfo.Lang);`
	`146`	`+ var prdData = ProductUtils.GetProductData(nbrightInfo.ItemID, nbrightInfo.PortalId, nbrightInfo.Lang);`
`159`	`147`	`// loop on models to get all promoid at model level.`
`160`	`148`	`var modelpromoids = new List<int>();`
`161`	`149`	`if (promoid > 0) modelpromoids.Add(promoid);`
`@@ -183,7 +171,7 @@ public override NBrightInfo AfterProductSave(NBrightInfo nbrightInfo)`
`183`	`171`	`var propapplygroupid = promoData.GetXmlPropertyInt("genxml/dropdownlist/propapply");`
`184`	`172`
`185`	`173`	`var removepromo = true;`
`186`		`- foreach (var c in prdData.GetCategories())`
	`174`	`+ foreach (var c in prdData.GetCategories(nbrightInfo.PortalId))`
`187`	`175`	`{`
`188`	`176`	`if (c.categoryid == catgroupid) removepromo = false;`
`189`	`177`	`if (c.categoryid == propgroupid) removepromo = false;`