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

Changing the connection to bootstrap.php (#229)

Browse Source
This commit is contained in:
Day Vladimir 2021-05-06 13:42:45 +02:00 committed by GitHub
parent 4e09c021c8
commit d058173aa4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -265,28 +265,29 @@ class ModelExtensionRetailcrmOrder extends Model {
if (isset($properties)) $item['properties'] = $properties; if (isset($properties)) $item['properties'] = $properties;
$order['items'][] = $item; $order['items'][] = $item;
if (isset($order_data['order_status_id']) && $order_data['order_status_id'] > 0) {
$order['status'] = $this->settings[$this->moduleTitle . '_status'][$order_data['order_status_id']];
} elseif (isset($order_data['order_status_id']) && $order_data['order_status_id'] == 0) {
$order['status'] = $this->settings[$this->moduleTitle . '_missing_status'];
}
if (isset($this->settings[$this->moduleTitle . '_custom_field']) && $order_data['custom_field']) {
$customFields = $order_data['custom_field'];
foreach ($customFields as $key => $value) {
if (isset($this->settings[$this->moduleTitle . '_custom_field']['o_' . $key])) {
$customFieldsToCrm[$this->settings[$this->moduleTitle . '_custom_field']['o_' . $key]] = $value;
}
}
if (isset($customFieldsToCrm)) {
$order['customFields'] = $customFieldsToCrm;
}
}
} }
if (isset($order_data['order_status_id']) && $order_data['order_status_id'] > 0) {
$order['status'] = $this->settings[$this->moduleTitle . '_status'][$order_data['order_status_id']];
} elseif (isset($order_data['order_status_id']) && $order_data['order_status_id'] == 0) {
$order['status'] = $this->settings[$this->moduleTitle . '_missing_status'];
}
if (isset($this->settings[$this->moduleTitle . '_custom_field']) && $order_data['custom_field']) {
$customFields = $order_data['custom_field'];
foreach ($customFields as $key => $value) {
if (isset($this->settings[$this->moduleTitle . '_custom_field']['o_' . $key])) {
$customFieldsToCrm[$this->settings[$this->moduleTitle . '_custom_field']['o_' . $key]] = $value;
}
}
if (isset($customFieldsToCrm)) {
$order['customFields'] = $customFieldsToCrm;
}
}
$payment = array( $payment = array(
'externalId' => $order_id, 'externalId' => $order_id,
'type' => $payment_code, 'type' => $payment_code,

2
src/upload/system/library/retailcrm/retailcrm.php
View File

@ -10,7 +10,7 @@ use retailcrm\factory\OrderConverterFactory;
use retailcrm\factory\CustomerConverterFactory; use retailcrm\factory\CustomerConverterFactory;
use retailcrm\service\SettingsManager; use retailcrm\service\SettingsManager;
require_once 'bootstrap.php'; require_once DIR_SYSTEM . 'library/retailcrm/bootstrap.php';
class Retailcrm { class Retailcrm {