From 7de0e4d649d2c9930720363c858f64b4f2f62efc Mon Sep 17 00:00:00 2001 From: Jonathan Prykop Date: Tue, 23 Feb 2016 09:04:46 -0600 Subject: [PATCH] RT#39586 Manual check refunds cannot be unapplied [nbsp] --- httemplate/view/cust_main/payment_history/credit.html | 6 +++--- httemplate/view/cust_main/payment_history/payment.html | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/httemplate/view/cust_main/payment_history/credit.html b/httemplate/view/cust_main/payment_history/credit.html index da8ca2e9a..1e7a7df99 100644 --- a/httemplate/view/cust_main/payment_history/credit.html +++ b/httemplate/view/cust_main/payment_history/credit.html @@ -45,7 +45,7 @@ if ( scalar(@cust_credit_bill) == 0 if ( $opt{total_unapplied_refunds} > 0 ) { $apply.= ' ('. include( '/elements/popup_link.html', - 'label' => emt('apply refund'), + 'label' => emt('apply').' '.emt('refund'), 'action' => "${p}edit/cust_credit_refund.cgi?". $cust_credit->crednum, 'actionlabel' => emt('Apply credit to refund'), @@ -100,7 +100,7 @@ if ( scalar(@cust_credit_bill) == 0 if ( $opt{total_unapplied_refunds} > 0 ) { $apply.= ' ('. include( '/elements/popup_link.html', - 'label' => emt('apply refund'), + 'label' => emt('apply').' '.emt('refund'), 'action' => "${p}edit/cust_credit_refund.cgi?". $cust_credit->crednum, 'actionlabel' => emt('Apply credit to refund'), @@ -150,7 +150,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 refunds') + emt('unapply').' '.emt('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 8faed3ca7..f65c903ba 100644 --- a/httemplate/view/cust_main/payment_history/payment.html +++ b/httemplate/view/cust_main/payment_history/payment.html @@ -103,7 +103,7 @@ if ($unapplied > 0) { if ( $opt{total_unapplied_refunds} > 0 ) { $apply.= ' ('. include( '/elements/popup_link.html', - 'label' => emt('apply refund'), + 'label' => emt('apply').' '.emt('refund'), 'action' => "${p}edit/cust_pay_refund.cgi?". $cust_pay->paynum, 'actionlabel' => emt('Apply payment to refund'), @@ -207,7 +207,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 refunds') + emt('unapply').' '.emt('refunds') ) if $cust_pay->refund_to_unapply; } -- 2.11.0