X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fsvc_www.cgi;h=0579a55b44885cd581b34599d34f1eedbe480e31;hb=17856ff5c299e4db21da28116f2666655c03f2c7;hp=f2be5c717df70792dd883d2e18e0aef9e8dc8c54;hpb=c8cccb4a92adceb943c635fe62dad0d034462ce0;p=freeside.git

diff --git a/httemplate/view/svc_www.cgi b/httemplate/view/svc_www.cgi
index f2be5c717..0579a55b4 100644
--- a/httemplate/view/svc_www.cgi
+++ b/httemplate/view/svc_www.cgi
@@ -1,11 +1,19 @@
-<!-- mason kludge -->
-%
+% die "access denied"
+% unless $FS::CurrentUser::CurrentUser->access_right('View customer services')
+%     || $FS::CurrentUser::CurrentUser->access_right('View customer'); #XXX remove me
 %
 %my($query) = $cgi->keywords;
 %$query =~ /^(\d+)$/;
 %my $svcnum = $1;
-%my $svc_www = qsearchs( 'svc_www', { 'svcnum' => $svcnum } )
-%  or die "svc_www: Unknown svcnum $svcnum";
+%my $svc_www = qsearchs({
+%  'select'    => 'svc_www.*',
+%  'table'     => 'svc_www',
+%  'addl_from' => ' LEFT JOIN cust_svc  USING ( svcnum  ) '.
+%                 ' LEFT JOIN cust_pkg  USING ( pkgnum  ) '.
+%                 ' LEFT JOIN cust_main USING ( custnum ) ',
+%  'hashref'   => { 'svcnum' => $svcnum },
+%  'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql,
+%}) or die "svc_www: Unknown svcnum $svcnum";
 %
 %#false laziness w/all svc_*.cgi
 %my $cust_svc = qsearchs( 'cust_svc', { 'svcnum' => $svcnum } );
@@ -20,6 +28,9 @@
 %}
 %#eofalse
 %
+%my $part_svc=qsearchs('part_svc',{'svcpart'=>$cust_svc->svcpart})
+%  or die "svc_www: Unknown svcpart" . $cust_svc->svcpart;
+
 %my $usersvc = $svc_www->usersvc;
 %my $svc_acct = '';
 %my $email = '';
@@ -48,17 +59,20 @@
 %      qq!<TR><TD ALIGN="right">Service number</TD>!.
 %        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>!.
-%      qq!<TR><TD ALIGN="right">Account</TD>!.
+%        qq!<TD BGCOLOR="#ffffff"><A HREF="http://$www">$www<A></TD></TR>!;
+%if (  $part_svc->part_svc_column('usersvc')->columnflag ne 'F'
+%   || $part_svc->part_svc_column('usersvc')->columnvalue !~ /^\s*$/) {
+%  print 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>';
-%}
+%  if ( $usersvc ) {
+%    print qq!<A HREF="${p}view/svc_acct.cgi?$usersvc">$email</A>!;
+%  } else {
+%    print '</i>(none)</i>';
+%  }
 %
-%print '</TD></TR>';
+%  print '</TD></TR>';
+%}
 %
 %foreach (sort { $a cmp $b } $svc_www->virtual_fields) {
 %  print $svc_www->pvf($_)->widget('HTML', 'view', $svc_www->getfield($_)),