https://github.com/thehcginstitute-com/m1/issues/589

thehcginstitute-com · May 4, 2024 · 0657406 · 0657406
1 parent 352ff87
commit 0657406
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/app/code/community/Ebizmarts/MailChimp/Model/Api/Subscribers/MailchimpTags.php b/app/code/community/Ebizmarts/MailChimp/Model/Api/Subscribers/MailchimpTags.php
@@ -91,11 +91,6 @@ function getMailChimpTagValue(string $key)
  return $mailchimpTagValue;
  }
 
- /**
- * @return Ebizmarts_MailChimp_Helper_Webhook
- */
- function getMailchimpWebhookHelper() {return $this->_mcWebhookHelper;}
-
  /**
  * @return int
  */
@@ -820,11 +815,6 @@ private function order():?O {return dfc($this, function() {/** @var OC $c */ ret
  */
  private function setMailChimpDateHelper():void {$this->_mcDateHelper = Mage::helper('mailchimp/date');}
 
- /**
- * @param $mageMCWebhookHelper
- */
- private function setMailChimpWebhookHelper():void {$this->_mcWebhookHelper = Mage::helper('mailchimp/webhook');}
-
  /**
  * @param $mapFields
  * @return mixed
@@ -877,10 +867,6 @@ private function unserializeMapFields($mapFields) {return hcg_mc_h()->unserializ
  * @var Ebizmarts_MailChimp_Helper_Date
  */
  private $_mcDateHelper;
- /**
- * @var Ebizmarts_MailChimp_Helper_Webhook
- */
- private $_mcWebhookHelper;
 
  /**
  * @var Ebizmarts_MailChimp_Model_Api_Subscribers_InterestGroupHandle

diff --git a/app/code/local/HCG/MailChimp/Tags/ProcessMergeFields.php b/app/code/local/HCG/MailChimp/Tags/ProcessMergeFields.php
@@ -1,5 +1,6 @@
 <?php
 namespace HCG\MailChimp\Tags;
+use Ebizmarts_MailChimp_Helper_Webhook as WebhookH;
 use Ebizmarts_MailChimp_Model_Api_Subscribers_MailchimpTags as T;
 # 2024-05-04 Dmitrii Fediuk https://upwork.com/fl/mage2pro
 # "Refactor `Ebizmarts_MailChimp_Model_Api_Subscribers_MailchimpTags`": https://github.com/cabinetsbay/site/issues/589
@@ -68,7 +69,7 @@ static function p(array $data, bool $subscribe = false):void {
  private static function _addSubscriberData($subscriber, $fname, $lname, $email, $listId):void
  {
  $helper = hcg_mc_h();
- $webhookHelper = $this->getMailchimpWebhookHelper();
+ $webhookHelper = \Mage::helper('mailchimp/webhook'); /** @var WebhookH $webhookHelper */
  $scopeArray = $helper->getFirstScopeFromConfig(
  \Ebizmarts_MailChimp_Model_Config::GENERAL_LIST,
  $listId