code optimized

Co-authored-by: Name <sumit201@webkul.in>
This commit is contained in:
azhar bhat
2026-05-01 12:17:50 +05:30
parent 32f01a7b6c
commit 7ade5a92d6
12 changed files with 506 additions and 562 deletions

View File

@@ -52,9 +52,10 @@
{foreach from=$cart_detail_data item=data}
<tr data-id-booking-data="{$data.id}" data-id-product="{$data.id_product}" data-id-room="{$data.id_room}" data-date-from="{$data.date_from}" data-date-to="{$data.date_to}" >
<td>{$data.room_num|escape:'html':'UTF-8'}
{if isset($data['connected_rooms'][$data['id_room']]) && $data['connected_rooms'][$data['id_room']]|@count > 0}
{include file="controllers/products/connected-rooms.tpl" htl_connected_rooms= $data['connected_rooms'][$data['id_room']]}
{if isset($data['connected_rooms']) && $data['connected_rooms']|@count > 0}
{include file="controllers/products/connected-rooms.tpl" htl_connected_rooms=$data['connected_rooms']}
{/if}
{hook h='displayRoomNumAfter' data=$data type='adminOrder'}</td>
<td><img src="{$data.image_link|escape:'html':'UTF-8'}" title="Room image" /></td>
<td>

View File

@@ -25,13 +25,14 @@
<tr class="product-line-row" data-id_htl_booking="{$data.id|escape:'html':'UTF-8'}" data-id_room="{$data.id_room}" data-id_product="{$data.id_product}" data-id_hotel="{$data.id_hotel}" data-date_from="{$data.date_from}" data-date_to="{$data.date_to}" data-product_price="{$data.unit_amt_tax_incl}" data-id_order_detail="{$data.id_order_detail}">
<td>
<p>{$data.room_num}</p>
<p>{$data.room_num}
{if isset($data['connected_rooms']) && $data['connected_rooms']|@count > 0}
{include file="controllers/products/connected-rooms.tpl" htl_connected_rooms=$data['connected_rooms']}
{/if}
</p>
{if $data.is_back_order}
<span class="overbooked_room">{l s='overbooked'}</span>
{/if}
{if isset($data['connected_rooms'][$data['id_room']]) && $data['connected_rooms'][$data['id_room']]|@count > 0}
{include file="controllers/products/connected-rooms.tpl" htl_connected_rooms=$data['connected_rooms'][$data['id_room']]}
{/if}
</td>
<td><img src="{$data.image_link}" title="{l s='Room image'}"></td>
<td>

View File

