Merge branch 'master' of git.freeside.biz:/home/git/freeside

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

diff --git a/httemplate/view/cust_main/payment_history/payment.html b/httemplate/view/cust_main/payment_history/payment.html
index 8faed3c..6402383 100644 (file)
--- a/httemplate/view/cust_main/payment_history/payment.html
+++ b/httemplate/view/cust_main/payment_history/payment.html
@@ -104,6 +104,7 @@ if ($unapplied > 0) {
       $apply.= ' ('.
                include( '/elements/popup_link.html',
                           'label'       => emt('apply refund'),
+                          'style'       => 'white-space: nowrap',
                           'action'      => "${p}edit/cust_pay_refund.cgi?".
                                            $cust_pay->paynum,
                           'actionlabel' => emt('Apply payment to refund'),
@@ -179,17 +180,18 @@ if (    $cust_pay->closed !~ /^Y/i
 }
 
 my $void = '';
-# note: "TOKN" is not yet supported in stock freeside
-my $voidmsg = $cust_pay->payby =~ /^(CARD|CHEK|TOKN)$/
+my $voidmsg = $cust_pay->payby =~ /^(CARD|CHEK)$/
               ? ' (' . emt('do not send anything to the payment gateway').')'
               : '';
 $void = ' ('.
-               include( '/elements/popup_link.html',
-                    'label'    => emt('void'),
-                    'action'   => "${p}misc/void-cust_pay.html?".$cust_pay->paynum,
-                    'actionlabel' => emt('Void payment'),
-                ).
-          ')'
+           include( '/elements/popup_link.html',
+                'label'    => emt('void'),
+                'action'   => "${p}misc/void-cust_pay.html?".$cust_pay->paynum,
+                'actionlabel' => emt('Void payment'),
+                'title'       => emt('Void this payment from the database').
+                                 $voidmsg,
+           ).
+         ')'
   if $cust_pay->closed !~ /^Y/i
   && (    ( $cust_pay->payby eq 'CARD'          && $opt{'Credit card void'} )
        || ( $cust_pay->payby eq 'CHEK'          && $opt{'Echeck void'}      )