diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 7d9ec153e..30bd234cc 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -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.'); diff --git a/modules/hotelreservationsystem/classes/HotelBookingDetail.php b/modules/hotelreservationsystem/classes/HotelBookingDetail.php index c6800f09d..1fe761d73 100644 --- a/modules/hotelreservationsystem/classes/HotelBookingDetail.php +++ b/modules/hotelreservationsystem/classes/HotelBookingDetail.php @@ -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; diff --git a/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php b/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php index 8076b8af6..c6a9321b5 100644 --- a/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php +++ b/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php @@ -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']); } } } diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php index afe9b5534..3203d74e2 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php @@ -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.');