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

Merge branch 'ticket-9260' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2016-08-30 13:56:13 +02:00
commit 563b9059de
4 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/categoryimg/categoryimg.php
View File

@ -47,6 +47,7 @@ class CategoryImg extends Module {
$smarty->assign('sale', $sale);
$smarty->assign('consumable', ((int) _SHOP_PRIVATESALES_CONSUMABLE == (int) $sale->id)? true : false);
$smarty->assign('category', $category);
$smarty->assign('is_thumb_vp',(file_exists(_PS_ROOT_DIR_.'/img/c/'.$category->id.'_thumb_vp.jpg'));
return $this->display(__FILE__, 'left_img.tpl');
}
}

5
modules/categoryimg/left_img.tpl
View File

@ -3,8 +3,11 @@
<img src="{$link->getCatImageLink($category->link_rewrite, $category->id, 'cover_vp')}" alt="{$category->name}" />
<div class="logo_cat">
{* <img src="{$base_dir_ssl}modules/privatesales/img/{$sale->id}/thumb_{$cookie->id_lang}.jpg" /> *}
{if $is_thumb_vp}
<img src="{$base_dir_ssl}img/c/{$category->id}_thumb_vp.jpg" alt="{$category->name}" />
{else}
<img src="{$base_dir_ssl}modules/privatesales/img/{$sale->id}/thumb_{$cookie->id_lang}.jpg" />
{/if}
</div>
{if !$consumable}
<div class="delivery_delay_left">

1
override/controllers/ProductController.php
View File

@ -11,6 +11,7 @@ class ProductController extends ProductControllerCore {
'sale' => $sale,
'HOOK_PRIVATESALES_PRODUCT' => Module::hookExec('privatesales_product', array('sale' => $sale)),
'is_sale_home' => ($sale? $sale->id_category == $id_category: FALSE),
'is_thumb_vp' => (file_exists(_PS_ROOT_DIR_.'/img/c/'.$sale->id_category.'_thumb_vp.jpg')),
));
// assign date estimation from sale delay

4
themes/site/product.tpl
View File

@ -208,7 +208,11 @@ var oneQuantityAvailableSentence = '{l s='Warning: 1 item in stock!' js=1}';
<div class="title_block">
<div class="content">
<div class="logo_vente">
{if $is_thumb_vp}
<img src="{$base_dir_ssl}img/c/{$sale->id_category}_thumb_vp.jpg" height="80px"/>
{else}
<img src="{$base_dir_ssl}modules/privatesales/img/{$sale->id}/thumb_{$cookie->id_lang}.jpg" height="80px"/>
{/if}
</div>
{if $sale}
<div class="psales">