X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Felements%2Fsvc_Common.html;h=8f915a10e467340848466c88b69fb23a8b546593;hb=6e3a9df538c2aecccebdd3903447eb62793465bb;hp=b6d8e652f8a3f85da05730de8b016115c6db656a;hpb=4a476092eda9c8e42292cc7bf01f5c73cf5abcd0;p=freeside.git

diff --git a/httemplate/view/elements/svc_Common.html b/httemplate/view/elements/svc_Common.html
index b6d8e652f..8f915a10e 100644
--- a/httemplate/view/elements/svc_Common.html
+++ b/httemplate/view/elements/svc_Common.html
@@ -1,82 +1,101 @@
-%  # 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/header.html","View $label: $value") %>
+  include( 'elements/svc_Common.html, 
 
-  <% include( '/elements/small_custview.html', $custnum, '', 1,
-     "${p}view/cust_main.cgi") %>
-  <BR>
-% } else { 
+             'table' => 'svc_something'
 
+             'labels' => {
+                           'column' => 'Label',
+                         },
 
-  <SCRIPT>
-  function areyousure(href) {
-      if (confirm("Permanently delete this <% $label %>?") == true)
-          window.location.href = href;
-  }
-  </SCRIPT>
+             #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) {
+% my $delmsg = emt("Permanently delete this [_1]?", $label);
+  if (confirm(<% $delmsg |js_string %>) == true)
+    window.location.href = href;
+}
+</SCRIPT>
+
+% if ( $custnum ) { 
+
+  <& /elements/header.html,emt("View [_1]: [_2]",$label,$value) &>
+
+  <& /elements/small_custview.html, $custnum, '', 1,
+     "${p}view/cust_main.cgi" &>
+  <BR>
+
+% } else { 
 
-  <% include("/elements/header.html","View $label: $value", menubar(
-      "Cancel this (unaudited) $label" =>
+  <& /elements/header.html,emt("View [_1]: [_2]",$label,$value), menubar(
+      emt("Cancel this (unaudited) [_1]",$label) =>
             "javascript:areyousure(\'${p}misc/cancel-unaudited.cgi?$svcnum\')"
-  )) %>
-% } 
+  ) &>
 
+% } 
 
-Service #<B><% $svcnum %></B>
+<% mt('Service #') |h %><B><% $svcnum %></B>
 % my $url = $opt{'edit_url'} || $p. 'edit/'. $opt{'table'}. '.cgi?';
-| <A HREF="<%$url%><%$svcnum%>">Edit this <% $label %></A>
+| <& /view/elements/svc_edit_link.html, 'svc' => $svc_x &>
 <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, $hack_strict_refs);
+%   if ( ref($f) ) {
+%     $field = $f->{'field'};
+%     $hack_strict_refs = \&{ $f->{'value'} } if $f->{'value'};
+%     $value = $f->{'value'} ? &$hack_strict_refs($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
-%    
+%	$value = time2str($date_format,$value) if ( $type eq 'date' && $value );
+%	$value = time2str("$date_format %H:%M",$value) if ( $type eq 'datetime' && $value );
+%	$value = $value eq 'Y' ? emt('Yes') : emt('No') if ( $type eq 'checkbox' );
+%       #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($_)) %>
 % } 
 
@@ -95,7 +114,6 @@ Service #<B><% $svcnum %></B>
 
 % }
 
-
 <% joblisting({'svcnum'=>$svcnum}, 1) %>
 
 <% include('/elements/footer.html') %>
@@ -106,6 +124,9 @@ die "access denied"
 
 my(%opt) = @_;
 
+my $conf = new FS::Conf;
+my $date_format = $conf->config('date_format') || '%m/%d/%Y';
+
 my $table = $opt{'table'};
 
 my $fields = $opt{'fields'}
@@ -128,12 +149,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);
@@ -145,4 +178,6 @@ if ($pkgnum) {
   $custnum = '';
 }
 
+&{ $opt{'svc_callback'} }( $cgi, $svc_x, $part_svc, $cust_pkg, $fields, \%opt ) 
+    if $opt{'svc_callback'};
 </%init>