← All changes | app/Abstracts/AdditionalQueryCustomLayout.php +22 -9 2.1.0 → 3.2.5 View file →

		@@ -77,10 +77,8 @@
77	77	$this->widget_query()
78	78	)
79	79	);
80	80
81		- unset( $fields['grid_style'] );
82		-
83	81	return $fields;
84	82	}
85	83
86	84	/**
		@@ -105,11 +103,12 @@
105	103	unset( $content_visibility['show_title']['separator'] );
106	104
107	105	$sections = array_merge(
108	106	$content_visibility,
	107	+ Controls\SettingsFields::content_ordering( $this ),
	108	+ Controls\SettingsFields::section_title( $this ),
109	109	Controls\SettingsFields::image( $this ),
110	110	Controls\SettingsFields::action_buttons( $this ),
111		- Controls\SettingsFields::section_title( $this ),
112	111	Controls\SettingsFields::product_title( $this ),
113	112	Controls\SettingsFields::product_excerpt( $this ),
114	113	Controls\SettingsFields::badges( $this ),
115	114	$this->variation_swatch_conditionaly(),
		@@ -124,16 +123,24 @@
124	123	*/
125	124	protected function widget_layout() {
126	125	return Controls\LayoutFields::grid_layout( $this );
127	126	}
	127	+
	128	+ /**
	129	+ * Controls for layout tab
	130	+ *
	131	+ * @return array
	132	+ */
128	133	public function variation_swatch_conditionaly() {
129		- if ( ! function_exists( 'rtwpvsp' ) ) {
	134	+ if ( ! function_exists( 'rtwpvsp' ) && ! rtsb()->has_pro() ) {
130	135	return [];
131	136	}
132		- $swatches_controls = Controls\SettingsFields::variation_swatch( $this );
133		- $swatches_controls['swatch_position']['condition'] = [
134		- 'layout' => [ 'grid-layout1' ],
135		- ];
	137	+ $swatches_controls = Controls\SettingsFields::variation_swatch( $this );
	138	+ if ( ! empty( $swatches_controls['swatch_position'] ) ) {
	139	+ $swatches_controls['swatch_position']['condition'] = [
	140	+ 'layout' => [ 'grid-layout1' ],
	141	+ ];
	142	+ }
136	143	return $swatches_controls;
137	144	}
138	145	/**
139	146	* Controls for layout tab
		@@ -145,8 +152,13 @@
145	152	$additional_query['posts_limit']['separator'] = 'default';
146	153	return $additional_query;
147	154	}
148	155
	156	+ /**
	157	+ * Controls for style tab
	158	+ *
	159	+ * @return array
	160	+ */
149	161	protected function pagination_navigation() {
150	162	return Controls\StyleFields::pagination( $this );
151	163	}
152	164
		@@ -182,9 +194,9 @@
182	194
183	195	/**
184	196	* Widget Field
185	197	*
186		- * @return void|array
	198	+ * @return string
187	199	*/
188	200	protected function render_template_file() {
189	201	return 'elementor/general/grid/';
190	202	}
		@@ -215,8 +227,9 @@
215	227	if ( $this->is_builder_mode() ) {
216	228	add_filter( 'wp_kses_allowed_html', [ FilterHooks::class, 'custom_wpkses_post_tags' ], 10, 2 );
217	229	}
218	230
	231	+ // Call the template rendering method.
219	232	Fns::print_html( Render::instance()->setup_loop_for_product_view( $this->render_template_file(), $settings, $this ), true );
220	233
221	234	$this->action_button_icon_set_default();
222	235	$this->render_end();