diff --git a/admin/themes/default/template/controllers/normal_products/options.tpl b/admin/themes/default/template/controllers/normal_products/options.tpl new file mode 100644 index 000000000..3a866309e --- /dev/null +++ b/admin/themes/default/template/controllers/normal_products/options.tpl @@ -0,0 +1,121 @@ +{* +* NOTICE OF LICENSE +* +* This source file is subject to the Open Software License version 3.0 +* that is bundled with this package in the file LICENSE.md +* It is also available through the world-wide-web at this URL: +* https://opensource.org/license/osl-3-0-php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to support@qloapps.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade this module to a newer +* versions in the future. If you wish to customize this module for your needs +* please refer to https://store.webkul.com/customisation-guidelines for more information. +* +* @author Webkul IN +* @copyright Since 2010 Webkul +* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0 +*} + +
+ +

{l s='Options'}

+ +
+ + + + + + + + {if $serviceProductOptions} + {foreach $serviceProductOptions as $productOption} + + + + + + {/foreach} + {/if} + + + + + + + + + + + +
{l s='Name'}{l s='Price Impact'}{l s='Action'}
+ + +
+ {$currency->prefix}{$currency->suffix} + + +
+
+ +
+ + +
+ {$currency->prefix}{$currency->suffix} + + +
+
+
+ + +
+ {$currency->prefix}{$currency->suffix} + +
+
+
+
+ + +
+ + + \ No newline at end of file diff --git a/admin/themes/default/template/controllers/orders/_current_cart_details_data.tpl b/admin/themes/default/template/controllers/orders/_current_cart_details_data.tpl index aacfd3228..730f0016f 100644 --- a/admin/themes/default/template/controllers/orders/_current_cart_details_data.tpl +++ b/admin/themes/default/template/controllers/orders/_current_cart_details_data.tpl @@ -154,43 +154,6 @@ {/foreach} {/if} - {if isset($cart_hotel_product_data) && $cart_hotel_product_data} - - - {l s='Image'} - {l s='Name'} - {l s='Hotel Name'} - {l s='Unit Price (tax excl)'} - {l s='Quantity'} - {l s='Total Price (Tax incl.)'} - - - - - {foreach $cart_hotel_product_data as $product} - - -

{$product['name']|escape:'html':'UTF-8'}{if $product.option_name} : {$product.option_name|escape:'html':'UTF-8'}{/if}

- {$product['hotel_name']} - {displayPrice price=$product['unit_price_tax_excl']} - - {if $product.allow_multiple_quantity} - 0}max="{$product.max_quantity}"{/if}> - - {else} - -- - {/if} - - {displayPrice price=$product['total_price_tax_incl']} - - - - - {/foreach} - - {/if} diff --git a/admin/themes/default/template/controllers/orders/_hotel_service_products_table.tpl b/admin/themes/default/template/controllers/orders/_hotel_service_products_table.tpl index cb97956ba..c5538a56d 100644 --- a/admin/themes/default/template/controllers/orders/_hotel_service_products_table.tpl +++ b/admin/themes/default/template/controllers/orders/_hotel_service_products_table.tpl @@ -19,134 +19,144 @@
- +
- - - - - - + + + + + + {if isset($refundReqProducts) && $refundReqProducts} - - + + {/if} - {if ($can_edit && !$order->hasBeenDelivered())} - + {if $can_edit} + {/if} - {if $hotel_service_products} - {foreach from=$hotel_service_products item=product} - {* Include product line partial *} - {if ($order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC)} - {assign var=product_price value=($product['unit_price_tax_excl'])} - {else} - {assign var=product_price value=$product['unit_price_tax_incl']} - {/if} - - - - - - - - {if (isset($refundReqProducts) && $refundReqProducts)} - + + + + + + + {if (isset($refundReqProducts) && $refundReqProducts)} + - - {/if} - {if ($can_edit && !$order->hasBeenDelivered())} - + {/if} - - + + + {/if} + + {/foreach} + {else} + + {assign var=colspan value=6} + {if isset($refundReqProducts) && $refundReqProducts} + {assign var=colspan value=($colspan+2)} {/if} + {if ($can_edit)} + {assign var=colspan value=($colspan+1)} + {/if} + - {/foreach} - {else} - - - - {/if} - {* Include product line partial *} - {* {include file='controllers/orders/_new_service_product.tpl'} *} + {/if}
{l s='Image'}{l s='Name'}{l s='Quantity'}{l s='Price (Tax excl.)'}{l s='Total Tax'}{l s='Total Price (Tax incl.)'}{l s='Image'}{l s='Name'}{l s='Quantity'}{l s='Price (Tax excl.)'}{l s='Total Tax'}{l s='Total Price (Tax incl.)'}{l s='Refund State'}{l s='Refunded amount'}{l s='Refund State'}{l s='Refunded amount'}{l s='Edit Order'}{l s='Actions'}
- {if isset($product.image) && $product.image->id}{$product.image_tag}{/if} - - - {$product['name']}{if isset($product['option_name']) && $product['option_name']} : {$product['option_name']}{/if}
-
-
- {(int)$product['quantity']} - -

