certificates ala communigate, RT#7515

[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 a0b4e37..618d33e 100644 (file)
--- a/httemplate/view/elements/svc_Common.html
+++ b/httemplate/view/elements/svc_Common.html
@@ -1,60 +1,73 @@
-%  # options example...
-%  #
-%  # 'table' => 'svc_something'
-%  #
-%  # 'labels' => {
-%  #               'column' => 'Label',
-%  #             },
-%  #
-%  # listref - each item is a literal column name (or method) or (notyet) coderef
-%  # if not specified all columns (except for the primary key) will be viewable
-%  # 'fields' => [
-%  #             ]
-%  #
-%  # # defaults to "edit/$table.cgi?", will have svcnum appended
-%  # 'edit_url' => 
-%
-%
-% if ( $custnum ) { 
+<%doc>
+
+#Example:
+
+  include( 'elements/svc_Common.html, 
+
+             'table' => 'svc_something'
+
+             'labels' => {
+                           'column' => 'Label',
+                         },
+
+             #listref - each item is a literal column name (or method) or
+             # (notyet) coderef.  if not specified all columns (except for the
+             #primary key) will be viewable
+             'fields' => [
+                         ]
+
+             # defaults to "edit/$table.cgi?", will have svcnum appended
+             'edit_url' => 
+
+             #at the very bottom (well, as low as you can go from here)
+             'html_foot'  => '',
+
+         )
 
+</%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") %>
 
   <% include( '/elements/small_custview.html', $custnum, '', 1,
      "${p}view/cust_main.cgi") %>
   <BR>
-% } else { 
-
 
-  <SCRIPT>
-  function areyousure(href) {
-      if (confirm("Permanently delete this <% $label %>?") == true)
-          window.location.href = href;
-  }
-  </SCRIPT>
+% } else { 
 
   <% include("/elements/header.html","View $label: $value", menubar(
       "Cancel this (unaudited) $label" =>
             "javascript:areyousure(\'${p}misc/cancel-unaudited.cgi?$svcnum\')"
   )) %>
-% } 
 
+% } 
 
 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) %>
 
 % foreach my $f ( @$fields ) {
 %
-%   my($field, $type);
+%   my($field, $type, $value);
 %   if ( ref($f) ) {
 %     $field = $f->{'field'},
+%     $value = $f->{'value'} ? &{ $f->{'value'} }($svc_x) : $svc_x->$field;
 %     $type  = $f->{'type'} || 'text',
 %   } else {
 %     $field = $f;
+%     $value = $svc_x->$field;
 %     $type = 'text';
 %   }
 %
@@ -71,7 +84,7 @@ Service #<B><% $svcnum %></B>
 
 %       #eventually more options for <SELECT>, etc. fields
 
-        <TD BGCOLOR="#ffffff"><% $svc_x->$field %><TD>
+        <TD BGCOLOR="#ffffff"><% $value %><TD>
 
       </TR>
 
@@ -130,7 +143,9 @@ my $svc_x = qsearchs({
                  ' LEFT JOIN cust_pkg  USING ( pkgnum  ) '.
                  ' LEFT JOIN cust_main USING ( custnum ) ',
   'hashref'   => { 'svcnum' => $svcnum },
-  'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql,
+  'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql(
+                            'null_right' => 'View/link unlinked services'
+                          ),
 }) or die "Unknown svcnum $svcnum in ". $opt{'table'}. " table\n";
 
 my $cust_svc = $svc_x->cust_svc;
@@ -138,6 +153,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);