Merge branch 'develop' into gli-2961

This commit is contained in:
azhar bhat
2026-04-29 17:37:41 +05:30
50 changed files with 3038 additions and 806 deletions

View File

@@ -786,6 +786,8 @@ class AdminOrdersControllerCore extends AdminController
'order' => $objOrder,
'current_index' => self::$currentIndex,
'hotel_order_status' => $htlOrderStatus,
'ROOM_STATUS_ALLOTED' => HotelBookingDetail::STATUS_ALLOTED,
'current_room_status' => Tools::getValue('current_room_status')
)
);
$modal = array(
@@ -8723,30 +8725,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 {