{displayPrice price=$product.total_price_tax_excl currency=$currency->id}

-

{l s='Unit price'} : {displayPrice price=$product.unit_price_tax_excl currency=$currency->id}

-
- {displayPrice price=($product.total_price_tax_incl - $product.total_price_tax_excl) currency=$currency->id} - - {displayPrice price=$product.total_price_tax_incl currency=$currency->id} - - {if $product.id_room_type_service_product_order_detail|in_array:$refundReqProducts} - {if $product.is_cancelled} - {l s='Cancelled'} - {elseif isset($product.refund_info) && (!$product.refund_info.refunded || $product.refund_info.id_customization)} - {$product.refund_info.name|escape:'html':'UTF-8'} + {if $hotel_service_products} + {foreach from=$hotel_service_products item=product} + {* Include product line partial *} + {if ($order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC)} + {assign var=product_price value=($product['unit_price_tax_excl'])} + {else} + {assign var=product_price value=$product['unit_price_tax_incl']} + {/if} +
+ {if isset($product.image) && $product.image->id}{$product.image_tag}{/if} + + + {$product['name']}{if isset($product['option_name']) && $product['option_name']} : {$product['option_name']}{/if}
+
+
+ {(int)$product['quantity']} + +

{displayPrice price=$product.total_price_tax_excl currency=$currency->id}

+

{l s='Unit price'} : {displayPrice price=$product.unit_price_tax_excl currency=$currency->id}

