RetailCRM-Mirror/woocommerce-module
1
0
Fork 0
mirror of synced 2025-04-06 07:13:33 +03:00
Code Issues Projects Releases Wiki Activity

extract customer data from order for guests

Browse source
This commit is contained in:
Pavel 2020-02-13 13:27:56 +03:00 • committed by Павел
parent a2171ca09c
commit 652faaeb71
3 changed files with 51 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/include/class-wc-retailcrm-customers.php
View file

@ -130,9 +130,12 @@ if (!class_exists('WC_Retailcrm_Customers')) :
*
* @param int | WC_Customer $customer
*
* @param \WC_Order|null $order
*
* @return mixed
* @throws \Exception
*/
public function createCustomer($customer)
public function createCustomer($customer, $order = null)
{
if (!$this->retailcrm) {
return null;
@ -147,7 +150,7 @@ if (!class_exists('WC_Retailcrm_Customers')) :
}
if (self::isCustomer($customer)) {
$this->processCustomer($customer);
$this->processCustomer($customer, $order);
$response = $this->retailcrm->customersCreate($this->customer);
if ((!empty($response) && $response->isSuccessful()) && isset($response['id'])) {
@ -255,15 +258,31 @@ if (!class_exists('WC_Retailcrm_Customers')) :
/**
* Process customer
*
* @param WC_Customer $customer
* @param WC_Customer $customer
* @param WC_Order|null $order
*
* @return void
* @throws \Exception
*/
protected function processCustomer($customer)
protected function processCustomer($customer, $order = null)
{
$createdAt = $customer->get_date_created();
$firstName = $customer->get_first_name();
$lastName = $customer->get_last_name();
if (empty($firstName) && empty($lastName) && $order instanceof WC_Order) {
$firstName = $order->get_billing_first_name();
$lastName = $order->get_billing_last_name();
if (empty($firstName) && empty($lastName)) {
$firstName = $order->get_shipping_first_name();
$lastName = $order->get_shipping_last_name();
}
if (empty($firstName)) {
$firstName = $customer->get_username();
}
}
if (empty($createdAt)) {
$createdAt = new WC_DateTime();
@ -271,10 +290,17 @@ if (!class_exists('WC_Retailcrm_Customers')) :
$data_customer = array(
'createdAt' => $createdAt->date('Y-m-d H:i:s'),
<<<<<<< HEAD
'firstName' => $firstName ? $firstName : $customer->get_username(),
'lastName' => $customer->get_last_name(),
'email' => $customer->get_billing_email(),
'address' => $this->customer_address->build($customer)->get_data()
=======
'firstName' => $firstName,
'lastName' => $lastName,
'email' => $customer->get_email(),
'address' => $this->customer_address->build($customer, $order)->get_data()
>>>>>>> extract customer data from order for guests
);
if ($customer->get_id() > 0) {

2
src/include/class-wc-retailcrm-orders.php
View file

@ -295,7 +295,7 @@ if ( ! class_exists( 'WC_Retailcrm_Orders' ) ) :
$foundCustomer = $this->customers->findCustomerEmailOrId($wcCustomerId, $wcCustomerEmail);
if (empty($foundCustomer)) {
$foundCustomerId = $this->customers->createCustomer($wcCustomerId);
$foundCustomerId = $this->customers->createCustomer($wcCustomerId, $wcOrder);
if (!empty($foundCustomerId)) {
$this->order['customer']['id'] = $foundCustomerId;

29
src/include/customer/class-wc-retailcrm-customer-address.php
View file

@ -17,19 +17,30 @@ class WC_Retailcrm_Customer_Address extends WC_Retailcrm_Abstracts_Address
protected $filter_name = 'customer_address';
/**
* @param WC_Customer $customer
* @param WC_Customer $customer
* @param \WC_Order|null $order
*
* @return self
*/
public function build($customer)
public function build($customer, $order = null)
{
$data = array(
'index' => $customer->get_billing_postcode(),
'countryIso' => $customer->get_billing_country(),
'region' => $this->get_state_name($customer->get_billing_country(), $customer->get_billing_state()),
'city' => $customer->get_billing_city(),
'text' => $customer->get_billing_address_1() . ', ' . $customer->get_billing_address_2()
);
if ($order instanceof WC_Order && empty($customer->get_billing_address())) {
$data = array(
'index' => $order->get_billing_postcode(),
'countryIso' => $order->get_billing_country(),
'region' => $this->get_state_name($order->get_billing_country(), $order->get_billing_state()),
'city' => $order->get_billing_city(),
'text' => $order->get_billing_address_1() . ', ' . $order->get_billing_address_2()
);
} else {
$data = array(
'index' => $customer->get_billing_postcode(),
'countryIso' => $customer->get_billing_country(),
'region' => $this->get_state_name($customer->get_billing_country(), $customer->get_billing_state()),
'city' => $customer->get_billing_city(),
'text' => $customer->get_billing_address_1() . ', ' . $customer->get_billing_address_2()
);
}
$this->set_data_fields($data);