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

fix conflict

Browse Source
This commit is contained in:
Marion Muszynski 2016-07-01 11:20:49 +02:00
commit c7aa42f883
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/blockbestsellers/blockbestsellers.php
View File

@ -237,7 +237,7 @@ class BlockBestSellers extends Module
if(!$this->isCached('blockbestsellers_productfooter_'.(int) $cookie->id_lang.'.tpl', $cache_id)) {
$currency = new Currency((int)($params['cookie']->id_currency));
$bestsellers = ProductSale::getBestSalesVp((int)($params['cookie']->id_lang), 0, 5);
$bestsellers = ProductSale::getBestSalesVp((int)($params['cookie']->id_lang), 0, 6, NULL, NULL, 10);
if (!$bestsellers AND !Configuration::get('PS_BLOCK_BESTSELLERS_DISPLAY'))
return;
$best_sellers = array();

3
modules/soflexibilite/classes/SoFlexibiliteDelivery.php
View File

@ -163,7 +163,8 @@ class SoFlexibiliteDelivery
$this->country : Country::getIsoById($customer_address->id_country);
$this->id_customer = $this->id_customer ? $this->id_customer : $customer_address->id_customer;
$address->id_country = (int)Country::getByIso($this->country);
//$address->id_country = (int)Country::getByIso($this->country);
$address->id_country = strtolower($this->country) == 'fr'? 8: (int)Country::getByIso($this->country);
$address->id_customer = (int)$this->id_customer;
$address->firstname = $customer_address->firstname;
$address->lastname = $customer_address->lastname;

2
themes/site/css/style.css
View File

@ -2742,7 +2742,7 @@ div.addresses ul.address li.address_title {
color: #9a9a9a;
}
#product_list li span.reduction, .product_list li span.reduction {
background: url("../img/bg_reduction.png") no-repeat ;
background: url("../img/reduction.png") no-repeat center center;
color: #fff;
font-size: 15px;
font-style: italic;