projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
24fc239
)
hard things in programming: variable naming
author
Ivan Kohler
<ivan@freeside.biz>
Sun, 25 Sep 2016 17:56:23 +0000
(10:56 -0700)
committer
Ivan Kohler
<ivan@freeside.biz>
Sun, 25 Sep 2016 17:56:23 +0000
(10:56 -0700)
FS/FS/bill_batch.pm
patch
|
blob
|
history
diff --git
a/FS/FS/bill_batch.pm
b/FS/FS/bill_batch.pm
index
854a90a
..
827c102
100644
(file)
--- a/
FS/FS/bill_batch.pm
+++ b/
FS/FS/bill_batch.pm
@@
-58,22
+58,24
@@
sub print_pdf {
my $self = shift;
my $job = shift;
$job->update_statustext(0) if $job;
my $self = shift;
my $job = shift;
$job->update_statustext(0) if $job;
- my @invoices = sort { $a->invnum <=> $b->invnum } $self->cust_bill_batch;
- return "No invoices in batch ".$self->batchnum.'.' if !@invoices;
+ my @cust_bill_batch = sort { $a->invnum <=> $b->invnum }
+ $self->cust_bill_batch;
+ return "No invoices in batch ".$self->batchnum.'.' if !@cust_bill_batch;
my $conf = FS::Conf->new;
my $duplex = $conf->exists('invoice_print_pdf-duplex');
my $pdf_out;
my $num = 0;
my $conf = FS::Conf->new;
my $duplex = $conf->exists('invoice_print_pdf-duplex');
my $pdf_out;
my $num = 0;
- foreach my $invoice (@invoices) {
- my $part = $invoice->cust_bill->print_pdf({$invoice->options});
- die 'Failed creating PDF from invoice '.$invoice->invnum.'\n' if !$part;
+ foreach my $cust_bill_batch (@cust_bill_batch) {
+ my $part =
+ $cust_bill_batch->cust_bill->print_pdf({$cust_bill_batch->options});
+ die 'Failed creating PDF from invoice '.$cust_bill_batch->invnum.'\n'
+ if !$part;
if($pdf_out) {
$pdf_out->appendPDF(CAM::PDF->new($part));
if($pdf_out) {
$pdf_out->appendPDF(CAM::PDF->new($part));
- }
- else {
+ } else {
$pdf_out = CAM::PDF->new($part);
}
if ( $duplex ) {
$pdf_out = CAM::PDF->new($part);
}
if ( $duplex ) {
@@
-83,10
+85,10
@@
sub print_pdf {
$pdf_out->duplicatePage($n, 1);
}
}
$pdf_out->duplicatePage($n, 1);
}
}
- if($job) {
+ if
($job) {
# update progressbar
$num++;
# update progressbar
$num++;
- my $error = $job->update_statustext(int(100 * $num/scalar(@
invoices
)));
+ my $error = $job->update_statustext(int(100 * $num/scalar(@
cust_bill_batch
)));
die $error if $error;
}
}
die $error if $error;
}
}