X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fpart_svc.cgi;h=79703435cb6ab613019ee228294436ea0fbd74dd;hb=2a644303258fb8f60de91bab271fd0422e5a959d;hp=4b8a2408037488038c1fdb5672d214c0ff4cff72;hpb=5e05724a635a22776f1b973f5d7e77989da4e048;p=freeside.git
diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 4b8a24080..79703435c 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -122,6 +122,7 @@ that field.
% $html .= include('/elements/table-grid.html', 'cellpadding' => 4 ).
% '
'.
% 'Field | '.
+% 'Label | '.
% 'Modifier | '.
% '
';
%
@@ -131,7 +132,14 @@ that field.
%
% #yucky kludge
% my @fields = defined( dbdef->table($layer) )
-% ? grep { $_ ne 'svcnum' } fields($layer)
+% ? grep {
+% $_ ne 'svcnum' &&
+% ( !FS::part_svc->svc_table_fields($layer)
+% ->{$_}->{disable_part_svc_column} ||
+% $part_svc->part_svc_column($_)->columnflag
+% )
+% }
+% fields($layer)
% : ();
% push @fields, 'usergroup' if $layer eq 'svc_acct'; #kludge
% $part_svc->svcpart($clone) if $clone; #haha, undone below
@@ -139,13 +147,15 @@ that field.
%
% foreach my $field (@fields) {
%
-% #my $def = $defs{$layer}{$field};
+% #a few lines of false laziness w/browse/part_svc.cgi
% my $def = FS::part_svc->svc_table_fields($layer)->{$field};
-% my $label = $def->{'def_label'} || $def->{'label'};
+% my $def_info = $def->{'def_info'};
% my $formatter = $def->{'format'} || sub { shift };
+%
% my $part_svc_column = $part_svc->part_svc_column($field);
+% my $label = $part_svc_column->columnlabel || $def->{'label'};
% my $value = &$formatter($part_svc_column->columnvalue);
-% my $flag = $part_svc_column->columnflag;
+% my $flag = $part_svc_column->columnflag;
%
% if ( $bgcolor eq $bgcolor1 ) {
% $bgcolor = $bgcolor2;
@@ -153,9 +163,12 @@ that field.
% $bgcolor = $bgcolor1;
% }
%
-% $html .= qq!!.
-% ( $label || $field ).
+% $html .= qq! |
!.
+% ( $def->{'label'} || $field ).
% " | ";
+%
+% $html .= qq! | ';
+%
% $flag = '' if $def->{type} eq 'disabled';
%
% $html .= qq!!;
@@ -261,9 +274,10 @@ that field.
% if ( $def->{select_table} ) {
% foreach my $record ( qsearch( $def->{select_table}, {} ) ) {
% my $rvalue = $record->getfield($def->{select_key});
+% my $select_label = $def->{select_label};
% $html .= qq!';
+% $record->$select_label(). '';
% } #next $record
% } else { # select_list
% foreach my $item ( @{$def->{select_list}} ) {
@@ -294,6 +308,15 @@ that field.
% }
%
% $html .= " |
\n";
+
+% $def_info = "($def_info)" if $def_info;
+% $html .=
+% qq!!.
+% qq! !.
+% qq! $def_info!.
+% qq! | !.
+% qq!
\n!;
%
% } #foreach my $field (@fields) {
%