X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fcontacts.html;h=83a6380264b1437b8e4f835de3f7a26c5c1aacde;hp=6213f27dda4732a2ea14217ae510c5bdd3fb1b13;hb=747949f05c140e23221b3a2364928431f58fc2d3;hpb=f3c4966ed1f6ec3db7accd6dcdd3a5a3821d72a7

diff --git a/httemplate/view/cust_main/contacts.html b/httemplate/view/cust_main/contacts.html
index 6213f27dd..83a638026 100644
--- a/httemplate/view/cust_main/contacts.html
+++ b/httemplate/view/cust_main/contacts.html
@@ -1,30 +1,52 @@
 % my %addr_label = ('bill' => 'Billing address', 'ship' => 'Service address');
 
 %# Locations (possibly break this out)
-% my @which = ('bill');
-% push @which, 'ship' if $cust_main->has_ship_address;
+% my @which = ('bill', 'ship');
 % while (@which) {
 %   my $this = shift @which;
 %   my $method = $this.'_location';
 %   my $location = $cust_main->$method;
-<FONT CLASS="fsinnerbox-title"><% mt( $addr_label{$this} ) |h %></FONT>
+<FONT CLASS="fsinnerbox-title"><% mt( $addr_label{$this} ) |h %>
+%   if ( $this eq 'ship' and 
+%       $cust_main->bill_locationnum == $cust_main->ship_locationnum )
+%   {
+ (<% mt('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>
 %   }
   </TR>
+%   if ( $conf->exists('cust_main-enable_spouse') and
+%        ($cust_main->spouse_last or $cust_main->spouse_first) ) {
+  <TR>
+    <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') ) {
   <TR>
-    <TD ALIGN="right"><% mt('Email address(es)') |h %></TD>
+    <TH ALIGN="right"><% mt('Email address(es)') |h %></TH>
     <TD BGCOLOR="#ffff00">
       <% $cust_main->invoicing_list_emailonly_scalar || $no %>
     </TD>
@@ -32,15 +54,32 @@
 %   }
 %   if ( $cust_main->company ) {
   <TR>
+    <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->company %></TD>
+    <TD COLSPAN=7><% $cust_main->ship_company |h %></TD>
   </TR>
 %   }
-% } # if $this eq 'bill'
-% # now the actual address
+% }
+
+
+% if ( $location ) { # now the actual address
+
+%   if ( $location->locationname ) {
+      <TR>
+        <TD ALIGN="right"><% mt('Location ID') |h %></TD>
+        <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') ) {
@@ -49,27 +88,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>
+,<% state_label( $location->state, $location->country ) |h %>
+  <% $location->zip %>
+</TD>
 </TR>
 <TR>
-  <TD ALIGN="right"><% mt('Country') |h %></TD>
-  <TD BGCOLOR="#ffffff"><% code2country( $location->country ) %></TD>
+  <TH></TH>
+  <TD><% code2country( $location->country ) %></TD>
 </TR>
 
 % if ( $location->latitude && $location->longitude ) {
@@ -79,6 +116,9 @@
                                $cust_main->agentnum,
   &>
 % }
+<& /elements/tr-censustract.html, $location &>
+
+% }
   
 % if ( $this eq 'bill' ) {
 %   # billing contact phone numbers
@@ -86,7 +126,7 @@
 %     next if !$cust_main->get($phone);
 <TR>
   <TD ALIGN="right"><% $phone_label{$phone} %></TD>
-  <TD COLSPAN=3 BGCOLOR="#ffffff">
+  <TD COLSPAN=3>
     <& /elements/phonenumber.html,
         $cust_main->get($phone),
         callable => 1,
@@ -100,7 +140,7 @@
 
   <TR>
     <TD ALIGN="right"><% mt('Fax') |h %></TD>
-    <TD COLSPAN=3 BGCOLOR="#ffffff">
+    <TD COLSPAN=3>
       <% $cust_main->get('fax') || '&nbsp;' %>
     </TD>
   </TR>
@@ -111,9 +151,9 @@
 
 <TR>
     <TD ALIGN="right"><% $stateid_label %></TD>
-    <TD BGCOLOR="#ffffff"><% $cust_main->masked('stateid') || '&nbsp' %></TD>
+    <TD><% $cust_main->masked('stateid') || '&nbsp' %></TD>
     <TD ALIGN="right"><% $stateid_state_label %></TD>
-    <TD BGCOLOR="#ffffff"><% $cust_main->stateid_state || '&nbsp' %></TD>
+    <TD><% $cust_main->stateid_state || '&nbsp' %></TD>
   </TR>
 
 %   }