have the UI use full country names, and state names outside the US...

[freeside.git] / httemplate / view / cust_main / contacts.html

diff --git a/httemplate/view/cust_main/contacts.html b/httemplate/view/cust_main/contacts.html
index 456d117..7aba118 100644 (file)
--- a/httemplate/view/cust_main/contacts.html
+++ b/httemplate/view/cust_main/contacts.html
@@ -33,13 +33,13 @@ Billing address
   <TD ALIGN="right">City</TD>
   <TD BGCOLOR="#ffffff"><%= $cust_main->city %></TD>
   <TD ALIGN="right">State</TD>
-  <TD BGCOLOR="#ffffff"><%= $cust_main->state %></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>
 </TR>
 <TR>
   <TD ALIGN="right">Country</TD>
-  <TD BGCOLOR="#ffffff"><%= $cust_main->country %></TD>
+  <TD BGCOLOR="#ffffff"><%= code2country($cust_main->country) %></TD>
 </TR>
 <%
   my $daytime_label = FS::Msgcat::_gettext('daytime') =~ /^(daytime)?$/
@@ -51,14 +51,22 @@ Billing address
 %>
 <TR>
   <TD ALIGN="right"><%= $daytime_label %></TD>
-  <TD COLSPAN=5 BGCOLOR="#ffffff">
-    <%= $cust_main->daytime || '&nbsp' %>
+  <TD COLSPAN=6 BGCOLOR="#ffffff">
+    <%= include('/elements/phonenumber.html',
+                  $cust_main->daytime,
+                  'callable'=>1
+               )
+    %>
   </TD>
 </TR>
 <TR>
   <TD ALIGN="right"><%= $night_label %></TD>
-  <TD COLSPAN=5 BGCOLOR="#ffffff">
-    <%= $cust_main->night || '&nbsp' %>
+  <TD COLSPAN=6 BGCOLOR="#ffffff">
+    <%= include('/elements/phonenumber.html',
+                  $cust_main->night,
+                  'callable'=>1
+               )
+    %>
   </TD>
 </TR>
 <TR>
@@ -111,13 +119,21 @@ Service address
 <TR>
   <TD ALIGN="right"><%= $daytime_label %></TD>
   <TD COLSPAN=5 BGCOLOR="#ffffff">
-    <%= $cust_main->get("${pre}daytime") || '&nbsp' %>
+    <%= include('/elements/phonenumber.html',
+                  $cust_main->get("${pre}daytime"),
+                  'callable'=>1
+               )
+    %>
   </TD>
 </TR>
 <TR>
   <TD ALIGN="right"><%= $night_label %></TD>
   <TD COLSPAN=5 BGCOLOR="#ffffff">
-    <%= $cust_main->get("${pre}night") || '&nbsp' %>
+    <%= include('/elements/phonenumber.html',
+                  $cust_main->get("${pre}night"),
+                  'callable'=>1
+               )
+    %>
   </TD>
 </TR>
 <TR>