X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fmisc%2Fbill.cgi;h=f048e5559f0fc1377a44fa091c8414d08035873e;hp=cc7938308a456ecb6cc31c60871d068fc5c9b477;hb=3ef62a0570055da710328937e7f65dbb2c027c62;hpb=3d671921441ba8422650b54435a1959ad1d4c71d

diff --git a/httemplate/misc/bill.cgi b/httemplate/misc/bill.cgi
index cc7938308..f048e5559 100755
--- a/httemplate/misc/bill.cgi
+++ b/httemplate/misc/bill.cgi
@@ -1,38 +1,37 @@
 <%
-#<!-- $Id: bill.cgi,v 1.2 2001-08-21 02:31:56 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::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;
+#&eidiot($error) if $error;
 
-$error = $cust_main->collect(
-#                             'invoice-time'=>$time,
-#                             'batch_card'=> 'yes',
-                             'batch_card'=> 'no',
-                             'report_badcard'=> 'yes',
-                            );
-&eidiot($error) if $error;
+unless ( $error ) {
+  $cust_main->apply_payments;
+  $cust_main->apply_credits;
 
-print $cgi->redirect(popurl(2). "view/cust_main.cgi?$custnum");
+  $error = $cust_main->collect(
+  #                             'invoice-time'=>$time,
+                               #'batch_card'=> 'yes',
+                               #'batch_card'=> 'no',
+                               #'report_badcard'=> 'yes',
+                               'retry_card' => 'yes',
+                              );
+}
+#&eidiot($error) if $error;
 
+if ( $error ) {
+%>
+<!-- mason kludge -->
+<%
+  &idiot($error);
+} else {
+  print $cgi->redirect(popurl(2). "view/cust_main.cgi?$custnum");
+}
 %>