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

Fix client info if shipping address empty, use billing address

Browse Source
This commit is contained in:
Dima Uryvskiy 2020-11-23 13:05:46 +03:00 committed by GitHub
parent c7c3065834
commit 2fd1a1088b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/include/abstracts/class-wc-retailcrm-abstracts-address.php
View File

@ -91,12 +91,13 @@ abstract class WC_Retailcrm_Abstracts_Address extends WC_Retailcrm_Abstracts_Dat
protected function getOrderAddress($order) protected function getOrderAddress($order)
{ {
$orderAddress = $order->get_address($this->address_type); $orderAddress = $order->get_address($this->address_type);
$checkEmptyArray = array_filter($orderAddress);
if (empty($orderAddress) && $this->address_type === self::ADDRESS_TYPE_BILLING && $this->fallback_to_shipping) { if (empty($checkEmptyArray) && $this->address_type === self::ADDRESS_TYPE_BILLING && $this->fallback_to_shipping) {
$orderAddress = $order->get_address(self::ADDRESS_TYPE_SHIPPING); $orderAddress = $order->get_address(self::ADDRESS_TYPE_SHIPPING);
} }
if (empty($orderAddress) && $this->address_type === self::ADDRESS_TYPE_SHIPPING && $this->fallback_to_billing) { if (empty($checkEmptyArray) && $this->address_type === self::ADDRESS_TYPE_SHIPPING && $this->fallback_to_billing) {
$orderAddress = $order->get_address(self::ADDRESS_TYPE_BILLING); $orderAddress = $order->get_address(self::ADDRESS_TYPE_BILLING);
} }

4
src/include/order/class-wc-retailcrm-order.php
View File

@ -65,8 +65,8 @@ class WC_Retailcrm_Order extends WC_Retailcrm_Abstracts_Data
$data = array( $data = array(
'externalId' => $order->get_id(), 'externalId' => $order->get_id(),
'createdAt' => $order->get_date_created()->date('Y-m-d H:i:s'), 'createdAt' => $order->get_date_created()->date('Y-m-d H:i:s'),
'firstName' => $order->get_shipping_first_name(), 'firstName' => $firstName,
'lastName' => $order->get_shipping_last_name(), 'lastName' => $lastName,
'email' => strtolower($order->get_billing_email()), 'email' => strtolower($order->get_billing_email()),
'customerComment' => $order->get_customer_note(), 'customerComment' => $order->get_customer_note(),
'phone' => $order->get_billing_phone(), 'phone' => $order->get_billing_phone(),