diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2018-04-11 13:26:11 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2018-04-11 13:26:11 -0700 |
| commit | 52868a4e0abe9e0a9aa78fe04ca5a3462c3bc5a6 (patch) | |
| tree | 1896bc23b6b8555f743cb6e81f88f1453d945072 | |
| parent | a71bb4db524387e97d57c0884f940f615fa78852 (diff) | |
optimize invoice display with sections, RT#80177
| -rw-r--r-- | FS/FS/Template_Mixin.pm | 12 | ||||
| -rw-r--r-- | FS/FS/cust_bill.pm | 8 |
2 files changed, 17 insertions, 3 deletions
diff --git a/FS/FS/Template_Mixin.pm b/FS/FS/Template_Mixin.pm index 2dde3ca..2091c48 100644 --- a/FS/FS/Template_Mixin.pm +++ b/FS/FS/Template_Mixin.pm @@ -2679,7 +2679,13 @@ sub _items_sections { foreach my $display ($cust_bill_pkg->cust_bill_pkg_display) { next if ( $display->summary && $opt{summary} ); - my $section = $display->section; + #my $section = $display->section; + #false laziness with the method, but for efficiency inside this loop + my $section = $display->get('section'); + if ( !$section && !$cust_bill_pkg->hidden ) { + $section = $cust_bill_pkg->get('categoryname'); #cust_bill->cust_bill_pkg added it (XXX quotations / quotation_section) + } + my $type = $display->type; # Set $section = undef if we're sectioning by location and this # line item _has_ a location (i.e. isn't a fee). @@ -3104,6 +3110,8 @@ sub _items_fee { my @cust_bill_pkg = grep { $_->feepart } $self->cust_bill_pkg; my $escape_function = $options{escape_function}; + my $locale = $self->cust_main->locale; + my @items; foreach my $cust_bill_pkg (@cust_bill_pkg) { # cache this, so we don't look it up again in every section @@ -3144,7 +3152,7 @@ sub _items_fee { $self->mt('from invoice #[_1] on [_2]', $_, $base_invnums{$_}) ); } - my $desc = $part_fee->itemdesc_locale($self->cust_main->locale); + my $desc = $part_fee->itemdesc_locale($locale); # but not escape the base description line my @pkg_tax = $cust_bill_pkg->_pkg_tax_list diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm index 0d0558a..92a0f9a 100644 --- a/FS/FS/cust_bill.pm +++ b/FS/FS/cust_bill.pm @@ -496,7 +496,13 @@ Returns the line items (see L<FS::cust_bill_pkg>) for this invoice. sub cust_bill_pkg { my $self = shift; qsearch( - { 'table' => 'cust_bill_pkg', + { + 'select' => 'cust_bill_pkg.*, pkg_category.categoryname', + 'table' => 'cust_bill_pkg', + 'addl_from' => ' LEFT JOIN cust_pkg USING ( pkgnum ) '. + ' LEFT JOIN part_pkg USING ( pkgpart ) '. + ' LEFT JOIN pkg_class USING ( classnum ) '. + ' LEFT JOIN pkg_category USING ( categorynum ) ', 'hashref' => { 'invnum' => $self->invnum }, 'order_by' => 'ORDER BY billpkgnum', #important? otherwise we could use # the AUTLOADED FK search. or should |