Merge branch 'release/1.1.0'

Endereco · Oct 5, 2022 · 967e3f6 · 967e3f6
2 parents ae0232e + 06c338e
commit 967e3f6
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 23 deletions.
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "endereco/endereco-shopware6-client",
     "description": "Checks customers' addresses in real time. In case of errors, the customer is prompted to correct his address before sending via warning windows and error messages.",
-    "version": "1.0.7",
+    "version": "1.1.0",
     "type": "shopware-platform-plugin",
     "license": "AGPL-3.0-or-later",
     "authors": [

diff --git a/src/EnderecoShopware6Client.php b/src/EnderecoShopware6Client.php
@@ -6,7 +6,7 @@
 use Shopware\Core\Framework\Plugin\Context\UninstallContext;
 use Shopware\Core\Framework\Plugin\Context\InstallContext;
 use Shopware\Core\Framework\Plugin\Context\UpdateContext;
-use Shopware\Core\Framework\Log\LoggerFactory;
+
 class EnderecoShopware6Client extends Plugin
 {
 

diff --git a/src/Resources/config/config.xml b/src/Resources/config/config.xml
@@ -29,8 +29,20 @@
             <label>Check API connection</label>
             <label lang="de-DE">API Verbindung prüfen</label>
         </component>
+    </card>
 
+    <card>
+        <title>Sales-Channel Settings</title>
+        <title lang="de-DE">Verkaufskanaleinstellungen</title>
 
+        <input-field type="bool">
+            <name>enderecoActiveInThisChannel</name>
+            <label>Active</label>
+            <label lang="de-DE">Aktiv</label>
+            <defaultValue>true</defaultValue>
+            <helpText>If this toggle is set to active, then the plugin will be activated in this sales channel.</helpText>
+            <helpText lang="de-DE">Mit dieser Einstellung kann man das Plugin in bestimmten Verkaufkanälen deaktivieren.</helpText>
+        </input-field>
     </card>
 
     <card>

diff --git a/src/Resources/views/storefront/base.html.twig b/src/Resources/views/storefront/base.html.twig
@@ -2,10 +2,12 @@
 
 {% block base_body_script %}
     {{ parent() }}
-    <script
-            defer
-            async
-            src="{{ asset('bundles/enderecoshopware6client/endereco.min.js') }}?var={{ page.endereco_config.enderecoVersion }}"
-            onload="if(typeof enderecoLoadAMSConfig === 'function'){enderecoLoadAMSConfig();}"
-    ></script>
+    {% if page.endereco_config.pluginActive %}
+        <script
+                defer
+                async
+                src="{{ asset('bundles/enderecoshopware6client/endereco.min.js') }}?var={{ page.endereco_config.enderecoVersion }}"
+                onload="if(typeof enderecoLoadAMSConfig === 'function'){enderecoLoadAMSConfig();}"
+        ></script>
+    {% endif %}
 {% endblock %}
diff --git a/src/Resources/views/storefront/component/address/address-form.html.twig b/src/Resources/views/storefront/component/address/address-form.html.twig
@@ -2,19 +2,21 @@
 
 {% block component_address_form_address_fields %}
     {{ parent() }}
-    <input
-            type="hidden"
-            name="endereco_data_marker" value="ams"
-            data-container-selector = "form"
-            data-container-type = "form"
-            data-used-prefix = "{{ prefix }}"
-            data-has-object = "no"
-            data-name = ""
-            data-type = ""
-            data-country-code-selector = "{{ prefix }}[countryId]"
-            data-subdivision-code-selector = "{{ prefix }}[countryStateId]"
-            data-postal-code-selector = "{{ prefix }}[zipcode]"
-            data-locality-selector = "{{ prefix }}[city]"
-            data-street-full-selector = "{{ prefix }}[street]"
-    >
+    {% if page.endereco_config.pluginActive %}
+        <input
+                type="hidden"
+                name="endereco_data_marker" value="ams"
+                data-container-selector = "form"
+                data-container-type = "form"
+                data-used-prefix = "{{ prefix }}"
+                data-has-object = "no"
+                data-name = ""
+                data-type = ""
+                data-country-code-selector = "{{ prefix }}[countryId]"
+                data-subdivision-code-selector = "{{ prefix }}[countryStateId]"
+                data-postal-code-selector = "{{ prefix }}[zipcode]"
+                data-locality-selector = "{{ prefix }}[city]"
+                data-street-full-selector = "{{ prefix }}[street]"
+        >
+    {% endif %}
 {% endblock %}
diff --git a/src/Resources/views/storefront/layout/meta.html.twig b/src/Resources/views/storefront/layout/meta.html.twig
@@ -1,6 +1,7 @@
 {% sw_extends '@Storefront/storefront/layout/meta.html.twig' %}
 
 {% block layout_head_meta_tags %}
+  {% if page.endereco_config.pluginActive %}
   <script>
     if (undefined === window.EnderecoIntegrator) {
       window.EnderecoIntegrator = {};
@@ -224,5 +225,7 @@
       }, 1);
     }
   </script>
+  {% endif %}
+
   {{ parent() }}
 {% endblock %}
diff --git a/src/Service/AddDataToPage.php b/src/Service/AddDataToPage.php
@@ -80,6 +80,8 @@ public function addEnderecoConfigToPage(GenericPageLoadedEvent $event): void
         $configContainer->enderecoAllowCloseIcon = $this->systemConfigService->get('EnderecoShopware6Client.config.enderecoAllowCloseIcon', $salesChannelId);
         $configContainer->enderecoConfirmWithCheckbox = $this->systemConfigService->get('EnderecoShopware6Client.config.enderecoConfirmWithCheckbox', $salesChannelId);
 
+        $configContainer->pluginActive = $this->systemConfigService->get('EnderecoShopware6Client.config.enderecoActiveInThisChannel', $salesChannelId);
+
         $countries = $this->countryRepository->search(new Criteria(), $context);
 
         $mapping = [];