Merge remote-tracking branch 'magento-l3/ACP2E-1762' into PR-L3-21-02-2023

Author: mirceaRosmeteniuc

app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js

@@ -157,8 +157,14 @@
             this.sidebarShow();
             //this.loadArea(['header', 'sidebar','data'], true);
             this.dataShow();
-            this.loadArea(['header', 'data'], true);
-            location.reload();
+            this.loadArea(
+                ['header', 'data'],
+                true,
+                null,
+                function () {
+                    location.reload();
+                }
+            );
         },
 
         setCurrencyId: function (id) {
@@ -1164,7 +1170,7 @@
             }
         },
 
-        loadArea: function (area, indicator, params) {
+        loadArea: function (area, indicator, params, callback) {
             var deferred = new jQuery.Deferred();
             var url = this.loadBaseUrl;
             if (area) {
@@ -1183,6 +1189,9 @@
                     onSuccess: function (transport) {
                         var response = transport.responseText.evalJSON();
                         this.loadAreaResponseHandler(response);
+                        if (callback instanceof Function) {
+                            callback();
+                        }
                         deferred.resolve();
                     }.bind(this)
                 });

dev/tests/js/jasmine/tests/app/code/Magento/Sales/adminhtml/js/order/create/scripts.test.js

@@ -160,6 +160,16 @@ define([
             jQueryAjax = undefined;
         });
 
+        it('test that setStoreId calls loadArea with a callback', function () {
+            init();
+            spyOn(order, 'loadArea').and.callFake(function () {
+                expect(arguments.length).toEqual(4);
+                expect(arguments[3] instanceof Function).toBeTrue();
+            });
+            order.setStoreId('id');
+            expect(order.loadArea).toHaveBeenCalled();
+        });
+
         describe('Testing the process customer group change', function () {
             it('and confirm method is called', function () {
                 init();