mirror of
https://github.com/retailcrm/opencart-module.git
synced 2024-11-25 06:36:06 +03:00
add cli extension for running cron, add orderHistory method for data exchange
This commit is contained in:
parent
258feff74d
commit
affe2a5867
@ -52,4 +52,4 @@ Look into example folder
|
||||
* Export old customers & orders
|
||||
* Generate static xml
|
||||
* New customers export
|
||||
* OrderHistory exchange
|
||||
|
||||
|
@ -18,7 +18,7 @@ class ControllerModuleIntarocrm extends Controller {
|
||||
public function index() {
|
||||
|
||||
$this->log = new Monolog\Logger('opencart-module');
|
||||
$this->log->pushHandler(new Monolog\Handler\StreamHandler(__DIR__ . '/../../../system/logs/module.log', Monolog\Logger::INFO));
|
||||
$this->log->pushHandler(new Monolog\Handler\StreamHandler(__DIR__ . '/../../../system/logs/intarocrm_module.log', Monolog\Logger::INFO));
|
||||
|
||||
$this->load->model('setting/setting');
|
||||
$this->load->model('setting/extension');
|
||||
@ -196,6 +196,134 @@ class ControllerModuleIntarocrm extends Controller {
|
||||
$this->response->setOutput($this->render());
|
||||
}
|
||||
|
||||
public function order_history()
|
||||
{
|
||||
$this->log = new Monolog\Logger('opencart-module');
|
||||
$this->log->pushHandler(new Monolog\Handler\StreamHandler(__DIR__ . '/../../../system/logs/intarocrm_module.log', Monolog\Logger::INFO));
|
||||
|
||||
$this->load->model('setting/setting');
|
||||
$this->load->model('setting/store');
|
||||
$this->load->model('sale/order');
|
||||
$settings = $this->model_setting_setting->getSetting('intarocrm');
|
||||
$settings['domain'] = parse_url(HTTP_SERVER, PHP_URL_HOST);
|
||||
|
||||
if (isset($settings['intarocrm_url']) && $settings['intarocrm_url'] != '' && isset($settings['intarocrm_apikey']) && $settings['intarocrm_apikey'] != '') {
|
||||
include_once __DIR__ . '/../../../system/library/intarocrm/apihelper.php';
|
||||
$crm = new ApiHelper($settings);
|
||||
$orders = $crm->orderHistory();
|
||||
$forFix = array();
|
||||
|
||||
foreach ($orders as $order)
|
||||
{
|
||||
$data = array();
|
||||
|
||||
$delivery = array_flip($settings['intarocrm_delivery']);
|
||||
$payment = array_flip($settings['intarocrm_payment']);
|
||||
$status = array_flip($settings['intarocrm_status']);
|
||||
|
||||
$ocPayment = $this->getOpercartPaymentTypes();
|
||||
$ocDelivery = $this->getOpercartDeliveryMethods();
|
||||
|
||||
$data['store_id'] = ($this->config->get('config_store_id') == null) ? 0 : $this->config->get('config_store_id');
|
||||
$data['customer'] = $order['customer']['firstName'];
|
||||
$data['customer_id'] = (isset($order['customer']['externalId'])) ? $order['customer']['externalId']: '';
|
||||
$data['customer_group_id'] = '1';
|
||||
$data['firstname'] = $order['customer']['firstName'];
|
||||
$data['lastname'] = (isset($order['customer']['lastName'])) ? $order['customer']['lastName'] : ' ';
|
||||
$data['email'] = $order['customer']['email'];
|
||||
$data['telephone'] = (isset($order['customer']['phones'][0]['number'])) ? $order['customer']['phones'][0]['number'] : ' ';
|
||||
$data['comment'] = $order['customerComment'];
|
||||
|
||||
$data['payment_address'] = '0';
|
||||
$data['payment_firstname'] = $order['firstName'];
|
||||
$data['payment_lastname'] = (isset($order['lastName'])) ? $order['lastName'] : ' ';
|
||||
$data['payment_address_1'] = $order['customer']['address']['text'];
|
||||
$data['payment_city'] = $order['customer']['address']['city'];
|
||||
$data['payment_postcode'] = $order['customer']['address']['index'];
|
||||
|
||||
/*
|
||||
* TODO: add country & zone id detection
|
||||
*/
|
||||
//$data['payment_country_id'] = '176';
|
||||
//$data['payment_zone_id'] = '2778';
|
||||
//$data['shipping_country_id'] = '176';
|
||||
//$data['shipping_zone_id'] = '2778';
|
||||
|
||||
$data['shipping_address'] = '0';
|
||||
$data['shipping_firstname'] = $order['customer']['firstName'];
|
||||
$data['shipping_lastname'] = (isset($order['customer']['lastName'])) ? $order['customer']['lastName'] : ' ';
|
||||
$data['shipping_address_1'] = $order['delivery']['address']['text'];
|
||||
$data['shipping_city'] = $order['delivery']['address']['city'];
|
||||
$data['shipping_postcode'] = $order['delivery']['address']['index'];
|
||||
|
||||
$data['shipping'] = $delivery[$order['delivery']['code']];
|
||||
$data['shipping_method'] = $ocDelivery[$data['shipping']];
|
||||
$data['shipping_code'] = $delivery[$order['delivery']['code']];
|
||||
$data['payment'] = $payment[$order['paymentType']];
|
||||
$data['payment_method'] = $ocPayment[$data['payment']];
|
||||
$data['payment_code'] = $payment[$order['paymentType']];
|
||||
$data['order_status_id'] = $status[$order['status']];
|
||||
|
||||
$data['order_product'] = array();
|
||||
|
||||
$subtotal = 0;
|
||||
$shipping = isset($order['delivery']['cost']) ? $order['delivery']['cost'] : 0;
|
||||
|
||||
foreach($order['items'] as $item) {
|
||||
$data['order_product'][] = array(
|
||||
'product_id' => $item['offer']['externalId'],
|
||||
'name' => $item['offer']['name'],
|
||||
'quantity' => $item['quantity'],
|
||||
'price' => $item['initialPrice'],
|
||||
'total' => $item['initialPrice'] * $item['quantity'],
|
||||
);
|
||||
|
||||
$subtotal += $item['initialPrice'] * $item['quantity'];
|
||||
}
|
||||
|
||||
$subtotalSettings = $this->model_setting_setting->getSetting('sub_total');
|
||||
$totalSettings = $this->model_setting_setting->getSetting('total');
|
||||
$shippingSettings = $this->model_setting_setting->getSetting('shipping');
|
||||
|
||||
$data['order_total'] = array(
|
||||
array(
|
||||
'order_total_id' => '',
|
||||
'code' => 'sub_total',
|
||||
'value' => $subtotal,
|
||||
'sort_order' => $subtotalSettings['sub_total_sort_order']
|
||||
),
|
||||
array(
|
||||
'order_total_id' => '',
|
||||
'code' => 'shipping',
|
||||
'value' => $shipping,
|
||||
'sort_order' => $shippingSettings['shipping_sort_order']
|
||||
),
|
||||
array(
|
||||
'order_total_id' => '',
|
||||
'code' => 'total',
|
||||
'value' => $subtotal + $shipping,
|
||||
'sort_order' => $totalSettings['total_sort_order']
|
||||
)
|
||||
);
|
||||
|
||||
if (isset($order['externalId'])) {
|
||||
$this->model_sale_order->editOrder($order['externalId'], $data);
|
||||
} else {
|
||||
$this->model_sale_order->addOrder($data);
|
||||
$last = $this->model_sale_order->getOrders($data = array('order' => 'DESC', 'limit' => 1));
|
||||
$forFix[] = array('id' => $order['id'], 'externalId' => (int) $last[0]['order_id']);
|
||||
}
|
||||
}
|
||||
|
||||
if (!empty($forFix)) {
|
||||
$crm->orderFixExternalIds($forFix);
|
||||
}
|
||||
|
||||
} else {
|
||||
$this->log->addNotice('['.$this->config->get('store_name').'] RestApi::orderHistory: you need to configure Intarocrm module first.');
|
||||
}
|
||||
}
|
||||
|
||||
private function validate() {
|
||||
if (!$this->user->hasPermission('modify', 'module/intarocrm')) {
|
||||
$this->error['warning'] = $this->language->get('error_permission');
|
||||
|
@ -66,7 +66,7 @@ class ControllerExportIntarocrm extends Controller {
|
||||
}
|
||||
|
||||
$e->appendChild($this->dd->createElement('name'))->appendChild($this->dd->createTextNode($offer['name']));
|
||||
$e->appendChild($this->dd->createElement('productName'))->appendChild($this->dd->createTextNode($offer['name'] .' '. $offer['model']));
|
||||
$e->appendChild($this->dd->createElement('productName'))->appendChild($this->dd->createTextNode($offer['name']));
|
||||
$e->appendChild($this->dd->createElement('vendor'))->appendChild($this->dd->createTextNode($offer['manufacturer']));
|
||||
$e->appendChild($this->dd->createElement('price', $offer['price']));
|
||||
|
||||
|
@ -41,8 +41,7 @@ class ModelCheckoutOrder extends Model
|
||||
/*
|
||||
* This is integration code
|
||||
*/
|
||||
$data['order_id'] = $order_id;
|
||||
$this->crmOrderAction($data, 'create');
|
||||
$this->crmOrderAction($data, $order_id, 'create');
|
||||
|
||||
/*
|
||||
* This is original code again
|
||||
@ -57,7 +56,7 @@ class ModelCheckoutOrder extends Model
|
||||
*
|
||||
* @param $action string values: edit, create
|
||||
*/
|
||||
protected function crmOrderAction($order, $action=null)
|
||||
protected function crmOrderAction($order, $order_id, $action=null)
|
||||
{
|
||||
$this->load->model('setting/setting');
|
||||
$settings = $this->model_setting_setting->getSetting('intarocrm');
|
||||
@ -66,6 +65,7 @@ class ModelCheckoutOrder extends Model
|
||||
if(isset($settings['intarocrm_url']) && $settings['intarocrm_url'] != '' && isset($settings['intarocrm_apikey']) && $settings['intarocrm_apikey'] != '') {
|
||||
include_once __DIR__ . '/../../../system/library/intarocrm/apihelper.php';
|
||||
|
||||
$order['order_id'] = $order_id;
|
||||
$crm = new ApiHelper($settings);
|
||||
|
||||
if ($action == null) {
|
||||
|
@ -8,7 +8,7 @@ class ApiHelper
|
||||
protected $intaroApi, $log, $settings;
|
||||
|
||||
public function __construct($settings) {
|
||||
$this->dir = __DIR__ . '/../logs/';
|
||||
$this->dir = __DIR__ . '/../../logs/';
|
||||
$this->fileDate = $this->dir . 'intarocrm_history.log';
|
||||
$this->settings = $settings;
|
||||
$this->domain = $settings['domain'];
|
||||
@ -138,30 +138,23 @@ class ApiHelper
|
||||
return false;
|
||||
}
|
||||
|
||||
foreach($orders as $order) {
|
||||
return $orders;
|
||||
}
|
||||
|
||||
if (!isset($order['deleted'])) {
|
||||
public function orderFixExternalIds($data)
|
||||
{
|
||||
try {
|
||||
$o = $this->intaroApi->orderGet($order['id'], 'id');
|
||||
$this->intaroApi->orderFixExternalIds($data);
|
||||
} catch (ApiException $e) {
|
||||
$this->log->addError('['.$this->domain.'] RestApi::orderGet:' . $e->getMessage());
|
||||
$this->log->addError('['.$this->domain.'] RestApi::orderGet:' . json_encode($order));
|
||||
$this->log->addError('['.$this->domain.'] RestApi::orderFixExternalIds:' . $e->getMessage());
|
||||
$this->log->addError('['.$this->domain.'] RestApi::orderFixExternalIds:' . json_encode($data));
|
||||
|
||||
return false;
|
||||
} catch (CurlException $e) {
|
||||
$this->log->addError('['.$this->domain.'] RestApi::orderGet::Curl:' . $e->getMessage());
|
||||
$this->log->addError('['.$this->domain.'] RestApi::orderFixExternalIds::Curl:' . $e->getMessage());
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
if(isset($o['orderMethod']) && $o['orderMethod'] == $this->params['intarocrm_api']['orderMethod']) {
|
||||
$this->log->addNotice('send order to PAP: ' . $o['id'] . ' - ' . $o['status']);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
private function saveDate($date) {
|
||||
@ -197,6 +190,6 @@ class ApiHelper
|
||||
|
||||
protected function initLogger() {
|
||||
$this->log = new Monolog\Logger('intarocrm');
|
||||
$this->log->pushHandler(new Monolog\Handler\StreamHandler($this->dir . 'intarocrm.log', Monolog\Logger::INFO));
|
||||
$this->log->pushHandler(new Monolog\Handler\StreamHandler($this->dir . 'intarocrm_module.log', Monolog\Logger::INFO));
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user