projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update jscalendar
[freeside.git]
/
httemplate
/
view
/
cust_main.cgi
diff --git
a/httemplate/view/cust_main.cgi
b/httemplate/view/cust_main.cgi
index
e0986bb
..
22c4191
100755
(executable)
--- a/
httemplate/view/cust_main.cgi
+++ b/
httemplate/view/cust_main.cgi
@@
-584,6
+584,7
@@
print '</TABLE>';
my $target = "$payby$payinfo";
$payby =~ s/^BILL$/Check #/ if $payinfo;
my $target = "$payby$payinfo";
$payby =~ s/^BILL$/Check #/ if $payinfo;
+ $payby =~ s/^CHEK$/Electronic check /;
$payby =~ s/^BILL$//;
$payby =~ s/^(CARD|COMP)$/$1 /;
my $info = $payby ? " ($payby$payinfo)" : '';
$payby =~ s/^BILL$//;
$payby =~ s/^(CARD|COMP)$/$1 /;
my $info = $payby ? " ($payby$payinfo)" : '';
@@
-639,17
+640,17
@@
print '</TABLE>';
my $refund = '';
my $refund_days = $conf->config('card_refund-days') || 120;
if ( $cust_pay->closed !~ /^Y/i
my $refund = '';
my $refund_days = $conf->config('card_refund-days') || 120;
if ( $cust_pay->closed !~ /^Y/i
- && $cust_pay->payby
eq 'CARD'
+ && $cust_pay->payby
=~ /^(CARD|CHEK)$/
&& time-$cust_pay->_date < $refund_days*86400
&& $cust_pay->unrefunded > 0
) {
&& time-$cust_pay->_date < $refund_days*86400
&& $cust_pay->unrefunded > 0
) {
- $refund = qq! (<A HREF="!. qq!${p}edit/cust_refund.cgi?payby=
CARD
;!.
+ $refund = qq! (<A HREF="!. qq!${p}edit/cust_refund.cgi?payby=
$1
;!.
qq!paynum=!. $cust_pay->paynum. qq!">refund</A>)!;
}
my $void = '';
if ( $cust_pay->closed !~ /^Y/i
qq!paynum=!. $cust_pay->paynum. qq!">refund</A>)!;
}
my $void = '';
if ( $cust_pay->closed !~ /^Y/i
- && $cust_pay->payby
ne 'CARD'
+ && $cust_pay->payby
!~ /^(CARD|CHEK)$/
) {
$void = qq! (<A HREF="javascript:areyousure('!.
qq!${p}misc/void-cust_pay.cgi?!. $cust_pay->paynum.
) {
$void = qq! (<A HREF="javascript:areyousure('!.
qq!${p}misc/void-cust_pay.cgi?!. $cust_pay->paynum.
@@
-693,6
+694,7
@@
print '</TABLE>';
: $cust_pay_void->payinfo;
$payby =~ s/^BILL$/Check #/ if $payinfo;
: $cust_pay_void->payinfo;
$payby =~ s/^BILL$/Check #/ if $payinfo;
+ $payby =~ s/^CHEK$/Electronic check /;
$payby =~ s/^BILL$//;
$payby =~ s/^(CARD|COMP)$/$1 /;
my $info = $payby ? " ($payby$payinfo)" : '';
$payby =~ s/^BILL$//;
$payby =~ s/^(CARD|COMP)$/$1 /;
my $info = $payby ? " ($payby$payinfo)" : '';
@@
-797,6
+799,7
@@
print '</TABLE>';
: $cust_refund->payinfo;
$payby =~ s/^BILL$/Check #/ if $payinfo;
: $cust_refund->payinfo;
$payby =~ s/^BILL$/Check #/ if $payinfo;
+ $payby =~ s/^CHEK$/Electronic check /;
$payby =~ s/^(CARD|COMP)$/$1 /;
push @history, {
$payby =~ s/^(CARD|COMP)$/$1 /;
push @history, {