From 4bfb66bb0dcd3f7207e9bef3a7f23c6bf39661f2 Mon Sep 17 00:00:00 2001 From: aradhana kumari Date: Wed, 17 Jun 2026 10:19:01 +0530 Subject: [PATCH] Fixed: Add the remark field Co-authored-by: Name --- .../controllers/slip/_booking_amount_desc.tpl | 7 ++- .../slip/_display_voucher_link.tpl | 2 + .../controllers/slip/modal_confirm_update.tpl | 2 +- classes/order/OrderSlip.php | 38 +++++++++++- config/defines.inc.php | 2 +- controllers/admin/AdminSlipController.php | 61 ++++++++++++++++--- install/data/db_structure.sql | 1 + js/admin/slips.js | 23 +++++++ 8 files changed, 123 insertions(+), 13 deletions(-) diff --git a/admin/themes/default/template/controllers/slip/_booking_amount_desc.tpl b/admin/themes/default/template/controllers/slip/_booking_amount_desc.tpl index 4e7b9d568..b937c7a34 100644 --- a/admin/themes/default/template/controllers/slip/_booking_amount_desc.tpl +++ b/admin/themes/default/template/controllers/slip/_booking_amount_desc.tpl @@ -19,5 +19,8 @@ * @copyright Since 2010 Webkul * @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0 *} - -{l s='Total cost of room and service:'} - +{l s='Total room price:'} -
+{l s='Total service price:'} -
+{l s='Total order amount:'} -
+{l s='Total credit slip amount for this order:'} -
+ diff --git a/admin/themes/default/template/controllers/slip/_display_voucher_link.tpl b/admin/themes/default/template/controllers/slip/_display_voucher_link.tpl index b6516e115..ba905dc55 100644 --- a/admin/themes/default/template/controllers/slip/_display_voucher_link.tpl +++ b/admin/themes/default/template/controllers/slip/_display_voucher_link.tpl @@ -24,6 +24,8 @@ #{$id_cart_rule} +{elseif $row['redeem_status'] == OrderSlip::REDEEM_STATUS_REDEEMED} + -- {else} {l s='Generate Voucher'} diff --git a/admin/themes/default/template/controllers/slip/modal_confirm_update.tpl b/admin/themes/default/template/controllers/slip/modal_confirm_update.tpl index 2d40d060f..14ceaa136 100644 --- a/admin/themes/default/template/controllers/slip/modal_confirm_update.tpl +++ b/admin/themes/default/template/controllers/slip/modal_confirm_update.tpl @@ -22,7 +22,7 @@