X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fcontacts.html;h=1660c1c2272a649ce8783c6864287d0a2160b299;hp=c9f8005b029b6f6c05711310ff211cfa0e803bd5;hb=ae58eda132b5a89ce251dbdf13822dee2f3bc92f;hpb=5556814b7ff65b0a4837390be9331e1841189427

diff --git a/httemplate/view/cust_main/contacts.html b/httemplate/view/cust_main/contacts.html
index c9f8005b0..1660c1c22 100644
--- a/httemplate/view/cust_main/contacts.html
+++ b/httemplate/view/cust_main/contacts.html
@@ -10,19 +10,26 @@
 %   if ( $this eq 'ship' and 
 %       $cust_main->bill_locationnum == $cust_main->ship_locationnum )
 %   {
- (<% mt('same as billing') %>)
+ (<% emt('same as billing') %>)
 %   }
 </FONT>
+%   if (
+%     ($this eq 'ship')
+%     && $cust_main->invoice_ship_address 
+%     && !$conf->exists('invoice-ship_address') #it's always on, so hide per-cust config
+%    ) {
+<SPAN STYLE="padding-left: .25em;">(<% emt('included on invoices') %>)</SPAN>
+%   }
 <TABLE CLASS="fsinnerbox">
 
 % if ( $this eq 'bill' ) {
 %   #billing contact fields
   <TR>
-    <TD ALIGN="right"><% mt('Contact name') |h %></TD>
-    <TD COLSPAN=5 BGCOLOR="#ffffff"><% $cust_main->contact |h %></TD>
+    <TH ALIGN="right"><% mt('Contact name') |h %></TH>
+    <TD COLSPAN=5><% $cust_main->contact |h %></TD>
 %   if ( $conf->exists('show_ss') ) {
-    <TD ALIGN="right"><% mt('SS#') |h %></TD>
-    <TD BGCOLOR="#ffffff"><% $conf->exists('unmask_ss')
+    <TH ALIGN="right"><% mt('SS#') |h %></TH>
+    <TD><% $conf->exists('unmask_ss')
                               ? $cust_main->ss
                               : $cust_main->masked('ss') || '&nbsp;' %></TD>
 %   }
@@ -30,32 +37,53 @@
 %   if ( $conf->exists('cust_main-enable_spouse') and
 %        ($cust_main->spouse_last or $cust_main->spouse_first) ) {
   <TR>
-    <TD ALIGN="right"><% mt('Spouse') |h %></TD>
-    <TD COLSPAN=5 BGCOLOR="#ffffff">
+    <TH ALIGN="right"><% mt('Spouse') |h %></TH>
+    <TD COLSPAN=5>
       <% join(', ', grep $_, 
                     $cust_main->spouse_last, $cust_main->spouse_first) %>
     </TD>
   </TR>
-% }
-%   if ( $conf->exists('cust-email-high-visibility') ) {
+%   }
+%
+%   # invoicing email
+%   if ( scalar(@invoicing_list) == 1 ) { # typical individual user; show here
   <TR>
-    <TD ALIGN="right"><% mt('Email address(es)') |h %></TD>
-    <TD BGCOLOR="#ffff00">
-      <% $cust_main->invoicing_list_emailonly_scalar || $no %>
+    <TH ALIGN="right"><% mt('Email address') |h %></TH>
+    <TD>
+      <% $invoicing_list[0] %>
     </TD>
   </TR>
-%   }
+%   } elsif ( scalar(@invoicing_list) > 1 ) {
+%   # business customer with a contact list
+%   # show nothing here
+%
+%   } else { # there is no invoice email for them
+  <TR>
+    <TH ALIGN="right"><% mt('Email address') |h %></TH>
+%     if ( !$cust_main->postal_invoice or
+%          $conf->exists('cust_main-require_invoicing_list_email',
+%                        $cust_main->agentnum)
+%     ) {
+%       # we need a contact email for this customer (either because that's
+%       # policy, or because otherwise they won't receive invoices) but we
+%       # don't have one.
+    <TD CLASS="error"><% emt('none') %></TD>
+%     } else {
+    <TD><% emt('no') %></TD>
+%     }
+%   } # end of invoicing email
+ 
 %   if ( $cust_main->company ) {
   <TR>
-    <TD ALIGN="right"><% mt('Company') |h %></TD>
-    <TD COLSPAN=7 BGCOLOR="#ffffff"><% $cust_main->company |h %></TD>
+    <TH ALIGN="right"><% mt('Company') |h %></TH>
+    <TD COLSPAN=7><% $cust_main->company |h %></TD>
   </TR>
 %   }
 % } elsif ( $this eq 'ship' ) {
 %   if ( $cust_main->ship_company ) { # mostly obsolete these days...
   <TR>
-    <TD ALIGN="right"><% mt('Company') |h %></TD>
-    <TD COLSPAN=7 BGCOLOR="#ffffff"><% $cust_main->ship_company |h %></TD>
+    <TH ALIGN="right"><% mt('Company') |h %></TH>
+    <TD COLSPAN=7><% $cust_main->ship_company |h %></TD>
   </TR>
 %   }
 % }
