From 7600a87b21a840e43ba9d7ffa9fab47c31309693 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Fri, 6 Jun 2025 17:07:18 +0530 Subject: [PATCH] Fixed: Tax label is displayed in the front even if the 'Display tax label' is disabled --- .../order-confirmation.tpl | 73 ++++----- .../hotel-reservation-theme/order-detail.tpl | 148 +++++++----------- 2 files changed, 83 insertions(+), 138 deletions(-) diff --git a/themes/hotel-reservation-theme/order-confirmation.tpl b/themes/hotel-reservation-theme/order-confirmation.tpl index d23fbf032..64db52cf3 100644 --- a/themes/hotel-reservation-theme/order-confirmation.tpl +++ b/themes/hotel-reservation-theme/order-confirmation.tpl @@ -414,46 +414,32 @@ {if isset($cart_htl_data)} - {if $priceDisplay && $use_tax} - - - + + - - {else} - - - - - {/if} + {/if} + + {/if} {if (isset($cart_standalone_service_products) && $cart_standalone_service_products) || (isset($cart_hotel_service_products) && $cart_hotel_service_products)} - {if $priceDisplay && $use_tax} - - - + + - - {else} - - - - - {/if} + {/if} + + {/if} {if $order->total_wrapping > 0} @@ -465,22 +451,17 @@ {/if} - {if $priceDisplay && $use_tax && $orderTotalInfo['total_convenience_fee_te']} + {if $orderTotalInfo['total_convenience_fee_te'] || $orderTotalInfo['total_convenience_fee_ti']} - - {else if $orderTotalInfo['total_convenience_fee_ti']} - - - {/if} diff --git a/themes/hotel-reservation-theme/order-detail.tpl b/themes/hotel-reservation-theme/order-detail.tpl index ba6956f60..afce9c6a0 100644 --- a/themes/hotel-reservation-theme/order-detail.tpl +++ b/themes/hotel-reservation-theme/order-detail.tpl @@ -326,57 +326,39 @@ {assign var=total_standard_products_tax_incl value=($order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_STANDALONE) + $order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_HOTEL_STANDALONE))} {assign var=total_standard_products_tax_excl value=($order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_STANDALONE) + $order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_HOTEL_STANDALONE))} {if isset($cart_htl_data) && $cart_htl_data} - {if $priceDisplay && $use_tax && $room_price_tax_excl} - - - - - {else} - - - - - {/if} - {/if} - - {if (isset($hotel_service_products) && $hotel_service_products) || (isset($standalone_service_products) && $standalone_service_products)} - {if $priceDisplay && $use_tax} - - - - - {else} - - - - - {/if} - {/if} - - {if $priceDisplay && $use_tax && $total_convenience_fee_te} - + - {else if $total_convenience_fee_ti} - - + {/if} + {if (isset($hotel_service_products) && $hotel_service_products) || (isset($standalone_service_products) && $standalone_service_products)} + + + + {/if} + + {if $total_convenience_fee_te || $total_convenience_fee_te} + + + {/if} @@ -743,57 +725,39 @@ {assign var=total_tax_without_discount value=(($room_price_tax_incl - $room_price_tax_excl) + ($room_services_price_tax_incl - $room_services_price_tax_excl) + ($total_standard_products_tax_incl - $total_standard_products_tax_excl))} {if isset($cart_htl_data) && $cart_htl_data} - {if $priceDisplay && $use_tax && $room_price_tax_excl} - - - - - {else} - - - - - {/if} - {/if} - - {if (isset($hotel_service_products) && $hotel_service_products) || (isset($standalone_service_products) && $standalone_service_products)} - {if $priceDisplay && $use_tax} - - - - - {else} - - - - - {/if} - {/if} - - {if $priceDisplay && $use_tax && $total_convenience_fee_te} - + - {else if $total_convenience_fee_ti} - - + {/if} + {if (isset($hotel_service_products) && $hotel_service_products) || (isset($standalone_service_products) && $standalone_service_products)} + + + + {/if} + + {if $total_convenience_fee_te || $total_convenience_fee_te} + + + {/if}
- {l s='Total Rooms Cost (tax excl.)'} - +
+ {l s='Total Rooms Cost'} {if $use_taxes && $display_tax_label == 1}{if $priceDisplay == 1}{l s='(tax excl.)'}{elseif $priceDisplay == 0}{l s='(tax incl.)'}{/if} {/if} + + {if $priceDisplay && $use_tax} {displayWtPriceWithCurrency price=($orderTotalInfo['total_rooms_te'] + $orderTotalInfo['total_services_te'] + $orderTotalInfo['total_auto_add_services_te'] + $orderTotalInfo['total_demands_price_te']) currency=$objOrderCurrency} -
- {l s='Total Rooms Cost'} {if $use_tax}{l s='(tax incl.)'}{/if} - + {else} {displayWtPriceWithCurrency price=($orderTotalInfo['total_rooms_ti'] + $orderTotalInfo['total_services_ti'] + $orderTotalInfo['total_auto_add_services_ti'] + $orderTotalInfo['total_demands_price_ti']) currency=$objOrderCurrency} -
- {l s='Total products cost (tax excl.)'} - +
+ {l s='Total products cost'} {if $use_taxes && $display_tax_label == 1}{if $priceDisplay == 1}{l s='(tax excl.)'}{elseif $priceDisplay == 0}{l s='(tax incl.)'}{/if} {/if} + + {if $priceDisplay && $use_tax} {displayWtPriceWithCurrency price=$orderTotalInfo['total_standalone_products_te'] currency=$objOrderCurrency} -
- {l s='Total products cost'} {if $use_tax}{l s='(tax incl.)'}{/if} - + {else} {displayWtPriceWithCurrency price=$orderTotalInfo['total_standalone_products_ti'] currency=$objOrderCurrency} -
- {l s='Total Convenience Fees (tax excl.)'} + {l s='Total Convenience Fees'} {if $use_taxes && $display_tax_label == 1}{if $priceDisplay == 1}{l s='(tax excl.)'}{elseif $priceDisplay == 0}{l s='(tax incl.)'}{/if} {/if} - {displayWtPriceWithCurrency price=($orderTotalInfo['total_convenience_fee_te']) currency=$objOrderCurrency} -
- {l s='Total Convenience Fees'} {if $use_tax}{l s='(tax incl.)'}{/if} - - {displayWtPriceWithCurrency price=($orderTotalInfo['total_convenience_fee_ti']) currency=$objOrderCurrency} + {if $priceDisplay && $use_tax} + {displayWtPriceWithCurrency price=($orderTotalInfo['total_convenience_fee_te']) currency=$objOrderCurrency} + {else} + {displayWtPriceWithCurrency price=($orderTotalInfo['total_convenience_fee_ti']) currency=$objOrderCurrency} + {/if}
{l s='Total rooms cost (tax excl.)'} - {displayWtPriceWithCurrency price=($room_price_tax_excl + $room_services_price_tax_excl - $total_convenience_fee_te) currency=$currency} -
{l s='Total Rooms Cost'} {if $use_tax}{l s='(tax incl.)'}{/if} - {displayWtPriceWithCurrency price=($room_price_tax_incl + $room_services_price_tax_incl - $total_convenience_fee_ti) currency=$currency} -
- {l s='Total products cost (tax excl.)'} - - {displayWtPriceWithCurrency price=$total_standard_products_tax_excl currency=$currency} -
- {l s='Total products cost'} {if $use_tax}{l s='(tax incl.)'}{/if} - - {displayWtPriceWithCurrency price=$total_standard_products_tax_incl currency=$currency} -
{l s='Total Convenience Fees (tax excl.)'}{l s='Total rooms cost'} {if $use_taxes && $display_tax_label == 1}{if $priceDisplay == 1}{l s='(tax excl.)'}{elseif $priceDisplay == 0}{l s='(tax incl.)'}{/if} {/if} - {displayWtPriceWithCurrency price=$total_convenience_fee_te currency=$currency} + {if $priceDisplay && $use_tax} + {displayWtPriceWithCurrency price=($room_price_tax_excl + $room_services_price_tax_excl - $total_convenience_fee_te) currency=$currency} + {else} + {displayWtPriceWithCurrency price=($room_price_tax_incl + $room_services_price_tax_incl - $total_convenience_fee_ti) currency=$currency} + {/if}
{l s='Total Convenience Fees (tax incl.)'}
{l s='Total products cost'} {if $use_taxes && $display_tax_label == 1}{if $priceDisplay == 1}{l s='(tax excl.)'}{elseif $priceDisplay == 0}{l s='(tax incl.)'}{/if}{/if} - {displayWtPriceWithCurrency price=$total_convenience_fee_ti currency=$currency} + {if $priceDisplay && $use_tax} + {displayWtPriceWithCurrency price=$total_standard_products_tax_excl currency=$currency} + {else} + {displayWtPriceWithCurrency price=$total_standard_products_tax_incl currency=$currency} + {/if} +
{l s='Total Convenience Fees'} {if $use_taxes && $display_tax_label == 1}{if $priceDisplay == 1}{l s='(tax excl.)'}{elseif $priceDisplay == 0}{l s='(tax incl.)'}{/if}{/if} + {if $priceDisplay && $use_tax} + {displayWtPriceWithCurrency price=$total_convenience_fee_te currency=$currency} + {else} + {displayWtPriceWithCurrency price=$total_convenience_fee_ti currency=$currency} + {/if}
{l s='Total rooms cost (tax excl.)'} - {displayWtPriceWithCurrency price=($room_price_tax_excl + $room_services_price_tax_excl - $total_convenience_fee_te) currency=$currency} -
{l s='Total Rooms Cost'} {if $use_tax}{l s='(tax incl.)'}{/if} - {displayWtPriceWithCurrency price=($room_price_tax_incl + $room_services_price_tax_incl - $total_convenience_fee_ti) currency=$currency} -
- {l s='Total products cost (tax excl.)'} - - {displayWtPriceWithCurrency price=$total_standard_products_tax_excl currency=$currency} -
- {l s='Total products cost'} {if $use_tax}{l s='(tax incl.)'}{/if} - - {displayWtPriceWithCurrency price=$total_standard_products_tax_incl currency=$currency} -
{l s='Total Convenience Fees (tax excl.)'}{l s='Total rooms cost'} {if $use_taxes && $display_tax_label == 1}{if $priceDisplay == 1}{l s='(tax excl.)'}{elseif $priceDisplay == 0}{l s='(tax incl.)'}{/if} {/if} - {displayWtPriceWithCurrency price=$total_convenience_fee_te currency=$currency} + {if $priceDisplay && $use_tax} + {displayWtPriceWithCurrency price=($room_price_tax_excl + $room_services_price_tax_excl - $total_convenience_fee_te) currency=$currency} + {else} + {displayWtPriceWithCurrency price=($room_price_tax_incl + $room_services_price_tax_incl - $total_convenience_fee_ti) currency=$currency} + {/if}
{l s='Total Convenience Fees (tax incl.)'}
{l s='Total products cost'} {if $use_taxes && $display_tax_label == 1}{if $priceDisplay == 1}{l s='(tax excl.)'}{elseif $priceDisplay == 0}{l s='(tax incl.)'}{/if}{/if} - {displayWtPriceWithCurrency price=$total_convenience_fee_ti currency=$currency} + {if $priceDisplay && $use_tax} + {displayWtPriceWithCurrency price=$total_standard_products_tax_excl currency=$currency} + {else} + {displayWtPriceWithCurrency price=$total_standard_products_tax_incl currency=$currency} + {/if} +
{l s='Total Convenience Fees'} {if $use_taxes && $display_tax_label == 1}{if $priceDisplay == 1}{l s='(tax excl.)'}{elseif $priceDisplay == 0}{l s='(tax incl.)'}{/if}{/if} + {if $priceDisplay && $use_tax} + {displayWtPriceWithCurrency price=$total_convenience_fee_te currency=$currency} + {else} + {displayWtPriceWithCurrency price=$total_convenience_fee_ti currency=$currency} + {/if}