prevent new "Bill now" link from futzing up later forms, RT#9193

[freeside.git] / httemplate / view / cust_main / misc.html

diff --git a/httemplate/view/cust_main/misc.html b/httemplate/view/cust_main/misc.html
index 060da87..d383e4a 100644 (file)
--- a/httemplate/view/cust_main/misc.html
+++ b/httemplate/view/cust_main/misc.html
@@ -10,12 +10,9 @@
   <TD BGCOLOR="#ffffff"><FONT COLOR="#<% $cust_main->statuscolor %>"><B><% ucfirst($cust_main->status) %></B></FONT></TD>
 </TR>
 
-%my $agent;
-%if ( $num_agents == 1 ) {
-%  my @agents = qsearchs( 'agent', {} );
-%  $agent = $agents[0];
-%} else {
-%  $agent = qsearchs('agent',{ 'agentnum' => $cust_main->agentnum } );
+%unless ( scalar(@agentnums) == 1
+%         && !$curuser->access_right('View customers of all agents')  ) {
+%  my $agent = qsearchs('agent',{ 'agentnum' => $cust_main->agentnum } );
    <TR>
      <TD ALIGN="right">Agent</TD>
      <TD BGCOLOR="#ffffff"><% $agent->agentnum %>: <% $agent->agent %></TD>
@@ -31,13 +28,18 @@
 </TR>
 %
 %  }
-%
+
+%  #if ( $cust_main->classnum ) {
+     <TR>
+       <TD ALIGN="right">Class</TD>
+       <TD BGCOLOR="#ffffff"><% $cust_main->classname || '(none)' %></TD>
+     </TR>
+%  #}
+
 %  unless ( FS::part_referral->num_part_referral == 1 ) {
 %    my $referral = qsearchs('part_referral', {
 %      'refnum' => $cust_main->refnum
 %    } );
-%
-
 
 <TR>
   <TD ALIGN="right">Advertising&nbsp;source</TD>
@@ -85,13 +87,24 @@
   </TR>
 
 % if ( $conf->exists('cust_main-enable_birthdate') ) {
-%   my $dt = DateTime->from_epoch(epoch => $cust_main->birthdate,
-%                                  time_zone=>'floating',
-%                                 );
+%   my $dt = $cust_main->birthdate ne ''
+%              ? DateTime->from_epoch( 'epoch'     => $cust_main->birthdate,
+%                                      'time_zone' =>'floating',
+%                                    )
+%              : '';
 
   <TR>
     <TD ALIGN="right">Date of Birth</TD>
-    <TD BGCOLOR="#ffffff"><% $cust_main->birthdate ne '' ? $dt->strftime($date_format) : '' %></TD>
+    <TD BGCOLOR="#ffffff"><% $dt ? $dt->strftime($date_format) : '' %></TD>
+  </TR>
+
+% }
+
+% if ( $conf->exists('cust_main-require_censustract') ) {
+
+  <TR>
+    <TD ALIGN="right">Census tract</TD>
+    <TD BGCOLOR="#ffffff"><% $cust_main->censustract  %></TD>
   </TR>
 
 % }
@@ -103,8 +116,8 @@ my( $cust_main ) = @_;
 my $conf = new FS::Conf;
 my $date_format = ($conf->config('date_format') || "%m/%d/%Y");
 
-my $sth = dbh->prepare('SELECT COUNT(*) FROM agent') or die dbh->errstr;
-$sth->execute or die $sth->errstr;
-my $num_agents = $sth->fetchrow_arrayref->[0];
+my $curuser = $FS::CurrentUser::CurrentUser;
+
+my @agentnums = $curuser->agentnums;
 
 </%init>