[freeside-commits] branch FREESIDE_4_BRANCH updated. c5e968992dcf349bbc2862909c70204fe4b980f9

Ivan ivan at 420.am
Fri Aug 25 12:41:01 PDT 2017


The branch, FREESIDE_4_BRANCH has been updated
       via  c5e968992dcf349bbc2862909c70204fe4b980f9 (commit)
      from  2ba25f8bd8dedf4ec194727b9669508946032aba (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c5e968992dcf349bbc2862909c70204fe4b980f9
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri Aug 25 12:40:59 2017 -0700

    restore void tooltip on v4, RT#77279

diff --git a/httemplate/view/cust_main/payment_history/payment.html b/httemplate/view/cust_main/payment_history/payment.html
index 6241f11..6402383 100644
--- a/httemplate/view/cust_main/payment_history/payment.html
+++ b/httemplate/view/cust_main/payment_history/payment.html
@@ -180,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'}      )

-----------------------------------------------------------------------

Summary of changes:
 .../view/cust_main/payment_history/payment.html       |   17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)




More information about the freeside-commits mailing list