Merge pull request #1955 from mailchimp/Issue1951-2.3.6-p1

closes #1951 for magento 2.3.6-p1
mailchimp · Apr 8, 2024 · e99e16b · e99e16b
2 parents 334065d + 81b24f5
commit e99e16b
Showing 1 changed file with 1 addition and 11 deletions.
diff --git a/Model/Api/Order.php b/Model/Api/Order.php
@@ -84,7 +84,6 @@ class Order
     protected $_counter;
 
     protected $_batchId;
-    protected $modifiedOrder = false;
 
     /**
      * @param \Ebizmarts\MailChimp\Helper\Data $helper
@@ -205,10 +204,6 @@ protected function _getModifiedOrders($magentoStoreId)
                 }
 
                 $orderJson = $this->generatePOSTPayload($order, $mailchimpStoreId, $magentoStoreId, true, $isSynced);
-                if ($this->modifiedOrder) {
-                    $order->save();
-                    $this->modifiedOrder = false;
-                }
                 if ($orderJson!==false) {
                     if (!empty($orderJson)) {
                         $this->_helper->modifyCounter(\Ebizmarts\MailChimp\Helper\Data::ORD_MOD);
@@ -291,10 +286,6 @@ protected function _getNewOrders($magentoStoreId)
                     }
                 }
                 $orderJson = $this->generatePOSTPayload($order, $mailchimpStoreId, $magentoStoreId,false,$isSynced);
-                if ($this->modifiedOrder) {
-                    $order->save();
-                    $this->modifiedOrder = false;
-                }
                 if ($orderJson!==false) {
                     if (!empty($orderJson)) {
                         $this->_helper->modifyCounter(\Ebizmarts\MailChimp\Helper\Data::ORD_NEW);
@@ -346,11 +337,10 @@ protected function generatePOSTPayload(
         if ($order->getMailchimpCampaignId()) {
             $data['campaign_id'] = $order->getMailchimpCampaignId();
         } elseif ($isSynced) {
-            if ($campaignId = $this->getCampaign($magentoStoreId, $order->getCustomerEmail())) {
+            if (!$isModifiedOrder && $campaignId = $this->getCampaign($magentoStoreId, $order->getCustomerEmail())) {
                 $data['campaign_id'] = $campaignId;
                 $order->setMailchimpCampaignId($campaignId);
                 $order->setMailchimpFlag(1);
-                $this->modifiedOrder = true;
             }
         }