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:48:00 +02:00
commit e2c867f5ed
4 changed files with 648 additions and 596 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1225
adm/tabs/AdminCategories.php
View File

File diff suppressed because it is too large Load Diff

3
modules/categoryimg/left_img.tpl
View File

@ -3,7 +3,8 @@
<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" />
{* <img src="{$base_dir_ssl}modules/privatesales/img/{$sale->id}/thumb_{$cookie->id_lang}.jpg" /> *}
<img src="{$base_dir_ssl}img/c/{$category->id}_thumb_vp.jpg" alt="{$category->name}" />
</div>
{if !$consumable}
<div class="delivery_delay_left">

2
override/controllers/ProductController.php
View File

@ -12,7 +12,7 @@ class ProductController extends ProductControllerCore {
'HOOK_PRIVATESALES_PRODUCT' => Module::hookExec('privatesales_product', array('sale' => $sale)),
'is_sale_home' => ($sale? $sale->id_category == $id_category: FALSE),
));
// assign date estimation from sale delay
if (Module::isInstalled('privatesales_delay')) {
if (!class_exists('SaleDelay')) {

14
themes/site/product.tpl
View File

@ -208,7 +208,7 @@ var oneQuantityAvailableSentence = '{l s='Warning: 1 item in stock!' js=1}';
<div class="title_block">
<div class="content">
<div class="logo_vente">
<img src="{$base_dir_ssl}modules/privatesales/img/{$sale->id}/thumb_{$cookie->id_lang}.jpg" height="80px"/>
<img src="{$base_dir_ssl}img/c/{$sale->id_category}_thumb_vp.jpg" height="80px"/>
</div>
{if $sale}
<div class="psales">
@ -318,14 +318,14 @@ var oneQuantityAvailableSentence = '{l s='Warning: 1 item in stock!' js=1}';
{foreach from=$groups key=id_attribute_group item=group}
{if $group.attributes|@count}
<p>
<label for="group_{$id_attribute_group|intval}">{$group.name|escape:'htmlall':'UTF-8'}
{if $id_attribute_group == '795' ||
<label for="group_{$id_attribute_group|intval}">{$group.name|escape:'htmlall':'UTF-8'}
{if $id_attribute_group == '795' ||
$id_attribute_group == '75'}
<span class="help_tailles tailles">&nbsp;</span>
{/if}
:
</label>
{if $id_attribute_group == '795' || $id_attribute_group == '75'}
<div class="info_tailles" style="display:none">
<p>
@ -333,8 +333,8 @@ var oneQuantityAvailableSentence = '{l s='Warning: 1 item in stock!' js=1}';
</p>
</div>
{/if}
{assign var="groupName" value="group_$id_attribute_group"}
@ -344,7 +344,7 @@ var oneQuantityAvailableSentence = '{l s='Warning: 1 item in stock!' js=1}';
<option value="{$id_attribute|intval}"{if (isset($smarty.get.$groupName) && $smarty.get.$groupName|intval == $id_attribute) || $group.default == $id_attribute} selected="selected"{/if} title="{$group_attribute|escape:'htmlall':'UTF-8'}">{$group_attribute|escape:'htmlall':'UTF-8'}</option>
{/foreach}
</select>
</p>
{/if}
{/foreach}