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

added opencart 2.2 compatibility

Browse Source
This commit is contained in:
dkorol 2016-08-02 14:20:56 +03:00
parent f55240d759
commit 82e3a4334b
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/controller/module/retailcrm.php
View File

@ -33,14 +33,14 @@ class ControllerModuleRetailcrm extends Controller
$this->model_extension_event $this->model_extension_event
->addEvent( ->addEvent(
'retailcrm', 'retailcrm',
'post.order.add', version_compare(VERSION, '2.2', '>=') ? 'catalog/model/checkout/order/addOrder/after' : 'post.order.add',
'module/retailcrm/order_create' 'module/retailcrm/order_create'
); );
$this->model_extension_event $this->model_extension_event
->addEvent( ->addEvent(
'retailcrm', 'retailcrm',
'post.order.history.add', version_compare(VERSION, '2.2', '>=') ? 'catalog/model/checkout/order/addOrderHistory/after' : 'post.order.history.add',
'module/retailcrm/order_edit' 'module/retailcrm/order_edit'
); );
} }

15
catalog/controller/module/retailcrm.php
View File

@ -18,12 +18,18 @@ class ControllerModuleRetailcrm extends Controller
* *
* @return void * @return void
*/ */
public function order_create($order_id) public function order_create($parameter1, $parameter2 = null)
{ {
$this->load->model('checkout/order'); $this->load->model('checkout/order');
$this->load->model('account/order'); $this->load->model('account/order');
if($parameter2 != null)
$order_id = $parameter2;
else
$order_id = $parameter1;
$data = $this->model_checkout_order->getOrder($order_id); $data = $this->model_checkout_order->getOrder($order_id);
$data['products'] = $this->model_account_order->getOrderProducts($order_id); $data['products'] = $this->model_account_order->getOrderProducts($order_id);
foreach($data['products'] as $key => $product) { foreach($data['products'] as $key => $product) {
$productOptions = $this->model_account_order->getOrderOptions($order_id, $product['order_product_id']); $productOptions = $this->model_account_order->getOrderOptions($order_id, $product['order_product_id']);
@ -49,7 +55,12 @@ class ControllerModuleRetailcrm extends Controller
} }
} }
public function order_edit($order_id) { public function order_edit($parameter1, $parameter2 = null, $parameter3 = null, $parameter4 = null) {
if($parameter4 != null)
$order_id = $parameter3;
else
$order_id = $parameter1;
$this->load->model('checkout/order'); $this->load->model('checkout/order');
$this->load->model('account/order'); $this->load->model('account/order');