Skip to content

Commit

Permalink
Merge pull request PrestaShop#3361 from tchauviere/fix/advancedEuComp…
Browse files Browse the repository at this point in the history
…liance_update

Fix/advanced eu compliance update
  • Loading branch information
Jérôme Nadaud committed Jul 6, 2015
2 parents 682ac2f + 71b417c commit 63bb216
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 11 deletions.
8 changes: 0 additions & 8 deletions themes/default-bootstrap/js/advanced-payment-api.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,18 +79,10 @@ var PaymentOptionHandler = function() {
}
this.selected_option = elem;
this.selected_option.addClass('payment_selected');
this.selected_option.children('a:first').css({
'border': '1px solid #55c65e',
'border-radius': '4px'
});
this.selected_option.children('a:first').children('.payment_option_selected:first').fadeIn();
};

this.unselectOption = function() {
this.selected_option.children('a:first').css({
'border': '1px solid #d6d4d4',
'border-radius': '4px'
});
this.selected_option.children('a:first').children('.payment_option_selected:first').fadeOut();
this.selected_option.removeClass('payment_selected');
};
Expand Down
2 changes: 1 addition & 1 deletion themes/default-bootstrap/modules/blockcart/blockcart.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
<span class="price">
{if !isset($product.is_gift) || !$product.is_gift}
{if $priceDisplay == $smarty.const.PS_TAX_EXC}{displayWtPrice p="`$product.total`"}{else}{displayWtPrice p="`$product.total_wt`"}{/if}
<div id="hookDisplayProductPriceBlock-price">
<div class="hookDisplayProductPriceBlock-price">
{hook h="displayProductPriceBlock" product=$product type="price" from="blockcart"}
</div>
{else}
Expand Down
2 changes: 1 addition & 1 deletion themes/default-bootstrap/shopping-cart-advanced.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@
<tr class="cart_total_price">
<td colspan="{$col_span_subtotal}" class="total_price_container text-right">
<span>{l s='Total'}</span>
<div id="hookDisplayProductPriceBlock-price">
<div class="hookDisplayProductPriceBlock-price">
{hook h="displayCartTotalPriceLabel"}
</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion themes/default-bootstrap/shopping-cart.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@
<tr class="cart_total_price">
<td colspan="{$col_span_subtotal}" class="total_price_container text-right">
<span>{l s='Total'}</span>
<div id="hookDisplayProductPriceBlock-price">
<div class="hookDisplayProductPriceBlock-price">
{hook h="displayCartTotalPriceLabel"}
</div>
</td>
Expand Down

0 comments on commit 63bb216

Please sign in to comment.