X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Felements%2Fsvc_Common.html;h=a822412bf9a9243eb4fb38d9f48b76a0b95be2b6;hb=822645aade15a4c4ac0558b116f7aacf9491002c;hp=8a352f3fa2a6cc51e04d8daf48cf4e28af94e9f3;hpb=0a51b87d75f8c93de863f729ef1ca568ca227e32;p=freeside.git
diff --git a/httemplate/view/elements/svc_Common.html b/httemplate/view/elements/svc_Common.html
index 8a352f3fa..a822412bf 100644
--- a/httemplate/view/elements/svc_Common.html
+++ b/httemplate/view/elements/svc_Common.html
@@ -18,50 +18,56 @@
# 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>
% 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" &>
% } 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 #<% $svcnum %>
+<% mt('Service #') |h %><% $svcnum %>
% my $url = $opt{'edit_url'} || $p. 'edit/'. $opt{'table'}. '.cgi?';
-| Edit this <% $label %>
-|
-Unprovision this Service
+| <& /view/elements/svc_edit_link.html, 'svc' => $svc_x &>
<% ntable("#cccccc") %>
<% ntable("#cccccc",2) %>
% foreach my $f ( @$fields ) {
%
-% my($field, $type);
+% my($field, $type, $value, $hack_strict_refs);
% if ( ref($f) ) {
-% $field = $f->{'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;
% $type = 'text';
% }
%
@@ -76,9 +82,12 @@ Unprovision this Service
%>
|
+% $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
@@ -115,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'}
@@ -147,13 +159,13 @@ 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*$/;
- }
+#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;
@@ -166,4 +178,6 @@ if ($pkgnum) {
$custnum = '';
}
+&{ $opt{'svc_callback'} }( $cgi, $svc_x, $part_svc, $cust_pkg, $fields, \%opt )
+ if $opt{'svc_callback'};
%init>