diff --git a/Block/Subscribe.php b/Block/Subscribe.php index 7c54c05b..b43eaa3d 100644 --- a/Block/Subscribe.php +++ b/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,26 +18,46 @@ 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); } @@ -42,4 +65,19 @@ 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; + } } diff --git a/Helper/Data.php b/Helper/Data.php index 98db7953..6d90e219 100755 --- a/Helper/Data.php +++ b/Helper/Data.php @@ -11,11 +11,31 @@ namespace Ebizmarts\MailChimp\Helper; +use Magento\Customer\Api\Data\CustomerInterface; use Magento\Framework\App\ResourceConnection; -use Magento\Framework\Exception\ValidatorException; -use Magento\Store\Model\Store; -use Symfony\Component\Config\Definition\Exception\Exception; - +use Magento\Framework\App\DeploymentConfig; +use Magento\Framework\App\Cache\TypeListInterface; +use Magento\Framework\App\Helper\Context; +use Magento\Framework\Stdlib\DateTime\DateTime; +use Magento\Framework\Locale\Resolver; +use Magento\Framework\Serialize\Serializer\Json as JsonSerializer; +use Magento\Framework\Module\ModuleList\Loader; +use Magento\Framework\Encryption\Encryptor; +use Magento\Directory\Api\CountryInformationAcquirerInterface; +use Magento\Directory\Model\CountryFactory; +use Magento\Customer\Model\Session; +use Magento\Customer\Api\CustomerRepositoryInterface; +use Magento\Customer\Model\CustomerFactory; +use Magento\Customer\Model\ResourceModel\Attribute\CollectionFactory as AttributeCollectionFactory; +use Magento\Customer\Model\ResourceModel\Customer\CollectionFactory as CustomerCollectionFactory; +use Magento\Newsletter\Model\ResourceModel\Subscriber\CollectionFactory as SubscriberCollectionFactory; +use Magento\Store\Model\StoreManagerInterface; +use Magento\Config\Model\ResourceModel\Config; +use Ebizmarts\MailChimp\Model\Logger\Logger; +use Ebizmarts\MailChimp\Model\MailChimpSyncBatches; +use Ebizmarts\MailChimp\Model\MailChimpStoresFactory; +use Ebizmarts\MailChimp\Model\MailChimpStores; +use Ebizmarts\MailChimp\Model\MailChimpInterestGroupFactory; class Data extends \Magento\Framework\App\Helper\AbstractHelper { const XML_PATH_ACTIVE = 'mailchimp/general/active'; @@ -98,17 +118,13 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper protected $counters = []; /** - * @var \Magento\Store\Model\StoreManagerInterface + * @var StoreManagerInterface */ private $_storeManager; /** - * @var \Ebizmarts\MailChimp\Model\Logger\Logger + * @var Logger */ private $_mlogger; - /** - * @var \Magento\Customer\Model\GroupRegistry - */ - private $_groupRegistry; /** * @var \Magento\Framework\App\Config\ScopeConfigInterface */ @@ -118,184 +134,164 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper */ protected $_request; /** - * @var \Magento\Framework\App\State - */ - private $_state; - /** - * @var \Magento\Framework\Module\ModuleList\Loader + * @var Loader */ private $_loader; /** - * @var \Magento\Config\Model\ResourceModel\Config + * @var Config */ private $_config; /** * @var \Mailchimp */ private $_api; - /** - * @var \Magento\Customer\Model\ResourceModel\Customer\CustomerRepository - */ - private $_customer; - /** - * @var \Ebizmarts\MailChimp\Model\MailChimpSyncBatches + * @var MailChimpSyncBatches */ private $_syncBatches; /** - * @var \Ebizmarts\MailChimp\Model\MailChimpStoresFactory + * @var MailChimpStoresFactory */ private $_mailChimpStoresFactory; /** - * @var \Ebizmarts\MailChimp\Model\MailChimpStores + * @var MailChimpStores */ private $_mailChimpStores; /** - * @var \Magento\Framework\Encryption\Encryptor + * @var Encryptor */ private $_encryptor; /** - * @var \Magento\Newsletter\Model\ResourceModel\Subscriber\CollectionFactory + * @var SubscriberCollectionFactory */ private $_subscriberCollection; /** - * @var \Magento\Customer\Model\ResourceModel\Customer\CollectionFactory + * @var CustomerCollectionFactory */ private $_customerCollection; - private $_addressRepositoryInterface; - /** - * @var \Magento\Framework\DB\Adapter\AdapterInterface - */ - private $connection; /** - * @var \Magento\Framework\App\ResourceConnection + * @var ResourceConnection */ private $_resource; /** - * @var \Magento\Framework\App\Cache\TypeListInterface + * @var TypeListInterface */ private $_cacheTypeList; /** - * @var \Magento\Customer\Model\ResourceModel\Attribute\CollectionFactory + * @var AttributeCollectionFactory */ private $_attCollection; /** - * @var \Magento\Customer\Model\CustomerFactory + * @var CustomerRepositoryInterface */ - protected $_customerFactory; + protected $_customerRepo; /** - * @var \Magento\Directory\Api\CountryInformationAcquirerInterface + * @var CountryInformationAcquirerInterface */ protected $_countryInformation; /** - * @var \Ebizmarts\MailChimp\Model\MailChimpInterestGroupFactory + * @var MailChimpInterestGroupFactory */ protected $_interestGroupFactory; /** - * @var \Magento\Framework\Stdlib\DateTime\DateTime + * @var DateTime */ protected $_date; /** - * @var \Magento\Framework\App\DeploymentConfig + * @var DeploymentConfig */ protected $_deploymentConfig; /** - * @var \Magento\Framework\Serialize\Serializer\Json + * @var JsonSerializer */ protected $_serializer; /** - * @var \Magento\Directory\Model\CountryFactory + * @var Session + */ + protected $customerSession; + /** + * @var CountryFactory */ protected $countryFactory; /** - * @var \Magento\Framework\Locale\Resolver + * @var Resolver */ protected $resolver; private $customerAtt = null; private $addressAtt = null; private $_mapFields = null; + private $customerFactory; /** - * @param \Magento\Framework\App\Helper\Context $context - * @param \Magento\Store\Model\StoreManagerInterface $storeManager - * @param \Ebizmarts\MailChimp\Model\Logger\Logger $logger - * @param \Magento\Customer\Model\GroupRegistry $groupRegistry - * @param \Magento\Framework\App\State $state - * @param \Magento\Framework\Module\ModuleList\Loader $loader - * @param \Magento\Config\Model\ResourceModel\Config $config + * @param Context $context + * @param StoreManagerInterface $storeManager + * @param Logger $logger + * @param Loader $loader + * @param Config $config * @param \Mailchimp $api - * @param \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList - * @param \Magento\Customer\Model\ResourceModel\CustomerRepository $customer - * @param \Ebizmarts\MailChimp\Model\MailChimpSyncBatches $syncBatches - * @param \Ebizmarts\MailChimp\Model\MailChimpStoresFactory $mailChimpStoresFactory - * @param \Ebizmarts\MailChimp\Model\MailChimpStores $mailChimpStores - * @param \Magento\Customer\Model\ResourceModel\Attribute\CollectionFactory $attCollection - * @param \Magento\Framework\Encryption\Encryptor $encryptor - * @param \Magento\Newsletter\Model\ResourceModel\Subscriber\CollectionFactory $subscriberCollection - * @param \Magento\Customer\Model\ResourceModel\Customer\CollectionFactory $customerCollection - * @param \Magento\Customer\Api\AddressRepositoryInterface $addressRepositoryInterface - * @param \Magento\Customer\Model\CustomerFactory $customerFactory - * @param \Magento\Directory\Api\CountryInformationAcquirerInterface $countryInformation + * @param TypeListInterface $cacheTypeList + * @param MailChimpSyncBatches $syncBatches + * @param MailChimpStoresFactory $mailChimpStoresFactory + * @param MailChimpStores $mailChimpStores + * @param AttributeCollectionFactory $attCollection + * @param Encryptor $encryptor + * @param SubscriberCollectionFactory $subscriberCollection + * @param CustomerCollectionFactory $customerCollection + * @param CustomerRepositoryInterface $customerRepository + * @param CountryInformationAcquirerInterface $countryInformation * @param ResourceConnection $resource - * @param \Ebizmarts\MailChimp\Model\MailChimpInterestGroupFactory $interestGroupFactory - * @param \Magento\Framework\Serialize\Serializer\Json $serializer - * @param \Magento\Framework\App\DeploymentConfig $deploymentConfig - * @param \Magento\Framework\Stdlib\DateTime\DateTime $date - * @param \Magento\Directory\Model\CountryFactory $countryFactory - * @param \Magento\Framework\Locale\Resolver $resolver + * @param MailChimpInterestGroupFactory $interestGroupFactory + * @param JsonSerializer $serializer + * @param DeploymentConfig $deploymentConfig + * @param DateTime $date + * @param CountryFactory $countryFactory + * @param Resolver $resolver + * @param Session $customerSession */ public function __construct( - \Magento\Framework\App\Helper\Context $context, - \Magento\Store\Model\StoreManagerInterface $storeManager, - \Ebizmarts\MailChimp\Model\Logger\Logger $logger, - \Magento\Customer\Model\GroupRegistry $groupRegistry, - \Magento\Framework\App\State $state, - \Magento\Framework\Module\ModuleList\Loader $loader, - \Magento\Config\Model\ResourceModel\Config $config, + Context $context, + StoreManagerInterface $storeManager, + Logger $logger, + Loader $loader, + Config $config, \Mailchimp $api, - \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList, - \Magento\Customer\Model\ResourceModel\CustomerRepository $customer, - \Ebizmarts\MailChimp\Model\MailChimpSyncBatches $syncBatches, - \Ebizmarts\MailChimp\Model\MailChimpStoresFactory $mailChimpStoresFactory, - \Ebizmarts\MailChimp\Model\MailChimpStores $mailChimpStores, - \Magento\Customer\Model\ResourceModel\Attribute\CollectionFactory $attCollection, - \Magento\Framework\Encryption\Encryptor $encryptor, - \Magento\Newsletter\Model\ResourceModel\Subscriber\CollectionFactory $subscriberCollection, - \Magento\Customer\Model\ResourceModel\Customer\CollectionFactory $customerCollection, - \Magento\Customer\Api\AddressRepositoryInterface $addressRepositoryInterface, - \Magento\Customer\Model\CustomerFactory $customerFactory, - \Magento\Directory\Api\CountryInformationAcquirerInterface $countryInformation, - \Magento\Framework\App\ResourceConnection $resource, - \Ebizmarts\MailChimp\Model\MailChimpInterestGroupFactory $interestGroupFactory, - \Magento\Framework\Serialize\Serializer\Json $serializer, - \Magento\Framework\App\DeploymentConfig $deploymentConfig, - \Magento\Framework\Stdlib\DateTime\DateTime $date, - \Magento\Directory\Model\CountryFactory $countryFactory, - \Magento\Framework\Locale\Resolver $resolver + TypeListInterface $cacheTypeList, + MailChimpSyncBatches $syncBatches, + MailChimpStoresFactory $mailChimpStoresFactory, + MailChimpStores $mailChimpStores, + AttributeCollectionFactory $attCollection, + Encryptor $encryptor, + SubscriberCollectionFactory $subscriberCollection, + CustomerCollectionFactory $customerCollection, + CustomerRepositoryInterface $customerRepository, + CountryInformationAcquirerInterface $countryInformation, + ResourceConnection $resource, + MailChimpInterestGroupFactory $interestGroupFactory, + JsonSerializer $serializer, + DeploymentConfig $deploymentConfig, + DateTime $date, + CountryFactory $countryFactory, + Resolver $resolver, + Session $customerSession, + CustomerFactory $customerFactory ) { - $this->_storeManager = $storeManager; $this->_mlogger = $logger; - $this->_groupRegistry = $groupRegistry; $this->_scopeConfig = $context->getScopeConfig(); $this->_request = $context->getRequest(); - $this->_state = $state; $this->_loader = $loader; $this->_config = $config; $this->_api = $api; - $this->_customer = $customer; $this->_syncBatches = $syncBatches; $this->_mailChimpStores = $mailChimpStores; $this->_mailChimpStoresFactory = $mailChimpStoresFactory; $this->_encryptor = $encryptor; $this->_subscriberCollection = $subscriberCollection; $this->_customerCollection = $customerCollection; - $this->_addressRepositoryInterface = $addressRepositoryInterface; $this->_resource = $resource; - $this->connection = $resource->getConnection(); $this->_cacheTypeList = $cacheTypeList; $this->_attCollection = $attCollection; - $this->_customerFactory = $customerFactory; + $this->_customerRepo = $customerRepository; $this->_countryInformation = $countryInformation; $this->_interestGroupFactory = $interestGroupFactory; $this->_serializer = $serializer; @@ -303,6 +299,8 @@ public function __construct( $this->_date = $date; $this->countryFactory = $countryFactory; $this->resolver = $resolver; + $this->customerSession = $customerSession; + $this->customerFactory = $customerFactory; parent::__construct($context); } @@ -793,18 +791,27 @@ public function getMergeVarsBySubscriber(\Magento\Newsletter\Model\Subscriber $s if (!$email) { $email = $subscriber->getEmail(); } - try { - /** - * @var $customer \Magento\Customer\Model\Customer - */ - $customer = $this->_customerFactory->create(); - $customer->setWebsiteId($webSiteId); - $customer->loadByEmail($email); - if ($customer->getData('email') == $email) { - $mergeVars = array_merge($mergeVars,$this->getMergeVars($customer, $customer->getStoreId())); + if ($this->customerSession->getCustomerId()) { + try { + /** + * @var $customer CustomerInterface + */ + //$customer = $this->_customerRepo->getById($this->customerSession->getCustomerId()); + $customer = $this->customerFactory->create()->load($this->customerSession->getCustomerId()); + $this->log("Customer ".$customer->getId()); + if ($customer->getData('mobile_phone')) { + $this->log($customer->getData('mobile_phone')); + } else { + $this->log('no mobile phone'); + } + if ($customer->getData('email') == $email) { + $mergeVars = array_merge($mergeVars, $this->getMergeVars($customer, $customer->getStoreId())); + } + } catch (\Exception $e) { + $this->log($e->getMessage()); } - } catch (\Exception $e) { - $this->log($e->getMessage()); + } else { + $this->log("Subscriber is not a customer"); } return $mergeVars; } diff --git a/Model/Plugin/SubscriptionManager.php b/Model/Plugin/SubscriptionManager.php index 020a45eb..5ea8f7d8 100644 --- a/Model/Plugin/SubscriptionManager.php +++ b/Model/Plugin/SubscriptionManager.php @@ -162,12 +162,10 @@ public function beforeSubscribe( $websiteId = (int)$this->_storeManager->getStore($storeId)->getWebsiteId(); $subscriber = $this->_subscriberFactory->create()->loadBySubscriberEmail($email, $websiteId); - $phones = $subscriber->getPhone(); - $phonec = $this->_customerSession->getPhone(); - if ($this->_customerSession->getPhone()) { $subscriber->setPhone($this->_customerSession->getPhone()); } + if ($this->_helper->isMailChimpEnabled($storeId)) { $api = $this->_helper->getApi($storeId); if ($this->_helper->isDoubleOptInEnabled($storeId)) { diff --git a/Observer/Subscriber/SaveBefore.php b/Observer/Subscriber/SaveBefore.php index fe0e6a03..a41ca31d 100644 --- a/Observer/Subscriber/SaveBefore.php +++ b/Observer/Subscriber/SaveBefore.php @@ -27,7 +27,7 @@ public function execute(Observer $observer) $subscriber = $observer->getSubscriber(); if ($this->customerSession->getPhone()) { $subscriber->setPhone($this->customerSession->getPhone()); - //$this->customerSession->unsPhone(); + $this->customerSession->unsPhone(); } return $subscriber; } diff --git a/Setup/UpgradeData.php b/Setup/UpgradeData.php index 1104997b..9a490ae8 100644 --- a/Setup/UpgradeData.php +++ b/Setup/UpgradeData.php @@ -18,7 +18,12 @@ use Magento\Framework\App\ResourceConnection; use Magento\Framework\App\DeploymentConfig; use Magento\Sales\Model\OrderFactory; +use Magento\Customer\Setup\CustomerSetupFactory; +use Magento\Eav\Model\Entity\Attribute\SetFactory as AttributeSetFactory; +use Magento\Eav\Model\Entity\Attribute\Set as AttributeSet; +use Magento\Customer\Model\Customer; use Ebizmarts\MailChimp\Model\ResourceModel\MailChimpSyncEcommerce\CollectionFactory as SyncCollectionFactory; + class UpgradeData implements UpgradeDataInterface { /** @@ -53,17 +58,10 @@ class UpgradeData implements UpgradeDataInterface * @var OrderFactory */ private $orderFactory; + protected $customerSetupFactory; + private $attributeSetFactory; + - /** - * @param ResourceConnection $resource - * @param DeploymentConfig $deploymentConfig - * @param \Ebizmarts\MailChimp\Model\ResourceModel\MailChimpInterestGroup\CollectionFactory $interestGroupCollectionFactory - * @param \Ebizmarts\MailChimp\Model\ResourceModel\MailChimpWebhookRequest\CollectionFactory $webhookCollectionFactory - * @param \Magento\Config\Model\ResourceModel\Config\Data\CollectionFactory $configFactory - * @param SyncCollectionFactory $syncCollectionFactory - * @param OrderFactory $orderFactory - * @param \Ebizmarts\MailChimp\Helper\Data $helper - */ public function __construct( ResourceConnection $resource, DeploymentConfig $deploymentConfig, @@ -72,6 +70,8 @@ public function __construct( \Magento\Config\Model\ResourceModel\Config\Data\CollectionFactory $configFactory, SyncCollectionFactory $syncCollectionFactory, OrderFactory $orderFactory, + CustomerSetupFactory $customerSetupFactory, + AttributeSetFactory $attributeSetFactory, \Ebizmarts\MailChimp\Helper\Data $helper ) { $this->_resource = $resource; @@ -81,6 +81,8 @@ public function __construct( $this->configFactory = $configFactory; $this->syncCollectionFactory = $syncCollectionFactory; $this->orderFactory = $orderFactory; + $this->customerSetupFactory = $customerSetupFactory; + $this->attributeSetFactory = $attributeSetFactory; $this->_helper = $helper; } @@ -186,5 +188,30 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $config->getResource()->delete($config); } } + if (version_compare($context->getVersion(), '102.3.58')){ + $customerSetup = $this->customerSetupFactory->create(['setup' => $setup]); + $customerEntity = $customerSetup->getEavConfig()->getEntityType('customer'); + $attributeSetId = $customerEntity->getDefaultAttributeSetId(); + /** @var $attributeSet AttributeSet */ + $attributeSet = $this->attributeSetFactory->create(); + $attributeGroupId = $attributeSet->getDefaultGroupId($attributeSetId); + $customerSetup->addAttribute(Customer::ENTITY, 'mobile_phone', [ + 'type' => 'varchar', + 'label' => 'Mobile Phone', + 'input' => 'text', + 'required' => false, + 'visible' => true, + 'user_defined' => true, + 'position' => 999, + 'system' => 0, + ]); + $attribute = $customerSetup->getEavConfig()->getAttribute(Customer::ENTITY, 'mobile_phone') + ->addData([ + 'attribute_set_id' => $attributeSetId, + 'attribute_group_id' => $attributeGroupId, + 'used_in_forms' => ['adminhtml_customer', 'customer_account_edit'], + ]); + $attribute->save(); + } } } diff --git a/Setup/UpgradeSchema.php b/Setup/UpgradeSchema.php index ae729720..deb8fe01 100644 --- a/Setup/UpgradeSchema.php +++ b/Setup/UpgradeSchema.php @@ -30,7 +30,11 @@ class UpgradeSchema implements UpgradeSchemaInterface * @var DeploymentConfig */ protected $_deploymentConfig; - public function __construct(ResourceConnection $resource, DeploymentConfig $deploymentConfig) + + public function __construct( + ResourceConnection $resource, + DeploymentConfig $deploymentConfig + ) { $this->_resource = $resource; $this->_deploymentConfig = $deploymentConfig;