X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fcontacts.html;h=1660c1c2272a649ce8783c6864287d0a2160b299;hb=929783d1045757abbe5c84ff2439547b0f8eca23;hp=a5bafea10ef1b3d61599a16e51c86524f39d15dc;hpb=67b05564568d10ee3833a87f09b752d0319934ba;p=freeside.git
diff --git a/httemplate/view/cust_main/contacts.html b/httemplate/view/cust_main/contacts.html
index a5bafea10..1660c1c22 100644
--- a/httemplate/view/cust_main/contacts.html
+++ b/httemplate/view/cust_main/contacts.html
@@ -10,7 +10,7 @@
% if ( $this eq 'ship' and
% $cust_main->bill_locationnum == $cust_main->ship_locationnum )
% {
- (<% mt('same as billing') %>)
+ (<% emt('same as billing') %>)
% }
% if (
@@ -25,11 +25,11 @@
% if ( $this eq 'bill' ) {
% #billing contact fields
- <% mt('Contact name') |h %> |
- <% $cust_main->contact |h %> |
+ <% mt('Contact name') |h %> |
+ <% $cust_main->contact |h %> |
% if ( $conf->exists('show_ss') ) {
- <% mt('SS#') |h %> |
- <% $conf->exists('unmask_ss')
+ | <% mt('SS#') |h %> |
+ <% $conf->exists('unmask_ss')
? $cust_main->ss
: $cust_main->masked('ss') || ' ' %> |
% }
@@ -37,32 +37,53 @@
% if ( $conf->exists('cust_main-enable_spouse') and
% ($cust_main->spouse_last or $cust_main->spouse_first) ) {
- <% mt('Spouse') |h %> |
-
+ | <% mt('Spouse') |h %> |
+
<% join(', ', grep $_,
$cust_main->spouse_last, $cust_main->spouse_first) %>
|
-% }
-% if ( $conf->exists('cust-email-high-visibility') ) {
+% }
+%
+% # invoicing email
+% if ( scalar(@invoicing_list) == 1 ) { # typical individual user; show here
- <% mt('Email address(es)') |h %> |
-
- <% $cust_main->invoicing_list_emailonly_scalar || $no %>
+ | <% mt('Email address') |h %> |
+
+ <% $invoicing_list[0] %>
|
-% }
+% } elsif ( scalar(@invoicing_list) > 1 ) {
+% # business customer with a contact list
+% # show nothing here
+%
+% } else { # there is no invoice email for them
+
+ <% mt('Email address') |h %> |
+% if ( !$cust_main->postal_invoice or
+% $conf->exists('cust_main-require_invoicing_list_email',
+% $cust_main->agentnum)
+% ) {
+% # we need a contact email for this customer (either because that's
+% # policy, or because otherwise they won't receive invoices) but we
+% # don't have one.
+ <% emt('none') %> |
+% } else {
+ <% emt('no') %> |
+% }
+% } # end of invoicing email
+
% if ( $cust_main->company ) {
- <% mt('Company') |h %> |
- <% $cust_main->company |h %> |
+ <% mt('Company') |h %> |
+ <% $cust_main->company |h %> |
% }
% } elsif ( $this eq 'ship' ) {
% if ( $cust_main->ship_company ) { # mostly obsolete these days...
- <% mt('Company') |h %> |
- <% $cust_main->ship_company |h %> |
+ <% mt('Company') |h %> |
+ <% $cust_main->ship_company |h %> |
% }
% }
@@ -72,14 +93,14 @@
% if ( $location->locationname ) {
- <% mt('Location ID') |h %> |
- <% $location->locationname |h %> |
+ <% mt('Location ID') |h %> |
+ <% $location->locationname |h %> |
% }
- <% mt('Address') |h %> |
- <% $location->address1 |h %> |
+ <% mt('Address') |h %> |
+ <% $location->address1 |h %> |
% if ( $location->get('address2') ) {
@@ -88,27 +109,25 @@
% : ' ';
- <% $address2_label %> |
- <% $location->address2 |h %> |
+ <% $address2_label %> |
+ <% $location->address2 |h %> |
% }
- <% mt('City') |h %> |
- <% $location->city |h %> |
+ |
+ <% $location->city |h %>\
% if ( $location->county ) {
- | <% mt('County') |h %> |
- <% $location->county |h %> |
+ (<% $location->county |h %> county)\
% }
- <% mt('State') |h %> |
- <% state_label( $location->state, $location->country ) |h %> |
- <% mt('Zip') |h %> |
- <% $location->zip %> |
+<% ($location->city || $location->county) ? ', ' : ''%><% state_label( $location->state, $location->country ) |h %>
+ <% $location->zip |h %>
+
- <% mt('Country') |h %> |
- <% code2country( $location->country ) %> |
+ |
+ <% $location->country_full |h %> |
% if ( $location->latitude && $location->longitude ) {
@@ -127,8 +146,8 @@
% foreach my $phone (qw(daytime night mobile)) {
% next if !$cust_main->get($phone);
- <% $phone_label{$phone} %> |
-
+ | <% $phone_label{$phone} %>
+ |
<& /elements/phonenumber.html,
$cust_main->get($phone),
callable => 1,
@@ -141,8 +160,8 @@
% if ( $cust_main->get('fax') ) {
|
- <% mt('Fax') |h %> |
-
+ | <% mt('Fax') |h %> |
+
<% $cust_main->get('fax') || ' ' %>
|
@@ -152,10 +171,10 @@
% if ( $conf->exists('show_stateid') ) {
- <% $stateid_label %> |
- <% $cust_main->masked('stateid') || ' ' %> |
- <% $stateid_state_label %> |
- <% $cust_main->stateid_state || ' ' %> |
+ <% $stateid_label %> |
+ <% $cust_main->masked('stateid') || ' ' %> |
+ <% $stateid_state_label %> |
+ <% $cust_main->stateid_state || ' ' %> |
% }
@@ -197,8 +216,6 @@ my $stateid_state_label = FS::Msgcat::_gettext('stateid_state') =~ /^(stateid_st
my $cust_main = shift;
my $conf = new FS::Conf;
-my @invoicing_list = $cust_main->invoicing_list;
-my $no = emt('no');
+my @invoicing_list = $cust_main->invoicing_list_emailonly;
%init>
-