have the UI use full country names, and state names outside the US...

[freeside.git] / httemplate / view / svc_www.cgi

diff --git a/httemplate/view/svc_www.cgi b/httemplate/view/svc_www.cgi
index 86f6932..6c8cd6a 100644 (file)
--- a/httemplate/view/svc_www.cgi
+++ b/httemplate/view/svc_www.cgi
@@ -20,19 +20,23 @@ if ($pkgnum) {
 }
 #eofalse
 
+my $usersvc = $svc_www->usersvc;
+my $svc_acct = '';
+my $email = '';
+if ( $usersvc ) {
+  $svc_acct = qsearchs('svc_acct', { 'svcnum' => $usersvc } )
+    or die "svc_www: Unknown usersvc $usersvc";
+  $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 +49,24 @@ 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">!;
+
+if ( $usersvc ) {
+  print qq!<A HREF="${p}view/svc_acct.cgi?$usersvc">$email</A>!;
+} else {
+  print '</i>(none)</i>';
+}
+
+print '</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>'
 ;