From e95180b9954f9e7bd5f4e7183e7591df4fa56746 Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Thu, 30 Mar 2023 14:49:52 +0530 Subject: [PATCH] updated refund details on admin and backoffice pages --- .../controllers/orders/_product_line.tpl | 19 +++--- .../orders/_rooms_informaion_table.tpl | 9 +-- classes/order/OrderReturn.php | 4 +- controllers/admin/AdminOrdersController.php | 6 +- controllers/front/OrderDetailController.php | 19 +++++- controllers/front/OrderReturnController.php | 8 ++- .../hotel-reservation-theme/order-detail.tpl | 20 +++--- .../hotel-reservation-theme/order-follow.tpl | 8 ++- .../hotel-reservation-theme/order-return.tpl | 63 ++++++++++++++----- 9 files changed, 103 insertions(+), 53 deletions(-) diff --git a/admin/themes/default/template/controllers/orders/_product_line.tpl b/admin/themes/default/template/controllers/orders/_product_line.tpl index 2223946c2..e68b185df 100644 --- a/admin/themes/default/template/controllers/orders/_product_line.tpl +++ b/admin/themes/default/template/controllers/orders/_product_line.tpl @@ -221,10 +221,14 @@ {/if} - {if isset($refundReqBookings) && $refundReqBookings} + {if (isset($refundReqBookings) && $refundReqBookings) || (isset($isCancelledRoom) && $isCancelledRoom)} - {if isset($data.refund_info) && $data.refund_info} + {if $data.is_cancelled} + {l s='Cancelled'} + {elseif isset($data.refund_info) && $data.refund_info} {$data.refund_info.name|escape:'html':'UTF-8'} + {else} + -- {/if} @@ -233,15 +237,6 @@ {/if} {/if} - {if isset($isCancelledRoom) && $isCancelledRoom} - - {if $data.is_refunded} - {l s='Cancelled'} - {else} - -- - {/if} - - {/if} {if ($can_edit && !$order->hasBeenDelivered())} {if sizeof($invoices_collection)} @@ -256,7 +251,7 @@   {/if} - + {* edit/delete controls *}
- {$currentStateInfo['name']|escape:'html':'UTF-8'} + + {if $isCanceled} + {l s='Cancelled'} + {else} + {$currentStateInfo['name']|escape:'html':'UTF-8'} + {/if} +
@@ -120,22 +126,49 @@ {displayPrice price=$orderReturnInfo['refunded_amount'] currency=$orderInfo['id_currency']}
-
-