CET-537/chore: Billing address should take precence over saved custom…

…erData
two-inc · Dec 5, 2024 · dd3d128 · dd3d128
1 parent 38ef2ca
commit dd3d128
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/view/frontend/web/js/view/payment/method-renderer/two_payment.js b/view/frontend/web/js/view/payment/method-renderer/two_payment.js
@@ -178,11 +178,6 @@ define([
         },
         fillCustomerData: function () {
             const self = this;
-            quote.shippingAddress.subscribe((address) => self.updateShippingAddress(address));
-            this.updateShippingAddress(quote.shippingAddress());
-
-            quote.billingAddress.subscribe((address) => self.updateBillingAddress(address));
-            this.updateBillingAddress(quote.billingAddress());
 
             customerData
                 .get('companyData')
@@ -198,6 +193,12 @@ define([
                 .get('countryCode')
                 .subscribe((countryCode) => self.fillCountryCode(countryCode));
             this.fillCountryCode(customerData.get('countryCode')());
+
+            quote.shippingAddress.subscribe((address) => self.updateShippingAddress(address));
+            this.updateShippingAddress(quote.shippingAddress());
+
+            quote.billingAddress.subscribe((address) => self.updateBillingAddress(address));
+            this.updateBillingAddress(quote.billingAddress());
         },
         afterPlaceOrder: function () {
             const url = $.mage.cookies.get(config.redirectUrlCookieCode);