projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag 'freeside_2_1_0'.
[freeside.git]
/
FS
/
FS
/
ClientAPI
/
MyAccount.pm
diff --git
a/FS/FS/ClientAPI/MyAccount.pm
b/FS/FS/ClientAPI/MyAccount.pm
index
3424966
..
71fe752
100644
(file)
--- a/
FS/FS/ClientAPI/MyAccount.pm
+++ b/
FS/FS/ClientAPI/MyAccount.pm
@@
-632,7
+632,7
@@
sub process_payment {
validate($payinfo)
or return { 'error' => gettext('invalid_card') }; # . ": ". $self->payinfo
return { 'error' => gettext('unknown_card_type') }
validate($payinfo)
or return { 'error' => gettext('invalid_card') }; # . ": ". $self->payinfo
return { 'error' => gettext('unknown_card_type') }
- if
$payinfo !~ /^99\d{14}$/ &&
cardtype($payinfo) eq "Unknown";
+ if cardtype($payinfo) eq "Unknown";
if ( length($p->{'paycvv'}) && $p->{'paycvv'} !~ /^\s*$/ ) {
if ( cardtype($payinfo) eq 'American Express card' ) {
if ( length($p->{'paycvv'}) && $p->{'paycvv'} !~ /^\s*$/ ) {
if ( cardtype($payinfo) eq 'American Express card' ) {
@@
-683,7
+683,7
@@
sub process_payment {
stateid stateid_state );
$new->set( 'payby' => $p->{'auto'} ? 'CHEK' : 'DCHK' );
}
stateid stateid_state );
$new->set( 'payby' => $p->{'auto'} ? 'CHEK' : 'DCHK' );
}
- $new->set( 'payinfo' => $
cust_main->card_token || $
payinfo );
+ $new->set( 'payinfo' => $payinfo );
$new->set( 'paydate' => $p->{'year'}. '-'. $p->{'month'}. '-01' );
my $error = $new->replace($cust_main);
if ( $error ) {
$new->set( 'paydate' => $p->{'year'}. '-'. $p->{'month'}. '-01' );
my $error = $new->replace($cust_main);
if ( $error ) {
@@
-1344,7
+1344,7
@@
sub _do_bop_realtime {
my $bill_error = $cust_main->bill
|| $cust_main->apply_payments_and_credits
my $bill_error = $cust_main->bill
|| $cust_main->apply_payments_and_credits
- || $cust_main->
realtime_collect
;
+ || $cust_main->
collect('realtime' => 1)
;
if ( $cust_main->balance > $old_balance
&& $cust_main->balance > 0
if ( $cust_main->balance > $old_balance
&& $cust_main->balance > 0
@@
-1669,10
+1669,6
@@
sub create_ticket {
my($context, $session, $custnum) = _custoragent_session_custnum($p);
return { 'error' => $session } if $context eq 'error';
my($context, $session, $custnum) = _custoragent_session_custnum($p);
return { 'error' => $session } if $context eq 'error';
- local($DEBUG) = 1;
- local($FS::TicketSystem::RT_Internal::DEBUG) = 1;
- local($FS::TicketSystem::RT_Internal::DEBUG) = 1;
-
warn "$me create_ticket: initializing ticket system\n" if $DEBUG;
FS::TicketSystem->init();
warn "$me create_ticket: initializing ticket system\n" if $DEBUG;
FS::TicketSystem->init();