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 += '