RetailCRM-Mirror/woocommerce-module
1
0
Fork 0
mirror of synced 2025-03-25 09:33:51 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #168 from dima-uryvskiy/time

Browse Source
This commit is contained in:
opheugene 2020-12-08 10:19:15 +03:00 committed by GitHub
commit e991e13cbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 186 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@ -1,3 +1,10 @@
## 2020-12-02 4.2.0
* Исправлен баг с получением даты создания незарегистрированного пользователя
* Изменена логика работы с оплатами, удалена опция "Передача суммы оплаты"
* Исправлен баг с пустым shipping адресом, если он пуст используем billing адрес
* Добавлены переводы главной страницы на испанский и английский
* Исправлен баг с удалением товаров при использовании опции "Активировать связь по sku(xmlId)"
## 2020-09-21 4.1.5 ## 2020-09-21 4.1.5
* Исправлен баг с передачей email. Email перед отправкой в CRM всегда переводиться в нижний регистр. * Исправлен баг с передачей email. Email перед отправкой в CRM всегда переводиться в нижний регистр.
* Исправлен баг с передачей оплаты с нулевой суммой * Исправлен баг с передачей оплаты с нулевой суммой

2
VERSION
View File

@ -1 +1 @@
4.1.5 4.2.0

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

@ -374,9 +374,9 @@ if (!class_exists('WC_Retailcrm_Customers')) :
} }
} }
if (empty($createdAt)) { // If a customer has placed an order as a guest, then $customer->get_date_created() == null,
$createdAt = new WC_DateTime(); // then we take $order->get_date_created() order
} $createdAt = empty($createdAt) ? $order->get_date_created() : $createdAt;
$data_customer = array( $data_customer = array(
'createdAt' => $createdAt->date('Y-m-d H:i:s'), 'createdAt' => $createdAt->date('Y-m-d H:i:s'),

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

@ -24,19 +24,19 @@ if ( ! class_exists( 'WC_Retailcrm_History' ) ) :
protected $startDate; protected $startDate;
/** @var array|mixed|void */ /** @var array|mixed|void */
protected $retailcrm_settings; protected $retailcrmSettings;
/** @var bool|\WC_Retailcrm_Proxy|\WC_Retailcrm_Client_V4|\WC_Retailcrm_Client_V5 */ /** @var bool|\WC_Retailcrm_Proxy|\WC_Retailcrm_Client_V4|\WC_Retailcrm_Client_V5 */
protected $retailcrm; protected $retailcrm;
/** @var array|mixed */ /** @var array|mixed */
protected $order_methods = array(); protected $orderMethods = array();
/** @var string */ /** @var string */
protected $bind_field = 'externalId'; protected $bindField = 'externalId';
/** @var WC_Retailcrm_Order_Item */ /** @var WC_Retailcrm_Order_Item */
protected $order_item; protected $orderItem;
/** /**
* WC_Retailcrm_History constructor. * WC_Retailcrm_History constructor.
@ -47,17 +47,17 @@ if ( ! class_exists( 'WC_Retailcrm_History' ) ) :
*/ */
public function __construct($retailcrm = false) public function __construct($retailcrm = false)
{ {
$this->retailcrm_settings = get_option(WC_Retailcrm_Base::$option_key); $this->retailcrmSettings = get_option(WC_Retailcrm_Base::$option_key);
if (isset($this->retailcrm_settings['bind_by_sku']) if (isset($this->retailcrmSettings['bind_by_sku'])
&& $this->retailcrm_settings['bind_by_sku'] == WC_Retailcrm_Base::YES && $this->retailcrmSettings['bind_by_sku'] == WC_Retailcrm_Base::YES
) { ) {
$this->bind_field = 'xmlId'; $this->bindField = 'xmlId';
} }
if (isset($this->retailcrm_settings['order_methods'])) { if (isset($this->retailcrmSettings['order_methods'])) {
$this->order_methods = $this->retailcrm_settings['order_methods']; $this->orderMethods = $this->retailcrmSettings['order_methods'];
unset($this->retailcrm_settings['order_methods']); unset($this->retailcrmSettings['order_methods']);
} }
$this->retailcrm = $retailcrm; $this->retailcrm = $retailcrm;
@ -75,20 +75,20 @@ if ( ! class_exists( 'WC_Retailcrm_History' ) ) :
*/ */
public function getHistory() public function getHistory()
{ {
$orders_since_id = get_option('retailcrm_orders_history_since_id'); $ordersSinceId = get_option('retailcrm_orders_history_since_id');
$customers_since_id = get_option('retailcrm_customers_history_since_id'); $customersSinceId = get_option('retailcrm_customers_history_since_id');
if (!$orders_since_id && isset($this->retailcrm_settings['history_orders'])) { if (!$ordersSinceId && isset($this->retailcrmSettings['history_orders'])) {
$this->startDateOrders = new DateTime($this->retailcrm_settings['history_orders']); $this->startDateOrders = new DateTime($this->retailcrmSettings['history_orders']);
} }
if (!$customers_since_id && isset($this->retailcrm_settings['history_customers'])) { if (!$customersSinceId && isset($this->retailcrmSettings['history_customers'])) {
$this->startDateCustomers = new DateTime($this->retailcrm_settings['history_customers']); $this->startDateCustomers = new DateTime($this->retailcrmSettings['history_customers']);
} }
try { try {
$this->customersHistory($this->startDateCustomers->format('Y-m-d H:i:s'), $customers_since_id); $this->customersHistory($this->startDateCustomers->format('Y-m-d H:i:s'), $customersSinceId);
$this->ordersHistory($this->startDateOrders->format('Y-m-d H:i:s'), $orders_since_id); $this->ordersHistory($this->startDateOrders->format('Y-m-d H:i:s'), $ordersSinceId);
} catch (\Exception $exception) { } catch (\Exception $exception) {
WC_Retailcrm_Logger::add( WC_Retailcrm_Logger::add(
sprintf("[%s] - %s", $exception->getMessage(), sprintf("[%s] - %s", $exception->getMessage(),
@ -176,21 +176,21 @@ if ( ! class_exists( 'WC_Retailcrm_History' ) ) :
} }
} }
/** /**
* History orders * History orders
* *
* @param string $date * @param string $date
* @param int $since_id * @param int $sinceId
* *
* @return boolean * @return boolean
*/ */
protected function ordersHistory($date, $since_id) protected function ordersHistory($date, $sinceId)
{ {
$filter = array('startDate' => $date); $filter = array('startDate' => $date);
$options = array_flip(array_filter($this->retailcrm_settings)); $options = array_flip(array_filter($this->retailcrmSettings));
if ($since_id) { if ($sinceId) {
$filter = array('sinceId' => $since_id); $filter = array('sinceId' => $sinceId);
} }
$request = new WC_Retailcrm_Paginated_Request(); $request = new WC_Retailcrm_Paginated_Request();
@ -204,7 +204,7 @@ if ( ! class_exists( 'WC_Retailcrm_History' ) ) :
->getData(); ->getData();
if (!empty($history)) { if (!empty($history)) {
$last_change = end($history); $lastChange = end($history);
$historyAssembly = WC_Retailcrm_History_Assembler::assemblyOrder($history); $historyAssembly = WC_Retailcrm_History_Assembler::assemblyOrder($history);
WC_Retailcrm_Logger::debug(__METHOD__, array('Assembled orders history:', $historyAssembly)); WC_Retailcrm_Logger::debug(__METHOD__, array('Assembled orders history:', $historyAssembly));
WC_Retailcrm_Plugin::$history_run = true; WC_Retailcrm_Plugin::$history_run = true;
@ -218,15 +218,15 @@ if ( ! class_exists( 'WC_Retailcrm_History' ) ) :
try { try {
if (isset($order['externalId'])) { if (isset($order['externalId'])) {
$wc_order_id = $this->orderUpdate($order, $options); $wcOrderId = $this->orderUpdate($order, $options);
} else { } else {
$wc_order_id = $this->orderCreate($order, $options); $wcOrderId = $this->orderCreate($order, $options);
} }
$wc_order = wc_get_order($wc_order_id); $wcOrder = wc_get_order($wcOrderId);
if ($wc_order instanceof WC_Order) { if ($wcOrder instanceof WC_Order) {
$this->update_total($wc_order); $this->update_total($wcOrder);
} }
} catch (Exception $exception) { } catch (Exception $exception) {
WC_Retailcrm_Logger::add( WC_Retailcrm_Logger::add(
@ -238,7 +238,7 @@ if ( ! class_exists( 'WC_Retailcrm_History' ) ) :
} }
} }
update_option('retailcrm_orders_history_since_id', $last_change['id']); update_option('retailcrm_orders_history_since_id', $lastChange['id']);
WC_Retailcrm_Plugin::$history_run = false; WC_Retailcrm_Plugin::$history_run = false;
} }
@ -250,33 +250,33 @@ if ( ! class_exists( 'WC_Retailcrm_History' ) ) :
* *
* @param array $order * @param array $order
* @param array $options * @param array $options
* @param WC_Order $wc_order * @param WC_Order $wcOrder
* *
* @return boolean * @return boolean
* @throws \WC_Data_Exception * @throws \WC_Data_Exception
*/ */
protected function updateShippingItemId($order, $options, $wc_order) protected function updateShippingItemId($order, $options, $wcOrder)
{ {
$create = false; $create = false;
$shippings = $wc_order->get_items('shipping'); $shipping = $wcOrder->get_items('shipping');
if (!$shippings) { if (!$shipping) {
$shipping = new WC_Order_Item_Shipping(); $shipping = new WC_Order_Item_Shipping();
$create = true; $create = true;
} else { } else {
$shipping = reset($shippings); $shipping = reset($shipping);
} }
$data_store = $shipping->get_data_store(); $dataStore = $shipping->get_data_store();
if (isset($order['delivery']['code'])) { if (isset($order['delivery']['code'])) {
if (!isset($options[$order['delivery']['code']])) { if (!isset($options[$order['delivery']['code']])) {
return false; return false;
} }
$shipping_methods = get_wc_shipping_methods(); $shippingMethods = get_wc_shipping_methods();
$shipping->set_method_title($shipping_methods[$options[$order['delivery']['code']]]['name']); $shipping->set_method_title($shippingMethods[$options[$order['delivery']['code']]]['name']);
$shipping->set_method_id($options[$order['delivery']['code']]); $shipping->set_method_id($options[$order['delivery']['code']]);
} }
@ -284,7 +284,7 @@ if ( ! class_exists( 'WC_Retailcrm_History' ) ) :
$shipping->set_total($order['delivery']['cost']); $shipping->set_total($order['delivery']['cost']);
} }
$activeNetCost = $this->retailcrm_settings['send_delivery_net_cost']; $activeNetCost = $this->retailcrmSettings['send_delivery_net_cost'];
if (isset($order['delivery']['netCost']) && wc_tax_enabled() && $activeNetCost != 'yes') { if (isset($order['delivery']['netCost']) && wc_tax_enabled() && $activeNetCost != 'yes') {
$shipping->set_total($order['delivery']['netCost']); $shipping->set_total($order['delivery']['netCost']);
@ -299,11 +299,11 @@ if ( ! class_exists( 'WC_Retailcrm_History' ) ) :
} }
if ($create === true) { if ($create === true) {
$data_store->create($shipping); $dataStore->create($shipping);
$shipping->set_order_id($wc_order->get_id()); $shipping->set_order_id($wcOrder->get_id());
} }
$data_store->update($shipping); $dataStore->update($shipping);
return true; return true;
} }
@ -332,55 +332,55 @@ if ( ! class_exists( 'WC_Retailcrm_History' ) ) :
*/ */
protected function orderUpdate($order, $options) protected function orderUpdate($order, $options)
{ {
$wc_order = wc_get_order($order['externalId']); $wcOrder = wc_get_order($order['externalId']);
if (!$wc_order instanceof WC_Order) { if (!$wcOrder instanceof WC_Order) {
return false; return false;
} }
if (isset($options[$order['status']])) { if (isset($options[$order['status']])) {
$wc_order->update_status($options[$order['status']]); $wcOrder->update_status($options[$order['status']]);
} }
if (isset($order['customerComment'])) { if (isset($order['customerComment'])) {
$wc_order->set_customer_note($order['customerComment']); $wcOrder->set_customer_note($order['customerComment']);
} }
if (isset($order['managerComment']) && !empty($order['managerComment'])) { if (isset($order['managerComment']) && !empty($order['managerComment'])) {
$wc_order->add_order_note($order['managerComment'], 0, false); $wcOrder->add_order_note($order['managerComment'], 0, false);
} }
if (isset($order['firstName'])) { if (isset($order['firstName'])) {
$wc_order->set_shipping_first_name($order['firstName']); $wcOrder->set_shipping_first_name($order['firstName']);
} }
if (isset($order['lastName'])) { if (isset($order['lastName'])) {
$wc_order->set_shipping_last_name($order['lastName']); $wcOrder->set_shipping_last_name($order['lastName']);
} }
if (!$this->handleCustomerDataChange($wc_order, $order)) { if (!$this->handleCustomerDataChange($wcOrder, $order)) {
if (isset($order['phone'])) { if (isset($order['phone'])) {
$wc_order->set_billing_phone($order['phone']); $wcOrder->set_billing_phone($order['phone']);
} }
if (isset($order['email'])) { if (isset($order['email'])) {
$wc_order->set_billing_email($order['email']); $wcOrder->set_billing_email($order['email']);
} }
if (isset($order['company']['address'])) { if (isset($order['company']['address'])) {
$billingAddress = $order['company']['address']; $billingAddress = $order['company']['address'];
$wc_order->set_billing_state(self::arrayValue($billingAddress, 'region', '--')); $wcOrder->set_billing_state(self::arrayValue($billingAddress, 'region', '--'));
$wc_order->set_billing_postcode(self::arrayValue($billingAddress, 'index', '--')); $wcOrder->set_billing_postcode(self::arrayValue($billingAddress, 'index', '--'));
$wc_order->set_billing_country(self::arrayValue($billingAddress, 'country', '--')); $wcOrder->set_billing_country(self::arrayValue($billingAddress, 'country', '--'));
$wc_order->set_billing_city(self::arrayValue($billingAddress, 'city', '--')); $wcOrder->set_billing_city(self::arrayValue($billingAddress, 'city', '--'));
$wc_order->set_billing_address_1(self::arrayValue($billingAddress, 'text', '--')); $wcOrder->set_billing_address_1(self::arrayValue($billingAddress, 'text', '--'));
} }
} }
if (array_key_exists('items', $order)) { if (array_key_exists('items', $order)) {
foreach ($order['items'] as $key => $item) { foreach ($order['items'] as $key => $item) {
if (!isset($item['offer'][$this->bind_field])) { if (!isset($item['offer'][$this->bindField])) {
continue; continue;
} }
@ -388,18 +388,18 @@ if ( ! class_exists( 'WC_Retailcrm_History' ) ) :
$arItemsNew = array(); $arItemsNew = array();
$arItemsOld = array(); $arItemsOld = array();
$product = retailcrm_get_wc_product( $product = retailcrm_get_wc_product(
$item['offer'][$this->bind_field], $item['offer'][$this->bindField],
$this->retailcrm_settings $this->retailcrmSettings
); );
foreach ($wc_order->get_items() as $order_item_id => $order_item) { foreach ($wcOrder->get_items() as $orderItemId => $orderItem) {
$arItemsOld[$order_item_id] = $order_item_id; $arItemsOld[$orderItemId] = $orderItemId;
} }
$wc_order->add_product($product, $item['quantity']); $wcOrder->add_product($product, $item['quantity']);
foreach ($wc_order->get_items() as $order_item_id => $order_item) { foreach ($wcOrder->get_items() as $orderItemId => $orderItem) {
$arItemsNew[$order_item_id] = $order_item_id; $arItemsNew[$orderItemId] = $orderItemId;
} }
$tmpArray = array_diff($arItemsNew, $arItemsOld); $tmpArray = array_diff($arItemsNew, $arItemsOld);
@ -407,16 +407,16 @@ if ( ! class_exists( 'WC_Retailcrm_History' ) ) :
$order['items'][$key]['woocomerceId'] = $result; $order['items'][$key]['woocomerceId'] = $result;
} else { } else {
foreach ($wc_order->get_items() as $order_item_id => $order_item) { foreach ($wcOrder->get_items() as $orderItemId => $orderItem) {
if ( if (
isset($this->retailcrm_settings['bind_by_sku']) isset($this->retailcrmSettings['bind_by_sku'])
&& $this->retailcrm_settings['bind_by_sku'] == WC_Retailcrm_Base::YES && $this->retailcrmSettings['bind_by_sku'] == WC_Retailcrm_Base::YES
) { ) {
$offer_id = $item['offer']['article']; $offerId = $item['offer']['article'];
} elseif ($order_item['variation_id'] != 0 ) { } elseif ($orderItem['variation_id'] != 0 ) {
$offer_id = $order_item['variation_id']; $offerId = $orderItem['variation_id'];
} else { } else {
$offer_id = $order_item['product_id']; $offerId = $orderItem['product_id'];
} }
if (isset($item['externalIds'])) { if (isset($item['externalIds'])) {
@ -429,10 +429,10 @@ if ( ! class_exists( 'WC_Retailcrm_History' ) ) :
$itemExternalId = explode('_', $item['externalId']); $itemExternalId = explode('_', $item['externalId']);
} }
if ( if (
$offer_id == $item['offer'][$this->bind_field] $offerId == $item['offer'][$this->bindField]
&& (isset($itemExternalId) && $itemExternalId[1] == $order_item->get_id()) && (isset($itemExternalId) && $itemExternalId[1] == $orderItem->get_id())
) { ) {
$this->deleteOrUpdateOrderItem($item, $order_item, $itemExternalId[1]); $this->deleteOrUpdateOrderItem($item, $orderItem, $itemExternalId[1]);
} }
} }
} }
@ -440,25 +440,25 @@ if ( ! class_exists( 'WC_Retailcrm_History' ) ) :
} }
if (array_key_exists('delivery', $order)) { if (array_key_exists('delivery', $order)) {
$this->updateShippingItemId($order, $options, $wc_order); $this->updateShippingItemId($order, $options, $wcOrder);
if (isset($order['delivery']['address'])) { if (isset($order['delivery']['address'])) {
$shipping_address = $order['delivery']['address']; $shippingAddress = $order['delivery']['address'];
if (isset($shipping_address['region'])) { if (isset($shippingAddress['region'])) {
$wc_order->set_shipping_state($shipping_address['region']); $wcOrder->set_shipping_state($shippingAddress['region']);
} }
if (isset($shipping_address['city'])) { if (isset($shippingAddress['city'])) {
$wc_order->set_shipping_city($shipping_address['city']); $wcOrder->set_shipping_city($shippingAddress['city']);
} }
if (isset($shipping_address['street'])) { if (isset($shippingAddress['street'])) {
$wc_order->set_shipping_address_1($shipping_address['street']); $wcOrder->set_shipping_address_1($shippingAddress['street']);
} }
if (isset($shipping_address['building'])) { if (isset($shippingAddress['building'])) {
$wc_order->set_shipping_address_2($shipping_address['building']); $wcOrder->set_shipping_address_2($shippingAddress['building']);
} }
} }
} }
@ -466,27 +466,27 @@ if ( ! class_exists( 'WC_Retailcrm_History' ) ) :
if (isset($order['paymentType'])) { if (isset($order['paymentType'])) {
if (!empty($options[$order['paymentType']])) { if (!empty($options[$order['paymentType']])) {
$payment = WC_Payment_Gateways::instance(); $payment = WC_Payment_Gateways::instance();
$payment_types = $payment->payment_gateways(); $paymentTypes = $payment->payment_gateways();
if (isset($payment_types[$options[$order['paymentType']]])) { if (isset($paymentTypes[$options[$order['paymentType']]])) {
$wc_order->set_payment_method($payment_types[$options[$order['paymentType']]]); $wcOrder->set_payment_method($paymentTypes[$options[$order['paymentType']]]);
} }
} }
} }
if (isset($order['payments']) && !empty($order['payments'])) { if (isset($order['payments']) && !empty($order['payments'])) {
$payment = WC_Payment_Gateways::instance(); $payment = WC_Payment_Gateways::instance();
$payment_types = $payment->payment_gateways(); $paymentTypes = $payment->payment_gateways();
if (count($order['payments']) == 1) { if (count($order['payments']) == 1) {
$paymentType = reset($order['payments']); $paymentType = reset($order['payments']);
if (isset($paymentType['type']) if (isset($paymentType['type'])
&& isset($options[$paymentType['type']]) && isset($options[$paymentType['type']])
&& isset($payment_types[$options[$paymentType['type']]]) && isset($paymentTypes[$options[$paymentType['type']]])
) { ) {
$payment_type = $payment_types[$options[$paymentType['type']]]; $paymentType = $paymentTypes[$options[$paymentType['type']]];
$wc_order->set_payment_method($payment_type); $wcOrder->set_payment_method($paymentType);
} }
} else { } else {
foreach ($order['payments'] as $payment_data) { foreach ($order['payments'] as $payment_data) {
@ -499,13 +499,13 @@ if ( ! class_exists( 'WC_Retailcrm_History' ) ) :
$paymentType = $order['payments'][0]; $paymentType = $order['payments'][0];
} }
if (isset($payment_types[$options[$paymentType['type']]])) { if (isset($paymentTypes[$options[$paymentType['type']]])) {
$wc_order->set_payment_method($payment_types[$options[$paymentType['type']]]); $wcOrder->set_payment_method($paymentTypes[$options[$paymentType['type']]]);
} }
} }
} }
$wc_order->save(); $wcOrder->save();
if (isset($order['items'])) { if (isset($order['items'])) {
$checkNewItem = false; $checkNewItem = false;
@ -518,37 +518,37 @@ if ( ! class_exists( 'WC_Retailcrm_History' ) ) :
} }
if ($checkNewItem == true) { if ($checkNewItem == true) {
$this->editOrder($this->retailcrm_settings, $wc_order, $order,'update'); $this->editOrder($order,'update');
} }
} }
return $wc_order->get_id(); return $wcOrder->get_id();
} }
/** /**
* @param array $item * @param array $item
* @param \WC_Order_Item $order_item * @param \WC_Order_Item $orderItem
* @param string $order_item_id * @param string $orderItemId
* *
* @throws \Exception * @throws \Exception
*/ */
private function deleteOrUpdateOrderItem($item, $order_item, $order_item_id) private function deleteOrUpdateOrderItem($item, $orderItem, $orderItemId)
{ {
if (isset($item['delete']) && $item['delete'] == true) { if (isset($item['delete']) && $item['delete'] == true) {
wc_delete_order_item($order_item_id); wc_delete_order_item($orderItemId);
} else { } else {
if (isset($item['quantity']) && $item['quantity']) { if (isset($item['quantity']) && $item['quantity']) {
$order_item->set_quantity($item['quantity']); $orderItem->set_quantity($item['quantity']);
$product = retailcrm_get_wc_product($item['offer'][$this->bind_field], $this->retailcrm_settings); $product = retailcrm_get_wc_product($item['offer'][$this->bindField], $this->retailcrmSettings);
$order_item->set_subtotal($product->get_price()); $orderItem->set_subtotal($product->get_price());
$data_store = $order_item->get_data_store(); $dataStore = $orderItem->get_data_store();
$data_store->update($order_item); $dataStore->update($orderItem);
} }
if (isset($item['summ']) && $item['summ']) { if (isset($item['summ']) && $item['summ']) {
$order_item->set_total($item['summ']); $orderItem->set_total($item['summ']);
$data_store = $order_item->get_data_store(); $dataStore = $orderItem->get_data_store();
$data_store->update($order_item); $dataStore->update($orderItem);
} }
} }
} }
@ -568,10 +568,10 @@ if ( ! class_exists( 'WC_Retailcrm_History' ) ) :
return false; return false;
} }
if (is_array($this->order_methods) if (is_array($this->orderMethods)
&& $this->order_methods && $this->orderMethods
&& isset($order['orderMethod']) && isset($order['orderMethod'])
&& !in_array($order['orderMethod'], $this->order_methods) && !in_array($order['orderMethod'], $this->orderMethods)
) { ) {
return false; return false;
} }
@ -607,9 +607,9 @@ if ( ! class_exists( 'WC_Retailcrm_History' ) ) :
'customer_id' => $customerId 'customer_id' => $customerId
); );
/** @var WC_Order|WP_Error $wc_order */ /** @var WC_Order|WP_Error wcOrder */
$wc_order = wc_create_order($args); $wcOrder = wc_create_order($args);
$wc_order->set_date_created($order['createdAt']); $wcOrder->set_date_created($order['createdAt']);
$customer = $order['customer']; $customer = $order['customer'];
$contactOrCustomer = array(); $contactOrCustomer = array();
$address = isset($order['customer']['address']) ? $order['customer']['address'] : array(); $address = isset($order['customer']['address']) ? $order['customer']['address'] : array();
@ -648,18 +648,18 @@ if ( ! class_exists( 'WC_Retailcrm_History' ) ) :
} }
} }
if ($wc_order instanceof WP_Error) { if ($wcOrder instanceof WP_Error) {
WC_Retailcrm_Logger::add(sprintf( WC_Retailcrm_Logger::add(sprintf(
'[%d] error while creating order: %s', '[%d] error while creating order: %s',
$order['id'], $order['id'],
print_r($wc_order->get_error_messages(), true) print_r($wcOrder->get_error_messages(), true)
)); ));
return false; return false;
} }
if (isset($order['managerComment']) && !empty($order['managerComment'])) { if (isset($order['managerComment']) && !empty($order['managerComment'])) {
$wc_order->add_order_note($order['managerComment'], 0, false); $wcOrder->add_order_note($order['managerComment'], 0, false);
} }
// TODO Check if that works; also don't forget to set this company field while creating order from CMS! // TODO Check if that works; also don't forget to set this company field while creating order from CMS!
@ -671,7 +671,7 @@ if ( ! class_exists( 'WC_Retailcrm_History' ) ) :
$companyName = $order['company']['name']; $companyName = $order['company']['name'];
} }
$address_shipping = array( $addressShipping = array(
'first_name' => isset($order['firstName']) ? $order['firstName'] : '', 'first_name' => isset($order['firstName']) ? $order['firstName'] : '',
'last_name' => isset($order['lastName']) ? $order['lastName'] : '', 'last_name' => isset($order['lastName']) ? $order['lastName'] : '',
'company' => '', 'company' => '',
@ -683,7 +683,7 @@ if ( ! class_exists( 'WC_Retailcrm_History' ) ) :
'country' => isset($order['delivery']['address']['countryIso']) ? $order['delivery']['address']['countryIso'] : '' 'country' => isset($order['delivery']['address']['countryIso']) ? $order['delivery']['address']['countryIso'] : ''
); );
$address_billing = array( $addressBilling = array(
'first_name' => isset($contactOrCustomer['firstName']) ? $contactOrCustomer['firstName'] : '', 'first_name' => isset($contactOrCustomer['firstName']) ? $contactOrCustomer['firstName'] : '',
'last_name' => isset($contactOrCustomer['lastName']) ? $contactOrCustomer['lastName'] : '', 'last_name' => isset($contactOrCustomer['lastName']) ? $contactOrCustomer['lastName'] : '',
'company' => $companyName, 'company' => $companyName,
@ -701,36 +701,36 @@ if ( ! class_exists( 'WC_Retailcrm_History' ) ) :
$payment = WC_Payment_Gateways::instance(); $payment = WC_Payment_Gateways::instance();
if (count($order['payments']) == 1) { if (count($order['payments']) == 1) {
$payment_types = $payment->payment_gateways(); $paymentTypes = $payment->payment_gateways();
$payments = $order['payments']; $payments = $order['payments'];
$paymentType = end($payments); $paymentType = end($payments);
if (isset($options[$paymentType['type']]) && isset($payment_types[$options[$paymentType['type']]])) { if (isset($options[$paymentType['type']]) && isset($paymentTypes[$options[$paymentType['type']]])) {
$wc_order->set_payment_method($payment_types[$options[$paymentType['type']]]); $wcOrder->set_payment_method($paymentTypes[$options[$paymentType['type']]]);
} }
} }
} }
$wc_order->set_address($address_billing, 'billing'); $wcOrder->set_address($addressBilling, 'billing');
$wc_order->set_address($address_shipping, 'shipping'); $wcOrder->set_address($addressShipping, 'shipping');
$product_data = isset($order['items']) ? $order['items'] : array(); $productData = isset($order['items']) ? $order['items'] : array();
if ($product_data) { if ($productData) {
foreach ($product_data as $key => $product) { foreach ($productData as $key => $product) {
$arItemsNew = array(); $arItemsNew = array();
$arItemsOld = array(); $arItemsOld = array();
$item = retailcrm_get_wc_product($product['offer'][$this->bind_field], $this->retailcrm_settings); $item = retailcrm_get_wc_product($product['offer'][$this->bindField], $this->retailcrmSettings);
if (!$item) { if (!$item) {
$logger = new WC_Logger(); $logger = new WC_Logger();
$logger->add('retailcrm', 'Product not found by ' . $this->bind_field); $logger->add('retailcrm', 'Product not found by ' . $this->bindField);
continue; continue;
} }
foreach ($wc_order->get_items() as $order_item_id => $order_item) { foreach ($wcOrder->get_items() as $orderItemId => $orderItem) {
$arItemsOld[$order_item_id] = $order_item_id; $arItemsOld[$orderItemId] = $orderItemId;
} }
$wc_order->add_product( $wcOrder->add_product(
$item, $item,
$product['quantity'], $product['quantity'],
array( array(
@ -749,8 +749,8 @@ if ( ! class_exists( 'WC_Retailcrm_History' ) ) :
) )
); );
foreach ($wc_order->get_items() as $order_item_id => $order_item) { foreach ($wcOrder->get_items() as $orderItemId => $orderItem) {
$arItemsNew[$order_item_id] = $order_item_id; $arItemsNew[$orderItemId] = $orderItemId;
} }
if (!empty($arItemsOld)) { if (!empty($arItemsOld)) {
@ -791,38 +791,36 @@ if ( ! class_exists( 'WC_Retailcrm_History' ) ) :
$shipping->set_total($order['delivery']['netCost']); $shipping->set_total($order['delivery']['netCost']);
} }
$shipping->set_order_id($wc_order->get_id()); $shipping->set_order_id($wcOrder->get_id());
$shipping->save(); $shipping->save();
$wc_order->add_item($shipping); $wcOrder->add_item($shipping);
} }
} }
$ids[] = array( $ids[] = array(
'id' => (int) $order['id'], 'id' => (int) $order['id'],
'externalId' => (int) $wc_order->get_id() 'externalId' => (int) $wcOrder->get_id()
); );
$wc_order->save(); $wcOrder->save();
$this->retailcrm->ordersFixExternalIds($ids); $this->retailcrm->ordersFixExternalIds($ids);
$this->editOrder($this->retailcrm_settings, $wc_order, $order); $this->editOrder($order);
return $wc_order->get_id(); return $wcOrder->get_id();
} }
/** /**
* @param $settings
* @param $wc_order
* @param $order * @param $order
* @param string $event * @param string $event
*/ */
protected function editOrder($settings, $wc_order, $order, $event = 'create') protected function editOrder($order, $event = 'create')
{ {
$data= array(); $data= array();
$crmOrder= array(); $crmOrder= array();
$order_items= array(); $orderItems= array();
if ($event == 'update') { if ($event == 'update') {
$result = $this->retailcrm->ordersGet($order['externalId']); $result = $this->retailcrm->ordersGet($order['externalId']);
@ -834,14 +832,14 @@ if ( ! class_exists( 'WC_Retailcrm_History' ) ) :
} }
if ($event == 'create') { if ($event == 'create') {
$data = $order; $data = $order;
} }
$iterableItems = isset($data['items']) ? $data['items'] : array(); $iterableItems = isset($data['items']) ? $data['items'] : array();
foreach ($iterableItems as $id => $item) { foreach ($iterableItems as $id => $item) {
$order_items[$id]['id'] = $item['id']; $orderItems[$id]['id'] = $item['id'];
$order_items[$id]['offer'] = array('id' => $item['offer']['id']); $orderItems[$id]['offer'] = array('id' => $item['offer']['id']);
if (!isset($order['items'][$item['id']])) { if (!isset($order['items'][$item['id']])) {
if (empty($crmOrder)) { if (empty($crmOrder)) {
@ -901,17 +899,17 @@ if ( ! class_exists( 'WC_Retailcrm_History' ) ) :
} }
if (!$found) { if (!$found) {
$order_items[$id]['externalIds'] = array_merge($item['externalIds'], $externalIds); $orderItems[$id]['externalIds'] = array_merge($item['externalIds'], $externalIds);
} }
} else { } else {
$order_items[$id]['externalIds'] = $externalIds; $orderItems[$id]['externalIds'] = $externalIds;
} }
} }
if (!empty($order_items)) { if (!empty($orderItems)) {
$orderEdit = array( $orderEdit = array(
'id' => $order['id'], 'id' => $order['id'],
'items' => WC_Retailcrm_Plugin::clearArray($order_items), 'items' => WC_Retailcrm_Plugin::clearArray($orderItems),
); );
$this->retailcrm->ordersEdit($orderEdit, 'id'); $this->retailcrm->ordersEdit($orderEdit, 'id');
@ -921,19 +919,19 @@ if ( ! class_exists( 'WC_Retailcrm_History' ) ) :
/** /**
* Handle customer data change (from individual to corporate, company change, etc) * Handle customer data change (from individual to corporate, company change, etc)
* *
* @param \WC_Order $wc_order * @param \WC_Order $wcOrder
* @param array $order * @param array $order
* *
* @return bool True if customer change happened; false otherwise. * @return bool True if customer change happened; false otherwise.
*/ */
protected function handleCustomerDataChange($wc_order, $order) protected function handleCustomerDataChange($wcOrder, $order)
{ {
$handled = false; $handled = false;
$crmOrder = array(); $crmOrder = array();
$newCustomerId = null; $newCustomerId = null;
$switcher = new WC_Retailcrm_Customer_Switcher(); $switcher = new WC_Retailcrm_Customer_Switcher();
$data = new WC_Retailcrm_Customer_Switcher_State(); $data = new WC_Retailcrm_Customer_Switcher_State();
$data->setWcOrder($wc_order); $data->setWcOrder($wcOrder);
WC_Retailcrm_Logger::debug( WC_Retailcrm_Logger::debug(
__METHOD__, __METHOD__,

2
src/include/components/class-wc-retailcrm-paginated-request.php
View File

@ -128,7 +128,7 @@ class WC_Retailcrm_Paginated_Request
); );
if ($response instanceof WC_Retailcrm_Response && $response->offsetExists($this->dataKey)) { if ($response instanceof WC_Retailcrm_Response && $response->offsetExists($this->dataKey)) {
$this->data = array_merge($response[$this->dataKey]); $this->data = array_merge($this->data, $response[$this->dataKey]);
$page = $response['pagination']['currentPage'] + 1; $page = $response['pagination']['currentPage'] + 1;
} }

8
src/readme.txt
View File

@ -82,6 +82,14 @@ Asegúrate de tener una clave API específica para cada tienda. Las siguientes i
== Changelog == == Changelog ==
= 4.2.0=
* Исправлен баг с получением даты создания незарегистрированного пользователя
* Изменена логика работы с оплатами, удалена опция "Передача суммы оплаты"
* Исправлен баг с пустым shipping адресом, если он пуст используем billing адрес
* Добавлены переводы главной страницы на испанский и английский
* Исправлен баг с удалением товаров при использовании опции "Активировать связь по sku(xmlId)"
= 4.1.5= = 4.1.5=
* Исправлен баг с передачей email. Email перед отправкой в CRM всегда переводиться в нижний регистр. * Исправлен баг с передачей email. Email перед отправкой в CRM всегда переводиться в нижний регистр.
* Исправлен баг с передачей оплаты с нулевой суммой * Исправлен баг с передачей оплаты с нулевой суммой

2
src/retailcrm.php
View File

@ -1,6 +1,6 @@
<?php <?php
/** /**
* Version: 4.1.5 * Version: 4.2.0
* WC requires at least: 3.0 * WC requires at least: 3.0
* WC tested up to: 3.9.3 * WC tested up to: 3.9.3
* Plugin Name: WooCommerce retailCRM * Plugin Name: WooCommerce retailCRM

2
src/uninstall.php
View File

@ -15,7 +15,7 @@
* *
* *
* @link https://wordpress.org/plugins/woo-retailcrm/ * @link https://wordpress.org/plugins/woo-retailcrm/
* @version 4.1.5 * @version 4.2.0
* *
* @package RetailCRM * @package RetailCRM
*/ */

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

@ -44,6 +44,7 @@ class WC_Retailcrm_Customers_Test extends WC_Retailcrm_Test_Case_Helper
$this->customer->set_billing_email($this->customer->get_email()); $this->customer->set_billing_email($this->customer->get_email());
$this->customer->set_password('password'); $this->customer->set_password('password');
$this->customer->set_billing_phone('89000000000'); $this->customer->set_billing_phone('89000000000');
$this->customer->set_date_created(date('Y-m-d H:i:s'));
$this->customer->save(); $this->customer->save();
} }
@ -91,6 +92,7 @@ class WC_Retailcrm_Customers_Test extends WC_Retailcrm_Test_Case_Helper
$this->assertArrayHasKey('createdAt', $customer_send); $this->assertArrayHasKey('createdAt', $customer_send);
$this->assertArrayHasKey('email', $customer_send); $this->assertArrayHasKey('email', $customer_send);
$this->assertNotEmpty($customer_send['externalId']); $this->assertNotEmpty($customer_send['externalId']);
$this->assertNotEmpty($customer_send['createdAt']);
$this->assertNotEmpty($customer_send['firstName']); $this->assertNotEmpty($customer_send['firstName']);
$this->assertNotEmpty($customer_send['email']); $this->assertNotEmpty($customer_send['email']);
} else { } else {
@ -115,6 +117,7 @@ class WC_Retailcrm_Customers_Test extends WC_Retailcrm_Test_Case_Helper
$this->assertArrayHasKey('createdAt', $customer_send); $this->assertArrayHasKey('createdAt', $customer_send);
$this->assertArrayHasKey('email', $customer_send); $this->assertArrayHasKey('email', $customer_send);
$this->assertNotEmpty($customer_send['externalId']); $this->assertNotEmpty($customer_send['externalId']);
$this->assertNotEmpty($customer_send['createdAt']);
$this->assertNotEmpty($customer_send['firstName']); $this->assertNotEmpty($customer_send['firstName']);
$this->assertNotEmpty($customer_send['email']); $this->assertNotEmpty($customer_send['email']);
$this->assertInstanceOf('WC_Customer', $customer); $this->assertInstanceOf('WC_Customer', $customer);