global duplicate checking on svc_pbx.id, RT#9967

[freeside.git] / httemplate / view / elements / svc_Common.html

diff --git a/httemplate/view/elements/svc_Common.html b/httemplate/view/elements/svc_Common.html
index 125fcd0..8a352f3 100644 (file)
--- a/httemplate/view/elements/svc_Common.html
+++ b/httemplate/view/elements/svc_Common.html
@@ -21,6 +21,13 @@
          )
 
 </%doc>
+<SCRIPT>
+function areyousure(href) {
+  if (confirm("Permanently delete this <% $label %>?") == true)
+    window.location.href = href;
+}
+</SCRIPT>
+
 % if ( $custnum ) { 
 
   <% include("/elements/header.html","View $label: $value") %>
@@ -36,18 +43,13 @@
             "javascript:areyousure(\'${p}misc/cancel-unaudited.cgi?$svcnum\')"
   )) %>
 
-  <SCRIPT>
-  function areyousure(href) {
-      if (confirm("Permanently delete this <% $label %>?") == true)
-          window.location.href = href;
-  }
-  </SCRIPT>
-
 % } 
 
 Service #<B><% $svcnum %></B>
 % my $url = $opt{'edit_url'} || $p. 'edit/'. $opt{'table'}. '.cgi?';
 | <A HREF="<%$url%><%$svcnum%>">Edit this <% $label %></A>
+| <A HREF="javascript:areyousure('<%$p.'misc/unprovision.cgi?'.$svcnum%>')">
+Unprovision this Service</A>
 <BR>
 
 <% ntable("#cccccc") %><TR><TD><% ntable("#cccccc",2) %>
@@ -145,6 +147,14 @@ my($label, $value, $svcdb) = $cust_svc->label;
 
 my $part_svc = $cust_svc->part_svc;
 
+  #false laziness w/edit/svc_Common.html
+  #override default labels with service-definition labels if applicable
+  my $labels = $opt{labels}; #not -> here
+  foreach my $field ( keys %$labels ) {
+    my $col = $part_svc->part_svc_column($field);
+    $labels->{$field} = $col->columnlabel if $col->columnlabel !~ /^\S*$/;
+  }
+
 my $pkgnum = $cust_svc->pkgnum;
 
 my($cust_pkg, $custnum);