From 498646c10a222b5138f1c6ac051580e68968e0c0 Mon Sep 17 00:00:00 2001
From: Uryvskiy Dima <uryvskiydima@gmail.com>
Date: Thu, 29 Feb 2024 16:00:48 +0300
Subject: [PATCH] ref #94710 Fixed an error when transferring abandoned carts
 (#323)

---
 CHANGELOG.md                            | 3 +++
 VERSION                                 | 2 +-
 src/include/class-wc-retailcrm-base.php | 2 +-
 src/include/class-wc-retailcrm-cart.php | 9 +++++++--
 src/readme.txt                          | 5 ++++-
 src/retailcrm.php                       | 2 +-
 src/uninstall.php                       | 2 +-
 tests/test-wc-retailcrm-cart.php        | 2 +-
 8 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e47ebc..adb9995 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 2024-02-29 4.7.4
+* Fixed an error when transferring abandoned carts
+
 ## 2024-02-07 4.7.3
 * Added filters after creating and updating an order
 
diff --git a/VERSION b/VERSION
index 87b18a5..b48b2de 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.7.3
+4.7.4
diff --git a/src/include/class-wc-retailcrm-base.php b/src/include/class-wc-retailcrm-base.php
index 254e5c0..729e8f1 100644
--- a/src/include/class-wc-retailcrm-base.php
+++ b/src/include/class-wc-retailcrm-base.php
@@ -119,7 +119,7 @@ if (!class_exists('WC_Retailcrm_Base')) {
             }
 
             if ($this->get_option('abandoned_carts_enabled') === static::YES) {
-                $this->cart = new WC_Retailcrm_Cart($this->apiClient);
+                $this->cart = new WC_Retailcrm_Cart($this->apiClient, $this->settings);
 
                 add_action('woocommerce_add_to_cart', [$this, 'set_cart']);
                 add_action('woocommerce_after_cart_item_quantity_update', [$this, 'set_cart']);
diff --git a/src/include/class-wc-retailcrm-cart.php b/src/include/class-wc-retailcrm-cart.php
index 9f2db21..b5c8b35 100644
--- a/src/include/class-wc-retailcrm-cart.php
+++ b/src/include/class-wc-retailcrm-cart.php
@@ -17,9 +17,12 @@ if (!class_exists('WC_Retailcrm_Carts')) :
         protected $apiClient;
         protected $dateFormat;
 
-        public function __construct($apiClient)
+        protected $settings;
+
+        public function __construct($apiClient, $settings)
         {
             $this->apiClient = $apiClient;
+            $this->settings = $settings;
             $this->dateFormat = 'Y-m-d H:i:sP';
         }
 
@@ -53,11 +56,13 @@ if (!class_exists('WC_Retailcrm_Carts')) :
                     return $this->clearCart($customerId, $site, $isCartExist);
                 }
 
+                $useXmlId = isset($this->settings['bind_by_sku']) && $this->settings['bind_by_sku'] === WC_Retailcrm_Base::YES;
+
                 foreach ($cartItems as $item) {
                     $product = $item['data'];
 
                     $crmCart['items'][] = [
-                        'offer' => ['externalId' => $product->get_id()],
+                        'offer' =>  $useXmlId ? ['xmlId' => $product->get_sku()] : ['externalId' => $product->get_id()],
                         'quantity' => $item['quantity'],
                         'createdAt' => $product->get_date_created()->date($this->dateFormat) ?? date($this->dateFormat),
                         'updatedAt' => $product->get_date_modified()->date($this->dateFormat) ?? date($this->dateFormat),
diff --git a/src/readme.txt b/src/readme.txt
index c18cb86..97a2de8 100644
--- a/src/readme.txt
+++ b/src/readme.txt
@@ -5,7 +5,7 @@ Tags: Интеграция, Simla.com, simla
 Requires PHP: 7.0
 Requires at least: 5.3
 Tested up to: 6.4
-Stable tag: 4.7.3
+Stable tag: 4.7.4
 License: GPLv1 or later
 License URI: http://www.gnu.org/licenses/gpl-1.0.html
 
@@ -82,6 +82,9 @@ Asegúrate de tener una clave API específica para cada tienda. Las siguientes i
 
 
 == Changelog ==
+= 4.7.4 =
+* Fixed an error when transferring abandoned carts
+
 = 4.7.3 =
 * Added filters after creating and updating an order
 
diff --git a/src/retailcrm.php b/src/retailcrm.php
index 021c81a..c965d97 100644
--- a/src/retailcrm.php
+++ b/src/retailcrm.php
@@ -5,7 +5,7 @@
  * Description: Integration plugin for WooCommerce & Simla.com
  * Author: RetailDriver LLC
  * Author URI: http://retailcrm.pro/
- * Version: 4.7.3
+ * Version: 4.7.4
  * Tested up to: 6.4
  * WC requires at least: 5.4
  * WC tested up to: 8.5
diff --git a/src/uninstall.php b/src/uninstall.php
index 260d39b..f0f9705 100644
--- a/src/uninstall.php
+++ b/src/uninstall.php
@@ -16,7 +16,7 @@
  *
  * @link       https://wordpress.org/plugins/woo-retailcrm/
  *
- * @version    4.7.3
+ * @version    4.7.4
  *
  * @package    RetailCRM
  */
diff --git a/tests/test-wc-retailcrm-cart.php b/tests/test-wc-retailcrm-cart.php
index 4749f7b..d239d0b 100644
--- a/tests/test-wc-retailcrm-cart.php
+++ b/tests/test-wc-retailcrm-cart.php
@@ -37,7 +37,7 @@ class WC_Retailcrm_Cart_Test extends WC_Retailcrm_Test_Case_Helper
         $this->setMockResponse($this->apiMock, 'cartSet', $this->responseMock);
         $this->setMockResponse($this->apiMock, 'cartClear', $this->responseMock);
 
-        $this->cart = new WC_Retailcrm_Cart($this->apiMock);
+        $this->cart = new WC_Retailcrm_Cart($this->apiMock, $this->getOptions());
     }
 
     public function testApiGetCart()