<%
-#<!-- $Id: bill.cgi,v 1.3 2001-09-03 22:07:39 ivan Exp $ -->
+#<!-- $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 eidiot);
+use FS::CGI qw(popurl idiot);
use FS::Record qw(qsearchs);
use FS::cust_main;
$error = $cust_main->bill(
# 'time'=>$time
);
-&eidiot($error) if $error;
-
-$cust_main->apply_payments;
-$cust_main->apply_credits;
-
-$error = $cust_main->collect(
-# 'invoice-time'=>$time,
-# 'batch_card'=> 'yes',
- 'batch_card'=> 'no',
- 'report_badcard'=> 'yes',
- );
-&eidiot($error) if $error;
-
-print $cgi->redirect(popurl(2). "view/cust_main.cgi?$custnum");
-
+#&eidiot($error) if $error;
+
+unless ( $error ) {
+ $cust_main->apply_payments;
+ $cust_main->apply_credits;
+
+ $error = $cust_main->collect(
+ # 'invoice-time'=>$time,
+ # 'batch_card'=> 'yes',
+ 'batch_card'=> 'no',
+ 'report_badcard'=> 'yes',
+ );
+}
+#&eidiot($error) if $error;
+
+if ( $error ) {
+ &idiot($error);
+} else {
+ print $cgi->redirect(popurl(2). "view/cust_main.cgi?$custnum");
+}
%>