From 1257521310dd3441e21b7d363cfd9e40dbba6222 Mon Sep 17 00:00:00 2001 From: Jorge Venzon Date: Wed, 27 Sep 2023 08:30:04 -0300 Subject: [PATCH 1/2] v2.0.11 --- AbandonedCart/Model/AbandonedCartSendData.php | 14 ++++++++------ AbandonedCart/composer.json | 2 +- AbandonedCart/etc/module.xml | 2 +- Customer/Observer/CustomerSaveAfter.php | 5 +++++ Customer/composer.json | 2 +- Customer/etc/module.xml | 2 +- Order/Model/OrderData/OrderDataSend.php | 10 ++++++++++ Order/composer.json | 2 +- Order/etc/module.xml | 2 +- composer.json | 2 +- marketplace-composer.json | 2 +- 11 files changed, 31 insertions(+), 14 deletions(-) diff --git a/AbandonedCart/Model/AbandonedCartSendData.php b/AbandonedCart/Model/AbandonedCartSendData.php index 427dfa1..acee399 100644 --- a/AbandonedCart/Model/AbandonedCartSendData.php +++ b/AbandonedCart/Model/AbandonedCartSendData.php @@ -21,7 +21,7 @@ use Magento\Framework\Exception\LocalizedException; use Magento\Framework\Exception\NoSuchEntityException; use Magento\Framework\Model\AbstractModel; -use Magento\Framework\Stdlib\DateTime; +use Magento\Framework\Stdlib\DateTime\TimezoneInterface; use Magento\Framework\UrlInterface; use Magento\Quote\Api\CartRepositoryInterface; use Magento\Quote\Model\QuoteFactory; @@ -128,6 +128,8 @@ class AbandonedCartSendData extends AbstractModel private $customerId; + + /** * AbandonedCartSendData constructor. * @param CustomerRepositoryInterface $customerRepository @@ -149,7 +151,7 @@ class AbandonedCartSendData extends AbstractModel * @param AppEmulation $appEmulation * @param StoreManagerInterface $storeManager * @param CustomerModel $customerModel - * @param DateTime $dateTime + * @param TimezoneInterface $dateTime * @param CartRepositoryInterface $quoteRepository * @param UrlInterface $urlBuilder */ @@ -173,7 +175,7 @@ public function __construct( AppEmulation $appEmulation, StoreManagerInterface $storeManager, CustomerModel $customerModel, - DateTime $dateTime, + TimezoneInterface $dateTime, CartRepositoryInterface $quoteRepository, UrlInterface $urlBuilder ) @@ -314,8 +316,8 @@ public function sendAbandonedCartData($quoteId = null): array ], "orderUrl" => $this->urlBuilder->getDirectUrl('checkout/cart'), "abandonedDate" => $abandonedCart->getCreatedAt(), - "externalCreatedDate" => $abandonedCart->getCreatedAt(), - "externalUpdatedDate" => $abandonedCart->getUpdatedAt(), + "externalCreatedDate" => $this->dateTime->date($abandonedCart->getUpdatedAt())->format('Y-m-d H:i:s'), + "externalUpdatedDate" => $this->dateTime->date($abandonedCart->getUpdatedAt())->format('Y-m-d H:i:s'), "shippingMethod" => $abandonedCart->getShippingMethod(), "totalPrice" => $this->coreHelper->priceToCents($abandonedCart->getGrandTotal()), "shippingAmount" => $this->coreHelper->priceToCents($abandonedCart->getShippingAmount()), @@ -425,7 +427,7 @@ private function saveResult($quoteId, $acOrderId, $syncStatus): void if ($quoteModel->getEntityId()) { $quoteModel->setAcOrderSyncId($acOrderId); $quoteModel->setAcSyncStatus($syncStatus); - $quoteModel->setAcSyncedDate($this->dateTime->formatDate(time())); + $quoteModel->setAcSyncedDate($this->dateTime->date()->format('Y-m-d H:i:s')); } $quoteModel->save(); } diff --git a/AbandonedCart/composer.json b/AbandonedCart/composer.json index 4d51dfa..75d4710 100644 --- a/AbandonedCart/composer.json +++ b/AbandonedCart/composer.json @@ -9,7 +9,7 @@ "config": { "sort-packages": true }, - "version": "2.1.1", + "version": "2.1.2", "require": { "php": "~7.3.0||~7.4.0||~8.0||~8.1||~8.2", "activecampaign/core": "2.1.*" diff --git a/AbandonedCart/etc/module.xml b/AbandonedCart/etc/module.xml index c4a2876..2c55f94 100644 --- a/AbandonedCart/etc/module.xml +++ b/AbandonedCart/etc/module.xml @@ -6,7 +6,7 @@ */ --> - + diff --git a/Customer/Observer/CustomerSaveAfter.php b/Customer/Observer/CustomerSaveAfter.php index f90cc1b..89851a0 100644 --- a/Customer/Observer/CustomerSaveAfter.php +++ b/Customer/Observer/CustomerSaveAfter.php @@ -27,6 +27,11 @@ class CustomerSaveAfter implements ObserverInterface */ protected $curl; + /** + * @var LoggerInterface + */ + protected $logger; + /** * CustomerSaveAfter constructor. * @param Customer $customer diff --git a/Customer/composer.json b/Customer/composer.json index 8525c1c..3b529b2 100644 --- a/Customer/composer.json +++ b/Customer/composer.json @@ -9,7 +9,7 @@ "config": { "sort-packages": true }, - "version": "2.1.3", + "version": "2.1.4", "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 index 506b145..f8c4170 100644 --- a/Customer/etc/module.xml +++ b/Customer/etc/module.xml @@ -1,6 +1,6 @@ - + diff --git a/Order/Model/OrderData/OrderDataSend.php b/Order/Model/OrderData/OrderDataSend.php index 61708c1..514f3e0 100644 --- a/Order/Model/OrderData/OrderDataSend.php +++ b/Order/Model/OrderData/OrderDataSend.php @@ -103,6 +103,16 @@ class OrderDataSend */ protected $quoteRepository; + /** + * @var CustomerModel + */ + protected $customerModel; + + /** + * @var CustomerModel + */ + protected $coreHelper; + /** * OrderDataSend constructor. * @param ProductRepositoryInterfaceFactory $productRepositoryFactory diff --git a/Order/composer.json b/Order/composer.json index df4755f..01f182a 100644 --- a/Order/composer.json +++ b/Order/composer.json @@ -9,7 +9,7 @@ "config": { "sort-packages": true }, - "version": "2.1.0", + "version": "2.1.1", "require": { "php": "~7.3.0||~7.4.0||~8.0||~8.1||~8.2", "activecampaign/core": "2.1.*" diff --git a/Order/etc/module.xml b/Order/etc/module.xml index bc8814e..139b88d 100644 --- a/Order/etc/module.xml +++ b/Order/etc/module.xml @@ -1,6 +1,6 @@ - + diff --git a/composer.json b/composer.json index 207f82c..1859f33 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "activecampaign/module-integration", "description": "ActiveCampaign extension for Magento 2.3 and 2.4", "type": "magento2-component", - "version": "2.0.10", + "version": "2.0.11", "license": "OSL-3.0", "require": { "php": "~7.3.0||~7.4.0||~8.0||~8.1||~8.2" diff --git a/marketplace-composer.json b/marketplace-composer.json index 59a868c..a8e97ce 100644 --- 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.10", + "version": "2.0.11", "license": [ "OSL-3.0" ], From d04d2f4a45bb987d3a3e25b44091147cb9201397 Mon Sep 17 00:00:00 2001 From: Jorge Venzon Date: Wed, 27 Sep 2023 08:37:08 -0300 Subject: [PATCH 2/2] v2.0.12 --- AbandonedCart/Model/AbandonedCartSendData.php | 4 ++-- AbandonedCart/composer.json | 2 +- AbandonedCart/etc/module.xml | 2 +- composer.json | 2 +- marketplace-composer.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/AbandonedCart/Model/AbandonedCartSendData.php b/AbandonedCart/Model/AbandonedCartSendData.php index acee399..32904d8 100644 --- a/AbandonedCart/Model/AbandonedCartSendData.php +++ b/AbandonedCart/Model/AbandonedCartSendData.php @@ -315,8 +315,8 @@ public function sendAbandonedCartData($quoteId = null): array "discountAmount" => $this->coreHelper->priceToCents($abandonedCart->getDiscountAmount()) ], "orderUrl" => $this->urlBuilder->getDirectUrl('checkout/cart'), - "abandonedDate" => $abandonedCart->getCreatedAt(), - "externalCreatedDate" => $this->dateTime->date($abandonedCart->getUpdatedAt())->format('Y-m-d H:i:s'), + "abandonedDate" => $this->dateTime->date($abandonedCart->getCreatedAt())->format('Y-m-d H:i:s'), + "externalCreatedDate" => $this->dateTime->date($abandonedCart->getCreatedAt())->format('Y-m-d H:i:s'), "externalUpdatedDate" => $this->dateTime->date($abandonedCart->getUpdatedAt())->format('Y-m-d H:i:s'), "shippingMethod" => $abandonedCart->getShippingMethod(), "totalPrice" => $this->coreHelper->priceToCents($abandonedCart->getGrandTotal()), diff --git a/AbandonedCart/composer.json b/AbandonedCart/composer.json index 75d4710..e1eea16 100644 --- a/AbandonedCart/composer.json +++ b/AbandonedCart/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.*" diff --git a/AbandonedCart/etc/module.xml b/AbandonedCart/etc/module.xml index 2c55f94..00fd351 100644 --- a/AbandonedCart/etc/module.xml +++ b/AbandonedCart/etc/module.xml @@ -6,7 +6,7 @@ */ --> - + diff --git a/composer.json b/composer.json index 1859f33..877616b 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "activecampaign/module-integration", "description": "ActiveCampaign extension for Magento 2.3 and 2.4", "type": "magento2-component", - "version": "2.0.11", + "version": "2.0.12", "license": "OSL-3.0", "require": { "php": "~7.3.0||~7.4.0||~8.0||~8.1||~8.2" diff --git a/marketplace-composer.json b/marketplace-composer.json index a8e97ce..277286c 100644 --- 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.11", + "version": "2.0.12", "license": [ "OSL-3.0" ],