Version 1.10.1

admin/classes/class-merchant-admin-options.php

@@ -402,7 +402,7 @@ public static function save_options( $settings ) {
 							} elseif ( 'textarea_multiline' === $field['type'] ) {
 								$value = sanitize_textarea_field( $_POST['merchant'][ $field['id'] ] );
 							} elseif ( is_array( $_POST['merchant'][ $field['id'] ] ) ) {
-								$value = array_filter( map_deep( wp_unslash( $_POST['merchant'][ $field['id'] ] ), 'sanitize_text_field' ) );
+								$value = array_filter( map_deep( wp_unslash( $_POST['merchant'][ $field['id'] ] ), 'sanitize_textarea_field' ) );
 							} else {
 								$value = sanitize_text_field( wp_unslash( $_POST['merchant'][ $field['id'] ] ) );
 							}
@@ -454,6 +454,7 @@ public static function sanitize( $field, $value ) {
 					$value = sanitize_text_field( $value );
 					break;
 
+				case 'textarea_multiline':
 				case 'textarea':
 					$value = sanitize_textarea_field( $value );
 					break;
@@ -2092,6 +2093,8 @@ public static function flexible_content( $settings, $value, $module_id = '' ) {
                                             $value = null;
                                             if ( isset( $option[ $sub_field['id'] ] ) ) {
                                                 $value = $option[ $sub_field['id'] ];
+                                            } elseif ( isset( $sub_field['type'] ) && $sub_field['type'] === 'switcher' ) {
+	                                            $value = is_null( $value ) ? 0 : 1;
                                             } elseif ( isset( $sub_field['default'] ) ) {
                                                 $value = $sub_field['default'];
                                             }

assets/js/src/admin/admin.js

@@ -360,10 +360,18 @@
             }
         }
 
-        // Intialize Sortable.
+        // Initialize Sortable.
         SortableField.init();
         flexibleToggleField.init();
 
