summaryrefslogtreecommitdiff
path: root/httemplate
diff options
context:
space:
mode:
Diffstat (limited to 'httemplate')
-rwxr-xr-xhttemplate/misc/cancel_pkg.html7
-rw-r--r--httemplate/view/cust_main/packages/services.html11
-rw-r--r--httemplate/view/cust_main/packages/status.html2
3 files changed, 14 insertions, 6 deletions
diff --git a/httemplate/misc/cancel_pkg.html b/httemplate/misc/cancel_pkg.html
index c802897bb..d3ca9964f 100755
--- a/httemplate/misc/cancel_pkg.html
+++ b/httemplate/misc/cancel_pkg.html
@@ -60,12 +60,14 @@
% foreach my $uncancel_svc (@uncancel_svcs) {
% my $uncancel_curr_value = $uncancel_svc->{'uncancel_svcnum'};
% my $uncancel_disabled = '';
+% my $uncancel_postfix = '';
% if ($cgi->param('error')) {
-% $uncancel_curr_value = '' unless grep { $_ == $uncancel_svc->{'_uncancel_svcnum'} } $cgi->param('only_svcnum');
+% $uncancel_curr_value = '' unless grep { $_ == $uncancel_svc->{'uncancel_svcnum'} } $cgi->param('only_svcnum');
% }
% unless ($uncancel_svc->{'reprovisionable'}) {
% $uncancel_curr_value = '';
% $uncancel_disabled = 1;
+% $uncancel_postfix = '<I>(' . emt('Cannot be reprovisioned') . ')</I>';
% }
<& /elements/tr-checkbox.html,
'label' => $uncancel_svc->{'svc'} . ': ' . $uncancel_svc->{'label'},
@@ -73,7 +75,8 @@
'value' => $uncancel_svc->{'uncancel_svcnum'},
'curr_value' => $uncancel_curr_value,
'disabled' => $uncancel_disabled,
- 'cell_style' => 'font-weight: normal;'
+ 'cell_style' => 'font-weight: normal',
+ 'postfix' => $uncancel_postfix,
&>
% }
% }
diff --git a/httemplate/view/cust_main/packages/services.html b/httemplate/view/cust_main/packages/services.html
index 352f5ea9d..a23a4c2fe 100644
--- a/httemplate/view/cust_main/packages/services.html
+++ b/httemplate/view/cust_main/packages/services.html
@@ -110,13 +110,16 @@ function clearhint_search_cust_svc(obj, str) {
% } #foreach part_svc
% if ($cust_pkg->get('cancel')) {
-% foreach my $svc (sort { $a->{'svcpart'} <=> $b->{'svcpart'} }
-% $cust_pkg->uncancel_svc_summary('summarize_size' => $opt{'cust_pkg-large_pkg_size'})
+% foreach my $svc (
+% $cust_pkg->uncancel_svc_summary('summarize_size' => $opt{'cust_pkg-large_pkg_size'}, 'no_test_reprovision' => 1)
% ) {
-% next unless $svc->{'reprovisionable'};
<TR>
<TD ALIGN="right" VALIGN="top"><% $svc->{'svc'} |h %></TD>
- <TD STYLE="padding-bottom:0px; font-style: italic"><% $svc->{'label'} |h %></TD>
+ <TD STYLE="padding-bottom:0px; font-style: italic">
+ <% $svc->{'num_cust_svc'}
+ ? $svc->{'num_cust_svc'} . ' ' . emt('services in history')
+ : (defined($svc->{'label'}) ? $svc->{'label'} : emt('(cannot load svc label)')) |h %>
+ </TD>
</TR>
% }
% }
diff --git a/httemplate/view/cust_main/packages/status.html b/httemplate/view/cust_main/packages/status.html
index 1d3de85b7..2d2ffb266 100644
--- a/httemplate/view/cust_main/packages/status.html
+++ b/httemplate/view/cust_main/packages/status.html
@@ -715,6 +715,8 @@ sub pkg_uncancel_link {
'actionlabel' => emt('Un-cancel'),
#'color' => #?
'cust_pkg' => shift,
+ 'width' => 960,
+ 'height' => 740,
)
}