diff --git a/controllers/front/CategoryController.php b/controllers/front/CategoryController.php index 026ae648a..e8f9bd674 100644 --- a/controllers/front/CategoryController.php +++ b/controllers/front/CategoryController.php @@ -181,7 +181,23 @@ class CategoryControllerCore extends FrontController $booking_data = $objBookingDetail->dataForFrontSearch($bookingParams); + // set default occupancies in required format + if (isset($booking_data['rm_data']) && $booking_data['rm_data']) { + foreach ($booking_data['rm_data'] as &$roomTypeData) { + $occupancy = array( + array( + 'adults' => $roomTypeData['adults'], + 'children' => 0, + 'child_ages' => array(), + ), + ); + $roomTypeData['occupancies'] = $occupancy; + $roomTypeData['occupancy_adults'] = $roomTypeData['adults']; // only one room by default + $roomTypeData['occupancy_children'] = 0; + $roomTypeData['occupancy_child_ages'] = 0; + } + } $obj_booking_detail = new HotelBookingDetail(); $num_days = $obj_booking_detail->getNumberOfDays($date_from, $date_to); diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php index 6146e43f4..4456e5525 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php @@ -767,6 +767,21 @@ class AdminHotelRoomsBookingController extends ModuleAdminController $objHotelRoomType = new HotelRoomType(); foreach ($booking_data['rm_data'] as $key_bk_data => $value_bk_data) { $booking_data['rm_data'][$key_bk_data]['room_type_info'] = $objHotelRoomType->getRoomTypeInfoByIdProduct($value_bk_data['id_product']); + + // set default occupancies in required format + $occupancy = array( + array( + 'adults' => $value_bk_data['adults'], + 'children' => 0, + 'child_ages' => array(), + ), + ); + + $booking_data['rm_data'][$key_bk_data]['occupancies'] = $occupancy; + $booking_data['rm_data'][$key_bk_data]['occupancy_adults'] = $booking_data['rm_data'][$key_bk_data]['adults']; // only one room by default + $booking_data['rm_data'][$key_bk_data]['occupancy_children'] = 0; + $booking_data['rm_data'][$key_bk_data]['occupancy_child_ages'] = 0; + if (isset($value_bk_data['data']['booked']) && $value_bk_data['data']['booked']) { foreach ($value_bk_data['data']['booked'] as $booked_k1 => $booked_v1) { if (isset($booked_v1['detail']) && $booked_v1['detail']) { diff --git a/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/_partials/booking-rooms.tpl b/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/_partials/booking-rooms.tpl index 21f4c0e7b..98c53e733 100644 --- a/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/_partials/booking-rooms.tpl +++ b/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/_partials/booking-rooms.tpl @@ -56,39 +56,77 @@