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

fix conflicts

Browse Source
This commit is contained in:
Marion Muszynski 2016-06-07 14:45:26 +02:00
commit 5a7e53a116
6 changed files with 95 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -105,11 +105,15 @@ modules/barcodes/codes/*
modules/importproduit/*.csv
modules/lapostews/PDR.csv
modules/lapostews/mpdf/*
modules/landingpages/img/*
modules/privatesales/img/*
modules/privatesales_logistique/*
modules/stats_logistic/*
modules/privatesales_logistique/files/*
modules/emarsys_rss/flux.xml
modules/emarsys_rss/*.xml
modules/bulkupdate/*.csv
modules/logistics/carriers/laposte/summaries/*.pdf
modules/labelgenerate/img/
modules/product_vouchers/*.csv
modules/labelgenerate/img/*

35
modules/braderie/ajax.php
View File

@ -149,15 +149,46 @@ function addToSellout()
$languages = Language::getLanguages(false);
foreach ($languages as $key => $language) {
$category_name = Db::getInstance()->getRow('
/*$category_name = Db::getInstance()->getRow('
SELECT cl.`name`
FROM `'._DB_PREFIX_.'category_lang` cl
LEFT JOIN `'._DB_PREFIX_.'privatesale` ps ON (ps.`id_category` = cl.`id_category`)
LEFT JOIN `'._DB_PREFIX_.'product_ps_cache` pps ON (pps.`id_sale` = ps.`id_sale`)
WHERE pps.`id_product` = '.(int)$id_product_old.'
AND cl.`id_lang` = '.(int)$language['id_lang']
);*/
$category_name = Db::getInstance()->getRow('
SELECT cl.`name`
FROM `'._DB_PREFIX_.'category_lang` cl
LEFT JOIN `'._DB_PREFIX_.'privatesale` ps ON (ps.`id_category` = cl.`id_category`)
LEFT JOIN `'._DB_PREFIX_.'product_ps_cache` pps ON (pps.`id_sale` = ps.`id_sale`)
LEFT JOIN `'._DB_PREFIX_.'product` p ON (p.`id_product` = pps.`id_product`)
WHERE p.`ean13` = '.pSQL($product->ean13).'
AND cl.`id_lang` = '.(int)$language['id_lang'].'
ORDER BY p.`date_add` ASC LIMIT 1'
);
$product->name[(int)$language['id_lang']] = $product->name[$language['id_lang']].' - '.strtoupper($category_name['name']);
$name = Db::getInstance()->getRow('
SELECT pl.`name`
FROM `'._DB_PREFIX_.'product` p
LEFT JOIN `'._DB_PREFIX_.'product_lang` pl ON (pl.`id_product` = p.`id_product`)
WHERE p.`ean13` = '.pSQL($product->ean13).'
AND pl.`id_lang` = '.(int)$language['id_lang'].'
ORDER BY p.`date_add` ASC'
);
if (!$name) {
$name = Db::getInstance()->getRow('
SELECT pl.`name`
FROM `'._DB_PREFIX_.'product_attribute` pa
LEFT JOIN `'._DB_PREFIX_.'product` p ON (p.`id_product` = pa.`id_product`)
LEFT JOIN `'._DB_PREFIX_.'product_lang` pl ON (pl.`id_product` = p.`id_product`)
LEFT JOIN `'._DB_PREFIX_.'product_attribute_combination` pac ON (pac.`id_product_attribute` = pa.`id_product_attribute`)
LEFT JOIN `'._DB_PREFIX_.'attribute_lang` al ON (al.`id_attribute` = pac.`id_attribute`)
WHERE p.`ean13` = '.pSQL($product->ean13).'
AND pl.`id_lang` = '.(int)$language['id_lang'].'
ORDER BY pa.`id_product_attribute` ASC
');
}
$product->name[(int)$language['id_lang']] = $name['name'].' - '.strtoupper($category_name['name']);
}
$product->id_category_default = (int)$category;

2
modules/stats_logistic/AdminStatsLogistic.php
View File

@ -499,7 +499,6 @@ class AdminStatsLogistic extends AdminTab {
.'</form>
</fieldset>';
if ($cookie->id_employee == 1 || $cookie->id_employee == 2 || $cookie->id_employee == 7) {
echo '<br><br><h2 style="margin-top:15px">Export Expeditions La Poste</h2>
<fieldset>
<p>Exporter le détail des expeditions dont la date est comprise entre : </p>
@ -518,7 +517,6 @@ class AdminStatsLogistic extends AdminTab {
.'</form>
</fieldset>'
;
}
}

1
themes/site/modules/blockcartex/es.php
View File

@ -8,6 +8,7 @@ $_MODULE['<{blockcartex}site>ajax_cart_1b27b371c9e7d0298eab533bffae53b7'] = 'Can
$_MODULE['<{blockcartex}site>ajax_cart_f01390a0b796aab97beed915df1cdd63'] = 'IVA';
$_MODULE['<{blockcartex}site>ajax_cart_7255b165f0be9f2380465cd98f9f1e41'] = 'Todas las ventas';
$_MODULE['<{blockcartex}site>ajax_cart_9056510ed1245d5000afd43cf2816902'] = 'Ver cesta';
$_MODULE['<{blockcartex}site>ajax_cart_f507368685bf131d9a5940b2e24f2602'] = 'Recuerda que puedes añadir a tu cesta productos de las diferentes ventas y realizar así un pedido único, para pagar los gastos de envío solamente una vez';
$_MODULE['<{blockcartex}site>ajax_cart_5af6614a8af23ed2fdba3b0f47b40128'] = 'Nuestras mejores ventas';
$_MODULE['<{blockcartex}site>blockcart_20351b3328c35ab617549920f5cb4939'] = 'Personalización ';
$_MODULE['<{blockcartex}site>blockcart_ed6e9a09a111035684bb23682561e12d'] = 'eliminar este producto de la cesta';

3
themes/site_mobile/css/style.css
View File

@ -3984,6 +3984,9 @@ body#index .jqibuttons span.gradient{
display: block;
display: block;
}
.box_add_to_cart .content .others_links .show_fdp_info{
font-size: 11px; padding-top: 10px
}
.box_add_to_cart .content .others_links .show_cart{
display: block;
clear: both;

1
themes/site_mobile/product-add_to_cart.tpl
View File

@ -1,3 +1,4 @@
<<<<<<< HEAD
<div class="overlay_bbb"></div>
<div class="box_add_to_cart">