diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2016-02-11 05:39:48 -0800 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2016-02-11 05:39:48 -0800 |
| commit | 117659ee02ba32bf59335bf18faa7a075f231709 (patch) | |
| tree | 7402c232557eb032897fa41613fee4c721c8345e | |
| parent | 95e4856fce90f6549822707c1dd28bdcbec5f540 (diff) | |
fix advanced package report, RT#40292, fallout from RT#20173
| -rw-r--r-- | FS/FS/cust_pkg.pm | 4 | ||||
| -rwxr-xr-x | httemplate/search/cust_main.cgi | 1 | ||||
| -rwxr-xr-x | httemplate/search/cust_pkg.cgi | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm index daa3353c1..b1373849f 100644 --- a/FS/FS/cust_pkg.pm +++ b/FS/FS/cust_pkg.pm @@ -56,9 +56,11 @@ $disable_agentcheck = 0; $upgrade = 0; #go away after setup+start dates cleaned up for old customers +our $cache_enabled = 0; + sub _simplecache { my( $self, $hashref ) = @_; - if ( $hashref->{'pkg'} ) { + if ( $cache_enabled && $hashref->{'pkg'} && $hashref->{'plan'} ) { $self->{'_pkgpart'} = FS::part_pkg->new($hashref); } } diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi index 7bcd5bfcd..38ec4f453 100755 --- a/httemplate/search/cust_main.cgi +++ b/httemplate/search/cust_main.cgi @@ -518,6 +518,7 @@ my $addl_from = qq{ AND recur_option.optionname = 'recur_fee' ) }; +local($FS::cust_pkg::cache_enabled) = 1; #for $cust_pkg->part_pkg my %all_pkgs = map { $_->custnum => [ $_->$pkgs_method({ select => $select, addl_from => $addl_from, diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi index f1e686a83..dbd346dba 100755 --- a/httemplate/search/cust_pkg.cgi +++ b/httemplate/search/cust_pkg.cgi @@ -44,7 +44,7 @@ }, sub { my $c = shift; sprintf( $money_char.'%.2f', - $c->part_pkg->base_recur($c) + $c->base_recur ); }, sub { FS::part_pkg::freq_pretty(shift); }, |