fix the store id #1847 for magento 2.3.6-p1

mailchimp · Oct 23, 2023 · 9baa66a · 9baa66a
1 parent 6cfe89a
commit 9baa66a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 18 deletions.
diff --git a/Model/Plugin/Subscriber.php b/Model/Plugin/Subscriber.php
@@ -66,7 +66,7 @@ public function beforeUnsubscribeCustomerById(
         \Magento\Newsletter\Model\Subscriber $subscriber,
                                              $customerId
     ) {
-        $storeId = $this->getStoreIdFromSubscriber($subscriber);
+        $storeId = $this->_storeManager->getStore()->getId();
         if ($this->_helper->isMailChimpEnabled($storeId)) {
             if (!$this->_helper->getConfigValue(\Ebizmarts\MailChimp\Helper\Data::XML_MAGENTO_MAIL, $storeId)) {
                 $subscriber->setImportMode(true);
@@ -101,8 +101,7 @@ public function beforeSubscribeCustomerById(
         \Magento\Newsletter\Model\Subscriber $subscriber,
                                              $customerId
     ) {
-
-        $storeId = $this->getStoreIdFromSubscriber($subscriber);
+        $storeId = $this->_storeManager->getStore()->getId();
         if ($this->_helper->isMailChimpEnabled($storeId)) {
             $subscriber->loadByCustomerId($customerId);
             if (!$subscriber->isSubscribed()) {
@@ -154,7 +153,6 @@ public function beforeSubscribe(
         \Magento\Newsletter\Model\Subscriber $subscriber,
                                              $email
     ) {
-        //$websiteId = $this->getStoreIdFromSubscriber($subscriber);
         $storeId = $this->_storeManager->getStore()->getId();
         if ($this->_helper->isMailChimpEnabled($storeId)) {
             if (!$this->_helper->getConfigValue(\Ebizmarts\MailChimp\Helper\Data::XML_MAGENTO_MAIL, $storeId)) {
@@ -203,7 +201,7 @@ public function beforeSubscribe(
     public function beforeUnsubscribe(
         \Magento\Newsletter\Model\Subscriber $subscriber
     ) {
-        $storeId = $this->getStoreIdFromSubscriber($subscriber);
+        $storeId = $this->_storeManager->getStore()->getId();
         if ($this->_helper->isMailChimpEnabled($storeId)) {
             if (!$this->_helper->getConfigValue(\Ebizmarts\MailChimp\Helper\Data::XML_MAGENTO_MAIL, $storeId)) {
                 $subscriber->setImportMode(true);
@@ -230,8 +228,7 @@ public function beforeUnsubscribe(
     public function afterDelete(
         \Magento\Newsletter\Model\Subscriber $subscriber
     ) {
-
-        $storeId = $this->getStoreIdFromSubscriber($subscriber);
+        $storeId = $this->_storeManager->getStore()->getId();
         if ($this->_helper->isMailChimpEnabled($storeId)) {
             $api = $this->_helper->getApi($storeId);
             if ($subscriber->isSubscribed()) {
@@ -254,13 +251,4 @@ public function afterDelete(
         }
         return null;
     }
-
-    /**
-     * @param \Magento\Newsletter\Model\Subscriber $subscriber
-     * @return int
-     */
-    protected function getStoreIdFromSubscriber(\Magento\Newsletter\Model\Subscriber $subscriber)
-    {
-        return $subscriber->getStoreId();
-    }
 }
diff --git a/view/frontend/templates/footerwphone.phtml b/view/frontend/templates/footerwphone.phtml
@@ -19,9 +19,9 @@
                                data-validate="{required:true, 'validate-email':true}"
                         />
                         <input name="phone" type="tel" id="newsletter"
-                               placeholder="<?= $block->escapeHtml(__('Enter your phone')) ?>"
+                               placeholder="<?= $block->escapeHtml(__('Enter your SMS phone')) ?>"
                                data-mage-init='{"mage/trim-input":{}}'
-                               data-validate="{required:true, 'validate-phoneStrict':false}"
+                               data-validate="{required:false, 'validate-phoneStrict':false}"
                         />
                     </label>
                 </div>