[freeside-commits] branch FREESIDE_3_BRANCH updated. acc8122f031e2d10141a7cb80cfa73ac74ed2e86

[Jonathan Prykop]

The branch, FREESIDE_3_BRANCH has been updated
       via  acc8122f031e2d10141a7cb80cfa73ac74ed2e86 (commit)
      from  efeb24eb94eb8b32566ff9bbe5f69518d1e90631 (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 acc8122f031e2d10141a7cb80cfa73ac74ed2e86
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Mon Mar 21 18:58:01 2016 -0500

    RT#39586 Manual check refunds cannot be unapplied [better whitespace handling]

diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html
index 737b0e2..a28fa07 100644
--- a/httemplate/view/cust_main/payment_history.html
+++ b/httemplate/view/cust_main/payment_history.html
@@ -689,7 +689,7 @@ sub translate_payinfo {
 
 sub areyousure_link {
     my ($url,$msg,$title,$label) = (shift,shift,shift,shift);
-    ' (<A HREF="javascript:areyousure(\''.$url.'\',\''.$msg.'\')" TITLE="'.$title.'">'.$label.'</A>)';
+    ' (<A HREF="javascript:areyousure(\''.$url.'\',\''.$msg.'\')" TITLE="'.$title.'" STYLE="white-space: nowrap;">'.$label.'</A>)';
 }
 
 </%init>
diff --git a/httemplate/view/cust_main/payment_history/credit.html b/httemplate/view/cust_main/payment_history/credit.html
index 4655203..b6b145a 100644
--- a/httemplate/view/cust_main/payment_history/credit.html
+++ b/httemplate/view/cust_main/payment_history/credit.html
@@ -45,7 +45,8 @@ if (    scalar(@cust_credit_bill)   == 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_credit_refund.cgi?".
                                         $cust_credit->crednum,
                           'actionlabel' => emt('Apply credit to refund'),
@@ -100,7 +101,8 @@ if (    scalar(@cust_credit_bill)   == 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_credit_refund.cgi?".
                                              $cust_credit->crednum,
                             'actionlabel' => emt('Apply credit to refund'),
@@ -159,7 +161,7 @@ if ($opt{'Unapply credit'} && !$cust_credit->closed) {
   $unapply .= areyousure_link("${p}misc/unapply-cust_credit_refund.cgi?".$cust_credit->crednum,
                                emt('Are you sure you want to unapply this credit from refunds?'),
                                emt('Keep this credit, but dissociate it from the refunds it is currently applied to'),
-                               emt('unapply').' '.emt('refunds')
+                               emt('unapply refunds')
                              )
     if $cust_credit->refund_to_unapply;
 }
diff --git a/httemplate/view/cust_main/payment_history/payment.html b/httemplate/view/cust_main/payment_history/payment.html
index 6c72323..cc5789b 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'),
@@ -213,7 +214,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').' '.emt('refunds')
+                               emt('unapply refunds')
                              )
     if $cust_pay->refund_to_unapply;
 }

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

Summary of changes:
 httemplate/view/cust_main/payment_history.html         |    2 +-
 httemplate/view/cust_main/payment_history/credit.html  |    8 +++++---
 httemplate/view/cust_main/payment_history/payment.html |    5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)