diff --git a/admin/themes/default/sass/controllers/_order.sass b/admin/themes/default/sass/controllers/_order.sass index a516c46c3..f0e6929db 100644 --- a/admin/themes/default/sass/controllers/_order.sass +++ b/admin/themes/default/sass/controllers/_order.sass @@ -3,3 +3,8 @@ #customization_list border: 0px + +.booking_occupancy + .booking_occupancy_wrapper + max-height: 250px + overflow-x: auto \ No newline at end of file diff --git a/admin/themes/default/template/controllers/orders/_new_product.tpl b/admin/themes/default/template/controllers/orders/_new_product.tpl index 141e9e68b..b5b6224fe 100644 --- a/admin/themes/default/template/controllers/orders/_new_product.tpl +++ b/admin/themes/default/template/controllers/orders/_new_product.tpl @@ -121,8 +121,8 @@ +
-
{l s='Add Room'} diff --git a/controllers/admin/AdminStatsController.php b/controllers/admin/AdminStatsController.php index 693b8ce0f..500227779 100644 --- a/controllers/admin/AdminStatsController.php +++ b/controllers/admin/AdminStatsController.php @@ -1184,7 +1184,7 @@ class AdminStatsControllerCore extends AdminStatsTabController public static function getNewBookingsInfoByDate($date, $idHotel = null) { $sql = 'SELECT hbd.`id_customer`, CONCAT(c.`firstname`, " ", c.`lastname`) AS customer_name, - COUNT(hbd.`id`) AS total_rooms, SUM(hbd.`adult` + hbd.`children`) AS total_guests, + COUNT(hbd.`id`) AS total_rooms, SUM(hbd.`adults` + hbd.`children`) AS total_guests, hbd.`id_hotel`, hbd.`hotel_name`, hbd.`id_order`, o.`total_paid_tax_excl`, o.`id_currency`, osl.`name` AS `state_name` FROM `'._DB_PREFIX_.'htl_booking_detail` hbd LEFT JOIN `'._DB_PREFIX_.'orders` o ON (o.`id_order` = hbd.`id_order`) @@ -1203,7 +1203,7 @@ class AdminStatsControllerCore extends AdminStatsTabController { $sql = 'SELECT orr.`id_order_return`, orr.`id_customer`, hbd.`room_num`, hbd.`id_product`, hbd.`room_type_name`, CONCAT(c.`firstname`, " ", c.`lastname`) AS customer_name, - hbd.`id_hotel`, hbd.`hotel_name`, SUM(hbd.`adult` + hbd.`children`) AS total_guests, + hbd.`id_hotel`, hbd.`hotel_name`, SUM(hbd.`adults` + hbd.`children`) AS total_guests, hbd.`date_from`, hbd.`date_to`, orr.`id_order` FROM `'._DB_PREFIX_.'order_return` orr LEFT JOIN `'._DB_PREFIX_.'order_return_detail` ord ON (ord.`id_order_return` = orr.`id_order_return`) diff --git a/js/admin/orders.js b/js/admin/orders.js index 0c8584b0f..6ce53d8b9 100644 --- a/js/admin/orders.js +++ b/js/admin/orders.js @@ -587,7 +587,7 @@ function init() if ($('.booking_occupancy_wrapper:visible').length) { var occupancy_wrapper = $('.booking_occupancy_wrapper:visible'); $(occupancy_wrapper).find(".occupancy_info_block").addClass('selected'); - if (!($(e.target).closest(".booking_occupancy_wrapper").length || $(e.target).closest(".booking_guest_occupancy").length || $(e.target).closest(".ajax_add_to_cart_button").length || $(e.target).closest(".exclusive.book_now_submit").length)) { + if (!($(e.target).closest(".booking_occupancy_wrapper").length || $(e.target).closest(".booking_guest_occupancy").length || $(e.target).closest(".ajax_add_to_cart_button").length || $(e.target).closest(".exclusive.book_now_submit").length || $(e.target).closest(".remove-room-link").length)) { let hasErrors = 0; let adults = $(occupancy_wrapper).find(".num_adults").map(function(){return $(this).val();}).get(); @@ -669,8 +669,8 @@ function init() occupancy_block += '
'; occupancy_block += ''; occupancy_block += ''; + occupancy_block += '
'; occupancy_block += ''; - occupancy_block += '
'; $(booking_occupancy_wrapper).find('.booking_occupancy_inner').append(occupancy_block); setRoomTypeGuestOccupancy(booking_occupancy_wrapper); diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php index fdeed4393..7d8657975 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php @@ -421,7 +421,7 @@ class AdminHotelRoomsBookingController extends ModuleAdminController $bookingParams = array(); $bookingParams['hotel_id'] = $searchIdHotel; - $bookingParams['room_type'] = $searchIdRoomType; + $bookingParams['id_room_type'] = $searchIdRoomType; $bookingParams['adults'] = $adults; $bookingParams['children'] = $children; $bookingParams['num_rooms'] = $num_rooms; diff --git a/modules/hotelreservationsystem/views/css/HotelReservationAdmin.css b/modules/hotelreservationsystem/views/css/HotelReservationAdmin.css index 95ae44305..1b4fa5d5f 100644 --- a/modules/hotelreservationsystem/views/css/HotelReservationAdmin.css +++ b/modules/hotelreservationsystem/views/css/HotelReservationAdmin.css @@ -141,6 +141,10 @@ a.deleteHtlImage { padding-top: 30px; } +.booking_occupancy_wrapper { + max-height: 250px; + overflow-x: auto; +} .bg-green { background-color: #7EC77B; diff --git a/themes/hotel-reservation-theme/js/occupancy.js b/themes/hotel-reservation-theme/js/occupancy.js index 771132da6..f3679b234 100644 --- a/themes/hotel-reservation-theme/js/occupancy.js +++ b/themes/hotel-reservation-theme/js/occupancy.js @@ -23,11 +23,18 @@ $(document).ready(function(){ e.preventDefault(); booking_occupancy_inner = $(this).closest('.booking_occupancy_inner'); - $(this).closest('.occupancy_info_block').remove(); - $(booking_occupancy_inner).find('.room_num_wrapper').each(function(key, val) { - $(this).text(room_txt + ' - '+ (key+1) ); + var booking_occupancy_wrapper = $(this).closest('.booking_occupancy_wrapper'); + $(this).closest('.occupancy_info_block').hide('fast', function(){ + $(this).remove() + $(booking_occupancy_inner).find('.room_num_wrapper').each(function(key, val) { + $(this).text(room_txt + ' - '+ (key+1) ); + }); + var countRooms = parseInt($(booking_occupancy_wrapper).find('.occupancy_info_block').length); + if (countRooms < $(booking_occupancy_wrapper).find('.max_avail_type_qty').val()) { + $(booking_occupancy_wrapper).find('.add_new_occupancy_btn').show(); + } + setRoomTypeGuestOccupancy($(booking_occupancy_inner).closest('.booking_occupancy_wrapper')); }); - setRoomTypeGuestOccupancy($(booking_occupancy_inner).closest('.booking_occupancy_wrapper')); }); $(document).on('click', '.booking_occupancy_wrapper .occupancy_quantity_up', function(e) { @@ -125,7 +132,7 @@ $(document).ready(function(){ var occupancy_wrapper = $('.booking_occupancy_wrapper:visible'); $(occupancy_wrapper).find(".occupancy_info_block").addClass('selected'); setRoomTypeGuestOccupancy(occupancy_wrapper); - if (!($(e.target).closest(".booking_occupancy_wrapper").length || $(e.target).closest(".booking_guest_occupancy").length || $(e.target).closest(".ajax_add_to_cart_button").length || $(e.target).closest(".exclusive.book_now_submit").length)) { + if (!($(e.target).closest(".booking_occupancy_wrapper").length || $(e.target).closest(".booking_guest_occupancy").length || $(e.target).closest(".ajax_add_to_cart_button").length || $(e.target).closest(".exclusive.book_now_submit").length || $(e.target).closest(".remove-room-link").length)) { let hasErrors = 0; let adults = $(occupancy_wrapper).find(".num_adults").map(function(){return $(this).val();}).get(); @@ -187,7 +194,7 @@ $(document).ready(function(){ if ($(booking_occupancy_wrapper).find('.max_avail_type_qty').val() > 0 && countRooms <= $(booking_occupancy_wrapper).find('.max_avail_type_qty').val() ) { - occupancy_block += '
'; + occupancy_block += '