From f144c3a14169d99fd93f265da690d9ce38dbae68 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 17 Dec 2007 00:59:02 +0000
Subject: add cust_main-require_address2 config, reimplement address2-search
 config ("Unit #" search in searchbar), visual indication of
 require_invoicing_list_email, closes: RT#2926

---
 httemplate/view/cust_main/contacts.html | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'httemplate/view')

diff --git a/httemplate/view/cust_main/contacts.html b/httemplate/view/cust_main/contacts.html
index 22594c5e2..20770e45b 100644
--- a/httemplate/view/cust_main/contacts.html
+++ b/httemplate/view/cust_main/contacts.html
@@ -25,12 +25,23 @@
   <TD ALIGN="right">Address</TD>
   <TD COLSPAN=7 BGCOLOR="#ffffff"><% $cust_main->get("${pre}address1") %></TD>
 </TR>
+
 % if ( $cust_main->get("${pre}address2") ) { 
+%   my $address2_label =
+%     ( $conf->exists('cust_main-require_address2')
+%       #  && (    ( !$which && !$cust_main->has_ship_address )
+%       #       || (  $which &&  $cust_main->has_ship_address )
+%       #     )
+%       && ! ( $which xor $cust_main->has_ship_address )
+%     )
+%       ? 'Unit&nbsp;#'
+%       : '&nbsp;';
+
+  <TR>
+    <TD ALIGN="right"><% $address2_label %></TD>
+    <TD COLSPAN=7 BGCOLOR="#ffffff"><% $cust_main->get("${pre}address2") %></TD>
+  </TR>
 
-<TR>
-  <TD ALIGN="right">&nbsp;</TD>
-  <TD COLSPAN=7 BGCOLOR="#ffffff"><% $cust_main->get("${pre}address2") %></TD>
-</TR>
 % } 
 
 <TR>
-- 
cgit v1.2.1