@@ -1954,235 +1954,184 @@
return false;
}
}
//connected modal
$(document).on('click', '.connectedRoomModal', function(e) {
e.preventDefault();
const initConnectedRoomModal = {
show: function(e) {
e.preventDefault();
var roomId = $(this).data('id-room');
var roomNum = $(this).data('room-num');
let roomId = $(this).data('id-room');
let roomNum = $(this).data('room-num');
let currentRoomType = $('[name="id_product"]').val();
$.ajax({
type: 'POST',
url: prod_link,
dataType: 'json',
data: {
ajax: true,
action: 'getModalConnectedRooms',
room_id: roomId,
current_roomtype: currentRoomType,
},
success: function(response) {
$('#modalLoader').remove();
if (response.success) {
if ($('#connectedRoomModal').length) {
$('#connectedRoomModal').modal('hide');
$('#connectedRoomModal').data('bs.modal', null);
$('#connectedRoomModal').remove();
}
$('.modal-backdrop').remove();
$('body').removeClass('modal-open');
$("#footer").next(".bootstrap").append(response.html);
$('#connectedRoomModal').modal({
backdrop: 'static',
keyboard: true
});
if (roomNum) {
roomNum = '( ' + roomNoText + ' ' + roomNum + ')';
$('#connectedRoomModal').attr('data-room-num-title', roomNum);
$('#connected_room_title').html(roomNum);
$.ajax({
type: 'POST',
url: prod_link,
dataType: 'json',
data: {
ajax: true,
action: 'initConnectedRoomModal',
room_id: roomId,
},
success: function(response) {
if (!response.hasError) {
if ($('#connectedRoomModal').length) {
$('#connectedRoomModal').modal('hide');
$('#connectedRoomModal').data('bs.modal', null);
$('#connectedRoomModal').remove();
}
$('.modal-backdrop').remove();
$('body').removeClass('modal-open');
$("#footer").next(".bootstrap").append(response.modalHtml);
$('#connectedRoomModal').modal({
backdrop: 'static',
keyboard: true
});
if (roomNum) {
roomNum = '( ' + roomNoText + ' ' + roomNum + ')';
$('#connectedRoomModal').attr('data-room-num-title', roomNum);
$('#connected_room_title').html(roomNum);
} else {
$('#connectedRoomModal').attr('data-room-num-title', '');
$('#connected_room_title').html('');
}
} else {
$('#connectedRoomModal').attr('data-room-num-title', '');
$('#connected_room_title').html('');
alert(response.message);
}
} else {
alert(response.message);
}
});
},
add: function() {
var $row = $(this).closest('tr');
var mainRoomId = $('#connected_room_main_id').val();
var connectedRoomId = $row.find('.connect-room').val();
if (!connectedRoomId) {
alert(selectRoomText);
return;
}
});
});
function filterRoomsByType($row) {
var selectedType = $row.find('.connect-room-type').val();
var $roomSelect = $row.find('.connect-room');
var firstVisible = null;
$roomSelect.find('option').each(function() {
if ($(this).data('type') == selectedType) {
$(this).show();
if (!firstVisible) {
firstVisible = $(this);
}
} else {
$(this).hide();
}
});
if (firstVisible) {
firstVisible.prop('selected', true);
} else {
$roomSelect.val('');
}
}
function addConnectedRoomRow() {
var $template = $('#connected_room_add_template');
if (!$template.length) {
return;
}
var $tbody = $('#connected_rooms_tbody');
if ($tbody.find('.connected-room-add-row').not('#connected_room_add_template').length) {
return;
}
var $newRow = $template.clone().removeAttr('id').removeClass('hide');
var $tableWrapper = $('#connected_rooms_table_wrapper');
var $emptyState = $('#connected_rooms_empty_state');
var $addButton = $('#add_connected_room_row');
if ($tableWrapper.length) {
$tableWrapper.removeClass('hide');
}
if ($emptyState.length) {
$emptyState.hide();
}
$tbody.append($newRow);
filterRoomsByType($newRow);
if ($addButton.length) {
$addButton.prop('disabled', true);
}
}
$(document).on('click', '#add_connected_room_row', function() {
addConnectedRoomRow();
}); $(document).on('click', '.remove-connected-room-row', function() {
var $row = $(this).closest('tr');
$('#add_connected_room_row').prop('disabled', false);
$row.remove();
if (!$('#connected_rooms_tbody').find('.connected-room-row').length && !$('#connected_rooms_tbody')
.find('.connected-room-add-row').not('#connected_room_add_template').length) {
$('#connected_rooms_table_wrapper').addClass('hide');
$('#connected_rooms_empty_state').removeClass('hide').show();
}
}); $(document).on('change', '.connect-room-type', function() {
filterRoomsByType($(this).closest('tr'));
}); $(document).on('shown.bs.modal', '#connectedRoomModal', function() {
var $row = $(this).find('.connected-room-add-row').not('#connected_room_add_template').first();
if ($row.length) {
filterRoomsByType($row);
}
});
//add connected room
$(document).on('click', '.save-connected-room', function() {
var $row = $(this).closest('tr');
var mainRoomId = $('#connected_room_main_id').val();
var connectedRoomId = $row.find('.connect-room').val();
let currentRoomType = $('[name="id_product"]').val();
if (!connectedRoomId) {
alert(selectRoomText);
return;
}
$.ajax({
url: prod_link,
type: 'POST',
dataType: 'json',
data: {
ajax: true,
action: 'ManageConnectedRoom',
mode: 'add',
room_id: mainRoomId,
connected_room_id: connectedRoomId,
current_roomtype: currentRoomType,
},
beforeSend: function() {
$row.find('.save-connected-room').prop('disabled', true);
},
success: function(response) {
if (response.success) {
showSuccessMessage(response.message);
$('#connectedRoomModal .modal-content').replaceWith($(response.html).find(
'.modal-content'));
$('#connected_room_title').html($('#connectedRoomModal').attr(
'data-room-num-title'));
// update connected rooms count badge in list
var $icon = $('.connectedRoomModal[data-id-room="' + mainRoomId + '"]')
.find('.connected-room-count');
if ($icon.length) {
var currentCount = parseInt($.trim($icon.text()), 10);
if (isNaN(currentCount)) {
currentCount = 0;
$.ajax({
url: prod_link,
type: 'POST',
dataType: 'json',
data: {
ajax: true,
action: 'ManageConnectedRoom',
mode: 'add',
room_id: mainRoomId,
connected_room_id: connectedRoomId,
},
beforeSend: function() {
$row.find('.save-connected-room').prop('disabled', true);
},
success: function(response) {
if (response.success) {
showSuccessMessage(response.message);
$('#connectedRoomModal .modal-body').replaceWith($(response.html).filter('.modal-body'));
$('#connected_room_title').html($('#connectedRoomModal').attr('data-room-num-title'));
var $icon = $('.connectedRoomModal[data-id-room="' + mainRoomId + '"]').find('.connected-room-count');
if ($icon.length && typeof response.connected_count !== 'undefined') {
$icon.text(response.connected_count);
}
$icon.text(currentCount + 1);
}
if (response.details) {
$('.connectedRoomModal[data-id-room="' + mainRoomId + '"]').data(
'connected-details', response.details);
}
} else {
alert(response.message);
}
},
complete: function() {
$row.find('.save-connected-room').prop('disabled', false);
}
});
});
//remove connected room
$(document).on('click', '.delete-connected-room', function() {
var $row = $(this).closest('tr');
var mainRoomId = $('#connected_room_main_id').val();
var connectedRoomId = $(this).data('connected-room-id');
var connectedId = $(this).data('connected-id');
let currentRoomType = $('[name="id_product"]').val();
$.ajax({
url: prod_link,
type: 'POST',
dataType: 'json',
data: {
ajax: true,
action: 'ManageConnectedRoom',
mode: 'delete',
room_id: mainRoomId,
connected_room_id: connectedRoomId,
connected_id: connectedId,
current_roomtype: currentRoomType,
},
success: function(response) {
if (response.success) {
showSuccessMessage(response.message);
if (response.html) {
$('#connectedRoomModal .modal-content').replaceWith($(response.html)
.find('.modal-content'));
$('#connected_room_title').html($('#connectedRoomModal').attr(
'data-room-num-title'));
} else {
$row.remove();
var $modal = $('#connectedRoomModal');
var $tbody = $modal.find('#connected_rooms_tbody');
var hasConnectedRows = $tbody.find('.connected-room-row').length > 0;
if (!hasConnectedRows) {
$modal.find('#connected_rooms_table_wrapper').addClass('hide');
$modal.find('#connected_rooms_empty_state').removeClass('hide')
.show();
}
alert(response.message);
}
// update connected rooms count badge in list
var $icon = $('.connectedRoomModal[data-id-room="' + mainRoomId + '"]')
.find(
'.connected-room-count');
if ($icon.length) {
var currentCount = parseInt($.trim($icon.text()), 10);
if (isNaN(currentCount)) {
currentCount = 0;
}
$icon.text(Math.max(0, currentCount - 1));
}
if (response.details) {
$('.connectedRoomModal[data-id-room="' + mainRoomId + '"]').data(
'connected-details', response.details);
}
} else {
alert(response.message);
},
complete: function() {
$row.find('.save-connected-room').prop('disabled', false);
}
});
},
showNotConnectedRooms: function() {
var $typeSelect = $(this);
var $row = $typeSelect.closest('tr');
var roomTypeId = $typeSelect.val();
var roomId = $('#connected_room_main_id').val();
var $roomSelect = $row.find('.connect-room');
$roomSelect.empty();
if (!roomTypeId) {
return;
}
});
});
$.ajax({
url: prod_link,
type: 'POST',
dataType: 'json',
data: {
ajax: true,
action: 'getNotConnectedRooms',
room_id: roomId,
room_type_id: roomTypeId,
},
success: function(response) {
if (response.success && response.rooms && response.rooms.length) {
$.each(response.rooms, function(i, room) {
$roomSelect.append(
$('<option>').val(room.id_room).text(room.name)
);
});
}
}
});
},
addRow: function() {
var $template = $('#connected_room_add_template');
if (!$template.length) {
return;
}
var $tbody = $('#connected_rooms_tbody');
if ($tbody.find('.connected-room-add-row').not('#connected_room_add_template').length) {
return;
}
var $newRow = $template.clone().removeAttr('id').removeClass('hide');
$('#connected_rooms_table_wrapper').removeClass('hide');
$('#connected_rooms_empty_state').hide();
$tbody.append($newRow);
initConnectedRoomModal.showNotConnectedRooms.call($newRow.find('.connect-room-type')[0]);
$('#add_connected_room_row').prop('disabled', true);
},
removeRow: function() {
var $row = $(this).closest('tr');
$row.remove();
$('#add_connected_room_row').prop('disabled', false);
if (!$('#connected_rooms_tbody').find('.connected-room-row').length) {
$('#connected_rooms_table_wrapper').addClass('hide');
$('#connected_rooms_empty_state').removeClass('hide').show();
}
},
delete: function() {
var mainRoomId = $('#connected_room_main_id').val();
var connectedId = $(this).data('connected-id');
$.ajax({
url: prod_link,
type: 'POST',
dataType: 'json',
data: {
ajax: true,
action: 'ManageConnectedRoom',
mode: 'delete',
room_id: mainRoomId,
connected_id: connectedId,
},
success: function(response) {
if (response.success) {
showSuccessMessage(response.message);
$('#connectedRoomModal .modal-body').replaceWith($(response.html).filter('.modal-body'));
$('#connected_room_title').html($('#connectedRoomModal').attr('data-room-num-title'));
var $icon = $('.connectedRoomModal[data-id-room="' + mainRoomId + '"]').find('.connected-room-count');
if ($icon.length && typeof response.connected_count !== 'undefined') {
$icon.text(response.connected_count);
}
} else {
alert(response.message);
}
}
});
}
};
$(document).on('click', '.connectedRoomModal', initConnectedRoomModal.show);
$(document).on('click', '.save-connected-room', initConnectedRoomModal.add);
$(document).on('click', '.delete-connected-room', initConnectedRoomModal.delete);
$(document).on('click', '#add_connected_room_row', initConnectedRoomModal.addRow);
$(document).on('click', '.remove-connected-room-row', initConnectedRoomModal.removeRow);
$(document).on('change', '.connect-room-type', initConnectedRoomModal.showNotConnectedRooms);
});
</script>

View File

@@ -25,79 +25,40 @@
<i class="icon-random connected-room-icon"></i>
</span>
{/if}
<style>
.connected-room-icon {
color: #008abd;
cursor: pointer;
}
/* page tooltip */
.tooltip_cont {
min-width: 280px;
width: 100%;
font-size: 14px;
font-weight: 600;
/* display: grid; */
}
.tooltip_cont .tip_header {
margin-bottom: 10px;
}
.tooltip_cont .tip-body>div {
margin-bottom: 6px;
}
.tip_element_head {
font-size: 12px;
}
.tip_element_value {
font-size: 16px;
opacity: 0.6;
}
.tip-body {
display: grid;
grid-template-columns: auto auto;
}
</style>
<script>
$(document).ready(function() {
{literal}
if (typeof $.fn.tooltip !== 'undefined' && typeof $.ui !== 'undefined' && typeof $.ui.tooltip !==
'undefined') {
if (!window._connectedRoomTooltipBound &&
typeof $.fn.tooltip !== 'undefined' && typeof $.ui !== 'undefined' && typeof $.ui.tooltip !== 'undefined') {
window._connectedRoomTooltipBound = true;
$('.connected-room-tooltip-trigger').tooltip({
items: '.connected-room-tooltip-trigger',
content: function() {
var details = $(this).data('connected-details');
if (!details || Object.keys(details).length === 0) {
if (!details || details.length === 0) {
return "{/literal}{l s='No rooms connected' js=1}{literal}";
}
var html = '<div class="tooltip_cont">';
html += '<div class="tip_header"><div class="tip_date">{/literal}{l s="Connected Rooms" js=1}{literal}</div></div>';
html += '<div class="tip-body">';
for (var type in details) {
html += '<div class="tip-body connected-tip-body">';
var grouped = {};
for (var i = 0; i < details.length; i++) {
var type = details[i].room_type_name;
if (!grouped[type]) { grouped[type] = []; }
grouped[type].push(details[i].connected_room_name);
}
for (var type in grouped) {
html += '<div>';
html += '<div class="tip_element_head">' + type + '</div>';
html += '<div class="tip_element_value">';
var rooms = details[type];
for (var i = 0; i < rooms.length; i++) {
html += rooms[i].connected_room_num + (i < rooms.length - 1 ? ', ' :
'');
}
html += '</div></div>';
html += '<div class="tip_element_value">' + grouped[type].join(', ') + '</div>';
html += '</div>';
}
html += '</div></div>';
return html;
},
position: {
my: "center bottom-10",
at: "center top",
collision: "flipfit"
}
position: { my: "center top+10", at: "center bottom", collision: "flipfit" }
});
}
{/literal}
});
</script>
</script>

View File

@@ -1,4 +1,4 @@
{**
{*
* NOTICE OF LICENSE
*
* This source file is subject to the Open Software License version 3.0
@@ -19,168 +19,124 @@
* @copyright Since 2010 Webkul
* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
*}
<div class="modal fade" id="connectedRoomModal" tabindex="-1" role="dialog">
<style>
#connectedRoomModal .connected-rooms-table {
table-layout: fixed;
width: 100%;
border-radius: 3px;
}
<style>
#connectedRoomModal .connected-rooms-table {
table-layout: fixed;
width: 100%;
border-radius: 3px;
}
#connectedRoomModal .modal-title .disable_dates_title {
display: inline-block;
font-weight: 600;
}
#connectedRoomModal .modal-title .connected_room_num {
color: grey;
}
#connectedRoomModal .modal-title .disable_dates_title {
display: inline-block;
font-weight: 600;
}
#connectedRoomModal .modal-title {
line-height: 2;
}
#connectedRoomModal .modal-title .connected_room_num {
color: grey;
}
#connectedRoomModal .modal-title .close {
line-height: 2;
}
</style>
<div class="modal-dialog modal-md">
<div class="modal-content">
<!-- header -->
<div class="modal-header">
<div class="modal-title">
<div class="row">
<div class="disable_dates_title">
<i class="icon-random"></i>&nbsp; {l s='Connected Rooms'} <span id="connected_room_title"
class="connected_room_num"></span>
</div>
<div class="pull-right">
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
#connectedRoomModal .modal-title {
line-height: 2;
}
#connectedRoomModal .modal-title .close {
line-height: 2;
}
#connectedRoomModal .modal-body {
max-height: 600px;
overflow-y: auto;
}
</style>
<div class="modal-body">
<input type="hidden" id="connected_room_main_id" name="main_room_id" value="{$main_room_id|intval}">
<!-- connectedrooms list -->
<div class="">
<div class="">
<div id="connected_rooms_list">
<div id="connected_rooms_table_wrapper"
class="{if !isset($htl_connected_rooms) || $htl_connected_rooms|count == 0}hide{/if}">
<table class="table table-bordered table-striped connected-rooms-table">
<colgroup>
<col style="width: 35%;">
<col style="width: 45%;">
<col style="width: 120px;">
</colgroup>
<thead>
<tr>
<th>{l s='Room Type'}</th>
<th>{l s='Connected Room'}</th>
<th width="120" class="text-center">
{l s='Action'}
</th>
</tr>
</thead>
<tbody id="connected_rooms_tbody">
{if isset($htl_connected_rooms) && $htl_connected_rooms|count > 0}
{foreach from=$htl_connected_rooms item=room}
<tr class="connected-room-row">
<td>{$room.room_type_name|escape:'html':'UTF-8'}</td>
<td>{$room.connected_room_name|escape:'html':'UTF-8'}</td>
<td class="text-center">
<a href="javascript:void(0);"
class="delete-connected-room btn btn-default"
data-connected-id="{$room.id_connected_room|intval}"
data-connected-room-id="{$room.id_room_connected|intval}"
title="{l s='Remove'}">
<i class="icon-trash"></i>
</a>
</td>
</tr>
{/foreach}
{/if}
</tbody>
</table>
</div>
<div class="list-empty {if isset($htl_connected_rooms) && $htl_connected_rooms|count > 0}hide{/if}"
id="connected_rooms_empty_state">
<div class="list-empty-msg">
<i class="icon-warning-sign list-empty-icon"></i>
{l s='No connected rooms.'}
</div>
</div>
</div>
<form id="connected_rooms_form">
<div class="modal-body">
<input type="hidden" id="connected_room_main_id" name="main_room_id" value="{$main_room_id|intval}">
<!-- connectedrooms list -->
<div class="">
<div class="">
<div id="connected_rooms_list">
<div id="connected_rooms_table_wrapper"
class="{if !isset($htl_connected_rooms) || $htl_connected_rooms|count == 0}hide{/if}">
<table class="table table-bordered table-striped connected-rooms-table">
<colgroup>
<col style="width: 45%;">
<col style="width: 35%;">
<col style="width: 120px;">
</colgroup>
<thead>
<tr>
<th>{l s='Room Type'}</th>
<th>{l s='Room'}</th>
<th width="120" class="text-center">
{l s='Action'}
</th>
</tr>
</thead>
<tbody id="connected_rooms_tbody">
{if isset($htl_connected_rooms) && $htl_connected_rooms|count > 0}
{foreach from=$htl_connected_rooms item=hotelRooms}
{foreach from=$hotelRooms key=roomType item=rooms}
{foreach from=$rooms item=row}
<tr class="connected-room-row">
<td>{$row.connected_room_type|escape:'html':'UTF-8'}</td>
<td>{$row.connected_room_num|escape:'html':'UTF-8'}</td>
<td class="text-center">
<a href="javascript:void(0);"
class="delete-connected-room btn btn-default"
data-connected-id="{$row.id_connected_room|intval}"
data-room-id="{$row.id_room_information|intval}"
data-connected-room-id="{$row.id_room|intval}"
title="{l s='Remove'}">
<i class="icon-trash"></i>
</a>
</td>
</tr>
{/foreach}
{/foreach}
{/foreach}
{/if}
</tbody>
</table>
</div>
<div class="list-empty {if isset($htl_connected_rooms) && $htl_connected_rooms|count > 0}hide{/if}"
id="connected_rooms_empty_state">
<div class="list-empty-msg">
<i class="icon-warning-sign list-empty-icon"></i>
{l s='No connected rooms.'}
</div>
</div>
</div>
{if isset($htl_not_connected_rooms) && $htl_not_connected_rooms|count > 0}
<button type="button" id="add_connected_room_row" class="btn btn-default">
<i class="icon-plus"></i> {l s='Add Connected Room'}
</button>
{/if}
</div>
</div>
{if isset($htl_not_connected_rooms) && $htl_not_connected_rooms|count > 0}
<table class="hide">
<tbody>
<tr id="connected_room_add_template" class="connected-room-add-row hide">
<td>
<select class="form-control connect-room-type" name="connect_room_type">
{assign var=types value=[]}
{foreach from=$htl_not_connected_rooms item=room}
{if !in_array($room.id_product, $types)}
{append var=types value=$room.id_product}
<option value="{$room.id_product|intval}"
{if $room.id_product == $current_roomtype}selected{/if}>
{$room.room_type|escape:'html':'UTF-8'}
</option>
{/if}
{/foreach}
</select>
</td>
<td>
<select class="form-control connect-room" name="connect_room">
{foreach from=$htl_not_connected_rooms item=room}
<option value="{$room.id|intval}" class="room-option"
data-type="{$room.id_product|intval}">
{$room.room_num|escape:'html':'UTF-8'}
</option>
{/foreach}
</select>
</td>
<td class="text-center">
<button type="button" class="btn btn-default remove-connected-room-row"
title="{l s='Remove'}">
<i class="icon-trash"></i>
</button>
<button type="button" class="btn btn-primary save-connected-room">
{l s='Add'}
</button>
</td>
</tr>
</tbody>
</table>
{/if}
</div>
<!-- footer -->
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">
<i class="icon-remove"></i>
{l s='Close'}
</button>
</div>
</form>
{if isset($htl_not_connected_rooms) && $htl_not_connected_rooms|count > 0}
<button type="button" id="add_connected_room_row" class="btn btn-default">
<i class="icon-plus"></i> {l s='Add Connected Room'}
</button>
{/if}
</div>
</div>
</div>
{if isset($htl_not_connected_rooms) && $htl_not_connected_rooms|count > 0}
<table class="hide">
<tbody>
<tr id="connected_room_add_template" class="connected-room-add-row hide">
<td>
<select class="form-control connect-room-type" name="connect_room_type">
{foreach from=$htl_not_connected_rooms key=typeId item=typeGroup}
<option value="{$typeGroup.id_room_type|intval}"
{if $typeGroup.id_room_type == $current_roomtype}selected{/if}>
{$typeGroup.name|escape:'html':'UTF-8'}
</option>
{/foreach}
</select>
</td>
<td>
<select class="form-control connect-room" name="connect_room">
</select>
</td>
<td class="text-center">
<button type="button" class="btn btn-default remove-connected-room-row"
title="{l s='Remove'}">
<i class="icon-trash"></i>
</button>
<button type="button" class="btn btn-primary save-connected-room">
{l s='Add'}
</button>
</td>
</tr>
</tbody>
</table>
{/if}
</div>

