Merge pull request #74 from jorgeeurekalabs/main

v2.1.20
ActiveCampaign · Apr 19, 2024 · 27d7aaf · 27d7aaf
2 parents 44ec9f1 + e67ef40
commit 27d7aaf
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 20 deletions.
diff --git a/AbandonedCart/Model/AbandonedCartSendData.php b/AbandonedCart/Model/AbandonedCartSendData.php
@@ -249,7 +249,7 @@ public function sendAbandonedCartData($quoteId = null): array
 
             $quote = $this->quoteRepository->get($abandonedCart->getEntityId());
             $AcCustomer = NULL;
-            if ($this->isGuest($quote) || ($abandonedCart->getCustomerId() && !$this->getCustomer($abandonedCart->getCustomerId())->getCustomerId())) {
+            if ($this->isGuest($quote) || ($abandonedCart->getCustomerId() && !$this->getCustomer($abandonedCart->getCustomerId())->getId())) {
                 $customerEmail = $quote->getBillingAddress()->getEmail();
                 if (!$customerEmail) {
                     $result['error'] = __('Customer Email does not exist.');
@@ -270,6 +270,10 @@ public function sendAbandonedCartData($quoteId = null): array
             $abandonedCart->collectTotals();
             $quoteItemsData = $this->getQuoteItemsData($abandonedCart->getEntityId(), $abandonedCart->getStoreId());
             $abandonedCartRepository = $this->quoteRepository->get($abandonedCart->getId());
+            $abandonedUpdateDate = $abandonedCartRepository->getUpdatedAt();
+            if(is_null($abandonedUpdateDate)){
+                $abandonedUpdateDate = $abandonedCartRepository->getCreatedAt();
+            }
             $timezone = $this->dateTime->getConfigTimezone(\Magento\Store\Model\ScopeInterface::SCOPE_STORES, $abandonedCart->getStoreId());
             $abandonedCartData = [
                 "ecomOrder" => [
@@ -281,9 +285,9 @@ public function sendAbandonedCartData($quoteId = null): array
                         "discountAmount" => $this->coreHelper->priceToCents($abandonedCart->getDiscountAmount())
                     ],
                     "orderUrl" => $this->urlBuilder->getDirectUrl('checkout/cart'),
-                    "abandonedDate" => $this->dateTime->date(strtotime($abandonedCartRepository->getUpdatedAt()),NULL,$timezone)->format('Y-m-d\TH:i:sP'),
+                    "abandonedDate" => $this->dateTime->date(strtotime($abandonedUpdateDate),NULL,$timezone)->format('Y-m-d\TH:i:sP'),
                     "externalCreatedDate" => $this->dateTime->date(strtotime($abandonedCartRepository->getCreatedAt()),NULL,$timezone)->format('Y-m-d\TH:i:sP'),
-                    "externalUpdatedDate" => $this->dateTime->date(strtotime($abandonedCartRepository->getUpdatedAt()),NULL,$timezone)->format('Y-m-d\TH:i:sP'),
+                    "externalUpdatedDate" => $this->dateTime->date(strtotime($abandonedUpdateDate),NULL,$timezone)->format('Y-m-d\TH:i:sP'),
                     "shippingMethod" => $abandonedCart->getShippingAddress()->getShippingMethod(),
                     "totalPrice" => $this->coreHelper->priceToCents($abandonedCart->getGrandTotal()),
                     "shippingAmount" => $this->coreHelper->priceToCents($abandonedCart->getShippingAmount()),

diff --git a/AbandonedCart/composer.json b/AbandonedCart/composer.json
@@ -9,7 +9,7 @@
     "config": {
         "sort-packages": true
     },
-    "version": "2.1.8",
+    "version": "2.1.9",
     "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
@@ -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.8">
+    <module name="ActiveCampaign_AbandonedCart" setup_version="2.1.9">
         <sequence>
             <module name="Magento_Product"/>
             <module name="Magento_Sales"/>

diff --git a/Customer/Model/Customer.php b/Customer/Model/Customer.php
@@ -169,7 +169,7 @@ public function getEcomCustomerData($customer)
         $ecomCustomer['connectionid'] = $this->coreHelper->getConnectionId($customer->getStoreId());
         $ecomCustomer['externalid'] = $customer->getId();
         $ecomCustomer['email'] = $customer->getEmail();
-        $ecomCustomerData['acceptsMarketing'] = (int)$this->subscriberFactory->create()->loadByCustomer($customer->getId(),$customer->getWebsiteId())->isSubscribed();
+        $ecomCustomer['acceptsMarketing'] = (int)$this->subscriberFactory->create()->loadBySubscriberEmail($customer->getEmail(), $customer->getWebsiteId())->isSubscribed();
         $ecomCustomerData['ecomCustomer'] = $ecomCustomer;
 
         return $ecomCustomerData;
@@ -178,13 +178,16 @@ public function getEcomCustomerData($customer)
     /**
      * @param null $billingId
      * @return string|null
-     * @throws \Magento\Framework\Exception\LocalizedException
      */
     private function getTelephone($billingId = null)
     {
         if ($billingId) {
-            $address = $this->addressRepository->getById($billingId);
-            return $address->getTelephone();
+           try{
+              $address = $this->addressRepository->getById($billingId);
+              return $address->getTelephone();
+          }catch (\Exception $exception){
+
+           }
         }
         return null;
     }

diff --git a/Customer/composer.json b/Customer/composer.json
@@ -9,7 +9,7 @@
     "config": {
         "sort-packages": true
     },
-    "version": "2.1.8",
+    "version": "2.1.9",
     "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.8">
+	<module name="ActiveCampaign_Customer" setup_version="2.1.9">
         <sequence>
             <module name="ActiveCampaign_Core"/>
         </sequence>

diff --git a/Order/Model/OrderData/OrderDataSend.php b/Order/Model/OrderData/OrderDataSend.php
@@ -224,20 +224,19 @@ public function orderDataSend($order): array
                 }
                 $timezone = $this->dateTime->getConfigTimezone(\Magento\Store\Model\ScopeInterface::SCOPE_STORES, $order->getStoreId());
                 foreach ($order->getAllVisibleItems() as $item) {
-                    $product = $this->_productRepositoryFactory->create()
-                                ->get($item->getSku());
+
                     $imageUrl = $this->imageHelperFactory->create()
-                                ->init($product, 'product_thumbnail_image')->getUrl();
+                                ->init($item->getProduct(), 'product_thumbnail_image')->getUrl();
                     $items[] = [
                                 "externalid" => $item->getProductId(),
                                 "name" => $item->getName(),
                                 "price" => $this->activeCampaignHelper->priceToCents($item->getPrice()),
                                 "quantity" => $item->getQtyOrdered(),
-                                "category" => implode(', ', $product->getCategoryIds()),
+                                "category" => implode(', ', $item->getProduct()->getCategoryIds()),
                                 "sku" => $item->getSku(),
                                 "description" => $item->getDescription(),
                                 "imageUrl" => $imageUrl,
-                                "productUrl" => $product->getProductUrl()
+                                "productUrl" => $item->getProduct()->getProductUrl()
                             ];
                 }
                 $data = [

diff --git a/Order/composer.json b/Order/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/Order/etc/module.xml b/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.4">
+    <module name="ActiveCampaign_Order" setup_version="2.1.5">
         <sequence>
             <module name="ActiveCampaign_Core" />
             <module name="ActiveCampaign_Customer"/>

diff --git 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.17",
+    "version": "2.1.20",
     "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
@@ -2,7 +2,7 @@
   "name": "activecampaign/module-integration",
   "description": "ActiveCampaign extension for Magento 2.3 and 2.4",
   "type": "metapackage",
-  "version": "2.0.18",
+  "version": "2.1.20",
   "license": [
     "OSL-3.0"
   ],