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

Merge branch 'ticket-updateBraderie'

Browse Source
This commit is contained in:
Marion Muszynski 2016-05-26 17:53:15 +02:00
commit 66c93d1ed1
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/braderie/ajax.php
View File

@ -69,7 +69,8 @@ function getProductId()
LEFT JOIN `'._DB_PREFIX_.'product_lang` pl ON (pl.`id_product` = p.`id_product`)
WHERE p.`ean13` = '.pSQL($ean).'
AND pl.`id_lang` = '.(int)$cookie->id_lang.'
ORDER BY `date_add` ASC
ORDER BY `date_add` DESC
-- ORDER BY `date_add` ASC
');
if (empty($result)) {
@ -88,8 +89,8 @@ function getProductId()
LEFT JOIN `'._DB_PREFIX_.'attribute_lang` al ON (al.`id_attribute` = pac.`id_attribute`)
WHERE pa.`ean13` = '.pSQL($ean).'
AND pl.`id_lang` = '.(int)$cookie->id_lang.'
ORDER BY pa.`id_product_attribute`
ASC'
ORDER BY pa.`id_product_attribute` DESC
--ORDER BY pa.`id_product_attribute` ASC'
);
$result['reference'] = (!empty($result['reference'])) ? $result['reference'] : $result['product_reference'];
@ -144,7 +145,7 @@ function addToSellout()
unset($product->id_product);
$product->active = 1;
$product->quantity = $quantity;
$product->reference = $storage.'-'.$product->reference;
$product->reference = $storage.'-'.$product->supplier_reference;
$languages = Language::getLanguages(false);
foreach ($languages as $key => $language) {