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

Merge branch 'ticket-ecotax' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2016-06-24 14:35:12 +02:00
commit fffeec4f63
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,6 +9,7 @@
overflow: hidden;
position: relative;
width: 100%!important;
max-width: 985px!important;
box-sizing: border-box;
}
.jspPane{
@ -6179,7 +6180,10 @@ table#carrierTable tbody td {
#product div.form-left p.price-ecotax #ecotax_price_display{
font-size: 9px
}
#product p.text-ecotax{
padding: 5px 20px;
font-size: 10px;
}
#product div#attributes {
float: left;
margin-right: 5px;

16
themes/site/product.tpl
View File

@ -294,9 +294,7 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
{/if}
{if $product->ecotax != 0}
<p class="price-ecotax">{l s='include'} <span id="ecotax_price_display">{if $priceDisplay == 2}{$ecotax_tax_exc|convertAndFormatPrice}{else}{$ecotax_tax_inc|convertAndFormatPrice}{/if}</span> {l s='for green tax'}
{if $product->specificPrice AND $product->specificPrice.reduction}
<br />{l s='(not impacted by the discount)'}
{/if}
{if $product->specificPrice AND $product->specificPrice.reduction}*{/if}
</p>
{/if}
{if !empty($product->unity) && $product->unit_price_ratio > 0.000000}
@ -447,14 +445,14 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
{/if}
{if !empty($product->description)}
<!-- full description -->
<div id="idTab2" class="rte scroll-pane">
<div id="idTab2" class="rte " style="">
{$product->description}
</div>
{/if}
<div id="idTab3" class="rte scroll-pane">
<div id="idTab3" class="rte " >
</div>
{if !empty($product->videos)}
<div id="idTab4" class="rte scroll-pane">
<div id="idTab4" class="rte " >
{$product->videos}
</div>
{/if}
@ -540,7 +538,11 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
</div>
</div>
{/if}
{if $product->ecotax != 0}
{if $product->specificPrice AND $product->specificPrice.reduction}
<p class='text-ecotax'>{l s='* not impacted by the discount'}<p>
{/if}
{/if}
</div>
{if $quantity_discounts}