DropdownFilter component added for billing page

Author: sazedul-haque

templates/dashboard/account/billing/order-history-filters.php

@@ -14,69 +14,45 @@
 use Tutor\Components\Button;
 use Tutor\Components\Constants\Variant;
 use Tutor\Components\DateFilter;
+use Tutor\Components\DropdownFilter;
 use Tutor\Components\Sorting;
 use TUTOR\Dashboard;
 use Tutor\Ecommerce\OrderController;
-use TUTOR\Icon;
 use TUTOR\Input;
 
 $filter_options = ( new OrderController( false ) )->tabs_key_value( 'dashboard' );
 
-$selected = array_filter(
-	$filter_options,
-	function( $item ) use ( $selected_filter ) {
-		return $item['key'] === $selected_filter || ( empty( $item['key'] ) && 'all' === $selected_filter );
-	}
+$dropdown_options = array_map(
+	function( $filter ) use ( $selected_filter ) {
+		$key = $filter['key'] ?? '';
+		return array(
+			'label'  => $filter['title'],
+			'value'  => $key,
+			'count'  => (int) $filter['value'],
+			'url'    => $filter['url'],
+			'active' => $key === $selected_filter || ( empty( $key ) && 'all' === $selected_filter ),
+		);
+	},
+	$filter_options
 );
-
-$selected = count( $selected ) ? reset( $selected ) : $filter_options[0];
 ?>
-<div x-data="tutorPopover({ placement: 'bottom-start', offset: 4 })">
-		<button x-ref="trigger" @click="toggle()" class="tutor-btn tutor-btn-link tutor-btn-x-small tutor-p-none tutor-gap-2">
-			<?php echo esc_html( $selected['title'] . ' (' . $selected['value'] . ')' ); ?>
-			<?php tutor_utils()->render_svg_icon( Icon::CHEVRON_DOWN, 16, 16, array( 'class' => 'tutor-icon-secondary' ) ); ?>
-		</button>
-
-		<div 
-			x-ref="content"
-			x-cloak 
-			x-show="open" 
-			@click.outside="handleClickOutside()" 
-			class="tutor-popover" 
-		>
-			<div class="tutor-popover-menu" style="width: 120px;">
-				<?php foreach ( $filter_options as $filter ) : ?>
-					<a href="<?php echo esc_url( $filter['url'] ); ?>" class="tutor-popover-menu-item tutor-popover-menu-item-active">
-						<?php
-							printf(
-								// translators: %1$s - Filter label, %2$d - Number of orders.
-								esc_html__( '%1$s (%2$d)', 'tutor' ),
-								esc_html( $filter['title'] ),
-								esc_html( $filter['value'] )
-							);
-						?>
-					</a>
-				<?php endforeach; ?>
-			</div>
-		</div>
-	</div>
-	<div class="tutor-qna-filter-right">
-		<div class="tutor-flex tutor-items-center tutor-gap-3">
-			<?php
-			$query_params = array( 'data', 'order', 'start_date', 'end_date' );
-			if ( Input::has_any( $query_params, Input::GET_REQUEST ) ) {
-				Button::make()
-					->tag( 'a' )
-					->attr( 'href', Dashboard::get_account_page_url( 'billing' ) )
-					->attr( 'class', 'tutor-text-brand' )
-					->label( __( 'Clear all', 'tutor' ) )
-					->variant( Variant::LINK )
-					->render();
-			}
+<div class="tutor-flex tutor-items-center tutor-justify-between tutor-px-6 tutor-py-5 tutor-border-b">
+	<?php DropdownFilter::make()->options( $dropdown_options )->render(); ?>
+	<div class="tutor-flex tutor-items-center tutor-gap-3">
+		<?php
+		$query_params = array( 'data', 'order', 'start_date', 'end_date' );
+		if ( Input::has_any( $query_params, Input::GET_REQUEST ) ) {
+			Button::make()
+				->tag( 'a' )
+				->attr( 'href', Dashboard::get_account_page_url( 'billing' ) )
+				->attr( 'class', 'tutor-text-brand' )
+				->label( __( 'Clear all', 'tutor' ) )
+				->variant( Variant::LINK )
+				->render();
+		}
 
-			DateFilter::make()->type( DateFilter::TYPE_RANGE )->placement( 'bottom-end' )->render();
-			Sorting::make()->order( $order_filter )->render();
-			?>
-		</div>
+		DateFilter::make()->type( DateFilter::TYPE_RANGE )->placement( 'bottom-end' )->render();
+		Sorting::make()->order( $order_filter )->render();
+		?>
 	</div>
 </div>

templates/dashboard/account/billing/order-history.php

@@ -32,9 +32,7 @@
 }
 ?>
 
-<div class="tutor-flex tutor-justify-between tutor-px-6 tutor-py-5 tutor-border-b">
-	<?php require_once tutor_get_template( 'dashboard.account.billing.order-history-filters' ); ?>
-</div>
+<?php require_once tutor_get_template( 'dashboard.account.billing.order-history-filters' ); ?>
 
 <?php
 if ( empty( $orders ) ) :