RetailCRM-Mirror/woocommerce-module
1
0
Fork 0
mirror of synced 2025-01-30 14:51:42 +03:00
Code Issues Projects Releases Wiki Activity

Added support WooCommerce 8.2 (HPOS) (#319)

Browse Source
This commit is contained in:
Uryvskiy Dima 2023-12-07 12:54:40 +03:00 committed by GitHub
parent f49cc3870d
commit a0d681509d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 216 additions and 298 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,3 +1,6 @@
## 2023-12-07 4.7.0
* Added support WooCommerce 8.2 (HPOS)
## 2023-11-20 4.6.14 ## 2023-11-20 4.6.14
* Fix module activation/deactivation * Fix module activation/deactivation

2
VERSION
View File

@ -1 +1 @@
4.6.14 4.7.0

7
src/include/abstracts/class-wc-retailcrm-abstracts-settings.php
View File

@ -144,11 +144,10 @@ abstract class WC_Retailcrm_Abstracts_Settings extends WC_Integration
), ),
]; ];
foreach (get_post_statuses() as $status_key => $status_value) { foreach (get_post_statuses() as $statusKey => $statusValue) {
$this->form_fields['p_' . $status_key] = [ $this->form_fields['p_' . $statusKey] = [
'title' => $status_value, 'title' => $statusValue,
'label' => ' ', 'label' => ' ',
'description' => '',
'class' => 'checkbox', 'class' => 'checkbox',
'type' => 'checkbox', 'type' => 'checkbox',
'desc_tip' => true, 'desc_tip' => true,

42
src/include/api/class-wc-retailcrm-response.php
View File

@ -170,30 +170,32 @@ class WC_Retailcrm_Response implements \ArrayAccess
return $this->response[$offset]; return $this->response[$offset];
} }
/** /**
* Returns error string. If there's multiple errors present - they will be squashed into single string. * Returns error string. If there's multiple errors present - they will be squashed into single string.
* *
* @return string * @return string
*/ */
public function getErrorString() public function getErrorString()
{ {
if ($this->offsetExists('error')) { if ($this->offsetExists('errorMsg')) {
return (string) $this->response['error']; return (string) $this->response['errorMsg'];
} elseif ($this->offsetExists('errors') && is_array($this->response['errors'])) { }
$errorMessage = '';
foreach ($this->response['errors'] as $error) { if (is_array($this->response['errors']) && $this->offsetExists('errors')) {
$errorMessage .= $error . ' >'; $errorMessage = '';
}
if (strlen($errorMessage) > 2) { foreach ($this->response['errors'] as $error) {
return (string) substr($errorMessage, 0, strlen($errorMessage) - 2); $errorMessage .= $error . ' >';
} }
return $errorMessage; if (strlen($errorMessage) > 2) {
} return (string) substr($errorMessage, 0, strlen($errorMessage) - 2);
}
return ''; return $errorMessage;
}
return '';
} }
/** /**

6
src/include/class-wc-retailcrm-base.php
View File

@ -821,7 +821,11 @@ if (!class_exists('WC_Retailcrm_Base')) {
{ {
global $wpdb; 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')]; $metaData = ['default_retailcrm' => __('Select value', 'retailcrm')];
$sqlQuery = "SELECT DISTINCT `meta_key` FROM $table ORDER BY `meta_key`"; $sqlQuery = "SELECT DISTINCT `meta_key` FROM $table ORDER BY `meta_key`";

3
src/include/class-wc-retailcrm-history.php
View File

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

67
src/include/class-wc-retailcrm-orders.php
View File

@ -72,34 +72,40 @@ if (!class_exists('WC_Retailcrm_Orders')) :
/** /**
* Create order. Returns wc_get_order data or error string. * Create order. Returns wc_get_order data or error string.
* *
* @param $order_id * @param $orderId
* *
* @return bool|WC_Order|WC_Order_Refund|string * @return bool|WC_Order|string
* @throws \Exception * @throws \Exception
*/ */
public function orderCreate($order_id) public function orderCreate($orderId)
{ {
if (!$this->retailcrm instanceof WC_Retailcrm_Proxy) { if (!$this->retailcrm instanceof WC_Retailcrm_Proxy) {
return null; return null;
} }
$this->order_payment->resetData();
$wcOrder = wc_get_order($order_id);
$this->processOrder($wcOrder);
try { try {
$this->order_payment->resetData();
$wcOrder = wc_get_order($orderId);
$this->processOrder($wcOrder);
$response = $this->retailcrm->ordersCreate($this->order); $response = $this->retailcrm->ordersCreate($this->order);
if ($response instanceof WC_Retailcrm_Proxy) { if (!$response instanceof WC_Retailcrm_Response || !$response->isSuccessful()) {
if ($response->isSuccessful()) {
return $wcOrder;
}
return $response->getErrorString(); return $response->getErrorString();
} }
} catch (InvalidArgumentException $exception) { } catch (Throwable $exception) {
return $exception->getMessage(); writeBaseLogs(
sprintf(
'Error message: %s, file: %s on line: %s',
$exception->getMessage(),
$exception->getFile(),
$exception->getLine()
)
);
return null;
} }
return $wcOrder; return $wcOrder;
@ -252,25 +258,38 @@ if (!class_exists('WC_Retailcrm_Orders')) :
/** /**
* Edit order in CRM * Edit order in CRM
* *
* @param int $order_id * @param int $orderId
* *
* @return WC_Order $order | null * @return WC_Order $order | null
* @throws \Exception * @throws \Exception
*/ */
public function updateOrder($order_id) public function updateOrder($orderId)
{ {
if (!$this->retailcrm instanceof WC_Retailcrm_Proxy) { if (!$this->retailcrm instanceof WC_Retailcrm_Proxy) {
return null; return null;
} }
$wcOrder = wc_get_order($order_id); try {
$wcOrder = wc_get_order($orderId);
$this->processOrder($wcOrder, true); $this->processOrder($wcOrder, true);
$response = $this->retailcrm->ordersEdit($this->order); $response = $this->retailcrm->ordersEdit($this->order);
if (!empty($response) && $response->isSuccessful()) { if ($response instanceof WC_Retailcrm_Response && $response->isSuccessful()) {
$this->payment = $this->orderUpdatePaymentType($wcOrder); $this->payment = $this->orderUpdatePaymentType($wcOrder);
}
} catch (Throwable $exception) {
writeBaseLogs(
sprintf(
'Error message: %s, file: %s on line: %s',
$exception->getMessage(),
$exception->getFile(),
$exception->getLine()
)
);
return null;
} }
return $wcOrder; return $wcOrder;
@ -337,11 +356,11 @@ if (!class_exists('WC_Retailcrm_Orders')) :
return; return;
} }
if ($order->get_status() == 'auto-draft') { if ('auto-draft' === $order->get_status()) {
return; return;
} }
if ($update === true) { if ($update) {
$this->orders->is_new = false; $this->orders->is_new = false;
} }

77
src/include/class-wc-retailcrm-uploader.php
View File

@ -59,11 +59,13 @@ if (class_exists('WC_Retailcrm_Uploader') === false) {
*/ */
public function uploadSelectedOrders() public function uploadSelectedOrders()
{ {
if (!empty($_GET['order_ids_retailcrm'])) { $ids = $_GET['order_ids_retailcrm'];
$ids = array_unique(explode(',', $_GET['order_ids_retailcrm']));
if (!empty($ids)) {
if (!empty($ids)) { preg_match_all('/\d+/', $ids, $matches);
$this->uploadArchiveOrders(0, $ids);
if (!empty($matches[0])) {
$this->uploadArchiveOrders(null, $matches[0]);
} }
} }
} }
@ -71,29 +73,31 @@ if (class_exists('WC_Retailcrm_Uploader') === false) {
/** /**
* Uploads archive order in CRM * Uploads archive order in CRM
* *
* @param int $page Number page uploads. * @param null|int $page Number page uploads.
* @param array $ids Ids orders upload. * @param array $ids Ids orders upload.
* *
* @return void|null * @return void|null
* @throws Exception Invalid argument exception. * @throws Exception Invalid argument exception.
*/ */
public function uploadArchiveOrders($page, $ids = array()) public function uploadArchiveOrders($page, $ids = [])
{ {
if (!$this->retailcrm instanceof WC_Retailcrm_Proxy) { if (!$this->retailcrm instanceof WC_Retailcrm_Proxy) {
return null; return null;
} }
$uploadErrors = array(); $orderIds = [];
$ordersCms = $this->getCmsOrders($page, $ids); $uploadErrors = [];
foreach ($ordersCms as $dataOrder) { if (null !== $page) {
$orderId = $dataOrder->ID; $orderIds = $this->getCmsOrders($page);
} elseif ([] !== $ids) {
$orderIds = $ids;
}
foreach ($orderIds as $orderId) {
$errorMessage = $this->orders->orderCreate($orderId); $errorMessage = $this->orders->orderCreate($orderId);
if (true === is_string($errorMessage)) { if (is_string($errorMessage)) {
$errorMessage = empty($errorMessage) === true
? 'Order exist. External id: ' . $orderId
: $errorMessage;
$uploadErrors[$orderId] = $errorMessage; $uploadErrors[$orderId] = $errorMessage;
} }
} }
@ -118,7 +122,7 @@ if (class_exists('WC_Retailcrm_Uploader') === false) {
$users = $this->getCmsUsers($page); $users = $this->getCmsUsers($page);
if (false === empty($users)) { if (false === empty($users)) {
$dataCustomers = array(); $dataCustomers = [];
foreach ($users as $user) { foreach ($users as $user) {
if ($this->customers->isCustomer($user) === false) { if ($this->customers->isCustomer($user) === false) {
@ -140,20 +144,19 @@ if (class_exists('WC_Retailcrm_Uploader') === false) {
* Return orders ids * Return orders ids
* *
* @param integer $page Number page uploads. * @param integer $page Number page uploads.
* @param array $ids Ids orders upload.
* *
* @return mixed * @return mixed
*/ */
private function getCmsOrders($page, $ids = array()) private function getCmsOrders($page)
{ {
return get_posts( return wc_get_orders(
array( [
'numberposts' => self::RETAILCRM_COUNT_OBJECT_UPLOAD, 'type' => wc_get_order_types('view-orders'),
'offset' => self::RETAILCRM_COUNT_OBJECT_UPLOAD * $page, 'limit' => self::RETAILCRM_COUNT_OBJECT_UPLOAD,
'post_type' => wc_get_order_types('view-orders'), 'status' => array_keys(wc_get_order_statuses()),
'post_status' => array_keys(wc_get_order_statuses()), 'offset' => self::RETAILCRM_COUNT_OBJECT_UPLOAD * $page,
'include' => $ids, 'return' => 'ids',
) ]
); );
} }
@ -166,12 +169,16 @@ if (class_exists('WC_Retailcrm_Uploader') === false) {
{ {
global $wpdb; 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 ? (int) $result[0]->count : 0;
} }
/** /**
* Return users ids * Return users ids
* *
@ -179,17 +186,16 @@ if (class_exists('WC_Retailcrm_Uploader') === false) {
* *
* @return mixed * @return mixed
*/ */
private function getCmsUsers($page) private function getCmsUsers(int $page)
{ {
return get_users( return get_users(
array( [
'number' => self::RETAILCRM_COUNT_OBJECT_UPLOAD, 'number' => self::RETAILCRM_COUNT_OBJECT_UPLOAD,
'offset' => self::RETAILCRM_COUNT_OBJECT_UPLOAD * $page, 'offset' => self::RETAILCRM_COUNT_OBJECT_UPLOAD * $page,
) ]
); );
} }
/** /**
* Return count users * Return count users
* *
@ -199,10 +205,9 @@ if (class_exists('WC_Retailcrm_Uploader') === false) {
{ {
$userCount = count_users(); $userCount = count_users();
return empty($userCount['total_users']) === false ? $userCount['total_users'] : 0; return $userCount['total_users'] ? (int) $userCount['total_users'] : 0;
} }
/** /**
* Array keys must be orders ID's in WooCommerce, values must be strings (error messages). * Array keys must be orders ID's in WooCommerce, values must be strings (error messages).
* *

11
src/include/functions.php
View File

@ -191,3 +191,14 @@ function writeBaseLogs($message)
{ {
WC_Retailcrm_Logger::addCaller(__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();
}

7
src/readme.txt
View File

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

12
src/retailcrm.php
View File

@ -5,10 +5,10 @@
* Description: Integration plugin for WooCommerce & Simla.com * Description: Integration plugin for WooCommerce & Simla.com
* Author: RetailDriver LLC * Author: RetailDriver LLC
* Author URI: http://retailcrm.pro/ * Author URI: http://retailcrm.pro/
* Version: 4.6.14 * Version: 4.7.0
* Tested up to: 6.2 * Tested up to: 6.4
* WC requires at least: 5.4 * WC requires at least: 5.4
* WC tested up to: 7.8 * WC tested up to: 8.3
* Text Domain: retailcrm * Text Domain: retailcrm
*/ */
@ -211,4 +211,10 @@ if (!class_exists( 'WC_Integration_Retailcrm')) :
$plugin->register_deactivation_hook(); $plugin->register_deactivation_hook();
add_action('plugins_loaded', ['WC_Integration_Retailcrm', 'get_instance'], 0); add_action('plugins_loaded', ['WC_Integration_Retailcrm', 'get_instance'], 0);
add_action('before_woocommerce_init', function() {
if (class_exists( Automattic\WooCommerce\Utilities\FeaturesUtil::class)) {
Automattic\WooCommerce\Utilities\FeaturesUtil::declare_compatibility('custom_order_tables', __FILE__, true);
}
});
endif; endif;

25
src/uninstall.php
View File

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

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

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

210
tests/test-wc-retailcrm-history.php
View File

@ -327,26 +327,28 @@ class WC_Retailcrm_History_Test extends WC_Retailcrm_Test_Case_Helper
{ {
$this->deleteAllData(); $this->deleteAllData();
$this->regenerateMocks(); $this->regenerateMocks();
$order_id = $this->history_order_create_for_changing_customer();
$this->assertNotEmpty($order_id); $orderId = $this->history_order_create_for_changing_customer();
$this->assertNotEmpty($orderId);
$this->regenerateMocks(); $this->regenerateMocks();
$this->history_order_switch_customer($order_id); $this->history_order_switch_customer($orderId);
$this->regenerateMocks(); $this->regenerateMocks();
$this->history_order_switch_customer_to_corporate($order_id); $this->history_order_switch_customer_to_corporate($orderId);
$this->regenerateMocks(); $this->regenerateMocks();
$this->history_order_switch_customer_to_another_corporate($order_id); $this->history_order_switch_customer_to_another_corporate($orderId);
$this->regenerateMocks(); $this->regenerateMocks();
$this->history_order_switch_only_company($order_id); $this->history_order_switch_only_company($orderId);
$this->regenerateMocks(); $this->regenerateMocks();
$this->history_order_switch_only_contact($order_id); $this->history_order_switch_only_contact($orderId);
$this->regenerateMocks(); $this->regenerateMocks();
$this->history_order_switch_back_to_individual($order_id); $this->history_order_switch_back_to_individual($orderId);
} }
public function history_order_create_for_changing_customer() public function history_order_create_for_changing_customer()
@ -376,16 +378,16 @@ class WC_Retailcrm_History_Test extends WC_Retailcrm_Test_Case_Helper
} }
/** /**
* @param int $order_id * @param int $orderId
* *
* @throws \Exception * @throws \Exception
*/ */
public function history_order_switch_customer($order_id) public function history_order_switch_customer(int $orderId)
{ {
$this->mockHistory( $this->mockHistory(
true, true,
DataHistoryRetailCrm::empty_history(), DataHistoryRetailCrm::empty_history(),
DataHistoryRetailCrm::get_history_change_to_another_individual($order_id) DataHistoryRetailCrm::get_history_change_to_another_individual($orderId)
); );
$this->ordersGetMock( $this->ordersGetMock(
@ -396,31 +398,7 @@ class WC_Retailcrm_History_Test extends WC_Retailcrm_Test_Case_Helper
$retailcrm_history = new \WC_Retailcrm_History($this->apiMock); $retailcrm_history = new \WC_Retailcrm_History($this->apiMock);
$retailcrm_history->getHistory(); $retailcrm_history->getHistory();
try { $order = new WC_Order($orderId);
$order = new WC_Order($order_id);
} catch (\Exception $exception) {
$post = get_post($order_id);
if (!$post instanceof WP_Post) {
$this->fail(sprintf('Cannot find order with id=%d', $order_id));
}
if (!in_array($post->post_type, wc_get_order_types())) {
$this->fail(sprintf(
'Invalid order post type `%s`. Should be one of these: %s',
$post->post_type,
implode(', ', wc_get_order_types())
));
} else {
$this->fail(sprintf(
'Cannot determine what\'s wrong with order id=%d. Message from WooCommerce: %s',
$order_id,
$exception->getMessage()
));
}
return;
}
$this->assertEquals('tester002', $order->get_billing_first_name()); $this->assertEquals('tester002', $order->get_billing_first_name());
$this->assertEquals('tester002', $order->get_billing_last_name()); $this->assertEquals('tester002', $order->get_billing_last_name());
@ -437,16 +415,16 @@ class WC_Retailcrm_History_Test extends WC_Retailcrm_Test_Case_Helper
} }
/** /**
* @param int $order_id * @param int $orderId
* *
* @throws \Exception * @throws \Exception
*/ */
public function history_order_switch_customer_to_corporate($order_id) public function history_order_switch_customer_to_corporate(int $orderId)
{ {
$this->mockHistory( $this->mockHistory(
true, true,
DataHistoryRetailCrm::empty_history(), DataHistoryRetailCrm::empty_history(),
DataHistoryRetailCrm::get_history_change_to_corporate($order_id) DataHistoryRetailCrm::get_history_change_to_corporate($orderId)
); );
$this->ordersGetMock( $this->ordersGetMock(
@ -462,31 +440,7 @@ class WC_Retailcrm_History_Test extends WC_Retailcrm_Test_Case_Helper
$retailcrm_history = new \WC_Retailcrm_History($this->apiMock); $retailcrm_history = new \WC_Retailcrm_History($this->apiMock);
$retailcrm_history->getHistory(); $retailcrm_history->getHistory();
try { $order = new WC_Order($orderId);
$order = new WC_Order($order_id);
} catch (\Exception $exception) {
$post = get_post($order_id);
if (!$post instanceof WP_Post) {
$this->fail(sprintf('Cannot find order with id=%d', $order_id));
}
if (!in_array($post->post_type, wc_get_order_types())) {
$this->fail(sprintf(
'Invalid order post type `%s`. Should be one of these: %s',
$post->post_type,
implode(', ', wc_get_order_types())
));
} else {
$this->fail(sprintf(
'Cannot determine what\'s wrong with order id=%d. Message from WooCommerce: %s',
$order_id,
$exception->getMessage()
));
}
return;
}
$this->assertEquals('psycho913', $order->get_billing_first_name()); $this->assertEquals('psycho913', $order->get_billing_first_name());
$this->assertEquals('psycho913', $order->get_billing_last_name()); $this->assertEquals('psycho913', $order->get_billing_last_name());
@ -500,16 +454,16 @@ class WC_Retailcrm_History_Test extends WC_Retailcrm_Test_Case_Helper
} }
/** /**
* @param int $order_id * @param int $orderId
* *
* @throws \Exception * @throws \Exception
*/ */
public function history_order_switch_customer_to_another_corporate($order_id) public function history_order_switch_customer_to_another_corporate($orderId)
{ {
$this->mockHistory( $this->mockHistory(
true, true,
DataHistoryRetailCrm::empty_history(), DataHistoryRetailCrm::empty_history(),
DataHistoryRetailCrm::get_history_change_to_another_corporate($order_id) DataHistoryRetailCrm::get_history_change_to_another_corporate($orderId)
); );
$this->ordersGetMock( $this->ordersGetMock(
@ -525,31 +479,7 @@ class WC_Retailcrm_History_Test extends WC_Retailcrm_Test_Case_Helper
$retailcrm_history = new \WC_Retailcrm_History($this->apiMock); $retailcrm_history = new \WC_Retailcrm_History($this->apiMock);
$retailcrm_history->getHistory(); $retailcrm_history->getHistory();
try { $order = new WC_Order($orderId);
$order = new WC_Order($order_id);
} catch (\Exception $exception) {
$post = get_post($order_id);
if (!$post instanceof WP_Post) {
$this->fail(sprintf('Cannot find order with id=%d', $order_id));
}
if (!in_array($post->post_type, wc_get_order_types())) {
$this->fail(sprintf(
'Invalid order post type `%s`. Should be one of these: %s',
$post->post_type,
implode(', ', wc_get_order_types())
));
} else {
$this->fail(sprintf(
'Cannot determine what\'s wrong with order id=%d. Message from WooCommerce: %s',
$order_id,
$exception->getMessage()
));
}
return;
}
$this->assertEquals('Tester4867', $order->get_billing_first_name()); $this->assertEquals('Tester4867', $order->get_billing_first_name());
$this->assertEquals('Tester4867', $order->get_billing_last_name()); $this->assertEquals('Tester4867', $order->get_billing_last_name());
@ -564,16 +494,16 @@ class WC_Retailcrm_History_Test extends WC_Retailcrm_Test_Case_Helper
} }
/** /**
* @param int $order_id * @param int $orderId
* *
* @throws \Exception * @throws \Exception
*/ */
public function history_order_switch_only_company($order_id) public function history_order_switch_only_company(int $orderId)
{ {
$this->mockHistory( $this->mockHistory(
true, true,
DataHistoryRetailCrm::empty_history(), DataHistoryRetailCrm::empty_history(),
DataHistoryRetailCrm::get_history_change_only_company($order_id) DataHistoryRetailCrm::get_history_change_only_company($orderId)
); );
$this->ordersGetMock( $this->ordersGetMock(
@ -589,31 +519,7 @@ class WC_Retailcrm_History_Test extends WC_Retailcrm_Test_Case_Helper
$retailcrm_history = new \WC_Retailcrm_History($this->apiMock); $retailcrm_history = new \WC_Retailcrm_History($this->apiMock);
$retailcrm_history->getHistory(); $retailcrm_history->getHistory();
try { $order = new WC_Order($orderId);
$order = new WC_Order($order_id);
} catch (\Exception $exception) {
$post = get_post($order_id);
if (!$post instanceof WP_Post) {
$this->fail(sprintf('Cannot find order with id=%d', $order_id));
}
if (!in_array($post->post_type, wc_get_order_types())) {
$this->fail(sprintf(
'Invalid order post type `%s`. Should be one of these: %s',
$post->post_type,
implode(', ', wc_get_order_types())
));
} else {
$this->fail(sprintf(
'Cannot determine what\'s wrong with order id=%d. Message from WooCommerce: %s',
$order_id,
$exception->getMessage()
));
}
return;
}
$this->assertEquals('Tester4867', $order->get_billing_first_name()); $this->assertEquals('Tester4867', $order->get_billing_first_name());
$this->assertEquals('Tester4867', $order->get_billing_last_name()); $this->assertEquals('Tester4867', $order->get_billing_last_name());
@ -628,16 +534,16 @@ class WC_Retailcrm_History_Test extends WC_Retailcrm_Test_Case_Helper
} }
/** /**
* @param int $order_id * @param int $orderId
* *
* @throws \Exception * @throws \Exception
*/ */
public function history_order_switch_only_contact($order_id) public function history_order_switch_only_contact(int $orderId)
{ {
$this->mockHistory( $this->mockHistory(
true, true,
DataHistoryRetailCrm::empty_history(), DataHistoryRetailCrm::empty_history(),
DataHistoryRetailCrm::get_history_change_only_contact($order_id) DataHistoryRetailCrm::get_history_change_only_contact($orderId)
); );
$this->ordersGetMock( $this->ordersGetMock(
@ -653,31 +559,7 @@ class WC_Retailcrm_History_Test extends WC_Retailcrm_Test_Case_Helper
$retailcrm_history = new \WC_Retailcrm_History($this->apiMock); $retailcrm_history = new \WC_Retailcrm_History($this->apiMock);
$retailcrm_history->getHistory(); $retailcrm_history->getHistory();
try { $order = new WC_Order($orderId);
$order = new WC_Order($order_id);
} catch (\Exception $exception) {
$post = get_post($order_id);
if (!$post instanceof WP_Post) {
$this->fail(sprintf('Cannot find order with id=%d', $order_id));
}
if (!in_array($post->post_type, wc_get_order_types())) {
$this->fail(sprintf(
'Invalid order post type `%s`. Should be one of these: %s',
$post->post_type,
implode(', ', wc_get_order_types())
));
} else {
$this->fail(sprintf(
'Cannot determine what\'s wrong with order id=%d. Message from WooCommerce: %s',
$order_id,
$exception->getMessage()
));
}
return;
}
$this->assertEquals('Tester2890', $order->get_billing_first_name()); $this->assertEquals('Tester2890', $order->get_billing_first_name());
$this->assertEquals('Tester2890', $order->get_billing_last_name()); $this->assertEquals('Tester2890', $order->get_billing_last_name());
@ -692,16 +574,16 @@ class WC_Retailcrm_History_Test extends WC_Retailcrm_Test_Case_Helper
} }
/** /**
* @param int $order_id * @param int $orderId
* *
* @throws \Exception * @throws \Exception
*/ */
public function history_order_switch_back_to_individual($order_id) public function history_order_switch_back_to_individual(int $orderId)
{ {
$this->mockHistory( $this->mockHistory(
true, true,
DataHistoryRetailCrm::empty_history(), DataHistoryRetailCrm::empty_history(),
DataHistoryRetailCrm::get_history_change_from_corporate_to_individual($order_id) DataHistoryRetailCrm::get_history_change_from_corporate_to_individual($orderId)
); );
$this->ordersGetMock( $this->ordersGetMock(
@ -712,31 +594,7 @@ class WC_Retailcrm_History_Test extends WC_Retailcrm_Test_Case_Helper
$retailcrm_history = new \WC_Retailcrm_History($this->apiMock); $retailcrm_history = new \WC_Retailcrm_History($this->apiMock);
$retailcrm_history->getHistory(); $retailcrm_history->getHistory();
try { $order = new WC_Order($orderId);
$order = new WC_Order($order_id);
} catch (\Exception $exception) {
$post = get_post($order_id);
if (!$post instanceof WP_Post) {
$this->fail(sprintf('Cannot find order with id=%d', $order_id));
}
if (!in_array($post->post_type, wc_get_order_types())) {
$this->fail(sprintf(
'Invalid order post type `%s`. Should be one of these: %s',
$post->post_type,
implode(', ', wc_get_order_types())
));
} else {
$this->fail(sprintf(
'Cannot determine what\'s wrong with order id=%d. Message from WooCommerce: %s',
$order_id,
$exception->getMessage()
));
}
return;
}
$this->assertEquals('tester001', $order->get_billing_first_name()); $this->assertEquals('tester001', $order->get_billing_first_name());
$this->assertEquals('tester001', $order->get_billing_last_name()); $this->assertEquals('tester001', $order->get_billing_last_name());

22
tests/test-wc-retailcrm-orders.php
View File

@ -55,6 +55,8 @@ class WC_Retailcrm_Orders_Test extends WC_Retailcrm_Test_Case_Helper
*/ */
public function test_order_create($retailcrm) public function test_order_create($retailcrm)
{ {
$this->createTestOrder();
if ($retailcrm) { if ($retailcrm) {
$responseMock = $this->createResponseMock(); $responseMock = $this->createResponseMock();
$responseMockCustomers = $this->createResponseMock(); $responseMockCustomers = $this->createResponseMock();
@ -68,13 +70,12 @@ class WC_Retailcrm_Orders_Test extends WC_Retailcrm_Test_Case_Helper
] ]
); );
$this->setMockResponse($responseMock, 'isSuccessful', true);
$this->setMockResponse($retailcrm, 'ordersCreate', $responseMock); $this->setMockResponse($retailcrm, 'ordersCreate', $responseMock);
$this->setMockResponse($retailcrm, 'customersCreate', $responseMock); $this->setMockResponse($retailcrm, 'customersCreate', $responseMock);
$this->setMockResponse($retailcrm, 'customersList', $responseMockCustomers); $this->setMockResponse($retailcrm, 'customersList', $responseMockCustomers);
} }
$this->createTestOrder();
$retailcrmOrders = $this->getRetailcrmOrders($retailcrm); $retailcrmOrders = $this->getRetailcrmOrders($retailcrm);
$order = $retailcrmOrders->orderCreate($this->order->get_id()); $order = $retailcrmOrders->orderCreate($this->order->get_id());
$orderData = $retailcrmOrders->getOrder(); $orderData = $retailcrmOrders->getOrder();
@ -132,6 +133,8 @@ class WC_Retailcrm_Orders_Test extends WC_Retailcrm_Test_Case_Helper
*/ */
public function test_order_create_with_corporate_customer($retailcrm) public function test_order_create_with_corporate_customer($retailcrm)
{ {
$this->createTestOrder();
if ($retailcrm) { if ($retailcrm) {
$responseMock = $this->createResponseMock(); $responseMock = $this->createResponseMock();
@ -170,6 +173,7 @@ class WC_Retailcrm_Orders_Test extends WC_Retailcrm_Test_Case_Helper
] ]
); );
$this->setMockResponse($responseMock, 'isSuccessful', true);
$this->setMockResponse($retailcrm, 'ordersCreate', $responseMock); $this->setMockResponse($retailcrm, 'ordersCreate', $responseMock);
$this->setMockResponse($retailcrm, 'getSingleSiteForKey', 'woo'); $this->setMockResponse($retailcrm, 'getSingleSiteForKey', 'woo');
$this->setMockResponse($retailcrm, 'customersCorporateCreate', $responseMockCustomerCorporate); $this->setMockResponse($retailcrm, 'customersCorporateCreate', $responseMockCustomerCorporate);
@ -180,8 +184,6 @@ class WC_Retailcrm_Orders_Test extends WC_Retailcrm_Test_Case_Helper
$this->setMockResponse($retailcrm, 'customersCorporateCompanies', $responseMockCompany); $this->setMockResponse($retailcrm, 'customersCorporateCompanies', $responseMockCompany);
} }
$this->createTestOrder();
$retailcrmOrders = $this->getRetailcrmOrders($retailcrm); $retailcrmOrders = $this->getRetailcrmOrders($retailcrm);
$order = $retailcrmOrders->orderCreate($this->order->get_id()); $order = $retailcrmOrders->orderCreate($this->order->get_id());
$orderData = $retailcrmOrders->getOrder(); $orderData = $retailcrmOrders->getOrder();
@ -609,14 +611,12 @@ class WC_Retailcrm_Orders_Test extends WC_Retailcrm_Test_Case_Helper
} }
} }
$this->order->add_meta_data('woo_order', 'test_custom_fields');
$this->order->add_meta_data('crm_phone', '1111122222');
$this->order->add_meta_data('crm_address_text', 'crm_address_text_test');
$this->order->add_meta_data('crm_customer_comment', 'crm_customer_comment_test');
$this->order->save(); $this->order->save();
$orderId = $this->order->get_id();
update_post_meta($orderId, 'woo_order', 'test_custom_fields');
update_post_meta($orderId, 'crm_phone', '1111122222');
update_post_meta($orderId, 'crm_address_text', 'crm_address_text_test');
update_post_meta($orderId, 'crm_customer_comment', 'crm_customer_comment_test');
} }
private function getResponseData($externalId) private function getResponseData($externalId)

3
tests/test-wc-retailcrm-uploader.php
View File

@ -87,7 +87,7 @@ class WC_Retailcrm_Uploader_Test extends WC_Retailcrm_Test_Case_Helper
public function test_order_upload($retailcrm) public function test_order_upload($retailcrm)
{ {
$retailcrm_uploader = $this->getRetailcrmUploader($retailcrm); $retailcrm_uploader = $this->getRetailcrmUploader($retailcrm);
$data = $retailcrm_uploader->uploadArchiveOrders(0); $data = $retailcrm_uploader->uploadArchiveOrders(null);
$this->assertEquals(null, $data); $this->assertEquals(null, $data);
} }
@ -109,7 +109,6 @@ class WC_Retailcrm_Uploader_Test extends WC_Retailcrm_Test_Case_Helper
{ {
$retailcrm_uploader = $this->getRetailcrmUploader($this->apiMock); $retailcrm_uploader = $this->getRetailcrmUploader($this->apiMock);
$count_orders = $retailcrm_uploader->getCountOrders(); $count_orders = $retailcrm_uploader->getCountOrders();
$this->assertInternalType('int', $count_orders); $this->assertInternalType('int', $count_orders);
} }