From 64d385c16253b403c9c6bb87c809e1e12bbe27ea Mon Sep 17 00:00:00 2001 From: Amit sharma Date: Tue, 16 Dec 2025 11:17:07 +0530 Subject: [PATCH 1/2] Added: Ensured that complete order bills are cleared before the last room is checked out. --- controllers/admin/AdminOrdersController.php | 54 +++++++++++-------- .../classes/HotelBookingDetail.php | 15 ++++++ 2 files changed, 47 insertions(+), 22 deletions(-) diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index cd2874dba..23897e713 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -8714,30 +8714,40 @@ class AdminOrdersControllerCore extends AdminController } if (empty($this->errors)) { - $objHotelBookingDetail->id_status = $newStatus; - if ($newStatus == HotelBookingDetail::STATUS_CHECKED_IN) { - $objHotelBookingDetail->check_in = $statusDate; - } elseif ($newStatus == HotelBookingDetail::STATUS_CHECKED_OUT) { - $objHotelBookingDetail->check_out = $statusDate; - } else { - $objHotelBookingDetail->check_in = ''; - $objHotelBookingDetail->check_out = ''; - } - if ($objHotelBookingDetail->save()) { - Hook::exec( - 'actionRoomBookingStatusUpdateAfter', - array( - 'id_hotel_booking_detail' => $objHotelBookingDetail->id, - 'id_order' => $objHotelBookingDetail->id_order, - 'id_room' => $objHotelBookingDetail->id_room, - 'date_from' => $objHotelBookingDetail->date_from, - 'date_to' => $objHotelBookingDetail->date_to - ) - ); - Tools::redirectAdmin(self::$currentIndex.'&id_order='.(int) $objHotelBookingDetail->id_order.'&vieworder&token='.$this->token.'&conf=4'); + $id_order = $objHotelBookingDetail->id_order; + $order = new Order($id_order); + $activeRooms = $objHotelBookingDetail->getActiveRoomsCountByOrder($id_order); + $hasPendingBills = $order->getTotalPaid() < $order->getOrderTotal(); + + if ($activeRooms == 1 && $newStatus == HotelBookingDetail::STATUS_CHECKED_OUT && $hasPendingBills) { + $this->errors[] = Tools::displayError('You cannot checkout the last room while there are pending bills for this order.'); } else { - $this->errors[] = Tools::displayError('Some error occurred. Please try again.'); + $objHotelBookingDetail->id_status = $newStatus; + if ($newStatus == HotelBookingDetail::STATUS_CHECKED_IN) { + $objHotelBookingDetail->check_in = $statusDate; + } elseif ($newStatus == HotelBookingDetail::STATUS_CHECKED_OUT) { + $objHotelBookingDetail->check_out = $statusDate; + } else { + $objHotelBookingDetail->check_in = ''; + $objHotelBookingDetail->check_out = ''; + } + if ($objHotelBookingDetail->save()) { + Hook::exec( + 'actionRoomBookingStatusUpdateAfter', + array( + 'id_hotel_booking_detail' => $objHotelBookingDetail->id, + 'id_order' => $objHotelBookingDetail->id_order, + 'id_room' => $objHotelBookingDetail->id_room, + 'date_from' => $objHotelBookingDetail->date_from, + 'date_to' => $objHotelBookingDetail->date_to + ) + ); + + Tools::redirectAdmin(self::$currentIndex . '&id_order=' . (int) $objHotelBookingDetail->id_order . '&vieworder&token=' . $this->token . '&conf=4'); + } else { + $this->errors[] = Tools::displayError('Some error occurred. Please try again.'); + } } } } else { diff --git a/modules/hotelreservationsystem/classes/HotelBookingDetail.php b/modules/hotelreservationsystem/classes/HotelBookingDetail.php index ce5ce56b2..81fae1482 100644 --- a/modules/hotelreservationsystem/classes/HotelBookingDetail.php +++ b/modules/hotelreservationsystem/classes/HotelBookingDetail.php @@ -2591,6 +2591,21 @@ class HotelBookingDetail extends ObjectModel return Db::getInstance()->executeS($sql); } + public function getActiveRoomsCountByOrder($id_order) + { + $sql = 'SELECT COUNT(*) + FROM `'._DB_PREFIX_.'htl_booking_detail` + WHERE `id_order` = '.(int)$id_order.' + AND `is_refunded` = 0 + AND `is_back_order` = 0 + AND `id_status` IN (' + .HotelBookingDetail::STATUS_CHECKED_IN.','. + HotelBookingDetail::STATUS_ALLOTED.' + )'; + + return (int) Db::getInstance()->getValue($sql); + } + public function updateHotelCartHotelOrderOnOrderEdit( $idOrder, $idRoom, From b587095c61199ba02d89d349e60f5451d077f8d5 Mon Sep 17 00:00:00 2001 From: Amit sharma Date: Mon, 20 Apr 2026 13:02:14 +0530 Subject: [PATCH 2/2] fix: prevent last room checkout when order payment is pending --- controllers/admin/AdminOrdersController.php | 13 +++++- .../classes/HotelBookingDetail.php | 42 ++++++++++--------- 2 files changed, 33 insertions(+), 22 deletions(-) diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index a92b0b19c..4d0fdf71b 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -8724,10 +8724,19 @@ class AdminOrdersControllerCore extends AdminController $id_order = $objHotelBookingDetail->id_order; $order = new Order($id_order); - $activeRooms = $objHotelBookingDetail->getActiveRoomsCountByOrder($id_order); + $remainingCheckoutRooms = 0; + if ($newStatus == HotelBookingDetail::STATUS_CHECKED_OUT) { + $orderBookings = $objHotelBookingDetail->getOrderCurrentDataByOrderId( + $id_order, + array(HotelBookingDetail::STATUS_ALLOTED, HotelBookingDetail::STATUS_CHECKED_IN), + 0, + 0 + ); + $remainingCheckoutRooms = count($orderBookings); + } $hasPendingBills = $order->getTotalPaid() < $order->getOrderTotal(); - if ($activeRooms == 1 && $newStatus == HotelBookingDetail::STATUS_CHECKED_OUT && $hasPendingBills) { + if ($remainingCheckoutRooms == 1 && $newStatus == HotelBookingDetail::STATUS_CHECKED_OUT && $hasPendingBills) { $this->errors[] = Tools::displayError('You cannot checkout the last room while there are pending bills for this order.'); } else { $objHotelBookingDetail->id_status = $newStatus; diff --git a/modules/hotelreservationsystem/classes/HotelBookingDetail.php b/modules/hotelreservationsystem/classes/HotelBookingDetail.php index d0f14aeff..db9dfeb54 100644 --- a/modules/hotelreservationsystem/classes/HotelBookingDetail.php +++ b/modules/hotelreservationsystem/classes/HotelBookingDetail.php @@ -2608,21 +2608,6 @@ class HotelBookingDetail extends ObjectModel return Db::getInstance()->executeS($sql); } - public function getActiveRoomsCountByOrder($id_order) - { - $sql = 'SELECT COUNT(*) - FROM `'._DB_PREFIX_.'htl_booking_detail` - WHERE `id_order` = '.(int)$id_order.' - AND `is_refunded` = 0 - AND `is_back_order` = 0 - AND `id_status` IN (' - .HotelBookingDetail::STATUS_CHECKED_IN.','. - HotelBookingDetail::STATUS_ALLOTED.' - )'; - - return (int) Db::getInstance()->getValue($sql); - } - public function updateHotelCartHotelOrderOnOrderEdit( $idOrder, $idRoom, @@ -2694,14 +2679,31 @@ class HotelBookingDetail extends ObjectModel /** * [getOrderCurrentDataByOrderId :: To get booking information of the order by Order id]. - * @param [int] $id_order [Id of the order] + * @param int $idOrder Id of the order + * @param array $idsStatus Booking statuses to filter by + * @param bool $isRefunded refunded bookings from the result + * @param bool $isBackOrder back-order bookings from the result * @return [array|false] [If data found Returns the array containing the information of the cart of the passed order id else returns false] */ - public function getOrderCurrentDataByOrderId($id_order) + public function getOrderCurrentDataByOrderId( + $idOrder, + $idsStatus = array(), + $isRefunded = null, + $isBackOrder = null + ) { - return Db::getInstance()->executeS( - 'SELECT * FROM `'._DB_PREFIX_.'htl_booking_detail` WHERE `id_order`='.(int)$id_order - ); + $sql = 'SELECT * FROM `'._DB_PREFIX_.'htl_booking_detail` WHERE `id_order`='.(int) $idOrder; + if (!empty($idsStatus)) { + $sql .= ' AND `id_status` IN ('.implode(',', array_map('intval', $idsStatus)).')'; + } + if (!is_null($isRefunded)) { + $sql .= ' AND `is_refunded` = '.(int) $isRefunded; + } + if (!is_null($isBackOrder)) { + $sql .= ' AND `is_back_order` = '.(int) $isBackOrder; + } + + return Db::getInstance()->executeS($sql); } /**