closes #895 for magento 2.2

mailchimp · Oct 11, 2019 · 60e1f14 · 60e1f14
1 parent 2f54666
commit 60e1f14
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/Block/Mailchimpjs.php b/Block/Mailchimpjs.php
@@ -13,6 +13,8 @@
 
 namespace Ebizmarts\MailChimp\Block;
 
+use Magento\Store\Model\ScopeInterface;
+
 class Mailchimpjs extends \Magento\Framework\View\Element\Template
 {
     /**
@@ -44,6 +46,19 @@ public function __construct(
     public function getJsUrl()
     {
         $storeId = $this->_storeManager->getStore()->getId();
-        return $this->_helper->getJsUrl($storeId);
+
+        $url = $this->_scopeConfig->getValue(
+            \Ebizmarts\MailChimp\Helper\Data::XML_MAILCHIMP_JS_URL, ScopeInterface::SCOPE_STORES,
+            $storeId
+        );
+        $active = $this->_scopeConfig->getValue(
+            \Ebizmarts\MailChimp\Helper\Data::XML_PATH_ACTIVE, ScopeInterface::SCOPE_STORES,
+            $storeId
+        );
+        if ($active && !$url) {
+            $url = $this->_helper->getJsUrl($storeId);
+        }
+
+        return $url;
     }
 }
diff --git a/etc/di.xml b/etc/di.xml
@@ -11,6 +11,11 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Ebizmarts\MailChimp\Block\Mailchimpjs">
+        <arguments>
+            <argument name="helper" xsi:type="object">Ebizmarts\MailChimp\Helper\Data\Proxy</argument>
+        </arguments>
+    </type>
     <type name="Magento\Quote\Model\Quote">
         <plugin name="mailchimp-save-quote" type="Ebizmarts\MailChimp\Model\Plugin\Quote" sortOrder="10"/>
     </type>