[freeside-commits] freeside/httemplate/view svc_phone.cgi, 1.16, 1.17

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/view
In directory wavetail.420.am:/tmp/cvs-serv12472/httemplate/view

Modified Files:
	svc_phone.cgi 
Log Message:
add location to svc_phone, RT#7047

Index: svc_phone.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/svc_phone.cgi,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -w -d -r1.16 -r1.17
--- svc_phone.cgi	8 Mar 2010 07:02:58 -0000	1.16
+++ svc_phone.cgi	12 Mar 2010 03:36:36 -0000	1.17
@@ -16,6 +16,7 @@
 <%init>
 
 my $conf = new FS::Conf;
+my $countrydefault = $conf->config('countrydefault') || 'US';
 
 my @fields = qw( countrycode phonenum );
 push @fields, 'domain' if $conf->exists('svc_phone-domain');
@@ -25,6 +26,27 @@
   my $svc_phone = shift;
 
   ###
+  # E911 Info
+  ###
+
+  my $loc = $svc_phone->cust_location_or_main;
+
+  my $e911 = 
+    'E911 Information'.
+    &ntable("#cccccc"). '<TR><TD>'. ntable("#cccccc",2).
+      '<TR><TD>Location</TD>'.
+      '<TD BGCOLOR="#FFFFFF">'.
+        $loc->location_label( 'join_string'     => '<BR>',
+                              'double_space'    => ' &nbsp; ',
+                              'escape_function' => \&encode_entities,
+                              'countrydefault'  => $countrydefault,
+                            ).
+      '</TD></TR>'.
+    '</TABLE></TD></TR></TABLE>'.
+    '<BR>'
+  ;
+
+  ###
   # Devices
   ###
 
@@ -123,6 +145,7 @@
   # concatenate & return
   ###
 
+  $e911.
   $devices.
   join(' | ', @links ). '<BR>'.
   join(' | ', @ilinks). '<BR>';