Virtual field merge

4 files changed, 37 insertions, 25 deletions

diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index 599c1d8b9..4e01db341 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -172,7 +172,7 @@ if ($svc_acct->slipip) {
           : $svc_acct->slipip
         ). "</TD>";
   my($attribute);
-  foreach $attribute ( grep /^radius_/, fields('svc_acct') ) {
+  foreach $attribute ( grep /^radius_/, $svc_acct->fields ) {
     #warn $attribute;
     $attribute =~ /^radius_(.*)$/;
     my $pattribute = $FS::raddb::attrib{$1};
@@ -180,7 +180,7 @@ if ($svc_acct->slipip) {
           "<TD BGCOLOR=\"#ffffff\">". $svc_acct->getfield($attribute).
           "</TD></TR>";
   }
-  foreach $attribute ( grep /^rc_/, fields('svc_acct') ) {
+  foreach $attribute ( grep /^rc_/, $svc_acct->fields ) {
     #warn $attribute;
     $attribute =~ /^rc_(.*)$/;
     my $pattribute = $FS::raddb::attrib{$1};
@@ -195,7 +195,19 @@ if ($svc_acct->slipip) {
 print '<TR><TD ALIGN="right">RADIUS groups</TD><TD BGCOLOR="#ffffff">'.
       join('<BR>', $svc_acct->radius_groups). '</TD></TR>';
 
-print '</TABLE></TD></TR></TABLE><BR><BR>';
+# Can this be abstracted further?  Maybe a library function like
+# widget('HTML', 'view', $svc_acct) ?  It would definitely make UI 
+# style management easier.
+
+foreach (sort { $a cmp $b } $svc_acct->virtual_fields) {
+  print $svc_acct->pvf($_)->widget('HTML', 'view', $svc_acct->getfield($_)),
+      "\n";
+}
+%>
+</TABLE></TD></TR></TABLE>
+<%
+
+print '<BR><BR>';
 
 print join("\n", $conf->config('svc_acct-notes') ). '<BR><BR>'.
       joblisting({'svcnum'=>$svcnum}, 1). '</BODY></HTML>';
diff --git a/httemplate/view/svc_broadband.cgi b/httemplate/view/svc_broadband.cgi
index 164b5b22c..677a4b058 100644
--- a/httemplate/view/svc_broadband.cgi
+++ b/httemplate/view/svc_broadband.cgi
@@ -64,26 +64,12 @@ print header('Broadband Service View', menubar(
         qq!<TD BGCOLOR="#ffffff">$ip_addr</TD></TR>!.
       '</TD></TR><TR ROWSPAN="1"><TD></TD></TR>';
 
+foreach (sort { $a cmp $b } $svc_broadband->virtual_fields) {
+  print $svc_broadband->pvf($_)->widget('HTML', 'view', 
+      $svc_broadband->getfield($_)), "\n";
+}
 
-#  foreach my $sb_field 
-#      ( qsearch('sb_field', { svcnum => $svcnum }) ) {
-#    my $part_sb_field = qsearchs('part_sb_field',
-#                         { sbfieldpart => $sb_field->sbfieldpart });
-#    print q!<TR><TD ALIGN="right">! . $part_sb_field->name . 
-#          q!</TD><TD BGCOLOR="#ffffff">! . $sb_field->value . 
-#          q!</TD></TR>!;
-#  }
-#  print '</TABLE>';
-
-
-  my $sb_field = $svc_broadband->sb_field_hashref;
-  foreach (sort { $a cmp $b } keys(%{$sb_field})) {
-    print q!<TR><TD ALIGN="right">! . $_ . 
-          q!</TD><TD BGCOLOR="#ffffff">! . $sb_field->{$_} .
-          q!</TD></TR>!;
-  }
-  print '</TABLE>';
-
+print '</TABLE>';
 
 print '<BR>'. joblisting({'svcnum'=>$svcnum}, 1).
       '</BODY></HTML>'
diff --git a/httemplate/view/svc_forward.cgi b/httemplate/view/svc_forward.cgi
index c8d1d6213..5d619de54 100755
--- a/httemplate/view/svc_forward.cgi
+++ b/httemplate/view/svc_forward.cgi
@@ -61,7 +61,14 @@ print qq!<A HREF="${p}edit/svc_forward.cgi?$svcnum">Edit this information</A>!.
       qq!<TR><TD ALIGN="right">Email to</TD>!.
         qq!<TD BGCOLOR="#ffffff">$source</TD></TR>!.
       qq!<TR><TD ALIGN="right">Forwards to </TD>!.
-        qq!<TD BGCOLOR="#ffffff">$destination</TD></TR></TABLE>!.
+        qq!<TD BGCOLOR="#ffffff">$destination</TD></TR>!;
+
+foreach (sort { $a cmp $b } $svc_forward->virtual_fields) {
+  print $svc_forward->pvf($_)->widget('HTML', 'view', $svc_forward->getfield($_)),
+      "\n";
+}
+
+print qq!  </TABLE>!.
       '<BR>'. joblisting({'svcnum'=>$svcnum}, 1).
       '</BODY></HTML>'
 ;
diff --git a/httemplate/view/svc_www.cgi b/httemplate/view/svc_www.cgi
index 442614491..7a716b4b8 100644
--- a/httemplate/view/svc_www.cgi
+++ b/httemplate/view/svc_www.cgi
@@ -47,8 +47,15 @@ print header('Website View', menubar(
       qq!<TR><TD ALIGN="right">Website name</TD>!.
         qq!<TD BGCOLOR="#ffffff"><A HREF="http://$www">$www<A></TD></TR>!.
       qq!<TR><TD ALIGN="right">Account</TD>!.
-        qq!<TD BGCOLOR="#ffffff"><A HREF="${p}view/svc_acct.cgi?$usersvc">$email</A></TD></TR>!.
-      '</TABLE></TD></TR></TABLE>'.
+        qq!<TD BGCOLOR="#ffffff"><A HREF="${p}view/svc_acct.cgi?$usersvc">$email</A></TD></TR>!;
+
+foreach (sort { $a cmp $b } $svc_www->virtual_fields) {
+  print $svc_www->pvf($_)->widget('HTML', 'view', $svc_www->getfield($_)),
+      "\n";
+}
+
+
+print '</TABLE></TD></TR></TABLE>'.
       '<BR>'. joblisting({'svcnum'=>$svcnum}, 1).
       '</BODY></HTML>'
 ;