View File

@@ -1283,6 +1283,9 @@ class AdminOrdersControllerCore extends AdminController
parent::setMedia();
$this->addJqueryUI('ui.datepicker');
$this->addJqueryUI('ui.tooltip', 'base', true);
$this->addCSS(_MODULE_DIR_.'hotelreservationsystem/views/css/HotelReservationAdmin.css');
$this->addJS(_PS_JS_DIR_.'vendor/d3.v3.min.js');
$this->addJqueryUI('ui.tooltip', 'base', true);
@@ -3488,7 +3491,7 @@ class AdminOrdersControllerCore extends AdminController
$order_detail_data[$key]['amt_with_qty_tax_incl'] = $value['total_price_tax_incl'];
$order_detail_data[$key]['room_type_info'] = $objHotelRoomType->getRoomTypeInfoByIdProduct($value['id_product']);
$order_detail_data[$key]['total_room_tax'] = $order_detail_data[$key]['total_room_price_ti'] - $order_detail_data[$key]['total_room_price_te'];
$order_detail_data[$key]['connected_rooms'] = HotelConnectedRoom::getConnectedRooms((int) Context::getContext()->language->id, (int) $value['id_room'], true);
$order_detail_data[$key]['connected_rooms'] = HotelConnectedRoom::getConnectedRooms((int) $value['id_room'], (int) Context::getContext()->language->id);
if (isset($value['refund_info'])
&& $value['refund_info']['refunded']

View File

@@ -542,6 +542,7 @@ class AdminProductsControllerCore extends AdminController
$this->addJs(__PS_BASE_URI__.'js/vendor/ladda.js');
$this->addCSS(_PS_JS_DIR_.'fullcalendar/main.css');
$this->addJs(_PS_JS_DIR_.'fullcalendar/main.js');
$this->addCSS(_MODULE_DIR_.'hotelreservationsystem/views/css/HotelReservationAdmin.css');
$this->addJS(_PS_JS_DIR_.'/datatable/jquery.dataTables.min.js');
$this->addJS(_PS_JS_DIR_.'/datatable/dataTables.bootstrap.js');
@@ -1602,7 +1603,8 @@ class AdminProductsControllerCore extends AdminController
) {
$this->addJqueryUI(array(
'ui.core',
'ui.widget'
'ui.widget',
'ui.tooltip'
));
$this->addjQueryPlugin(array(
@@ -3159,7 +3161,7 @@ class AdminProductsControllerCore extends AdminController
$disableDates = $objRoomDisableDates->getRoomDisableDates($room['id']);
$room['disable_dates_json'] = json_encode($disableDates);
}
$room['connected_rooms_count'] = HotelConnectedRoom::getConnectedRooms($this->context->language->id, $room['id'], true,true);
$room['connected_rooms_count'] = HotelConnectedRoom::getTotalConnectedRooms($room['id']);
}
$data->assign('htl_room_info', $hotelRoomInfo);
@@ -3795,7 +3797,7 @@ class AdminProductsControllerCore extends AdminController
$this->errors[] = $this->l('This room cannot be deleted as this room contains future booking.');
}
if (empty($this->errors)) {
$response['affected_rooms'] = HotelConnectedRoom::getRoomConnectedWith($idRoom);
$response['affected_rooms'] = HotelConnectedRoom::getTotalConnectedRooms(null, $idRoom);
if ($objRoomInfo->delete()) {
$response['success'] = true;
} else {
@@ -5718,82 +5720,101 @@ class AdminProductsControllerCore extends AdminController
return $tpl->fetch();
}
protected function getConnectedRoomsModalHtml($roomId, $currentRoomType)
{
$connectedRooms = HotelConnectedRoom::getConnectedRooms($this->context->language->id, $roomId, true);
$notConnectedRooms = HotelConnectedRoom::getConnectedRooms($this->context->language->id, $roomId, false);
$this->context->smarty->assign(array(
'htl_connected_rooms' => $connectedRooms,
'htl_not_connected_rooms' => $notConnectedRooms,
'main_room_id' => (int) $roomId,
'current_roomtype' => (int) $currentRoomType,
));
return $this->context->smarty->fetch('controllers/products/modal-connected-rooms.tpl');
}
public function ajaxProcessGetModalConnectedRooms()
public function ajaxProcessGetNotConnectedRooms()
{
$roomId = (int) Tools::getValue('room_id');
$modalContent = $this->getConnectedRoomsModalHtml($roomId, (int) Tools::getValue('current_roomtype'));
die(json_encode([
'success' => true,
'html' => $modalContent
]));
$roomTypeId = (int) Tools::getValue('room_type_id');
$allGroups = HotelConnectedRoom::getNotConnectedRooms($roomId, $this->context->language->id);
$rooms = isset($allGroups[$roomTypeId]) ? $allGroups[$roomTypeId]['rooms'] : array();
die(Tools::jsonEncode(['success' => true, 'rooms' => $rooms]));
}
public function ajaxProcessInitConnectedRoomModal()
{
$response['hasError'] = 1;
$roomId = (int) Tools::getValue('room_id');
$objRoom = new HotelRoomInformation($roomId);
$idProduct = (int) $objRoom->id_product;
$idHotel = (int) $objRoom->id_hotel;
$this->context->smarty->assign(array(
'htl_connected_rooms' => HotelConnectedRoom::getConnectedRooms($roomId, $this->context->language->id),
'htl_not_connected_rooms' => HotelConnectedRoom::getNotConnectedRooms($roomId, $this->context->language->id),
'main_room_id' => $roomId,
'current_roomtype' => $idProduct,
));
$modal = array(
'modal_id' => 'connectedRoomModal',
'modal_class' => 'modal-md',
'modal_title' => '<i class="icon-random"></i>&nbsp; '.$this->l('Connected Room').' <span id="connected_room_title" class="connected_room_num"></span>',
'modal_content' => $this->context->smarty->fetch('controllers/products/modal-connected-rooms.tpl'),
'modal_actions' => array(),
);
$this->context->smarty->assign($modal);
$response['hasError'] = 0;
$response['modalHtml'] = $this->context->smarty->fetch('modal.tpl');
die(Tools::jsonEncode($response));
}
public function ajaxProcessManageConnectedRoom()
{
if ($this->tabAccess['edit'] !== 1) {
die(json_encode(['success' => false, 'message' => $this->l('You do not have permission to edit this.')]));
}
$mode = Tools::getValue('mode');
$roomId = (int) Tools::getValue('room_id');
$connectedRoomId = (int) Tools::getValue('connected_room_id');
$connectedId = (int) Tools::getValue('connected_id');
$currentRoomType = (int) Tools::getValue('current_roomtype');
$objRoom = new HotelRoomInformation($roomId);
$idProduct = (int) $objRoom->id_product;
$idHotel = (int) $objRoom->id_hotel;
if ($mode === 'add') {
$connection = new HotelConnectedRoom();
$connection->id_room = $roomId;
$connection->id_room_connected = $connectedRoomId;
if ($connection->add()) {
$modalContent = $this->getConnectedRoomsModalHtml($roomId, $currentRoomType);
$this->context->smarty->assign(array(
'htl_connected_rooms' => HotelConnectedRoom::getConnectedRooms($roomId, $this->context->language->id),
'htl_not_connected_rooms' => HotelConnectedRoom::getNotConnectedRooms($roomId, $this->context->language->id),
'main_room_id' => $roomId,
'current_roomtype' => $idProduct,
));
die(json_encode([
'html' => $modalContent,
'html' => $this->context->smarty->fetch('controllers/products/modal-connected-rooms.tpl'),
'success' => true,
'message' => $this->l('Room connected successfully.')
'message' => $this->l('Room connected successfully.'),
'connected_count' => HotelConnectedRoom::getTotalConnectedRooms($roomId),
]));
}
die(json_encode([
'success' => false,
'message' => $this->l('Failed to connect room.')
]));
die(json_encode(['success' => false, 'message' => $this->l('Failed to connect room.')]));
}
//remove room
if ($mode === 'delete') {
if (!$connectedId) {
die(json_encode([
'success' => false,
'message' => $this->l('Invalid data.')
]));
die(json_encode(['success' => false, 'message' => $this->l('Invalid data.')]));
}
$objHotelConnectedRoom = new HotelConnectedRoom($connectedId);
if ($objHotelConnectedRoom->delete()) {
$modalContent = $this->getConnectedRoomsModalHtml($roomId, $currentRoomType);
$this->context->smarty->assign(array(
'htl_connected_rooms' => HotelConnectedRoom::getConnectedRooms($roomId, $this->context->language->id),
'htl_not_connected_rooms' => HotelConnectedRoom::getNotConnectedRooms($roomId, $this->context->language->id),
'main_room_id' => $roomId,
'current_roomtype' => $idProduct,
));
die(json_encode([
'success' => true,
'html' => $modalContent,
'message' => $this->l('Connected room removed successfully.')
'html' => $this->context->smarty->fetch('controllers/products/modal-connected-rooms.tpl'),
'message' => $this->l('Connected room removed successfully.'),
'connected_count' => HotelConnectedRoom::getTotalConnectedRooms($roomId),
]));
}
die(json_encode([
'success' => false,
'message' => $this->l('Failed to remove connected room.')
]));
die(json_encode(['success' => false, 'message' => $this->l('Failed to remove connected room.')]));
}
die(json_encode([
'success' => false,
'message' => $this->l('Invalid action.')
]));
}
}

