MAGETWO-39475: [GITHUB] No error message shown when purchase qty mismatch the 'Qty Increments' setup #1411

Michail Slabko · Michail Slabko · commit b3b89a3f0210 · 2015-07-09T12:26:00.000+03:00
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);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -74,8 +74,8 @@ define([`
`74`	`74`	`$('body').trigger(self.options.processStop);`
`75`	`75`	`}`
`76`	`76`
`77`		`- if (res.backUrl) {`
`78`		`- window.location = res.backUrl;`
	`77`	`+ if (res.redirect) {`
	`78`	`+ window.location = res.redirect;`
`79`	`79`	`return;`
`80`	`80`	`}`
`81`	`81`	`if (res.messages) {`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ define([`
`45`	`45`	`getFromServer: function (sectionNames) {`
`46`	`46`	`var parameters = _.isArray(sectionNames) ? {sections: sectionNames.join(',')} : [];`
`47`	`47`	`return $.getJSON(options.sectionLoadUrl, parameters).fail(function(jqXHR) {`
`48`		`- throw new Error(jqXHR.responseJSON.message);`
	`48`	`+ throw new Error(jqXHR);`
`49`	`49`	`});`
`50`	`50`	`}`
`51`	`51`	`};`
`@@ -134,6 +134,10 @@ define([`
`134`	`134`	`var sections = sectionConfig.getAffectedSections(settings.url);`
`135`	`135`	`if (sections) {`
`136`	`136`	`customerData.invalidate(sections);`
	`137`	`+ var redirects = ['redirect'];`
	`138`	`+ if (_.isObject(xhr.responseJSON) && !_.isEmpty(_.pick(xhr.responseJSON, redirects))) {`
	`139`	`+ return ;`
	`140`	`+ }`
`137`	`141`	`customerData.reload(sections);`
`138`	`142`	`}`
`139`	`143`	`}`