projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FCKeditor 2.6.6
[freeside.git]
/
httemplate
/
misc
/
bill.cgi
diff --git
a/httemplate/misc/bill.cgi
b/httemplate/misc/bill.cgi
index
3c3c48c
..
6151dce
100755
(executable)
--- a/
httemplate/misc/bill.cgi
+++ b/
httemplate/misc/bill.cgi
@@
-17,21
+17,16
@@
die "Can't find customer!\n" unless $cust_main;
my $conf = new FS::Conf;
my $conf = new FS::Conf;
-my $error = $cust_main->bill
(
-# 'time'=>$time
- );
+my $error = $cust_main->bill
_and_collect( 'fatal' => 'return',
+ 'retry' => 'yes',
+
);
-unless ( $error ) {
- $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',
#'invoice-time'=>$time,
#'batch_card'=> 'yes',
#'batch_card'=> 'no',
#'report_badcard'=> 'yes',
#'retry_card' => '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
#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
@@
-39,7
+34,5
@@
unless ( $error ) {
# "backend-realtime" is for something
# entirely different)
#'realtime' => $conf->exists('realtime-backend'),
# "backend-realtime" is for something
# entirely different)
#'realtime' => $conf->exists('realtime-backend'),
- );
-}
</%init>
</%init>