projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4e2b0b9
)
eliminate use of 'realtime' arg in calling FS::cust_main_collect RT#4167
author
jeff
<jeff>
Sun, 13 Jun 2010 05:59:53 +0000
(
05:59
+0000)
committer
jeff
<jeff>
Sun, 13 Jun 2010 05:59:53 +0000
(
05:59
+0000)
FS/FS/ClientAPI/MyAccount.pm
patch
|
blob
|
history
FS/FS/ClientAPI/Signup.pm
patch
|
blob
|
history
diff --git
a/FS/FS/ClientAPI/MyAccount.pm
b/FS/FS/ClientAPI/MyAccount.pm
index
71fe752
..
64c9421
100644
(file)
--- a/
FS/FS/ClientAPI/MyAccount.pm
+++ b/
FS/FS/ClientAPI/MyAccount.pm
@@
-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->
collect('realtime' => 1)
;
+ || $cust_main->
realtime_collect
;
if ( $cust_main->balance > $old_balance
&& $cust_main->balance > 0
if ( $cust_main->balance > $old_balance
&& $cust_main->balance > 0
diff --git
a/FS/FS/ClientAPI/Signup.pm
b/FS/FS/ClientAPI/Signup.pm
index
b9cd6c6
..
5d70325
100644
(file)
--- a/
FS/FS/ClientAPI/Signup.pm
+++ b/
FS/FS/ClientAPI/Signup.pm
@@
-649,14
+649,10
@@
sub new_customer {
# " new customer: $bill_error"
# if $bill_error;
# " new customer: $bill_error"
# if $bill_error;
- if ($cust_main->_new_bop_required()) {
- $bill_error = $cust_main->realtime_collect(
- method => FS::payby->payby2bop( $packet->{payby} ),
- depend_jobnum => $placeholder->jobnum,
- );
- } else {
- $bill_error = $cust_main->collect('realtime' => 1);
- }
+ $bill_error = $cust_main->realtime_collect(
+ method => FS::payby->payby2bop( $packet->{payby} ),
+ depend_jobnum => $placeholder->jobnum,
+ );
#warn "[fs_signup_server] error collecting from new customer: $bill_error"
# if $bill_error;
#warn "[fs_signup_server] error collecting from new customer: $bill_error"
# if $bill_error;