Merge pull request #1785 from mailchimp/Vesrsion54-2.3.6-p1

Version 102.3.54-p1 for magento 2.3.6-p1
mailchimp · Aug 28, 2023 · 44d570a · 44d570a
2 parents a9a961e + 4341a5f
commit 44d570a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 12 deletions.
diff --git a/Helper/Sync.php b/Helper/Sync.php
@@ -159,15 +159,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/Api/Order.php b/Model/Api/Order.php
@@ -412,7 +412,7 @@ protected function generatePOSTPayload(
         foreach ($items as $item) {
             $variant = null;
             try {
-                $productSyncData = $this->_helper->getChimpSyncEcommerce(
+                $productSyncData = $this->syncHelper->getChimpSyncEcommerce(
                     $mailchimpStoreId,
                     $item->getProductId(),
                     \Ebizmarts\MailChimp\Helper\Data::IS_PRODUCT

diff --git a/Model/Api/PromoCodes.php b/Model/Api/PromoCodes.php
@@ -111,7 +111,7 @@ protected function _sendDeletedCoupons($mailchimpStoreId, $magentoStoreId)
             $batchArray[$counter]['path'] =
                 "/ecommerce/stores/$mailchimpStoreId/promo-rules/$ruleId/promo-codes/$couponId";
             $counter++;
-            $syncCoupon =$this->_helper->getChimpSyncEcommerce(
+            $syncCoupon =$this->syncHelper->getChimpSyncEcommerce(
                 $mailchimpStoreId,
                 $couponId,
                 \Ebizmarts\MailChimp\Helper\Data::IS_PROMO_CODE
@@ -158,7 +158,7 @@ protected function _sendNewCoupons($mailchimpStoreId, $magentoStoreId)
                 $ruleId = $item->getRuleId();
                 $couponId = $item->getCouponId();
                 try {
-                    $promoRule = $this->_helper->getChimpSyncEcommerce(
+                    $promoRule = $this->syncHelper->getChimpSyncEcommerce(
                         $mailchimpStoreId,
                         $ruleId,
                         \Ebizmarts\MailChimp\Helper\Data::IS_PROMO_RULE