user-defined site ID / location codes per location, RT#30856, RT#27545

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

diff --git a/httemplate/view/cust_main/contacts.html b/httemplate/view/cust_main/contacts.html
index 9c60691..c9f8005 100644 (file)
--- a/httemplate/view/cust_main/contacts.html
+++ b/httemplate/view/cust_main/contacts.html
@@ -1,13 +1,18 @@
 % 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>
 <TABLE CLASS="fsinnerbox">
 
 % if ( $this eq 'bill' ) {
@@ -22,6 +27,16 @@
                               : $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>
+    <TD ALIGN="right"><% mt('Spouse') |h %></TD>
+    <TD COLSPAN=5 BGCOLOR="#ffffff">
+      <% 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>
@@ -36,8 +51,25 @@
     <TD COLSPAN=7 BGCOLOR="#ffffff"><% $cust_main->company |h %></TD>
   </TR>
 %   }
-% } # if $this eq 'bill'
-% # now the actual address
+% } 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>
+  </TR>
+%   }
+% }
+
+
+% if ( $location ) { # now the actual address
+
+%   if ( $location->locationname ) {
+      <TR>
+        <TD ALIGN="right"><% mt('Location ID') |h %></TD>
+        <TD COLSPAN=7 BGCOLOR="#ffffff"><% $location->locationname |h %></TD>
+      </TR>
+%   }
+
 <TR>
   <TD ALIGN="right"><% mt('Address') |h %></TD>
   <TD COLSPAN=7 BGCOLOR="#ffffff"><% $location->address1 |h %></TD>
@@ -79,6 +111,9 @@
                                $cust_main->agentnum,
   &>
 % }
+<& /elements/tr-censustract.html, $location &>
+
+% }
   
 % if ( $this eq 'bill' ) {
 %   # billing contact phone numbers