Merge pull request #116 from iyzoer/v2.2

Добавлена передача внешнего кода клиента при создании заказа
This commit is contained in:
Alex Lushpai 2018-09-28 17:50:52 +03:00 committed by GitHub
commit 6ba09d3ac5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 15 deletions

4
.gitignore vendored Normal file
View File

@ -0,0 +1,4 @@
.env
bin/
vendor/
www/

View File

@ -4,12 +4,12 @@ class ModelRetailcrmOrder extends Model {
public function sendToCrm($order_data, $order_id) public function sendToCrm($order_data, $order_id)
{ {
if(isset($this->request->post['fromApi'])) return; if (isset($this->request->post['fromApi'])) return;
$this->load->model('setting/setting'); $this->load->model('setting/setting');
$settings = $this->model_setting_setting->getSetting('retailcrm'); $settings = $this->model_setting_setting->getSetting('retailcrm');
if(!empty($settings['retailcrm_url']) && !empty($settings['retailcrm_apikey'])) { if (!empty($settings['retailcrm_url']) && !empty($settings['retailcrm_apikey'])) {
$this->load->model('catalog/product'); $this->load->model('catalog/product');
require_once DIR_SYSTEM . 'library/retailcrm/bootstrap.php'; require_once DIR_SYSTEM . 'library/retailcrm/bootstrap.php';
@ -22,22 +22,26 @@ class ModelRetailcrmOrder extends Model {
$order = array(); $order = array();
$customers = $this->retailcrm->customersList( if ($order_data['customer_id']) {
array( $order['customer']['externalId'] = $order_data['customer_id'];
'name' => $order_data['telephone'], } else {
'email' => $order_data['email'] $customers = $this->retailcrm->customersList(
), array(
1, 'name' => $order_data['telephone'],
100 'email' => $order_data['email']
); ),
1,
100
);
if($customers) { if ($customers) {
foreach ($customers['customers'] as $customer) { foreach ($customers['customers'] as $customer) {
$order['customer']['id'] = $customer['id']; $order['customer']['id'] = $customer['id'];
}
} }
}
unset($customers); unset($customers);
}
$order['externalId'] = $order_id; $order['externalId'] = $order_id;
$order['firstName'] = $order_data['firstname']; $order['firstName'] = $order_data['firstname'];