+        // When adding/duplicating new item, refresh sorting
+        $( document ).on('merchant-flexible-content-added', function (e, $layout) {
+            const $sortableWrapper = $layout.find( '.merchant-sortable-repeater-control' );
+            const $sortableElement = $sortableWrapper.find('.merchant-sortable-repeater.sortable');
+
+            SortableRepeaterField.makeFieldsSortable( $sortableElement );
+        });
+
         // Sortable Repeater.
         const SortableRepeaterField = {
             init: function (field) {
@@ -373,30 +381,31 @@
                 $('.merchant-sortable-repeater-control').each(function () {
 
                     // If there is an existing customizer value, populate our rows
-                    var defaultValuesArray = JSON.parse($(this).find('.merchant-sortable-repeater-input').val());
-                    var numRepeaterItems = defaultValuesArray.length;
+                    const defaultValuesArray = JSON.parse($(this).find('.merchant-sortable-repeater-input').val());
+                    const numRepeaterItems = defaultValuesArray.length;
 
                     if (numRepeaterItems > 0) {
                         // Add the first item to our existing input field
                         $(this).find('.repeater-input').val(defaultValuesArray[0]);
 
                         // Create a new row for each new value
                         if (numRepeaterItems > 1) {
-                            var i;
-                            for (i = 1; i < numRepeaterItems; ++i) {
+                            // var i;
+                            for (let i = 1; i < numRepeaterItems; ++i) {
                                 self.appendRow($(this), defaultValuesArray[i]);
                             }
                         }
                     }
 
-                    // Make our Repeater fields sortable.
-                    if (!$(this).hasClass('disable-sorting')) {
-                        $(this).find('.merchant-sortable-repeater.sortable').sortable({
-                            update: function (event, ui) {
-                                self.getAllInputs($(this).parent());
-                            }
-                        });
-                    }
+                    // Todo: remove
+                    // Make our Repeater fields sortable. Doesn't work with flexible content
+                    // if (!$(this).hasClass('disable-sorting')) {
+                    //     $(this).find('.merchant-sortable-repeater.sortable').sortable({
+                    //         update: function (event, ui) {
+                    //             self.getAllInputs($(this).parent());
+                    //         }
+                    //     });
+                    // }
                 });
 
                 // Events.
@@ -407,28 +416,30 @@
                 const self = this;
 
                 // Remove item starting from its parent element
-                $('.merchant-sortable-repeater.sortable').on('click', '.customize-control-sortable-repeater-delete', function (event) {
+                $( document ).on('click', '.merchant-sortable-repeater.sortable .customize-control-sortable-repeater-delete', function (event) {
                     event.preventDefault();
                     $(this).parent().slideUp('fast', function () {
                         var parentContainer = $(this).parent().parent();
                         $(this).remove();
                         self.getAllInputs(parentContainer);
                     })
+
+                    $( document ).trigger( 'merchant-sortable-repeater-item-deleted' );
                 });
 
                 // Add new item
-                $('.customize-control-sortable-repeater-add').click(function (event) {
+                $( document ).on('click', '.customize-control-sortable-repeater-add', function(event) {
                     event.preventDefault();
                     self.appendRow($(this).parent());
                     self.getAllInputs($(this).parent());
                 });
 
                 // Refresh our hidden field if any fields change
-                $('.merchant-sortable-repeater.sortable').change(function () {
+                $(document).on( 'change', '.merchant-sortable-repeater.sortable', function() {
                     self.getAllInputs($(this).parent());
                 })
 
-                $('.merchant-sortable-repeater.sortable').on('focusout', '.repeater-input', function () {
+                $( document ).on('focusout', '.merchant-sortable-repeater.sortable .repeater-input', function() {
                     self.getAllInputs($(this).parent());
                 });
             },
@@ -438,12 +449,30 @@
              *
              */
             appendRow: function ($element, defaultValue = '') {
-                var newRow = '<div class="repeater" style="display:none"><input type="text" value="' + defaultValue + '" class="repeater-input" /><span class="dashicons dashicons-menu"></span><a class="customize-control-sortable-repeater-delete" href="#"><span class="dashicons dashicons-no-alt"></span></a></div>';
+                const newRow = '<div class="repeater" style="display:none"><input type="text" value="' + defaultValue + '" class="repeater-input" /><span class="dashicons dashicons-menu"></span><a class="customize-control-sortable-repeater-delete" href="#"><span class="dashicons dashicons-no-alt"></span></a></div>';
 
                 $element.find('.sortable').append(newRow);
-                $element.find('.sortable').find('.repeater:last').slideDown('slow', function () {
+
+                const $newItem = $element.find('.sortable').find('.repeater:last');
+
+                $newItem.slideDown('slow', function () {
                     $(this).find('input').focus();
                 });
+
+                // Make Repeater fields sortable; Putting here works better with flexible content
+                this.makeFieldsSortable( $element.find('.sortable') );
+
+                $( document ).trigger( 'merchant-sortable-repeater-item-added', [ $newItem, $element.find('.sortable') ] );
+            },
+
+            makeFieldsSortable: function ( $sortableElement ) {
+                if ( ! $sortableElement.hasClass( 'disable-sorting' ) ) {
+                    $sortableElement.sortable( {
+                        update: function ( event, ui ) {
+                            SortableRepeaterField.getAllInputs( $sortableElement.parent() );
+                        }
+                    } );
+                }
             },
 
             /**
@@ -464,6 +493,8 @@
                 $element.find('.merchant-sortable-repeater-input').val(JSON.stringify(inputValues));
                 // Important! Make sure to trigger change event so Customizer knows it has to save the field
                 $element.find('.merchant-sortable-repeater-input').trigger('change');
+
+                $element.find('.merchant-sortable-repeater-input').trigger('sortable.repeater.change');
             }
         }
 
@@ -990,8 +1021,8 @@
             });
         }).trigger('merchant.change');
 
-        $(document).on('merchant-admin-check-fields merchant-flexible-content-added keyup', function () {
-            $('.merchant-module-page-setting-field').each(function () {
+        $(document).on('merchant-admin-check-fields merchant-flexible-content-added change keyup', function () {
+            $(document).find('.merchant-module-page-setting-field').each(function () {
                 let $field = $(this);
                 if ($field.data('conditions')) {
                     let conditions = $field.data('conditions'),
@@ -1670,11 +1701,20 @@
 		        $target = $('input[name="merchant[' + condition.field + '][]"],select[name="merchant[' + condition.field + '][]"]')
 	        }
 
+            if (!$target.length) {
+                // Maybe the field is inside fields group
+                $target = $('.merchant-group-fields-container').find('.merchant-field-' + condition.field + ' input[name*="' + condition.field + '"],.merchant-field-' + condition.field + ' select[name*="' + condition.field + '"]');
+            }
+
             let value = $target.val();
-            if ($target.attr('type') === 'checkbox' || $target.attr('type') === 'radio') {
+            if ($target.attr('type') === 'checkbox') {
                 value = $target.is(':checked');
             }
 
+            if ($target.attr('type') === 'radio') {
+                value = $target.filter(':checked').val();
+            }
+
 	        // check if the field is multiple checkbox
 	        if ($target.attr('type') === 'checkbox' && $target.length > 1) {
 		        value = [];

assets/js/src/modules/real-time-search/real-time-search.js

@@ -16,7 +16,7 @@ merchant.modules = merchant.modules || {};
 		init: function () {
 
 			var self = this;
-			var fields = document.querySelectorAll('.woocommerce-product-search .wc-search-field, .widget_product_search .search-field, .wp-block-search .wp-block-search__input, .wc-block-product-search-field, .woocommerce-product-search .search-field, .w-search-form input');
+			var fields = document.querySelectorAll('.woocommerce-product-search .wc-search-field, .widget_product_search .search-field, .wp-block-search .wp-block-search__input, .wc-block-product-search-field, .woocommerce-product-search .search-field, .w-search-form input, .the7-search-form__input, input[type="search"]');
 
 			if (fields.length) {
 
@@ -47,69 +47,71 @@ merchant.modules = merchant.modules || {};
 
 		},
 
-		searchFormHandler: function (el) {
-
-			if (el.value.length < 3) {
+		searchFormHandler: function ( el ) {
+			if ( el.value.length < 3 ) {
 				return false;
 			}
 
-			var self = this,
-				term = el.value,
-				clist = el.classList,
-				type = clist.contains('wc-block-product-search-field') || clist.contains('wc-search-field') ? 'product' : 'post';
-
-			$.post(window.merchant.setting.ajax_url, {
-				action: 'ajax_search_callback',
-				nonce: window.merchant.setting.nonce,
-				type: type,
-				search_term: term,
-				posts_per_page: window.merchant.setting.ajax_search_results_amounth_per_search,
-				orderby: window.merchant.setting.ajax_search_results_order_by,
-				order: window.merchant.setting.ajax_search_results_order,
-				display_categories: window.merchant.setting.ajax_search_results_display_categories,
-				enable_search_by_sku: window.merchant.setting.ajax_search_results_enable_search_by_sku,
-			}, function (response) {
-
-				var wrapper = el.parentNode.getElementsByClassName('merchant-ajax-search-wrapper')[0];
-
-				if (typeof wrapper === 'undefined') {
-
-					wrapper = document.createElement('div');
-					wrapper.className = 'merchant-ajax-search-wrapper';
-					el.parentNode.append(wrapper);
-					el.parentNode.classList.add('merchant-ajax-search');
-
-				}
+			const self = this;
+			const term = el.value;
+			const clist = el.classList;
+			const type = clist.contains( 'wc-block-product-search-field' ) || clist.contains( 'wc-search-field' ) ? 'product' : 'post';
+
+			const {
+				ajax_search_results_amount_per_search: posts_per_page = 15,
+				ajax_search_results_order_by: orderby = 'title',
+				ajax_search_results_order: order = 'asc',
+				ajax_search_results_display_categories: display_categories = 0,
+				ajax_search_results_enable_search_by_sku: enable_search_by_sku = 0
+			} = window.merchant.setting.real_time_search || {};
+
+			$.ajax( {
+				url: window.merchant.setting.ajax_url,
+				method: 'POST',
+				data: {
+					action: 'ajax_search_callback',
+					nonce: window.merchant.setting.nonce,
+					type: type,
+					search_term: term,
+					posts_per_page,
+					orderby,
+					order,
+					display_categories,
+					enable_search_by_sku
+				},
+				success: function (response) {
+					let wrapper = el.parentNode.querySelector( '.merchant-ajax-search-wrapper' );
+
+					if ( ! wrapper ) {
+						wrapper = document.createElement( 'div' );
+						wrapper.className = 'merchant-ajax-search-wrapper';
+						el.parentNode.append( wrapper );
+						el.parentNode.classList.add( 'merchant-ajax-search' );
+					}
 
-				wrapper.innerHTML = response.output;
+					wrapper.innerHTML = response.output;
 
-				var products_wrapper = document.querySelector('.merchant-ajax-search-products');
+					const productsWrapper = document.querySelector( '.merchant-ajax-search-products' );
 
-				if (products_wrapper !== null && self.scrollbarVisible(products_wrapper)) {
-					products_wrapper.classList.add('has-scrollbar');
-				}
+					if ( productsWrapper && self.scrollbarVisible( productsWrapper ) ) {
+						productsWrapper.classList.add( 'has-scrollbar' );
+					}
 
-				if (self.elementIsOutOfScreenHorizontal(wrapper)) {
-					wrapper.classList.add('merchant-reverse');
+					if ( self.elementIsOutOfScreenHorizontal( wrapper ) ) {
+						wrapper.classList.add( 'merchant-reverse' );
+					}
 				}
-
-			});
+			} );
 		},
 
 		destroy: function () {
-
-			if ($('body').hasClass('wp-admin')) {
+			if ( document.body.classList.contains( 'wp-admin' ) ) {
 				return;
 			}
 
-			var wrappers = document.querySelectorAll('.merchant-ajax-search-wrapper');
-
-			if (wrappers.length) {
-				for (var i = 0; i < wrappers.length; i++) {
-					wrappers[i].remove();
-				}
-			}
+			const wrappers = document.querySelectorAll( '.merchant-ajax-search-wrapper' );
 
+			wrappers.forEach( wrapper => wrapper.remove() );
 		},
 
 		debounce: function (callback, wait) {
@@ -134,7 +136,6 @@ merchant.modules = merchant.modules || {};
 			var rect = el.getBoundingClientRect();
 			return rect.x + rect.width > window.innerWidth;
 		}
-
 	};
 
 	$(document).ready(function () {