X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fcontacts.html;h=9c2b38f9acb7fb5e60addf0ac56c3d9b69098911;hp=48371550b599413359846aff7e9adb3adbcdef1a;hb=3ce7691203a7737406bf2d4442f7fd84b81f847e;hpb=15e561850b61b10a92a46d8f3e316d53d4970087

diff --git a/httemplate/view/cust_main/contacts.html b/httemplate/view/cust_main/contacts.html
index 48371550b..9c2b38f9a 100644
--- a/httemplate/view/cust_main/contacts.html
+++ b/httemplate/view/cust_main/contacts.html
@@ -1,58 +1,64 @@
-<%
-  my( $cust_main ) = @_;
-  my $conf = new FS::Conf;
-%>
+%
+%  my( $cust_main ) = @_;
+%  my $conf = new FS::Conf;
+%
+
 
 Billing address
-<%= ntable("#cccccc") %><TR><TD><%= ntable("#cccccc",2) %>
+<% ntable("#cccccc") %><TR><TD><% ntable("#cccccc",2) %>
 <TR>
   <TD ALIGN="right">Contact&nbsp;name</TD>
   <TD COLSPAN=3 BGCOLOR="#ffffff">
-    <%= $cust_main->last. ', '. $cust_main->first %>
+    <% $cust_main->last. ', '. $cust_main->first %>
   </TD>
-<% if ( $conf->exists('show_ss') ) { %>
+% if ( $conf->exists('show_ss') ) { 
+
   <TD ALIGN="right">SS#</TD>
-  <TD BGCOLOR="#ffffff"><%= $cust_main->ss || '&nbsp' %></TD>
-<% } %>
+  <TD BGCOLOR="#ffffff"><% $cust_main->ss || '&nbsp' %></TD>
+% } 
+
 </TR>
 <TR>
   <TD ALIGN="right">Company</TD>
-  <TD COLSPAN=5 BGCOLOR="#ffffff"><%= $cust_main->company %></TD>
+  <TD COLSPAN=5 BGCOLOR="#ffffff"><% $cust_main->company %></TD>
 </TR>
 <TR>
   <TD ALIGN="right">Address</TD>
-  <TD COLSPAN=5 BGCOLOR="#ffffff"><%= $cust_main->address1 %></TD>
+  <TD COLSPAN=5 BGCOLOR="#ffffff"><% $cust_main->address1 %></TD>
 </TR>
-<% if ( $cust_main->address2 ) { %>
+% if ( $cust_main->address2 ) { 
+
 <TR>
   <TD ALIGN="right">&nbsp;</TD>
-  <TD COLSPAN=5 BGCOLOR="#ffffff"><%= $cust_main->address2 %></TD>
+  <TD COLSPAN=5 BGCOLOR="#ffffff"><% $cust_main->address2 %></TD>
 </TR>
-<% } %>
+% } 
+
 <TR>
   <TD ALIGN="right">City</TD>
-  <TD BGCOLOR="#ffffff"><%= $cust_main->city %></TD>
+  <TD BGCOLOR="#ffffff"><% $cust_main->city %></TD>
   <TD ALIGN="right">State</TD>
-  <TD BGCOLOR="#ffffff"><%= state_label($cust_main->state, $cust_main->country) %></TD>
+  <TD BGCOLOR="#ffffff"><% state_label($cust_main->state, $cust_main->country) %></TD>
   <TD ALIGN="right">Zip</TD>
-  <TD BGCOLOR="#ffffff"><%= $cust_main->zip %></TD>
+  <TD BGCOLOR="#ffffff"><% $cust_main->zip %></TD>
 </TR>
 <TR>
   <TD ALIGN="right">Country</TD>
-  <TD BGCOLOR="#ffffff"><%= code2country($cust_main->country) %></TD>
-</TR>
-<%
-  my $daytime_label = FS::Msgcat::_gettext('daytime') =~ /^(daytime)?$/
-                        ? 'Day&nbsp;Phone'
-                        : FS::Msgcat::_gettext('daytime');
-  my $night_label = FS::Msgcat::_gettext('night') =~ /^(night)?$/
-                        ? 'Night&nbsp;Phone'
-                        : FS::Msgcat::_gettext('night');
-%>
-<TR>
-  <TD ALIGN="right"><%= $daytime_label %></TD>
+  <TD BGCOLOR="#ffffff"><% code2country($cust_main->country) %></TD>
+</TR>
+%
+%  my $daytime_label = FS::Msgcat::_gettext('daytime') =~ /^(daytime)?$/
+%                        ? 'Day&nbsp;Phone'
+%                        : FS::Msgcat::_gettext('daytime');
+%  my $night_label = FS::Msgcat::_gettext('night') =~ /^(night)?$/
+%                        ? 'Night&nbsp;Phone'
+%                        : FS::Msgcat::_gettext('night');
+%
+
+<TR>
+  <TD ALIGN="right"><% $daytime_label %></TD>
   <TD COLSPAN=6 BGCOLOR="#ffffff">
