Merge branch 'develop'

README.md

@@ -41,11 +41,16 @@ You are welcome to contribute to Engagement Cloud for Magento! You can either:
 - Fix a bug: please fork this repo and submit the Pull Request to our [Develop branch](https://github.com/dotmailer/dotmailer-magento-extension/tree/develop)
 Request a feature on our [roadmap](https://roadmap.dotdigital.com)
 
+# 6.4.29
+
+###### Bug fixes
+- We fixed a problem with order sync, a regression from 6.4.22. The process could break in two scenarios: if we couldn’t find any products for SKUs listed in a collection of orders for a single account; or if the sync ran for multiple accounts, and only one of those accounts had orders.
+
 # 6.4.28
 
 ###### Bug fixes
-- We fixed a problem with product image paths in catalog sync. The default level base media URL was always used, instead of the value set at website or store level. [8f6fd296a4111f5272c4183959b3b11fcaf3345f]
-- We've added batching when removing orphaned products at the start of catalog sync. This should prevent occasional SQL locking issues. [a383793c85e4f68db7dd6c84112671ed6c71c830]
+- We fixed a problem with product image paths in catalog sync. The default level base media URL was always used, instead of the value set at website or store level.
+- We've added batching when removing orphaned products at the start of catalog sync. This should prevent occasional SQL locking issues.
 
 # 6.4.27
 

code/Dotdigitalgroup/Email/Model/Sales/Order.php

@@ -104,7 +104,7 @@ public function sync()
                 }
             }
 
-            if ($this->countOrders > 0) {
+            if (($numOrders + $numOrdersForSingleSync) > 0 ) {
                 // Mark ordered products as unprocessed
                 $this->updateCatalog(array_merge($orders, $ordersForSingleSync));
             }
@@ -551,6 +551,12 @@ private function updateCatalog($orders)
         $productCollection = Mage::getResourceModel('catalog/product_collection')
             ->addFieldToFilter('sku', array('in' => array_unique($skus)));
 
-        Mage::getResourceModel('ddg_automation/catalog')->setUnProcessed($productCollection->getAllIds());
+        $productIds = $productCollection->getAllIds();
+
+        if (!empty($productIds)) {
+            Mage::getResourceModel('ddg_automation/catalog')->setUnProcessed($productIds);
+        } else {
+            Mage::helper('ddg')->log('Product skus not found: ' . implode(', ', array_unique($skus)));
+        }
     }
 }

code/Dotdigitalgroup/Email/etc/config.xml

@@ -2,7 +2,7 @@
 <config>
     <modules>
         <Dotdigitalgroup_Email>
-            <version>6.4.28</version>
+            <version>6.4.29</version>
         </Dotdigitalgroup_Email>
     </modules>
     <frontend>