+
+ {displayPrice price=($product.total_price_tax_incl - $product.total_price_tax_excl) currency=$currency->id} + + {displayPrice price=$product.total_price_tax_incl currency=$currency->id} + + {if $product.id_service_product_order_detail|in_array:$refundReqProducts} + {if $product.is_cancelled} + {l s='Cancelled'} + {elseif isset($product.refund_info) && (!$product.refund_info.refunded || $product.refund_info.id_customization)} + {$product.refund_info.name|escape:'html':'UTF-8'} + {else} + -- + {/if} {else} -- {/if} - {else} - -- - {/if} - - {if $product.is_refunded && isset($product.refund_info) && $product.refund_info} - {convertPriceWithCurrency price=$product.refund_info.refunded_amount currency=$currency->id} - {else} - -- - {/if} - + {if $product.is_refunded && isset($product.refund_info) && $product.refund_info} + {convertPriceWithCurrency price=$product.refund_info.refunded_amount currency=$currency->id} + {else} + -- + {/if} + - {* edit/delete controls *} -
- {*
+ {* edit/delete controls *} +
+ {* *} + + + +
+ {* Update controls *} + {* + *} - - - - - {* Update controls *} - {* - *} -
+
+ + {l s='No products added yet'} +
+
{l s='No Data Found.'}
diff --git a/admin/themes/default/template/controllers/orders/_standalone_service_products_table.tpl b/admin/themes/default/template/controllers/orders/_standalone_service_products_table.tpl index 1382e4404..4c23230e7 100644 --- a/admin/themes/default/template/controllers/orders/_standalone_service_products_table.tpl +++ b/admin/themes/default/template/controllers/orders/_standalone_service_products_table.tpl @@ -22,131 +22,141 @@ - - - - - - + + + + + + {if isset($refundReqProducts) && $refundReqProducts} - - + + {/if} - {if ($can_edit && !$order->hasBeenDelivered())} - + {if ($can_edit)} + {/if} - {if $standalone_service_products} - {foreach from=$standalone_service_products item=product} - {* Include product line partial *} - {if ($order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC)} - {assign var=product_price value=($product['unit_price_tax_excl'])} - {else} - {assign var=product_price value=$product['unit_price_tax_incl']} - {/if} - - - - - - - - {if (isset($refundReqProducts) && $refundReqProducts)} - + + + + + + + {if (isset($refundReqProducts) && $refundReqProducts)} + - - {/if} - {if ($can_edit && !$order->hasBeenDelivered())} - + {/if} - - + + + {/if} + + {/foreach} + {else} + + {assign var=colspan value=6} + {if isset($refundReqProducts) && $refundReqProducts} + {assign var=colspan value=($colspan+2)} {/if} + {if ($can_edit)} + {assign var=colspan value=($colspan+1)} + {/if} + - {/foreach} - {else} - - - - {/if} - {* Include product line partial *} - {* {include file='controllers/orders/_new_service_product.tpl'} *} + {/if}
{l s='Image'}{l s='Name'}{l s='Quantity'}{l s='Price (Tax excl.)'}{l s='Total Tax'}{l s='Total Price (Tax incl.)'}{l s='Image'}{l s='Name'}{l s='Quantity'}{l s='Price (Tax excl.)'}{l s='Total Tax'}{l s='Total Price (Tax incl.)'}{l s='Refund State'}{l s='Refunded amount'}{l s='Refund State'}{l s='Refunded amount'}{l s='Edit Order'}{l s='Actions'}
- {if isset($product.image) && $product.image->id}{$product.image_tag}{/if} - - - {$product['name']}{if $product['option_name']} : {$product['option_name']}{/if}
-
-
- {(int)$product['quantity']} - -

{displayPrice price=$product.total_price_tax_excl currency=$currency->id}

-

{l s='Unit price'} : {displayPrice price=$product.unit_price_tax_excl currency=$currency->id}

-
- {displayPrice price=($product.total_price_tax_incl - $product.total_price_tax_excl) currency=$currency->id} - - {displayPrice price=$product.total_price_tax_incl currency=$currency->id} - - {if $product.id_room_type_service_product_order_detail|in_array:$refundReqProducts} - {if $product.is_cancelled} - {l s='Cancelled'} - {elseif isset($product.refund_info) && (!$product.refund_info.refunded || $product.refund_info.id_customization)} - {$product.refund_info.name|escape:'html':'UTF-8'} + {if $standalone_service_products} + {foreach from=$standalone_service_products item=product} + {* Include product line partial *} + {if ($order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC)} + {assign var=product_price value=($product['unit_price_tax_excl'])} + {else} + {assign var=product_price value=$product['unit_price_tax_incl']} + {/if} +
+ {if isset($product.image) && $product.image->id}{$product.image_tag}{/if} + + + {$product['name']}{if $product['option_name']} : {$product['option_name']}{/if}
+
+
+ {(int)$product['quantity']} + +

{displayPrice price=$product.total_price_tax_excl currency=$currency->id}

+

{l s='Unit price'} : {displayPrice price=$product.unit_price_tax_excl currency=$currency->id}

+
+ {displayPrice price=($product.total_price_tax_incl - $product.total_price_tax_excl) currency=$currency->id} + + {displayPrice price=$product.total_price_tax_incl currency=$currency->id} + + {if $product.id_service_product_order_detail|in_array:$refundReqProducts} + {if $product.is_cancelled} + {l s='Cancelled'} + {elseif isset($product.refund_info) && (!$product.refund_info.refunded || $product.refund_info.id_customization)} + {$product.refund_info.name|escape:'html':'UTF-8'} + {else} + -- + {/if} {else} -- {/if} - {else} - -- - {/if} - - {if $product.is_refunded && isset($product.refund_info) && $product.refund_info} - {convertPriceWithCurrency price=$product.refund_info.refunded_amount currency=$currency->id} - {else} - -- - {/if} - + {if $product.is_refunded && isset($product.refund_info) && $product.refund_info} + {convertPriceWithCurrency price=$product.refund_info.refunded_amount currency=$currency->id} + {else} + -- + {/if} + - {* edit/delete controls *} -
- {*
+ {* edit/delete controls *} +
+ {* *} + + + +
+ {* Update controls *} + {* + *} - - - - - {* Update controls *} - {* - *} -
+
+ + {l s='No products added yet'} +
+
{l s='No Data Found.'}
diff --git a/admin/themes/default/template/controllers/orders/form.tpl b/admin/themes/default/template/controllers/orders/form.tpl index e3252bf82..c225814ca 100644 --- a/admin/themes/default/template/controllers/orders/form.tpl +++ b/admin/themes/default/template/controllers/orders/form.tpl @@ -293,7 +293,6 @@ var params = { id_product: parseInt($(cart_row).attr('data-id-product')), - id_hotel_service_product_cart_detail: parseInt($(cart_row).attr('data-id_hotel_service_product_cart_detail')), qty: qty_to_update, opt: opt, id_cart: id_cart diff --git a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl index 4bbe013c4..c8cd16e24 100644 --- a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl +++ b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl @@ -843,9 +843,10 @@ {/if} +
-  {l s='Product Detail'} {$hotel_service_products|count} +  {l s='Products Detail'} {$hotel_service_products|count} {if $can_edit && (!$order->hasBeenDelivered() && $currentState->id != Configuration::get('PS_OS_REFUND') && $currentState->id != Configuration::get('PS_OS_CANCELED'))}
-
+
diff --git a/admin/themes/default/template/controllers/orders/modals/_cancel_room_bookings.tpl b/admin/themes/default/template/controllers/orders/modals/_cancel_room_bookings.tpl index 5f67497f0..00413ed13 100644 --- a/admin/themes/default/template/controllers/orders/modals/_cancel_room_bookings.tpl +++ b/admin/themes/default/template/controllers/orders/modals/_cancel_room_bookings.tpl @@ -19,11 +19,23 @@