Selecting an attribute of type date caused an error on the product detail page

Author: mgesing

src/Libraries/SmartStore.Services/Catalog/Modelling/ProductVariantQueryFactory.cs

@@ -41,7 +41,6 @@ protected Multimap<string, string> QueryItems
                     if (_httpContext.Request?.Unvalidated != null)
                     {
                         var form = _httpContext.Request.Unvalidated.Form;
-
                         if (form != null)
                         {
                             foreach (var key in form.AllKeys)
@@ -54,7 +53,6 @@ protected Multimap<string, string> QueryItems
                         }
 
                         var query = _httpContext.Request.Unvalidated.QueryString;
-
                         if (query != null)
                         {
                             foreach (var key in query.AllKeys)
@@ -141,8 +139,18 @@ public ProductVariantQuery CreateFromQuery()
                 // Convert from three form controls.
                 var dateKey = key.Replace("-year", "");
                 year = value.ToInt();
-                month = QueryItems[dateKey + "-month"].FirstOrDefault()?.ToInt() ?? 0;
-                day = QueryItems[dateKey + "-day"].FirstOrDefault()?.ToInt() ?? 0;
+
+                if (QueryItems.ContainsKey(dateKey + "-month"))
+                {
+                    var str = QueryItems[dateKey + "-month"].FirstOrDefault();
+                    month = str?.ToInt() ?? 0;
+                }
+
+                if (QueryItems.ContainsKey(dateKey + "-day"))
+                {
+                    var str = QueryItems[dateKey + "-day"].FirstOrDefault();
+                    day = str?.ToInt() ?? 0;
+                }
             }
 
             if (year > 0 && month > 0 && day > 0)

src/Presentation/SmartStore.Web/Scripts/public.product.js

@@ -24,6 +24,7 @@
                 var ctx = inputCtrl.closest('.update-container');
                 var isTouchSpin = inputCtrl.parent(".bootstrap-touchspin").length > 0;
                 var isFileUpload = inputCtrl.data("fileupload");
+                var isDateTime = inputCtrl.hasClass("date-part");
 
                 if (ctx.length === 0) {
                     // It's an associated or bundled item.
@@ -33,14 +34,14 @@
                 ctx.doAjax({
                     data: ctx.find(':input').serialize(),
                     callbackSuccess: function (response) {
-                        self.updateDetailData(response, ctx, isTouchSpin, isFileUpload);
+                        self.updateDetailData(response, ctx, isTouchSpin, isFileUpload, isDateTime);
 
                         if (ctx.hasClass('pd-bundle-item')) {
                             // Update bundle price too.
                             $('#main-update-container').doAjax({
                                 data: $('.pd-bundle-items').find(':input').serialize(),
                                 callbackSuccess: function (response2) {
-                                    self.updateDetailData(response2, $('#main-update-container'), isTouchSpin, isFileUpload);
+                                    self.updateDetailData(response2, $('#main-update-container'), isTouchSpin, isFileUpload, isDateTime);
                                 }
                             });
                         }
@@ -51,7 +52,7 @@
             return this;
         };
 
-        this.updateDetailData = function (data, ctx, isTouchSpin, isFileUpload) {
+        this.updateDetailData = function (data, ctx, isTouchSpin, isFileUpload, isDateTime) {
             var gallery = $('#pd-gallery').data(galPluginName);
 
             // Image gallery needs special treatment
@@ -73,7 +74,8 @@
                 // Iterate all elems with [data-partial] attribute...
                 var $el = $(el);
                 var partial = $el.data('partial');
-                if (partial && !(isTouchSpin && partial === 'OfferActions')) {
+
+                if (partial && !(isTouchSpin && partial === 'OfferActions') && !(isDateTime && partial === 'Variants')) {
                     // ...fetch the updated html from the corresponding AJAX result object's properties
                     if (data.Partials && data.Partials.hasOwnProperty(partial)) {
                         if (partial === 'Variants') {