X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fcontacts.html;h=252ca10b36ccc1294713c8278a3dba5346c5fcfd;hb=62b18c75989a1b00a25079f8f110992aaad81bba;hp=9c60691825a1fadabfac3be83438ba8b7f1d5c66;hpb=840d76586528a4f4335d1b8138378d8fa9a42aff;p=freeside.git diff --git a/httemplate/view/cust_main/contacts.html b/httemplate/view/cust_main/contacts.html index 9c6069182..252ca10b3 100644 --- a/httemplate/view/cust_main/contacts.html +++ b/httemplate/view/cust_main/contacts.html @@ -1,13 +1,25 @@ % 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; -<% mt( $addr_label{$this} ) |h %> +<% mt( $addr_label{$this} ) |h %> +% if ( $this eq 'ship' and +% $cust_main->bill_locationnum == $cust_main->ship_locationnum ) +% { + (<% emt('same as billing') %>) +% } + +% if ( +% ($this eq 'ship') +% && $cust_main->invoice_ship_address +% && !$conf->exists('invoice-ship_address') #it's always on, so hide per-cust config +% ) { +(<% emt('included on invoices') %>) +% }
<% mt('Spouse') |h %> | ++ <% join(', ', grep $_, + $cust_main->spouse_last, $cust_main->spouse_first) %> + | +|||||||||
<% mt('Email address(es)') |h %> | @@ -36,8 +58,23 @@<% $cust_main->company |h %> | |||||||||
<% mt('Company') |h %> | +<% $cust_main->ship_company |h %> | +|||||||||
<% mt('Location ID') |h %> | +<% $location->locationname |h %> | +|||||||||
<% mt('Address') |h %> | <% $location->address1 |h %> | @@ -56,8 +93,12 @@ % }|||||||||
<% mt('City') |h %> | <% $location->city |h %> | +% } else { ++% } % if ( $location->county ) { | <% mt('County') |h %> | <% $location->county |h %> | @@ -65,11 +106,11 @@<% mt('State') |h %> | <% state_label( $location->state, $location->country ) |h %> | <% mt('Zip') |h %> | -<% $location->zip %> | +<% $location->zip |h %> | |
<% mt('Country') |h %> | -<% code2country( $location->country ) %> | +<% $location->country_full |h %> |