From e2569442d1388e452a68461ba9d43ab9cba67e95 Mon Sep 17 00:00:00 2001 From: azhar bhat Date: Thu, 9 Jul 2026 13:47:13 +0530 Subject: [PATCH 1/2] updated: Merge Room Status and Rooms Detail section --- .../controllers/orders/_product_line.tpl | 79 ++++++++++++----- .../orders/_rooms_informaion_table.tpl | 25 +++--- .../controllers/orders/helpers/view/view.tpl | 84 ------------------- controllers/admin/AdminOrdersController.php | 1 + 4 files changed, 72 insertions(+), 117 deletions(-) diff --git a/admin/themes/default/template/controllers/orders/_product_line.tpl b/admin/themes/default/template/controllers/orders/_product_line.tpl index 1e44a648f..9b70c20c6 100644 --- a/admin/themes/default/template/controllers/orders/_product_line.tpl +++ b/admin/themes/default/template/controllers/orders/_product_line.tpl @@ -24,26 +24,25 @@ *} - +

{$data.room_num}

+

{$data.room_type}

{if $data.is_back_order} {l s='overbooked'} {/if} - - -

{$data.room_type}

- - + + {assign var="is_full_date" value=($show_full_date && ($data['date_from']|date_format:'%D' == $data['date_to']|date_format:'%D'))} - {dateFormat date=$data.date_from full=$is_full_date} - {dateFormat date=$data.date_to full=$is_full_date} +

{dateFormat date=$data.date_from full=$is_full_date}

+

{l s='to'}

+

{dateFormat date=$data.date_to full=$is_full_date}

- + +

{if $data['adults']}{$data['adults']}{/if} {if $data['adults'] > 1}{l s='Adults'}{else}{l s='Adult'}{/if}

{if $data['children']}
- - {if $data['adults']}{$data['adults']}{/if} {if $data['adults'] > 1}{l s='Adults'}{else}{l s='Adult'}{/if}{if {$data['children']}}, {$data['children']} {if $data['children'] > 1}{l s='Children'}{else}{l s='Child'}{/if}{/if} - + {$data['children']} {if $data['children'] > 1}{l s='Children'}{else}{l s='Child'}{/if}
{if isset($data['child_ages']) && $data['child_ages']} @@ -59,19 +58,41 @@ {/if}
- {else} - {if $data['adults']}{$data['adults']}{/if} {if $data['adults'] > 1}{l s='Adults'}{else}{l s='Adult'}{/if}{if {$data['children']}}, {$data['children']} {if $data['children'] > 1}{l s='Children'}{else}{l s='Child'}{/if}{/if} {/if} - + +

+ {if ($data['id_status'] == $hotel_order_status['STATUS_CHECKED_IN']['id_status']) || ($data['id_status'] == $hotel_order_status['STATUS_CHECKED_OUT']['id_status'])} + {dateFormat date=$data['check_in'] full=1} + {else} + -- + {/if} +

+

+ {if $data['id_status'] == $hotel_order_status['STATUS_CHECKED_OUT']['id_status']} + {dateFormat date=$data['check_out'] full=1} + {else} + -- + {/if} +

+ + + {if $data['booking_type'] == $ALLOTMENT_MANUAL} + {l s='Manual'}  {if $data['comment'] != ''}{/if} + {else} + {l s='Auto'} + {/if} + +

{convertPriceWithCurrency price=$data['total_price_tax_excl'] currency=$currency->id}

-

{l s='Per day price:'} {convertPriceWithCurrency price=$data['paid_unit_price_tax_excl'] currency=$currency->id}

+

{convertPriceWithCurrency price=$data['paid_unit_price_tax_excl'] currency=$currency->id}/{l s='day'}

+ - + {convertPriceWithCurrency price=($data['extra_demands_price_te'] + $data['additional_services_price_te'] + $data['convenience_fee_te'] + $data['additional_services_price_auto_add_te']) currency=$currency->id} {if $data['extra_demands']|count || $data['additional_services']|count} @@ -79,14 +100,14 @@ {/if} - + {convertPriceWithCurrency price=($data['total_room_tax']) currency=$currency->id} - + {convertPriceWithCurrency price=($data['total_room_price_ti']) currency=$currency->id} {if (isset($refundReqBookings) && $refundReqBookings)} - + {if $data.id|in_array:$refundReqBookings} {if $data.is_cancelled} {l s='Cancelled'} @@ -99,7 +120,7 @@ -- {/if} - + {if $data.is_refunded && isset($data.refund_info) && $data.refund_info} {convertPriceWithCurrency price=$data.refund_info.refunded_amount currency=$currency->id} {else} @@ -108,7 +129,7 @@ {/if} {if ($can_edit && !$order->hasBeenDelivered())} - +
{if isset($refundReqBookings) && $refundReqBookings && $data.id|in_array:$refundReqBookings && $data.is_cancelled}
- - - - {/if}
 {l s='Order'} diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 7b7c58fc2..c8d65abcb 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -3580,6 +3580,7 @@ class AdminOrdersControllerCore extends AdminController $order_detail_data[$key]['amt_with_qty_tax_incl'] = $value['total_price_tax_incl']; $order_detail_data[$key]['room_type_info'] = $objHotelRoomType->getRoomTypeInfoByIdProduct($value['id_product']); $order_detail_data[$key]['total_room_tax'] = $order_detail_data[$key]['total_room_price_ti'] - $order_detail_data[$key]['total_room_price_te']; + $order_detail_data[$key]['num_checkin_documents'] = HotelBookingDocument::getCountByIdHtlBooking($value['id']); if (isset($value['refund_info']) && $value['refund_info']['refunded'] From fbbe747dfa2111cc6235b095459a331a685bbb07 Mon Sep 17 00:00:00 2001 From: azhar bhat Date: Fri, 10 Jul 2026 17:03:39 +0530 Subject: [PATCH 2/2] Updated: Text updated Co-authored-by: Name --- .../orders/_hotel_service_products_table.tpl | 2 +- .../controllers/orders/_product_line.tpl | 54 +++++++++---------- .../orders/_rooms_informaion_table.tpl | 17 +++--- .../_standalone_service_products_table.tpl | 2 +- .../orders/modals/_edit_room_tab_content.tpl | 4 +- 5 files changed, 39 insertions(+), 40 deletions(-) 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 935498f70..3e5b1cc48 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 @@ -117,7 +117,7 @@ {l s='Delete'} {else} -
+
{*