Merge pull request #2011 from amitsharma322/gli-3355
Fixed: Date validation issue in reports when selecting the same From and To dates in back office
This commit is contained in:
@@ -50,9 +50,8 @@
|
|||||||
let dateFrom = $('form#calendar_form .datepicker#datepickerFrom').val().trim();
|
let dateFrom = $('form#calendar_form .datepicker#datepickerFrom').val().trim();
|
||||||
let dateTo = $('form#calendar_form .datepicker#datepickerTo').val().trim();
|
let dateTo = $('form#calendar_form .datepicker#datepickerTo').val().trim();
|
||||||
|
|
||||||
if (dateFrom >= dateTo) {
|
if (dateFrom > dateTo) {
|
||||||
let objDateToMin = $.datepicker.parseDate('yy-mm-dd', dateFrom);
|
let objDateToMin = $.datepicker.parseDate('yy-mm-dd', dateFrom);
|
||||||
objDateToMin.setDate(objDateToMin.getDate() + 1);
|
|
||||||
|
|
||||||
$('form#calendar_form .datepicker#datepickerTo').datepicker('option', 'minDate', objDateToMin);
|
$('form#calendar_form .datepicker#datepickerTo').datepicker('option', 'minDate', objDateToMin);
|
||||||
$('form#calendar_form .datepicker#datepickerTo').val($.datepicker.formatDate('yy-mm-dd', objDateToMin));
|
$('form#calendar_form .datepicker#datepickerTo').val($.datepicker.formatDate('yy-mm-dd', objDateToMin));
|
||||||
@@ -70,14 +69,10 @@
|
|||||||
|
|
||||||
if (typeof dateFrom != 'undefined' && dateFrom != '') {
|
if (typeof dateFrom != 'undefined' && dateFrom != '') {
|
||||||
let objDateToMin = $.datepicker.parseDate('yy-mm-dd', dateFrom);
|
let objDateToMin = $.datepicker.parseDate('yy-mm-dd', dateFrom);
|
||||||
objDateToMin.setDate(objDateToMin.getDate() + 1);
|
|
||||||
|
|
||||||
$('form#calendar_form .datepicker#datepickerTo').datepicker('option', 'minDate', objDateToMin);
|
$('form#calendar_form .datepicker#datepickerTo').datepicker('option', 'minDate', objDateToMin);
|
||||||
} else {
|
} else {
|
||||||
let objDateToMin = new Date();
|
$('form#calendar_form .datepicker#datepickerTo').datepicker('option', 'minDate', null);
|
||||||
objDateToMin.setDate(objDateToMin.getDate() + 1);
|
|
||||||
|
|
||||||
$('form#calendar_form .datepicker#datepickerTo').datepicker('option', 'minDate', objDateToMin);
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "qloapps/qloapps",
|
"name": "qloapps/qloapps",
|
||||||
"description": "QloApps is an Open-source and Free hotel reservation system and booking engine. With the help of QloApps, you can launch your hotel booking website without any cost and take & manage online bookings.",
|
"description": "QloApps is a free and open-source hotel management and reservation system that helps you take your property business online. It offers a comprehensive Property Management System (PMS), a Booking Engine, and an attractive property website. With QloApps, you can streamline daily operations, simplify booking management, and enhance the overall experience for both property owners and guests.",
|
||||||
"type": "project",
|
"type": "project",
|
||||||
"homepage": "https://qloapps.com",
|
"homepage": "https://qloapps.com",
|
||||||
"license": "OSL-3.0",
|
"license": "OSL-3.0",
|
||||||
|
|||||||
Reference in New Issue
Block a user