Merge pull request #9391 from adobe-commerce-tier-4/PR-VK-2024-11-27-CE

PR-VK-2024-11-27-CE

Author: internal-magento-queue-manager[bot]

app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontClickUpdateAddressInCheckoutActionGroup.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+/**
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -16,6 +16,7 @@
         <waitForElementVisible selector="{{CheckoutShippingSection.updateAddress}}" stepKey="waitForUpdateButton"/>
         <waitForElementClickable selector="{{CheckoutShippingSection.updateAddress}}" stepKey="waitForUpdateButtonClickable"/>
         <click selector="{{CheckoutShippingSection.updateAddress}}" stepKey="clickUpdateButton"/>
+        <waitForElementVisible selector="{{CheckoutShippingSection.billingAddressDetails}}" stepKey="waitForBillingAddressUpdate"/>
         <waitForPageLoad stepKey="waitForAddressSaved"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/Checkout/Test/Mftf/ActionGroup/VerifyCheckoutPaymentOrderSummaryActionGroup.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+/**
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
+ */
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -19,6 +19,7 @@
             <argument name="orderSummaryTotal" type="string"/>
         </arguments>
 
+        <wait time="30" stepKey="waitForShippingSummary"/>
         <see selector="{{CheckoutPaymentSection.orderSummarySubtotal}}" userInput="{{orderSummarySubTotal}}" stepKey="seeCorrectSubtotal"/>
         <see selector="{{CheckoutPaymentSection.orderSummaryShippingTotal}}" userInput="{{orderSummaryShippingTotal}}" stepKey="seeCorrectShipping"/>
         <see selector="{{CheckoutPaymentSection.orderSummaryTotal}}" userInput="{{orderSummaryTotal}}" stepKey="seeCorrectOrderTotal"/>

app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingSection.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+/**
+ * Copyright 2017 Adobe
+ * All Rights Reserved.
+ */
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -37,6 +37,7 @@
         <element name="next" type="button" selector="button.button.action.continue.primary" timeout="30"/>
         <element name="firstShippingMethod" type="radio" selector="//*[@id='checkout-shipping-method-load']//input[@class='radio']"/>
         <element name="defaultShipping" type="button" selector=".billing-address-details"/>
+        <element name="billingAddressDetails" type="text" selector=".billing-address-details"/>
         <element name="state" type="button" selector="//*[text()='Alabama']"/>
         <element name="stateInput" type="input" selector="input[name=region]"/>
         <element name="regionOptions" type="select" selector="select[name=region_id] option"/>

app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js

@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 
 /**
@@ -17,6 +17,7 @@ define([
     'use strict';
 
     var cacheKey = 'checkout-data',
+        storeCode = window.checkoutConfig.storeCode,
 
         /**
          * @param {Object} data
@@ -57,6 +58,20 @@ define([
             }
 
             return data;
+        },
+        getShippingAddressByStore = function (shippingAddressObj) {
+            if (!shippingAddressObj) {
+                return null;
+            }
+
+            return shippingAddressObj[storeCode];
+        },
+        setShippingAddressByStore = function (shippingAddressObj, data) {
+            if (!shippingAddressObj) {
+                shippingAddressObj = {};
+            }
+            shippingAddressObj[storeCode] = utils.filterFormData(data);
+            return shippingAddressObj;
         };
 
     return {
@@ -87,9 +102,9 @@ define([
          * @param {Object} data
          */
         setShippingAddressFromData: function (data) {
-            var obj = getData();
+            let obj = getData();
 
-            obj.shippingAddressFromData = utils.filterFormData(data);
+            obj.shippingAddressFromData = setShippingAddressByStore(obj.shippingAddressFromData, data);
             saveData(obj);
         },
 
@@ -99,7 +114,7 @@ define([
          * @return {*}
          */
         getShippingAddressFromData: function () {
-            return getData().shippingAddressFromData;
+            return getShippingAddressByStore(getData().shippingAddressFromData);
         },
 
         /**
@@ -110,7 +125,7 @@ define([
         setNewCustomerShippingAddress: function (data) {
             var obj = getData();
 
-            obj.newCustomerShippingAddress = data;
+            obj.newCustomerShippingAddress = setShippingAddressByStore(obj.newCustomerShippingAddress, data);
             saveData(obj);
         },
 
@@ -120,7 +135,7 @@ define([
          * @return {*}
          */
         getNewCustomerShippingAddress: function () {
-            return getData().newCustomerShippingAddress;
+            return getShippingAddressByStore(getData().newCustomerShippingAddress);
         },
 
         /**