From: jeff <jeff>
Date: Sun, 13 Jun 2010 05:59:53 +0000 (+0000)
Subject: eliminate use of 'realtime' arg in calling FS::cust_main_collect RT#4167
X-Git-Tag: root_of_svc_elec_features~171
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;ds=sidebyside;h=89a81f5a2daf31f47a263c4ffc27f0fc36ac26f5;p=freeside.git

eliminate use of 'realtime' arg in calling FS::cust_main_collect RT#4167
---

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 71fe75261..64c942149 100644
--- 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
-                     || $cust_main->collect('realtime' => 1);
+                     || $cust_main->realtime_collect;
 
     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 b9cd6c69f..5d70325d2 100644
--- 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;
 
-    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;