X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpayment_history%2Fpayment.html;h=d7322a2d6ed8f07046ac68e97ab1ec67f322ed1e;hb=c598fcf11241b02111a2df43860199ae8a9d5512;hp=7df16cf875ed90e7da566dc09ffb1a3e26bcf502;hpb=d21d7864c1f1bc4fed05a01c0b037628a4ca5b99;p=freeside.git
diff --git a/httemplate/view/cust_main/payment_history/payment.html b/httemplate/view/cust_main/payment_history/payment.html
index 7df16cf87..d7322a2d6 100644
--- a/httemplate/view/cust_main/payment_history/payment.html
+++ b/httemplate/view/cust_main/payment_history/payment.html
@@ -7,22 +7,13 @@ my( $cust_pay, %opt ) = @_;
my $date_format = $opt{'date_format'} || '%m/%d/%Y';
my $conf = new FS::Conf;
+my $money_char = $conf->config('money_char') || '$';
my $curuser = $FS::CurrentUser::CurrentUser;
-my $payby = $cust_pay->payby;
-
-my $payinfo;
-if ( $payby eq 'CARD' ) {
- $payinfo = $cust_pay->paymask;
-} elsif ( $payby eq 'CHEK' ) {
- my( $account, $aba ) = split('@', $cust_pay->paymask );
- $payinfo = mt("ABA [_1], Acct #[_2]",$aba,$account);
-} else {
- $payinfo = $cust_pay->payinfo;
-}
my @cust_bill_pay = $cust_pay->cust_bill_pay;
my @cust_pay_refund = $cust_pay->cust_pay_refund;
+my ($payby,$payinfo) = translate_payinfo($cust_pay);
my $target = "$payby$payinfo";
$payby = translate_payby($payby,$payinfo);
my $info = $payby ? "($payby$payinfo)" : '';
@@ -40,28 +31,36 @@ if ($conf->exists('cust_bill_pay_pkg-manual')) {
%cust_bill_pay_height = ('height' => 436);
}
-my( $apply, $ext ) = ( '', '', '', '' );
+my $apply = '';
+my $italicize_otaker = 0;
my $otaker = $cust_pay->otaker;
-$otaker = 'auto billing' if $otaker eq 'fs_daily';
-$otaker = 'customer self-service' if $otaker eq 'fs_selfservice';
+if ( $otaker eq 'fs_daily' ) {
+ $otaker = 'auto billing';
+ $italicize_otaker = 1;
+}
+if ( $otaker eq 'fs_selfservice' ) {
+ $otaker = 'customer self-service';
+ $italicize_otaker = 1;
+}
-my $payment = mt("Payment by [_1]",$otaker);
+my $payment = emt("Payment by [_1]",$otaker);
+$payment =~ s/$otaker/$otaker<\/i>/ if $italicize_otaker;
if ( scalar(@cust_bill_pay) == 0
&& scalar(@cust_pay_refund) == 0 ) {
#completely unapplied
- $payment = ''
- . mt("Unapplied Payment by [_1]",$otaker)
- . '';
+ $payment = emt("Unapplied Payment by [_1]",$otaker);
+ $payment =~ s/$otaker/$otaker<\/i>/ if $italicize_otaker;
+ $payment = ''.$payment.'';
if ( $curuser->access_right('Apply payment') ) {
if ( $cust_pay->cust_main->total_owed > 0 ) {
$apply = ' ('.
include( '/elements/popup_link.html',
- 'label' => mt('apply'),
+ 'label' => emt('apply'),
'action' => "${p}edit/cust_bill_pay.cgi?".
$cust_pay->paynum,
- 'actionlabel' => mt('Apply payment'),
+ 'actionlabel' => emt('Apply payment'),
%cust_bill_pay_width,
%cust_bill_pay_height,
).
@@ -70,10 +69,10 @@ if ( scalar(@cust_bill_pay) == 0
if ( $cust_pay->cust_main->total_unapplied_refunds > 0 ) {
$apply.= ' ('.
include( '/elements/popup_link.html',
- 'label' => mt('apply to refund'),
+ 'label' => emt('apply to refund'),
'action' => "${p}edit/cust_pay_refund.cgi?".
$cust_pay->paynum,
- 'actionlabel' => mt('Apply payment to refund'),
+ 'actionlabel' => emt('Apply payment to refund'),
'width' => 392,
).
')';
@@ -88,39 +87,36 @@ if ( scalar(@cust_bill_pay) == 0
&& scalar(@cust_pay_refund) == 1
&& $cust_pay->unapplied == 0 ) {
#applied to one refund
- $desc .= mt(" refunded on [_1]", time2str($date_format, $cust_pay_refund[0]->_date) );
+ $desc .= emt(" refunded on [_1]", time2str($date_format, $cust_pay_refund[0]->_date) );
} else {
#complicated
$desc .= '
';
foreach my $app ( sort { $a->_date <=> $b->_date }
( @cust_bill_pay, @cust_pay_refund ) ) {
if ( $app->isa('FS::cust_bill_pay') ) {
- $desc .= ' '.
- '$'. $app->amount.
- ' '. $app->applied_to_invoice.
- '
';
- #' on '. time2str($date_format, $cust_bill_pay->_date).
+ $desc .= ' ' . $money_char . $app->amount . ' ' .
+ $app->applied_to_invoice . '
';
} elsif ( $app->isa('FS::cust_pay_refund') ) {
- $desc .= ' '.
- '$'. $app->amount.
- mt(" refunded on [_1]", time2str($date_format, $app->_date) ) .
- '
';
+ $desc .= ' ' .
+ emt("[_1][_2] refunded on [_3]", $money_char, $app->amount,
+ time2str($date_format, $app->_date) ) . '
';
} else {
die "$app is not a FS::cust_bill_pay or FS::cust_pay_refund";
}
}
if ( $cust_pay->unapplied > 0 ) {
$desc .= ' '.
- '$'.
- $cust_pay->unapplied. ' unapplied';
+ '' .
+ emt("[_1][_2] unapplied", $money_char, $cust_pay->unapplied) .
+ '';
if ( $curuser->access_right('Apply payment') ) {
if ( $cust_pay->cust_main->total_owed > 0 ) {
$apply = ' ('.
include( '/elements/popup_link.html',
- 'label' => mt('apply'),
+ 'label' => emt('apply'),
'action' => "${p}edit/cust_bill_pay.cgi?".
$cust_pay->paynum,
- 'actionlabel' => mt('Apply payment'),
+ 'actionlabel' => emt('Apply payment'),
%cust_bill_pay_width,
%cust_bill_pay_height,
).
@@ -129,10 +125,10 @@ if ( scalar(@cust_bill_pay) == 0
if ( $cust_pay->cust_main->total_unapplied_refunds > 0 ) {
$apply.= ' ('.
include( '/elements/popup_link.html',
- 'label' => mt('apply to refund'),
+ 'label' => emt('apply to refund'),
'action' => "${p}edit/cust_pay_refund.cgi?".
$cust_pay->paynum,
- 'actionlabel' => mt('Apply payment to refund'),
+ 'actionlabel' => emt('Apply payment to refund'),
'width' => 392,
).
')';
@@ -144,10 +140,10 @@ if ( scalar(@cust_bill_pay) == 0
my $view =
' ('. include('/elements/popup_link.html',
- 'label' => mt('view receipt'),
+ 'label' => emt('view receipt'),
'action' => "${p}view/cust_pay.html?link=popup;paynum=".
$cust_pay->paynum,
- 'actionlabel' => mt('Payment Receipt'),
+ 'actionlabel' => emt('Payment Receipt'),
).
')';
@@ -164,18 +160,18 @@ if ( $cust_pay->closed !~ /^Y/i
) {
$refund = qq! (refund)!;
+ qq! TITLE="! .emt('Send a refund for this payment to the payment gateway')
+ . '">' . emt('refund') . ')';
}
my $void = '';
my $voidmsg = $cust_pay->payby =~ /^(CARD|CHEK)$/
- ? ' (' . mt('do not send anything to the payment gateway').')'
+ ? ' (' . emt('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')
+ emt('Are you sure you want to void this payment?'),
+ emt('Void this payment from the database') . $voidmsg,
+ emt('void')
)
if ( $cust_pay->closed !~ /^Y/i
&& ( ( $cust_pay->payby eq 'CARD'
@@ -192,18 +188,18 @@ $void = areyousure_link("${p}misc/void-cust_pay.cgi?".$cust_pay->paynum,
my $delete = '';
$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')
+ emt('Are you sure you want to delete this payment?'),
+ emt('Delete this payment from the database completely - not recommended'),
+ emt('delete')
)
if ( $cust_pay->closed !~ /^Y/i && $opt{'deletepayments'}
&& $curuser->access_right('Delete payment') );
my $unapply = '';
$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')
+ emt('Are you sure you want to unapply this payment?'),
+ emt('Keep this payment, but dissociate it from the invoices it is currently applied against'),
+ emt('unapply')
)
if ( $cust_pay->closed !~ /^Y/i && scalar(@cust_bill_pay)
&& $curuser->access_right('Unapply payment') );