summaryrefslogtreecommitdiff
path: root/httemplate/view
diff options
context:
space:
mode:
authorivan <ivan>2007-12-17 00:59:02 +0000
committerivan <ivan>2007-12-17 00:59:02 +0000
commitf144c3a14169d99fd93f265da690d9ce38dbae68 (patch)
tree880d1704f3b2b80fb376d2fe594060587924322b /httemplate/view
parentba6a046e7cbccee29fb13a32e0ae438faeccaf62 (diff)
add cust_main-require_address2 config, reimplement address2-search config ("Unit #" search in searchbar), visual indication of require_invoicing_list_email, closes: RT#2926
Diffstat (limited to 'httemplate/view')
-rw-r--r--httemplate/view/cust_main/contacts.html19
1 files changed, 15 insertions, 4 deletions
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>