X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Fcancel_pkg.html;h=96cf6412cfa6642d6ddde32706d4946c39f5f81d;hb=833cfe5c9938d33c3e6b97ed610c25a7afa6eb04;hp=7af106d852ae32bdefed8969739ef15946a0f4b9;hpb=c56b3fce5486b08d986743d1c2a9cc2e6aafa5bc;p=freeside.git
diff --git a/httemplate/misc/cancel_pkg.html b/httemplate/misc/cancel_pkg.html
index 7af106d85..96cf6412c 100755
--- a/httemplate/misc/cancel_pkg.html
+++ b/httemplate/misc/cancel_pkg.html
@@ -9,7 +9,11 @@
<% emt(ucfirst($method)." [_1]", $part_pkg->pkg_comment(cust_pkg=>$cust_pkg) ) %>
-<% $unprovision_warning |h %>
+
+% for ( @unprovision_warning ) {
+<% $_ |h %>
+% }
+
% my $date_init = 0;
@@ -193,21 +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 ) {
- $unprovision_warning = 'NOTE: This package has ' . @services_w_export
- . ' ' . PL( "service", @services_w_export )
- . ' that will be unprovisioned';
- $unprovision_warning .= ' (' . join( ', ', @services_w_export, ) . ')'
- if @services_w_export < 10;
- $unprovision_warning .= '.';
+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);