From a30e8806a4d208aa8736061a3654b6ad97335322 Mon Sep 17 00:00:00 2001 From: ivan Date: Fri, 20 Feb 2009 02:41:06 +0000 Subject: [PATCH] disable display of auto-suspend dates unless enabled by config. at least until it can be made more efficient. this is slowing down customer view waaaaaaaaaay too much. RT#4830 --- FS/FS/Conf.pm | 7 +++++++ httemplate/view/cust_main/packages/status.html | 12 +++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm index 4def46260..39ab389e7 100644 --- a/FS/FS/Conf.pm +++ b/FS/FS/Conf.pm @@ -2650,6 +2650,13 @@ worry that config_items is freeside-specific and icky. 'type' => 'text', }, + { + 'key' => 'cust_pkg-show_autosuspend', + 'section' => 'UI', + 'description' => 'Show package auto-suspend dates. Use with caution for now; can slow down customer view for large insallations.', + 'type' => 'checkbox', + }, + ); 1; diff --git a/httemplate/view/cust_main/packages/status.html b/httemplate/view/cust_main/packages/status.html index e0a188e57..106137ba9 100644 --- a/httemplate/view/cust_main/packages/status.html +++ b/httemplate/view/cust_main/packages/status.html @@ -121,8 +121,11 @@ % } % % } -% my $autosuspend = pkg_autosuspend_time( $cust_pkg ); -% $cust_pkg->set('autosuspend', $autosuspend) if $autosuspend; +% +% if ( $conf->exists('cust_pkg-show_autosuspend') ) { +% my $autosuspend = pkg_autosuspend_time( $cust_pkg ); +% $cust_pkg->set('autosuspend', $autosuspend) if $autosuspend; +% } <% pkg_status_row_changed( $cust_pkg, %opt ) %> <% pkg_status_row_if( $cust_pkg, $last_bill_or_renewed, 'last_bill', %opt, curuser=>$curuser ) %> @@ -167,6 +170,8 @@ my %opt = @_; +my $conf = new FS::Conf; + my $bgcolor = $opt{'bgcolor'}; my $cust_pkg = $opt{'cust_pkg'}; my $part_pkg = $opt{'part_pkg'}; @@ -352,7 +357,8 @@ sub pkg_autosuspend_time { my $days = 7; my $time = time; my $pending_suspend = 0; - #this seems to be extremely inefficient... + #this seems to be extremely inefficient... and is slowing down all customer + #views while ( $days > 0 && scalar( grep { $_->part_event->action eq 'suspend' } -- 2.11.0