Merge pull request #65 from jorgeeurekalabs/main

Fixed Customer export.
ActiveCampaign · Oct 31, 2023 · 82af49c · 82af49c
2 parents c022b28 + bf2ed5e
commit 82af49c
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 3 deletions.
diff --git a/Customer/Model/AcSyncStatus.php b/Customer/Model/AcSyncStatus.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace ActiveCampaign\Customer\Model;
+
+use \ActiveCampaign\Customer\Model\Config\CronConfig;
+
+class AcSyncStatus implements \Magento\Framework\Data\OptionSourceInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function toOptionArray()
+    {
+        return [
+            [
+                'value' => CronConfig::SYNCED,
+                'label' => __('Synced'),
+            ],
+            [
+                'value' => CronConfig::NOT_SYNCED,
+                'label' => __('Not Synced'),
+            ],
+            [
+                'value' => CronConfig::FAIL_SYNCED,
+                'label' => __('Not Synced'),
+            ],
+        ];
+    }
+}
diff --git a/Customer/composer.json b/Customer/composer.json
@@ -9,7 +9,7 @@
     "config": {
         "sort-packages": true
     },
-    "version": "2.1.4",
+    "version": "2.1.5",
     "require": {
         "php": "~7.3.0||~7.4.0||~8.0||~8.1||~8.2",
         "activecampaign/core": "2.1.*"

diff --git a/Customer/etc/module.xml b/Customer/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_Customer" setup_version="2.1.4">
+	<module name="ActiveCampaign_Customer" setup_version="2.1.5">
         <sequence>
             <module name="ActiveCampaign_Core"/>
         </sequence>

diff --git a/Customer/view/adminhtml/ui_component/customer_listing.xml b/Customer/view/adminhtml/ui_component/customer_listing.xml
@@ -18,6 +18,7 @@
     <columns name="customer_columns" class="Magento\Customer\Ui\Component\Listing\Columns">
         <column name="ac_sync_status" class="ActiveCampaign\Customer\Ui\Component\Listing\Column\AcSyncStatus" sortOrder="300">
             <settings>
+                <options class="ActiveCampaign\Customer\Model\AcSyncStatus"/>
                 <dataType>select</dataType>
                 <label translate="true">ActiveCampaign Sync Status</label>
                 <visible>true</visible>

diff --git a/marketplace-composer.json b/marketplace-composer.json
@@ -2,7 +2,7 @@
   "name": "activecampaign/module-integration",
   "description": "ActiveCampaign extension for Magento 2.3 and 2.4",
   "type": "metapackage",
-  "version": "2.0.12",
+  "version": "2.0.13",
   "license": [
     "OSL-3.0"
   ],