Changeset 2214861

Timestamp:

12/19/2019 06:58:38 AM (6 years ago)

Author:

hitcode

Message:

3.7.0

Location:

locatoraid/trunk

Files:

• config/_common.php (modified) (1 diff)
• happ2/modules/maps_google.conf/form.php (modified) (1 diff)
• happ2/modules/maps_google.conf/icon (added)
• happ2/modules/maps_google.conf/icon/input.php (added)
• happ2/modules/maps_google/_config_after.php (modified) (2 diffs)
• happ2/modules/maps_google/_config_settings.php (modified) (1 diff)
• locatoraid.php (modified) (2 diffs)
• modules/front/assets/js/front.js (modified) (1 diff)
• modules/front/view.php (modified) (2 diffs)
• modules/locations/presenter.php (modified) (2 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.9';
+$config['app_version'] = '3.7.0';
 // $config['dbprefix_version'] = 'v1';
 

locatoraid/trunk/happ2/modules/maps_google.conf/form.php

@@ -39 +39 @@
     // if no api key is set then don't show other inputs
         if( strlen($api_key) ){
+            $return['maps_google:icon'] = array(
+                'input' => $this->app->make('/maps-google.conf/icon/input'),
+                'label' => HCM::__('Map Icon')
+            );
+
             $return['maps_google:scrollwheel'] =
                 $this->app->make('/form/checkbox')

locatoraid/trunk/happ2/modules/maps_google/_config_after.php

@@ -28 +28 @@
     $more_options = $app_settings->get('maps_google:more_options');
 
+    $icon = '';
+    $icon_id = $app_settings->get('maps_google:icon');
+    if( $icon_id ){
+        $your_img_src = wp_get_attachment_image_src( $icon_id, 'full' );
+        $have_img = is_array( $your_img_src );
+        if( $have_img ){
+            $icon = $your_img_src[0];
+        }
+    }
+
     $params = array(
         'api_key'       => $api_key,
@@ -33 +43 @@
         'scrollwheel'   => $scrollwheel,
         'more_options'  => $more_options,
+        'icon'          => $icon,
         );
 

locatoraid/trunk/happ2/modules/maps_google/_config_settings.php

@@ -4 +4 @@
 $config['settings']['maps_google:map_style'] = '';
 $config['settings']['maps_google:more_options'] = '{"streetViewControl": false}';
+$config['settings']['maps_google:icon'] = NULL;

locatoraid/trunk/locatoraid.php

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

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

@@ -701 +701 @@
                 location_marker.setIcon( this_loc['mapicon'] );
             }
+            else {
+                if( hc2_gmaps_vars.hasOwnProperty('icon') && hc2_gmaps_vars['icon'] ){
+                    location_marker.setIcon( hc2_gmaps_vars['icon'] );
+                }
+            }
 
             location_marker.addListener( 'click', function(){

locatoraid/trunk/modules/front/view.php

@@ -40 +40 @@
         $more_options = $app_settings->get('maps_google:more_options');
 
+        $icon = '';
+        $icon_id = $app_settings->get('maps_google:icon');
+        if( $icon_id ){
+            $your_img_src = wp_get_attachment_image_src( $icon_id, 'full' );
+            $have_img = is_array( $your_img_src );
+            if( $have_img ){
+                $icon = $your_img_src[0];
+            }
+        }
+
         $params = array(
             'api_key'       => $api_key,
@@ -45 +55 @@
             'scrollwheel'   => $scrollwheel,
             'more_options'  => $more_options,
+            'icon'          => $icon,
             );
 

locatoraid/trunk/modules/locations/presenter.php

@@ -60 +60 @@
     {
         $return = NULL;
+
+        $app_settings = $this->app->make('/app/settings');
+        $icon_id = $app_settings->get('maps_google:icon');
+        if( $icon_id ){
+            $your_img_src = wp_get_attachment_image_src( $icon_id, 'full' );
+            $have_img = is_array( $your_img_src );
+            if( $have_img ){
+                $return = $your_img_src[0];
+            }
+        }
+
         $return = $this->app
             ->after( array($this, __FUNCTION__), $return, $data )
             ;
+
+
         return $return;
     }
@@ -69 +82 @@
     {
         $icon_url = $this->present_icon_url( $data );
+
         if( ! $icon_url ){
             $icon_url = '//maps.google.com/mapfiles/ms/micons/red-dot.png';

locatoraid/trunk/readme.txt

@@ -85 +85 @@
 == Changelog ==
 
+= 3.7.0 =
+* Added a setting to define a default map pin for locations.
+
 = 3.6.9 =
 * BUG: multiple products checkbox in the search form may have worked incorrectly.