X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Fbill.cgi;h=6151dce5188c30efdc2bc9a1e1f4cbaad9434be2;hb=7a7bcda9d75c951df9c911ce60d5b0551765daf2;hp=3c3c48c54e6983b55ab028860c8042fe684d723b;hpb=5e05724a635a22776f1b973f5d7e77989da4e048;p=freeside.git

diff --git a/httemplate/misc/bill.cgi b/httemplate/misc/bill.cgi
index 3c3c48c54..6151dce51 100755
--- a/httemplate/misc/bill.cgi
+++ b/httemplate/misc/bill.cgi
@@ -17,21 +17,16 @@ die "Can't find customer!\n" unless $cust_main;
 
 my $conf = new FS::Conf;
 
-my $error = $cust_main->bill(
-#                          'time'=>$time
-                         );
+my $error = $cust_main->bill_and_collect( 'fatal' => 'return',
+                                          'retry' => 'yes',
+                                        );
 
-unless ( $error ) {
-  $error = $cust_main->apply_payments_and_credits
-           || $cust_main->collect(
                                   #'invoice-time'=>$time,
                                   #'batch_card'=> 'yes',
                                   #'batch_card'=> 'no',
                                   #'report_badcard'=> 'yes',
                                   #'retry_card' => 'yes',
 
-                                  'retry' => 'yes',
-                                   
                                   #this is used only by cust_main::batch_card
                                   #need to pick & create an actual config
                                   #value if we're going to turn this on
@@ -39,7 +34,5 @@ unless ( $error ) {
                                   # "backend-realtime" is for something
                                   #  entirely different)
                                   #'realtime' => $conf->exists('realtime-backend'),
-                                 );
-}
 
 </%init>