MAGETWO-37495: Wrong behaviour for save new shipping addres during checkout

Author: Ievgen Shakhsuvarov

app/code/Magento/Checkout/view/frontend/web/js/action/select-billing-address.js

@@ -13,27 +13,31 @@ define(
         'uiRegistry',
         '../model/url-builder',
         'mage/storage',
-        '../model/payment-service'
-
+        '../model/payment-service',
+        'underscore'
     ],
-    function (quote, addressList, navigator, selectShippingAddress, registry, urlBuilder, storage, paymentService) {
+    function (quote, addressList, navigator, selectShippingAddress, registry, urlBuilder, storage, paymentService, _) {
         "use strict";
         var actionCallback;
         var result = function (billingAddress, useForShipping, additionalData) {
+            var copyBillingToShipping = function() {
+                var shippingAddressSource = registry.get('checkoutProvider'),
+                    shippingAddress = shippingAddressSource.get('shippingAddress');
+                for (var property in billingAddress) {
+                    if (billingAddress.hasOwnProperty(property) && shippingAddress.hasOwnProperty(property)) {
+                        if (typeof billingAddress[property] === 'string') {
+                            shippingAddressSource.set('shippingAddress.' + property, billingAddress[property]);
+                        } else {
+                            shippingAddressSource.set('shippingAddress.' + property, _.clone(billingAddress[property]));
+                        }
+                    }
+                }
+            };
             additionalData = additionalData || {};
             quote.setBillingAddress(billingAddress);
             if (useForShipping() === '1' && !quote.isVirtual()) {
                 if (!billingAddress.customerAddressId) {
-                    // update shipping address data in corresponding provider
-                    var shippingAddressSource = registry.get('checkoutProvider');
-                    var shippingAddress = shippingAddressSource.get('shippingAddress');
-                    for (var property in billingAddress) {
-                        if (billingAddress.hasOwnProperty(property)
-                            && shippingAddress.hasOwnProperty(property)
-                        ) {
-                            shippingAddressSource.set('shippingAddress.' + property, billingAddress[property]);
-                        }
-                    }
+                    copyBillingToShipping();
                 }
                 selectShippingAddress(billingAddress, useForShipping, additionalData);
             } else if (quote.isVirtual()) {
@@ -72,6 +76,9 @@ define(
                 );
             } else {
                 navigator.setCurrent('billingAddress').goNext();
+                if (addressList.isBillingSameAsShipping) {
+                    copyBillingToShipping();
+                }
             }
         };
         result.setActionCallback = function (value) {

app/code/Magento/Checkout/view/frontend/web/js/model/addresslist.js

@@ -23,6 +23,7 @@ define(['jquery'], function($) {
         },
         getAddresses: function() {
             return addresses.slice(0);
-        }
+        },
+        isBillingSameAsShipping: false
     };
 });

app/code/Magento/Checkout/view/frontend/web/js/view/shipping-address.js

@@ -13,9 +13,9 @@ define(
         '../model/quote',
         'Magento_Checkout/js/model/step-navigator',
         '../model/addresslist',
-        'mage/translate'
+        'underscore'
     ],
-    function($, Component, ko, selectShippingAddress, customer, quote, navigator, addressList) {
+    function($, Component, ko, selectShippingAddress, customer, quote, navigator, addressList, _) {
         'use strict';
         var stepName = 'shippingAddress';
         var newAddressSelected = ko.observable(false);
@@ -87,6 +87,7 @@ define(
                 }
             },
             sameAsBillingClick: function() {
+                addressList.isBillingSameAsShipping = !addressList.isBillingSameAsShipping;
                 if (this.sameAsBilling()) {
                     var billingAddress = quote.getBillingAddress()();
                     if (billingAddress.customerAddressId) {
@@ -97,7 +98,11 @@ define(
                         var shippingAddress = this.source.get('shippingAddress');
                         for (var property in billingAddress) {
                             if (billingAddress.hasOwnProperty(property) && shippingAddress.hasOwnProperty(property)) {
-                                this.source.set('shippingAddress.' + property, billingAddress[property]);
+                                if (typeof billingAddress[property] === 'string') {
+                                    this.source.set('shippingAddress.' + property, billingAddress[property]);
+                                } else {
+                                    this.source.set('shippingAddress.' + property, _.clone(billingAddress[property]));
+                                }
                             }
                         }
                         this.selectedAddressId(null);