issue-10, issue-11, issue-44

Author: jorgeeurekalabs

AbandonedCart/Model/AbandonedCartSendData.php

@@ -229,9 +229,9 @@ public function sendAbandonedCartData($quoteId = null): array
                 ['lt' => new \Zend_Db_Expr('main_table.updated_at')],
                 ['null' =>  true]
             ])
-            ->addFieldToFilter('main_table.updated_at',
-                ['eq' => new \Zend_Db_Expr('IF( ac_synced_date is not null or main_table.updated_at < DATE_SUB(NOW(), INTERVAL '.$minInactiveTime.' minute), main_table.updated_at,-1)')]
-            )
+        //    ->addFieldToFilter('main_table.updated_at',
+         //       ['eq' => new \Zend_Db_Expr('IF( ac_synced_date is not null or main_table.updated_at < DATE_SUB(NOW(), INTERVAL '.$minInactiveTime.' minute), main_table.updated_at,-1)')]
+         //   )
             ->addFieldToFilter(
                 'is_active',
                 '1'
@@ -372,6 +372,13 @@ private function getQuoteItemsData($entityId, $storeId): array
             $imageUrl = $this->imageHelperFactory->create()
                 ->init($product, 'product_page_image_medium')->getUrl();
             $this->appEmulation->stopEnvironmentEmulation();
+            $categories = $product->getCategoryCollection()->addAttributeToSelect('name');
+            $categoriesName = [];
+            foreach($categories as $category)
+            {
+                $categoriesName[] = $category->getName();
+            }
+            $categoriesName = implode(', ', $categoriesName);
             $quoteItemsData[] = [
                 "externalid" => $quoteItem->getItemId(),
                 "name" => $quoteItem->getName(),
@@ -380,7 +387,8 @@ private function getQuoteItemsData($entityId, $storeId): array
                 "sku" => $quoteItem->getSku(),
                 "description" => $product->getDescription(),
                 "imageUrl" => $imageUrl,
-                "productUrl" => $product->getProductUrl()
+                "productUrl" => $product->getProductUrl(),
+                "category" => $categoriesName
             ];
         }
         return $quoteItemsData;

AbandonedCart/composer.json

@@ -9,7 +9,7 @@
     "config": {
         "sort-packages": true
     },
