Merge branch 'ACP2E-3402' of https://github.com/adobe-commerce-tier-4/magento2ce into PR-VK-2024-11-27-CE

Author: vkolesny

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);
         },
 
         /**

dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/checkout-data.test.js

@@ -0,0 +1,73 @@
+/**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+
+define([
+    'squire'
+], function (Squire) {
+    'use strict';
+
+    describe('Magento_Checkout/js/checkout-data', function () {
+        let checkoutData,
+            cacheKey = 'checkout-data',
+            testData = {
+                shippingAddressFromData: {base: {address1: 'address1'}}
+            },
+
+            /** Stub */
+            getStorageData = function () {
+                return function () {
+                    return testData;
+                };
+            },
+            injector = new Squire(),
+            mocks = {
+                'Magento_Customer/js/customer-data': {
+                    /** Method stub. */
+                    set: jasmine.createSpy(),
+                    get: jasmine.createSpy().and.callFake(getStorageData)
+                },
+                'jquery/jquery-storageapi': jasmine.createSpy(),
+                'mageUtils': jasmine.createSpy()
+            };
+
+        window.checkoutConfig = {
+            storeCode: 'base'
+        };
+
+        beforeEach(function (done) {
+            injector.mock(mocks);
+            injector.require([
+                'Magento_Checkout/js/checkout-data'
+            ], function (Constructor) {
+                checkoutData = Constructor;
+                done();
+            });
+        });
+
+        it('should save selected shipping address per website', function () {
+            checkoutData.setShippingAddressFromData({address1: 'address1'});
+            expect(mocks['Magento_Customer/js/customer-data'].set).
+                toHaveBeenCalledWith(cacheKey, jasmine.objectContaining(testData));
+        });
+
+        it('should get shipping address from data per website', function () {
+            let address = checkoutData.getShippingAddressFromData();
+
+            expect(address).toEqual(testData.shippingAddressFromData.base);
+        });
+
+        it('should save new customer shipping address per website', function () {
+            checkoutData.setNewCustomerShippingAddress({address1: 'address1'});
+            expect(mocks['Magento_Customer/js/customer-data'].set).
+                toHaveBeenCalledWith(cacheKey, jasmine.objectContaining(testData));
+        });
+
+        it('should get new customer shipping address from data per website', function () {
+            let address = checkoutData.getNewCustomerShippingAddress();
+
+            expect(address).toEqual(testData.shippingAddressFromData.base);
+        });
+    });
+});