[freeside-commits] freeside/httemplate/view/cust_main/payment_history credit.html, 1.7, 1.8 invoice.html, 1.3, 1.4 payment.html, 1.9, 1.10 refund.html, 1.4, 1.5 voided_payment.html, 1.7, 1.8
Erik Levinson
levinse at wavetail.420.am
Mon May 16 12:47:22 PDT 2011
- Previous message: [freeside-commits] freeside/httemplate/view/cust_main payment_history.html, 1.54, 1.55
- Next message: [freeside-commits] freeside/httemplate/view/cust_main billing.html, 1.26, 1.27 misc.html, 1.19, 1.20 order_pkg_link.html, 1.5, 1.6 packages.html, 1.79, 1.80
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /home/cvs/cvsroot/freeside/httemplate/view/cust_main/payment_history
In directory wavetail.420.am:/tmp/cvs-serv17361/payment_history
Modified Files:
credit.html invoice.html payment.html refund.html
voided_payment.html
Log Message:
internationalization/localization, RT12515
Index: voided_payment.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main/payment_history/voided_payment.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -d -r1.7 -r1.8
--- voided_payment.html 16 May 2011 18:48:25 -0000 1.7
+++ voided_payment.html 16 May 2011 19:47:20 -0000 1.8
@@ -34,19 +34,14 @@
}
my $unvoid = '';
-if ( $cust_pay_void->closed !~ /^Y/i
- && $curuser->access_right('Unvoid')
- )
-{
- $unvoid = qq! (<A HREF="javascript:areyousure('!.
- qq!${p}misc/unvoid-cust_pay_void.cgi?!. $cust_pay_void->paynum.
- qq!', 'Are you sure you want to unvoid this payment?')"!.
- qq! TITLE="!.mt('Unvoid this payment from the database').
- ( $cust_pay_void->payby =~ /^(CARD|CHEK)$/
+my $unvoidmsg = $cust_pay_void->payby =~ /^(CARD|CHEK)$/
? ' ('.mt('do not send anything to the payment gateway') .')'
- : ''
- ). '"'.
- '>'.mt('unvoid').'</A>)';
-}
+ : '';
+$unvoid = areyousure_link("${p}misc/unvoid-cust_pay_void.cgi?".$cust_pay_void->paynum,
+ mt('Are you sure you want to unvoid this payment?'),
+ mt('Unvoid this payment from the database') . $unvoidmsg,
+ mt('unvoid')
+ )
+ if ( $cust_pay_void->closed !~ /^Y/i && $curuser->access_right('Unvoid') );
</%init>
Index: refund.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main/payment_history/refund.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -d -r1.4 -r1.5
--- refund.html 16 May 2011 18:48:25 -0000 1.4
+++ refund.html 16 May 2011 19:47:20 -0000 1.5
@@ -1,6 +1,6 @@
<% $refund %>
-(<% $payby. $payinfo %>)
-<% mt('by') |h %> <% $cust_refund->otaker %><% $view %><% $delete %>
+(<% "$payby$payinfo" %>)
+<% "$view$delete" %>
<%init>
my( $cust_refund, %opt ) = @_;
@@ -14,8 +14,10 @@
$payby = translate_payby_refund($payby,$payinfo);
-my $refund = mt('Refund');
-$refund = '<B><FONT COLOR="#FF0000">' . mt('Unapplied Refund') . '</FONT></B>'
+my $refund = mt("Refund by [_1]",$cust_refund->otaker);
+$refund = '<B><FONT COLOR="#FF0000">'
+ . mt("Unapplied Refund by [_1]",$cust_refund->otaker)
+ . '</FONT></B>'
if $cust_refund->unapplied > 0;
my $view =
@@ -29,17 +31,13 @@
my $delete = '';
-if ( $cust_refund->closed !~ /^Y/i
- && $opt{'deleterefunds'}
- && $curuser->access_right('Delete refund')
+$delete = areyousure_link("${p}misc/delete-cust_refund.cgi?".$cust_refund->refundnum,
+ mt('Are you sure you want to delete this refund?'),
+ mt('Delete this refund from the database completely - not recommended'),
+ mt('delete')
)
-{
- $delete = qq! (<A HREF="javascript:areyousure('!.
- qq!${p}misc/delete-cust_refund.cgi?!. $cust_refund->refundnum.
- qq!', 'Are you sure you want to delete this refund?')"!.
- qq! TITLE="!.mt('Delete this refund from the database completely - not recommended').
- ">".mt('delete')."</A>)";
-}
+ if ( $cust_refund->closed !~ /^Y/i && $opt{'deleterefunds'}
+ && $curuser->access_right('Delete refund') );
</%init>
Index: invoice.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main/payment_history/invoice.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -d -r1.3 -r1.4
--- invoice.html 16 May 2011 18:48:25 -0000 1.3
+++ invoice.html 16 May 2011 19:47:19 -0000 1.4
@@ -20,13 +20,12 @@
: '';
my $delete = '';
-if ( $opt{'deleteinvoices'} && $curuser->access_right('Delete invoices') ) {
- $delete = qq! (<A HREF="javascript:areyousure('!.
- qq!${p}misc/delete-cust_bill.html?$invnum',!.
- qq!'Are you sure you want to delete this invoice?')"!.
- qq! TITLE="Delete this invoice from the database completely"!.
- mt('delete') . '</A>)';
-}
+$delete = areyousure_link("${p}misc/delete-cust_bill.html?$invnum",
+ mt('Are you sure you want to delete this invoice?'),
+ mt('Delete this invoice from the database completely'),
+ mt('delete')
+ )
+ if ( $opt{'deleteinvoices'} && $curuser->access_right('Delete invoices') );
my $events = '';
#1.9
Index: payment.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main/payment_history/payment.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -d -r1.9 -r1.10
--- payment.html 16 May 2011 18:48:25 -0000 1.9
+++ payment.html 16 May 2011 19:47:19 -0000 1.10
@@ -169,6 +169,14 @@
}
my $void = '';
+my $voidmsg = $cust_pay->payby =~ /^(CARD|CHEK)$/
+ ? ' (' . mt('do not send anything to the payment gateway').')'
+ : '';
+$void = areyousure_link("${p}misc/void-cust_pay.cgi?".$cust_pay->paynum,
+ mt('Are you sure you want to void this payment?'),
+ mt('Void this payment from the database') . $voidmsg,
+ mt('void')
+ )
if ( $cust_pay->closed !~ /^Y/i
&& ( ( $cust_pay->payby eq 'CARD'
&& $curuser->access_right('Credit card void')
@@ -180,43 +188,24 @@
&& $curuser->access_right('Regular void')
)
)
- )
-{
- $void = qq! (<A HREF="javascript:areyousure('!.
- qq!${p}misc/void-cust_pay.cgi?!. $cust_pay->paynum.
- qq!', 'Are you sure you want to void this payment?')"!.
- qq! TITLE="Void this payment from the database!.
- ( $cust_pay->payby =~ /^(CARD|CHEK)$/
- ? ' (do not send anything to the payment gateway)'
- : ''
- ). '"'.
- qq!>void</A>)!;
-}
+ );
my $delete = '';
-if ( $cust_pay->closed !~ /^Y/i
- && $opt{'deletepayments'}
- && $curuser->access_right('Delete payment')
+$delete = areyousure_link("${p}misc/delete-cust_pay.cgi?".$cust_pay->paynum,
+ mt('Are you sure you want to delete this payment?'),
+ mt('Delete this payment from the database completely - not recommended'),
+ mt('delete')
)
-{
- $delete = qq! (<A HREF="javascript:areyousure('!.
- qq!${p}misc/delete-cust_pay.cgi?!. $cust_pay->paynum.
- qq!', 'Are you sure you want to delete this payment?')"!.
- qq! TITLE="Delete this payment from the database completely - not recommended"!.
- qq!>delete</A>)!;
-}
+ if ( $cust_pay->closed !~ /^Y/i && $opt{'deletepayments'}
+ && $curuser->access_right('Delete payment') );
my $unapply = '';
-if ( $cust_pay->closed !~ /^Y/i
- && scalar(@cust_bill_pay)
- && $curuser->access_right('Unapply payment')
+$unapply = areyousure_link("${p}misc/unapply-cust_pay.cgi?".$cust_pay->paynum,
+ mt('Are you sure you want to unapply this payment?'),
+ mt('Keep this payment, but dissociate it from the invoices it is currently applied against'),
+ mt('unapply')
)
-{
- $unapply = qq! (<A HREF="javascript:areyousure('!.
- qq!${p}misc/unapply-cust_pay.cgi?!. $cust_pay->paynum.
- qq!', 'Are you sure you want to unapply this payment?')"!.
- qq! TITLE="Keep this payment, but dissociate it from the invoices it is currently applied against"!.
- qq!>unapply</A>)!;
-}
+ if ( $cust_pay->closed !~ /^Y/i && scalar(@cust_bill_pay)
+ && $curuser->access_right('Unapply payment') );
</%init>
Index: credit.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main/payment_history/credit.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -d -r1.7 -r1.8
--- credit.html 16 May 2011 18:48:25 -0000 1.7
+++ credit.html 16 May 2011 19:47:19 -0000 1.8
@@ -121,32 +121,21 @@
}
#
my $delete = '';
-if ( $cust_credit->closed !~ /^Y/i
-
- #s'pose deleting a credit isn't bad like deleting a payment
- # and this needs to be generally available until we have credit voiding..
- #&& $conf->exists('deletecredits')
-
- && $curuser->access_right('Delete credit')
+$delete = areyousure_link("${p}misc/delete-cust_credit.cgi?".$cust_credit->crednum,
+ mt('Are you sure you want to delete this credit?'),
+ '',
+ mt('delete')
)
-{
- $delete = qq! (<A HREF="javascript:areyousure('!.
- qq!${p}misc/delete-cust_credit.cgi?!. $cust_credit->crednum.
- qq!', 'Are you sure you want to delete this credit?')">!.
- qq!delete</A>)!;
-}
+if ( $cust_credit->closed !~ /^Y/i && $curuser->access_right('Delete credit') );
my $unapply = '';
-if ( $cust_credit->closed !~ /^Y/i
- && scalar(@cust_credit_bill)
- && $curuser->access_right('Unapply credit')
+$unapply = areyousure_link("${p}misc/unapply-cust_credit.cgi?".$cust_credit->crednum,
+ mt('Are you sure you want to unapply this credit?'),
+ '',
+ mt('unapply')
)
-{
- $unapply = qq! (<A HREF="javascript:areyousure('!.
- qq!${p}misc/unapply-cust_credit.cgi?!. $cust_credit->crednum.
- qq!', 'Are you sure you want to unapply this credit?')">!.
- qq!unapply</A>)!;
-}
+if ( $cust_credit->closed !~ /^Y/i && scalar(@cust_credit_bill)
+ && $curuser->access_right('Unapply credit') );
my $reason = $cust_credit->reason
? ' ('. $cust_credit->reason. ')'
- Previous message: [freeside-commits] freeside/httemplate/view/cust_main payment_history.html, 1.54, 1.55
- Next message: [freeside-commits] freeside/httemplate/view/cust_main billing.html, 1.26, 1.27 misc.html, 1.19, 1.20 order_pkg_link.html, 1.5, 1.6 packages.html, 1.79, 1.80
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the freeside-commits
mailing list