v4.2.2. - Fix phatom records being in DB with null TypeCode.

Author: leedavi

Components/Categories/CategoryData.cs

@@ -167,7 +167,8 @@ public void Delete()
         public void Save()
         {
             _objCtrl.Update(DataRecord);
-            _objCtrl.Update(DataLangRecord);
+            if (String.IsNullOrEmpty(DataLangRecord.TypeCode)) DataLangRecord.TypeCode = "CATEGORYLANG";
+            DataLangRecord.ItemID = _objCtrl.Update(DataLangRecord);
 
             //do reindex of cascade records.
             if (_doCascadeIndex)

Components/NBrightBuyController.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Data.SqlTypes;
 using System.Globalization;
 using System.Net;
 using System.Web;
@@ -277,7 +278,15 @@ public override int Update(NBrightInfo objInfo)
 
                 // do update
                 objInfo.ModifiedDate = DateTime.Now;
-                return DataProvider.Instance().Update(objInfo.ItemID, objInfo.PortalId, objInfo.ModuleId, objInfo.TypeCode, objInfo.XMLData, objInfo.GUIDKey, objInfo.ModifiedDate, objInfo.TextData, objInfo.XrefItemId, objInfo.ParentItemId, objInfo.UserId, objInfo.Lang);
+                if (String.IsNullOrEmpty(objInfo.TypeCode))
+                {
+                    Logging.Error($"NBrightBuyController.Update called with NULL typecode: Is is caused by invalid langauge records (usually Categories, when a langauge is added, they need to be edited and saved.)" );
+                    return -1;
+                }
+                else
+                {
+                    return DataProvider.Instance().Update(objInfo.ItemID, objInfo.PortalId, objInfo.ModuleId, objInfo.TypeCode, objInfo.XMLData, objInfo.GUIDKey, objInfo.ModifiedDate, objInfo.TextData, objInfo.XrefItemId, objInfo.ParentItemId, objInfo.UserId, objInfo.Lang);
+                }
             }
             catch (Exception e)
             {
@@ -399,7 +408,17 @@ public NBrightInfo GetData(int itemId, string typeCodeLang, string lang = "",boo
 
             if (rtnInfo == null)
             {
-                rtnInfo = CBO.FillObject<NBrightInfo>(DataProvider.Instance().Get(itemId, typeCodeLang, lang)); 
+                rtnInfo = CBO.FillObject<NBrightInfo>(DataProvider.Instance().Get(itemId, typeCodeLang, lang));
+                if (rtnInfo.Lang == "")
+                {
+                    // record does not exists, so add lang
+                    rtnInfo.Lang = lang; 
+                    if (rtnInfo.XMLDoc.SelectSingleNode("genxml/lang") == null)
+                    {
+                        rtnInfo.SetXmlProperty("genxml/lang", "", System.TypeCode.String, false);
+                    }
+                    rtnInfo.AddXmlNode("<genxml></genxml>", "/*", "genxml/lang");
+                }
                 if (debugMode == false) Utils.SetCache(strCacheKey, rtnInfo);
             }
             return rtnInfo;

Components/NBrightBuyUtils.cs

@@ -1430,6 +1430,7 @@ public static List<NBrightInfo> GetCatList(int parentid = 0, string groupref = "
             {
                 var g = grpCtrl.GetCategory(c.ItemID);
                 if (g != null) c.SetXmlProperty("genxml/entrycount", g.entrycount.ToString(""));
+                c.Lang = lang; // get correct language, even it it does not exists.
             }
 
             return levelList;

DNNpackager.dnnpack

@@ -1,5 +1,5 @@
 <root>
-	<version>4.2.1</version>
+	<version>4.2.2</version>
   <websitedestrelpath>\DesktopModules\NBright\NBrightBuy</websitedestrelpath>
   <websitedestbinrelpath>\bin</websitedestbinrelpath>
   <!-- Include only files that match the regular expression -->

OpenStore.dnn

@@ -1,7 +1,7 @@
 <dotnetnuke type="Package" version="5.0">
 	<packages>
 
-    <package name="OS_ProductView" type="Module" version="4.2.1">
+    <package name="OS_ProductView" type="Module" version="4.2.2">
       <friendlyName>OS_ProductView</friendlyName>
       <description>
         OpenStore open source e-commerce for DNN.
@@ -267,7 +267,7 @@
     </package>
 
 
-    <package name="OpenStoreBO" type="Skin" version="4.2.1">
+    <package name="OpenStoreBO" type="Skin" version="4.2.2">
       <friendlyName>OpenStoreBO</friendlyName>
       <description>
         OpenStore Admin Panel
@@ -313,7 +313,7 @@
 
 
 
-    <package name="OS_DisplaySearch" type="Module" version="4.2.1">
+    <package name="OS_DisplaySearch" type="Module" version="4.2.2">
       <friendlyName>OS_DisplaySearch</friendlyName>
       <description>
         OpenStore open source e-commerce for DNN.
@@ -394,7 +394,7 @@
       </components>
     </package>
 
-    <package name="OS_AddressAdmin" type="Module" version="4.2.1">
+    <package name="OS_AddressAdmin" type="Module" version="4.2.2">
 			<friendlyName>OS_AddressAdmin</friendlyName>
 			<description>OpenStore open source e-commerce for DNN.
   Admin for clients addresses from the front office.
@@ -469,7 +469,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 			</components>
 		</package>
 
-		<package name="OS_Payment" type="Module" version="4.2.1">
+		<package name="OS_Payment" type="Module" version="4.2.2">
 			<friendlyName>OS_Payment</friendlyName>
 			<description>OpenStore open source e-commerce for DNN.
   Process payment of orders.
@@ -543,7 +543,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 			</components>
 		</package>
 
-		<package name="OS_OrderAdmin" type="Module" version="4.2.1">
+		<package name="OS_OrderAdmin" type="Module" version="4.2.2">
 
 			<friendlyName>OS_OrderAdmin</friendlyName>
 			<description>OpenStore open source e-commerce for DNN.
@@ -619,7 +619,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 			</components>
 		</package>
 
-		<package name="OS_ProfileForm" type="Module" version="4.2.1">
+		<package name="OS_ProfileForm" type="Module" version="4.2.2">
 			<friendlyName>OS_ProfileForm</friendlyName>
 			<description>OpenStore open source e-commerce for DNN.
   This module creates a profile form that links to the DNN profile and NBS address.
@@ -695,7 +695,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 		</package>
 
 
-				<package name="OS_Checkout" type="Module" version="4.2.1">
+				<package name="OS_Checkout" type="Module" version="4.2.2">
 			<friendlyName>OS_Checkout</friendlyName>
 			<description>OpenStore open source e-commerce for DNN. Checkout process.
 			</description>
@@ -769,7 +769,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 			</components>
 		</package>
 
-				<package name="OS_MiniCart" type="Module" version="4.2.1">
+				<package name="OS_MiniCart" type="Module" version="4.2.2">
 			<friendlyName>OS_MiniCart</friendlyName>
 			<description>OpenStore open source e-commerce for DNN. Mini cart view.
 			</description>
@@ -843,7 +843,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 			</components>
 		</package>
 
-				<package name="OS_FullCart" type="Module" version="4.2.1">
+				<package name="OS_FullCart" type="Module" version="4.2.2">
 			<friendlyName>OS_FullCart</friendlyName>
 			<description>OpenStore open source e-commerce for DNN. full cart view.
 			</description>
@@ -917,7 +917,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 			</components>
 		</package>
 
-    <package name="OS_CategoryMenu" type="Module" version="4.2.1">
+    <package name="OS_CategoryMenu" type="Module" version="4.2.2">
       <friendlyName>OS_CategoryMenu</friendlyName>
       <description>
         CategoryMenu Display 
@@ -989,7 +989,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
       </components>
     </package>
 
-    <package name="OS_ProductFilter" type="Module" version="4.2.1">
+    <package name="OS_ProductFilter" type="Module" version="4.2.2">
       <friendlyName>OS_ProductFilter</friendlyName>
       <description>
         Filter module for Ajax Product Display
@@ -1062,7 +1062,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
       </components>
     </package>    
 
-    <package name="OS_ItemList" type="Module" version="4.2.1">
+    <package name="OS_ItemList" type="Module" version="4.2.2">
       <friendlyName>OS_ItemList</friendlyName>
       <description>
         Itemlist admin for shopping/favorites list

OpenStoreUpgrade.dnn

@@ -1,7 +1,7 @@
 <dotnetnuke type="Package" version="5.0">
 	<packages>
 
-    <package name="OS_ProductView" type="Module" version="4.2.1">
+    <package name="OS_ProductView" type="Module" version="4.2.2">
       <friendlyName>OS_ProductView</friendlyName>
       <description>
         OpenStore open source e-commerce for DNN.
@@ -264,7 +264,7 @@
       </components>
     </package>
 
-    <package name="OS_DisplaySearch" type="Module" version="4.2.1">
+    <package name="OS_DisplaySearch" type="Module" version="4.2.2">
       <friendlyName>OS_DisplaySearch</friendlyName>
       <description>
         OpenStore open source e-commerce for DNN.
@@ -345,7 +345,7 @@
       </components>
     </package>
 
-    <package name="OS_AddressAdmin" type="Module" version="4.2.1">
+    <package name="OS_AddressAdmin" type="Module" version="4.2.2">
 			<friendlyName>OS_AddressAdmin</friendlyName>
 			<description>OpenStore open source e-commerce for DNN.
   Admin for clients addresses from the front office.
@@ -420,7 +420,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 			</components>
 		</package>
 
-		<package name="OS_Payment" type="Module" version="4.2.1">
+		<package name="OS_Payment" type="Module" version="4.2.2">
 			<friendlyName>OS_Payment</friendlyName>
 			<description>OpenStore open source e-commerce for DNN.
   Process payment of orders.
@@ -494,7 +494,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 			</components>
 		</package>
 
-		<package name="OS_OrderAdmin" type="Module" version="4.2.1">
+		<package name="OS_OrderAdmin" type="Module" version="4.2.2">
 
 			<friendlyName>OS_OrderAdmin</friendlyName>
 			<description>OpenStore open source e-commerce for DNN.
@@ -570,7 +570,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 			</components>
 		</package>
 
-		<package name="OS_ProfileForm" type="Module" version="4.2.1">
+		<package name="OS_ProfileForm" type="Module" version="4.2.2">
 			<friendlyName>OS_ProfileForm</friendlyName>
 			<description>OpenStore open source e-commerce for DNN.
   This module creates a profile form that links to the DNN profile and NBS address.
@@ -646,7 +646,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 		</package>
 
 
-				<package name="OS_Checkout" type="Module" version="4.2.1">
+				<package name="OS_Checkout" type="Module" version="4.2.2">
 			<friendlyName>OS_Checkout</friendlyName>
 			<description>OpenStore open source e-commerce for DNN. Checkout process.
 			</description>
@@ -720,7 +720,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 			</components>
 		</package>
 
-				<package name="OS_MiniCart" type="Module" version="4.2.1">
+				<package name="OS_MiniCart" type="Module" version="4.2.2">
 			<friendlyName>OS_MiniCart</friendlyName>
 			<description>OpenStore open source e-commerce for DNN. Mini cart view.
 			</description>
@@ -794,7 +794,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 			</components>
 		</package>
 
-				<package name="OS_FullCart" type="Module" version="4.2.1">
+				<package name="OS_FullCart" type="Module" version="4.2.2">
 			<friendlyName>OS_FullCart</friendlyName>
 			<description>OpenStore open source e-commerce for DNN. full cart view.
 			</description>
@@ -868,7 +868,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 			</components>
 		</package>
 
-    <package name="OS_CategoryMenu" type="Module" version="4.2.1">
+    <package name="OS_CategoryMenu" type="Module" version="4.2.2">
       <friendlyName>OS_CategoryMenu</friendlyName>
       <description>
         CategoryMenu Display 
@@ -940,7 +940,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
       </components>
     </package>
 
-    <package name="OS_ProductFilter" type="Module" version="4.2.1">
+    <package name="OS_ProductFilter" type="Module" version="4.2.2">
       <friendlyName>OS_ProductFilter</friendlyName>
       <description>
         Filter module for Ajax Product Display
@@ -1013,7 +1013,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
       </components>
     </package>    
 
-    <package name="OS_ItemList" type="Module" version="4.2.1">
+    <package name="OS_ItemList" type="Module" version="4.2.2">
       <friendlyName>OS_ItemList</friendlyName>
       <description>
         Itemlist admin for shopping/favorites list

Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.2.1.0")]
-[assembly: AssemblyFileVersion("4.2.1.0")]
+[assembly: AssemblyVersion("4.2.2.0")]
+[assembly: AssemblyFileVersion("4.2.2.0")]

README.md

@@ -1,4 +1,4 @@
-# OpenSource v4.2.1.0
+# OpenSource v4.2.2.0
 OpenStore - E-Commerce for DNN
 
 **OpenStore is still maintained, it is now considered feature full.  More functionality will only be added as bug fixes and plugins.**