Changeset 2127805

Timestamp:

07/24/2019 11:23:14 AM (7 years ago)

Author:

hitcode

Message:

3.6.6

Location:

locatoraid/trunk

Files:

• config/_common.php (modified) (1 diff)
• locatoraid.php (modified) (2 diffs)
• modules/front/assets/js/front.js (modified) (2 diffs)
• modules/locations/commands/read.php (modified) (1 diff)
• modules/search/controller.php (modified) (3 diffs)
• readme.txt (modified) (1 diff)

locatoraid/trunk/config/_common.php

@@ -1 +1 @@
 <?php if (! defined('ABSPATH')) exit; // Exit if accessed directly
-$config['app_version'] = '3.6.5';
+$config['app_version'] = '3.6.6';
 // $config['dbprefix_version'] = 'v1';
 

locatoraid/trunk/locatoraid.php

@@ -4 +4 @@
 Plugin URI: https://www.locatoraid.com/
 Description: Store locator plugin
-Version: 3.6.5
+Version: 3.6.6
 Author: hitcode.com
 Author URI: https://www.locatoraid.com/
@@ -12 +12 @@
 
 if( ! defined('LC3_VERSION') ){
-    define( 'LC3_VERSION', 365 );
+    define( 'LC3_VERSION', 366 );
 }
 

locatoraid/trunk/modules/front/assets/js/front.js

@@ -396 +396 @@
                 var this_loc = entries[ii];
                 var this_group_label = this_loc[group_by];
-
                 if( ! groups.hasOwnProperty(this_group_label) ){
                     groups[this_group_label] = [];
@@ -412 +411 @@
 
         var group_labels = Object.keys( groups );
+
+    // if have empty label then it should come last
+        var fullCount = group_labels.length;
+        group_labels = group_labels.filter( function(a){
+            return (a.length > 0);
+        });
+        var realCount = group_labels.length;
+
         group_labels.sort(function(a, b){
             return a.localeCompare(b);
         })
+
+        if( fullCount > realCount ){
+            group_labels.push( '' );
+        }
 
         for( var kk = 0; kk < group_labels.length; kk++ ){

locatoraid/trunk/modules/locations/commands/read.php

@@ -63 +63 @@
             $app_settings = $this->app->make('/app/settings');
             $measure = $app_settings->get('core:measure');
+
+            $args['WHERE'][] = array( 'latitude', '<>', NULL );
+            $args['WHERE'][] = array( 'latitude', '<>', 0 );
 
         /* miles */

locatoraid/trunk/modules/search/controller.php

@@ -70 +70 @@
         }
 
-        $command_args[] = array('osearch', $search);
+        $command_args['osearch'] = array('osearch', $search);
         $command_args[] = array('with', '-all-');
         if( $id ){
@@ -148 +148 @@
 
     // also find by geo if coordinates
-
         if( $lat && $lng && ($lat != '_LAT_') && ($lng != '_LNG_') ){
             $search_coordinates = array($lat, $lng);
-
             $command_args[] = array('lat', $lat);
             $command_args[] = array('lng', $lng);
@@ -157 +155 @@
             if( $radius ){
                 $radius = (int) $radius;
+                unset( $command_args['osearch'] );
                 $command_args[] = array( 'having', 'computed_distance', '<=', $radius );
                 $command_args[] = array( 'or_having', 'computed_distance', '=', NULL );

locatoraid/trunk/readme.txt

@@ -85 +85 @@
 == Changelog ==
 
+= 3.6.6 =
+* BUG: not yet geocoded entries may have appeared in search results.
+* If search results are grouped by state, entries with no state defined now go at the bottom rather on top.
+
 = 3.6.5 =
 * Phone numbers now appear as links (tel:).