antadis/bebeboutik-scripts
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add device column

Browse Source
This commit is contained in:
Michael RICOIS 2018-01-03 11:57:05 +01:00
parent cac60e429c
commit 3b7800beca
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cron_export_sales_monthly.php
View File

@ -136,7 +136,7 @@ foreach(Db::getInstance()->ExecuteS('
FROM `'._DB_PREFIX_.'order_detail` d
LEFT JOIN `'._DB_PREFIX_.'product` p ON (p.`id_product` = d.`product_id`)
WHERE d.id_order IN ('.implode(',',$query_orders).')
') as $row){
') as $row) {
if(isset($orders[(int)$row['id_order']])){
if(!isset($orders[(int)$row['id_order']]['order_details'])){
$orders[(int)$row['id_order']]['order_details'] = array();
@ -491,6 +491,7 @@ if(count($slips) > 0) {
);
$invoice_address = $invoice_address[0];
// Order details
$order_details = Db::getInstance()->ExecuteS('
SELECT d.*, p.`wholesale_price`
FROM `'._DB_PREFIX_.'order_detail` d
@ -515,13 +516,14 @@ if(count($slips) > 0) {
AND `id_lang` = 2
');
$date_send = Db::getInstance()->getValue('
// Never used
/*$date_send = Db::getInstance()->getValue('
SELECT `date_add`
FROM `'._DB_PREFIX_.'order_history`
WHERE `id_order_state` = 4
AND `id_order` = '.(int) $order['id_order'].'
ORDER BY `date_add` ASC
');
');*/
$ldetails = array();
$total_products_wo_taxes_210 = array();