X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fcontacts.html;h=6213f27dda4732a2ea14217ae510c5bdd3fb1b13;hb=01629c3c934f1f6fd2ab9de5f7638f671fd59791;hp=fe7cc5c0a29801681e759327a9adfdc8f004c1d0;hpb=1ae273f69e5bf2b46c9c5fcd990ad923770ace56;p=freeside.git diff --git a/httemplate/view/cust_main/contacts.html b/httemplate/view/cust_main/contacts.html index fe7cc5c0a..6213f27dd 100644 --- a/httemplate/view/cust_main/contacts.html +++ b/httemplate/view/cust_main/contacts.html @@ -1,122 +1,128 @@ -% my %which = ( -% '' => emt('Billing'), -% 'ship_' => emt('Service'), -% ); -% foreach my $which ( '', 'ship_' ) { -% my $pre = $cust_main->get("${which}last") ? $which : ''; - -<% $which{$which} %> <% mt('address') |h %> +% 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; +% while (@which) { +% my $this = shift @which; +% my $method = $this.'_location'; +% my $location = $cust_main->$method; +<% mt( $addr_label{$this} ) |h %> - - - -% if ( $which eq '' && $conf->exists('show_ss') ) { - - -% } - -% if ( $conf->exists('cust-email-high-visibility') && $which eq '') { +% if ( $this eq 'bill' ) { +% #billing contact fields + + + +% if ( $conf->exists('show_ss') ) { + + +% } + +% if ( $conf->exists('cust-email-high-visibility') ) { -% } - -% if ( $cust_main->get("${pre}company") ) { +% } +% if ( $cust_main->company ) { - + -% } - +% } +% } # if $this eq 'bill' +% # now the actual address - + -% if ( $cust_main->get("${pre}address2") ) { -% my $address2_label = -% ( $conf->exists('cust_main-require_address2') -% && ! ( $pre xor $cust_main->has_ship_address ) -% ) -% ? emt('Unit #') -% : ' '; +% if ( $location->get('address2') ) { +% my $address2_label = $conf->exists('cust_main-require_address2') +% ? emt('Unit #') +% : ' '; - - - - + + + + % } - -% if ( $cust_main->get("${pre}county") ) { + +% if ( $location->county ) { - + % } - + - + - + -% if ( $cust_main->get($pre.'latitude') && $cust_main->get($pre.'longitude') ) { - <& /elements/tr-coords.html, $cust_main->get($pre.'latitude'), - $cust_main->get($pre.'longitude'), +% if ( $location->latitude && $location->longitude ) { + <& /elements/tr-coords.html, $location->latitude, + $location->longitude, $cust_main->name_short, $cust_main->agentnum, &> % } + +% if ( $this eq 'bill' ) { +% # billing contact phone numbers +% foreach my $phone (qw(daytime night mobile)) { +% next if !$cust_main->get($phone); + + + + -% foreach my $phone (grep $cust_main->get($pre.$_), qw( daytime night mobile )){ - - - - - - -% } +% } #foreach $phone +% if ( $cust_main->get('fax') ) { -% if ( $cust_main->get("${pre}fax") ) { -% } -% if ( $which eq '' && $conf->exists('show_stateid') ) { - +% } +% +% if ( $conf->exists('show_stateid') ) { + + -% } +% } +% } #if $this eq 'bill'
<% mt('Contact name') |h %> - <% $cust_main->get("${pre}last"). ', '. $cust_main->get("${pre}first") |h %> - <% mt('SS#') |h %><% $conf->exists('unmask_ss') ? $cust_main->ss : $cust_main->masked('ss') || ' ' %>
<% mt('Contact name') |h %><% $cust_main->contact |h %><% mt('SS#') |h %><% $conf->exists('unmask_ss') + ? $cust_main->ss + : $cust_main->masked('ss') || ' ' %>
<% mt('Email address(es)') |h %> - <% join(', ', grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list ) || $no %> + <% $cust_main->invoicing_list_emailonly_scalar || $no %>
<% mt('Company') |h %><% $cust_main->get("${pre}company") |h %><% $cust_main->company %>
<% mt('Address') |h %><% $cust_main->get("${pre}address1") |h %><% $location->address1 |h %>
<% $address2_label %><% $cust_main->get("${pre}address2") |h %>
<% $address2_label %><% $location->address2 |h %>
<% mt('City') |h %><% $cust_main->get("${pre}city") |h %><% $location->city |h %><% mt('County') |h %><% $cust_main->get("${pre}county") |h %><% $location->county |h %><% mt('State') |h %><% state_label( $cust_main->get("${pre}state"), $cust_main->get("${pre}country") ) |h %><% state_label( $location->state, $location->country ) |h %> <% mt('Zip') |h %><% $cust_main->get("${pre}zip") %><% $location->zip %>
<% mt('Country') |h %><% code2country( $cust_main->get("${pre}country") ) %><% code2country( $location->country ) %>
<% $phone_label{$phone} %> + <& /elements/phonenumber.html, + $cust_main->get($phone), + callable => 1, + calling_list_exempt => $cust_main->calling_list_exempt, + &> +
<% $phone_label{$phone} %> - <& /elements/phonenumber.html, - $cust_main->get($pre.$phone), - 'callable'=>1, - 'calling_list_exempt'=>$cust_main->calling_list_exempt, - &> -
<% mt('Fax') |h %> - <% $cust_main->get("${pre}fax") || ' ' %> + <% $cust_main->get('fax') || ' ' %>
<% $stateid_label %> <% $cust_main->masked('stateid') || ' ' %> <% $stateid_state_label %> <% $cust_main->stateid_state || ' ' %>
-% if ( $which ne 'ship_' ) { +% if ( @which ) {
% } -% } +% } #while @which <%once> my %phone_label = ( @@ -147,7 +153,7 @@ my $stateid_state_label = FS::Msgcat::_gettext('stateid_state') =~ /^(stateid_st <%init> -my( $cust_main ) = @_; +my $cust_main = shift; my $conf = new FS::Conf; my @invoicing_list = $cust_main->invoicing_list; my $no = emt('no');