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

diff --git a/httemplate/misc/bill.cgi b/httemplate/misc/bill.cgi
index 44d85b880..6151dce51 100755
--- a/httemplate/misc/bill.cgi
+++ b/httemplate/misc/bill.cgi
@@ -1,4 +1,12 @@
-<%
+%if ( $error ) {
+%  errorpage($error);
+%} else {
+<% $cgi->redirect(popurl(2). "view/cust_main.cgi?$custnum") %>
+%}
+<%init>
+
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Bill customer now');
 
 #untaint custnum
 my($query) = $cgi->keywords;
@@ -7,32 +15,24 @@ my $custnum = $1;
 my $cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
 die "Can't find customer!\n" unless $cust_main;
 
-my $error = $cust_main->bill(
-#                          'time'=>$time
-                         );
-#&eidiot($error) if $error;
+my $conf = new FS::Conf;
+
+my $error = $cust_main->bill_and_collect( 'fatal' => 'return',
+                                          'retry' => 'yes',
+                                        );
 
-unless ( $error ) {
-  $cust_main->apply_payments;
-  $cust_main->apply_credits;
+                                  #'invoice-time'=>$time,
+                                  #'batch_card'=> 'yes',
+                                  #'batch_card'=> 'no',
+                                  #'report_badcard'=> 'yes',
+                                  #'retry_card' => 'yes',
 
-  $error = $cust_main->collect(
-  #                             'invoice-time'=>$time,
-                               #'batch_card'=> 'yes',
-                               #'batch_card'=> 'no',
-                               #'report_badcard'=> 'yes',
-                               #'retry_card' => 'yes',
-                               'retry' => 'yes',
-                              );
-}
-#&eidiot($error) if $error;
+                                  #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'),
 
-if ( $error ) {
-%>
-<!-- mason kludge -->
-<%
-  &idiot($error);
-} else {
-  print $cgi->redirect(popurl(2). "view/cust_main.cgi?$custnum");
-}
-%>
+</%init>