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

Merge branch 'ticket-consumable' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2016-04-18 16:03:42 +02:00
commit e15f382530
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/defines.inc.php
View File

@ -157,8 +157,8 @@ if (!defined('_PS_CACHE_ENABLED_'))
/* Consumable */
if (!defined('_SHOP_CATEGORYROOT'))
define('_SHOP_CATEGORYROOT', 8720307);
define('_SHOP_CATEGORYROOT', 8711761);
if (!defined('_SHOP_CATEGORYENABLED'))
define('_SHOP_CATEGORYENABLED', 1);
if (!defined('_SHOP_PRIVATESALES_CONSUMABLE'))
define('_SHOP_PRIVATESALES_CONSUMABLE', 5158);
define('_SHOP_PRIVATESALES_CONSUMABLE', 3963);

1
modules/categoryimg/categoryimg.php
View File

@ -45,6 +45,7 @@ class CategoryImg extends Module {
$sale = Sale::getSaleFromCategory(Tools::getValue('id_category'));
$smarty->assign('sale', $sale);
$smarty->assign('consumable', ((int) _SHOP_PRIVATESALES_CONSUMABLE == (int) $sale->id)? true : false);
$smarty->assign('category', $category);
return $this->display(__FILE__, 'left_img.tpl');
}

2
modules/categoryimg/left_img.tpl
View File

@ -5,8 +5,10 @@
<div class="logo_cat">
<img src="{$base_dir_ssl}modules/privatesales/img/{$sale->id}/thumb_{$cookie->id_lang}.jpg" />
</div>
{if !consumable}
<div class="delivery_delay_left">
{include file="./themes/site/delay.tpl" delivery_delay=$sale->delivery_delay}
</div>
{/if}
</div>
{/if}