From e9d371c33b5f53fd078c5f5a7d93e5c36743c8bc Mon Sep 17 00:00:00 2001 From: Alex Brelsfoard Date: Sat, 31 Jan 2015 23:29:13 -0500 Subject: [PATCH] RT #25498 adding reason to voided payments and voided invoices on payment history --- httemplate/view/cust_main/payment_history/voided_invoice.html | 10 ++++++++-- httemplate/view/cust_main/payment_history/voided_payment.html | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/httemplate/view/cust_main/payment_history/voided_invoice.html b/httemplate/view/cust_main/payment_history/voided_invoice.html index f9ff3079a..a64501fc0 100644 --- a/httemplate/view/cust_main/payment_history/voided_invoice.html +++ b/httemplate/view/cust_main/payment_history/voided_invoice.html @@ -1,9 +1,15 @@ <% $link %><% $invoice %><% $link ? '' : '' %> -<% mt("voided [_1]", time2str($date_format, $cust_bill_void->void_date) ) |h %> +voided % my $void_user = $cust_bill_void->void_access_user; % if ($void_user) { - by <% $void_user->username %> + by <% $void_user->username %> % } +% my $reason = $cust_bill_void->reason; +% if ($reason) { + (<% $reason %>) +% } +<% mt("on [_1]", time2str($date_format, $cust_bill_void->void_date) ) |h %> + <% "$unvoid$delete$under" %> <%init> diff --git a/httemplate/view/cust_main/payment_history/voided_payment.html b/httemplate/view/cust_main/payment_history/voided_payment.html index a8194a75f..63cfb309f 100644 --- a/httemplate/view/cust_main/payment_history/voided_payment.html +++ b/httemplate/view/cust_main/payment_history/voided_payment.html @@ -1,9 +1,15 @@ <% mt("Payment [_1] by [_2]", $info, $cust_pay_void->otaker ) |h %> -<% mt("voided [_1]", time2str($date_format, $cust_pay_void->void_date) ) |h %> +voided % my $void_user = $cust_pay_void->void_access_user; % if ($void_user) { - by <% $void_user->username %> + by <% $void_user->username %> % } +% my $reason = $cust_pay_void->reason; +% if ($reason) { + (<% $reason %>) +% } +<% mt("on [_1]", time2str($date_format, $cust_pay_void->void_date) ) |h %> + <% $unvoid %> <%init> -- 2.11.0