RetailCRM-Mirror/opencart-module
1
0
Fork 0
mirror of https://github.com/retailcrm/opencart-module.git synced 2025-01-23 03:01:41 +03:00
Code Issues Projects Releases Wiki Activity

fix edit method, fix api marker, update translations

Browse Source
This commit is contained in:
Alex Lushpai 2014-09-03 13:03:25 +04:00
parent 44258050eb
commit d86ff44e0b
4 changed files with 125 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

196
admin/controller/module/intarocrm.php
View File

@ -238,9 +238,9 @@ class ControllerModuleIntarocrm extends Controller {
$this->load->model('sale/customer'); $this->load->model('sale/customer');
$this->load->model('intarocrm/tools'); $this->load->model('intarocrm/tools');
$this->load->model('catalog/product'); $this->load->model('catalog/product');
$this->load->model('localisation/zone');
$my_language = new Language('russian'); $this->load->language('module/intarocrm');
$my_language->load('sale/order');
$settings = $this->model_setting_setting->getSetting('intarocrm'); $settings = $this->model_setting_setting->getSetting('intarocrm');
$settings['domain'] = parse_url(HTTP_SERVER, PHP_URL_HOST); $settings['domain'] = parse_url(HTTP_SERVER, PHP_URL_HOST);
@ -259,8 +259,17 @@ class ControllerModuleIntarocrm extends Controller {
$totalSettings = $this->model_setting_setting->getSetting('total'); $totalSettings = $this->model_setting_setting->getSetting('total');
$shippingSettings = $this->model_setting_setting->getSetting('shipping'); $shippingSettings = $this->model_setting_setting->getSetting('shipping');
foreach ($orders as $order) $delivery = array_flip($settings['intarocrm_delivery']);
{ $payment = array_flip($settings['intarocrm_payment']);
$status = array_flip($settings['intarocrm_status']);
$ocPayment = $this->model_intarocrm_tools->getOpercartPaymentTypes();
$ocDelivery = $this->model_intarocrm_tools->getOpercartDeliveryMethods();
$zones = $this->model_localisation_zone->getZones();
foreach ($orders as $order) {
if (!isset($order['deleted']) || !$order['deleted']) { if (!isset($order['deleted']) || !$order['deleted']) {
$data = array(); $data = array();
@ -270,63 +279,72 @@ class ControllerModuleIntarocrm extends Controller {
: '' : ''
; ;
if ($customer_id == '') { if (isset($order['externalId'])) {
$cData = array( /*
'customer_group_id' => '1', * opercart developers believe that to remove all
'firstname' => $order['customer']['firstName'], * products from the order during the editing is a good
'lastname' => (isset($order['customer']['lastName'])) * idea...
? $order['customer']['lastName'] *
: ' ' * so we have to get order data from crm
, *
'email' => $order['customer']['email'], */
'telephone' => (isset($order['customer']['phones'][0]['number'])) $order = $crm->getOrder($order['externalId']);
? $order['customer']['phones'][0]['number'] } else {
: ' ' if ($customer_id == '') {
, $cData = array(
'newsletter' => 0, 'customer_group_id' => '1',
'password' => 'tmppass',
'status' => 1,
'address' => array(
'firstname' => $order['customer']['firstName'], 'firstname' => $order['customer']['firstName'],
'lastname' => (isset($order['customer']['lastName'])) 'lastname' => (isset($order['customer']['lastName']))
? $order['customer']['lastName'] ? $order['customer']['lastName']
: ' ' : ' '
, ,
'address_1' => $order['customer']['address']['text'], 'email' => $order['customer']['email'],
'city' => isset($order['customer']['address']['city']) 'telephone' => (isset($order['customer']['phones'][0]['number']))
? $order['customer']['address']['city'] ? $order['customer']['phones'][0]['number']
: $order['delivery']['address']['city'] : ' '
, ,
'postcode' => isset($order['customer']['address']['index']) 'newsletter' => 0,
? $order['customer']['address']['index'] 'password' => 'tmppass',
: $order['delivery']['address']['index'] 'status' => 1,
, 'address' => array(
), 'firstname' => $order['customer']['firstName'],
'tax_id' => '', 'lastname' => (isset($order['customer']['lastName']))
'zone_id' => '', ? $order['customer']['lastName']
); : ' '
,
$this->model_sale_customer->addCustomer($cData); 'address_1' => $order['customer']['address']['text'],
'city' => isset($order['customer']['address']['city'])
if (isset($order['customer']['email']) && $order['customer']['email'] != '') { ? $order['customer']['address']['city']
$tryToFind = $this->model_sale_customer->getCustomerByEmail($order['customer']['email']); : $order['delivery']['address']['city']
$customer_id = $tryToFind['customer_id']; ,
} else { 'postcode' => isset($order['customer']['address']['index'])
$last = $this->model_sale_customer->getCustomers( ? $order['customer']['address']['index']
$data = array('order' => 'DESC', 'limit' => 1) : $order['delivery']['address']['index']
,
),
'tax_id' => '',
'zone_id' => '',
); );
$customer_id = $last[0]['customer_id'];
}
$customersIdsFix[] = array('id' => $order['customer']['id'], 'externalId' => (int)$customer_id); $this->model_sale_customer->addCustomer($cData);
if (isset($order['customer']['email']) && $order['customer']['email'] != '') {
$tryToFind = $this->model_sale_customer->getCustomerByEmail($order['customer']['email']);
$customer_id = $tryToFind['customer_id'];
} else {
$last = $this->model_sale_customer->getCustomers(
$data = array('order' => 'DESC', 'limit' => 1)
);
$customer_id = $last[0]['customer_id'];
}
$customersIdsFix[] = array('id' => $order['customer']['id'], 'externalId' => (int)$customer_id);
}
} }
$delivery = array_flip($settings['intarocrm_delivery']); /*
$payment = array_flip($settings['intarocrm_payment']); * Build order data
$status = array_flip($settings['intarocrm_status']); */
$ocPayment = $this->model_intarocrm_tools->getOpercartPaymentTypes();
$ocDelivery = $this->model_intarocrm_tools->getOpercartDeliveryMethods();
$data['store_id'] = ($this->config->get('config_store_id') == null) $data['store_id'] = ($this->config->get('config_store_id') == null)
? 0 ? 0
@ -363,13 +381,34 @@ class ControllerModuleIntarocrm extends Controller {
; ;
/* /*
* TODO: add country & zone id detection * Country & zone id detection
*/ */
$data['payment_country_id'] = '176';
$data['shipping_country_id'] = '176';
//$data['payment_zone_id'] = '2778'; $country = 0;
//$data['shipping_zone_id'] = '2778'; $region = '';
if(is_int($order['delivery']['address']['region'])) {
$region = $order['delivery']['address']['region'];
} else {
foreach($zones as $zone) {
if($order['delivery']['address']['region'] == $zone['name']) {
$region = $zone['zone_id'];
}
}
}
$data['payment_country_id'] = isset($order['customer']['address']['country'])
? $order['customer']['address']['country']
: $order['delivery']['address']['country']
;
$data['payment_zone_id'] = isset($order['customer']['address']['region'])
? $order['customer']['address']['region']
: $region
;
$data['shipping_country_id'] = $order['delivery']['address']['country'];
$data['shipping_zone_id'] = $region;
$data['shipping_address'] = '0'; $data['shipping_address'] = '0';
$data['shipping_firstname'] = $order['customer']['firstName']; $data['shipping_firstname'] = $order['customer']['firstName'];
@ -391,8 +430,6 @@ class ControllerModuleIntarocrm extends Controller {
$data['payment_method'] = $ocPayment[$data['payment']]; $data['payment_method'] = $ocPayment[$data['payment']];
$data['payment_code'] = $payment[$order['paymentType']]; $data['payment_code'] = $payment[$order['paymentType']];
$data['order_status_id'] = $status[$order['status']];
// this data will not retrive from crm for now // this data will not retrive from crm for now
$data['tax'] = ''; $data['tax'] = '';
$data['tax_id'] = ''; $data['tax_id'] = '';
@ -433,7 +470,7 @@ class ControllerModuleIntarocrm extends Controller {
array( array(
'order_total_id' => '', 'order_total_id' => '',
'code' => 'sub_total', 'code' => 'sub_total',
'title' => $my_language->get('entry_amount'), 'title' => $this->language->get('product_summ'),
'value' => $order['summ'], 'value' => $order['summ'],
'text' => $order['summ'], 'text' => $order['summ'],
'sort_order' => $subtotalSettings['sub_total_sort_order'] 'sort_order' => $subtotalSettings['sub_total_sort_order']
@ -449,7 +486,7 @@ class ControllerModuleIntarocrm extends Controller {
array( array(
'order_total_id' => '', 'order_total_id' => '',
'code' => 'total', 'code' => 'total',
'title' => $my_language->get('column_total'), 'title' => $this->language->get('column_total'),
'value' => isset($order['totalSumm']) 'value' => isset($order['totalSumm'])
? $order['totalSumm'] ? $order['totalSumm']
: $order['summ'] + $deliveryCost : $order['summ'] + $deliveryCost
@ -462,43 +499,24 @@ class ControllerModuleIntarocrm extends Controller {
) )
); );
if (isset($order['created'])) { $data['fromApi'] = true;
$data['fromApi'] = true;
}
if (isset($order['externalId'])) { if (isset($order['externalId'])) {
/* if(array_key_exists($order['status'], $status)) {
* opercart developers believe that to remove all $data['order_status_id'] = $status[$order['status']];
* products from the order during the editing is a good idea... } else {
* $tmpOrder = $this->model_sale_order->getOrder($order['externalId']);
* so we have to get all the goods before orders are breaks $data['order_status_id'] = $tmpOrder['order_status_id'];
*
*/
$items = $crm->getOrderItems($order['externalId']);
$data['order_product'] = array();
foreach($items as $item) {
$p = $this->model_catalog_product->getProduct($item['offer']['externalId']);
$data['order_product'][] = array(
'product_id' => $item['offer']['externalId'],
'name' => $item['offer']['name'],
'quantity' => $item['quantity'],
'price' => $item['initialPrice'],
'total' => $item['initialPrice'] * $item['quantity'],
'model' => $p['model'],
// this data will not retrive from crm
'order_product_id' => '',
'tax' => 0,
'reward' => 0
);
} }
$this->model_sale_order->editOrder($order['externalId'], $data); $this->model_sale_order->editOrder($order['externalId'], $data);
} else { } else {
$data['order_status_id'] = 1;
$this->model_sale_order->addOrder($data); $this->model_sale_order->addOrder($data);
$last = $this->model_sale_order->getOrders($data = array('order' => 'DESC', 'limit' => 1)); $last = $this->model_sale_order->getOrders($data = array('order' => 'DESC', 'limit' => 1));
$ordersIdsFix[] = array('id' => $order['id'], 'externalId' => (int) $last[0]['order_id']); $ordersIdsFix[] = array('id' => $order['id'], 'externalId' => (int) $last[0]['order_id']);
} }
} }
} }
@ -538,4 +556,4 @@ class ControllerModuleIntarocrm extends Controller {
} }
} }

5
admin/language/english/module/intarocrm.php
View File

@ -17,6 +17,9 @@ $_['intarocrm_dict_delivery'] = 'Shipment methods';
$_['intarocrm_dict_status'] = 'Order statuses'; $_['intarocrm_dict_status'] = 'Order statuses';
$_['intarocrm_dict_payment'] = 'Payment methods'; $_['intarocrm_dict_payment'] = 'Payment methods';
$_['column_total'] = 'Total';
$_['product_summ'] = 'Amount';
// Errors // Errors
$_['error_permission'] = 'Warning! You do not have permission to modify module'; $_['error_permission'] = 'Warning! You do not have permission to modify module';
?> ?>

5
admin/language/russian/module/intarocrm.php
View File

@ -17,6 +17,9 @@ $_['intarocrm_dict_delivery'] = 'Способы доставки';
$_['intarocrm_dict_status'] = 'Статусы'; $_['intarocrm_dict_status'] = 'Статусы';
$_['intarocrm_dict_payment'] = 'Способы оплаты'; $_['intarocrm_dict_payment'] = 'Способы оплаты';
$_['column_total'] = 'Итого';
$_['product_summ'] = 'Сумма';
// Errors // Errors
$_['error_permission'] = 'У вас недостаточно прав на изменение настроек модуля'; $_['error_permission'] = 'У вас недостаточно прав на изменение настроек модуля';
?> ?>

17
system/library/intarocrm/apihelper.php
View File

@ -54,6 +54,9 @@ class ApiHelper
$customer['email'] = $data['email']; $customer['email'] = $data['email'];
$customer['phones'] = array(array('number' => $data['telephone'])); $customer['phones'] = array(array('number' => $data['telephone']));
$customer['address']['country'] = $data['payment_country_id'];
$customer['address']['region'] = $data['payment_zone_id'];
$customer['address']['text'] = implode(', ', array( $customer['address']['text'] = implode(', ', array(
$data['payment_postcode'], $data['payment_postcode'],
$data['payment_country'], $data['payment_country'],
@ -96,15 +99,19 @@ class ApiHelper
$order['createdAt'] = date('Y-m-d H:i:s'); $order['createdAt'] = date('Y-m-d H:i:s');
$order['paymentType'] = $settings['intarocrm_payment'][$payment_code]; $order['paymentType'] = $settings['intarocrm_payment'][$payment_code];
$country = (isset($data['shipping_country'])) ? $data['shipping_country'] : '' ;
$order['delivery'] = array( $order['delivery'] = array(
'code' => $settings['intarocrm_delivery'][$delivery_code], 'code' => $settings['intarocrm_delivery'][$delivery_code],
'cost' => $deliveryCost, 'cost' => $deliveryCost,
'address' => array( 'address' => array(
'index' => $data['shipping_postcode'], 'index' => $data['shipping_postcode'],
'city' => $data['shipping_city'], 'city' => $data['shipping_city'],
'country' => $data['shipping_country_id'],
'region' => $data['shipping_zone_id'],
'text' => implode(', ', array( 'text' => implode(', ', array(
$data['shipping_postcode'], $data['shipping_postcode'],
$data['shipping_country'], $country,
$data['shipping_city'], $data['shipping_city'],
$data['shipping_address_1'], $data['shipping_address_1'],
$data['shipping_address_2'] $data['shipping_address_2']
@ -112,7 +119,6 @@ class ApiHelper
) )
); );
$orderProducts = isset($data['products']) ? $data['products'] : $data['order_product']; $orderProducts = isset($data['products']) ? $data['products'] : $data['order_product'];
foreach ($orderProducts as $product) { foreach ($orderProducts as $product) {
@ -191,13 +197,10 @@ class ApiHelper
} }
} }
public function getOrderItems($order_id) public function getOrder($order_id)
{ {
$order = '';
try { try {
$order = $this->intaroApi->orderGet($order_id); return $this->intaroApi->orderGet($order_id);
return $order['items'];
} catch (IntaroCrm\Exception\ApiException $e) { } catch (IntaroCrm\Exception\ApiException $e) {
$this->log->addError('['.$this->domain.'] RestApi::orderFixExternalIds:' . $e->getMessage()); $this->log->addError('['.$this->domain.'] RestApi::orderFixExternalIds:' . $e->getMessage());
$this->log->addError('['.$this->domain.'] RestApi::orderFixExternalIds:' . json_encode($order)); $this->log->addError('['.$this->domain.'] RestApi::orderFixExternalIds:' . json_encode($order));