Skip to content

Commit

Permalink
closes #1847 for magento 2.3.6-p1
Browse files Browse the repository at this point in the history
  • Loading branch information
gonzaloebiz committed Oct 9, 2023
1 parent 409f97d commit 661ff37
Show file tree
Hide file tree
Showing 19 changed files with 521 additions and 39 deletions.
6 changes: 5 additions & 1 deletion Block/Subscribe.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,8 @@ 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]);
}
}
40 changes: 40 additions & 0 deletions Controller/Subscriber/Subscribe.php
Original file line number Diff line number Diff line change
@@ -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();
}
}
3 changes: 2 additions & 1 deletion Controller/WebHook/Index.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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());
Expand Down
6 changes: 4 additions & 2 deletions Cron/Webhook.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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)));
Expand Down
25 changes: 18 additions & 7 deletions Helper/Data.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
const XML_POPUP_FORM = 'mailchimp/general/popup_form';
const XML_POPUP_URL = 'mailchimp/general/popup_url';
const XML_CLEAN_ERROR_MONTHS = 'mailchimp/ecommerce/clean_errors_months';
const XML_FOOTER_PHONE = 'mailchimp/general/footer_phone';
const XML_FOOTER_MAP = 'mailchimp/general/footer_phone_map';

const ORDER_STATE_OK = 'complete';

Expand Down Expand Up @@ -419,7 +421,7 @@ private function getAddressAtt()
$ret[$item] = [
'attCode' => $item,
'isDate' => false,
'isAddress' => false,
'isAddress' => true,
'options' => []
];
}
Expand Down Expand Up @@ -780,8 +782,14 @@ private function _getAddressValues(\Magento\Customer\Model\Address\AbstractAddre
public function getMergeVarsBySubscriber(\Magento\Newsletter\Model\Subscriber $subscriber, $email = null)
{
$mergeVars = [];
$storeId = $subscriber->getStoreId();
$webSiteId = $this->getWebsiteId($subscriber->getStoreId());
$webSiteId = $subscriber->getStoreId();
if ($this->getConfigValue(self::XML_FOOTER_PHONE, $webSiteId, "websites")) {
$phone_field = $this->getConfigValue(self::XML_FOOTER_MAP , $webSiteId, "websites");
$phone = $subscriber->getPhone();
if ($phone_field && $phone) {
$mergeVars[$phone_field] = $phone;
}
}
if (!$email) {
$email = $subscriber->getEmail();
}
Expand All @@ -793,7 +801,7 @@ public function getMergeVarsBySubscriber(\Magento\Newsletter\Model\Subscriber $s
$customer->setWebsiteId($webSiteId);
$customer->loadByEmail($email);
if ($customer->getData('email') == $email) {
$mergeVars = $this->getMergeVars($customer, $storeId);
$mergeVars = array_merge($mergeVars,$this->getMergeVars($customer, $customer->getStoreId()));
}
} catch (\Exception $e) {
$this->log($e->getMessage());
Expand Down Expand Up @@ -1031,12 +1039,15 @@ public function deleteWebHook($apikey, $listId)
public function loadListSubscribers($listId, $mail)
{
$collection = null;
$websiteIds = [];
$storeIds = $this->getMagentoStoreIdsByListId($listId);
$storeIds[] = 0;
if (count($storeIds) > 0) {
foreach($storeIds as $storeId) {
$websiteIds[] =$this->_storeManager->getStore($storeId)->getWebsiteId();
}
if (count($websiteIds) > 0) {
$collection = $this->_subscriberCollection->create();
$collection
->addFieldToFilter('store_id', ['in'=>$storeIds])
->addFieldToFilter('store_id', ['in'=>$websiteIds])
->addFieldToFilter('subscriber_email', ['eq'=>$mail]);
}
return $collection;
Expand Down
53 changes: 53 additions & 0 deletions Model/Config/Source/Maps.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<?php

namespace Ebizmarts\MailChimp\Model\Config\Source;

use Magento\Framework\Data\OptionSourceInterface;
use Ebizmarts\MailChimp\Helper\Data as MailchimpHelper;
use Magento\Framework\App\RequestInterface;
class Maps implements OptionSourceInterface
{
private $options = null;
public function __construct(
RequestInterface $request,
MailchimpHelper $helper
)
{
$storeId = (int) $request->getParam("store", 0);
if ($request->getParam('website', 0)) {
$scope = 'website';
$storeId = $request->getParam('website', 0);
} elseif ($request->getParam('store', 0)) {
$scope = 'stores';
$storeId = $request->getParam('store', 0);
} else {
$scope = 'default';
}

if ($helper->getApiKey($storeId, $scope)) {
try {
$this->options = $helper->getApi($storeId, $scope)->lists->mergeFields->getAll(
$helper->getConfigValue(\Ebizmarts\MailChimp\Helper\Data::XML_PATH_LIST, $storeId, $scope),
null,
null,
MailchimpHelper::MAX_MERGEFIELDS
);
} catch (\Mailchimp_Error $e) {
$helper->log($e->getFriendlyMessage());
}
}

}
public function toOptionArray()
{
if (is_array($this->options)&&key_exists('merge_fields', $this->options)) {
$rc = [];
foreach ($this->options['merge_fields'] as $item) {
$rc[$item['tag']] = $item['tag'] . ' (' . $item['name'] . ' : ' . $item['type'] . ')';
}
} else {
$rc[] = ['value' => 0, 'label' => __('---No Data---')];
}
return $rc;
}
}
Loading

0 comments on commit 661ff37

Please sign in to comment.