closes #1847 for magento 2.3.6-p1

Block/Subscribe.php

@@ -2,6 +2,9 @@
 
 namespace Ebizmarts\MailChimp\Block;
 
+use Magento\Customer\Model\Session;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Model\CustomerFactory;
 use Magento\Framework\View\Element\Template;
 use \Ebizmarts\MailChimp\Helper\Data as MailchimpHelper;
 
@@ -15,27 +18,66 @@ class Subscribe extends \Magento\Newsletter\Block\Subscribe
      * @var MailchimpHelper
      */
     protected $helper;
+    /**
+     * @var Session
+     */
+    private $customerSession;
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepo;
+    /**
+     * @var CustomerFactory
+     */
+    private $customerFactory;
 
     /**
      * @param Template\Context $context
      * @param MailchimpHelper $helper
+     * @param Session $customerSession
+     * @param CustomerRepositoryInterface $customerRepo
+     * @param CustomerFactory $customerFactory
      * @param array $data
      */
     public function __construct(
         Template\Context $context,
         MailchimpHelper $helper,
+        Session $customerSession,
+        CustomerRepositoryInterface $customerRepo,
+        CustomerFactory $customerFactory,
         array $data = []
     )
     {
         parent::__construct($context, $data);
         $this->context = $context;
         $this->helper = $helper;
+        $this->customerSession = $customerSession;
+        $this->customerRepo = $customerRepo;
+        $this->customerFactory = $customerFactory;
     }
 
     public function getPopupUrl()
     {
-
         $storeId = $this->context->getStoreManager()->getStore()->getId();
         return $this->helper->getConfigValue(MailchimpHelper::XML_POPUP_URL,$storeId);
     }
-}
+    public function getFormActionUrl()
+    {
+        return $this->getUrl('mailchimp/subscriber/subscribe', ['_secure' => true]);
+    }
+    public function showMobilePhone()
+    {
+        $ret = true;
+        if ($this->customerSession->getCustomerId()) {
+            /**
+             * @var $customer \Magento\Customer\Model\Customer
+             */
+            $customer = $this->customerFactory->create()->load($this->customerSession->getCustomerId());
+            $mobilePhone = $customer->getData('mobile_phone');
+            if ($mobilePhone&&$mobilePhone!='') {
+                $ret = false;
+            }
+        }
+        return $ret;
+    }
+}

Controller/Subscriber/Subscribe.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace Ebizmarts\MailChimp\Controller\Subscriber;
+
+use Magento\Customer\Api\AccountManagementInterface as CustomerAccountManagement;
+use Magento\Customer\Model\Session;
+use Magento\Customer\Model\Url as CustomerUrl;
+use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\Validator\EmailAddress as EmailValidator;
+use Magento\Newsletter\Controller\Subscriber\NewAction as SubscriberController;
+use Magento\Newsletter\Model\SubscriberFactory;
+use Magento\Store\Model\StoreManagerInterface;
+
+class Subscribe extends SubscriberController implements HttpPostActionInterface
+{
+    private $session;
+    public function __construct(
+        Context $context,
+        SubscriberFactory $subscriberFactory,
+        Session $customerSession,
+        StoreManagerInterface $storeManager,
+        CustomerUrl $customerUrl,
+        CustomerAccountManagement $customerAccountManagement,
+        EmailValidator $emailValidator = null
+    )
+    {
+        $this->session = $customerSession;
+        parent::__construct($context, $subscriberFactory, $customerSession, $storeManager, $customerUrl, $customerAccountManagement,  $emailValidator);
+    }
+
+    public function execute()
+    {
+        if($this->getRequest()->isPost() && $this->getRequest()->getPost('phone')) {
+            $phone = (string)$this->getRequest()->getPost('phone');
+            $this->session->setPhone($phone);
+        }
+        return parent::execute();
+    }
+}

Controller/WebHook/Index.php

@@ -52,7 +52,6 @@ public function __construct(
         \Ebizmarts\MailChimp\Model\MailChimpWebhookRequestFactory $chimpWebhookRequestFactory,
         \Magento\Framework\HTTP\PhpEnvironment\RemoteAddress $remoteAddress
     ) {
-
         parent::__construct($context);
         $this->_resultFactory              = $context->getResultFactory();
         $this->_helper                      = $helper;
@@ -111,6 +110,8 @@ public function execute()
                     $this->_helper->log($request['data']);
                     $result->setHttpResponseCode(403);
                 }
+            } else {
+                $this->_helper->log("The two way is off");
             }
         } else {
             $this->_helper->log('An empty request comes from ip: '.$this->_remoteAddress->getRemoteAddress());

Cron/Webhook.php

@@ -150,7 +150,8 @@ protected function _subscribe($data)
             if (count($storeIds) > 0) {
                 foreach ($storeIds as $storeId) {
                     $sub = $this->_subscriberFactory->create();
-                    $sub->setStoreId($storeId);
+                    $websiteId = $this->storeManager->getStore($storeId)->getWebsiteId();
+                    $sub->setStoreId($websiteId);
                     $sub->setSubscriberEmail($email);
                     $this->_subscribeMember($sub, \Magento\Newsletter\Model\Subscriber::STATUS_SUBSCRIBED);
                 }
@@ -247,7 +248,8 @@ protected function _profile($data)
 
                 $stores = $this->_helper->getMagentoStoreIdsByListId($listId);
                 if (count($stores)) {
-                    $subscriber->setStoreId($stores[0]);
+                    $websiteId = $this->storeManager->getStore($stores[0])->getWebsiteId();
+                    $subscriber->setStoreId($websiteId);
                     try {
                         $api = $this->_helper->getApi($stores[0]);
                         $member = $api->lists->members->get($listId, hash('md5', strtolower($email)));