From dd09e201f7cdd4ca7427de98ac760fcedbbfce29 Mon Sep 17 00:00:00 2001
From: Dmitrii Fediuk <dfediuk@gmail.com>
Date: Thu, 2 May 2024 21:17:28 +0100
Subject: [PATCH] https://github.com/thehcginstitute-com/m1/issues/590

---
 .../MailChimp/Model/ProcessWebhook.php        | 30 ++++---------------
 1 file changed, 6 insertions(+), 24 deletions(-)

diff --git a/app/code/community/Ebizmarts/MailChimp/Model/ProcessWebhook.php b/app/code/community/Ebizmarts/MailChimp/Model/ProcessWebhook.php
index 9f4d4ee63..f59fc2712 100644
--- a/app/code/community/Ebizmarts/MailChimp/Model/ProcessWebhook.php
+++ b/app/code/community/Ebizmarts/MailChimp/Model/ProcessWebhook.php
@@ -42,7 +42,11 @@ function processWebhookData():void {
 			if ($data) {
 				switch ($webhookRequest->getType()) {
 					case 'subscribe':
-						$this->_subscribe($data);
+						try {
+							$this->getMailchimpTagsModel()->processMergeFields($data, true);
+						} catch (Exception $e) {
+							Mage::logException($e);
+						}
 						break;
 					case 'unsubscribe':
 						$this->_unsubscribe($data);
@@ -54,7 +58,7 @@ function processWebhookData():void {
 						$this->_updateEmail($data);
 						break;
 					case 'profile':
-						$this->_profile($data);
+						$this->getMailchimpTagsModel()->processMergeFields($data);
 				}
 			}
 
@@ -90,33 +94,11 @@ private function _clean(array $data):void {
 	 */
 	private function getMailchimpTagsModel():Tags {return $this->_tags;}
 
-	/**
-	 * 2024-05-02 Dmitrii Fediuk https://upwork.com/fl/mage2pro
-	 * "Refactor `Ebizmarts_MailChimp_Model_ProcessWebhook`": https://github.com/cabinetsbay/site/issues/590
-	 * @used-by self::processWebhookData()
-	 * @throws Mage_Core_Exception
-	 */
-	private function _profile(array $d):void {$this->getMailchimpTagsModel()->processMergeFields($d);}
-
 	/**
 	 * @param $webhookRequest
 	 */
 	private function _saveProcessedWebhook($webhookRequest):void {$webhookRequest->setProcessed(1)->save();}
 
-	/**
-	 * Subscribe email to Magento list, store aware
-	 *
-	 * @param array $data
-	 * @return void
-	 */
-	private function _subscribe(array $data):void {
-		try {
-			$this->getMailchimpTagsModel()->processMergeFields($data, true);
-		} catch (Exception $e) {
-			Mage::logException($e);
-		}
-	}
-
 	/**
 	 * Update customer email <upemail>
 	 *