MAGETWO-39475: [GITHUB] No error message shown when purchase qty mism…

…atch the 'Qty Increments' setup #1411
magento · Jul 9, 2015 · b3b89a3 · b3b89a3
1 parent e9b1713
commit b3b89a3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js b/app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js
@@ -74,8 +74,8 @@ define([
                         $('body').trigger(self.options.processStop);
                     }
 
-                    if (res.backUrl) {
-                        window.location = res.backUrl;
+                    if (res.redirect) {
+                        window.location = res.redirect;
                         return;
                     }
                     if (res.messages) {

diff --git a/app/code/Magento/Checkout/Controller/Cart/Add.php b/app/code/Magento/Checkout/Controller/Cart/Add.php
@@ -169,7 +169,7 @@ protected function goBack($backUrl = null, $product = null)
         $result = [];
 
         if ($backUrl || $backUrl = $this->getBackUrl()) {
-            $result['backUrl'] = $backUrl;
+            $result['redirect'] = $backUrl;
         } else {
             if ($product && !$product->getIsSalable()) {
                 $result['product'] = [

diff --git a/app/code/Magento/Customer/view/frontend/web/js/customer-data.js b/app/code/Magento/Customer/view/frontend/web/js/customer-data.js
@@ -45,7 +45,7 @@ define([
         getFromServer: function (sectionNames) {
             var parameters = _.isArray(sectionNames) ? {sections: sectionNames.join(',')} : [];
             return $.getJSON(options.sectionLoadUrl, parameters).fail(function(jqXHR) {
-                throw new Error(jqXHR.responseJSON.message);
+                throw new Error(jqXHR);
             });
         }
     };
@@ -134,6 +134,10 @@ define([
             var sections = sectionConfig.getAffectedSections(settings.url);
             if (sections) {
                 customerData.invalidate(sections);
+                var redirects = ['redirect'];
+                if (_.isObject(xhr.responseJSON) && !_.isEmpty(_.pick(xhr.responseJSON, redirects))) {
+                    return ;
+                }
                 customerData.reload(sections);
             }
         }