[freeside-commits] freeside/httemplate/misc bill.cgi, 1.15, 1.15.4.1

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/misc
In directory wavetail.420.am:/tmp/cvs-serv16118/httemplate/misc

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	bill.cgi 
Log Message:
have 'Bill now' link cancel expired (and suspend adjourned) packages, and catch and return errors in all cases, RT#6627

Index: bill.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/misc/bill.cgi,v
retrieving revision 1.15
retrieving revision 1.15.4.1
diff -u -d -r1.15 -r1.15.4.1
--- bill.cgi	13 Jan 2008 21:14:18 -0000	1.15
+++ bill.cgi	21 Dec 2009 02:00:56 -0000	1.15.4.1
@@ -17,21 +17,16 @@
 
 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 @@
                                   # "backend-realtime" is for something
                                   #  entirely different)
                                   #'realtime' => $conf->exists('realtime-backend'),
-                                 );
-}
 
 </%init>