Merge pull request #2653 from kprajapatii/master

2.3.71

geodirectory.php

@@ -11,7 +11,7 @@
  * Plugin Name: GeoDirectory
  * Plugin URI: https://wpgeodirectory.com/
  * Description: GeoDirectory - Business Directory Plugin for WordPress.
- * Version: 2.3.70
+ * Version: 2.3.71
  * Author: AyeCode - WP Business Directory Plugins
  * Author URI: https://wpgeodirectory.com
  * Text Domain: geodirectory
@@ -34,7 +34,7 @@ final class GeoDirectory {
 	 *
 	 * @var string
 	 */
-	public $version = '2.3.70';
+	public $version = '2.3.71';
 
 	/**
 	 * GeoDirectory instance.

languages/geodirectory-en_US.po

@@ -1,9 +1,9 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: GeoDirectory 2.3.70\n"
+"Project-Id-Version: GeoDirectory 2.3.71\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-08-01 20:26+0530\n"
-"PO-Revision-Date: 2024-08-01 20:26+0530\n"
+"POT-Creation-Date: 2024-08-08 19:19+0530\n"
+"PO-Revision-Date: 2024-08-08 19:19+0530\n"
 "Last-Translator: \n"
 "Language-Team: AyeCode Ltd <[email protected]>\n"
 "Language: en_US\n"
@@ -2844,18 +2844,18 @@ msgid "Let's go!"
 msgstr ""
 
 #: includes/admin/class-geodir-admin-setup-wizard.php:518
-#: includes/admin/class-geodir-admin.php:251
+#: includes/admin/class-geodir-admin.php:256
 msgid "GeoDirectory - an AyeCode product!"
 msgstr ""
 
 #: includes/admin/class-geodir-admin-setup-wizard.php:519
-#: includes/admin/class-geodir-admin.php:252
+#: includes/admin/class-geodir-admin.php:257
 #: vendor/ayecode/ayecode-connect-helper/ayecode-connect-helper.php:37
 msgid "Please confirm you wish to connect your site?"
 msgstr ""
 
 #: includes/admin/class-geodir-admin-setup-wizard.php:520
-#: includes/admin/class-geodir-admin.php:253
+#: includes/admin/class-geodir-admin.php:258
 #: vendor/ayecode/ayecode-connect-helper/ayecode-connect-helper.php:38
 #, php-format
 msgid ""
@@ -2864,25 +2864,25 @@ msgid ""
 msgstr ""
 
 #: includes/admin/class-geodir-admin-setup-wizard.php:521
-#: includes/admin/class-geodir-admin.php:254
+#: includes/admin/class-geodir-admin.php:259
 #: vendor/ayecode/ayecode-connect-helper/ayecode-connect-helper.php:39
 msgid "Connect Site"
 msgstr ""
 
 #: includes/admin/class-geodir-admin-setup-wizard.php:522
-#: includes/admin/class-geodir-admin.php:255
+#: includes/admin/class-geodir-admin.php:260
 #: vendor/ayecode/ayecode-connect-helper/ayecode-connect-helper.php:40
 msgid "Connecting..."
 msgstr ""
 
 #: includes/admin/class-geodir-admin-setup-wizard.php:523
-#: includes/admin/class-geodir-admin.php:256
+#: includes/admin/class-geodir-admin.php:261
 #: vendor/ayecode/ayecode-connect-helper/ayecode-connect-helper.php:41
 msgid "This service will only work with a live domain, not a localhost."
 msgstr ""
 
 #: includes/admin/class-geodir-admin-setup-wizard.php:524
-#: includes/admin/class-geodir-admin.php:257
+#: includes/admin/class-geodir-admin.php:262
 #: vendor/ayecode/ayecode-connect-helper/ayecode-connect-helper.php:42
 msgid "Something went wrong, please refresh and try again."
 msgstr ""
@@ -3131,7 +3131,7 @@ msgid "Awesome, your directory is ready!"
 msgstr ""
 
 #: includes/admin/class-geodir-admin-setup-wizard.php:1595
-#: includes/admin/class-geodir-admin.php:423
+#: includes/admin/class-geodir-admin.php:427
 msgid "Thank you for using GeoDirectory!"
 msgstr ""
 
@@ -3668,117 +3668,117 @@ msgstr ""
 msgid "Taxonomies Page"
 msgstr ""
 
-#: includes/admin/class-geodir-admin.php:145
+#: includes/admin/class-geodir-admin.php:150
 msgid "GD Add listing page"
 msgstr ""
 
-#: includes/admin/class-geodir-admin.php:146
+#: includes/admin/class-geodir-admin.php:151
 msgid "This is where users will add listings via the frontend if enabled."
 msgstr ""
 
-#: includes/admin/class-geodir-admin.php:148
+#: includes/admin/class-geodir-admin.php:153
 msgid "GD Location page"
 msgstr ""
 
-#: includes/admin/class-geodir-admin.php:149
+#: includes/admin/class-geodir-admin.php:154
 msgid ""
 "This page can be used as the main directory page and is also used by some "
 "addons."
 msgstr ""
 
-#: includes/admin/class-geodir-admin.php:151
+#: includes/admin/class-geodir-admin.php:156
 msgid "GD Search page"
 msgstr ""
 
-#: includes/admin/class-geodir-admin.php:152
+#: includes/admin/class-geodir-admin.php:157
 msgid "This is the GD search results page."
 msgstr ""
 
-#: includes/admin/class-geodir-admin.php:154
+#: includes/admin/class-geodir-admin.php:159
 msgid "GD Archive template"
 msgstr ""
 
-#: includes/admin/class-geodir-admin.php:155
+#: includes/admin/class-geodir-admin.php:160
 msgid ""
 "Used to design the archive pages but should never be linked to directly."
 msgstr ""
 
-#: includes/admin/class-geodir-admin.php:157
+#: includes/admin/class-geodir-admin.php:162
 msgid "GD Archive Item template"
 msgstr ""
 
-#: includes/admin/class-geodir-admin.php:158
+#: includes/admin/class-geodir-admin.php:163
 msgid ""
 "Used to design the archive items but should never be linked to directly."
 msgstr ""
 
-#: includes/admin/class-geodir-admin.php:160
+#: includes/admin/class-geodir-admin.php:165
 msgid "GD Details template"
 msgstr ""
 
-#: includes/admin/class-geodir-admin.php:161
+#: includes/admin/class-geodir-admin.php:166
 msgid "Used to design the details page but should never be linked to directly."
 msgstr ""
 
-#: includes/admin/class-geodir-admin.php:163
+#: includes/admin/class-geodir-admin.php:168
 msgid "GD T&Cs"
 msgstr ""
 
-#: includes/admin/class-geodir-admin.php:164
+#: includes/admin/class-geodir-admin.php:169
 msgid "This is the page that will be used for your terms and conditions."
 msgstr ""
 
-#: includes/admin/class-geodir-admin.php:172
+#: includes/admin/class-geodir-admin.php:177
 #, php-format
 msgid "GD Archive template (%s)"
 msgstr ""
 
-#: includes/admin/class-geodir-admin.php:173
+#: includes/admin/class-geodir-admin.php:178
 #, php-format
 msgid ""
 "Used to design the %s archive pages but should never be linked to directly."
 msgstr ""
 
-#: includes/admin/class-geodir-admin.php:175
+#: includes/admin/class-geodir-admin.php:180
 #, php-format
 msgid "GD Archive Item template (%s)"
 msgstr ""
 
-#: includes/admin/class-geodir-admin.php:176
+#: includes/admin/class-geodir-admin.php:181
 #, php-format
 msgid ""
 "Used to design the %s archive items but should never be linked to directly."
 msgstr ""
 
-#: includes/admin/class-geodir-admin.php:178
+#: includes/admin/class-geodir-admin.php:183
 #, php-format
 msgid "GD Details template (%s)"
 msgstr ""
 
-#: includes/admin/class-geodir-admin.php:179
+#: includes/admin/class-geodir-admin.php:184
 #, php-format
 msgid ""
 "Used to design the %s details page but should never be linked to directly."
 msgstr ""
 
-#: includes/admin/class-geodir-admin.php:181
+#: includes/admin/class-geodir-admin.php:186
 #, php-format
 msgid "GD Add listing page (%s)"
 msgstr ""
 
-#: includes/admin/class-geodir-admin.php:182
+#: includes/admin/class-geodir-admin.php:187
 #, php-format
 msgid "Used to design the add %s page for the frontend."
 msgstr ""
 
-#: includes/admin/class-geodir-admin.php:420
+#: includes/admin/class-geodir-admin.php:425
 #, php-format
 msgid ""
 "If you like <strong>GeoDirectory</strong> please leave us a %s rating. A "
 "huge thanks in advance!"
 msgstr ""
 
-#: includes/admin/class-geodir-admin.php:420
+#: includes/admin/class-geodir-admin.php:425
 msgid "Thanks :)"
 msgstr ""
 

readme.txt

@@ -4,7 +4,7 @@ Donate link: https://wpgeodirectory.com
 Tags: business directory, listings, directory plugin, classifieds, directory
 Requires at least: 4.5
 Tested up to: 6.6
-Stable tag: 2.3.70
+Stable tag: 2.3.71
 Requires PHP: 5.6
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -317,7 +317,7 @@ We don't offer free trials, but we have a 30-day money-back guarantee if you are
 
 __WARNING: GDv2 is a significant update over GDv1 and may require manual work, such as adding widgets to sidebars to recreate your current layout. As always, we recommend trying this on a staging site first. [Learn more](https://docs.wpgeodirectory.com/article/260-upgrading-from-gdv1-to-gdv2)__
 
-= 2.3.71 - TBD =
+= GeoDirectory v2.3.71 - 2024-08-08 =
 * Nonce security check added to admin rating link - FIXED
 
 = GeoDirectory v2.3.70 - 2024-08-01 =

templates/map.php

@@ -12,7 +12,7 @@
  *
  * @see        https://docs.wpgeodirectory.com/article/346-customizing-templates/
  * @package    GeoDirectory
- * @version    2.3.24
+ * @version    2.3.71
  *
  * @global int $mapzoom Zoom level value for the map.
  * @global bool $geodir_manual_map Check if manual map.
@@ -960,9 +960,7 @@ function (results, status) {
     /* ]]> */
 </script>
 <?php }
