From fff499a10eda84bb5e9d488fa07558681f6082be Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Tue, 24 Sep 2024 17:27:47 +0530 Subject: [PATCH 1/3] Fixed: The vocher expiry date was not saved correctly while trying to generate voucher from the refund request --- .../controllers/admin/AdminOrderRefundRequestsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php b/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php index d9664b18e..55ac676b4 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php @@ -496,7 +496,7 @@ class AdminOrderRefundRequestsController extends ModuleAdminController $cartrule->date_from = date('Y-m-d H:i:s', $now); // generateDiscount if ($voucher_expiry_date) { - $cartrule->date_to = date('Y-m-d H:i:s', strtotime($voucher_expiry_date)); + $cartrule->date_to = date('Y-m-d', strtotime($voucher_expiry_date)).' 23:00:00'; } else { $cartrule->date_to = date('Y-m-d H:i:s', $now + (3600 * 24 * 365.25)); /* 1 year */ } From 6c9f833cd0d22e62ce35cff66107f4dcba631ea0 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Thu, 3 Oct 2024 11:52:01 +0530 Subject: [PATCH 2/3] Updated: The min expiry date for voucher created while refund --- .../hotelreservationsystem/views/js/admin/wk_refund_request.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/hotelreservationsystem/views/js/admin/wk_refund_request.js b/modules/hotelreservationsystem/views/js/admin/wk_refund_request.js index c6b039f7c..1976cd7cd 100644 --- a/modules/hotelreservationsystem/views/js/admin/wk_refund_request.js +++ b/modules/hotelreservationsystem/views/js/admin/wk_refund_request.js @@ -89,7 +89,7 @@ $(document).ready(function() { dateFormat: 'dd-mm-yy', altFormat: 'yy-mm-dd', altField: '#voucher_expiry_date', - minDate: 0, + minDate: +1, }); $(document).on('change', '#generateDiscount', function() { From f8e8a33b7133a59987368345cf9c61cc5ec1c631 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Thu, 3 Oct 2024 15:33:18 +0530 Subject: [PATCH 3/3] Updated: max expiry time for the vouchers created using the refund request --- .../controllers/admin/AdminOrderRefundRequestsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php b/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php index 55ac676b4..4c889b751 100644 --- a/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php +++ b/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php @@ -496,7 +496,7 @@ class AdminOrderRefundRequestsController extends ModuleAdminController $cartrule->date_from = date('Y-m-d H:i:s', $now); // generateDiscount if ($voucher_expiry_date) { - $cartrule->date_to = date('Y-m-d', strtotime($voucher_expiry_date)).' 23:00:00'; + $cartrule->date_to = date('Y-m-d', strtotime($voucher_expiry_date)).' 23:59:59'; } else { $cartrule->date_to = date('Y-m-d H:i:s', $now + (3600 * 24 * 365.25)); /* 1 year */ }