From 53d25dc0a8bbc40d7033f3e258ed338c42019320 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Thu, 24 Oct 2024 13:01:29 +0530 Subject: [PATCH 01/50] Fixed: Price is calculated and saved incorrectly when admin tries to update booking not having any service/demands in the back-office --- controllers/admin/AdminOrdersController.php | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 6dfcdaced..1e467e15d 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -4886,10 +4886,6 @@ class AdminOrdersControllerCore extends AdminController $order->total_products_wt += (float)$diff_price_tax_incl; $order->total_products_wt = $order->total_products_wt > 0 ? $order->total_products_wt : 0; - $order->total_paid = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_); - $order->total_paid_tax_incl = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_); - $order->total_paid_tax_excl = Tools::ps_round($order->getOrderTotal(false), _PS_PRICE_COMPUTE_PRECISION_); - $res &= $order->update(); } @@ -5043,7 +5039,6 @@ class AdminOrdersControllerCore extends AdminController )) { // update extra demands total prices if dates are changes (price calc method for each day) if ($extraDemands) { - $order = new Order($id_order); foreach ($extraDemands as $demand) { if (isset($demand['extra_demands']) && $demand['extra_demands']) { foreach ($demand['extra_demands'] as $rDemand) { @@ -5072,19 +5067,13 @@ class AdminOrdersControllerCore extends AdminController } } } - // change order total save - $order->total_paid = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_); - $order->total_paid_tax_incl = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_); - $order->total_paid_tax_excl = Tools::ps_round($order->getOrderTotal(false), _PS_PRICE_COMPUTE_PRECISION_); - $order->save(); } if (isset($orderServiceProducts) && is_array($orderServiceProducts) && count($orderServiceProducts) ) { - $order = new Order((int) $id_order); foreach ($orderServiceProducts as $orderServiceProduct) { if (isset($orderServiceProduct['additional_services']) && is_array($orderServiceProduct['additional_services']) @@ -5140,13 +5129,15 @@ class AdminOrdersControllerCore extends AdminController } } - $order->total_paid = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_); - $order->total_paid_tax_incl = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_); - $order->total_paid_tax_excl = Tools::ps_round($order->getOrderTotal(false), _PS_PRICE_COMPUTE_PRECISION_); - $order->save(); } } + $order = new Order((int) $id_order); + $order->total_paid = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_); + $order->total_paid_tax_incl = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_); + $order->total_paid_tax_excl = Tools::ps_round($order->getOrderTotal(false), _PS_PRICE_COMPUTE_PRECISION_); + $order->save(); + if (is_array(Tools::getValue('product_quantity'))) { $view = $this->createTemplate('_customized_data.tpl')->fetch(); } else { From 3a291feb1392dcf9af0746ae007fea526ea6b80d Mon Sep 17 00:00:00 2001 From: Aman deep sharma Date: Thu, 16 Jan 2025 20:31:43 +0530 Subject: [PATCH 02/50] [Fixed]: Order invoice does not get updated --- .../orders/modals/_edit_room_tab_content.tpl | 9 + controllers/admin/AdminOrdersController.php | 207 +++++++++--------- 2 files changed, 115 insertions(+), 101 deletions(-) diff --git a/admin/themes/default/template/controllers/orders/modals/_edit_room_tab_content.tpl b/admin/themes/default/template/controllers/orders/modals/_edit_room_tab_content.tpl index 1bb98114b..7df2e26b9 100644 --- a/admin/themes/default/template/controllers/orders/modals/_edit_room_tab_content.tpl +++ b/admin/themes/default/template/controllers/orders/modals/_edit_room_tab_content.tpl @@ -127,6 +127,15 @@ +
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 6dfcdaced..328ec168a 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -894,89 +894,92 @@ class AdminOrdersControllerCore extends AdminController && ($productLineData = Tools::getValue('product_line_data')) ) { $productLineData = json_decode($productLineData, true); - - $smartyVars = array( - 'order' => $objOrder, - 'data' => $productLineData, - 'currency' => new Currency($objOrder->id_currency), - 'max_child_age' => Configuration::get('WK_GLOBAL_CHILD_MAX_AGE'), - 'orderEdit' => 1, - ); - - $objCurrency = new Currency($objOrder->id_currency); - $smartyVars['orderCurrency'] = $objOrder->id_currency; - $smartyVars['currencySign'] = $objCurrency->sign; - $smartyVars['link'] = $this->context->link; - - $smartyVars['id_booking_detail'] = $productLineData['id']; - - $objBookingDemand = new HotelBookingDemands(); - - // set context currency So that we can get prices in the order currency - $this->context->currency = $objCurrency; - - if ($extraDemands = $objBookingDemand->getRoomTypeBookingExtraDemands( - $idOrder, - 0, - 0, - 0, - 0, - 1, - 0, - 1, - $productLineData['id'] - )) { - $smartyVars['extraDemands'] = $extraDemands; - } - - // get room type additional demands - $objRoomDemands = new HotelRoomTypeDemand(); - if ($roomTypeDemands = $objRoomDemands->getRoomTypeDemands($idProduct)) { - foreach ($roomTypeDemands as &$demand) { - // if demand has advance options then set demand price as first advance option price. - if (isset($demand['adv_option']) && $demand['adv_option']) { - $demand['price'] = current($demand['adv_option'])['price']; - } + if (Validate::isLoadedObject($objOrderDetail = new OrderDetail($productLineData['id_order_detail']))) { + $productLineData['id_order_invoice'] = $objOrderDetail->id_order_invoice; + $smartyVars = array( + 'order' => $objOrder, + 'data' => $productLineData, + 'currency' => new Currency($objOrder->id_currency), + 'max_child_age' => Configuration::get('WK_GLOBAL_CHILD_MAX_AGE'), + 'orderEdit' => 1, + ); + + $objCurrency = new Currency($objOrder->id_currency); + $smartyVars['orderCurrency'] = $objOrder->id_currency; + $smartyVars['currencySign'] = $objCurrency->sign; + $smartyVars['link'] = $this->context->link; + + $smartyVars['id_booking_detail'] = $productLineData['id']; + + $objBookingDemand = new HotelBookingDemands(); + + // set context currency So that we can get prices in the order currency + $this->context->currency = $objCurrency; + + if ($extraDemands = $objBookingDemand->getRoomTypeBookingExtraDemands( + $idOrder, + 0, + 0, + 0, + 0, + 1, + 0, + 1, + $productLineData['id'] + )) { + $smartyVars['extraDemands'] = $extraDemands; } - $smartyVars['roomTypeDemands'] = $roomTypeDemands; - } - - $objRoomTypeServiceProductOrderDetail = new RoomTypeServiceProductOrderDetail(); - if ($additionalServices = $objRoomTypeServiceProductOrderDetail->getSelectedServicesForRoom( - $productLineData['id'] - )) { - $smartyVars['additionalServices'] = $additionalServices; - } - - // get room type additional demands - $objRoomTypeServiceProduct = new RoomTypeServiceProduct(); - if ($roomTypeServiceProducts = $objRoomTypeServiceProduct->getServiceProductsData($idProduct, 1, 0, false, 2, null)) { - if ($additionalServices) { - foreach ($roomTypeServiceProducts as $key => $product) { - if (in_array($product['id_product'], array_column($additionalServices['additional_services'], 'id_product'))) { - unset($roomTypeServiceProducts[$key]); + + // get room type additional demands + $objRoomDemands = new HotelRoomTypeDemand(); + if ($roomTypeDemands = $objRoomDemands->getRoomTypeDemands($idProduct)) { + foreach ($roomTypeDemands as &$demand) { + // if demand has advance options then set demand price as first advance option price. + if (isset($demand['adv_option']) && $demand['adv_option']) { + $demand['price'] = current($demand['adv_option'])['price']; } } + $smartyVars['roomTypeDemands'] = $roomTypeDemands; } - $smartyVars['roomTypeServiceProducts'] = $roomTypeServiceProducts; + + $objRoomTypeServiceProductOrderDetail = new RoomTypeServiceProductOrderDetail(); + if ($additionalServices = $objRoomTypeServiceProductOrderDetail->getSelectedServicesForRoom( + $productLineData['id'] + )) { + $smartyVars['additionalServices'] = $additionalServices; + } + + // get room type additional demands + $objRoomTypeServiceProduct = new RoomTypeServiceProduct(); + if ($roomTypeServiceProducts = $objRoomTypeServiceProduct->getServiceProductsData($idProduct, 1, 0, false, 2, null)) { + if ($additionalServices) { + foreach ($roomTypeServiceProducts as $key => $product) { + if (in_array($product['id_product'], array_column($additionalServices['additional_services'], 'id_product'))) { + unset($roomTypeServiceProducts[$key]); + } + } + } + $smartyVars['roomTypeServiceProducts'] = $roomTypeServiceProducts; + } + + $objOrderReturn = new OrderReturn(); + $refundReqBookings = $objOrderReturn->getOrderRefundRequestedBookings($objOrder->id, 0, 1); + $smartyVars['refundReqBookings'] = $refundReqBookings; + $smartyVars['invoices_collection'] = $objOrder->getInvoicesCollection(); + + $this->context->smarty->assign($smartyVars); + + $modal = array( + 'modal_id' => 'edit-room-booking-modal', + 'modal_class' => 'modal-lg order_detail_modal', + 'modal_title' => '  '.$this->l('Edit Room'), + 'modal_content' => $this->context->smarty->fetch('controllers/orders/modals/_edit_room_booking.tpl'), + ); + + $this->context->smarty->assign($modal); + $response['hasError'] = 0; + $response['modalHtml'] = $this->context->smarty->fetch('modal.tpl'); } - - $objOrderReturn = new OrderReturn(); - $refundReqBookings = $objOrderReturn->getOrderRefundRequestedBookings($objOrder->id, 0, 1); - $smartyVars['refundReqBookings'] = $refundReqBookings; - - $this->context->smarty->assign($smartyVars); - - $modal = array( - 'modal_id' => 'edit-room-booking-modal', - 'modal_class' => 'modal-lg order_detail_modal', - 'modal_title' => '  '.$this->l('Edit Room'), - 'modal_content' => $this->context->smarty->fetch('controllers/orders/modals/_edit_room_booking.tpl'), - ); - - $this->context->smarty->assign($modal); - $response['hasError'] = 0; - $response['modalHtml'] = $this->context->smarty->fetch('modal.tpl'); } die(Tools::jsonEncode($response)); @@ -4873,8 +4876,6 @@ class AdminOrdersControllerCore extends AdminController if (isset($order_invoice)) { // Apply changes on OrderInvoice - $order_invoice->total_products += (float)$diff_price_tax_excl; - $order_invoice->total_products_wt += (float)$diff_price_tax_incl; $order_invoice->total_paid_tax_excl += (float)$diff_price_tax_excl; $order_invoice->total_paid_tax_incl += (float)$diff_price_tax_incl; } @@ -4886,10 +4887,6 @@ class AdminOrdersControllerCore extends AdminController $order->total_products_wt += (float)$diff_price_tax_incl; $order->total_products_wt = $order->total_products_wt > 0 ? $order->total_products_wt : 0; - $order->total_paid = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_); - $order->total_paid_tax_incl = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_); - $order->total_paid_tax_excl = Tools::ps_round($order->getOrderTotal(false), _PS_PRICE_COMPUTE_PRECISION_); - $res &= $order->update(); } @@ -4914,10 +4911,6 @@ class AdminOrdersControllerCore extends AdminController } } - // Save order invoice - if (isset($order_invoice)) { - $res &= $order_invoice->update(); - } if ($qty_diff != 0) { $cartQty = $qty_diff; @@ -5043,7 +5036,6 @@ class AdminOrdersControllerCore extends AdminController )) { // update extra demands total prices if dates are changes (price calc method for each day) if ($extraDemands) { - $order = new Order($id_order); foreach ($extraDemands as $demand) { if (isset($demand['extra_demands']) && $demand['extra_demands']) { foreach ($demand['extra_demands'] as $rDemand) { @@ -5068,23 +5060,23 @@ class AdminOrdersControllerCore extends AdminController $objBookingDemand->total_price_tax_incl = $demandPriceTI; $objBookingDemand->save(); + + $order_invoice->total_paid_tax_excl -= $rDemand['total_price_tax_excl']; + $order_invoice->total_paid_tax_incl -= $rDemand['total_price_tax_incl']; + + $order_invoice->total_paid_tax_excl += (float)$objBookingDemand->total_price_tax_excl; + $order_invoice->total_paid_tax_incl += (float)$objBookingDemand->total_price_tax_incl; } } } } - // change order total save - $order->total_paid = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_); - $order->total_paid_tax_incl = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_); - $order->total_paid_tax_excl = Tools::ps_round($order->getOrderTotal(false), _PS_PRICE_COMPUTE_PRECISION_); - $order->save(); } if (isset($orderServiceProducts) && is_array($orderServiceProducts) && count($orderServiceProducts) ) { - $order = new Order((int) $id_order); foreach ($orderServiceProducts as $orderServiceProduct) { if (isset($orderServiceProduct['additional_services']) && is_array($orderServiceProduct['additional_services']) @@ -5130,6 +5122,12 @@ class AdminOrdersControllerCore extends AdminController $objOrderDetail->product_quantity += ($newProductQuantity - $oldProductQuantity); $objOrderDetail->save(); + $order_invoice->total_paid_tax_excl -= $objRoomTypeServiceProductOrderDetail->total_price_tax_excl; + $order_invoice->total_paid_tax_incl -= $objRoomTypeServiceProductOrderDetail->total_price_tax_incl; + + $order_invoice->total_paid_tax_excl += (float)$newTotalPriceTaxExcl; + $order_invoice->total_paid_tax_incl += (float)$newTotalPriceTaxIncl; + $objRoomTypeServiceProductOrderDetail->unit_price_tax_excl = $unitPriceTaxExcl; $objRoomTypeServiceProductOrderDetail->unit_price_tax_incl = $unitPriceTaxIncl; $objRoomTypeServiceProductOrderDetail->total_price_tax_excl = $newTotalPriceTaxExcl; @@ -5139,14 +5137,21 @@ class AdminOrdersControllerCore extends AdminController } } } - - $order->total_paid = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_); - $order->total_paid_tax_incl = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_); - $order->total_paid_tax_excl = Tools::ps_round($order->getOrderTotal(false), _PS_PRICE_COMPUTE_PRECISION_); - $order->save(); } } + $order->total_paid = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_); + $order->total_paid_tax_incl = Tools::ps_round($order->getOrderTotal(), _PS_PRICE_COMPUTE_PRECISION_); + $order->total_paid_tax_excl = Tools::ps_round($order->getOrderTotal(false), _PS_PRICE_COMPUTE_PRECISION_); + $order->save(); + + // Save order invoice + if (isset($order_invoice)) { + $order_invoice->total_products = $order_invoice->total_paid_tax_excl; + $order_invoice->total_products_wt = $order_invoice->total_paid_tax_incl; + $res &= $order_invoice->update(); + } + if (is_array(Tools::getValue('product_quantity'))) { $view = $this->createTemplate('_customized_data.tpl')->fetch(); } else { @@ -7264,4 +7269,4 @@ class AdminOrdersControllerCore extends AdminController $this->ajaxDie(json_encode($result)); } -} +} \ No newline at end of file From 8c55c5e6291016d4008079d0c60f56d07874ba11 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Fri, 17 Jan 2025 15:24:58 +0530 Subject: [PATCH 03/50] Fixed: Average price of a room is incorrect in invoice in case any service is attached with the room --- classes/pdf/HTMLTemplateInvoice.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/pdf/HTMLTemplateInvoice.php b/classes/pdf/HTMLTemplateInvoice.php index 491ce2686..8545e408d 100644 --- a/classes/pdf/HTMLTemplateInvoice.php +++ b/classes/pdf/HTMLTemplateInvoice.php @@ -483,7 +483,7 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate $cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl'] = $data_v['total_price_tax_excl']/$num_days; $cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl'] = $data_v['total_price_tax_excl']/$num_days; - $cart_htl_data[$type_key]['date_diff'][$date_join]['avg_paid_unit_price_tax_excl'] = $cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl'] + $cart_htl_data[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_te']; + $cart_htl_data[$type_key]['date_diff'][$date_join]['avg_paid_unit_price_tax_excl'] = $cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl'] + ($cart_htl_data[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_te']/$num_days); $cart_htl_data[$type_key]['date_diff'][$date_join]['amount'] = ($data_v['total_price_tax_excl'] + $cart_htl_data[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_te']); From 2ba945814bc4d4e46007e7d555e7b568a4480479 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Mon, 20 Jan 2025 12:29:22 +0530 Subject: [PATCH 04/50] Fixed: All the products are removed from all the carts in case admin/employee clicks on remove button from back office twice while trying to remove a room from the cart --- .../admin/AdminHotelRoomsBookingController.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php index 04d0dc8a6..239306922 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php @@ -746,13 +746,13 @@ class AdminHotelRoomsBookingController extends ModuleAdminController } } else { // remove room from cart - $objHotelCartBookingData = new HotelCartBookingData($id_cart_book_data); - if ($objHotelCartBookingData->deleteCartBookingData( - $obj_booking_dtl->id_cart, - $objHotelCartBookingData->id_product, - $objHotelCartBookingData->id_room, - $objHotelCartBookingData->date_from, - $objHotelCartBookingData->date_to + if ((Validate::isLoadedObject($objHotelCartBookingData = new HotelCartBookingData((int) $id_cart_book_data))) + && $objHotelCartBookingData->deleteCartBookingData( + $obj_booking_dtl->id_cart, + $objHotelCartBookingData->id_product, + $objHotelCartBookingData->id_room, + $objHotelCartBookingData->date_from, + $objHotelCartBookingData->date_to )) { $response['success'] = true; if ($ajax_delete) { From b60a74884417231cd31d88192fbd6f773a9b3f9c Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Mon, 20 Jan 2025 16:37:41 +0530 Subject: [PATCH 05/50] Fixed: service products are not deselected if the rooms are not available for the selected date range --- .../js/modules/blockcart/ajax-cart.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/themes/hotel-reservation-theme/js/modules/blockcart/ajax-cart.js b/themes/hotel-reservation-theme/js/modules/blockcart/ajax-cart.js index d0698fa3e..c2fcf30fe 100644 --- a/themes/hotel-reservation-theme/js/modules/blockcart/ajax-cart.js +++ b/themes/hotel-reservation-theme/js/modules/blockcart/ajax-cart.js @@ -1267,12 +1267,14 @@ function crossselling_serialScroll() { }); } -function resetRoomtypeServices() { +function resetRoomtypeServices(refresh = true) { $('.room_demands_container').find('input.id_room_type_demand:checked').prop('checked', false).uniform(); $('#additional_products').empty(); $('#additional_products div') $('.remove_roomtype_product').text(select_txt).removeClass('btn-danger remove_roomtype_product').addClass('btn-success add_roomtype_product'); - BookingForm.refresh(); + if (refresh) { + BookingForm.refresh(); + } } function disableRoomTypeDemands(show) { @@ -1289,6 +1291,7 @@ function disableRoomTypeDemands(show) { function disableRoomTypeServices(disable) { if (disable) { + resetRoomtypeServices(false); $('#service_products_cont').find('button.add_roomtype_product').attr('disabled', 'disabled'); $('#service_products_cont').find('.qty_container .qty_direction a').attr('disabled', 'disabled'); } else { From ffe5b06edfcf9e049e5df83e4a1b0519090d7799 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Mon, 20 Jan 2025 18:41:41 +0530 Subject: [PATCH 06/50] Fixed: Occupancy column not showing to the admin after admin add the customer to the cart on book now page in the back office --- .../orders/_current_cart_details_data.tpl | 6 +++++- controllers/admin/AdminCartsController.php | 16 +++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) 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 3bb29c765..1ceb61c62 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 @@ -17,7 +17,9 @@ * @license https://store.webkul.com/license.html *} +{if !isset($ajax) || !$ajax}
+{/if}
{l s='Cart Details'} @@ -51,7 +53,7 @@

{$data.room_type|escape:'html':'UTF-8'}

- {assign var="is_full_date" value=($show_full_date && ($data['date_from']|date_format:'%D' == $data['date_to']|date_format:'%D'))} + {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} {if $occupancy_required_for_booking} @@ -187,6 +189,7 @@
+{if !isset($ajax) || !$ajax}
{* Modal for extra demands *} @@ -229,3 +232,4 @@ #rooms_extra_demands .room_demand_detail { padding: 15px 15px 0px 15px;} +{/if} diff --git a/controllers/admin/AdminCartsController.php b/controllers/admin/AdminCartsController.php index 2ce84593f..0954044c1 100644 --- a/controllers/admin/AdminCartsController.php +++ b/controllers/admin/AdminCartsController.php @@ -612,10 +612,24 @@ class AdminCartsControllerCore extends AdminController $cart_detail_data = array(); $cart_detail_data_obj = new HotelCartBookingData(); $cart_detail_data_obj->updateIdCurrencyByIdCart($id_cart, $currency->id); - $cart_detail_data = $cart_detail_data_obj->getCartFormatedBookinInfoByIdCart((int) $id_cart); + + if ($cart_detail_data = $cart_detail_data_obj->getCartFormatedBookinInfoByIdCart((int) $id_cart)) { + $objRoomType = new HotelRoomType(); + foreach ($cart_detail_data as $key => $cart_data) { + + $cart_detail_data[$key]['room_type_info'] = $objRoomType->getRoomTypeInfoByIdProduct($cart_data['id_product']); + } + } + $occupancyRequiredForBooking = false; + if (Configuration::get('PS_BACKOFFICE_ROOM_BOOKING_TYPE') == HotelBookingDetail::PS_ROOM_UNIT_SELECTION_TYPE_OCCUPANCY) { + $occupancyRequiredForBooking = true; + } + $this->context->smarty->assign(array( 'cart_detail_data' => $cart_detail_data, 'currency' => new Currency((int)$this->context->cart->id_currency), + 'occupancy_required_for_booking' => $occupancyRequiredForBooking, + 'ajax' => true )); $tpl_path = 'default/template/controllers/orders/_current_cart_details_data.tpl'; From f3391db29eca63028cc1b30f7ed73d1b0b8a8cfb Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Mon, 20 Jan 2025 19:25:58 +0530 Subject: [PATCH 07/50] Fixed: Extra demands remained selected even when rooms were unavailable for the selected date range in the front office. --- themes/hotel-reservation-theme/js/modules/blockcart/ajax-cart.js | 1 + 1 file changed, 1 insertion(+) diff --git a/themes/hotel-reservation-theme/js/modules/blockcart/ajax-cart.js b/themes/hotel-reservation-theme/js/modules/blockcart/ajax-cart.js index c2fcf30fe..8f672c73f 100644 --- a/themes/hotel-reservation-theme/js/modules/blockcart/ajax-cart.js +++ b/themes/hotel-reservation-theme/js/modules/blockcart/ajax-cart.js @@ -1281,6 +1281,7 @@ function disableRoomTypeDemands(show) { if (show) { $('.room_demands_container_overlay').show(); $('.room_demands_container').find('input:checkbox.id_room_type_demand').prop('checked', false); + $('.room_demand_block').find('.id_room_type_demand').prop('checked', false).parent().removeClass('checked'); $('.room_demands_container').find('input:checkbox.id_room_type_demand').attr('disabled', 'disabled'); } else { $('.room_demands_container_overlay').hide(); From 91a700e2e22fcf39256e7297f1534af36accc611 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Tue, 21 Jan 2025 11:28:19 +0530 Subject: [PATCH 08/50] Added: Proper validations before calling the function deleteCartBookingData() --- classes/Customer.php | 10 ++++++---- .../admin/AdminHotelRoomsBookingController.php | 14 +++++++------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/classes/Customer.php b/classes/Customer.php index 2983aa607..05e84952c 100644 --- a/classes/Customer.php +++ b/classes/Customer.php @@ -324,10 +324,12 @@ class CustomerCore extends ObjectModel $objHtlCartData = new HotelCartBookingData(); foreach ($carts as $cart) { $objCart = new Cart($cart['id_cart']); - Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'cart WHERE id_cart='.(int)$cart['id_cart']); - Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'cart_product WHERE id_cart='.(int)$cart['id_cart']); - // delete rows from hotel booking cart table - $objHtlCartData->deleteCartBookingData($cart['id_cart'], 0, 0, 0, 0, 0); + if ($cart['id_cart']) { + Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'cart WHERE id_cart='.(int)$cart['id_cart']); + Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'cart_product WHERE id_cart='.(int)$cart['id_cart']); + // delete rows from hotel booking cart table + $objHtlCartData->deleteCartBookingData($cart['id_cart'], 0, 0, 0, 0, 0); + } } } diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php index 239306922..6ff7606c1 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php @@ -746,13 +746,13 @@ class AdminHotelRoomsBookingController extends ModuleAdminController } } else { // remove room from cart - if ((Validate::isLoadedObject($objHotelCartBookingData = new HotelCartBookingData((int) $id_cart_book_data))) - && $objHotelCartBookingData->deleteCartBookingData( - $obj_booking_dtl->id_cart, - $objHotelCartBookingData->id_product, - $objHotelCartBookingData->id_room, - $objHotelCartBookingData->date_from, - $objHotelCartBookingData->date_to + $objHotelCartBookingData = new HotelCartBookingData($id_cart_book_data); + if ($objHotelCartBookingData->deleteCartBookingData( + 0, + $objHotelCartBookingData->id_product, + $objHotelCartBookingData->id_room, + $objHotelCartBookingData->date_from, + $objHotelCartBookingData->date_to )) { $response['success'] = true; if ($ajax_delete) { From 2f728f513b87ba0155fd3230eac73787214b356b Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Tue, 21 Jan 2025 11:30:49 +0530 Subject: [PATCH 09/50] Added: proper validations before deleteCartBookingData() calls --- .../admin/AdminHotelRoomsBookingController.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php index 6ff7606c1..dd9983e67 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php @@ -746,13 +746,13 @@ class AdminHotelRoomsBookingController extends ModuleAdminController } } else { // remove room from cart - $objHotelCartBookingData = new HotelCartBookingData($id_cart_book_data); - if ($objHotelCartBookingData->deleteCartBookingData( - 0, - $objHotelCartBookingData->id_product, - $objHotelCartBookingData->id_room, - $objHotelCartBookingData->date_from, - $objHotelCartBookingData->date_to + if ((Validate::isLoadedObject($objHotelCartBookingData = new HotelCartBookingData((int) $id_cart_book_data))) + && $objHotelCartBookingData->deleteCartBookingData( + 0, + $objHotelCartBookingData->id_product, + $objHotelCartBookingData->id_room, + $objHotelCartBookingData->date_from, + $objHotelCartBookingData->date_to )) { $response['success'] = true; if ($ajax_delete) { From 39b3dfbc8e6a89f3790475f9e0afd3a0e7a84071 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Tue, 21 Jan 2025 17:47:28 +0530 Subject: [PATCH 10/50] Updated: Parameters in 'actionRoomReallocateAfter' --- .../hotelreservationsystem/classes/HotelBookingDetail.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/hotelreservationsystem/classes/HotelBookingDetail.php b/modules/hotelreservationsystem/classes/HotelBookingDetail.php index 5686dad65..4357fc2a7 100644 --- a/modules/hotelreservationsystem/classes/HotelBookingDetail.php +++ b/modules/hotelreservationsystem/classes/HotelBookingDetail.php @@ -1872,6 +1872,7 @@ class HotelBookingDetail extends ObjectModel $reallocatedBookingId = 0; // get the cart booking data for the given booking if (Validate::isLoadedObject($objOldHotelBooking = new HotelBookingDetail($idHotelBooking))) { + $objectHotelbookingFrom = $objOldHotelBooking; $objHotelRoomInfo = new HotelRoomInformation($idRoom); $idNewRoomType = $objHotelRoomInfo->id_product; if ($objOldHotelBooking->id_product != $idNewRoomType) { @@ -2098,6 +2099,7 @@ class HotelBookingDetail extends ObjectModel if ($result &= $objBookingDetail->save()) { $reallocatedBookingId = $objBookingDetail->id; + $objectHotelbookingTo = $objBookingDetail; // Get Booking Demands of the old booking to add in the new booking creation $objBookingDemand = new HotelBookingDemands(); if ($oldBookingDemands = $objBookingDemand->getRoomTypeBookingExtraDemands( @@ -2278,6 +2280,7 @@ class HotelBookingDetail extends ObjectModel $result &= $objOldHotelBooking->save(); $reallocatedBookingId = $objOldHotelBooking->id; + $objectHotelbookingTo = $objOldHotelBooking; } if ($result && $reallocatedBookingId) { @@ -2286,6 +2289,8 @@ class HotelBookingDetail extends ObjectModel array( 'id_htl_booking_from' => $idHotelBooking, 'id_htl_booking_to' => $reallocatedBookingId, + 'objectHotelbookingFrom' => $objOldHotelBooking, + 'objectHotelbookingTo' => $objBookingDetail, ) ); From 9da53bd8321d24279cd80e43fd87d0c80f1b5359 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Wed, 22 Jan 2025 15:13:00 +0530 Subject: [PATCH 11/50] Fixed: search panel on landing page does not displays properly if there are any issues in the jquery --- .../classes/WkRoomSearchHelper.php | 15 +++++++++++++ .../views/js/wk-room-search-block.js | 17 --------------- .../templates/hook/landingPageSearch.tpl | 2 +- .../views/templates/hook/searchForm.tpl | 21 +++++++------------ 4 files changed, 23 insertions(+), 32 deletions(-) diff --git a/modules/wkroomsearchblock/classes/WkRoomSearchHelper.php b/modules/wkroomsearchblock/classes/WkRoomSearchHelper.php index 9f90bf623..8a0c2335e 100644 --- a/modules/wkroomsearchblock/classes/WkRoomSearchHelper.php +++ b/modules/wkroomsearchblock/classes/WkRoomSearchHelper.php @@ -264,6 +264,21 @@ class WkRoomSearchHelper )); } + $totalColumns = 9;// min value + if ($locationEnabled) { + $totalColumns += 4; + } + + if (!(count($hotelsInfo) <= 1 && !$smartyVars['show_hotel_name'])) { + $totalColumns += 5; + } + + if (Configuration::get('PS_FRONT_SEARCH_TYPE') == HotelBookingDetail::SEARCH_TYPE_OWS) { + $totalColumns += 4; + } + + $smartyVars['total_columns'] = $totalColumns; + Context::getContext()->smarty->assign($smartyVars); } } diff --git a/modules/wkroomsearchblock/views/js/wk-room-search-block.js b/modules/wkroomsearchblock/views/js/wk-room-search-block.js index 36d0a4205..e18babcb7 100644 --- a/modules/wkroomsearchblock/views/js/wk-room-search-block.js +++ b/modules/wkroomsearchblock/views/js/wk-room-search-block.js @@ -337,23 +337,6 @@ const BookingSearchManager = { return true; }, } -function updateGridColumns() { - const gridContainer = $('#search_hotel_block_form > .grid'); - $(gridContainer).each(function() { - const gridItems = $(this).find('div.grid-item'); - let totalColumns = 0; - - Array.from(gridItems).forEach(item => { - totalColumns += parseInt(getComputedStyle(item).getPropertyValue('--col-span')); - }); - - $(this).css('grid-template-columns', `repeat(${totalColumns}, 1fr)`); - - Array.from(gridItems).forEach(item => { - item.style.gridColumn = `span ${getComputedStyle(item).getPropertyValue('--col-span')}`; - }); - }) -} $(document).ready(function() { // initialize booking search fields diff --git a/modules/wkroomsearchblock/views/templates/hook/landingPageSearch.tpl b/modules/wkroomsearchblock/views/templates/hook/landingPageSearch.tpl index 0849db558..e1173253d 100644 --- a/modules/wkroomsearchblock/views/templates/hook/landingPageSearch.tpl +++ b/modules/wkroomsearchblock/views/templates/hook/landingPageSearch.tpl @@ -23,7 +23,7 @@ {if isset($hotels_info) && count($hotels_info)}
-
+ diff --git a/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl b/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl index d7f89bc11..087033914 100644 --- a/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl +++ b/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl @@ -20,10 +20,10 @@
{hook h='displaySearchFormFieldsBefore'} {block name="search_form_fields_wrapper"} -
+
{block name='search_form_location'} {if isset($location_enabled) && $location_enabled} -
+
@@ -40,7 +40,7 @@ {else} -
+
@@ -60,7 +60,7 @@ {block name='search_form_dates'} {if isset($multiple_dates_input) && $multiple_dates_input} -
+
{l s='Check-in' mod='wkroomsearchblock'}
@@ -71,7 +71,7 @@
{else} -
+
{l s='Check-in' mod='wkroomsearchblock'}    {l s='Check-out' mod='wkroomsearchblock'}
@@ -81,7 +81,7 @@ {block name='search_form_occupancy'} {if isset($is_occupancy_wise_search) && $is_occupancy_wise_search} -
+
@@ -244,10 +244,3 @@
{/block} - From bfebb9a54371f2ebe51800e06e19497c4fa70b85 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Tue, 28 Jan 2025 17:08:53 +0530 Subject: [PATCH 12/50] Fixed: The room price is not shown correcly in case a new room is added in the order, and same auto added service exists for the both rooms --- classes/pdf/HTMLTemplateInvoice.php | 76 +++++++++++++++-------------- 1 file changed, 39 insertions(+), 37 deletions(-) diff --git a/classes/pdf/HTMLTemplateInvoice.php b/classes/pdf/HTMLTemplateInvoice.php index 8545e408d..71ec02c27 100644 --- a/classes/pdf/HTMLTemplateInvoice.php +++ b/classes/pdf/HTMLTemplateInvoice.php @@ -379,9 +379,6 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate $cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl'] = $data_v['total_price_tax_excl']/$num_days; $cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl'] = $data_v['total_price_tax_excl']/$num_days; - $cart_htl_data[$type_key]['date_diff'][$date_join]['avg_paid_unit_price_tax_excl'] += $cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl']; - - $cart_htl_data[$type_key]['date_diff'][$date_join]['amount'] += ($data_v['total_price_tax_excl']); // For order refund $cart_htl_data[$type_key]['date_diff'][$date_join]['id_room'] = $data_v['id_room']; @@ -443,33 +440,6 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate 0 ); - $cart_htl_data[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_ti'] = $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( - $order_obj->id, - 0, - 0, - $data_v['id_product'], - $data_v['date_from'], - $data_v['date_to'], - 0, - 1, - 1, - 1, - Product::PRICE_ADDITION_TYPE_WITH_ROOM - ); - $cart_htl_data[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_te'] = $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( - $order_obj->id, - 0, - 0, - $data_v['id_product'], - $data_v['date_from'], - $data_v['date_to'], - 0, - 1, - 0, - 1, - Product::PRICE_ADDITION_TYPE_WITH_ROOM - ); - $num_days = $obj_htl_bk_dtl->getNumberOfDays($data_v['date_from'], $data_v['date_to']); $cart_htl_data[$type_key]['date_diff'][$date_join]['num_rm'] = 1; @@ -480,18 +450,44 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate $cart_htl_data[$type_key]['date_diff'][$date_join]['adults'] = $data_v['adults']; $cart_htl_data[$type_key]['date_diff'][$date_join]['children'] = $data_v['children']; - - $cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl'] = $data_v['total_price_tax_excl']/$num_days; - $cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl'] = $data_v['total_price_tax_excl']/$num_days; - $cart_htl_data[$type_key]['date_diff'][$date_join]['avg_paid_unit_price_tax_excl'] = $cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl'] + ($cart_htl_data[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_te']/$num_days); - - $cart_htl_data[$type_key]['date_diff'][$date_join]['amount'] = ($data_v['total_price_tax_excl'] + $cart_htl_data[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_te']); - + $cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl'] = 0; + $cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl'] = 0; + $cart_htl_data[$type_key]['date_diff'][$date_join]['amount'] = 0; // For order refund $cart_htl_data[$type_key]['date_diff'][$date_join]['id_room'] = $data_v['id_room']; $totalDemandsPriceTE += $cart_htl_data[$type_key]['date_diff'][$date_join]['extra_demands_price_te']; $totalDemandsPriceTI += $cart_htl_data[$type_key]['date_diff'][$date_join]['extra_demands_price_ti']; } + + $cart_htl_data[$type_key]['date_diff'][$date_join]['total_price_tax_excl'] += $data_v['total_price_tax_excl']; + $cart_htl_data[$type_key]['date_diff'][$date_join]['total_price_tax_incl'] += $data_v['total_price_tax_incl']; + $cart_htl_data[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_ti'] += $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( + $order_obj->id, + 0, + 0, + $data_v['id_product'], + $data_v['date_from'], + $data_v['date_to'], + $data_v['id_room'], + 1, + 1, + 1, + Product::PRICE_ADDITION_TYPE_WITH_ROOM + ); + $cart_htl_data[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_te'] += $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts( + $order_obj->id, + 0, + 0, + $data_v['id_product'], + $data_v['date_from'], + $data_v['date_to'], + $data_v['id_room'], + 1, + 0, + 1, + Product::PRICE_ADDITION_TYPE_WITH_ROOM + ); + if ($extraDemands = $objBookingDemand->getRoomTypeBookingExtraDemands( $order_obj->id, $type_value['product_id'], @@ -537,6 +533,12 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate } } + foreach ($cart_htl_data[$type_key]['date_diff'] as $date_join => $val) { + $cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl'] = $val['total_price_tax_excl']; + $cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_incl'] = $val['total_price_tax_excl']; + $cart_htl_data[$type_key]['date_diff'][$date_join]['amount'] += ($val['total_price_tax_excl'] + $cart_htl_data[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_te']); + $cart_htl_data[$type_key]['date_diff'][$date_join]['avg_paid_unit_price_tax_excl'] += $cart_htl_data[$type_key]['date_diff'][$date_join]['paid_unit_price_tax_excl'] + ($cart_htl_data[$type_key]['date_diff'][$date_join]['additional_services_price_auto_add_te']/$num_days); + } // calculate averages now foreach ($cart_htl_data[$type_key]['date_diff'] as $key => &$value) { $value['avg_paid_unit_price_tax_excl'] = Tools::ps_round($value['avg_paid_unit_price_tax_excl'] / $value['num_rm'], 6); From 39b366ae3bc1653831af5b88bc3fcfc6297c8047 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Tue, 28 Jan 2025 17:09:21 +0530 Subject: [PATCH 13/50] Fixed: Extra services tax not being displyed properly in invoice --- .../classes/RoomTypeServiceProductOrderDetail.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/hotelreservationsystem/classes/RoomTypeServiceProductOrderDetail.php b/modules/hotelreservationsystem/classes/RoomTypeServiceProductOrderDetail.php index d8a236f66..2d7059469 100644 --- a/modules/hotelreservationsystem/classes/RoomTypeServiceProductOrderDetail.php +++ b/modules/hotelreservationsystem/classes/RoomTypeServiceProductOrderDetail.php @@ -239,6 +239,13 @@ class RoomTypeServiceProductOrderDetail extends ObjectModel $totalPrice += $product['total_price_tax_excl']; } } else { + $taxes = OrderDetailCore::getTaxListStatic($product['id_order_detail']); + $tax_temp = array(); + foreach ($taxes as $tax) { + $obj = new Tax($tax['id_tax']); + $tax_temp[] = sprintf('%1$s%2$s%%', ($obj->rate + 0), ' '); + } + $product_tax_label = implode(', ', $tax_temp); if (isset($selectedAdditionalServices['additional_services'])) { $selectedAdditionalServices['total_price_tax_excl'] += $product['total_price_tax_excl']; $selectedAdditionalServices['total_price_tax_incl'] += $product['total_price_tax_incl']; @@ -257,6 +264,7 @@ class RoomTypeServiceProductOrderDetail extends ObjectModel 'unit_price_tax_incl' => $product['unit_price_tax_incl'], 'total_price_tax_excl' => $product['total_price_tax_excl'], 'total_price_tax_incl' => $product['total_price_tax_incl'], + 'product_tax_label' => $product_tax_label, ); } else { $selectedAdditionalServices['id_order'] = $product['id_order']; @@ -282,6 +290,7 @@ class RoomTypeServiceProductOrderDetail extends ObjectModel 'unit_price_tax_incl' => $product['unit_price_tax_incl'], 'total_price_tax_excl' => $product['total_price_tax_excl'], 'total_price_tax_incl' => $product['total_price_tax_incl'], + 'product_tax_label' => $product_tax_label, ), ); } From b3e27b87163343e04748f133cfac9de9981d3147 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Tue, 28 Jan 2025 17:10:42 +0530 Subject: [PATCH 14/50] Fixed: new invoices are created every time a new room is added in the order --- .../template/controllers/orders/modals/_add_room_booking.tpl | 2 +- controllers/admin/AdminOrdersController.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/admin/themes/default/template/controllers/orders/modals/_add_room_booking.tpl b/admin/themes/default/template/controllers/orders/modals/_add_room_booking.tpl index d15493a00..11c7f1b0e 100644 --- a/admin/themes/default/template/controllers/orders/modals/_add_room_booking.tpl +++ b/admin/themes/default/template/controllers/orders/modals/_add_room_booking.tpl @@ -127,7 +127,7 @@
{if sizeof($invoices_collection)} -
+