Merge branch 'release/3.9.0'

Endereco · Aug 29, 2022 · b94f819 · b94f819
2 parents 981ed5b + 19b185c
commit b94f819
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/Resources/views/frontend/_public/src/js/endereco.min.js b/Resources/views/frontend/_public/src/js/endereco.min.js
diff --git a/Resources/views/frontend/index/header.tpl b/Resources/views/frontend/index/header.tpl
@@ -181,6 +181,12 @@
                         window.EnderecoIntegrator.subdivisionMapping = JSON.parse('{$endereco_subdivision_code2id_mapping}');
                         window.EnderecoIntegrator.subdivisionMappingReverse = JSON.parse('{$endereco_subdivision_id2code_mapping}');
 
+
+                        // Execute all function that have been called throughout the page.
+                        window.EnderecoIntegrator.onLoad.forEach(function (callback) {
+                            callback();
+                        });
+
                         window.EnderecoIntegrator.ready = true;
                         clearInterval($interval);
                     }

diff --git a/build-shopware5-client.sh b/build-shopware5-client.sh
@@ -38,7 +38,7 @@ find ./EnderecoAMS -type f -exec sed -i 's/endereco_order_billingamsstatus/ender
 find ./EnderecoAMS -type f -exec sed -i 's/endereco_order_shippingamsstatus/endereco_order_swshippingamsstatus/g' {} \;
 
 find ./EnderecoAMS -type f -exec rename 's/EnderecoShopware5Client/EnderecoAMS/g' {} \;
-zip -r EnderecoAMS-$branch.zip EnderecoAMS
+zip -r ../EnderecoAMS-$branch.zip EnderecoAMS
 rm -rf EnderecoAMS
 
 
@@ -56,5 +56,5 @@ rm -f EnderecoShopware5Client/webpack.config.js
 rm -f EnderecoShopware5Client/docker-compose.yml
 rm -f EnderecoShopware5Client/build-shopware5-client.sh
 
-zip -r EnderecoShopware5Client-$branch.zip EnderecoShopware5Client
+zip -r ../EnderecoShopware5Client-$branch.zip EnderecoShopware5Client
 rm -rf EnderecoShopware5Client
diff --git a/endereco.js b/endereco.js
@@ -295,7 +295,4 @@ window.EnderecoIntegrator.waitUntilReady().then(function () {
 
 if (!window.EnderecoIntegrator.onLoad) {
     window.EnderecoIntegrator.onLoad = [];
-}
-window.EnderecoIntegrator.onLoad.push( function() {
-    window.EnderecoIntegrator.config.apiUrl = "https://"+window.location.hostname+"/bundles/enderecoshopware6clientstore/io.php";
-});
+}