| @@ -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 | /** |
| @@ -106,11 +104,11 @@ | ||
| 106 | 104 | |
| 107 | 105 | $sections = array_merge( |
| 108 | 106 | $content_visibility, |
| 109 | 107 | Controls\SettingsFields::content_ordering( $this ), |
| 108 | + Controls\SettingsFields::section_title( $this ), | |
| 110 | 109 | Controls\SettingsFields::image( $this ), |
| 111 | 110 | Controls\SettingsFields::action_buttons( $this ), |
| 112 | - Controls\SettingsFields::section_title( $this ), | |
| 113 | 111 | Controls\SettingsFields::product_title( $this ), |
| 114 | 112 | Controls\SettingsFields::product_excerpt( $this ), |
| 115 | 113 | Controls\SettingsFields::badges( $this ), |
| 116 | 114 | $this->variation_swatch_conditionaly(), |
| @@ -125,16 +123,24 @@ | ||
| 125 | 123 | */ |
| 126 | 124 | protected function widget_layout() { |
| 127 | 125 | return Controls\LayoutFields::grid_layout( $this ); |
| 128 | 126 | } |
| 127 | + | |
| 128 | + /** | |
| 129 | + * Controls for layout tab | |
| 130 | + * | |
| 131 | + * @return array | |
| 132 | + */ | |
| 129 | 133 | public function variation_swatch_conditionaly() { |
| 130 | - if ( ! function_exists( 'rtwpvsp' ) ) { | |
| 134 | + if ( ! function_exists( 'rtwpvsp' ) && ! rtsb()->has_pro() ) { | |
| 131 | 135 | return []; |
| 132 | 136 | } |
| 133 | - $swatches_controls = Controls\SettingsFields::variation_swatch( $this ); | |
| 134 | - $swatches_controls['swatch_position']['condition'] = [ | |
| 135 | - 'layout' => [ 'grid-layout1' ], | |
| 136 | - ]; | |
| 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 | + } | |
| 137 | 143 | return $swatches_controls; |
| 138 | 144 | } |
| 139 | 145 | /** |
| 140 | 146 | * Controls for layout tab |
| @@ -146,8 +152,13 @@ | ||
| 146 | 152 | $additional_query['posts_limit']['separator'] = 'default'; |
| 147 | 153 | return $additional_query; |
| 148 | 154 | } |
| 149 | 155 | |
| 156 | + /** | |
| 157 | + * Controls for style tab | |
| 158 | + * | |
| 159 | + * @return array | |
| 160 | + */ | |
| 150 | 161 | protected function pagination_navigation() { |
| 151 | 162 | return Controls\StyleFields::pagination( $this ); |
| 152 | 163 | } |
| 153 | 164 | |
| @@ -183,9 +194,9 @@ | ||
| 183 | 194 | |
| 184 | 195 | /** |
| 185 | 196 | * Widget Field |
| 186 | 197 | * |
| 187 | - * @return void|array | |
| 198 | + * @return string | |
| 188 | 199 | */ |
| 189 | 200 | protected function render_template_file() { |
| 190 | 201 | return 'elementor/general/grid/'; |
| 191 | 202 | } |