Merge pull request #119 from Paazl/release/1.17.6

Release/1.17.6

Author: Marvin-Magmodules

composer.json

@@ -2,7 +2,7 @@
   "name": "paazl/magento2-checkout-widget",
   "description": "Paazl checkoutWidget for Magento 2",
   "type": "magento2-module",
-  "version": "1.17.5",
+  "version": "1.17.6",
   "keywords": [
     "Paazl",
     "Magento 2",

etc/config.xml

@@ -8,7 +8,7 @@
     <default>
         <carriers>
             <paazlshipping>
-                <version>v1.17.5</version>
+                <version>v1.17.6</version>
                 <active>0</active>
                 <sallowspecific>0</sallowspecific>
                 <price>0</price>

view/frontend/web/js/checkout/action/set-shipping-information-mixin.js

@@ -66,7 +66,9 @@ define([
                 shippingAddress.firstname = currentAddress.firstname;
                 shippingAddress.lastname = currentAddress.lastname;
                 shippingAddress.countryId = currentAddress.country_id;
-                shippingAddress.region = currentAddress.region;
+                shippingAddress.region = typeof currentAddress.region === 'object' && currentAddress.region !== null 
+                    ? currentAddress.region.region 
+                    : currentAddress.region;
                 shippingAddress.city = currentAddress.city;
                 shippingAddress.postcode = currentAddress.postcode;
                 shippingAddress.street = Object.values(currentAddress.street);

view/frontend/web/js/checkout/view/shipping-mixin.js

@@ -12,8 +12,22 @@ define([
     'Magento_Checkout/js/model/shipping-save-processor/payload-extender',
     'Magento_Checkout/js/model/resource-url-manager',
     'Magento_Checkout/js/model/error-processor',
-    'Paazl_CheckoutWidget/js/checkout/view/widget-config'
-], function ($, _, ko, storage, quote, payloadExtender, resourceUrlManager, errorProcessor, widgetConfig) {
+    'Paazl_CheckoutWidget/js/checkout/view/widget-config',
+    'Magento_Customer/js/model/customer',
+    'Paazl_CheckoutWidget/js/checkout/model/shipping-locations',
+], function (
+    $, 
+    _, 
+    ko, 
+    storage, 
+    quote, 
+    payloadExtender, 
+    resourceUrlManager, 
+    errorProcessor,
+    widgetConfig,
+    customer,
+    shippingLocations
+) {
     "use strict";
 
     /**
@@ -78,25 +92,53 @@ define([
 
             setShippingInformation: function () {
                 const savedSelectedShippingAddress = quote.shippingAddress();
-                let ajaxHandled = false;
 
                 widgetConfig.prototype.lock();
                 this._super();
 
                 if (savedSelectedShippingAddress.customerAddressId !== quote.shippingAddress().customerAddressId) {
-                    quote.shippingAddress(savedSelectedShippingAddress);
-
-                    $(document).ajaxComplete((_, xhr, settings) => {
-                        if (!ajaxHandled && settings.url.includes(resourceUrlManager.getUrlForSetShippingInformation(quote))) {
-                            ajaxHandled = true;
-                            this.saveShippingInformation();
-                        }
-                    });
+                    this.updateShippingInfo(savedSelectedShippingAddress);
+                }
+
+                if (!shippingLocations.selectedLocationCode()) {
+                    const customerAddressId = quote.shippingAddress().customerAddressId;
+                    const customerAddressList = customer.customerData.addresses;
+
+                    if (customerAddressList) {
+                        const currentAddress = customerAddressList[customerAddressId];
+                        const shippingAddress = Object.assign({}, quote.shippingAddress(), {
+                            firstname: currentAddress.firstname,
+                            lastname: currentAddress.lastname,
+                            countryId: currentAddress.country_id,
+                            region: typeof currentAddress.region === 'object' && currentAddress.region !== null 
+                                ? currentAddress.region.region 
+                                : currentAddress.region,
+                            city: currentAddress.city,
+                            postcode: currentAddress.postcode,
+                            street: Object.values(currentAddress.street),
+                            telephone: currentAddress.telephone
+                        });
+
+                        this.updateShippingInfo(shippingAddress);
+                    }
                 }
 
                 widgetConfig.prototype.unlock();
             },
 
+            updateShippingInfo(address) {
+                let ajaxHandled = false;
+
+                quote.shippingAddress(address);
+
+                $(document).ajaxComplete((_, xhr, settings) => {
+                    if (!ajaxHandled && settings.url.includes(resourceUrlManager.getUrlForSetShippingInformation(quote))) {
+                        ajaxHandled = true;
+                        this.saveShippingInformation();
+                    }
+                });
+            },
+
             saveShippingInformation: function () {
                 var payload;