From d9dfa887a57eb98205f46aeeac54f413040178b4 Mon Sep 17 00:00:00 2001 From: Mitch Jackson Date: Sun, 31 Mar 2019 18:53:33 -0400 Subject: [PATCH] RT# 81946 Implement conf-disable_counts on Service Definitions page --- httemplate/browse/part_svc.cgi | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi index 222433db3..8b596752f 100755 --- a/httemplate/browse/part_svc.cgi +++ b/httemplate/browse/part_svc.cgi @@ -64,7 +64,6 @@ function part_export_areyousure(href) { Required -% my $conf = FS::Conf->new; % foreach my $part_svc ( @part_svc ) { % my $svcdb = $part_svc->svcdb; % my $svc_x = "FS::$svcdb"->new( { svcpart => $part_svc->svcpart } ); @@ -137,12 +136,12 @@ function part_export_areyousure(href) { CLASS="grid" BGCOLOR="<% $bgcolor %>"> % my $svcurl_active = svc_url( 'ahref' => 1, 'm' => $m, 'action' => 'search', 'part_svc' => $part_svc, 'query' => "svcpart=". $part_svc->svcpart . "&cancelled=0"); % my $svcurl_cancel = svc_url( 'ahref' => 1, 'm' => $m, 'action' => 'search', 'part_svc' => $part_svc, 'query' => "svcpart=". $part_svc->svcpart . "&cancelled=1"); - <% $num_cust_svc_active{$part_svc->svcpart} %> <% $num_cust_svc_active{$part_svc->svcpart} ? $svcurl_active : '' %>active<% $num_cust_svc_active{$part_svc->svcpart} ? '' : '' %> -% if ( $num_cust_svc_cancelled{$part_svc->svcpart} ) { + <% $num_cust_svc_active{$part_svc->svcpart} %> <% $num_cust_svc_active{$part_svc->svcpart} || $disable_counts ? $svcurl_active : '' %>active<% $num_cust_svc_active{$part_svc->svcpart} || $disable_counts ? '' : '' %> +% if ( $num_cust_svc_cancelled{$part_svc->svcpart} || $disable_counts ) {
<% $num_cust_svc_cancelled{$part_svc->svcpart} %> <% $svcurl_cancel %>cancelled % } -% if ( $num_cust_svc{$part_svc->svcpart} ) { -
[ change ] +% if ( $num_cust_svc{$part_svc->svcpart} || $disable_counts ) { +
[ change ] % } @@ -239,6 +238,9 @@ function part_export_areyousure(href) { die "access denied" unless $FS::CurrentUser::CurrentUser->access_right('Configuration'); +my $conf = FS::Conf->new; +my $disable_counts = $conf->exists('config-disable_counts') ? 1 : 0; + #code duplication w/ edit/part_svc.cgi, should move this hash to part_svc.pm my %flag = ( '' => '', @@ -276,10 +278,13 @@ my $total = scalar(@part_svc); my %num_cust_svc_active; my %num_cust_svc_cancelled; my %num_cust_svc; -foreach my $part_svc (@part_svc) { - $num_cust_svc{$part_svc->svcpart} = $part_svc->num_cust_svc; - $num_cust_svc_cancelled{$part_svc->svcpart} = $part_svc->num_cust_svc_cancelled; - $num_cust_svc_active{$part_svc->svcpart} = $num_cust_svc{$part_svc->svcpart} - $num_cust_svc_cancelled{$part_svc->svcpart}; + +unless ( $disable_counts ) { + foreach my $part_svc (@part_svc) { + $num_cust_svc{$part_svc->svcpart} = $part_svc->num_cust_svc; + $num_cust_svc_cancelled{$part_svc->svcpart} = $part_svc->num_cust_svc_cancelled; + $num_cust_svc_active{$part_svc->svcpart} = $num_cust_svc{$part_svc->svcpart} - $num_cust_svc_cancelled{$part_svc->svcpart}; + } } if ( $cgi->param('orderby') eq 'active' ) { -- 2.11.0