[freeside-commits] branch master updated. 6b1b3797e7136fb617c32d467bb3281920318436

Mark Wells mark at 420.am
Thu May 2 16:22:23 PDT 2013


The branch, master has been updated
       via  6b1b3797e7136fb617c32d467bb3281920318436 (commit)
      from  cc839bbae9c4615a5d3d2b0c7edcfb0bae58b0ec (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 6b1b3797e7136fb617c32d467bb3281920318436
Author: Mark Wells <mark at freeside.biz>
Date:   Thu May 2 16:21:56 2013 -0700

    "Without census tract" search should look at the service location, #22741, #940

diff --git a/FS/FS/cust_main/Search.pm b/FS/FS/cust_main/Search.pm
index 7dbb7a8..e0c7080 100644
--- a/FS/FS/cust_main/Search.pm
+++ b/FS/FS/cust_main/Search.pm
@@ -624,14 +624,14 @@ sub search {
   # parse without census tract checkbox
   ##
 
-  push @where, "(censustract = '' or censustract is null)"
+  push @where, "(ship_location.censustract = '' or ship_location.censustract is null)"
     if $params->{'no_censustract'};
 
   ##
   # parse with hardcoded tax location checkbox
   ##
 
-  push @where, "geocode is not null"
+  push @where, "ship_location.geocode is not null"
     if $params->{'with_geocode'};
 
   ##
@@ -841,7 +841,7 @@ sub search {
       'ON (cust_main.'.$pre.'locationnum = '.$pre.'location.locationnum) ';
   }
 
-  my $count_query = "SELECT COUNT(*) FROM cust_main $extra_sql";
+  my $count_query = "SELECT COUNT(*) FROM cust_main $addl_from $extra_sql";
 
   my @select = (
                  'cust_main.custnum',
@@ -927,6 +927,8 @@ sub search {
     'extra_headers' => \@extra_headers,
     'extra_fields'  => \@extra_fields,
   };
+  warn Data::Dumper::Dumper($sql_query);
+  $sql_query;
 
 }
 

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

Summary of changes:
 FS/FS/cust_main/Search.pm |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)




More information about the freeside-commits mailing list