Skip to content

Basic and advanced search form improvement #2330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
nazmulhasan103 wants to merge 11 commits into from
Closed

Basic and advanced search form improvement #2330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8259473
Improved basic-search-form & advance-search-form condition
nazmulhasan103 May 5, 2025
d5c3728
Refactored templates
obiPlabon May 8, 2025
8337f3e
Refactor template and conditions
obiPlabon May 8, 2025
d416b0a
Fixed advanced search form condition
obiPlabon May 8, 2025
4fedad6
Updated and refactored
obiPlabon May 8, 2025
9b46b39
Refactored all search form instances with one instance
obiPlabon May 8, 2025
3f8e564
Refactored template
obiPlabon May 8, 2025
8984571
Refactor and strict comparison
obiPlabon May 8, 2025
b8d1c66
Merge branch 'development' into improve/search-form
HeyMehedi May 12, 2025
56e9243
Merge branch 'development' into improve/search-form
obiPlabon May 14, 2025
7c68ff4
Merge branch 'development' into improve/search-form
HeyMehedi May 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
158 changes: 81 additions & 77 deletions includes/model/Listings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
class Directorist_Listings {
protected $thumbnails_cached = false;

protected $search_form = null;

public $query_args = [];
public $query_results = [];
public $options = [];
Expand Down Expand Up @@ -1137,15 +1139,6 @@ public function render_shortcode( $atts = [] ) {
Helper::add_shortcode_comment( $atts['shortcode'] );
}

$search_field_atts = array_filter( $this->atts, function( $key ) {
return substr( $key, 0, 7 ) == 'filter_';
}, ARRAY_FILTER_USE_KEY );

$args = array(
'listings' => $this,
'searchform' => new Directorist_Listing_Search_Form( $this->type, $this->current_listing_type, $search_field_atts ),
);

switch ( $this->sidebar ) {
case 'left_sidebar':
$template = 'sidebar-archive-contents';
Expand All @@ -1164,9 +1157,9 @@ public function render_shortcode( $atts = [] ) {
Helper::get_template( $template,
array(
'listings' => $this,
'searchform' => new Directorist_Listing_Search_Form( $this->type, $this->current_listing_type, $search_field_atts ),
'searchform' => $this->get_search_form(),
),
'listings_archive',
'listings_archive'
);

return ob_get_clean();
Expand Down Expand Up @@ -2142,34 +2135,29 @@ public function render_badge_template( $field ) {
switch ( $field['widget_key'] ) {

case 'popular_badge':
$field['class'] = 'popular';
$field['icon'] = 'fas fa-fire';
$field['tooltip_class'] = 'directorist-badge-tooltip__popular';
$field['label'] = Helper::popular_badge_text();

$field['class'] = 'popular';
$field['icon'] = 'fas fa-fire';
$field['tooltip_class'] = 'directorist-badge-tooltip__popular';
$field['label'] = Helper::popular_badge_text();

if ( Helper::is_popular( $id ) ) {
Helper::get_template( 'archive/fields/badge', $field );
}

break;
if ( Helper::is_popular( $id ) ) {
Helper::get_template( 'archive/fields/badge', $field );
}
break;

case 'featured_badge':
$field['class'] = 'featured';
$field['icon'] = 'fas fa-star';
$field['tooltip_class'] = 'directorist-badge-tooltip__featured';
$field['label'] = Helper::featured_badge_text();
$field['featured_badge_type'] = get_directorist_option( 'feature_badge_type', 'icon_badge');

if ( Helper::is_featured( $id ) ) {
Helper::get_template( 'archive/fields/badge', apply_filters( 'directorist_featured_badge_field_data', $field ) );
}
break;

$field['class'] = 'featured';
$field['icon'] = 'fas fa-star';
$field['tooltip_class'] = 'directorist-badge-tooltip__featured';
$field['label'] = Helper::featured_badge_text();
$field['featured_badge_type'] = get_directorist_option( 'feature_badge_type', 'icon_badge');

if ( Helper::is_featured( $id ) ) {
Helper::get_template( 'archive/fields/badge', apply_filters( 'directorist_featured_badge_field_data', $field ) );
}

break;

case 'new_badge':

case 'new_badge':
$field['class'] = 'new';
$field['icon'] = 'fas fa-bolt';
$field['tooltip_class'] = 'directorist-badge-tooltip__new';
Expand All @@ -2180,11 +2168,8 @@ public function render_badge_template( $field ) {
if ( Helper::is_new( $id ) ) {
Helper::get_template( 'archive/fields/badge', $field );
}

break;

}

}

public function listing_wrapper_class() {
Expand All @@ -2199,17 +2184,17 @@ public function grid_container_fluid() {
public function sidebar_class() {
$class = 'no-sidebar-contents';

if ( $this->sidebar ) {

switch ( $this->sidebar ) {
case 'left_sidebar':
$class = 'left-sidebar-contents';
break;
case 'right_sidebar':
$class = 'right-sidebar-contents';
break;
}
if ( ! $this->sidebar ) {
return $class;
}

switch ( $this->sidebar ) {
case 'left_sidebar':
$class = 'left-sidebar-contents';
break;
case 'right_sidebar':
$class = 'right-sidebar-contents';
break;
}

return $class;
Expand Down Expand Up @@ -2244,41 +2229,36 @@ public function display_search_button() {
}

public function search_form_template() {
// only catch atts with the prefix 'filter_'
$search_field_atts = array_filter( $this->atts, function( $key ) {
return substr( $key, 0, 7 ) == 'filter_';
}, ARRAY_FILTER_USE_KEY );

$args = array(
'listings' => $this,
'searchform' => new Directorist_Listing_Search_Form( $this->type, $this->current_listing_type, $search_field_atts ),
'searchform' => $this->get_search_form(),
);
Helper::get_template( 'archive/search-form', $args );
}

public function basic_search_form_template() {
// only catch atts with the prefix 'filter_'
$search_field_atts = array_filter( $this->atts, function( $key ) {
return substr( $key, 0, 7 ) == 'filter_';
}, ARRAY_FILTER_USE_KEY );
if ( ! $this->get_search_form()->have_basic_fields() ) {
return;
}

$args = array(
'listings' => $this,
'searchform' => new Directorist_Listing_Search_Form( 'search_result', $this->current_listing_type, $search_field_atts ),
'searchform' => $this->get_search_form(),
);

Helper::get_template( 'archive/basic-search-form', $args );
}

public function advance_search_form_template() {
// only catch atts with the prefix 'filter_'
$search_field_atts = array_filter( $this->atts, function( $key ) {
return substr( $key, 0, 7 ) == 'filter_';
}, ARRAY_FILTER_USE_KEY );
if ( ! $this->get_search_form()->have_advance_fields() ) {
return;
}

$args = array(
'listings' => $this,
'searchform' => new Directorist_Listing_Search_Form( 'search_result', $this->current_listing_type, $search_field_atts ),
'searchform' => $this->get_search_form(),
);

Helper::get_template( 'archive/advance-search-form', $args );
}

Expand All @@ -2292,14 +2272,9 @@ public function filter_btn_html() {
}

public function mobile_view_filter_template() {
// only catch atts with the prefix 'filter_'
$search_field_atts = array_filter( $this->atts, function( $key ) {
return substr( $key, 0, 7 ) == 'filter_';
}, ARRAY_FILTER_USE_KEY );

$args = array(
'listings' => $this,
'searchform' => new Directorist_Listing_Search_Form( $this->type, $this->current_listing_type, $search_field_atts ),
'searchform' => $this->get_search_form(),
);
Helper::get_template( 'archive/mobile-search-form', $args );
}
Expand All @@ -2326,14 +2301,9 @@ public function listings_header_title() {
}

public function full_search_form_template() {
// only catch atts with the prefix 'filter_'
$search_field_atts = array_filter( $this->atts, function( $key ) {
return substr( $key, 0, 7 ) == 'filter_';
}, ARRAY_FILTER_USE_KEY );

$args = array(
'listings' => $this,
'searchform' => new Directorist_Listing_Search_Form( $this->type, $this->current_listing_type, $search_field_atts ),
'searchform' => $this->get_search_form(),
);

Helper::get_template( 'archive/search-form', $args );
Expand Down Expand Up @@ -2470,4 +2440,38 @@ public static function mark_as_favourite_button() {
_deprecated_function( __METHOD__, '7.3.1' );
}

}
public function should_display_basic_search_form() {
return ( ! $this->hide_top_search_bar_on_sidebar_layout() && $this->get_search_form()->have_basic_fields() );
}

public function should_display_advance_search_form() {
return $this->get_search_form()->have_advance_fields();
}

protected function get_filter_attributes() {
return array_filter(
$this->atts,
function( $key ) {
return substr( $key, 0, 7 ) === 'filter_';
},
ARRAY_FILTER_USE_KEY
);
}

public function get_search_form() {
if ( is_null( $this->search_form ) ) {
$this->search_form = new Directorist_Listing_Search_Form(
$this->type,
$this->current_listing_type,
$this->get_filter_attributes()
);
}

return $this->search_form;
}

public function wrapper_html_attributes() {
$this->wrapper_class();
$this->data_atts();
}
}
22 changes: 22 additions & 0 deletions includes/model/SearchForm.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,4 +753,26 @@ public function load_radius_search_scripts( $data ) {
public function load_map_scripts() {
_deprecated_function( __METHOD__, '7.3' );
}

public function have_basic_fields() {
return ! empty( $this->get_basic_fields() );
}

public function have_advance_fields() {
return ! empty( $this->get_advance_fields() );
}

public function render_basic_search_fields() {
foreach ( $this->get_basic_fields() as $field ) {
$this->field_template( $field );
}
}

public function render_advance_search_fields() {
foreach ( $this->get_advance_fields() as $field ) : ?>
<div class="directorist-advanced-filter__advanced__element directorist-search-field-<?php echo esc_attr( $field['widget_name'] ) ?>">
<?php $this->field_template( $field ); ?>
</div>
<?php endforeach;
}
}
32 changes: 19 additions & 13 deletions templates/archive/advance-search-form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,36 +2,42 @@
/**
* @author wpWax
* @since 8.0
* @version 8.0
* @version 8.4.1
*/

use \Directorist\Helper;
if ( ! defined( 'ABSPATH' ) ) {
exit;
}

if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! $searchform->have_advance_fields() ) {
return;
}

$title = $listings->options['sidebar_filter_text'] ?? __( 'Filters', 'directorist' );
$reset_button_label = $searchform->options['reset_sidebar_filters_text'] ?? esc_html__( 'Clear All', 'directorist' );
?>
<form action="<?php atbdp_search_result_page_link(); ?>" class="directorist-search-form directorist-advanced-search">
<div class="directorist-search-form__box">
<div class="directorist-advanced-filter__top">
<h2 class="directorist-advanced-filter__title"><?php echo esc_html( $listings->options['sidebar_filter_text'] ?? 'Filters' ); ?></h2>
<button class="directorist-search-modal__contents__btn directorist-advanced-filter__close" type="button" aria-label="Sidebar Filter Close Button">
<h2 class="directorist-advanced-filter__title"><?php echo esc_html( $title ); ?></h2>
<button class="directorist-search-modal__contents__btn directorist-advanced-filter__close" type="button" aria-label="<?php esc_attr_e( 'Sidebar filter close button', 'directorist' ); ?>">
<?php directorist_icon( 'fas fa-times' ); ?>
</button>
</div>
<div class="directorist-advanced-filter__advanced">
<input type="hidden" name='directory_type' value='<?php echo esc_attr( $listings->get_directory_type_slug() ); ?>'>
<?php foreach ( $searchform->form_data[1]['fields'] as $field ) : ?>
<div class="directorist-advanced-filter__advanced__element directorist-search-field-<?php echo esc_attr( $field['widget_name'] ) ?>"><?php $searchform->field_template( $field ); ?></div>
<?php endforeach; ?>
<input type="hidden" name='directory_type' value='<?php echo esc_attr( $listings->get_directory_type_slug() ); ?>'>

<?php $searchform->render_advance_search_fields(); ?>

<div class="directorist-advanced-filter__action directorist-advanced-filter__action--ajax">
<button class="directorist-btn-reset-js directorist-btn-reset-ajax"><?php echo esc_html( $searchform->options['reset_sidebar_filters_text'] ?? esc_html__( 'Clear All', 'directorist' ) ); ?></button>
<button class="directorist-btn-reset-js directorist-btn-reset-ajax"><?php echo esc_html( $reset_button_label ); ?></button>
</div>
</div>

<?php if ( ! empty( $listings->display_search_button() ) ) : ?>

<?php $searchform->buttons_template(); ?>

<?php endif; ?>

<?php endif; ?>
</div>
</form>
</form>
30 changes: 12 additions & 18 deletions templates/archive/basic-search-form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,40 +2,34 @@
/**
* @author wpWax
* @since 7.2.2
* @version 8.0
* @version 8.4.1
*/
if ( ! defined( 'ABSPATH' ) ) {
exit;
}

use \Directorist\Helper;

if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! $searchform->have_basic_fields() ) {
return;
}
?>

<form action="<?php atbdp_search_result_page_link(); ?>" class="directorist-search-form directorist-basic-search">
<div class="directorist-search-form__box">
<div class="directorist-search-form-top directorist-flex directorist-align-center directorist-search-form-inline directorist-search-form__top">

<?php
foreach ( $searchform->form_data[0]['fields'] as $field ){
$searchform->field_template( $field );
}
?>
<div class="directorist-search-form-top directorist-flex directorist-align-center directorist-search-form-inline directorist-search-form__top">
<?php $searchform->render_basic_search_fields(); ?>
</div>

</div>

<?php if ( ! empty( $listings->display_search_button() ) ) : ?>
<div class="directorist-search-form-action">
<div class="directorist-search-form-action__submit">
<button type="submit" class="directorist-btn directorist-btn-lg directorist-btn-primary directorist-btn-search">

<?php if ( $searchform->has_search_button_icon() ): ?>
<?php directorist_icon( 'las la-search' ); ?>
<?php endif;?>

<?php echo esc_html( $searchform->search_button_text );?>

<?php echo esc_html( $searchform->search_button_text ); ?>
</button>
</div>
</div>
<?php endif; ?>
</div>
</form>
</form>
Loading
Loading