MAGETWO-66436: Add missing return in resolveShippingRates #6321

vrann · vrann · commit d00231d6ecc0 · 2017-03-20T19:59:30.000-07:00
- Merge Pull Request #6321 from GordonLesti/magento2:resolveShippingRates
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js b/app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js
@@ -164,6 +164,8 @@ define([
             if (!availableRate && window.checkoutConfig.selectedShippingMethod) {
                 availableRate = window.checkoutConfig.selectedShippingMethod;
                 selectShippingMethodAction(window.checkoutConfig.selectedShippingMethod);
+
+                return;
             }
 
             //Unset selected shipping method if not available

Original file line number	Diff line number	Diff line change
`@@ -164,6 +164,8 @@ define([`
`164`	`164`	`if (!availableRate && window.checkoutConfig.selectedShippingMethod) {`
`165`	`165`	`availableRate = window.checkoutConfig.selectedShippingMethod;`
`166`	`166`	`selectShippingMethodAction(window.checkoutConfig.selectedShippingMethod);`
	`167`	`+`
	`168`	`+ return;`
`167`	`169`	`}`
`168`	`170`
`169`	`171`	`//Unset selected shipping method if not available`