@@ -65,14 +93,14 @@
 
 %   if ( $location->locationname ) {
       <TR>
-        <TD ALIGN="right"><% mt('Location ID') |h %></TD>
-        <TD COLSPAN=7 BGCOLOR="#ffffff"><% $location->locationname |h %></TD>
+        <TH ALIGN="right"><% mt('Location ID') |h %></TH>
+        <TD COLSPAN=7><% $location->locationname |h %></TD>
       </TR>
 %   }
 
 <TR>
-  <TD ALIGN="right"><% mt('Address') |h %></TD>
-  <TD COLSPAN=7 BGCOLOR="#ffffff"><% $location->address1 |h %></TD>
+  <TH ALIGN="right"><% mt('Address') |h %></TH>
+  <TD COLSPAN=7><% $location->address1 |h %></TD>
 </TR>
 
 % if ( $location->get('address2') ) {
@@ -81,27 +109,25 @@
 %                        : ' ';
 
 <TR>
-  <TD ALIGN="right"><% $address2_label %></TD>
-  <TD COLSPAN=7 BGCOLOR="#ffffff"><% $location->address2 |h %></TD>
+  <TH ALIGN="right"><% $address2_label %></TH>
+  <TD COLSPAN=7><% $location->address2 |h %></TD>
 </TR>
 
 % } 
 
 <TR>
-  <TD ALIGN="right"><% mt('City') |h %></TD>
-  <TD BGCOLOR="#ffffff"><% $location->city |h %></TD>
+  <TH></TH>
+  <TD COLSPAN=5><% $location->city |h %>\
 % if ( $location->county ) {
-    <TD ALIGN="right"><% mt('County') |h %></TD>
-    <TD BGCOLOR="#ffffff"><% $location->county |h %></TD>
+ (<% $location->county |h %> county)\
 % }
-  <TD ALIGN="right"><% mt('State') |h %></TD>
-  <TD BGCOLOR="#ffffff"><% state_label( $location->state, $location->country ) |h %></TD>
-  <TD ALIGN="right"><% mt('Zip') |h %></TD>
-  <TD BGCOLOR="#ffffff"><% $location->zip %></TD>
+<% ($location->city || $location->county) ? ', ' : ''%><% state_label( $location->state, $location->country ) |h %>
+  <% $location->zip |h %>
+</TD>
 </TR>
 <TR>
-  <TD ALIGN="right"><% mt('Country') |h %></TD>
-  <TD BGCOLOR="#ffffff"><% code2country( $location->country ) %></TD>
+  <TH></TH>
+  <TD><% $location->country_full |h %></TD>
 </TR>
 
 % if ( $location->latitude && $location->longitude ) {
@@ -120,8 +146,8 @@
 %   foreach my $phone (qw(daytime night mobile)) {
 %     next if !$cust_main->get($phone);
 <TR>
-  <TD ALIGN="right"><% $phone_label{$phone} %></TD>
-  <TD COLSPAN=3 BGCOLOR="#ffffff">
+  <TH ALIGN="right"><% $phone_label{$phone} %></TD>
+  <TD COLSPAN=3>
     <& /elements/phonenumber.html,
         $cust_main->get($phone),
         callable => 1,
@@ -134,8 +160,8 @@
 %   if ( $cust_main->get('fax') ) {
 
   <TR>
-    <TD ALIGN="right"><% mt('Fax') |h %></TD>
-    <TD COLSPAN=3 BGCOLOR="#ffffff">
+    <TH ALIGN="right"><% mt('Fax') |h %></TH>
+    <TD COLSPAN=3>
       <% $cust_main->get('fax') || '&nbsp;' %>
     </TD>
   </TR>
@@ -145,10 +171,10 @@
 %   if ( $conf->exists('show_stateid') ) { 
 
 <TR>
-    <TD ALIGN="right"><% $stateid_label %></TD>
-    <TD BGCOLOR="#ffffff"><% $cust_main->masked('stateid') || '&nbsp' %></TD>
-    <TD ALIGN="right"><% $stateid_state_label %></TD>
-    <TD BGCOLOR="#ffffff"><% $cust_main->stateid_state || '&nbsp' %></TD>
+    <TH ALIGN="right"><% $stateid_label %></TH>
+    <TD><% $cust_main->masked('stateid') || '&nbsp' %></TD>
+    <TH ALIGN="right"><% $stateid_state_label %></TH>
+    <TD><% $cust_main->stateid_state || '&nbsp' %></TD>
   </TR>
 
 %   }
@@ -190,8 +216,6 @@ my $stateid_state_label = FS::Msgcat::_gettext('stateid_state') =~ /^(stateid_st
 
 my $cust_main = shift;
 my $conf = new FS::Conf;
-my @invoicing_list = $cust_main->invoicing_list;
-my $no = emt('no');
+my @invoicing_list = $cust_main->invoicing_list_emailonly;
 
 </%init>
-