Change part_1

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2023-12-06 4.7.0
+* Fix module activation/deactivation
+
 ## 2023-11-20 4.6.14
 * Fix module activation/deactivation
 

VERSION

@@ -1 +1 @@
-4.6.14
+4.7.0

src/include/class-wc-retailcrm-base.php

@@ -821,7 +821,11 @@ if (!class_exists('WC_Retailcrm_Base')) {
         {
             global $wpdb;
 
-            $table = $entity === 'order' ? $wpdb->postmeta : $wpdb->usermeta;
+            if ('user' === $entity) {
+                $table = $wpdb->usermeta;
+            } else {
+                $table = useHpos() ? $wpdb->prefix . 'wc_orders_meta' : $wpdb->postmeta;
+            }
 
             $metaData = ['default_retailcrm' => __('Select value', 'retailcrm')];
             $sqlQuery = "SELECT DISTINCT `meta_key` FROM $table ORDER BY `meta_key`";

src/include/class-wc-retailcrm-history.php

@@ -1354,7 +1354,7 @@ if (!class_exists('WC_Retailcrm_History')) :
                 }
 
                 if ($wcObject instanceof WC_Order) {
-                    update_post_meta($wcObject->get_id(), $metaKey, $crmData['customFields'][$customKey]);
+                    $wcObject->update_meta_data($metaKey, $crmData['customFields'][$customKey]);
                 } else {
                     update_user_meta($wcObject->get_id(), $metaKey, $crmData['customFields'][$customKey]);
                 }

src/include/class-wc-retailcrm-uploader.php

@@ -169,9 +169,14 @@ if (class_exists('WC_Retailcrm_Uploader') === false) {
         {
             global $wpdb;
 
-            $result = $wpdb->get_results("SELECT COUNT(ID) as `count` FROM $wpdb->posts WHERE post_type = 'shop_order'");
+            if (useHpos()) {
+                // Use {$wpdb->prefix}, because wp_wc_orders not standard WP table
+                $result = $wpdb->get_results("SELECT COUNT(ID) as `count` FROM {$wpdb->prefix}wc_orders");
+            } else {
+                $result = $wpdb->get_results("SELECT COUNT(ID) as `count` FROM $wpdb->posts WHERE post_type = 'shop_order'");
+            }
 
-            return empty($result[0]->count) === false ? (int) $result[0]->count : 0;
+            return $result[0]->count ?? 0;
         }
 
 

src/include/functions.php

@@ -1,7 +1,5 @@
 <?php
 
-use Automattic\WooCommerce\Utilities\FeaturesUtil;
-
 if (! defined('ABSPATH')) {
     exit; // Exit if accessed directly
 }
@@ -191,15 +189,23 @@ function calculatePriceExcludingTax($priceIncludingTax, $rate)
  */
 function writeBaseLogs($message)
 {
-    WC_Retailcrm_Logger::debug(__METHOD__, $message);
+    WC_Retailcrm_Logger::addCaller(__METHOD__, $message);
 }
 
-
-
+/**
+ * Checking the use of HPOS.
+ *
+ * @codeCoverageIgnore
+ */
+function useHpos()
+{
+    return class_exists(Automattic\WooCommerce\Utilities\OrderUtil::class)
+        && Automattic\WooCommerce\Utilities\OrderUtil::custom_orders_table_usage_is_enabled();
+}
 
 // TODO добавить правильно
 add_action('before_woocommerce_init', function() {
-    if ( class_exists( FeaturesUtil::class ) ) {
-        FeaturesUtil::declare_compatibility( 'custom_order_tables', 'retailcrm.php', true);
+    if (class_exists( Automattic\WooCommerce\Utilities\FeaturesUtil::class)) {
+        Automattic\WooCommerce\Utilities\FeaturesUtil::declare_compatibility('custom_order_tables', 'retailcrm.php', true);
     }
-} );
+});

src/readme.txt

@@ -4,8 +4,8 @@ Donate link: https://www.simla.com
 Tags: Интеграция, Simla.com, simla
 Requires PHP: 7.0
 Requires at least: 5.3
-Tested up to: 6.2
-Stable tag: 4.6.14
+Tested up to: 6.4
+Stable tag: 4.7.0
 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.0 =
+* Added support WooCommerce 8.2 (HPOS)n
+
 = 4.6.14 =
 * Fix module activation/deactivation
 

src/retailcrm.php

@@ -5,10 +5,10 @@
  * Description: Integration plugin for WooCommerce & Simla.com
  * Author: RetailDriver LLC
  * Author URI: http://retailcrm.pro/
- * Version: 4.6.14
- * Tested up to: 6.2
+ * Version: 4.7.0
+ * Tested up to: 6.4
  * WC requires at least: 5.4
- * WC tested up to: 7.8
+ * WC tested up to: 8.3
  * Text Domain: retailcrm
  */
 

src/uninstall.php

@@ -16,14 +16,14 @@
  *
  * @link       https://wordpress.org/plugins/woo-retailcrm/
  *
- * @version    4.6.14
+ * @version    4.7.0
  *
  * @package    RetailCRM
  */
 
 // @codeCoverageIgnoreStart
 if (!defined('ABSPATH')) {
-    exit; // Exit if accessed directly
+    exit;
 }
 
 // If uninstall not called from WordPress, then exit.
@@ -31,18 +31,23 @@ if (!defined('WP_UNINSTALL_PLUGIN')) {
     exit;
 }
 
-global $wpdb;
-
 wp_clear_scheduled_hook('retailcrm_icml');
 wp_clear_scheduled_hook('retailcrm_history');
 wp_clear_scheduled_hook('retailcrm_inventories');
 
-// Delete options.
-$wpdb->query("DELETE FROM $wpdb->options WHERE option_name = 'woocommerce_integration-retailcrm_settings';");
-$wpdb->query("DELETE FROM $wpdb->options WHERE option_name = 'retailcrm_customers_history_since_id';");
-$wpdb->query("DELETE FROM $wpdb->options WHERE option_name = 'retailcrm_orders_history_since_id';");
-$wpdb->query("DELETE FROM $wpdb->options WHERE option_name = 'retailcrm_active_in_crm';");
-$wpdb->query("DELETE FROM $wpdb->options WHERE option_name = 'retailcrm_client_id';");
+global $wpdb;
+
+$options = [
+    'retailcrm_client_id',
+    'retailcrm_active_in_crm',
+    'retailcrm_orders_history_since_id',
+    'retailcrm_customers_history_since_id',
+    'woocommerce_integration-retailcrm_settings',
+];
+
+foreach ($options as $option) {
+    $wpdb->query("DELETE FROM $wpdb->options WHERE option_name = {$option}");
+}
 
 // Clear any cached data that has been removed
 wp_cache_flush();

tests/helpers/class-wc-retailcrm-test-case-helper.php

@@ -100,27 +100,30 @@ class WC_Retailcrm_Test_Case_Helper extends WC_Unit_Test_Case
         } else {
             global $wpdb;
 
-            foreach (
-                [
+            $tables = [
+                useHpos() ? $wpdb->prefix . 'wc_orders' : '',
+                useHpos() ? $wpdb->prefix . 'wc_orders_meta' : '',
                 $wpdb->posts,
                 $wpdb->postmeta,
                 $wpdb->comments,
                 $wpdb->commentmeta,
                 $wpdb->term_relationships,
                 $wpdb->termmeta,
-                ] as $table
-            ) {
-                //phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+            ];
+
+            foreach ($tables as $table) {
+                if ('' === $table) {
+                    continue;
+                }
+
                 $wpdb->query("DELETE FROM {$table}");
             }
 
             foreach ([$wpdb->terms, $wpdb->term_taxonomy] as $table) {
-                //phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
                 $wpdb->query("DELETE FROM {$table} WHERE term_id != 1");
             }
 
             $wpdb->query("UPDATE {$wpdb->term_taxonomy} SET count = 0");
-
             $wpdb->query("DELETE FROM {$wpdb->users} WHERE ID != 1");
             $wpdb->query("DELETE FROM {$wpdb->usermeta} WHERE user_id != 1");
         }

tests/test-wc-retailcrm-base.php

@@ -252,7 +252,7 @@ class WC_Retailcrm_Base_Test extends WC_Retailcrm_Test_Case_Helper
         $this->baseRetailcrm->count_upload_data();
 
         $uploadInfo = $this->getJsonData(ob_get_contents());
-
+        var_dump($uploadInfo);
         $this->assertInternalType('array', $uploadInfo);
         $this->assertArrayHasKey('count_orders', $uploadInfo);
         $this->assertArrayHasKey('count_users', $uploadInfo);

tests/test-wc-retailcrm-uploader.php

@@ -109,7 +109,7 @@ class WC_Retailcrm_Uploader_Test extends WC_Retailcrm_Test_Case_Helper
     {
         $retailcrm_uploader = $this->getRetailcrmUploader($this->apiMock);
         $count_orders = $retailcrm_uploader->getCountOrders();
-
+        var_dump($count_orders);
         $this->assertInternalType('int', $count_orders);
     }