[freeside-commits] branch FREESIDE_3_BRANCH updated. 3c10215fb8f856e966f22ffaba297ae1c335f5d0

[Jonathan Prykop]

The branch, FREESIDE_3_BRANCH has been updated
       via  3c10215fb8f856e966f22ffaba297ae1c335f5d0 (commit)
      from  329f2eb365af6d529bbb0cde0af8630c91eaa2af (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3c10215fb8f856e966f22ffaba297ae1c335f5d0
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Wed Apr 22 17:06:46 2015 -0500

    #34636: Add service address Lat and Long to Advanced customer report

diff --git a/FS/FS/ConfDefaults.pm b/FS/FS/ConfDefaults.pm
index a66d0ab..de08f7d 100644
--- a/FS/FS/ConfDefaults.pm
+++ b/FS/FS/ConfDefaults.pm
@@ -71,6 +71,9 @@ sub cust_fields_avail { (
   'Cust# | Cust. Status | Name | Company | (bill) Address 1 | (bill) Address 2 | (bill) City | (bill) State | (bill) Zip | (bill) Country | Day phone | Night phone | Mobile phone | Fax number | (service) Address 1 | (service) Address 2 | (service) City | (service) State | (service) Zip | (service) Country | Invoicing email(s) | Payment Type | Current Balance' =>
     'custnum | Status | Last, First | Company | (address) | (all phones) | (service address) | Invoicing email(s) | Payment Type | Current Balance',
 
+  'Cust# | Cust. Status | Name | Company | (bill) Address 1 | (bill) Address 2 | (bill) City | (bill) State | (bill) Zip | (bill) Country | (bill) Latitude | (bill) Longitude | Day phone | Night phone | Mobile phone | Fax number | (service) Address 1 | (service) Address 2 | (service) City | (service) State | (service) Zip | (service) Country | (service) Latitude | (service) Longitude | Invoicing email(s) | Payment Type | Current Balance' =>
+    'custnum | Status | Last, First | Company | (address+coord) | (all phones) | (service address+coord) | Invoicing email(s) | Payment Type | Current Balance',
+
   'Invoicing email(s)' => 'Invoicing email(s)',
   'Cust# | Invoicing email(s)' => 'custnum | Invoicing email(s)',
 
diff --git a/FS/FS/UI/Web.pm b/FS/FS/UI/Web.pm
index df46e09..28ba869 100644
--- a/FS/FS/UI/Web.pm
+++ b/FS/FS/UI/Web.pm
@@ -206,6 +206,7 @@ sub parse_lt_gt {
 # cust_main report subroutines
 ###
 
+=over 4
 
 =item cust_header [ CUST_FIELDS_VALUE ]
 
@@ -259,12 +260,16 @@ sub cust_header {
     '(bill) State'             => 'bill_state',
     '(bill) Zip'               => 'bill_zip',
     '(bill) Country'           => 'bill_country_full',
+    '(bill) Latitude'          => 'bill_latitude',
+    '(bill) Longitude'         => 'bill_longitude',
     '(service) Address 1'      => 'ship_address1',
     '(service) Address 2'      => 'ship_address2',
     '(service) City'           => 'ship_city',
     '(service) State'          => 'ship_state',
     '(service) Zip'            => 'ship_zip',
     '(service) Country'        => 'ship_country_full',
+    '(service) Latitude'       => 'ship_latitude',
+    '(service) Longitude'      => 'ship_longitude',
     'Invoicing email(s)'       => 'invoicing_list_emailonly_scalar',
     'Payment Type'             => 'payby',
     'Current Balance'          => 'current_balance',
@@ -352,7 +357,7 @@ sub cust_sql_fields {
   #inefficientish, but tiny lists and only run once per page
 
   my @location_fields;
-  foreach my $field (qw( address1 address2 city state zip )) {
+  foreach my $field (qw( address1 address2 city state zip latitude longitude )) {
     foreach my $pre ('bill_','ship_') {
       if ( grep { $_ eq $pre.$field } @cust_fields ) {
         push @location_fields, $pre.'location.'.$field.' AS '.$pre.$field;
@@ -601,7 +606,11 @@ sub is_mobile {
   }
   return 0;
 }
-    
+
+=back
+
+=cut
+
 ###
 # begin JSRPC code...
 ###

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/ConfDefaults.pm |    3 +++
 FS/FS/UI/Web.pm       |   13 +++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)