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

Merge branch 'ticket-10527'

Browse Source
This commit is contained in:
Marion Muszynski 2016-08-31 15:18:42 +02:00
commit b677946ca7
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
themes/site/shopping-cart.tpl
View File

@ -316,6 +316,9 @@
</table>
</div>
{if $site_version == 'es'}
<p class="safety-payment">{l s='Pago seguro, datos encriptados'}</p>
{/if}
<div id="HOOK_SHOPPING_CART">{$HOOK_SHOPPING_CART}</div>
<p class="cart_voucher_display">{l s='You have a voucher?'} <a onclick="if ($('#cart_voucher').css('display') == 'none') $('#cart_voucher').slideDown(); else $('#cart_voucher').slideUp();">{l s='Click here to use'}</a></p>
{if $voucherAllowed}
@ -350,9 +353,6 @@
<p class="economy">{l s='savings'} <span class="economy-price">{displayPrice price=$economy}</span><span class="economy-currency"></span> ({displayPrice price=$total_products_wt} {l s='instead of'} {displayPrice price=$strike_price})</p>
{/if}
<p class="shipping-calculate">{l s='Shipping calculated its step 3'}</p>
{if $site_version == 'es'}
<p class="safety-payment">{l s='Pago seguro, datos encriptados'}</p>
{/if}
{* Define the style if it doesn't exist in the PrestaShop version*}
{* Will be deleted for 1.5 version and more *}

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

@ -2457,13 +2457,18 @@ body#order #cart_voucher{
body#order #safety-payment{
padding: 10px;
}
body#order #shipping_cost_third_step,
body#order #safety-payment{
body#order #shipping_cost_third_step{
border-top: 1px solid #ccc;
color:#434D52;
font-family:Tahoma;
font-size:12px;
}
body#order #safety-payment{
border-bottom: 1px solid #ccc;
color:#434D52;
font-family:Tahoma;
font-size:12px;
}
body#order #safety-payment i{
width: 25px;
height: 25px;

13
themes/site_mobile/shopping-cart.tpl
View File

@ -213,6 +213,13 @@
</table>
</div>
{if $site_version == 'es'}
<div id="safety-payment">
<i class="icon-payment"></i>
<span class="">{l s='Pago seguro, datos encriptados'}</span>
</div>
{/if}
{if $voucherAllowed}
<div id="cart_voucher_toggle_wrapper">
<i class="icon-pourcentage"></i>
@ -275,12 +282,6 @@
<i class="icon-frais"></i>
<span>{l s='Shipping cost will be calculated on the third step'}</span>
</div>
{if $site_version == 'es'}
<div id="safety-payment">
<i class="icon-payment"></i>
<span class="">{l s='Pago seguro, datos encriptados'}</span>
</div>
{/if}
<div id="HOOK_SHOPPING_CART">{$HOOK_SHOPPING_CART}</div>
{* Define the style if it doesn't exist in the PrestaShop version*}