-    <%= include('/elements/phonenumber.html',
+    <% include('/elements/phonenumber.html',
                   $cust_main->daytime,
                   'callable'=>1
                )
@@ -60,9 +66,9 @@ Billing address
   </TD>
 </TR>
 <TR>
-  <TD ALIGN="right"><%= $night_label %></TD>
+  <TD ALIGN="right"><% $night_label %></TD>
   <TD COLSPAN=6 BGCOLOR="#ffffff">
-    <%= include('/elements/phonenumber.html',
+    <% include('/elements/phonenumber.html',
                   $cust_main->night,
                   'callable'=>1
                )
@@ -72,54 +78,56 @@ Billing address
 <TR>
   <TD ALIGN="right">Fax</TD>
   <TD COLSPAN=5 BGCOLOR="#ffffff">
-    <%= $cust_main->fax || '&nbsp' %>
+    <% $cust_main->fax || '&nbsp' %>
   </TD>
 </TR>
 </TABLE></TD></TR></TABLE>
+% if ( defined $cust_main->dbdef_table->column('ship_last') ) {
+%     my $pre = $cust_main->ship_last ? 'ship_' : '';
+%
 
-<% if ( defined $cust_main->dbdef_table->column('ship_last') ) {
-     my $pre = $cust_main->ship_last ? 'ship_' : '';
-%>
 
 <BR>
 Service address
-<%= ntable("#cccccc") %><TR><TD><%= ntable("#cccccc",2) %>
+<% ntable("#cccccc") %><TR><TD><% ntable("#cccccc",2) %>
 <TR>
   <TD ALIGN="right">Contact name</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") %>
   </TD>
 </TR>
 <TR>
   <TD ALIGN="right">Company</TD>
-  <TD COLSPAN=5 BGCOLOR="#ffffff"><%= $cust_main->get("${pre}company") %></TD>
+  <TD COLSPAN=5 BGCOLOR="#ffffff"><% $cust_main->get("${pre}company") %></TD>
 </TR>
 <TR>
   <TD ALIGN="right">Address</TD>
-  <TD COLSPAN=5 BGCOLOR="#ffffff"><%= $cust_main->get("${pre}address1") %></TD>
+  <TD COLSPAN=5 BGCOLOR="#ffffff"><% $cust_main->get("${pre}address1") %></TD>
 </TR>
-<% if ( $cust_main->get("${pre}address2") ) { %>
+% if ( $cust_main->get("${pre}address2") ) { 
+
 <TR>
   <TD ALIGN="right">&nbsp;</TD>
-  <TD COLSPAN=5 BGCOLOR="#ffffff"><%= $cust_main->get("${pre}address2") %></TD>
+  <TD COLSPAN=5 BGCOLOR="#ffffff"><% $cust_main->get("${pre}address2") %></TD>
 </TR>
-<% } %>
+% } 
+
 <TR>
   <TD ALIGN="right">City</TD>
-  <TD BGCOLOR="#ffffff"><%= $cust_main->get("${pre}city") %></TD>
+  <TD BGCOLOR="#ffffff"><% $cust_main->get("${pre}city") %></TD>
   <TD ALIGN="right">State</TD>
-  <TD BGCOLOR="#ffffff"><%= $cust_main->get("${pre}state") %></TD>
+  <TD BGCOLOR="#ffffff"><% $cust_main->get("${pre}state") %></TD>
   <TD ALIGN="right">Zip</TD>
-  <TD BGCOLOR="#ffffff"><%= $cust_main->get("${pre}zip") %></TD>
+  <TD BGCOLOR="#ffffff"><% $cust_main->get("${pre}zip") %></TD>
 </TR>
 <TR>
   <TD ALIGN="right">Country</TD>
-  <TD BGCOLOR="#ffffff"><%= code2country( $cust_main->get("${pre}country") ) %></TD>
+  <TD BGCOLOR="#ffffff"><% code2country( $cust_main->get("${pre}country") ) %></TD>
 </TR>
 <TR>
-  <TD ALIGN="right"><%= $daytime_label %></TD>
+  <TD ALIGN="right"><% $daytime_label %></TD>
   <TD COLSPAN=5 BGCOLOR="#ffffff">
-    <%= include('/elements/phonenumber.html',
+    <% include('/elements/phonenumber.html',
                   $cust_main->get("${pre}daytime"),
                   'callable'=>1
                )
@@ -127,9 +135,9 @@ Service address
   </TD>
 </TR>
 <TR>
-  <TD ALIGN="right"><%= $night_label %></TD>
+  <TD ALIGN="right"><% $night_label %></TD>
   <TD COLSPAN=5 BGCOLOR="#ffffff">
-    <%= include('/elements/phonenumber.html',
+    <% include('/elements/phonenumber.html',
                   $cust_main->get("${pre}night"),
                   'callable'=>1
                )
@@ -139,9 +147,9 @@ Service address
 <TR>
   <TD ALIGN="right">Fax</TD>
   <TD COLSPAN=5 BGCOLOR="#ffffff">
-    <%= $cust_main->get("${pre}fax") || '&nbsp' %>
+    <% $cust_main->get("${pre}fax") || '&nbsp' %>
   </TD>
 </TR>
 </TABLE></TD></TR></TABLE>
+% } 
 
-<% } %>