Merge branch 'develop'

Author: leedavi

Components/Product/ProductFunctions.cs

@@ -2045,12 +2045,19 @@ public String ProductAjaxViewList(NBrightInfo ajaxInfo, string pagemid, string p
                 // If we have a list,then always display the default category
                 if (ModSettings.Get("staticlist") == "True")
                 {
+                    // fix invalid select when no categories or properties exists.
+                    if (filterCatList == "()")
+                        filterCatList = "";
+                    else
+                        filterCatList = " and " + filterCatList;
+                    // fix invalid select when no categories or properties exists.
+
                     if (catseo == "") catseo = _catid;
                     _catid = defcatid;
                     if (ModSettings.Get("chkcascaderesults").ToLower() == "true")
-                        strFilter = strFilter + " and NB1.[ItemId] in (select parentitemid from " + dbOwner + "[" + objQual + "NBrightBuy] where (typecode = 'CATCASCADE' or typecode = 'CATXREF') and " + filterCatList + ") ";
+                        strFilter = strFilter + " and NB1.[ItemId] in (select parentitemid from " + dbOwner + "[" + objQual + "NBrightBuy] where (typecode = 'CATCASCADE' or typecode = 'CATXREF') " + filterCatList + ") ";
                     else
-                        strFilter = strFilter + " and NB1.[ItemId] in (select parentitemid from " + dbOwner + "[" + objQual + "NBrightBuy] where typecode = 'CATXREF' and " + filterCatList + ") ";
+                        strFilter = strFilter + " and NB1.[ItemId] in (select parentitemid from " + dbOwner + "[" + objQual + "NBrightBuy] where typecode = 'CATXREF' " + filterCatList + ") ";
 
                     if (ModSettings.Get("caturlfilter") == "True" && catseo != "" && catseo != _catid)
                     {

Themes/Default/Default/CheckoutAddress.cshtml

@@ -78,7 +78,7 @@
 
             <div class="formrow">
                 <label>@ResourceKey("General.lblAddress1")</label>
-                @NBrightTextBox(info, "genxml/billaddress/genxml/textbox/unit")
+                @NBrightTextBox(info, "genxml/billaddress/genxml/textbox/unit", "required name='billunit' class='required'")
             </div>
 
             <div class="formrow">