% 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' ) {
: $cust_main->masked('ss') || ' ' %></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>
% if ( $cust_main->company ) {
<TR>
<TD ALIGN="right"><% mt('Company') |h %></TD>
- <TD COLSPAN=7 BGCOLOR="#ffffff"><% $cust_main->company %></TD>
+ <TD COLSPAN=7 BGCOLOR="#ffffff"><% $cust_main->company |h %></TD>
</TR>
% }
-% } # if $this eq 'bill'
+% } 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>
+% }
+% }
% # 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>
$cust_main->agentnum,
&>
% }
+<& /elements/tr-censustract.html, $location &>
% if ( $this eq 'bill' ) {
% # billing contact phone numbers