Merge pull request #1787 from mailchimp/Version54-2.2

Version 101.2.54 for magento 2.2
mailchimp · Aug 28, 2023 · e732b4d · e732b4d
2 parents 906f771 + 0ceb8ed
commit e732b4d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/Helper/Sync.php b/Helper/Sync.php
@@ -155,15 +155,6 @@ public function resetErrors($mailchimpStore, $storeId, $retry)
                     $tableName,
                     "mailchimp_store_id = '" . $mailchimpStore . "' and mailchimp_sync_error is not null"
                 );
-                // clean the order table
-                $orderCollection = $this->orderCollectionFactory->create();
-                $orderCollection->addFieldToFilter('store_id', ['eq' => $storeId]);
-                $orderCollection->addFieldToFilter('mailchimp_sync_error', ['notnull' => true]);
-                foreach ($orderCollection as $item) {
-                    $item->setMailchimpSent(\Ebizmarts\MailChimp\Helper\Data::NEVERSYNC);
-                    $item->setMailchimpSyncError('');
-                    $item->save();
-                }
             }
         } catch (\Zend_Db_Exception $e) {
             throw new ValidatorException(__($e->getMessage()));

diff --git a/Model/Config/Backend/MonkeyStore.php b/Model/Config/Backend/MonkeyStore.php
@@ -140,7 +140,7 @@ public function beforeSave()
             }
             if ($found==1) {
                 $this->_helper->cancelAllPendingBatches($mailchimpStore);
-                $this->syncHelper->resetErrors($mailchimpStore, true);
+                $this->syncHelper->resetErrors($mailchimpStore, $storeId,true);
             }
             $this->_helper->restoreAllCanceledBatches($this->getValue());
             if ($createWebhook) {