projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
invoice_sections_with_taxes per-agent, RT#79636
[freeside.git]
/
httemplate
/
misc
/
process
/
payment.cgi
diff --git
a/httemplate/misc/process/payment.cgi
b/httemplate/misc/process/payment.cgi
index
74ca734
..
717d57c
100644
(file)
--- a/
httemplate/misc/process/payment.cgi
+++ b/
httemplate/misc/process/payment.cgi
@@
-129,13
+129,13
@@
if ( (my $custpaybynum = scalar($cgi->param('custpaybynum'))) > 0 ) {
$payinfo = $cgi->param('payinfo');
$payinfo =~ s/\D//g;
$payinfo = $cgi->param('payinfo');
$payinfo =~ s/\D//g;
- $payinfo =~ /^(\d{13,1
6
}|\d{8,9})$/
+ $payinfo =~ /^(\d{13,1
9
}|\d{8,9})$/
or errorpage(gettext('invalid_card'));
$payinfo = $1;
validate($payinfo)
or errorpage(gettext('invalid_card'));
or errorpage(gettext('invalid_card'));
$payinfo = $1;
validate($payinfo)
or errorpage(gettext('invalid_card'));
- unless ( $
payinfo =~ /^99\d{14}$/
) { #token
+ unless ( $
cust_main->tokenized($payinfo)
) { #token
my $cardtype = cardtype($payinfo);
my $cardtype = cardtype($payinfo);
@@
-193,6
+193,11
@@
if ( (my $custpaybynum = scalar($cgi->param('custpaybynum'))) > 0 ) {
errorpage("error saving info, payment not processed: $error")
if $error;
errorpage("error saving info, payment not processed: $error")
if $error;
+
+ } elsif ( $payby eq 'CARD' ) { # not saving
+
+ $paymask = FS::payinfo_Mixin->mask_payinfo('CARD',$payinfo); # for untokenized but tokenizable payinfo
+
}
}
}
}
@@
-251,7
+256,7
@@
if ( $cgi->param('batch') ) {
#and generate an invoice for it now too
$error = $cust_main->bill( 'pkg_list' => [ $cust_pkg ] );
#and generate an invoice for it now too
$error = $cust_main->bill( 'pkg_list' => [ $cust_pkg ] );
- errorpage("payment processed and fee ordered sucessfully, but error billing fee: $error")
+ errorpage("payment processed and fee ordered suc
c
essfully, but error billing fee: $error")
if $error;
}
if $error;
}