From 1fa46a8e2890c2c6f1e0117856f5c481306b1c59 Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Sat, 19 Aug 2017 14:50:15 -0700 Subject: [PATCH] fix cancel message verb for suspensions, RT#29087 --- httemplate/misc/cancel_pkg.html | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/httemplate/misc/cancel_pkg.html b/httemplate/misc/cancel_pkg.html index 3c1862212..96cf6412c 100755 --- a/httemplate/misc/cancel_pkg.html +++ b/httemplate/misc/cancel_pkg.html @@ -197,25 +197,27 @@ my $cust_pkg = qsearchs('cust_pkg', {'pkgnum' => $pkgnum}) my $part_pkg = $cust_pkg->part_pkg; -my @unprovision_warning; -{ - my @services_w_export; - for ( $cust_pkg->cust_svc ) { - push( @services_w_export, ($_->label)[0] . ': ' . ($_->label)[1], ) - if $_->part_svc->export_svc; - } - if ( @services_w_export ) { - push( @unprovision_warning, 'NOTE: This package has ' - . @services_w_export . ' ' . PL( "service", @services_w_export ) - . ' that will be unprovisioned', ); - if ( @services_w_export < 10 ) { - $unprovision_warning[0] .= ':'; - push( @unprovision_warning, @services_w_export, ); - } - else { - $unprovision_warning[0] .= '.'; - } +my @unprovision_warning = (); +unless ( $method =~ /^(resume|uncancel)$/ ) { + my @services_w_export = map { my @l = $_->label; $l[0]. ': '. $l[1]; } + grep $_->part_svc->export_svc, + $cust_pkg->cust_svc; + if ( @services_w_export ) { + + my $actioned = ($method =~ /^(suspend|adjourn)$/) ? 'suspended' + : 'unprovisioned'; + push @unprovision_warning, + 'NOTE: This package has '. @services_w_export. ' '. + PL( 'service', @services_w_export ). " that will be $actioned"; + + if ( @services_w_export < 10 ) { + $unprovision_warning[0] .= ':'; + push @unprovision_warning, @services_w_export; + } else { + $unprovision_warning[0] .= '.'; } + + } } $date ||= $cust_pkg->get($method); -- 2.11.0