Merge pull request #571 from magento-folks/MAGETWO-42130

[Folks] Bug fix (P0 issue)

Author: Korshenko, Olexii(okorshenko)

Diff for: app/code/Magento/Checkout/view/frontend/web/js/model/address-converter.js

@@ -29,8 +29,8 @@ define(
                 }
 
                 addressData.region = {
-                    region_id: null,
-                    region_code: null,
+                    region_id: addressData.region_id,
+                    region_code: addressData.region_code,
                     region: regionName
                 };
 

Diff for: app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js

@@ -18,7 +18,8 @@ define([
     'Magento_Checkout/js/action/select-payment-method',
     'Magento_Checkout/js/model/address-converter',
     'Magento_Checkout/js/action/select-billing-address',
-    'Magento_Checkout/js/action/create-billing-address'
+    'Magento_Checkout/js/action/create-billing-address',
+    'underscore'
 ], function (
     addressList,
     quote,
@@ -30,7 +31,8 @@ define([
     selectPaymentMethodAction,
     addressConverter,
     selectBillingAddress,
-    createBillingAddress
+    createBillingAddress,
+    _
 ) {
     'use strict';
 
@@ -39,9 +41,10 @@ define([
             if (checkoutData.getShippingAddressFromData()) {
                 var address = addressConverter.formAddressDataToQuoteAddress(checkoutData.getShippingAddressFromData());
                 selectShippingAddress(address);
+            } else {
+                this.resolveShippingAddress();
             }
-            this.resolveShippingAddress(true);
-            if (quote.isVirtual) {
+            if (quote.isVirtual()) {
                if  (checkoutData.getBillingAddressFromData()) {
                     address = addressConverter.formAddressDataToQuoteAddress(checkoutData.getBillingAddressFromData());
                     selectBillingAddress(address);
@@ -61,7 +64,6 @@ define([
         },
 
         applyShippingAddress: function (isEstimatedAddress) {
-
             if (addressList().length == 0) {
                 var address = addressConverter.formAddressDataToQuoteAddress(checkoutData.getShippingAddressFromData());
                 selectShippingAddress(address);
@@ -104,40 +106,37 @@ define([
 
         resolveShippingRates: function (ratesData) {
             var selectedShippingRate = checkoutData.getSelectedShippingRate();
-            var rateIsAvailable = false;
+            var availableRate = false;
 
             if (ratesData.length == 1) {
                 //set shipping rate if we have only one available shipping rate
                 selectShippingMethodAction(ratesData[0]);
                 return;
             }
 
-            if(quote.shippingMethod()) {
-                rateIsAvailable = ratesData.some(function (rate) {
+            if (quote.shippingMethod()) {
+                availableRate = _.find(ratesData, function (rate) {
                     return rate.carrier_code == quote.shippingMethod().carrier_code
                         && rate.method_code == quote.shippingMethod().method_code;
                 });
             }
 
-            if (!rateIsAvailable && selectedShippingRate) {
-                rateIsAvailable = ratesData.some(function (rate) {
-                    if (rate.carrier_code + "_" + rate.method_code == selectedShippingRate) {
-                        selectShippingMethodAction(rate);
-                        return true;
-                    }
-                    return false;
-
+            if (!availableRate && selectedShippingRate) {
+                availableRate = _.find(ratesData, function (rate) {
+                    return rate.carrier_code + "_" + rate.method_code === selectedShippingRate;
                 });
             }
 
-            if (!rateIsAvailable && window.checkoutConfig.selectedShippingMethod) {
-                rateIsAvailable = true;
+            if (!availableRate && window.checkoutConfig.selectedShippingMethod) {
+                availableRate = true;
                 selectShippingMethodAction(window.checkoutConfig.selectedShippingMethod);
             }
 
             //Unset selected shipping method if not available
-            if (!rateIsAvailable) {
+            if (!availableRate) {
                 selectShippingMethodAction(null);
+            } else {
+                selectShippingMethodAction(availableRate);
             }
         },
 

Diff for: app/code/Magento/Checkout/view/frontend/web/js/view/cart/shipping-rates.js

@@ -47,6 +47,7 @@ define(
                 this._super();
 
                 this.shippingRates.subscribe(function (rates) {
+                    self.shippingRateGroups([]);
                     _.each(rates, function (rate) {
                         var carrierTitle = rate['carrier_title'];
 

Diff for: app/code/Magento/Customer/view/frontend/web/js/model/customer/address.js

@@ -14,7 +14,7 @@ define([], function() {
             customerAddressId: addressData.id,
             email: addressData.email,
             countryId: addressData.country_id,
-            regionId: addressData.region.region_id,
+            regionId: addressData.region_id,
             regionCode: addressData.region.region_code,
             region: addressData.region.region,
             customerId: addressData.customer_id,

Diff for: dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Shipping.php

@@ -74,14 +74,21 @@ public function openEstimateShippingAndTax()
      *
      * @param array $shipping
      * @return void
+     * @throws \Exception
      */
     public function selectShippingMethod(array $shipping)
     {
         $selector = sprintf($this->shippingMethod, $shipping['shipping_service'], $shipping['shipping_method']);
         if (!$this->_rootElement->find($selector, Locator::SELECTOR_XPATH)->isVisible()) {
             $this->openEstimateShippingAndTax();
         }
-        $this->_rootElement->find($selector, Locator::SELECTOR_XPATH)->click();
+
+        $element = $this->_rootElement->find($selector, Locator::SELECTOR_XPATH);
+        if (!$element->isDisabled()) {
+            $element->click();
+        } else {
+            throw new \Exception("Unable to set value to field '$selector' as it's disabled.");
+        }
     }
 
     /**
@@ -95,8 +102,13 @@ public function fillEstimateShippingAndTax(Address $address)
         $this->openEstimateShippingAndTax();
         $data = $address->getData();
         $mapping = $this->dataMapping(array_intersect_key($data, array_flip($this->estimationFields)));
-        $this->_fill($mapping, $this->_rootElement);
-        $this->waitForUpdatedShippingMethods();
+
+        // Test environment may become unstable when form fields are filled in a default manner.
+        // Imitating behavior closer to the real user.
+        foreach ($mapping as $field) {
+            $this->_fill([$field], $this->_rootElement);
+            $this->waitForUpdatedShippingMethods();
+        }
     }
 
     /**