mirror of
https://github.com/retailcrm/opencart-module.git
synced 2024-11-22 05:06:07 +03:00
Merge pull request #5 from VitalyArt/abandoned-order
fix abandoned order
This commit is contained in:
commit
2111c99690
@ -5,20 +5,26 @@
|
||||
<vqmver required="true">2.3.x</vqmver>
|
||||
<author>retailcrm.ru</author>
|
||||
|
||||
<file path="catalog/model/checkout/" name="order.php">
|
||||
<file path="catalog/controller/checkout/" name="success.php">
|
||||
<operation error="skip">
|
||||
<search position="before" ><![CDATA[return $order_id]]></search>
|
||||
<search position="before" ><![CDATA[$this->cart->clear()]]></search>
|
||||
<add><![CDATA[
|
||||
$this->load->model('account/order');
|
||||
$this->load->model('checkout/order');
|
||||
$this->load->model('retailcrm/order');
|
||||
$this->model_retailcrm_order->sendToCrm($data, $order_id);
|
||||
|
||||
$order = $this->model_checkout_order->getOrder($this->session->data['order_id']);
|
||||
$order['products'] = $this->model_account_order->getOrderProducts($this->session->data['order_id']);
|
||||
|
||||
$this->model_retailcrm_order->sendToCrm($order, $this->session->data['order_id']);
|
||||
]]></add>
|
||||
</operation>
|
||||
</file>
|
||||
|
||||
<file path="admin/model/sale/" name="order.php">
|
||||
<operation error="skip">
|
||||
<search position="after" ><![CDATA[$this->db->query("UPDATE `" . DB_PREFIX . "order` SET total = '" . (float)$total . "', affiliate_id = '" . (int)$affiliate_id . "', commission = '" . (float)$commission . "' WHERE order_id = '" . (int)$order_id . "'");]]></search>
|
||||
<add><![CDATA[
|
||||
<file path="admin/model/sale/" name="order.php">
|
||||
<operation error="skip">
|
||||
<search position="after" ><![CDATA[$this->db->query("UPDATE `" . DB_PREFIX . "order` SET total = '" . (float)$total . "', affiliate_id = '" . (int)$affiliate_id . "', commission = '" . (float)$commission . "' WHERE order_id = '" . (int)$order_id . "'");]]></search>
|
||||
<add><![CDATA[
|
||||
if (!isset($data['fromApi'])) {
|
||||
$this->load->model('setting/setting');
|
||||
$status = $this->model_setting_setting->getSetting('retailcrm');
|
||||
@ -35,7 +41,6 @@
|
||||
}
|
||||
}
|
||||
]]></add>
|
||||
</operation>
|
||||
</file>
|
||||
|
||||
</operation>
|
||||
</file>
|
||||
</modification>
|
||||
|
Loading…
Reference in New Issue
Block a user