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

Merge branch 'ticket-8039' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2016-06-22 17:23:56 +02:00
commit 22a8b5cac1
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/privatesales/privatesales.php
View File

@ -501,14 +501,11 @@ class PrivateSales extends Module {
public function hookPrivateSales_Category($params) { public function hookPrivateSales_Category($params) {
global $cookie, $smarty; global $cookie, $smarty;
$sale = Sale::getSaleFromCategory(Tools::getValue('id_category')); $sale = Sale::getSaleFromCategory(Tools::getValue('id_category'));
$has_salebg = false;
if(is_file(_PS_ROOT_DIR_.'/modules/privatesales/img/'.$sale->id.'/salebg_'.$cookie->id_lang.'.jpg')) {
$has_salebg = true;
}
$smarty->assign(array( $smarty->assign(array(
'category' => new Category(Tools::getValue('id_category'), $cookie->id_lang), 'category' => new Category(Tools::getValue('id_category'), $cookie->id_lang),
'sale' => $sale, 'sale' => $sale,
'has_salebg' => $has_salebg, 'path_saleimg' => dirname(__FILE__).'/img/'.$sale->id.'/',
'has_salebg' => is_file(dirname(__FILE__).'/img/'.$sale->id.'/salebg_'.$cookie->id_lang.'.jpg'),
'consumable' => ((int) _SHOP_PRIVATESALES_CONSUMABLE == (int) $sale->id)? true : false, 'consumable' => ((int) _SHOP_PRIVATESALES_CONSUMABLE == (int) $sale->id)? true : false,
)); ));
return $this->display(__FILE__, 'category.tpl'); return $this->display(__FILE__, 'category.tpl');

3
themes/site/modules/privatesales/category.tpl
View File

@ -3,7 +3,8 @@
body#category #columns { body#category #columns {
/* background-image: url("{/literal}{$link->getCatImageLink($sale->alias[$cookie->id_lang], $sale->id_category, 'privatesales')}{literal}"); */ /* background-image: url("{/literal}{$link->getCatImageLink($sale->alias[$cookie->id_lang], $sale->id_category, 'privatesales')}{literal}"); */
/* background: url("https://static.bebeboutik.com{$path}img/{$sale->id}/salebg_{/literal}{$cookie->id_lang}{literal}.jpg")no-repeat fixed center 0; */ /* background: url("https://static.bebeboutik.com{$path}img/{$sale->id}/salebg_{/literal}{$cookie->id_lang}{literal}.jpg")no-repeat fixed center 0; */
background: url("{/literal}{$path}{literal}/modules/privatesales/img/{/literal}{$sale->id}{literal}/salebg_{/literal}{$cookie->id_lang}{literal}.jpg") no-repeat fixed center 0; /* background: url("{/literal}{$path}{literal}/modules/privatesales/img/{/literal}{$sale->id}{literal}/salebg_{/literal}{$cookie->id_lang}{literal}.jpg") no-repeat fixed center 0; {* for local/dev *} */
background: url("{/literal}{$path_saleimg}{literal}salebg_{/literal}{$cookie->id_lang}{literal}.jpg") no-repeat fixed center 0;
} }
{/literal}</style> {/literal}</style>
{/if} {/if}