Merge branch 'develop' into release/6.4.24

Author: sta1r

README.md

@@ -41,6 +41,14 @@ 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.24
+
+###### What's new
+- We've increased the sync limits for bulk imports into Engagement Cloud. The importer sync will now import up to 100 bulk items on each execution (25 of which can be for contacts), plus up to 100 single items.
+
+###### Bug fixes
+- We fixed a filename casing error that broke the page at Configuration > Engagement Cloud > Dynamic Content. 
+
 # 6.4.23
 
 ###### What's new
@@ -51,6 +59,7 @@ Request a feature on our [roadmap](https://roadmap.dotdigital.com)
 
 ###### Bug fixes
 - We've fixed an error with updating products following an order sync - an exception was thrown once all available orders had been synced.
+- We changed a line in our `UrlFinder` class that was causing a fatal error in PHP 5.4.
 
 # 6.4.22
 

…System/Dynamic/SubheadingWithComment.php …System/Dynamic/Subheadingwithcomment.phpcode/Dotdigitalgroup/Email/Block/Adminhtml/System/Dynamic/SubheadingWithComment.php renamed to code/Dotdigitalgroup/Email/Block/Adminhtml/System/Dynamic/Subheadingwithcomment.php code/Dotdigitalgroup/Email/Block/Adminhtml/System/Dynamic/SubheadingWithComment.php renamed to code/Dotdigitalgroup/Email/Block/Adminhtml/System/Dynamic/Subheadingwithcomment.php

@@ -5,7 +5,7 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Dotdigitalgroup_Email_Block_Adminhtml_System_Dynamic_SubheadingWithComment
+class Dotdigitalgroup_Email_Block_Adminhtml_System_Dynamic_Subheadingwithcomment
     extends Mage_Adminhtml_Block_Abstract implements Varien_Data_Form_Element_Renderer_Interface
 {
     /**

code/Dotdigitalgroup/Email/Model/Importer.php

@@ -30,7 +30,8 @@ class Dotdigitalgroup_Email_Model_Importer extends Mage_Core_Model_Abstract
     const IMPORT_TYPE_SUBSCRIBER_RESUBSCRIBED = 'Subscriber';
 
     //sync limits
-    const SYNC_SINGLE_LIMIT_NUMBER = 100;
+    const TOTAL_IMPORT_SYNC_LIMIT = 100;
+    const CONTACT_IMPORT_SYNC_LIMIT = 25;
 
     /**
      * @var array
@@ -59,7 +60,6 @@ class Dotdigitalgroup_Email_Model_Importer extends Mage_Core_Model_Abstract
     public $bulkPriority;
     public $singlePriority;
     public $totalItems;
-    public $bulkSyncLimit;
 
     /**
      * Constructor.
@@ -127,7 +127,7 @@ protected function _checkImportStatus()
     {
         $helper = Mage::helper('ddg');
         $helper->allowResourceFullExecution();
-        if ($items = $this->_getImportingItems($this->bulkSyncLimit)) {
+        if ($items = $this->_getImportingItems(self::TOTAL_IMPORT_SYNC_LIMIT)) {
             foreach ($items as $item) {
                 $websiteId = $item->getWebsiteId();
                 $client = Mage::helper('ddg')->getWebsiteApiClient($websiteId);
@@ -238,9 +238,6 @@ public function processQueue()
         //Set items to 0
         $this->totalItems = 0;
 
-        //Set bulk sync limit
-        $this->bulkSyncLimit = 5;
-
         //Set priority
         $this->_setPriority();
 
@@ -249,37 +246,39 @@ public function processQueue()
 
         $enabledWebsiteIds = $this->getEnabledWebsiteIds();
 
-        //Bulk priority. Process group 1 first
+        //Bulk priority. Process Contact Bulk first
         foreach ($this->bulkPriority as $bulk) {
-            if ($this->totalItems < $bulk['limit']) {
+            if ($this->totalItems < self::TOTAL_IMPORT_SYNC_LIMIT) {
+                // only Contact imports have a bulk limit
+                $bulkLimit = isset($bulk['limit']) ? $bulk['limit'] - $this->totalItems : self::TOTAL_IMPORT_SYNC_LIMIT - $this->totalItems;
                 $collection = $this->_getQueue(
                     $bulk['type'],
                     $bulk['mode'],
-                    $bulk['limit'] - $this->totalItems,
+                    $bulkLimit,
                     $enabledWebsiteIds
                 );
                 if ($collection->getSize()) {
-                    $this->totalItems += $collection->getSize();
+                    $this->totalItems += count($collection);
                     $bulkModel = Mage::getModel($bulk['model']);
                     $bulkModel->processCollection($collection);
                 }
             }
         }
 
-        //reset total items to 0
+        //reset total items
         $this->totalItems = 0;
 
         //Single/Update priority
         foreach ($this->singlePriority as $single) {
-            if ($this->totalItems < $single['limit']) {
+            if ($this->totalItems < self::TOTAL_IMPORT_SYNC_LIMIT) {
                 $collection = $this->_getQueue(
                     $single['type'],
                     $single['mode'],
-                    $single['limit'] - $this->totalItems,
+                    self::TOTAL_IMPORT_SYNC_LIMIT - $this->totalItems,
                     $enabledWebsiteIds
                 );
                 if ($collection->getSize()) {
-                    $this->totalItems += $collection->getSize();
+                    $this->totalItems += count($collection);
                     $singleModel = Mage::getModel($single['model']);
                     $singleModel->processCollection($collection);
                 }
@@ -301,7 +300,6 @@ protected function _setPriority()
             'model' => '',
             'mode'  => self::MODE_BULK,
             'type'  => '',
-            'limit' => $this->bulkSyncLimit
         );
 
         //Contact Bulk
@@ -312,6 +310,7 @@ protected function _setPriority()
             self::IMPORT_TYPE_GUEST,
             self::IMPORT_TYPE_SUBSCRIBERS
         );
+        $contact['limit'] = self::CONTACT_IMPORT_SYNC_LIMIT;
 
         //Bulk Order
         $order = $defaultBulk;
@@ -339,7 +338,6 @@ protected function _setPriority()
             'model' => 'ddg_automation/sync_contact_update',
             'mode'  => '',
             'type'  => '',
-            'limit' => self::SYNC_SINGLE_LIMIT_NUMBER
         );
 
         //Subscriber resubscribe
@@ -385,7 +383,6 @@ protected function _setPriority()
             'model' => '',
             'mode'  => '',
             'type'  => '',
-            'limit' => self::SYNC_SINGLE_LIMIT_NUMBER
         );
 
         //Contact Delete

code/Dotdigitalgroup/Email/Model/Sync/Contact/Bulk.php

@@ -76,8 +76,15 @@ protected function _handleItemAfterSync($item, $result)
                     ->save();
             } else {
                 $message = (isset($result->message)) ? $result->message : 'Error unknown';
-                $item->setImportStatus(Dotdigitalgroup_Email_Model_Importer::FAILED)
-                    ->setMessage($message);
+
+                // Requeue imports if import limit has been exceeded
+                if (strpos($message, 'ERROR_IMPORT_TOOMANYACTIVEIMPORTS') !== false) {
+                    $item->setImportStatus(Dotdigitalgroup_Email_Model_Importer::NOT_IMPORTED);
+                } else {
+                    $item->setImportStatus(Dotdigitalgroup_Email_Model_Importer::FAILED);
+                }
+
+                $item->setMessage($message);
 
                 //If result id
                 if (isset($result->id)) {

code/Dotdigitalgroup/Email/etc/config.xml

@@ -2,7 +2,7 @@
 <config>
     <modules>
         <Dotdigitalgroup_Email>
-            <version>6.4.23</version>
+            <version>6.4.24</version>
         </Dotdigitalgroup_Email>
     </modules>
     <frontend>