+
+
+
+
+
@@ -502,7 +612,7 @@
html += '';
html += '';
html += '
';
- html += '';
+ html += '';
html += ' | ';
html += '
';
html += '';
@@ -552,18 +662,6 @@
return true;
});
- $('[name="rooms_checkbox"]').on('change', function() {
- if ($(this).hasClass('select_all')) {
- $(this).addClass('unselect_all').removeClass('select_all');
- $('[name="bulk_update_room[]"]').prop('checked', true);
- } else {
- $(this).addClass('select_all').removeClass('unselect_all');
- $('[name="bulk_update_room[]"]').prop('checked', false);
- }
-
- BulkUpdateRoomModal.toggleBulkUpdateButton();
- })
-
// remove room row
$(document).on('click', '.remove-rooms-button', function(e) {
e.preventDefault();
@@ -824,7 +922,19 @@
BulkUpdateRoomModal.toggleBulkUpdateButton();
});
- $(document).on('change', 'select[name="bulk_update_room_status"]', function(){
+ $('[name="rooms_checkbox"]').on('change', function() {
+ if ($(this).hasClass('select_all')) {
+ $(this).addClass('unselect_all').removeClass('select_all');
+ $('[name="bulk_update_room[]"]').prop('checked', true);
+ } else {
+ $(this).addClass('select_all').removeClass('unselect_all');
+ $('[name="bulk_update_room[]"]').prop('checked', false);
+ }
+
+ BulkUpdateRoomModal.toggleBulkUpdateButton();
+ });
+
+ $(document).on('change', 'select[name="bulk_update_room_status"], select[name="bulk_create_room_status"]', function(){
var status_val = $(this).val();
if (status_val == rm_status.STATUS_TEMPORARY_INACTIVE.id) {
$(this).closest('.modal-body').find('.rooms-disable-dates').parent().show();
@@ -872,22 +982,45 @@
});
$('#bulkUpdateRoomModal').on('show.bs.modal', function(e){
- $('#bulkUpdateRoomModal table tbody').html('');
- $('.bulk_update_room_status').val(rm_status.STATUS_ACTIVE.id).closest('.modal-body').find('.rooms-disable-dates').parent().hide();
- $('[name="bulk_update_room_comment"]').val('');
- $('[name="bulk_update_room_floor"]').val('');
- $('#page-loader').show();
- BulkUpdateRoomModal.init();
+ if (!$(e.relatedTarget).attr('disabled')) {
+ $('#bulkUpdateRoomModal table tbody').html('');
+ $('.bulk_update_room_status').val(rm_status.STATUS_ACTIVE.id).closest('.modal-body').find('.rooms-disable-dates').parent().hide();
+ $('[name="bulk_update_room_comment"]').val('');
+ $('[name="bulk_update_room_floor"]').val('');
+ $('#page-loader').show();
+ BulkUpdateRoomModal.init();
+ } else {
+ return false;
+ }
});
$('#bulkUpdateRoomModal').on('shown.bs.modal', function(e){
$('#page-loader').hide();
});
+ $('#bulkCreateRoomModal').on('show.bs.modal', function(e){
+ $('#bulkCreateRoomModal table tbody').html('');
+ $('.bulk_create_room_status').val(rm_status.STATUS_ACTIVE.id).closest('.modal-body').find('.rooms-disable-dates').parent().hide();
+ $('[name="bulk_create_room_comment"]').val('');
+ $('[name="bulk_create_room_floor"]').val('');
+ $('[name="bulk_create_room_prefix"]').val(''),
+ $('[name="bulk_create_room_num"]').val(''),
+ $('[name="bulk_create_room_qty"]').val(''),
+ BulkCreateRoomModal.init();
+ });
+
+ $('#bulkCreateRoomModal').on('shown.bs.modal', function(e){
+ $('#page-loader').hide();
+ });
+
$('.add_bulk_room_update_disable_date').on('click', function() {
BulkUpdateRoomModal.addNewRow();
});
+ $('.add_bulk_room_create_disable_date').on('click', function() {
+ BulkCreateRoomModal.addNewRow();
+ });
+
$(document).on('click','.remove-room-bulk-disable-dates-button',function(e) {
e.preventDefault();
$(this).closest('tr').remove();
@@ -895,7 +1028,10 @@
$(document).on('click','button[name="submitBulkUpdateRooms"]',function(e) {
BulkUpdateRoomModal.submitBulkUpdateModal();
+ });
+ $(document).on('click','button[name="submitBulkCreateRooms"]',function(e) {
+ BulkCreateRoomModal.submitBulkCreateModal();
});
const BulkUpdateRoomModal = {
@@ -920,9 +1056,9 @@
toggleBulkUpdateButton: function() {
let selectedRooms = BulkUpdateRoomModal.getSelectedRooms();
if (selectedRooms.length != 0) {
- $('#bulk-update-rooms-button').prop('disabled', false);
+ $('#bulk-update-rooms-button').attr('disabled', false);
} else {
- $('#bulk-update-rooms-button').prop('disabled', true);
+ $('#bulk-update-rooms-button').attr('disabled', true);
}
},
getSelectedRooms: function(){
@@ -1005,6 +1141,97 @@
}
};
+ const BulkCreateRoomModal = {
+ init: function() {
+ BulkCreateRoomModal.addNewRow();
+ BulkCreateRoomModal.hideErrors();
+ },
+ addNewRow: function() {
+ $('#bulkCreateRoomModal tbody').append(this.getDisableDatesRowHtml());
+ },
+ removeAllInvalidRowDataMarkers: function(tr) {
+ $('#bulkCreateRoomModal .room-disable-dates tr').css('outline', '');
+ $(tr).css('outline', '');
+ },
+ markRowDataInvalid: function(tr) {
+ $(tr).css({ 'outline': '1px solid #D27C82', 'border-radius': '2px' });
+ },
+ hideErrors: function() {
+ $('#bulkCreateRoomModal .errors-wrap').hide();
+ $('#bulkCreateRoomModal .errors-wrap').html('');
+ },
+ getSelectedDates: function() {
+ let disableDates = [];
+ $('#bulkCreateRoomModal .rooms-disable-dates tbody tr').each(function(i, tr) {
+ let date_from = $(tr).find('.disabled_date_from').val().trim();
+ let date_to = $(tr).find('.disabled_date_to').val().trim();
+ let reason = $(tr).find('.room_disable_reason').val().trim();
+ disableDates.push({ date_from, date_to, reason});
+ });
+
+ return disableDates;
+ },
+ showErrors: function(errors) {
+ $('#bulkCreateRoomModal .errors-wrap').html(errors);
+ $('#bulkCreateRoomModal .errors-wrap').show();
+ },
+ submitBulkCreateModal: function() {
+ let dates = this.getSelectedDates();
+ let data = {
+ ajax : 1,
+ action: 'bulkCreateRooms',
+ disable_dates: this.getSelectedDates(),
+ prefix: $('[name="bulk_create_room_prefix"]').val(),
+ num: $('[name="bulk_create_room_num"]').val(),
+ qty: $('[name="bulk_create_room_qty"]').val(),
+ floor: $('[name="bulk_create_room_floor"]').val(),
+ room_comment: $('[name="bulk_create_room_comment"]').val(),
+ id_status: $('.bulk_create_room_status').val(),
+ id_product: $('[name="id_product"]').val()
+ };
+
+ $('#page-loader').show();
+ $.ajax({
+ url: prod_link,
+ type: 'POST',
+ data: data,
+ dataType: 'JSON',
+ success: function(response) {
+ if (response.status) {
+ window.location.href = response.href;
+ } else {
+ BulkCreateRoomModal.showErrors(response.msg);
+ BulkCreateRoomModal.addInvalidRowDataMarkers(response.rows_to_highlight);
+ }
+ },
+ complete: function() {
+ $('#page-loader').hide();
+ }
+ });
+ },
+ addInvalidRowDataMarkers: function(rowsToHighlight) {
+ if (rowsToHighlight.length != 0) {
+ rowsToHighlight.map(function (rowIndex) {
+ const tr = $('#bulkCreateRoomModal .rooms-disable-dates tbody tr').eq(rowIndex);
+ BulkCreateRoomModal.markRowDataInvalid(tr);
+ });
+ }
+ },
+ getDisableDatesRowHtml: function () {
+ let dateFromElem = $(' | ').addClass('col-sm-2 center').append($('').attr('type', 'text').addClass('form-control disabled_date_from').prop('readonly', 'readonly'));
+ let dateToElem = $(' | ').addClass('col-sm-2 center').append($('').attr('type', 'text').addClass('form-control disabled_date_to').prop('readonly', 'readonly'));
+ let reasonElem = $(' | ').addClass('col-sm-6 center').append($('').attr('type', 'text').addClass('form-control room_disable_reason'));
+ let removeRowElem = $(' | ').addClass('col-sm-1 center').append($('').attr('href', '#').addClass('remove-room-bulk-disable-dates-button btn btn-default').append($('').addClass('icon-trash')));
+ let rowElem = $('').addClass('disabledDatesTr')
+ .append(dateFromElem)
+ .append(dateToElem)
+ .append(reasonElem)
+ .append(removeRowElem);
+
+ return $(rowElem).prop('outerHTML');
+ }
+ };
+
// Init full calender object.
const DisableDatesCalendar = new FullCalendar.Calendar($('#disable_dates_full_calendar').get(0), {
initialView: 'dayGridMonth',
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index 3f42dfe99..4bd95e210 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -3497,10 +3497,10 @@ class AdminProductsControllerCore extends AdminController
}
$objHotelRoomInfo->id_product = $id_product;
$objHotelRoomInfo->id_hotel = $id_hotel;
- $objHotelRoomInfo->room_num = trim($roomInfo['room_num']);
+ $objHotelRoomInfo->room_num = $roomInfo['room_num'];
$objHotelRoomInfo->id_status = $roomInfo['id_status'];
- $objHotelRoomInfo->floor = trim($roomInfo['floor']);
- $objHotelRoomInfo->comment = trim($roomInfo['comment']);
+ $objHotelRoomInfo->floor = $roomInfo['floor'];
+ $objHotelRoomInfo->comment = $roomInfo['comment'];
if ($objHotelRoomInfo->save()
&& $objHotelRoomInfo->id_status != HotelRoomInformation::STATUS_TEMPORARY_INACTIVE
) {
@@ -3536,7 +3536,7 @@ class AdminProductsControllerCore extends AdminController
}
}
- if (empty(trim($roomInfo['room_num'])) || !Validate::isGenericName($roomInfo['room_num'])) {
+ if ($roomInfo['room_num'] && !Validate::isGenericName($roomInfo['room_num'])) {
$this->errors[] = sprintf(Tools::displayError('Invalid room number for room %s.'), $roomIndex);
}
@@ -5320,6 +5320,129 @@ class AdminProductsControllerCore extends AdminController
$this->ajaxDie(json_encode($response));
}
+ public function ajaxProcessbulkCreateRooms()
+ {
+ $response = array('status' => false);
+ if ($this->tabAccess['edit'] === '1') {
+ if (($idProduct = Tools::getValue('id_product'))
+ && Validate::isLoadedObject($objProduct = new Product($idProduct, null, $this->context->language->id))
+ && $objProduct->booking_product
+ ) {
+ $objRoomType = new HotelRoomType();
+ $roomTypeInfo = $objRoomType->getRoomTypeInfoByIdProduct($objProduct->id);
+ $idHotel = $roomTypeInfo['id_hotel'];
+ $rowsToHighlight = array();
+ $roomsInfo = array();
+ if (trim($floor = Tools::getValue('floor'))) {
+ $roomsInfo['floor'] = $floor;
+ if (!Validate::isGenericName($floor)) {
+ $this->errors[] = Tools::displayError('Invalid value for floor.');
+ }
+ }
+
+ if (!empty($prefix = trim(Tools::getValue('prefix')))
+ && !Validate::isGenericName($prefix)
+ ) {
+ $this->errors[] = Tools::displayError('Invalid Prefix.');
+ }
+
+ if (!empty($roomNumber = trim(Tools::getValue('num')))
+ && !Validate::isUnsignedInt($roomNumber)
+ ) {
+ $this->errors[] = Tools::displayError('Invalid Starting Room No.');
+ }
+
+ if (!($roomQuantity = Tools::getValue('qty'))) {
+ $this->errors[] = Tools::displayError('Number of rooms is required.');
+ } else if ($roomQuantity < 1) {
+ $this->errors[] = Tools::displayError('Invalid value for number of rooms.');
+ }
+
+ if (trim($comment = Tools::getValue('room_comment'))) {
+ $roomsInfo['comment'] = $comment;
+ }
+
+ $roomsInfo['id_status'] = Tools::getValue('id_status');
+ $disableDates = array();
+ if ($roomsInfo['id_status'] == HotelRoomInformation::STATUS_TEMPORARY_INACTIVE) {
+ $disableDates = Tools::getValue('disable_dates');
+ $roomsInfo['disable_dates_json'] = json_encode($disableDates);
+ if (!$disableDates) {
+ $this->errors[] = Tools::displayError('Please add at least one date range for updating the rooms status to temporary inactive.');
+ } else {
+ $hasMissingRowError = false;
+ foreach ($disableDates as $key => $dateRange) {
+ if (!Validate::isDate($dateRange['date_from']) || !Validate::isDate($dateRange['date_to'])) {
+ if (!$hasMissingRowError) {
+ $hasMissingRowError = true;
+ $this->errors[] = Tools::displayError('Some dates are missing. Please select all the date ranges.');
+ }
+
+ $rowsToHighlight[] = $key;
+ }
+ }
+ }
+ }
+
+ if (empty($this->errors)) {
+ if (!$prefix) {
+ $roomsInfo['prefix'] = $objProduct->name[0].'R';
+ } else {
+ $roomsInfo['prefix'] = $prefix;
+ }
+
+ for ($i = 0; $i <= $roomQuantity; $i++) {
+ $roomNum = $roomsInfo['prefix'];
+ if ((int) $roomNumber) {
+ $roomNum .= '-'.($roomNumber + $i);
+ }
+
+ $objHotelRoomInfo = new HotelRoomInformation();
+ $objHotelRoomInfo->id_product = $objProduct->id;
+ $objHotelRoomInfo->id_hotel = $idHotel;
+ $objHotelRoomInfo->id_status = $roomsInfo['id_status'];
+ $objHotelRoomInfo->room_num = $roomNum;
+
+ if (isset($roomsInfo['floor']) && $roomsInfo['floor'] != '') {
+ $objHotelRoomInfo->floor = $roomsInfo['floor'];
+ }
+
+ if (isset($roomsInfo['comment']) && $roomsInfo['comment'] != '') {
+ $objHotelRoomInfo->comment = $roomsInfo['comment'];
+ }
+
+ if ($objHotelRoomInfo->save() && $objHotelRoomInfo->id_status == HotelRoomInformation::STATUS_TEMPORARY_INACTIVE) {
+ foreach ($disableDates as $key => $dateRange) {
+ $objHotelRoomDisableDates = new HotelRoomDisableDates();
+ $objHotelRoomDisableDates->id_room_type = $objHotelRoomInfo->id_product;
+ $objHotelRoomDisableDates->id_room = $objHotelRoomInfo->id;
+ $objHotelRoomDisableDates->date_from = $dateRange['date_from'];
+ $objHotelRoomDisableDates->date_to = $dateRange['date_to'];
+ $objHotelRoomDisableDates->reason = $dateRange['reason'];
+ $objHotelRoomDisableDates->save();
+ }
+ }
+ }
+
+ $response['status'] = true;
+ $response['href'] = self::$currentIndex.'&update'.$this->table.'&id_product='.$idProduct.'&token='.$this->token.'&conf=4&key_tab=Configuration';
+ } else {
+ $rowsToHighlight = array_values(array_unique($rowsToHighlight));
+ $response['rows_to_highlight'] = $rowsToHighlight;
+ }
+ } else {
+ $this->errors[] = Tools::displayError('Room type not found.');
+ }
+ } else {
+ $this->errors[] = Tools::displayError('You do not have permission to perform this operation.');
+ }
+
+ $this->assignAlerts();
+ $response['msg'] = $this->context->smarty->fetch('alerts.tpl');
+
+ $this->ajaxDie(json_encode($response));
+ }
+
public function processImageLegends()
{
if (Tools::getValue('key_tab') == 'Images' && Tools::getValue('submitAddproductAndStay') == 'update_legends' && Validate::isLoadedObject($product = new Product((int)Tools::getValue('id_product')))) {
|