fix conflicts
This commit is contained in:
Marion Muszynski
commit
5a7e53a116
4
.gitignore
vendored
4
.gitignore
vendored
@ -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/*
|
||||
|
||||
@ -90,7 +90,7 @@ function getProductId()
|
||||
WHERE pa.`ean13` = '.pSQL($ean).'
|
||||
AND pl.`id_lang` = '.(int)$cookie->id_lang.'
|
||||
ORDER BY pa.`id_product_attribute` DESC
|
||||
--ORDER BY pa.`id_product_attribute` ASC'
|
||||
-- ORDER BY pa.`id_product_attribute` ASC'
|
||||
);
|
||||
$result['reference'] = (!empty($result['reference'])) ? $result['reference'] : $result['product_reference'];
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -499,26 +499,24 @@ 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>
|
||||
<form method="POST" action="'.$currentIndex.'" >'
|
||||
.'<span class="form-group">'
|
||||
.'<label style="float: none;" class="control-label" for="date_export_begin">Date de début :</label>'
|
||||
.'<input type="date" name="date_expe_begin" value="'.pSQl($this->date_expe_begin).'" id="date_expe_begin" class="form-control" />'
|
||||
.'</span>'
|
||||
.'<span class="form-group">'
|
||||
.'<label style="float: none;" class="control-label" for="date_export_end">Date de fin :</label>'
|
||||
.'<input type="date" name="date_expe_end" value="'.pSQl($this->date_expe_end).'" id="date_expe_end" class="form-control" />'
|
||||
.'</span>'
|
||||
.'<input type="hidden" name="token" value="'.Tools::getAdminTokenLite(__CLASS__).'" />'
|
||||
.'<input type="hidden" name="tab" value="'.__CLASS__.'" />'
|
||||
.'<input type="submit" class="button" name="submitExportExp" value="Exporter les Expéditions" />'
|
||||
.'</form>
|
||||
</fieldset>'
|
||||
;
|
||||
}
|
||||
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>
|
||||
<form method="POST" action="'.$currentIndex.'" >'
|
||||
.'<span class="form-group">'
|
||||
.'<label style="float: none;" class="control-label" for="date_export_begin">Date de début :</label>'
|
||||
.'<input type="date" name="date_expe_begin" value="'.pSQl($this->date_expe_begin).'" id="date_expe_begin" class="form-control" />'
|
||||
.'</span>'
|
||||
.'<span class="form-group">'
|
||||
.'<label style="float: none;" class="control-label" for="date_export_end">Date de fin :</label>'
|
||||
.'<input type="date" name="date_expe_end" value="'.pSQl($this->date_expe_end).'" id="date_expe_end" class="form-control" />'
|
||||
.'</span>'
|
||||
.'<input type="hidden" name="token" value="'.Tools::getAdminTokenLite(__CLASS__).'" />'
|
||||
.'<input type="hidden" name="tab" value="'.__CLASS__.'" />'
|
||||
.'<input type="submit" class="button" name="submitExportExp" value="Exporter les Expéditions" />'
|
||||
.'</form>
|
||||
</fieldset>'
|
||||
;
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -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';
|
||||
|
||||
@ -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,35 +1,36 @@
|
||||
<div class="overlay_bbb"></div>
|
||||
|
||||
<div class="box_add_to_cart">
|
||||
<div class="content">
|
||||
<h3>{l s='Ce produit a bien été ajouté au panier'}</h3>
|
||||
<div class="close" id="close_add_to_cart">
|
||||
<img src="{$img_dir}/close.jpg" alt="{l s='Fermer la fenètre'}">
|
||||
</div>
|
||||
|
||||
<div class="product_box">
|
||||
<div class="img">
|
||||
{assign var='cover' value=Product::getCover($product->id)}
|
||||
<img src="{$link->getImageLink($product->link_rewrite, $cover.id_image, 'mini_carre')}"/>
|
||||
</div>
|
||||
<div class="desc">
|
||||
<p class="name">{$product->name}</p>
|
||||
</div>
|
||||
<div class="price">
|
||||
<p class="quantity">{l s='Quantité'} : <span id="quantity_sel">1</span></p>
|
||||
{assign var='productPrice' value=$product->getPrice(true, NULL, 2)}
|
||||
<p class="price"><span id="price_add_to_cart">{$productPrice|replace:'.':','}</span> € TTC</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="others_links">
|
||||
<a class="show_sales" href="{$link->getPageLink('index.php')}">{l s='Toutes les ventes'}</a>
|
||||
<a class="show_cart" href="{$link->getPageLink('order.php')}">{l s='Voir mon panier'}</a>
|
||||
<p class="show_fdp_info">{l s='Commandez dans plusieurs ventes au sein du même panier et profitez de frais de port uniques !'}</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="content_best_sales">
|
||||
<h3>{l s='Nos meilleures ventes'}</h3>
|
||||
{$bestSaleCart}
|
||||
</div>
|
||||
<<<<<<< HEAD
|
||||
<div class="overlay_bbb"></div>
|
||||
|
||||
<div class="box_add_to_cart">
|
||||
<div class="content">
|
||||
<h3>{l s='Ce produit a bien été ajouté au panier'}</h3>
|
||||
<div class="close" id="close_add_to_cart">
|
||||
<img src="{$img_dir}/close.jpg" alt="{l s='Fermer la fenètre'}">
|
||||
</div>
|
||||
|
||||
<div class="product_box">
|
||||
<div class="img">
|
||||
{assign var='cover' value=Product::getCover($product->id)}
|
||||
<img src="{$link->getImageLink($product->link_rewrite, $cover.id_image, 'mini_carre')}"/>
|
||||
</div>
|
||||
<div class="desc">
|
||||
<p class="name">{$product->name}</p>
|
||||
</div>
|
||||
<div class="price">
|
||||
<p class="quantity">{l s='Quantité'} : <span id="quantity_sel">1</span></p>
|
||||
{assign var='productPrice' value=$product->getPrice(true, NULL, 2)}
|
||||
<p class="price"><span id="price_add_to_cart">{$productPrice|replace:'.':','}</span> € TTC</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="others_links">
|
||||
<a class="show_sales" href="{$link->getPageLink('index.php')}">{l s='Toutes les ventes'}</a>
|
||||
<a class="show_cart" href="{$link->getPageLink('order.php')}">{l s='Voir mon panier'}</a>
|
||||
<p class="show_fdp_info">{l s='Commandez dans plusieurs ventes au sein du même panier et profitez de frais de port uniques !'}</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="content_best_sales">
|
||||
<h3>{l s='Nos meilleures ventes'}</h3>
|
||||
{$bestSaleCart}
|
||||
</div>
|
||||
</div>
|
||||
Loading…
Reference in New Issue
Block a user