X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Felements%2Fsvc_Common.html;h=3c1cc66fa41d031982a2d0bdff73339d14a32b0e;hb=7c41eea8dca02a399739c29a0dfbda7efdd6df86;hp=7a7539da2aaa51a2c5451a6583563796cf0ec711;hpb=b5c4237a34aef94976bc343c8d9e138664fc3984;p=freeside.git

diff --git a/httemplate/view/elements/svc_Common.html b/httemplate/view/elements/svc_Common.html
index 7a7539da2..3c1cc66fa 100644
--- a/httemplate/view/elements/svc_Common.html
+++ b/httemplate/view/elements/svc_Common.html
@@ -27,50 +27,66 @@
 </%doc>
 <SCRIPT>
 function areyousure(href) {
-  if (confirm("Permanently delete this <% $label %>?") == true)
+% my $delmsg = emt("Permanently delete this [_1]?", $label);
+  if (confirm(<% $delmsg |js_string %>) == true)
     window.location.href = href;
 }
 </SCRIPT>
 
 % if ( $custnum ) { 
 
-  <% include("/elements/header.html","View $label: $value") %>
+  <& /elements/header.html, mt("View [_1]: [_2]",$label,$value) &>
 
-  <% include( '/elements/small_custview.html', $custnum, '', 1,
-     "${p}view/cust_main.cgi") %>
+  <& /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, mt("View [_1]: [_2]",$label,$value), menubar(
+      emt("Cancel this (unaudited) [_1]",$label) =>
             "javascript:areyousure(\'${p}misc/cancel-unaudited.cgi?$svcnum\')"
-  )) %>
+  ) &>
 
 % } 
 
-Service #<B><% $svcnum %></B>
-% my $url = $opt{'edit_url'} || $p. 'edit/'. $opt{'table'}. '.cgi?';
-| <% include('/view/elements/svc_edit_link.html', 'svc' => $svc_x) %>
+<% mt('Service #') |h %><B><% $svcnum %></B>
+% if ( $custnum ) {
+%   my $url = $opt{'edit_url'} || $p. 'edit/'. $opt{'table'}. '.cgi?';
+<& /view/elements/svc_edit_link.html, 'svc' => $svc_x, 'edit_url' => $url &>
+% }
 <BR>
 
 <% ntable("#cccccc") %><TR><TD><% ntable("#cccccc",2) %>
 
+% my @inventory_items = $svc_x->inventory_item;
 % foreach my $f ( @$fields ) {
 %
-%   my($field, $type, $value, $hack_strict_refs);
+%   my($field, $type, $value);
 %   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';
+%     if ( $f->{'value_callback'} ) {
+%       my $hack_strict_refs = \&{ $f->{'value_callback'} };
+%       $value = &$hack_strict_refs($svc_x);
+%     } else {
+%       $value = exists($f->{'value'}) ? $f->{'value'} : $svc_x->$field;
+%     }
 %   } else {
 %     $field = $f;
-%     $value = $svc_x->$field;
 %     $type = 'text';
+%     $value = $svc_x->$field;
 %   }
 %
 %   my $columndef = $part_svc->part_svc_column($field);
+%   if ( $columndef->columnflag =~ /^[MA]$/ && $columndef->columnvalue =~ /,/ )
+%   {
+%     # inventory-select field with multiple classes
+%     # show the class name to disambiguate
+%     my ($item) = grep { $_->svc_field eq $field } @inventory_items;
+%     my $class = qsearchs('inventory_class', { classnum => $item->classnum });
+%     $value .= ' <i>('. $class->classname . ')</i>' if $class;
+%   }
 %   unless ($columndef->columnflag eq 'F' && !length($columndef->columnvalue)) {
 
       <TR>
@@ -83,7 +99,7 @@ Service #<B><% $svcnum %></B>
 
 %	$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' ? 'Yes' : 'No' if ( $type eq 'checkbox' );
+%	$value = $value eq 'Y' ? emt('Yes') : emt('No') if ( $type eq 'checkbox' );
 %       #eventually more options for <SELECT>, etc. fields
 
         <TD BGCOLOR="#ffffff"><% $value %><TD>
@@ -103,6 +119,11 @@ Service #<B><% $svcnum %></B>
 
 <BR>
 
+<& svc_devices.html,
+     'svc_x' => $svc_x,
+     'table' => $svc_x->device_table,
+&>
+
 % if ( defined($opt{'html_foot'}) ) {
 
   <% ref($opt{'html_foot'})
@@ -113,6 +134,10 @@ Service #<B><% $svcnum %></B>
 
 % }
 
+% if ( $cust_svc ) {
+<& /elements/table-tickets.html, object => $cust_svc &>
+% }
+
 <% joblisting({'svcnum'=>$svcnum}, 1) %>
 
 <% include('/elements/footer.html') %>
@@ -134,7 +159,7 @@ my $fields = $opt{'fields'}
 
 my $svcnum;
 if ( $cgi->param('svcnum') ) {
-  $cgi->param('svcnum') =~ /^(\d+)$/ or die "unparsable svcnum";
+  $cgi->param('svcnum') =~ /^(\d+)$/ or die "unparseable svcnum";
   $svcnum = $1;
 } else {
   my($query) = $cgi->keywords;
@@ -154,19 +179,29 @@ my $svc_x = qsearchs({
 }) 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 ($label, $value, $svcdb, $part_svc );
+my $labels = $opt{labels}; #not -> here
+
+if ( $cust_svc ) {
+  ($label, $value, $svcdb) = $cust_svc->label;
 
-my $part_svc = $cust_svc->part_svc;
+  $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*$/;
+    $labels->{$field} = $col->columnlabel if $col->columnlabel !~ /^\s*$/;
   }
+} else {
+  $label = "Unlinked $table";
+  $value = $svc_x->label;
+  $svcdb = $table;
+  # just to satisfy callbacks
+  $part_svc = FS::part_svc->new({ svcpart => 0, svcdb => $table });
+}
 
-my $pkgnum = $cust_svc->pkgnum;
+my $pkgnum = $cust_svc->pkgnum if $cust_svc;
 
 my($cust_pkg, $custnum);
 if ($pkgnum) {