internationalization/localization, RT12515

[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 618d33e..7a7539d 100644 (file)
--- a/httemplate/view/elements/svc_Common.html
+++ b/httemplate/view/elements/svc_Common.html
@@ -51,20 +51,19 @@ function areyousure(href) {
 
 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>
+| <% include('/view/elements/svc_edit_link.html', 'svc' => $svc_x) %>
 <BR>
 
 <% ntable("#cccccc") %><TR><TD><% ntable("#cccccc",2) %>
 
 % foreach my $f ( @$fields ) {
 %
-%   my($field, $type, $value);
+%   my($field, $type, $value, $hack_strict_refs);
 %   if ( ref($f) ) {
-%     $field = $f->{'field'},
-%     $value = $f->{'value'} ? &{ $f->{'value'} }($svc_x) : $svc_x->$field;
-%     $type  = $f->{'type'} || 'text',
+%     $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;
@@ -82,6 +81,9 @@ Unprovision this Service</A>
           %>
         </TD>
 
+%      $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' );
 %       #eventually more options for <SELECT>, etc. fields
 
         <TD BGCOLOR="#ffffff"><% $value %><TD>
@@ -121,6 +123,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'}
@@ -172,4 +177,6 @@ if ($pkgnum) {
   $custnum = '';
 }
 
+&{ $opt{'svc_callback'} }( $cgi, $svc_x, $part_svc, $cust_pkg, $fields, \%opt ) 
+    if $opt{'svc_callback'};
 </%init>