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

Merge branch 'ticket_9890' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2016-08-26 17:08:53 +02:00
commit c45e018298
5 changed files with 41 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6841,12 +6841,13 @@ table#carrierTable tbody td {
width: 270px;
margin: 0 !important;
padding: 5px 0 !important;
background-color: #fb66a9;
/* background-color: #fb66a9; */
left: 35px;
box-shadow: 0px 5px 8px -3px #b5b1b1;
/* box-shadow: 0px 5px 8px -3px #b5b1b1; */
}
.productQuantityAlert p{
color: white;
font-size: 14px;
color: #fb66a9;
font-size: 12px;
font-weight: bold;
}

20
themes/site/modules/categoryscroll/product-list.tpl
View File

@ -33,7 +33,7 @@
{else}
<a href="{$product.link|escape:'htmlall':'UTF-8'}" class="product_img_link" title="{$product.name|escape:'htmlall':'UTF-8'}"><img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'home')}" alt="{$product.legend|escape:'htmlall':'UTF-8'}" {if isset($homeSize)} width="{$homeSize.width}" height="{$homeSize.height}"{/if} /></a>
{/if}
{if $product.quantity_all_versions <= $last_qties && $product.quantity_all_versions > 0}
{if isset($product.quantity_all_versions) && $product.quantity_all_versions <= $last_qties && $product.quantity_all_versions > 0}
<div class="productQuantityAlert">
{if $product.quantity_all_versions == 1}
<p>{l s='Warning: 1 item in stock!'}</p>
@ -41,16 +41,14 @@
<p>{l s='Warning :'} {$product.quantity_all_versions} {l s='items in stock'}</p>
{/if}
</div>
{else}
{if !isset($product.quantity_all_versions) && $product.quantity <= $last_qties}
<div class="productQuantityAlert">
{if $product.quantity == 1}
<p>{l s='Warning: 1 item in stock!'}</p>
{else}
<p>{l s='Warning :'} {$product.quantity} {l s='items in stock'}</p>
{/if}
</div>
{/if}
{elseif $product.quantity <= $last_qties && $product.quantity > 0}
<div class="productQuantityAlert">
{if $product.quantity == 1}
<p>{l s='Warning: 1 item in stock!'}</p>
{else}
<p>{l s='Warning :'} {$product.quantity} {l s='items in stock'}</p>
{/if}
</div>
{/if}
{*<p class="product_desc"><a href="{$product.link|escape:'htmlall':'UTF-8'}" title="{$product.description_short|truncate:360:'...'|strip_tags:'UTF-8'|escape:'htmlall':'UTF-8'}">{$product.description_short|truncate:360:'...'|strip_tags:'UTF-8'}</a></p>*}
</div>

20
themes/site/product-list.tpl
View File

@ -62,7 +62,7 @@
{else}
<a href="{$product.link|escape:'htmlall':'UTF-8'}" class="product_img_link" title="{$product.name|escape:'htmlall':'UTF-8'}"><img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'home')}" alt="{$product.legend|escape:'htmlall':'UTF-8'}" {if isset($homeSize)} height="{$homeSize.height}"{/if} /></a>
{/if}
{if $product.quantity_all_versions <= $last_qties && $product.quantity_all_versions > 0}
{if isset($product.quantity_all_versions) && $product.quantity_all_versions <= $last_qties && $product.quantity_all_versions > 0}
<div class="productQuantityAlert">
{if $product.quantity_all_versions == 1}
<p>{l s='Warning: 1 item in stock!'}</p>
@ -70,16 +70,14 @@
<p>{l s='Warning :'} {$product.quantity_all_versions} {l s='items in stock'}</p>
{/if}
</div>
{else}
{if !isset($product.quantity_all_versions) && $product.quantity <= $last_qties}
<div class="productQuantityAlert">
{if $product.quantity == 1}
<p>{l s='Warning: 1 item in stock!'}</p>
{else}
<p>{l s='Warning :'} {$product.quantity} {l s='items in stock'}</p>
{/if}
</div>
{/if}
{elseif $product.quantity <= $last_qties && $product.quantity > 0}
<div class="productQuantityAlert">
{if $product.quantity == 1}
<p>{l s='Warning: 1 item in stock!'}</p>
{else}
<p>{l s='Warning :'} {$product.quantity} {l s='items in stock'}</p>
{/if}
</div>
{/if}
{*<p class="product_desc"><a href="{$product.link|escape:'htmlall':'UTF-8'}" title="{$product.description_short|truncate:360:'...'|strip_tags:'UTF-8'|escape:'htmlall':'UTF-8'}">{$product.description_short|truncate:360:'...'|strip_tags:'UTF-8'}</a></p>*}
</div>

