[freeside-commits] freeside/httemplate/misc bill.cgi,1.16,1.17

[Mark Wells]

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

Modified Files:
	bill.cgi 
Log Message:
"Bill now" link uses job queue/progressbar, RT#8995

Index: bill.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/misc/bill.cgi,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -w -d -r1.16 -r1.17
--- bill.cgi	21 Dec 2009 02:00:54 -0000	1.16
+++ bill.cgi	6 Jul 2010 12:18:11 -0000	1.17
@@ -1,38 +1,8 @@
-%if ( $error ) {
-%  errorpage($error);
-%} else {
-<% $cgi->redirect(popurl(2). "view/cust_main.cgi?$custnum") %>
-%}
+<% $server->process %>
 <%init>
 
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Bill customer now');
-
-#untaint custnum
-my($query) = $cgi->keywords;
-$query =~ /^(\d*)$/;
-my $custnum = $1;
-my $cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
-die "Can't find customer!\n" unless $cust_main;
-
-my $conf = new FS::Conf;
-
-my $error = $cust_main->bill_and_collect( 'fatal' => 'return',
-                                          'retry' => 'yes',
-                                        );
-
-                                  #'invoice-time'=>$time,
-                                  #'batch_card'=> 'yes',
-                                  #'batch_card'=> 'no',
-                                  #'report_badcard'=> 'yes',
-                                  #'retry_card' => '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
-                                  #("realtime-backend" doesn't exist,
-                                  # "backend-realtime" is for something
-                                  #  entirely different)
-                                  #'realtime' => $conf->exists('realtime-backend'),
-
+my $server = FS::UI::Web::JSRPC->new('FS::cust_main::process_bill_and_collect', $cgi);
 </%init>
+