X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fsvc_www.cgi;h=2980f846b6a7107a567329131058bad744ca5d15;hp=86f693201ec35445ed3f264203e508a44519961c;hb=8ed2714fc50607081d7ac4edf0b17e23902dabba;hpb=6e863af6c6c3ebda89f1da6ca9c3c52fb9b1a54a

diff --git a/httemplate/view/svc_www.cgi b/httemplate/view/svc_www.cgi
index 86f693201..2980f846b 100644
--- a/httemplate/view/svc_www.cgi
+++ b/httemplate/view/svc_www.cgi
@@ -20,19 +20,19 @@ if ($pkgnum) {
 }
 #eofalse
 
+my $usersvc = $svc_www->usersvc;
+my $svc_acct = qsearchs('svc_acct', { 'svcnum' => $usersvc } )
+  or die "svc_www: Unknown usersvc $usersvc";
+my $email = $svc_acct->email;
+
 my $domain_record = qsearchs('domain_record', { 'recnum' => $svc_www->recnum } )
-  or die "svc_www: Unknown recnum". $svc_www->recnum;
+  or die "svc_www: Unknown recnum ". $svc_www->recnum;
 
-my $www = $domain_record->reczone;
-unless ( $www =~ /\.$/ ) {
-  my $svc_domain = qsearchs('svc_domain', { svcnum=>$domain_record->svcnum } );
-  $www .= '.'. $svc_domain->domain;
-}
+my $www = $domain_record->zone;
 
 print header('Website View', menubar(
   ( ( $custnum )
-    ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
-        "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+    ? ( "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
       )                                                                       
     : ( "Cancel this (unaudited) website" =>
           "${p}misc/cancel-unaudited.cgi?$svcnum" )
@@ -45,7 +45,16 @@ print header('Website View', menubar(
         qq!<TD BGCOLOR="#ffffff">$svcnum</TD></TR>!.
       qq!<TR><TD ALIGN="right">Website name</TD>!.
         qq!<TD BGCOLOR="#ffffff"><A HREF="http://$www">$www<A></TD></TR>!.
-      '</TABLE></TD></TR></TABLE>'.
+      qq!<TR><TD ALIGN="right">Account</TD>!.
+        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>'
 ;