-    "version": "2.1.12",
+    "version": "2.1.13",
     "require": {
         "php": "~7.3.0||~7.4.0||~8.0||~8.1||~8.2",
         "activecampaign/core": "2.1.*"

AbandonedCart/etc/module.xml

@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="ActiveCampaign_AbandonedCart" setup_version="2.1.12">
+    <module name="ActiveCampaign_AbandonedCart" setup_version="2.1.13">
         <sequence>
             <module name="Magento_Product"/>
             <module name="Magento_Sales"/>

Order/Model/OrderData/OrderDataSend.php

@@ -227,12 +227,20 @@ public function orderDataSend($order): array
 
                     $imageUrl = $this->imageHelperFactory->create()
                                 ->init($item->getProduct(), 'product_thumbnail_image')->getUrl();
+                    $categories = $item->getProduct()->getCategoryCollection()->addAttributeToSelect('name');
+                    $categoriesName = [];
+                    foreach($categories as $category)
+                    {
+                        $categoriesName[] = $category->getName();
+                    }
+                    $categoriesName = implode(', ', $categoriesName);
+
                     $items[] = [
                                 "externalid" => $item->getProductId(),
                                 "name" => $item->getName(),
                                 "price" => $this->activeCampaignHelper->priceToCents($item->getPrice()),
                                 "quantity" => $item->getQtyOrdered(),
-                                "category" => implode(', ', $item->getProduct()->getCategoryIds()),
+                                "category" => $categoriesName,
                                 "sku" => $item->getSku(),
                                 "description" => $item->getDescription(),
                                 "imageUrl" => $imageUrl,

Order/composer.json

@@ -9,7 +9,7 @@
     "config": {
         "sort-packages": true
     },
-    "version": "2.1.7",
+    "version": "2.1.8",
     "require": {
         "php": "~7.3.0||~7.4.0||~8.0||~8.1||~8.2",
         "activecampaign/core": "2.1.*"

Order/etc/module.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="ActiveCampaign_Order" setup_version="2.1.7">
+    <module name="ActiveCampaign_Order" setup_version="2.1.8">
         <sequence>
             <module name="ActiveCampaign_Core" />
             <module name="ActiveCampaign_Customer"/>

SyncLog/Cron/DeleteSyncLog.php

@@ -8,33 +8,32 @@
 use Magento\Framework\Stdlib\DateTime\DateTime;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Store\Model\ScopeInterface;
-
+use ActiveCampaign\SyncLog\Helper\Data;
 class DeleteSyncLog
 {
 
     const SYNCLOG_TABLE = "sync_log";
-    const XML_PATH_ACTIVE_CAMPAIGN_SYNCLOG_ENABLE = "active_campaign/synclog/synclog_delete";
 
-    /**
-     * @var ScopeConfigInterface
-     */
-    protected $scopeConfig;
+
+
 
     /** @var ResourceConnection  */
     private  $connection;
 
     /** @var DateTime  */
     private  $dateTime;
 
+    private $helper;
+
     public function __construct(
-        ScopeConfigInterface $scopeConfig,
         ResourceConnection $connection,
-        DateTime $dateTime
+        DateTime $dateTime,
+        Data $helper
     )
     {
-        $this->scopeConfig = $scopeConfig;
         $this->connection = $connection;
         $this->dateTime = $dateTime;
+        $this->helper = $helper;
     }
 
     /**
@@ -44,27 +43,18 @@ public function __construct(
      */
     public function execute()
     {
-        if($this->isDeletingEnabled()) {
+
+        if($this->helper->isDeletingEnabled()) {
             $connection = $this->connection->getConnection();
             $tableName = $connection->getTableName(self::SYNCLOG_TABLE);
-            $currentDate = $this->dateTime->gmtDate("Y-m-d", strtotime('-7 days'));
+            $currentDate = $this->dateTime->gmtDate("Y-m-d", strtotime('-'.$this->helper->removeAfterDays().' days'));
             $whereConditions = [
-                  $connection->quoteInto("creation_date < ?", $currentDate)
+                  $connection->quoteInto("Date(creation_date) <= ?", $currentDate)
             ];
+
             $connection->delete($tableName, $whereConditions);
         }
     }
 
-    /**
-     * @param null $scopeCode
-     * @return bool
-     */
-    public function isDeletingEnabled($scopeCode = null): bool
-    {
-        return $this->scopeConfig->isSetFlag(
-            self::XML_PATH_ACTIVE_CAMPAIGN_SYNCLOG_ENABLE,
-            ScopeInterface::SCOPE_STORES,
-            $scopeCode
-        );
-    }
+
 }

SyncLog/Helper/Data.php

@@ -9,8 +9,8 @@
 class Data extends AbstractHelper
 {
     const ACTIVE_CAMPAIGN_SYNCLOG_MODE = "active_campaign/synclog/synclog_mode";
-
-
+    const ACTIVE_CAMPAIGN_REMOVE_AFTER_DAYS = "active_campaign/synclog/remove_after_days";
+    const XML_PATH_ACTIVE_CAMPAIGN_SYNCLOG_ENABLE = "active_campaign/synclog/synclog_delete";
     /**
      * @var \Magento\Framework\App\State *
      */
@@ -29,6 +29,13 @@ public function __construct(
         $this->state = $state;
     }
 
+    public function removeAfterDays($scopeCode = null){
+        return $this->scopeConfig->getValue(
+         self::ACTIVE_CAMPAIGN_REMOVE_AFTER_DAYS,
+            ScopeInterface::SCOPE_STORES,
+            $scopeCode
+      );
+    }
     /**
      * @param null $scopeCode
      * @return bool
@@ -42,4 +49,16 @@ public function isLogError($scopeCode = null)
         );
     }
 
+    /**
+     * @param null $scopeCode
+     * @return bool
+     */
+    public function isDeletingEnabled($scopeCode = null): bool
+    {
+        return $this->scopeConfig->isSetFlag(
+            self::XML_PATH_ACTIVE_CAMPAIGN_SYNCLOG_ENABLE,
+            ScopeInterface::SCOPE_STORES,
+            $scopeCode
+        );
+    }
 }

SyncLog/composer.json

@@ -9,7 +9,7 @@
     "config": {
         "sort-packages": true
     },
-    "version": "2.1.2",
+    "version": "2.1.3",
     "require": {
         "php": "~7.3.0||~7.4.0||~8.0||~8.1||~8.2",
         "activecampaign/core": "2.1.*"

SyncLog/etc/adminhtml/system.xml

@@ -18,9 +18,15 @@
                 </field>
                 <field id="synclog_delete" translate="label" type="select" sortOrder="10" showInDefault="1">
                     <label>SyncLog Delete</label>
-                    <comment><![CDATA[Choosing yes will start deleting your past 7 days existing SyncLog stored in database.]]></comment>
+                    <comment><![CDATA[Choosing yes will start deleting  existing SyncLog stored in database.]]></comment>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
+                <field id="remove_after_days" type="text" sortOrder="19" showInDefault="1">
+                    <label>Delete after (days)</label>
+                    <depends>
+                        <field id="synclog_delete">1</field>
+                    </depends>
+                </field>
                 <field id="cron_minute" translate="label comment" type="text" sortOrder="20" showInDefault="1">
                     <label>Cron Minute</label>
                     <comment><![CDATA[0-59 Allowed value. Set * for every minute.]]></comment>