Merge pull request #1618 from amitsharma322/gli-2894

Added: Ensured that all order bills are cleared before the last room is checked out.
This commit is contained in:
Rohit Jain
2026-04-28 13:12:37 +05:30
committed by GitHub
2 changed files with 63 additions and 27 deletions

View File

@@ -8721,30 +8721,49 @@ 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);
$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 ($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 {
$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 {

View File

@@ -2679,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);
}
/**