Merge branch 'develop'

openstore-ecommerce · Oct 17, 2024 · b79d83b · b79d83b
2 parents d60041b + 83315c6
commit b79d83b
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 34 deletions.
diff --git a/Components/Categories/CategoryFunctions.cs b/Components/Categories/CategoryFunctions.cs
@@ -195,7 +195,7 @@ public String CategoryAdminSaveList(HttpContext context)
         {
             var ajaxInfoList = NBrightBuyUtils.GetAjaxInfoList(context);
             var strOut = "";
-            var regex = new Regex(@"^[a-z0-9]+$");
+            var regex = new Regex("^[a-zA-Z0-9_]*$");
             var isPropertyList = (context.Request.QueryString.Get("cmd") == "property_admin_savelist");
 
             foreach (var nbi in ajaxInfoList)

diff --git a/DNNpackager.dnnpack b/DNNpackager.dnnpack
@@ -1,5 +1,5 @@
 <root>
-	<version>4.2.0</version>
+	<version>4.2.1</version>
   <websitedestrelpath>\DesktopModules\NBright\NBrightBuy</websitedestrelpath>
   <websitedestbinrelpath>\bin</websitedestbinrelpath>
   <!-- Include only files that match the regular expression -->

diff --git a/OpenStore.dnn b/OpenStore.dnn
@@ -1,7 +1,7 @@
 <dotnetnuke type="Package" version="5.0">
 	<packages>
 
-    <package name="OS_ProductView" type="Module" version="4.2.0">
+    <package name="OS_ProductView" type="Module" version="4.2.1">
       <friendlyName>OS_ProductView</friendlyName>
       <description>
         OpenStore open source e-commerce for DNN.
@@ -132,6 +132,9 @@
 		  - af1987b - Fix first render search query
 		  - 0432151 - fix invalid SQL for static list
 
+		  v04.02.01
+		  - property Fix to allow underscore Regex("^[a-zA-Z0-9_]*$")
+
 	  </releaseNotes>
       <dependencies>
         <dependency type="CoreVersion">08.00.04</dependency>
@@ -264,7 +267,7 @@
     </package>
 
 
-    <package name="OpenStoreBO" type="Skin" version="4.2.0">
+    <package name="OpenStoreBO" type="Skin" version="4.2.1">
       <friendlyName>OpenStoreBO</friendlyName>
       <description>
         OpenStore Admin Panel
@@ -310,7 +313,7 @@
 
 
 
-    <package name="OS_DisplaySearch" type="Module" version="4.2.0">
+    <package name="OS_DisplaySearch" type="Module" version="4.2.1">
       <friendlyName>OS_DisplaySearch</friendlyName>
       <description>
         OpenStore open source e-commerce for DNN.
@@ -391,7 +394,7 @@
       </components>
     </package>
 
-    <package name="OS_AddressAdmin" type="Module" version="4.2.0">
+    <package name="OS_AddressAdmin" type="Module" version="4.2.1">
 			<friendlyName>OS_AddressAdmin</friendlyName>
 			<description>OpenStore open source e-commerce for DNN.
   Admin for clients addresses from the front office.
@@ -466,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.0">
+		<package name="OS_Payment" type="Module" version="4.2.1">
 			<friendlyName>OS_Payment</friendlyName>
 			<description>OpenStore open source e-commerce for DNN.
   Process payment of orders.
@@ -540,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.0">
+		<package name="OS_OrderAdmin" type="Module" version="4.2.1">
 
 			<friendlyName>OS_OrderAdmin</friendlyName>
 			<description>OpenStore open source e-commerce for DNN.
@@ -616,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.0">
+		<package name="OS_ProfileForm" type="Module" version="4.2.1">
 			<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.
@@ -692,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.0">
+				<package name="OS_Checkout" type="Module" version="4.2.1">
 			<friendlyName>OS_Checkout</friendlyName>
 			<description>OpenStore open source e-commerce for DNN. Checkout process.
 			</description>
@@ -766,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.0">
+				<package name="OS_MiniCart" type="Module" version="4.2.1">
 			<friendlyName>OS_MiniCart</friendlyName>
 			<description>OpenStore open source e-commerce for DNN. Mini cart view.
 			</description>
@@ -840,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.0">
+				<package name="OS_FullCart" type="Module" version="4.2.1">
 			<friendlyName>OS_FullCart</friendlyName>
 			<description>OpenStore open source e-commerce for DNN. full cart view.
 			</description>
@@ -914,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.0">
+    <package name="OS_CategoryMenu" type="Module" version="4.2.1">
       <friendlyName>OS_CategoryMenu</friendlyName>
       <description>
         CategoryMenu Display 
@@ -986,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.0">
+    <package name="OS_ProductFilter" type="Module" version="4.2.1">
       <friendlyName>OS_ProductFilter</friendlyName>
       <description>
         Filter module for Ajax Product Display
@@ -1059,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.0">
+    <package name="OS_ItemList" type="Module" version="4.2.1">
       <friendlyName>OS_ItemList</friendlyName>
       <description>
         Itemlist admin for shopping/favorites list

diff --git a/OpenStoreUpgrade.dnn b/OpenStoreUpgrade.dnn
@@ -1,7 +1,7 @@
 <dotnetnuke type="Package" version="5.0">
 	<packages>
 
-    <package name="OS_ProductView" type="Module" version="4.2.0">
+    <package name="OS_ProductView" type="Module" version="4.2.1">
       <friendlyName>OS_ProductView</friendlyName>
       <description>
         OpenStore open source e-commerce for DNN.
@@ -130,6 +130,9 @@
 		  - af1987b - Fix first render search query
 		  - 0432151 - fix invalid SQL for static list
 
+		  v04.02.01
+		  - property Fix to allow underscore Regex("^[a-zA-Z0-9_]*$")
+
 	  </releaseNotes>
       <dependencies>
         <dependency type="CoreVersion">08.00.04</dependency>
@@ -261,7 +264,7 @@
       </components>
     </package>
 
-    <package name="OS_DisplaySearch" type="Module" version="4.2.0">
+    <package name="OS_DisplaySearch" type="Module" version="4.2.1">
       <friendlyName>OS_DisplaySearch</friendlyName>
       <description>
         OpenStore open source e-commerce for DNN.
@@ -342,7 +345,7 @@
       </components>
     </package>
 
-    <package name="OS_AddressAdmin" type="Module" version="4.2.0">
+    <package name="OS_AddressAdmin" type="Module" version="4.2.1">
 			<friendlyName>OS_AddressAdmin</friendlyName>
 			<description>OpenStore open source e-commerce for DNN.
   Admin for clients addresses from the front office.
@@ -417,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.0">
+		<package name="OS_Payment" type="Module" version="4.2.1">
 			<friendlyName>OS_Payment</friendlyName>
 			<description>OpenStore open source e-commerce for DNN.
   Process payment of orders.
@@ -491,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.0">
+		<package name="OS_OrderAdmin" type="Module" version="4.2.1">
 
 			<friendlyName>OS_OrderAdmin</friendlyName>
 			<description>OpenStore open source e-commerce for DNN.
@@ -567,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.0">
+		<package name="OS_ProfileForm" type="Module" version="4.2.1">
 			<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.
@@ -643,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.0">
+				<package name="OS_Checkout" type="Module" version="4.2.1">
 			<friendlyName>OS_Checkout</friendlyName>
 			<description>OpenStore open source e-commerce for DNN. Checkout process.
 			</description>
@@ -717,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.0">
+				<package name="OS_MiniCart" type="Module" version="4.2.1">
 			<friendlyName>OS_MiniCart</friendlyName>
 			<description>OpenStore open source e-commerce for DNN. Mini cart view.
 			</description>
@@ -791,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.0">
+				<package name="OS_FullCart" type="Module" version="4.2.1">
 			<friendlyName>OS_FullCart</friendlyName>
 			<description>OpenStore open source e-commerce for DNN. full cart view.
 			</description>
@@ -865,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.0">
+    <package name="OS_CategoryMenu" type="Module" version="4.2.1">
       <friendlyName>OS_CategoryMenu</friendlyName>
       <description>
         CategoryMenu Display 
@@ -937,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.0">
+    <package name="OS_ProductFilter" type="Module" version="4.2.1">
       <friendlyName>OS_ProductFilter</friendlyName>
       <description>
         Filter module for Ajax Product Display
@@ -1010,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.0">
+    <package name="OS_ItemList" type="Module" version="4.2.1">
       <friendlyName>OS_ItemList</friendlyName>
       <description>
         Itemlist admin for shopping/favorites list

diff --git a/Properties/AssemblyInfo.cs b/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.0.0")]
-[assembly: AssemblyFileVersion("4.2.0.0")]
+[assembly: AssemblyVersion("4.2.1.0")]
+[assembly: AssemblyFileVersion("4.2.1.0")]
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# OpenSource v4.2.0.2
+# OpenSource v4.2.1.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.**  
@@ -8,7 +8,7 @@ Developer please read this to get started:
 
 https://doc.openstore-ecommerce.com/
 
-https://www.openstore-ecommerce.com/Open-Store/%C3%80-propos
+https://www.openstore-ecommerce.com
 
 https://www.openstore-ecommerce.com/Fonctionnalites
 

diff --git a/Themes/config/default/Admin_PropertyList.cshtml b/Themes/config/default/Admin_PropertyList.cshtml
@@ -71,6 +71,7 @@
                                     {
                                         <td style="width: 20%">
                                             @nbi.GetXmlProperty("genxml/textbox/propertyref")
+                                            @NBrightTextBox(nbi, "genxml/textbox/propertyref", "class='form-control' style='display:none;' maxlength='150' lp='" + lp + "'")
                                         </td>
                                     }
                                     <td style="width: 80%">

diff --git a/Themes/config/js/admin_property.js b/Themes/config/js/admin_property.js
@@ -173,11 +173,9 @@
                     }
                 });
 
-
                 $('#propertyAdmin_cmdSaveList').unbind("click");
                 $("#propertyAdmin_cmdSaveList").click(function () {
-
-                    var regEx = /[^a-z\d]/i;
+                    var regEx = /[^a-z\d_]/i;
                     var elems = ".propertyitemfields input#propertyref";
                     var isValid = ($(elems).length > 0);
                     $(elems).each(function(){