more formatting updates to RADIUS report

[freeside.git] / httemplate / misc / bill.cgi

diff --git a/httemplate/misc/bill.cgi b/httemplate/misc/bill.cgi
index 48da255..44d85b8 100755 (executable)
--- a/httemplate/misc/bill.cgi
+++ b/httemplate/misc/bill.cgi
@@ -1,27 +1,13 @@
 <%
-#<!-- $Id: bill.cgi,v 1.4 2001-10-15 12:16:42 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $query $custnum $cust_main $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-#use FS::CGI qw(popurl eidiot);
-use FS::CGI qw(popurl idiot);
-use FS::Record qw(qsearchs);
-use FS::cust_main;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
 
 #untaint custnum
-($query) = $cgi->keywords;
+my($query) = $cgi->keywords;
 $query =~ /^(\d*)$/;
-$custnum = $1;
-$cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
+my $custnum = $1;
+my $cust_main = qsearchs('cust_main',{'custnum'=>$custnum});
 die "Can't find customer!\n" unless $cust_main;
 
-$error = $cust_main->bill(
+my $error = $cust_main->bill(
 #                          'time'=>$time
                          );
 #&eidiot($error) if $error;
@@ -32,14 +18,19 @@ unless ( $error ) {
 
   $error = $cust_main->collect(
   #                             'invoice-time'=>$time,
-  #                             'batch_card'=> 'yes',
-                               'batch_card'=> 'no',
-                               'report_badcard'=> 'yes',
+                               #'batch_card'=> 'yes',
+                               #'batch_card'=> 'no',
+                               #'report_badcard'=> 'yes',
+                               #'retry_card' => 'yes',
+                               'retry' => 'yes',
                               );
 }
 #&eidiot($error) if $error;
 
 if ( $error ) {
+%>
+<!-- mason kludge -->
+<%
   &idiot($error);
 } else {
   print $cgi->redirect(popurl(2). "view/cust_main.cgi?$custnum");