[freeside-commits] freeside/httemplate/view/cust_main contacts.html, 1.10.2.2, 1.10.2.3

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/view/cust_main
In directory wavetail:/tmp/cvs-serv16657/httemplate/view/cust_main

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	contacts.html 
Log Message:
add cust_main-require_address2 config, reimplement address2-search config ("Unit #" search in searchbar), visual indication of require_invoicing_list_email, closes: RT#2926

Index: contacts.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main/contacts.html,v
retrieving revision 1.10.2.2
retrieving revision 1.10.2.3
diff -u -d -r1.10.2.2 -r1.10.2.3
--- contacts.html	27 Apr 2007 21:29:17 -0000	1.10.2.2
+++ contacts.html	17 Dec 2007 01:00:07 -0000	1.10.2.3
@@ -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>