RT #25498 adding reason to voided payments and voided invoices on payment history

[freeside.git] / httemplate / view / cust_main / payment_history / voided_payment.html

diff --git a/httemplate/view/cust_main/payment_history/voided_payment.html b/httemplate/view/cust_main/payment_history/voided_payment.html
index 08469db..207ab9c 100644 (file)
--- a/httemplate/view/cust_main/payment_history/voided_payment.html
+++ b/httemplate/view/cust_main/payment_history/voided_payment.html
@@ -1,22 +1,19 @@
-<DEL>Payment <% $info %></DEL>
-<I>voided <% time2str("%D", $cust_pay_void->void_date) %>
-by <% $cust_pay_void->otaker %></I><% $unvoid %>
+<DEL><% mt("Payment [_1] by [_2]", $info, $cust_pay_void->otaker ) |h %></DEL>
+<I><% mt("voided ([_1]) [_2]", $cust_pay_void->reason, time2str($date_format, $cust_pay_void->void_date) ) |h %> 
+% my $void_user = $cust_pay_void->void_access_user;
+% if ($void_user) {
+    by <% $void_user->username %></I>
+% }
+<% $unvoid %>
 <%init>
 
 my( $cust_pay_void, %opt ) = @_;
 
-my $curuser = $FS::CurrentUser::CurrentUser;
+my $date_format = $opt{'date_format'} || '%m/%d/%Y';
 
-my $payby = $cust_pay_void->payby;
-my $payinfo = $payby eq 'CARD'
-                ? $cust_pay_void->paymask
-                : $cust_pay_void->payinfo;
-
-$payby =~ s/^BILL$/Check #/ if $payinfo;
-$payby =~ s/^CHEK$/Electronic check /;
-$payby =~ s/^BILL$//;
-$payby =~ s/^(CARD|COMP)$/$1 /;
-my $info = $payby ? " ($payby$payinfo)" : '';
+my ($payby,$payinfo) = translate_payinfo($cust_pay_void);
+$payby = translate_payby($payby,$payinfo);
+my $info = $payby ? "($payby$payinfo)" : '';
 
 if ( $opt{'pkg-balances'} && $cust_pay_void->pkgnum ) {
   my $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $cust_pay_void->pkgnum } );
@@ -24,19 +21,14 @@ if ( $opt{'pkg-balances'} && $cust_pay_void->pkgnum ) {
 }
 
 my $unvoid = '';
-if ( $cust_pay_void->closed !~ /^Y/i
-     && $curuser->access_right('Unvoid')
-   )
-{
-  $unvoid = qq! (<A HREF="javascript:areyousure('!.
-            qq!${p}misc/unvoid-cust_pay_void.cgi?!. $cust_pay_void->paynum.
-            qq!', 'Are you sure you want to unvoid this payment?')"!.
-            qq! TITLE="Unvoid this payment from the database!.
-              ( $cust_pay_void->payby =~ /^(CARD|CHEK)$/
-                ? ' (do not send anything to the payment gateway)'
-                : '' 
-              ). '"'.
-            qq!>unvoid</A>)!;
-}
+my $unvoidmsg = $cust_pay_void->payby =~ /^(CARD|CHEK)$/
+                ? ' ('.emt('do not send anything to the payment gateway') .')'
+                : '';
+$unvoid = areyousure_link("${p}misc/unvoid-cust_pay_void.cgi?".$cust_pay_void->paynum,
+                            emt('Are you sure you want to unvoid this payment?'),
+                            emt('Unvoid this payment from the database') . $unvoidmsg,
+                            emt('unvoid')
+                         )
+  if $cust_pay_void->closed !~ /^Y/i && $opt{'Unvoid payments'};
 
 </%init>