diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php index a038a9f4c..a3337e58f 100644 --- a/controllers/admin/AdminTranslationsController.php +++ b/controllers/admin/AdminTranslationsController.php @@ -1326,7 +1326,7 @@ class AdminTranslationsControllerCore extends AdminController $return['request.max_vars'] = ini_get('suhosin.request.max_vars'); $return['needed_limit'] = $count + 100; } - else if (ini_get('max_input_vars') && ini_get('max_input_vars') < $count) + elseif (ini_get('max_input_vars') && ini_get('max_input_vars') < $count) { $this->post_limit_exceed = true; $return['error_type'] = 'conf'; diff --git a/themes/default/css/global.css b/themes/default/css/global.css index 81e805a64..da34cec5a 100644 --- a/themes/default/css/global.css +++ b/themes/default/css/global.css @@ -672,13 +672,15 @@ table#cart_summary td { vertical-align:top } table#cart_summary td.cart_delete, +table#cart_summary td.cart_discount_price, table#cart_summary td.price_discount_del {border-right:none} table#cart_summary .last_item td {border-bottom:1px solid #999} table#cart_summary tr.cart_item.odd, table#cart_summary tr.cart_total_delivery, -table#cart_summary tr.cart_total_price { +table#cart_summary tr.cart_total_price, +table#cart_summary tr.cart_total_voucher{ background-color: #fff } table#cart_summary tr.cart_item.even { diff --git a/themes/default/order-payment.tpl b/themes/default/order-payment.tpl index 8c9817140..c441586d1 100644 --- a/themes/default/order-payment.tpl +++ b/themes/default/order-payment.tpl @@ -102,7 +102,7 @@ {l s='Total vouchers:'} {/if} - + {if $use_taxes} {if $priceDisplay} {displayPrice price=$total_discounts_tax_exc} @@ -126,7 +126,7 @@ {l s='Total gift-wrapping:'} {/if} - + {if $use_taxes} {if $priceDisplay} {displayPrice price=$total_wrapping_tax_exc} @@ -170,7 +170,7 @@ {/if} {/if} - +

{l s='Total:'}

{displayPrice price=$total_price} @@ -209,9 +209,9 @@ {/if} - +

{l s='Total:'}

- {displayPrice price=$total_price_without_tax} + {displayPrice price=$total_price_without_tax} {/if}