RetailCRM-Mirror/opencart-module
1
0
Fork 0
mirror of https://github.com/retailcrm/opencart-module.git synced 2024-11-21 20:56:07 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #162 from Neur0toxine/v1.x

Browse Source 
Don't update 'createdAt' while updating order in retailCRM
This commit is contained in:
Alex Lushpai 2019-07-04 10:09:51 +03:00 committed by GitHub
commit aae432abbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.idea

4
admin/model/retailcrm/order.php
View File

@ -52,7 +52,7 @@ class ModelRetailcrmOrder extends Model {
} }
} }
$order['createdAt'] = date('Y-m-d H:i:s'); $order['createdAt'] = isset($order_data['date_added']) ? $order_data['date_added'] : date('Y-m-d H:i:s');
$payment_code = $order_data['payment_code']; $payment_code = $order_data['payment_code'];
$order['paymentType'] = $settings['retailcrm_payment'][$payment_code]; $order['paymentType'] = $settings['retailcrm_payment'][$payment_code];
@ -154,9 +154,7 @@ class ModelRetailcrmOrder extends Model {
} }
} }
$order['createdAt'] = date('Y-m-d H:i:s');
$order['paymentType'] = $settings['retailcrm_payment'][$payment_code]; $order['paymentType'] = $settings['retailcrm_payment'][$payment_code];
$country = (isset($order_data['shipping_country'])) ? $order_data['shipping_country'] : '' ; $country = (isset($order_data['shipping_country'])) ? $order_data['shipping_country'] : '' ;
$order['delivery'] = array( $order['delivery'] = array(

4
catalog/model/retailcrm/order.php
View File

@ -56,7 +56,7 @@ class ModelRetailcrmOrder extends Model {
} }
} }
$order['createdAt'] = date('Y-m-d H:i:s'); $order['createdAt'] = isset($order_data['date_added']) ? $order_data['date_added'] : date('Y-m-d H:i:s');
$payment_code = $order_data['payment_code']; $payment_code = $order_data['payment_code'];
$order['paymentType'] = $settings['retailcrm_payment'][$payment_code]; $order['paymentType'] = $settings['retailcrm_payment'][$payment_code];
@ -162,9 +162,7 @@ class ModelRetailcrmOrder extends Model {
} }
} }
$order['createdAt'] = date('Y-m-d H:i:s');
$order['paymentType'] = $settings['retailcrm_payment'][$payment_code]; $order['paymentType'] = $settings['retailcrm_payment'][$payment_code];
$country = (isset($order_data['shipping_country'])) ? $order_data['shipping_country'] : '' ; $country = (isset($order_data['shipping_country'])) ? $order_data['shipping_country'] : '' ;
$order['delivery'] = array( $order['delivery'] = array(