X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fcontacts.html;h=56fbac8c6213c96e40e71347e08f9f9f8ae091a7;hb=3d62ec9362d0b22c17a17da6197f8b2fc219a54e;hp=22594c5e271ba217f2d86181eb12faf179ceba22;hpb=9509e5bfb7f9331303153cac24d7bfecbe2ea9f1;p=freeside.git

diff --git a/httemplate/view/cust_main/contacts.html b/httemplate/view/cust_main/contacts.html
index 22594c5e2..56fbac8c6 100644
--- a/httemplate/view/cust_main/contacts.html
+++ b/httemplate/view/cust_main/contacts.html
@@ -1,76 +1,90 @@
 % my %which = (
-%   ''      => 'Billing',
-%   'ship_' => 'Service',
+%   ''      => emt('Billing'),
+%   'ship_' => emt('Service'),
 % );
 % foreach my $which ( '', 'ship_' ) {
 %   my $pre = $cust_main->get("${which}last") ? $which : '';
 
-<% $which{$which} %> address
+<% $which{$which} %> <% mt('address') |h %>
 <% ntable("#cccccc") %><TR><TD><% ntable("#cccccc",2) %>
 <TR>
-  <TD ALIGN="right">Contact name</TD>
+  <TD ALIGN="right"><% mt('Contact name') |h %></TD>
   <TD COLSPAN=5 BGCOLOR="#ffffff">
-    <% $cust_main->get("${pre}last"). ', '. $cust_main->get("${pre}first") %>
+    <% $cust_main->get("${pre}last"). ', '. $cust_main->get("${pre}first") |h %>
   </TD>
 % if ( $which eq '' && $conf->exists('show_ss') ) { 
-    <TD ALIGN="right">SS#</TD>
+    <TD ALIGN="right"><% mt('SS#') |h %></TD>
     <TD BGCOLOR="#ffffff"><% $cust_main->masked('ss') || '&nbsp' %></TD>
 % } 
 </TR>
+% if ( $conf->exists('cust-email-high-visibility') && $which eq '') {
 <TR>
-  <TD ALIGN="right">Company</TD>
-  <TD COLSPAN=7 BGCOLOR="#ffffff"><% $cust_main->get("${pre}company") %></TD>
+  <TD ALIGN="right"><% mt('Email invoices') |h %></TD>
+  <TD BGCOLOR="#ffff00">
+    <% join(', ', grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list ) || $no %>
+  </TD>
 </TR>
+% }
 <TR>
-  <TD ALIGN="right">Address</TD>
-  <TD COLSPAN=7 BGCOLOR="#ffffff"><% $cust_main->get("${pre}address1") %></TD>
+  <TD ALIGN="right"><% mt('Company') |h %></TD>
+  <TD COLSPAN=7 BGCOLOR="#ffffff"><% $cust_main->get("${pre}company") |h %></TD>
 </TR>
-% if ( $cust_main->get("${pre}address2") ) { 
-
 <TR>
-  <TD ALIGN="right">&nbsp;</TD>
-  <TD COLSPAN=7 BGCOLOR="#ffffff"><% $cust_main->get("${pre}address2") %></TD>
+  <TD ALIGN="right"><% mt('Address') |h %></TD>
+  <TD COLSPAN=7 BGCOLOR="#ffffff"><% $cust_main->get("${pre}address1") |h %></TD>
 </TR>
+
+% if ( $cust_main->get("${pre}address2") ) { 
+%   my $address2_label =
+%     ( $conf->exists('cust_main-require_address2')
+%       && ! ( $pre xor $cust_main->has_ship_address )
+%     )
+%       ? emt('Unit #')
+%       : ' ';
+
+  <TR>
+    <TD ALIGN="right"><% $address2_label %></TD>
+    <TD COLSPAN=7 BGCOLOR="#ffffff"><% $cust_main->get("${pre}address2") |h %></TD>
+  </TR>
+
 % } 
 
 <TR>
-  <TD ALIGN="right">City</TD>
-  <TD BGCOLOR="#ffffff"><% $cust_main->get("${pre}city") %></TD>
+  <TD ALIGN="right"><% mt('City') |h %></TD>
+  <TD BGCOLOR="#ffffff"><% $cust_main->get("${pre}city") |h %></TD>
 % if ( $cust_main->get("${pre}county") ) {
-    <TD ALIGN="right">County</TD>
-    <TD BGCOLOR="#ffffff"><% $cust_main->get("${pre}county") %></TD>
+    <TD ALIGN="right"><% mt('County') |h %></TD>
+    <TD BGCOLOR="#ffffff"><% $cust_main->get("${pre}county") |h %></TD>
 % }
-  <TD ALIGN="right">State</TD>
-  <TD BGCOLOR="#ffffff"><% state_label( $cust_main->get("${pre}state"), $cust_main->get("${pre}country") ) %></TD>
-  <TD ALIGN="right">Zip</TD>
+  <TD ALIGN="right"><% mt('State') |h %></TD>
+  <TD BGCOLOR="#ffffff"><% state_label( $cust_main->get("${pre}state"), $cust_main->get("${pre}country") ) |h %></TD>
+  <TD ALIGN="right"><% mt('Zip') |h %></TD>
   <TD BGCOLOR="#ffffff"><% $cust_main->get("${pre}zip") %></TD>
 </TR>
 <TR>
-  <TD ALIGN="right">Country</TD>
+  <TD ALIGN="right"><% mt('Country') |h %></TD>
   <TD BGCOLOR="#ffffff"><% code2country( $cust_main->get("${pre}country") ) %></TD>
 </TR>
 <TR>
   <TD ALIGN="right"><% $daytime_label %></TD>
   <TD COLSPAN=3 BGCOLOR="#ffffff">
-    <% include('/elements/phonenumber.html',
+    <& /elements/phonenumber.html,
                   $cust_main->get("${pre}daytime"),
                   'callable'=>1
-               )
-    %>
+    &>
   </TD>
 </TR>
 <TR>
   <TD ALIGN="right"><% $night_label %></TD>
   <TD COLSPAN=3 BGCOLOR="#ffffff">
-    <% include('/elements/phonenumber.html',
+    <& /elements/phonenumber.html,
                   $cust_main->get("${pre}night"),
                   'callable'=>1
-               )
-    %>
+    &>
   </TD>
 </TR>
 <TR>
-  <TD ALIGN="right">Fax</TD>
+  <TD ALIGN="right"><% mt('Fax') |h %></TD>
   <TD COLSPAN=3 BGCOLOR="#ffffff">
     <% $cust_main->get("${pre}fax") || '&nbsp' %>
   </TD>
@@ -88,7 +102,7 @@
 <BR>
 % }
 % } 
-
+<& contacts_new.html, $cust_main &>
 <%once>
 
 my $daytime_label = FS::Msgcat::_gettext('daytime') =~ /^(daytime)?$/
@@ -109,6 +123,8 @@ my $stateid_state_label = FS::Msgcat::_gettext('stateid_state') =~ /^(stateid_st
 
 my( $cust_main ) = @_;
 my $conf = new FS::Conf;
+my @invoicing_list = $cust_main->invoicing_list;
+my $no = emt('no');
 
 </%init>