Merge pull request #1256 from mailchimp/issue_1253

Promo Rule and Promo Code related are properly deleted both in Magento and Mailchimp
mailchimp · Aug 9, 2021 · 1e8cdaf · 1e8cdaf
2 parents a4cfb1b + e23b346
commit 1e8cdaf
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/app/code/community/Ebizmarts/MailChimp/Model/Api/Batches.php b/app/code/community/Ebizmarts/MailChimp/Model/Api/Batches.php
@@ -525,7 +525,7 @@ protected function deleteUnsentItems()
         $resource = $helper->getCoreResource();
         $connection = $resource->getConnection('core_write');
         $tableName = $resource->getTableName('mailchimp/ecommercesyncdata');
-        $where = array("batch_id IS NULL AND mailchimp_sync_modified != 1");
+        $where = array("batch_id IS NULL AND mailchimp_sync_modified != 1 AND mailchimp_sync_deleted != 1");
         $connection->delete($tableName, $where);
     }
 
@@ -709,7 +709,7 @@ public function getBatchResponse($batchId, $magentoStoreId)
             if ($fileHelper->isDir($baseDir.DS.'var'.DS.'mailchimp') == false)
             {
                 $fileHelper->mkDir($baseDir.DS.'var'.DS.'mailchimp');
-            } 
+            }
             if ($api) {
                 // check the status of the job
                 $response = $api->batchOperation->status($batchId);

diff --git a/app/code/community/Ebizmarts/MailChimp/Model/Api/PromoCodes.php b/app/code/community/Ebizmarts/MailChimp/Model/Api/PromoCodes.php
@@ -412,6 +412,7 @@ protected function _setDeleted($codeId, $promoRuleId)
 
         foreach ($promoCodes as $promoCode) {
             $mailchimpStoreId = $promoCode->getMailchimpStoreId();
+            $this->setMailchimpStoreId($mailchimpStoreId);
             $this->addDeletedRelatedId($codeId, $promoRuleId);
         }
     }

diff --git a/app/code/community/Ebizmarts/MailChimp/Model/Observer.php b/app/code/community/Ebizmarts/MailChimp/Model/Observer.php
@@ -1025,11 +1025,16 @@ public function salesruleSaveAfter(Varien_Event_Observer $observer)
 
     public function salesruleDeleteAfter(Varien_Event_Observer $observer)
     {
-        $promoRulesApi = $this->makeApiPromoRule();
         $rule = $observer->getEvent()->getRule();
         $ruleId = $rule->getRuleId();
+        $couponId = $rule->getPrimaryCoupon()->getData() ['coupon_id'];
+
+        $promoRulesApi = $this->makeApiPromoRule();
         $promoRulesApi->markAsDeleted($ruleId);
 
+        $promoCodesApi = $this->makeApiPromoCode();
+        $promoCodesApi->markAsDeleted($couponId, $ruleId);
+
         return $observer;
     }