X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Felements%2Fsvc_Common.html;h=618d33eed338971b5ee0101212265f19c067e802;hp=0500248b161cb8d91aca207ac0f11fc84b46619d;hb=2d73473ce78c22160b618e93802a9551c9c77d69;hpb=c648976f0b7975f2328ebd7ba8c711fad0ca4195

diff --git a/httemplate/view/elements/svc_Common.html b/httemplate/view/elements/svc_Common.html
index 0500248b1..618d33eed 100644
--- a/httemplate/view/elements/svc_Common.html
+++ b/httemplate/view/elements/svc_Common.html
@@ -1,82 +1,98 @@
-%  # 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);
-%     if ( ref($f) ) {
-%       $field = $f->{'field'},
-%       $type  = $f->{'type'} || 'text',
-%     } else {
-%       $field = $f;
-%       $type = 'text';
-%     }
+%   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';
+%   }
 %
+%   my $columndef = $part_svc->part_svc_column($field);
+%   unless ($columndef->columnflag eq 'F' && !length($columndef->columnvalue)) {
 
+      <TR>
+        <TD ALIGN="right">
+          <% ( $opt{labels} && exists $opt{labels}->{$field} )
+                  ? $opt{labels}->{$field}
+                  : $field
+          %>
+        </TD>
 
-  <TR>
-    <TD ALIGN="right">
-      <% ( $opt{labels} && exists $opt{labels}->{$field} )
-              ? $opt{labels}->{$field}
-              : $field
-      %>
-    </TD>
-%
-%      #eventually more options for <SELECT>, etc. fields
-%    
+%       #eventually more options for <SELECT>, etc. fields
 
+        <TD BGCOLOR="#ffffff"><% $value %><TD>
 
-    <TD BGCOLOR="#ffffff"><% $svc_x->$field %><TD>
+      </TR>
 
-  </TR>
+%   }
+%
 % } 
-% foreach (sort { $a cmp $b } $svc_x->virtual_fields) { 
 
+% foreach (sort { $a cmp $b } $svc_x->virtual_fields) { 
   <% $svc_x->pvf($_)->widget('HTML', 'view', $svc_x->getfield($_)) %>
 % } 
 
@@ -84,6 +100,17 @@ Service #<B><% $svcnum %></B>
 </TABLE></TD></TR></TABLE>
 
 <BR>
+
+% if ( defined($opt{'html_foot'}) ) {
+
+  <% ref($opt{'html_foot'})
+       ? &{ $opt{'html_foot'} }($svc_x)
+       : $opt{'html_foot'}
+  %>
+  <BR>
+
+% }
+
 <% joblisting({'svcnum'=>$svcnum}, 1) %>
 
 <% include('/elements/footer.html') %>
@@ -116,12 +143,24 @@ 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;
 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);