-$set_button_class = 'geodir_button';
-if (is_admin())
-    $set_button_class = 'btn btn-primary collapse';
+$set_button_class = is_admin() ? 'gd-advanced-setting btn btn-sm btn-primary collapse' : 'geodir_button';
 ?>
 <input type="button" id="<?php echo $prefix; ?>set_address_button" class="<?php echo $set_button_class; ?>" value="<?php esc_attr_e($map_title, 'geodirectory'); ?>" style="float:none;"/>
 <div id="<?php echo $prefix; ?>d_mouseClick"></div>

vendor/ayecode/wp-ayecode-ui/change-log.txt

@@ -1,3 +1,6 @@
+= 0.2.23 - 2024-08-08 =
+* Conditional field set default value changes - CHANGED
+
 = 0.2.22 - 2024-08-01 =
 * Conditional field don't reset field value on hide element - FIXED
 

vendor/ayecode/wp-ayecode-ui/includes/ayecode-ui-settings.php

@@ -35,7 +35,7 @@ class AyeCode_UI_Settings {
 		 *
 		 * @var string
 		 */
-		public $version = '0.2.22';
+		public $version = '0.2.23';
 
 		/**
 		 * Class textdomain.
@@ -2939,15 +2939,18 @@ function aui_cf_field_get_default_value($el) {
                 /**
                  * Reset field default value.
                  */
-                function aui_cf_field_reset_default_value($el) {
+                function aui_cf_field_reset_default_value($el, bHide, setVal) {
                     var type = aui_cf_field_get_type($el), key = $el.data('rule-key'), field = aui_cf_field_default_values[key];
+                    if (typeof setVal === 'undefined' || (typeof setVal !== 'undefined' && setVal === null)) {
+                        setVal = field.value;
+                    }
 
                     switch (type) {
                         case 'text':
                         case 'number':
                         case 'date':
                         case 'textarea':
-                            $el.find('input:text,input[type="number"],textarea').val(field.value);
+                            $el.find('input:text,input[type="number"],textarea').val(setVal);
                             break;
                         case 'phone':
                         case 'email':
@@ -2956,22 +2959,22 @@ function aui_cf_field_reset_default_value($el) {
                         case 'hidden':
                         case 'password':
                         case 'file':
-                            $el.find('input[type="' + type + '"]').val(field.value);
+                            $el.find('input[type="' + type + '"]').val(setVal);
                             break;
                         case 'select':
                             $el.find('select').find('option').prop('selected', false);
-                            $el.find('select').val(field.value);
+                            $el.find('select').val(setVal);
                             $el.find('select').trigger('change');
                             break;
                         case 'multiselect':
                             $el.find('select').find('option').prop('selected', false);
-                            if ((typeof field.value === 'object' || typeof field.value === 'array') && !field.value.length && $el.find('select option:first').text() == '') {
+                            if ((typeof setVal === 'object' || typeof setVal === 'array') && !setVal.length && $el.find('select option:first').text() == '') {
                                 $el.find('select option:first').remove(); // Clear first option to show placeholder.
                             }
-                            if (typeof field.value === 'string') {
-                                $el.find('select').val(field.value);
+                            if (typeof setVal === 'string') {
+                                $el.find('select').val(setVal);
                             } else {
-                                jQuery.each(field.value, function(i, v) {
+                                jQuery.each(setVal, function(i, v) {
                                     $el.find('select').find('option[value="' + v + '"]').attr('selected', true);
                                 });
                             }
@@ -2980,20 +2983,20 @@ function aui_cf_field_reset_default_value($el) {
                         case 'checkbox':
                             if ($el.find('input[type="checkbox"]:checked').length >= 1) {
                                 $el.find('input[type="checkbox"]:checked').prop('checked', false);
-                                if (Array.isArray(field.value)) {
-                                    jQuery.each(field.value, function(i, v) {
+                                if (Array.isArray(setVal)) {
+                                    jQuery.each(setVal, function(i, v) {
                                         $el.find('input[type="checkbox"][value="' + v + '"]').attr('checked', true);
                                     });
                                 } else {
-                                    $el.find('input[type="checkbox"][value="' + field.value + '"]').attr('checked', true);
+                                    $el.find('input[type="checkbox"][value="' + setVal + '"]').attr('checked', true);
                                 }
                             }
                             break;
                         case 'radio':
                             if ($el.find('input[type="radio"]:checked').length >= 1) {
                                 setTimeout(function() {
                                     $el.find('input[type="radio"]:checked').prop('checked', false);
-                                    $el.find('input[type="radio"][value="' + field.value + '"]').attr('checked', true);
+                                    $el.find('input[type="radio"][value="' + setVal + '"]').attr('checked', true);
                                 }, 100);
                             }
                             break;
@@ -3055,13 +3058,15 @@ function aui_cf_field_apply_action($el, rule, isTrue) {
                         }
                         aui_cf_field_show_element($destEl);
                     } else if (rule.action === 'show' && !isTrue) {
-                        if (!$destEl.is(':hidden') && !$destEl.hasClass('aui-cf-skip-reset')) {
-                            aui_cf_field_reset_default_value($destEl);
+                        if ((!$destEl.is(':hidden') || ($destEl.is(':hidden') && ($destEl.hasClass('aui-cf-force-reset') || ($destEl.closest('.aui-cf-use-parent').length && $destEl.closest('.aui-cf-use-parent').is(':hidden'))))) && !$destEl.hasClass('aui-cf-skip-reset')) {
+                            var _setVal = $destEl.hasClass('aui-cf-force-empty') ? '' : null;
+                            aui_cf_field_reset_default_value($destEl, true, _setVal);
                         }
                         aui_cf_field_hide_element($destEl);
                     } else if (rule.action === 'hide' && isTrue) {
-                        if (!$destEl.is(':hidden') && !$destEl.hasClass('aui-cf-skip-reset')) {
-                            aui_cf_field_reset_default_value($destEl);
+                        if ((!$destEl.is(':hidden') || ($destEl.is(':hidden') && ($destEl.hasClass('aui-cf-force-reset') || ($destEl.closest('.aui-cf-use-parent').length && $destEl.closest('.aui-cf-use-parent').is(':hidden'))))) && !$destEl.hasClass('aui-cf-skip-reset')) {
+                            var _setVal = $destEl.hasClass('aui-cf-force-empty') ? '' : null;
+                            aui_cf_field_reset_default_value($destEl, true, _setVal);
                         }
                         aui_cf_field_hide_element($destEl);
                     } else if (rule.action === 'hide' && !isTrue) {

vendor/ayecode/wp-ayecode-ui/includes/inc/bs4-js.php

@@ -930,8 +930,8 @@ function aui_flip_color_scheme_on_scroll($value, $iframe){
                 cs_scroll  = 'navbar-light';
             }
 
-            navbar.dataset.cso = cs_original
-            navbar.dataset.css = cs_scroll
+            navbar.dataset.cso = cs_original;
+            navbar.dataset.css = cs_scroll;
         }
 
         if($value > 0 ){