Fixed calculation issues

This commit is contained in:
azhar bhat
2026-10-29 20:19:01 +05:30
parent ef3dc5ea91
commit 4f0735d743
3 changed files with 11 additions and 7 deletions

View File

@@ -169,7 +169,11 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
$order_detail['unit_price_tax_excl_before_specific_price'] = $order_detail['unit_price_tax_excl_including_ecotax'] + $order_detail['reduction_amount_tax_excl'];
} elseif ($order_detail['reduction_percent'] > 0) {
$has_discount = true;
$order_detail['unit_price_tax_excl_before_specific_price'] = (100 * $order_detail['unit_price_tax_excl_including_ecotax']) / (100 - $order_detail['reduction_percent']);
if ($order_detail['reduction_percent'] >= 100) {
$order_detail['unit_price_tax_excl_before_specific_price'] = $order_detail['original_product_price'];
} else {
$order_detail['unit_price_tax_excl_before_specific_price'] = (100 * $order_detail['unit_price_tax_excl_including_ecotax']) / (100 - $order_detail['reduction_percent']);
}
}
// Set tax_code

View File

@@ -161,7 +161,7 @@
{/block}
{block name='blockcart_shopping_cart_total_convenience_fee'}
{if isset($total_convenience_fee)}
<div class="cart-prices-line">
<div class="cart-prices-line"{if !$total_convenience_fee} style="display:none"{/if}>
<span class="price cart_block_convenience_fee ajax_cart_convenience_fee">{convertPrice price=$total_convenience_fee}</span>
<span class="price">{l s='Convenience Fees' mod='blockcart'}</strong>
</div>
@@ -343,7 +343,7 @@
</div> -->
{block name='blockcart_layer_cart_total_convenience_fee'}
{if isset($total_convenience_fee)}
<div class="layer_cart_row">
<div class="layer_cart_row"{if !$total_convenience_fee} style="display:none"{/if}>
<strong class="dark">
{l s='Convenience Fees' mod='blockcart'}
{if $use_taxes && $display_tax_label}

View File

@@ -161,8 +161,8 @@
{/if}
{/block}
{block name='blockcart_shopping_cart_total_convenience_fee'}
{if isset($total_convenience_fee) && $total_convenience_fee}
<div class="cart-prices-line">
{if isset($total_convenience_fee)}
<div class="cart-prices-line"{if !$total_convenience_fee} style="display:none"{/if}>
<span class="price cart_block_convenience_fee ajax_cart_convenience_fee">{convertPrice price=$total_convenience_fee}</span>
<span class="price">{l s='Convenience Fees' mod='blockcart'}</strong>
</div>
@@ -343,8 +343,8 @@
</span>
</div> -->
{block name='blockcart_layer_cart_total_convenience_fee'}
{if isset($total_convenience_fee) && $total_convenience_fee}
<div class="layer_cart_row">
{if isset($total_convenience_fee)}
<div class="layer_cart_row"{if !$total_convenience_fee} style="display:none"{/if}>
<strong class="dark">
{l s='Convenience Fees' mod='blockcart'}
{if $use_taxes && $display_tax_label}