Merge branch 'ticket-newExtracts' into develop

This commit is contained in:
Marion Muszynski 2016-04-20 15:59:31 +02:00
commit 9f20e049de

View File

@ -1211,7 +1211,7 @@ class AdminBulkUpdate extends AdminTab {
// $c_images[] = 'http://static.bebeboutik.com/'.(int) $p->id.'-'.$img['id_image'].'.jpg';
}
/*$quantity_sold = (int) Db::getInstance()->getValue('
$quantity_sold = (int) Db::getInstance()->getValue('
SELECT SUM(d.`product_quantity`)
FROM `'._DB_PREFIX_.'order_detail` d
LEFT JOIN `'._DB_PREFIX_.'orders` o
@ -1221,8 +1221,8 @@ class AdminBulkUpdate extends AdminTab {
WHERE d.`product_id` = '.(int) $p->id.'
AND d.`product_attribute_id` = '.(int) $k.'
AND h.`id_order_state` = 2
');*/
$quantity_sold = (int) Db::getInstance()->getValue('
');
/*$quantity_sold = (int) Db::getInstance()->getValue('
SELECT SUM(d.`product_quantity`)
FROM `'._DB_PREFIX_.'order_detail` d
LEFT JOIN `'._DB_PREFIX_.'orders` o ON o.`id_order` = d.`id_order`
@ -1234,7 +1234,7 @@ class AdminBulkUpdate extends AdminTab {
WHERE `id_order`=d.`id_order`
ORDER BY `date_add` DESC LIMIT 1
) NOT IN (1,6,8,9,10,11,14,15,18)
');
');*/
$names = array_unique($v['name']);
sort($names, SORT_STRING);
@ -1272,7 +1272,7 @@ class AdminBulkUpdate extends AdminTab {
), ';', '"');
}
} else {
/*$quantity_sold = (int) Db::getInstance()->getValue('
$quantity_sold = (int) Db::getInstance()->getValue('
SELECT SUM(d.`product_quantity`)
FROM `'._DB_PREFIX_.'order_detail` d
LEFT JOIN `'._DB_PREFIX_.'orders` o
@ -1281,8 +1281,8 @@ class AdminBulkUpdate extends AdminTab {
ON h.`id_order` = d.`id_order`
WHERE d.`product_id` = '.(int) $p->id.'
AND h.`id_order_state` = 2
');*/
$quantity_sold = (int) Db::getInstance()->getValue('
');
/*$quantity_sold = (int) Db::getInstance()->getValue('
SELECT SUM(d.`product_quantity`)
FROM `'._DB_PREFIX_.'order_detail` d
LEFT JOIN `'._DB_PREFIX_.'orders` o ON o.`id_order` = d.`id_order`
@ -1293,7 +1293,7 @@ class AdminBulkUpdate extends AdminTab {
WHERE `id_order`=d.`id_order`
ORDER BY `date_add` DESC LIMIT 1
) NOT IN (1,6,8,9,10,11,14,15,18)
');
');*/
fputcsv($f, array(
$p->supplier_reference,
@ -1496,7 +1496,7 @@ class AdminBulkUpdate extends AdminTab {
$names = array_unique($v['name']);
sort($names, SORT_STRING);
/*$quantity_sold = (int) Db::getInstance()->getValue('
$quantity_sold = (int) Db::getInstance()->getValue('
SELECT SUM(d.`product_quantity`)
FROM `'._DB_PREFIX_.'order_detail` d
LEFT JOIN `'._DB_PREFIX_.'orders` o
@ -1506,8 +1506,8 @@ class AdminBulkUpdate extends AdminTab {
WHERE d.`product_id` = '.(int) $p->id.'
AND d.`product_attribute_id` = '.(int) $k.'
AND h.`id_order_state` = 2
');*/
$quantity_sold = (int) Db::getInstance()->getValue('
');
/*$quantity_sold = (int) Db::getInstance()->getValue('
SELECT SUM(d.`product_quantity`)
FROM `'._DB_PREFIX_.'order_detail` d
LEFT JOIN `'._DB_PREFIX_.'orders` o ON o.`id_order` = d.`id_order`
@ -1519,7 +1519,7 @@ class AdminBulkUpdate extends AdminTab {
WHERE `id_order`=d.`id_order`
ORDER BY `date_add` DESC LIMIT 1
) NOT IN (1,6,8,9,10,11,14,15,18)
');
');*/
$customs = Db::getInstance()->getRow('
SELECT `nc8`, `id_country`
@ -1559,7 +1559,7 @@ class AdminBulkUpdate extends AdminTab {
}
} else {
/*$quantity_sold = (int) Db::getInstance()->getValue('
$quantity_sold = (int) Db::getInstance()->getValue('
SELECT SUM(d.`product_quantity`)
FROM `'._DB_PREFIX_.'order_detail` d
LEFT JOIN `'._DB_PREFIX_.'orders` o
@ -1568,8 +1568,8 @@ class AdminBulkUpdate extends AdminTab {
ON h.`id_order` = d.`id_order`
WHERE d.`product_id` = '.(int) $p->id.'
AND h.`id_order_state` = 2
');*/
$quantity_sold = (int) Db::getInstance()->getValue('
');
/*$quantity_sold = (int) Db::getInstance()->getValue('
SELECT SUM(d.`product_quantity`)
FROM `'._DB_PREFIX_.'order_detail` d
LEFT JOIN `'._DB_PREFIX_.'orders` o ON o.`id_order` = d.`id_order`
@ -1580,7 +1580,7 @@ class AdminBulkUpdate extends AdminTab {
WHERE `id_order`=d.`id_order`
ORDER BY `date_add` DESC LIMIT 1
) NOT IN (1,6,8,9,10,11,14,15,18)
');
');*/
$customs = Db::getInstance()->getRow('
SELECT `nc8`, `id_country`