issue-78 issue-55

Author: jorgeeurekalabs

AbandonedCart/Plugin/Checkout/Model/GuestPaymentInformationManagementPlugin.php

@@ -55,7 +55,11 @@ public function afterSavePaymentInformation(
     ) {
         $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
         if ($this->abandonedCartHelper->isAbandonedCartSyncingEnabled()) {
-            $response = $this->abandonedCartSendData->sendAbandonedCartData($quoteIdMask->getQuoteId());
+            try{
+                $response = $this->abandonedCartSendData->sendAbandonedCartData($quoteIdMask->getQuoteId());
+            } catch (\Exception $e) {
+
+            }
         }
     }
-}   
+}

AbandonedCart/Plugin/Checkout/Model/PaymentInformationManagementPlugin.php

@@ -49,7 +49,11 @@ public function afterSavePaymentInformation(
         $quote = $quoteRepository->getActive($cartId);
 
         if ($this->abandonedCartHelper->isAbandonedCartSyncingEnabled()) {
-            $response = $this->abandonedCartSendData->sendAbandonedCartData($quote->getId());
+            try{
+                $response = $this->abandonedCartSendData->sendAbandonedCartData($quote->getId());
+            } catch (\Exception $e) {
+
+            }
         }
     }
 

AbandonedCart/composer.json

@@ -9,7 +9,7 @@
     "config": {
         "sort-packages": true
     },
-    "version": "2.1.11",
+    "version": "2.1.12",
     "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.11">
+    <module name="ActiveCampaign_AbandonedCart" setup_version="2.1.12">
         <sequence>
             <module name="Magento_Product"/>
             <module name="Magento_Sales"/>

Core/composer.json

@@ -9,7 +9,7 @@
     "config": {
         "sort-packages": true
     },
-    "version": "2.1.22",
+    "version": "2.1.23",
     "require": {
         "php": "~7.3.0||~7.4.0||~8.0||~8.1||~8.2"
     },

Core/etc/module.xml

@@ -1,4 +1,4 @@
 <?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_Core" setup_version="2.1.22"/>
+	<module name="ActiveCampaign_Core" setup_version="2.1.23"/>
 </config>

Customer/Model/Customer.php

@@ -222,9 +222,12 @@ public function saveResult($customerId, $syncStatus, $contactId, $ecomCustomerId
         }
 
         $customerModel->setAcSyncStatus($syncStatus);
-        $customerModel->setAcContactId($contactId);
-        $customerModel->setAcCustomerId($ecomCustomerId);
-
+        if ($contactId) {
+            $customerModel->setAcContactId($contactId);
+        }
+        if ($ecomCustomerId) {
+            $customerModel->setAcCustomerId($ecomCustomerId);
+        }
         $this->customerResource->save($customerModel);
     }
 

Customer/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.*"

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.12">
+	<module name="ActiveCampaign_Customer" setup_version="2.1.13">
         <sequence>
             <module name="ActiveCampaign_Core"/>
         </sequence>

Order/Model/OrderData/OrderDataSend.php

@@ -291,7 +291,7 @@ public function orderDataSend($order): array
                         foreach ($ecomOrders as $ecomKey => $customers) {
                             $ecomOrderArray[$ecomOrders[$ecomKey]['email']] = $ecomOrders[$ecomKey]['id'];
                         }
-                        $acOrderId = $ecomOrderArray[$customerEmail];
+                        $acOrderId = $ecomOrderArray[$quote->getBillingAddress()->getEmail()];
                     } else {
                         $acOrderId = isset($result['data']['ecomOrder']['id']) ? $result['data']['ecomOrder']['id'] : null;
                     }