20
themes/site_mobile/modules/categoryscroll/product-list.tpl
View File

@ -28,7 +28,7 @@
{assign var=product_reduction value=($product.reduction * (1 + $product.rate / 100) * 100 / $product.price_without_reduction)}
{if $product_reduction>0}
<span class="reduction">(-{$product_reduction|round|string_format:'%d'}%)</span>
{if $product.quantity_all_versions <= $last_qties && $product.quantity_all_versions > 0}
{if isset($product.quantity_all_versions) && $product.quantity_all_versions <= $last_qties && $product.quantity_all_versions > 0}
<div class="productQuantityAlert">
{if $product.quantity_all_versions == 1}
<p>{l s='Warning: 1 item in stock!'}</p>
@ -36,16 +36,14 @@
<p>{l s='Warning :'} {$product.quantity_all_versions} {l s='items in stock'}</p>
{/if}
</div>
{else}
{if !isset($product.quantity_all_versions) && $product.quantity <= $last_qties}
<div class="productQuantityAlert">
{if $product.quantity == 1}
<p>{l s='Warning: 1 item in stock!'}</p>
{else}
<p>{l s='Warning :'} {$product.quantity} {l s='items in stock'}</p>
{/if}
</div>
{/if}
{elseif $product.quantity <= $last_qties && $product.quantity > 0}
<div class="productQuantityAlert">
{if $product.quantity == 1}
<p>{l s='Warning: 1 item in stock!'}</p>
{else}
<p>{l s='Warning :'} {$product.quantity} {l s='items in stock'}</p>
{/if}
</div>
{/if}
{/if}
{/if}

20
themes/site_mobile/product-list.tpl
View File

@ -56,7 +56,7 @@
{if $product_reduction>0}
<span class="reduction">(-{$product_reduction|round|string_format:'%d'}%)</span>
{/if}
{if $product.quantity_all_versions <= $last_qties && $product.quantity_all_versions > 0}
{if isset($product.quantity_all_versions) && $product.quantity_all_versions <= $last_qties && $product.quantity_all_versions > 0}
<div class="productQuantityAlert">
{if $product.quantity_all_versions == 1}
<p>{l s='Warning: 1 item in stock!'}</p>
@ -64,16 +64,14 @@
<p>{l s='Warning :'} {$product.quantity_all_versions} {l s='items in stock'}</p>
{/if}
</div>
{else}
{if !isset($product.quantity_all_versions) && $product.quantity <= $last_qties}
<div class="productQuantityAlert">
{if $product.quantity == 1}
<p>{l s='Warning: 1 item in stock!'}</p>
{else}
<p>{l s='Warning :'} {$product.quantity} {l s='items in stock'}</p>
{/if}
</div>
{/if}
{elseif $product.quantity <= $last_qties && $product.quantity > 0}
<div class="productQuantityAlert">
{if $product.quantity == 1}
<p>{l s='Warning: 1 item in stock!'}</p>
{else}
<p>{l s='Warning :'} {$product.quantity} {l s='items in stock'}</p>
{/if}
</div>
{/if}
{/if}
{/if}