View File

@@ -1331,7 +1331,7 @@ class HotelCartBookingData extends ObjectModel
);
$cart_detail_data[$key]['amt_with_qty'] = $roomTypeDateRangePrice['total_price_tax_excl'];
$cart_detail_data[$key]['connected_rooms'] = HotelConnectedRoom::getConnectedRooms(Context::getContext()->language->id, $obj_htl_room_info->id, true);
$cart_detail_data[$key]['connected_rooms'] = HotelConnectedRoom::getConnectedRooms($obj_htl_room_info->id, Context::getContext()->language->id);
}
}
if ($cart_detail_data) {

View File

@@ -43,89 +43,126 @@ class HotelConnectedRoom extends ObjectModel
),
);
public static function getConnectedRooms($idLang, $roomId = null, $isConnected = true ,$count = false)
public static function getConnectedRooms($idRoom = null, $idLang = null)
{
$idLang = (int) $idLang;
$roomId = (!is_bool($roomId) && Validate::isUnsignedId($roomId)) ? (int) $roomId : 0;
$hotelId = 0;
$idLang = $idLang ? (int) $idLang : (int) Context::getContext()->language->id;
if ($roomId > 0) {
$objHotelRoomInformation = new HotelRoomInformation($roomId);
$hotelId = (int) $objHotelRoomInformation->id_hotel;
if ($idRoom === null) {
$sql = 'SELECT
hcr.id_connected_room,
hcr.id_room,
hcr.id_room_connected,
conn_pl.name AS room_type_name,
connected_room.room_num AS connected_room_name
FROM `' . _DB_PREFIX_ . 'htl_connected_room` hcr
INNER JOIN `' . _DB_PREFIX_ . 'htl_room_information` connected_room
ON connected_room.id = hcr.id_room_connected
LEFT JOIN `' . _DB_PREFIX_ . 'product_lang` conn_pl
ON (conn_pl.id_product = connected_room.id_product AND conn_pl.id_lang = ' . $idLang . ')
ORDER BY hcr.id_room, connected_room.room_num';
$results = Db::getInstance()->executeS($sql);
if ($results === false) {
return [];
}
$map = [];
foreach ($results as $row) {
$map[(int) $row['id_room']][] = $row;
}
return $map;
}
if ($isConnected) {
$sql = 'SELECT
hcr.id_connected_room, hcr.id_room AS id_room_information, hcr.id_room_connected AS id_room, main_room.id_hotel, main_room.room_num AS main_room_num, connected_room.room_num AS connected_room_num,
main_pl.name AS main_room_type, conn_pl.name AS connected_room_type
$idRoom = (int) $idRoom;
if ($idRoom <= 0) {
return array();
}
$sql = 'SELECT
hcr.id_connected_room,
hcr.id_room,
hcr.id_room_connected,
conn_pl.name AS room_type_name,
connected_room.room_num AS connected_room_name
FROM `' . _DB_PREFIX_ . 'htl_connected_room` hcr
INNER JOIN `' . _DB_PREFIX_ . 'htl_room_information` main_room ON main_room.id = hcr.id_room
INNER JOIN `' . _DB_PREFIX_ . 'htl_room_information` connected_room ON connected_room.id = hcr.id_room_connected
LEFT JOIN `' . _DB_PREFIX_ . 'product_lang` main_pl ON (main_pl.id_product = main_room.id_product AND main_pl.id_lang = ' . (int) $idLang . ')
LEFT JOIN `' . _DB_PREFIX_ . 'product_lang` conn_pl ON (conn_pl.id_product = connected_room.id_product AND conn_pl.id_lang = ' . (int) $idLang . ')
WHERE 1';
if ($hotelId > 0) {
$sql .= ' AND main_room.id_hotel = ' . (int) $hotelId . '
AND connected_room.id_hotel = ' . (int) $hotelId;
}
if ($roomId > 0) {
$sql .= ' AND main_room.id = ' . (int) $roomId;
INNER JOIN `' . _DB_PREFIX_ . 'htl_room_information` connected_room
ON connected_room.id = hcr.id_room_connected
LEFT JOIN `' . _DB_PREFIX_ . 'product_lang` conn_pl
ON (conn_pl.id_product = connected_room.id_product AND conn_pl.id_lang = ' . $idLang . ')
WHERE hcr.id_room = ' . $idRoom . '
ORDER BY connected_room.room_num';
$results = Db::getInstance()->executeS($sql);
return ($results === false) ? array() : $results;
}
public static function getNotConnectedRooms($idRoom, $idLang = null)
{
$idRoom = (int) $idRoom;
if ($idRoom <= 0) {
return array();
}
$idLang = $idLang ? (int) $idLang : (int) Context::getContext()->language->id;
$hotelId = (int) (new HotelRoomInformation($idRoom))->id_hotel;
$sql = 'SELECT hri.id AS id_room, hri.id_product AS id_room_type, pl.name AS room_type_name, hri.room_num AS room_name
FROM `' . _DB_PREFIX_ . 'htl_room_information` hri
LEFT JOIN `' . _DB_PREFIX_ . 'product_lang` pl
ON (pl.id_product = hri.id_product AND pl.id_lang = ' . $idLang . ')
WHERE hri.id != ' . $idRoom . '
AND hri.id_hotel = ' . $hotelId;
$sql .= ' AND NOT EXISTS (
SELECT 1 FROM `' . _DB_PREFIX_ . 'htl_connected_room` cr
WHERE cr.id_room = ' . $idRoom . ' AND cr.id_room_connected = hri.id
)
ORDER BY pl.name ASC, hri.room_num ASC';
$results = Db::getInstance()->executeS($sql);
if ($results === false) {
return array();
}
$grouped = array();
foreach ($results as $row) {
$typeId = (int) $row['id_room_type'];
if (!isset($grouped[$typeId])) {
$grouped[$typeId] = array(
'id_room_type' => $typeId,
'name' => $row['room_type_name'],
'rooms' => array(),
);
}
$grouped[$typeId]['rooms'][] = array(
'id_room' => (int) $row['id_room'],
'name' => $row['room_name'],
);
}
return $grouped;
}
public static function getTotalConnectedRooms($idRoom = 0, $idRoomConnected = 0)
{
$idRoom = (int) $idRoom;
$idRoomConnected = (int) $idRoomConnected;
if ($idRoom <= 0 && $idRoomConnected > 0) {
$sql = 'SELECT DISTINCT id_room
FROM `' . _DB_PREFIX_ . 'htl_connected_room`
WHERE id_room_connected = ' . $idRoomConnected;
$results = Db::getInstance()->executeS($sql);
if ($results === false) {
return array();
}
$grouped = array();
foreach ($results as $row) {
$mainRoomId = (int) $row['id_room_information'];
$connType = (string) $row['connected_room_type'];
if (!isset($grouped[$mainRoomId])) {
$grouped[$mainRoomId] = array();
}
if (!isset($grouped[$mainRoomId][$connType])) {
$grouped[$mainRoomId][$connType] = array();
}
$grouped[$mainRoomId][$connType][] = $row;
}
if($count){
return count($results);
}else{
return $grouped;
}
} else {
$sql = 'SELECT hri.*, pl.name AS room_type
FROM `' . _DB_PREFIX_ . 'htl_room_information` hri
LEFT JOIN `' . _DB_PREFIX_ . 'product_lang` pl ON (pl.id_product = hri.id_product AND pl.id_lang = ' . (int) $idLang . ')
WHERE 1';
if ($hotelId > 0) {
$sql .= ' AND hri.id_hotel = ' . (int) $hotelId;
}
$sql .= ' AND hri.id != ' . (int) $roomId . '
AND NOT EXISTS (SELECT 1 FROM `' . _DB_PREFIX_ . 'htl_connected_room` cr WHERE cr.id_room = ' . (int) $roomId . ' AND cr.id_room_connected = hri.id)
ORDER BY hri.room_num ASC';
$results = Db::getInstance()->executeS($sql);
return ($results === false) ? array() : $results;
return array_column($results, 'id_room');
}
$sql = 'SELECT COUNT(*) FROM `' . _DB_PREFIX_ . 'htl_connected_room` hcr
INNER JOIN `' . _DB_PREFIX_ . 'htl_room_information` hri
ON hri.id = hcr.id_room_connected
WHERE hcr.id_room = ' . $idRoom;
return (int) Db::getInstance()->getValue($sql);
}
public static function getRoomConnectedWith($roomId)
{
$objHotelRoomInformation = new HotelRoomInformation($roomId);
$idProduct = $objHotelRoomInformation->id_product;
if (!$idProduct) {
return array();
}
$sql = 'SELECT DISTINCT case
WHEN hcr.id_room = ' . (int) $roomId . ' THEN hcr.id_room_connected
ELSE hcr.id_room
END AS affected_room_id
FROM `' . _DB_PREFIX_ . 'htl_connected_room` hcr
INNER JOIN `' . _DB_PREFIX_ . 'htl_room_information` hri
ON (hri.id = hcr.id_room OR hri.id = hcr.id_room_connected)
WHERE (hcr.id_room = ' . (int) $roomId . ' OR hcr.id_room_connected = ' . (int) $roomId . ')
AND hri.id != ' . (int) $roomId . '
AND hri.id_product = ' . (int) $idProduct;
$results = Db::getInstance()->executeS($sql);
return $results ? array_column($results, 'affected_room_id') : array();
}
}

View File

@@ -387,7 +387,7 @@ class AdminHotelRoomsBookingController extends ModuleAdminController
'max_child_in_room' => Configuration::get('WK_GLOBAL_MAX_CHILD_IN_ROOM'),
'link' => $this->context->link,
'ALLOTMENT_MANUAL' => HotelBookingDetail::ALLOTMENT_MANUAL,
'htl_connected_rooms' => HotelConnectedRoom::getConnectedRooms($this->context->language->id, true, true),
'htl_connected_rooms' => HotelConnectedRoom::getConnectedRooms(null, $this->context->language->id),
));
if (Configuration::get('PS_BACKOFFICE_SEARCH_TYPE') == HotelBookingDetail::SEARCH_TYPE_OWS) {
@@ -1038,6 +1038,7 @@ class AdminHotelRoomsBookingController extends ModuleAdminController
// add fullcalender plugin
$this->addJqueryUI('ui.tooltip', 'base', true);
$this->removeJS(Media::getJqueryUIPath('effects.core', 'base', false), false);
$this->addCSS(array(_MODULE_DIR_.'hotelreservationsystem/views/css/HotelReservationAdmin.css'));
$this->addCSS(_PS_JS_DIR_.'fullcalendar/main.css');
$this->addJs(_PS_JS_DIR_.'fullcalendar/main.js');

View File

@@ -577,7 +577,7 @@ p.room_cat_data
.fc-today-button:disabled {
display: none;
}
/* book now page tooltip */
/*tooltip */
.tooltip_cont {
min-width: 280px;
width: 100%;
@@ -607,6 +607,19 @@ body.adminhotelroomsbooking .ui-tooltip {
padding: 10px;
box-shadow: 0px 0px 15px 0px #00000026;
}
.ui-tooltip {
border: unset;
padding: 10px;
box-shadow: 0px 0px 15px 0px #00000026;
}
.tooltip_cont { min-width: 280px; width: 100%; font-size: 14px; font-weight: 600; }
.tooltip_cont .tip_header { margin-bottom: 10px; }
.tooltip_cont .tip-body > div { margin-bottom: 6px; }
.tip_element_head { font-size: 12px; }
.tip_element_value { font-size: 16px; opacity: 0.6; }
.tip-body { display: grid; grid-template-columns: auto auto; }
.tip-body.connected-tip-body { display: grid; grid-template-columns: 1fr 1fr; gap: 8px 16px; }
.connected-room-icon { color: #008abd; cursor: pointer; }
#room-reallocation-modal .modal-footer {
padding: 15px 0px 0px 0px

View File

@@ -44,6 +44,7 @@
{if isset($htl_connected_rooms[$avai_v['id_room']]) && $htl_connected_rooms[$avai_v['id_room']]|@count > 0}
{include file="controllers/products/connected-rooms.tpl" htl_connected_rooms=$htl_connected_rooms[$avai_v['id_room']]}
{/if}
{hook h='displayRoomNumAfter' data=$avai_v type='available'}</td>
{assign var="is_full_date" value=($show_full_date && ($date_from|date_format:'%D' == $date_to|date_format:'%D'))}
<td>{dateFormat date=$date_from full=$is_full_date} - {dateFormat date=$date_to full=$is_full_date}</td>