X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Fbill.cgi;h=3c3c48c54e6983b55ab028860c8042fe684d723b;hb=c33e009d50f9af054a5a0195eca5df31c4fb9539;hp=6f523a52c8061dbd180d143e05d26312077b4ff1;hpb=a4c96748eb6eab29a70f3a944c6520283a635c78;p=freeside.git

diff --git a/httemplate/misc/bill.cgi b/httemplate/misc/bill.cgi
index 6f523a52c..3c3c48c54 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,30 +15,31 @@ 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(
 #                          'time'=>$time
                          );
-#&eidiot($error) if $error;
 
 unless ( $error ) {
-  $cust_main->apply_payments;
-  $cust_main->apply_credits;
+  $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',
 
-  $error = $cust_main->collect(
-  #                             'invoice-time'=>$time,
-  #                             'batch_card'=> 'yes',
-                               'batch_card'=> 'no',
-                               'report_badcard'=> '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
+                                  #("realtime-backend" doesn't exist,
+                                  # "backend-realtime" is for something
+                                  #  entirely different)
+                                  #'realtime' => $conf->exists('realtime-backend'),
+                                 );
 }
-#&eidiot($error) if $error;
 
-if ( $error ) {
-%>
-<!-- mason kludge -->
-<%
-  &idiot($error);
-} else {
-  print $cgi->redirect(popurl(2). "view/cust_main.cgi?$custnum");
-}
-%>
+</%init>