X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpayment_history%2Fpayment.html;h=3fe588b5250d77e711d9dc74fd1288b37cdc35f4;hb=7c079bd8cb5ccf5381ac0c054438efcd0645ddbf;hp=6c723237e10849e04cee7b20cd489b94672248d1;hpb=1694050ffbdb5c4e214bc0d13294d3b262d33129;p=freeside.git

diff --git a/httemplate/view/cust_main/payment_history/payment.html b/httemplate/view/cust_main/payment_history/payment.html
index 6c723237e..3fe588b52 100644
--- a/httemplate/view/cust_main/payment_history/payment.html
+++ b/httemplate/view/cust_main/payment_history/payment.html
@@ -103,7 +103,8 @@ if ($unapplied > 0) {
     if ( $opt{total_unapplied_refunds} > 0 ) {
       $apply.= ' ('.
                include( '/elements/popup_link.html',
-                          'label'       => emt('apply').' '.emt('refund'),
+                          'label'       => emt('apply refund'),
+                          'style'       => 'white-space: nowrap',
                           'action'      => "${p}edit/cust_pay_refund.cgi?".
                                            $cust_pay->paynum,
                           'actionlabel' => emt('Apply payment to refund'),
@@ -176,6 +177,7 @@ if (    $cust_pay->closed !~ /^Y/i
             qq! TITLE="! . $refundtitle
             . '">' . emt('refund') . '</A>)';
 }
+$refund = '' if ($cust_pay->batchnum && !FS::pay_batch->can_handle_electronic_refunds);
 
 my $void = '';
 my $voidmsg = $cust_pay->payby =~ /^(CARD|CHEK)$/
@@ -213,7 +215,7 @@ if ($opt{'Unapply payment'} && !$cust_pay->closed) {
   $unapply .= areyousure_link("${p}misc/unapply-cust_pay_refund.cgi?".$cust_pay->paynum,
                                emt('Are you sure you want to unapply this payment from refunds?'),
                                emt('Keep this payment, but dissociate it from the refunds it is currently applied to'),
-                               emt('unapply').'&nbsp;'.emt('refunds')
+                               emt('unapply refunds')
                              )
     if $cust_pay->refund_to_unapply;
 }