Fixed: issues in reallocation allotment and rounding in auto add services

This commit is contained in:
Sumit Panwar
2024-09-06 10:22:38 +05:30
parent d5ed2b1110
commit 09ecd3df0a
4 changed files with 7 additions and 15 deletions

View File

@@ -1187,11 +1187,7 @@ class AdminOrdersControllerCore extends AdminController
if (!count($this->errors)) {
// Finally, reallocate the room
if ($reallocatedBookingId = $objBookingDetail->reallocateBooking($idHtlBookingFrom, $idRoomToReallocate, $priceDiff)) {
$objHtlBookingDetail = new HotelBookingDetail($reallocatedBookingId);
$objHtlBookingDetail->comment = $this->l('Room manually reallocated.');
$objHtlBookingDetail->save();
if ($objBookingDetail->reallocateBooking($idHtlBookingFrom, $idRoomToReallocate, $priceDiff)) {
Tools::redirectAdmin(self::$currentIndex.'&id_order='.(int) $idOrder.'&vieworder&conf=52&token='.$this->token);
} else {
$this->errors[] = $this->l('Some error occured. Please try again.');

View File

@@ -1996,7 +1996,8 @@ class HotelBookingDetail extends ObjectModel
$objCartBookingData->id_product = $roomInfo['id_product'];
$objCartBookingData->id_room = $roomInfo['id_room'];
$objCartBookingData->id_hotel = $roomInfo['id_hotel'];
$objCartBookingData->booking_type = Self::ALLOTMENT_MANUAL;
$objCartBookingData->booking_type = $objOldHotelBooking->booking_type;
$objCartBookingData->comment = $objOldHotelBooking->comment;
$objCartBookingData->quantity = $productQty;
$objCartBookingData->date_from = $objOldHotelBooking->date_from;
$objCartBookingData->date_to = $objOldHotelBooking->date_to;
@@ -2083,9 +2084,9 @@ class HotelBookingDetail extends ObjectModel
$objBookingDetail->id_hotel = $objCartBookingData->id_hotel;
$objBookingDetail->id_customer = $objOrder->id_customer;
$objBookingDetail->booking_type = $objCartBookingData->booking_type;
$objBookingDetail->comment = $objCartBookingData->comment;
$objBookingDetail->id_status = 1;
$objBookingDetail->room_type_name = Product::getProductName($idNewRoomType, null, $objOrder->id_lang);
$objBookingDetail->date_from = $objCartBookingData->date_from;
$objBookingDetail->date_to = $objCartBookingData->date_to;
$objBookingDetail->adults = $objCartBookingData->adults;
@@ -2303,7 +2304,6 @@ class HotelBookingDetail extends ObjectModel
// update in the hotel booking detail table
$objOldHotelBooking->id_room = $idRoom;
$objOldHotelBooking->room_num = $objHotelRoomInfo->room_num;
$objOldHotelBooking->booking_type = Self::ALLOTMENT_MANUAL;
// set backorder to 0 as available reallocate rooms will always be free
$objOldHotelBooking->is_back_order = 0;

View File

@@ -729,7 +729,7 @@ class HotelRoomTypeFeaturePricing extends ObjectModel
$use_reduc
)) {
foreach($servicesWithTax as $service) {
$totalPrice['total_price_tax_incl'] += $service['price'];
$totalPrice['total_price_tax_incl'] += Tools::processPriceRounding($service['price']);
}
}
if ($servicesWithoutTax = RoomTypeServiceProduct::getAutoAddServices(
@@ -743,7 +743,7 @@ class HotelRoomTypeFeaturePricing extends ObjectModel
$use_reduc
)) {
foreach($servicesWithoutTax as $service) {
$totalPrice['total_price_tax_excl'] += $service['price'];
$totalPrice['total_price_tax_excl'] += Tools::processPriceRounding($service['price']);
}
}
}

View File

@@ -210,11 +210,7 @@ class AdminHotelRoomsBookingController extends ModuleAdminController
if (!count($this->errors)) {
// Finally, reallocate the room
if ($reallocatedBookingId = $objBookingDetail->reallocateBooking($idHtlBookingFrom, $idRoomToReallocate, $priceDiff)) {
$objHtlBookingDetail = new HotelBookingDetail($reallocatedBookingId);
$objHtlBookingDetail->comment = $this->l('Room manually reallocated.');
$objHtlBookingDetail->save();
if ($objBookingDetail->reallocateBooking($idHtlBookingFrom, $idRoomToReallocate, $priceDiff)) {
Tools::redirectAdmin(self::$currentIndex.'&id_order='.(int) $idOrder.'&vieworder&conf=52&token='.$this->token);
} else {
$this->errors[] = $this->l('Some error occured. Please try again.');