X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fcontacts.html;h=d75f114cf2c7348b5cfe4e57bd78b3343bd1526c;hb=4dc075fc38008d1c6cbe9b88b2bdb32bdc92adbf;hp=22a7b95848382a1d022999995ed1d038577efa2a;hpb=d98e4631640eaaf28b4c022efedd49b640a283c6;p=freeside.git
diff --git a/httemplate/view/cust_main/contacts.html b/httemplate/view/cust_main/contacts.html
index 22a7b9584..d75f114cf 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 (
@@ -43,15 +43,36 @@
$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 %> |
@@ -100,13 +121,13 @@
% if ( $location->county ) {
(<% $location->county |h %> county)\
% }
-,<% state_label( $location->state, $location->country ) |h %>
- <% $location->zip %>
+<% ($location->city || $location->county) ? ', ' : ''%><% state_label( $location->state, $location->country ) |h %>
+ <% $location->zip |h %>
|
- <% code2country( $location->country ) %> |
+ <% $location->country_full |h %> |
% if ( $location->latitude && $location->longitude ) {
@@ -195,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>
-