RetailCRM-Mirror/opencart-module
1
0
Fork 0
mirror of https://github.com/retailcrm/opencart-module.git synced 2024-11-25 06:36:06 +03:00
Code Issues Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
Daniel Weiser 2020-07-15 12:28:02 +03:00
parent 53767392e9
commit caf55f67ad
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/upload/catalog/model/extension/retailcrm/order.php
View File

@ -48,16 +48,16 @@ class ModelExtensionRetailcrmOrder extends Model {
if ($create) { if ($create) {
$order = self::filterRecursive($order); $order = self::filterRecursive($order);
$response = $retailcrmApiClient->ordersCreate($order); $response = $retailcrmApiClient->ordersCreate($order);
if ($response->getStatusCode() === 400 && !empty($response->__get('errors')['customer.externalId'])) { if (isset($response['errors']['customer.externalId'])) {
$order['customer'] = $this->createCustomer($data); $order['customer'] = $this->createCustomer($data);
$response = $retailcrmApiClient->ordersEdit($order); $response = $retailcrmApiClient->ordersCreate($order);
} }
} else { } else {
$order_payment = reset($order['payments']); $order_payment = reset($order['payments']);
unset($order['payments']); unset($order['payments']);
$order = self::filterRecursive($order); $order = self::filterRecursive($order);
$response = $retailcrmApiClient->ordersEdit($order); $response = $retailcrmApiClient->ordersEdit($order);
if ($response->getStatusCode() === 400 && !empty($response->__get('errors')['customer.externalId'])) { if (isset($response['errors']['customer.externalId'])) {
$order['customer'] = $this->createCustomer($data); $order['customer'] = $this->createCustomer($data);
$response = $retailcrmApiClient->ordersEdit($order); $response = $retailcrmApiClient->ordersEdit($order);
} }
@ -97,9 +97,9 @@ class ModelExtensionRetailcrmOrder extends Model {
$shippingModule = $shippingCode[0]; $shippingModule = $shippingCode[0];
if (isset($this->settings[$this->moduleTitle . '_delivery'][$order_data['shipping_code']])) { if (isset($this->settings[$this->moduleTitle . '_delivery'][$order_data['shipping_code']])) {
$delivery_code = $this->settings[$this->moduleTitle . '_delivery'][$order_data['shipping_code']]; $delivery_code = $this->settings[$this->moduleTitle . '_delivery'][$order_data['shipping_code']];
} elseif (isset($this->settings[$this->moduleTitle . '_delivery'][$shippingModule])) { } elseif (isset($this->settings[$this->moduleTitle . '_delivery'][$shippingModule])) {
$delivery_code = $this->settings[$this->moduleTitle . '_delivery'][$shippingModule]; $delivery_code = $this->settings[$this->moduleTitle . '_delivery'][$shippingModule];
} }
} }
@ -414,7 +414,7 @@ class ModelExtensionRetailcrmOrder extends Model {
/** /**
* @param array $data * @param array $data
* *
* @return array * @return array $customer
*/ */
private function createCustomer($data) private function createCustomer($data)
{ {