Skip to content

Commit b79d83b

Browse files
leedavileedavi
committed
Merge branch 'develop'
2 parents d60041b + 83315c6 commit b79d83b

File tree

8 files changed

+39
-34
lines changed

8 files changed

+39
-34
lines changed

‎Components/Categories/CategoryFunctions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ public String CategoryAdminSaveList(HttpContext context)
195195
{
196196
var ajaxInfoList = NBrightBuyUtils.GetAjaxInfoList(context);
197197
var strOut = "";
198-
var regex = new Regex(@"^[a-z0-9]+$");
198+
var regex = new Regex("^[a-zA-Z0-9_]*$");
199199
var isPropertyList = (context.Request.QueryString.Get("cmd") == "property_admin_savelist");
200200

201201
foreach (var nbi in ajaxInfoList)

‎DNNpackager.dnnpack‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<root>
2-
<version>4.2.0</version>
2+
<version>4.2.1</version>
33
<websitedestrelpath>\DesktopModules\NBright\NBrightBuy</websitedestrelpath>
44
<websitedestbinrelpath>\bin</websitedestbinrelpath>
55
<!-- Include only files that match the regular expression -->

‎OpenStore.dnn‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<dotnetnuke type="Package" version="5.0">
22
<packages>
33

4-
<package name="OS_ProductView" type="Module" version="4.2.0">
4+
<package name="OS_ProductView" type="Module" version="4.2.1">
55
<friendlyName>OS_ProductView</friendlyName>
66
<description>
77
OpenStore open source e-commerce for DNN.
@@ -132,6 +132,9 @@
132132
- af1987b - Fix first render search query
133133
- 0432151 - fix invalid SQL for static list
134134

135+
v04.02.01
136+
- property Fix to allow underscore Regex("^[a-zA-Z0-9_]*$")
137+
135138
</releaseNotes>
136139
<dependencies>
137140
<dependency type="CoreVersion">08.00.04</dependency>
@@ -264,7 +267,7 @@
264267
</package>
265268

266269

267-
<package name="OpenStoreBO" type="Skin" version="4.2.0">
270+
<package name="OpenStoreBO" type="Skin" version="4.2.1">
268271
<friendlyName>OpenStoreBO</friendlyName>
269272
<description>
270273
OpenStore Admin Panel
@@ -310,7 +313,7 @@
310313

311314

312315

313-
<package name="OS_DisplaySearch" type="Module" version="4.2.0">
316+
<package name="OS_DisplaySearch" type="Module" version="4.2.1">
314317
<friendlyName>OS_DisplaySearch</friendlyName>
315318
<description>
316319
OpenStore open source e-commerce for DNN.
@@ -391,7 +394,7 @@
391394
</components>
392395
</package>
393396

394-
<package name="OS_AddressAdmin" type="Module" version="4.2.0">
397+
<package name="OS_AddressAdmin" type="Module" version="4.2.1">
395398
<friendlyName>OS_AddressAdmin</friendlyName>
396399
<description>OpenStore open source e-commerce for DNN.
397400
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
466469
</components>
467470
</package>
468471

469-
<package name="OS_Payment" type="Module" version="4.2.0">
472+
<package name="OS_Payment" type="Module" version="4.2.1">
470473
<friendlyName>OS_Payment</friendlyName>
471474
<description>OpenStore open source e-commerce for DNN.
472475
Process payment of orders.
@@ -540,7 +543,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
540543
</components>
541544
</package>
542545

543-
<package name="OS_OrderAdmin" type="Module" version="4.2.0">
546+
<package name="OS_OrderAdmin" type="Module" version="4.2.1">
544547

545548
<friendlyName>OS_OrderAdmin</friendlyName>
546549
<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
616619
</components>
617620
</package>
618621

619-
<package name="OS_ProfileForm" type="Module" version="4.2.0">
622+
<package name="OS_ProfileForm" type="Module" version="4.2.1">
620623
<friendlyName>OS_ProfileForm</friendlyName>
621624
<description>OpenStore open source e-commerce for DNN.
622625
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
692695
</package>
693696

694697

695-
<package name="OS_Checkout" type="Module" version="4.2.0">
698+
<package name="OS_Checkout" type="Module" version="4.2.1">
696699
<friendlyName>OS_Checkout</friendlyName>
697700
<description>OpenStore open source e-commerce for DNN. Checkout process.
698701
</description>
@@ -766,7 +769,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
766769
</components>
767770
</package>
768771

769-
<package name="OS_MiniCart" type="Module" version="4.2.0">
772+
<package name="OS_MiniCart" type="Module" version="4.2.1">
770773
<friendlyName>OS_MiniCart</friendlyName>
771774
<description>OpenStore open source e-commerce for DNN. Mini cart view.
772775
</description>
@@ -840,7 +843,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
840843
</components>
841844
</package>
842845

843-
<package name="OS_FullCart" type="Module" version="4.2.0">
846+
<package name="OS_FullCart" type="Module" version="4.2.1">
844847
<friendlyName>OS_FullCart</friendlyName>
845848
<description>OpenStore open source e-commerce for DNN. full cart view.
846849
</description>
@@ -914,7 +917,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
914917
</components>
915918
</package>
916919

917-
<package name="OS_CategoryMenu" type="Module" version="4.2.0">
920+
<package name="OS_CategoryMenu" type="Module" version="4.2.1">
918921
<friendlyName>OS_CategoryMenu</friendlyName>
919922
<description>
920923
CategoryMenu Display
@@ -986,7 +989,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
986989
</components>
987990
</package>
988991

989-
<package name="OS_ProductFilter" type="Module" version="4.2.0">
992+
<package name="OS_ProductFilter" type="Module" version="4.2.1">
990993
<friendlyName>OS_ProductFilter</friendlyName>
991994
<description>
992995
Filter module for Ajax Product Display
@@ -1059,7 +1062,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
10591062
</components>
10601063
</package>
10611064

1062-
<package name="OS_ItemList" type="Module" version="4.2.0">
1065+
<package name="OS_ItemList" type="Module" version="4.2.1">
10631066
<friendlyName>OS_ItemList</friendlyName>
10641067
<description>
10651068
Itemlist admin for shopping/favorites list

‎OpenStoreUpgrade.dnn‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<dotnetnuke type="Package" version="5.0">
22
<packages>
33

4-
<package name="OS_ProductView" type="Module" version="4.2.0">
4+
<package name="OS_ProductView" type="Module" version="4.2.1">
55
<friendlyName>OS_ProductView</friendlyName>
66
<description>
77
OpenStore open source e-commerce for DNN.
@@ -130,6 +130,9 @@
130130
- af1987b - Fix first render search query
131131
- 0432151 - fix invalid SQL for static list
132132

133+
v04.02.01
134+
- property Fix to allow underscore Regex("^[a-zA-Z0-9_]*$")
135+
133136
</releaseNotes>
134137
<dependencies>
135138
<dependency type="CoreVersion">08.00.04</dependency>
@@ -261,7 +264,7 @@
261264
</components>
262265
</package>
263266

264-
<package name="OS_DisplaySearch" type="Module" version="4.2.0">
267+
<package name="OS_DisplaySearch" type="Module" version="4.2.1">
265268
<friendlyName>OS_DisplaySearch</friendlyName>
266269
<description>
267270
OpenStore open source e-commerce for DNN.
@@ -342,7 +345,7 @@
342345
</components>
343346
</package>
344347

345-
<package name="OS_AddressAdmin" type="Module" version="4.2.0">
348+
<package name="OS_AddressAdmin" type="Module" version="4.2.1">
346349
<friendlyName>OS_AddressAdmin</friendlyName>
347350
<description>OpenStore open source e-commerce for DNN.
348351
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
417420
</components>
418421
</package>
419422

420-
<package name="OS_Payment" type="Module" version="4.2.0">
423+
<package name="OS_Payment" type="Module" version="4.2.1">
421424
<friendlyName>OS_Payment</friendlyName>
422425
<description>OpenStore open source e-commerce for DNN.
423426
Process payment of orders.
@@ -491,7 +494,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
491494
</components>
492495
</package>
493496

494-
<package name="OS_OrderAdmin" type="Module" version="4.2.0">
497+
<package name="OS_OrderAdmin" type="Module" version="4.2.1">
495498

496499
<friendlyName>OS_OrderAdmin</friendlyName>
497500
<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
567570
</components>
568571
</package>
569572

570-
<package name="OS_ProfileForm" type="Module" version="4.2.0">
573+
<package name="OS_ProfileForm" type="Module" version="4.2.1">
571574
<friendlyName>OS_ProfileForm</friendlyName>
572575
<description>OpenStore open source e-commerce for DNN.
573576
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
643646
</package>
644647

645648

646-
<package name="OS_Checkout" type="Module" version="4.2.0">
649+
<package name="OS_Checkout" type="Module" version="4.2.1">
647650
<friendlyName>OS_Checkout</friendlyName>
648651
<description>OpenStore open source e-commerce for DNN. Checkout process.
649652
</description>
@@ -717,7 +720,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
717720
</components>
718721
</package>
719722

720-
<package name="OS_MiniCart" type="Module" version="4.2.0">
723+
<package name="OS_MiniCart" type="Module" version="4.2.1">
721724
<friendlyName>OS_MiniCart</friendlyName>
722725
<description>OpenStore open source e-commerce for DNN. Mini cart view.
723726
</description>
@@ -791,7 +794,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
791794
</components>
792795
</package>
793796

794-
<package name="OS_FullCart" type="Module" version="4.2.0">
797+
<package name="OS_FullCart" type="Module" version="4.2.1">
795798
<friendlyName>OS_FullCart</friendlyName>
796799
<description>OpenStore open source e-commerce for DNN. full cart view.
797800
</description>
@@ -865,7 +868,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
865868
</components>
866869
</package>
867870

868-
<package name="OS_CategoryMenu" type="Module" version="4.2.0">
871+
<package name="OS_CategoryMenu" type="Module" version="4.2.1">
869872
<friendlyName>OS_CategoryMenu</friendlyName>
870873
<description>
871874
CategoryMenu Display
@@ -937,7 +940,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
937940
</components>
938941
</package>
939942

940-
<package name="OS_ProductFilter" type="Module" version="4.2.0">
943+
<package name="OS_ProductFilter" type="Module" version="4.2.1">
941944
<friendlyName>OS_ProductFilter</friendlyName>
942945
<description>
943946
Filter module for Ajax Product Display
@@ -1010,7 +1013,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
10101013
</components>
10111014
</package>
10121015

1013-
<package name="OS_ItemList" type="Module" version="4.2.0">
1016+
<package name="OS_ItemList" type="Module" version="4.2.1">
10141017
<friendlyName>OS_ItemList</friendlyName>
10151018
<description>
10161019
Itemlist admin for shopping/favorites list

‎Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("4.2.0.0")]
36-
[assembly: AssemblyFileVersion("4.2.0.0")]
35+
[assembly: AssemblyVersion("4.2.1.0")]
36+
[assembly: AssemblyFileVersion("4.2.1.0")]

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# OpenSource v4.2.0.2
1+
# OpenSource v4.2.1.0
22
OpenStore - E-Commerce for DNN
33

44
**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:
88

99
https://doc.openstore-ecommerce.com/
1010

11-
https://www.openstore-ecommerce.com/Open-Store/%C3%80-propos
11+
https://www.openstore-ecommerce.com
1212

1313
https://www.openstore-ecommerce.com/Fonctionnalites
1414

‎Themes/config/default/Admin_PropertyList.cshtml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
{
7272
<td style="width: 20%">
7373
@nbi.GetXmlProperty("genxml/textbox/propertyref")
74+
@NBrightTextBox(nbi, "genxml/textbox/propertyref", "class='form-control' style='display:none;' maxlength='150' lp='" + lp + "'")
7475
</td>
7576
}
7677
<td style="width: 80%">

‎Themes/config/js/admin_property.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,11 +173,9 @@
173173
}
174174
});
175175

176-
177176
$('#propertyAdmin_cmdSaveList').unbind("click");
178177
$("#propertyAdmin_cmdSaveList").click(function () {
179-
180-
var regEx = /[^a-z\d]/i;
178+
var regEx = /[^a-z\d_]/i;
181179
var elems = ".propertyitemfields input#propertyref";
182180
var isValid = ($(elems).length > 0);
183181
$(elems).each(function(){

0 commit comments

Comments
 (0)