lib/data/datasources/order_remote_datasource.dart

@@ -272,26 +272,18 @@ class OrderRemoteDatasource {
     String status = 'completed',
     required DateTime dateFrom,
     required DateTime dateTo,
-    String? search,
   }) async {
     try {
       final authData = await AuthLocalDataSource().getAuthData();
-
-      Map<String, dynamic> params = {
-        'page': page,
-        'limit': limit,
-        'status': status,
-        'date_from': DateFormat('dd-MM-yyyy').format(dateFrom),
-        'date_to': DateFormat('dd-MM-yyyy').format(dateTo),
-      };
-
-      if (search != null && search.isNotEmpty) {
-        params['search'] = search;
-      }
-
       final response = await dio.get(
         '${Variables.baseUrl}/api/v1/orders',
-        queryParameters: params,
+        queryParameters: {
+          'page': page,
+          'limit': limit,
+          'status': status,
+          'date_from': DateFormat('dd-MM-yyyy').format(dateFrom),
+          'date_to': DateFormat('dd-MM-yyyy').format(dateTo),
+        },
         options: Options(
           headers: {
             'Authorization': 'Bearer ${authData.token}',

lib/presentation/sales/blocs/order_loader/order_loader_bloc.dart

@@ -60,7 +60,6 @@ class OrderLoaderBloc extends Bloc<OrderLoaderEvent, OrderLoaderState> {
       status: event.status,
       dateFrom: event.dateFrom,
       dateTo: event.dateTo,
-      search: event.search,
     );
 
     await result.fold(
@@ -109,7 +108,6 @@ class OrderLoaderBloc extends Bloc<OrderLoaderEvent, OrderLoaderState> {
         status: event.status,
         dateFrom: event.dateFrom,
         dateTo: event.dateTo,
-        search: event.search,
       );
 
       await result.fold(

lib/presentation/sales/blocs/order_loader/order_loader_bloc.freezed.dart

@@ -18,36 +18,33 @@ final _privateConstructorUsedError = UnsupportedError(
 mixin _$OrderLoaderEvent {
   @optionalTypeArgs
   TResult when<TResult extends Object?>({
-    required TResult Function(String status, DateTime dateFrom, DateTime dateTo,
+    required TResult Function(
-            int? limit, String? search)
+            String status, DateTime dateFrom, DateTime dateTo, int? limit)
         getByStatus,
     required TResult Function(String id) getById,
-    required TResult Function(
+    required TResult Function(String status, DateTime dateFrom, DateTime dateTo)
-            String status, DateTime dateFrom, DateTime dateTo, String? search)
         loadMore,
     required TResult Function(String status) refresh,
   }) =>
       throw _privateConstructorUsedError;
   @optionalTypeArgs
   TResult? whenOrNull<TResult extends Object?>({
-    TResult? Function(String status, DateTime dateFrom, DateTime dateTo,
+    TResult? Function(
-            int? limit, String? search)?
+            String status, DateTime dateFrom, DateTime dateTo, int? limit)?
         getByStatus,
     TResult? Function(String id)? getById,
-    TResult? Function(
+    TResult? Function(String status, DateTime dateFrom, DateTime dateTo)?
-            String status, DateTime dateFrom, DateTime dateTo, String? search)?
         loadMore,
     TResult? Function(String status)? refresh,
   }) =>
       throw _privateConstructorUsedError;
   @optionalTypeArgs
   TResult maybeWhen<TResult extends Object?>({
-    TResult Function(String status, DateTime dateFrom, DateTime dateTo,
+    TResult Function(
-            int? limit, String? search)?
+            String status, DateTime dateFrom, DateTime dateTo, int? limit)?
         getByStatus,
     TResult Function(String id)? getById,
-    TResult Function(
+    TResult Function(String status, DateTime dateFrom, DateTime dateTo)?
-            String status, DateTime dateFrom, DateTime dateTo, String? search)?
         loadMore,
     TResult Function(String status)? refresh,
     required TResult orElse(),
@@ -107,12 +104,7 @@ abstract class _$$GetByStatusImplCopyWith<$Res> {
           _$GetByStatusImpl value, $Res Function(_$GetByStatusImpl) then) =
       __$$GetByStatusImplCopyWithImpl<$Res>;
   @useResult
-  $Res call(
+  $Res call({String status, DateTime dateFrom, DateTime dateTo, int? limit});
-      {String status,
-      DateTime dateFrom,
-      DateTime dateTo,
-      int? limit,
-      String? search});
 }
 
 /// @nodoc
@@ -132,7 +124,6 @@ class __$$GetByStatusImplCopyWithImpl<$Res>
     Object? dateFrom = null,
     Object? dateTo = null,
     Object? limit = freezed,
-    Object? search = freezed,
   }) {
     return _then(_$GetByStatusImpl(
       null == status
@@ -151,10 +142,6 @@ class __$$GetByStatusImplCopyWithImpl<$Res>
           ? _value.limit
           : limit // ignore: cast_nullable_to_non_nullable
               as int?,
-      search: freezed == search
-          ? _value.search
-          : search // ignore: cast_nullable_to_non_nullable
-              as String?,
     ));
   }
 }
@@ -163,7 +150,7 @@ class __$$GetByStatusImplCopyWithImpl<$Res>
 
 class _$GetByStatusImpl implements _GetByStatus {
   const _$GetByStatusImpl(this.status,
-      {required this.dateFrom, required this.dateTo, this.limit, this.search});
+      {required this.dateFrom, required this.dateTo, this.limit});
 
   @override
   final String status;
@@ -173,12 +160,10 @@ class _$GetByStatusImpl implements _GetByStatus {
   final DateTime dateTo;
   @override
   final int? limit;
-  @override
-  final String? search;
 
   @override
   String toString() {
-    return 'OrderLoaderEvent.getByStatus(status: $status, dateFrom: $dateFrom, dateTo: $dateTo, limit: $limit, search: $search)';
+    return 'OrderLoaderEvent.getByStatus(status: $status, dateFrom: $dateFrom, dateTo: $dateTo, limit: $limit)';
   }
 
   @override
@@ -190,13 +175,11 @@ class _$GetByStatusImpl implements _GetByStatus {
             (identical(other.dateFrom, dateFrom) ||
                 other.dateFrom == dateFrom) &&
             (identical(other.dateTo, dateTo) || other.dateTo == dateTo) &&
-            (identical(other.limit, limit) || other.limit == limit) &&
+            (identical(other.limit, limit) || other.limit == limit));
-            (identical(other.search, search) || other.search == search));
   }
 
   @override
-  int get hashCode =>
+  int get hashCode => Object.hash(runtimeType, status, dateFrom, dateTo, limit);
-      Object.hash(runtimeType, status, dateFrom, dateTo, limit, search);
 
   /// Create a copy of OrderLoaderEvent
   /// with the given fields replaced by the non-null parameter values.
@@ -209,48 +192,45 @@ class _$GetByStatusImpl implements _GetByStatus {
   @override
   @optionalTypeArgs
   TResult when<TResult extends Object?>({
-    required TResult Function(String status, DateTime dateFrom, DateTime dateTo,
+    required TResult Function(
-            int? limit, String? search)
+            String status, DateTime dateFrom, DateTime dateTo, int? limit)
         getByStatus,
     required TResult Function(String id) getById,
-    required TResult Function(
+    required TResult Function(String status, DateTime dateFrom, DateTime dateTo)
-            String status, DateTime dateFrom, DateTime dateTo, String? search)
         loadMore,
     required TResult Function(String status) refresh,
   }) {
-    return getByStatus(status, dateFrom, dateTo, limit, search);
+    return getByStatus(status, dateFrom, dateTo, limit);
   }
 
   @override
   @optionalTypeArgs
   TResult? whenOrNull<TResult extends Object?>({
-    TResult? Function(String status, DateTime dateFrom, DateTime dateTo,
+    TResult? Function(
-            int? limit, String? search)?
+            String status, DateTime dateFrom, DateTime dateTo, int? limit)?
         getByStatus,
     TResult? Function(String id)? getById,
-    TResult? Function(
+    TResult? Function(String status, DateTime dateFrom, DateTime dateTo)?
-            String status, DateTime dateFrom, DateTime dateTo, String? search)?
         loadMore,
     TResult? Function(String status)? refresh,
   }) {
-    return getByStatus?.call(status, dateFrom, dateTo, limit, search);
+    return getByStatus?.call(status, dateFrom, dateTo, limit);
   }
 
   @override
   @optionalTypeArgs
   TResult maybeWhen<TResult extends Object?>({
-    TResult Function(String status, DateTime dateFrom, DateTime dateTo,
+    TResult Function(
-            int? limit, String? search)?
+            String status, DateTime dateFrom, DateTime dateTo, int? limit)?
         getByStatus,
     TResult Function(String id)? getById,
-    TResult Function(
+    TResult Function(String status, DateTime dateFrom, DateTime dateTo)?
-            String status, DateTime dateFrom, DateTime dateTo, String? search)?
         loadMore,
     TResult Function(String status)? refresh,
     required TResult orElse(),
   }) {
     if (getByStatus != null) {
-      return getByStatus(status, dateFrom, dateTo, limit, search);
+      return getByStatus(status, dateFrom, dateTo, limit);
     }
     return orElse();
   }
@@ -297,14 +277,12 @@ abstract class _GetByStatus implements OrderLoaderEvent {
   const factory _GetByStatus(final String status,
       {required final DateTime dateFrom,
       required final DateTime dateTo,
-      final int? limit,
+      final int? limit}) = _$GetByStatusImpl;
-      final String? search}) = _$GetByStatusImpl;
 
   String get status;
   DateTime get dateFrom;
   DateTime get dateTo;
   int? get limit;
-  String? get search;
 
   /// Create a copy of OrderLoaderEvent
   /// with the given fields replaced by the non-null parameter values.
@@ -381,12 +359,11 @@ class _$GetByIdImpl implements _GetById {
   @override
   @optionalTypeArgs
   TResult when<TResult extends Object?>({
-    required TResult Function(String status, DateTime dateFrom, DateTime dateTo,
+    required TResult Function(
-            int? limit, String? search)
+            String status, DateTime dateFrom, DateTime dateTo, int? limit)
         getByStatus,
     required TResult Function(String id) getById,
-    required TResult Function(
+    required TResult Function(String status, DateTime dateFrom, DateTime dateTo)
-            String status, DateTime dateFrom, DateTime dateTo, String? search)
         loadMore,
     required TResult Function(String status) refresh,
   }) {
@@ -396,12 +373,11 @@ class _$GetByIdImpl implements _GetById {
   @override
   @optionalTypeArgs
   TResult? whenOrNull<TResult extends Object?>({
-    TResult? Function(String status, DateTime dateFrom, DateTime dateTo,
+    TResult? Function(
-            int? limit, String? search)?
+            String status, DateTime dateFrom, DateTime dateTo, int? limit)?
         getByStatus,
     TResult? Function(String id)? getById,
-    TResult? Function(
+    TResult? Function(String status, DateTime dateFrom, DateTime dateTo)?
-            String status, DateTime dateFrom, DateTime dateTo, String? search)?
         loadMore,
     TResult? Function(String status)? refresh,
   }) {
@@ -411,12 +387,11 @@ class _$GetByIdImpl implements _GetById {
   @override
   @optionalTypeArgs
   TResult maybeWhen<TResult extends Object?>({
-    TResult Function(String status, DateTime dateFrom, DateTime dateTo,
+    TResult Function(
-            int? limit, String? search)?
+            String status, DateTime dateFrom, DateTime dateTo, int? limit)?
         getByStatus,
     TResult Function(String id)? getById,
-    TResult Function(
+    TResult Function(String status, DateTime dateFrom, DateTime dateTo)?
-            String status, DateTime dateFrom, DateTime dateTo, String? search)?
         loadMore,
     TResult Function(String status)? refresh,
     required TResult orElse(),
@@ -483,8 +458,7 @@ abstract class _$$LoadMoreImplCopyWith<$Res> {
           _$LoadMoreImpl value, $Res Function(_$LoadMoreImpl) then) =
       __$$LoadMoreImplCopyWithImpl<$Res>;
   @useResult
-  $Res call(
+  $Res call({String status, DateTime dateFrom, DateTime dateTo});
-      {String status, DateTime dateFrom, DateTime dateTo, String? search});
 }
 
 /// @nodoc
@@ -503,7 +477,6 @@ class __$$LoadMoreImplCopyWithImpl<$Res>
     Object? status = null,
     Object? dateFrom = null,
     Object? dateTo = null,
-    Object? search = freezed,
   }) {
     return _then(_$LoadMoreImpl(
       null == status
@@ -518,10 +491,6 @@ class __$$LoadMoreImplCopyWithImpl<$Res>
           ? _value.dateTo
           : dateTo // ignore: cast_nullable_to_non_nullable
               as DateTime,
-      search: freezed == search
-          ? _value.search
-          : search // ignore: cast_nullable_to_non_nullable
-              as String?,
     ));
   }
 }
@@ -530,7 +499,7 @@ class __$$LoadMoreImplCopyWithImpl<$Res>
 
 class _$LoadMoreImpl implements _LoadMore {
   const _$LoadMoreImpl(this.status,
-      {required this.dateFrom, required this.dateTo, this.search});
+      {required this.dateFrom, required this.dateTo});
 
   @override
   final String status;
@@ -538,12 +507,10 @@ class _$LoadMoreImpl implements _LoadMore {
   final DateTime dateFrom;
   @override
   final DateTime dateTo;
-  @override
-  final String? search;
 
   @override
   String toString() {
-    return 'OrderLoaderEvent.loadMore(status: $status, dateFrom: $dateFrom, dateTo: $dateTo, search: $search)';
+    return 'OrderLoaderEvent.loadMore(status: $status, dateFrom: $dateFrom, dateTo: $dateTo)';
   }
 
   @override
@@ -554,13 +521,11 @@ class _$LoadMoreImpl implements _LoadMore {
             (identical(other.status, status) || other.status == status) &&
             (identical(other.dateFrom, dateFrom) ||
                 other.dateFrom == dateFrom) &&
-            (identical(other.dateTo, dateTo) || other.dateTo == dateTo) &&
+            (identical(other.dateTo, dateTo) || other.dateTo == dateTo));
-            (identical(other.search, search) || other.search == search));
   }
 
   @override
-  int get hashCode =>
+  int get hashCode => Object.hash(runtimeType, status, dateFrom, dateTo);
-      Object.hash(runtimeType, status, dateFrom, dateTo, search);
 
   /// Create a copy of OrderLoaderEvent
   /// with the given fields replaced by the non-null parameter values.
@@ -573,48 +538,45 @@ class _$LoadMoreImpl implements _LoadMore {
   @override
   @optionalTypeArgs
   TResult when<TResult extends Object?>({
-    required TResult Function(String status, DateTime dateFrom, DateTime dateTo,
+    required TResult Function(
-            int? limit, String? search)
+            String status, DateTime dateFrom, DateTime dateTo, int? limit)
         getByStatus,
     required TResult Function(String id) getById,
-    required TResult Function(
+    required TResult Function(String status, DateTime dateFrom, DateTime dateTo)
-            String status, DateTime dateFrom, DateTime dateTo, String? search)
         loadMore,
     required TResult Function(String status) refresh,
   }) {
-    return loadMore(status, dateFrom, dateTo, search);
+    return loadMore(status, dateFrom, dateTo);
   }
 
   @override
   @optionalTypeArgs
   TResult? whenOrNull<TResult extends Object?>({
-    TResult? Function(String status, DateTime dateFrom, DateTime dateTo,
+    TResult? Function(
-            int? limit, String? search)?
+            String status, DateTime dateFrom, DateTime dateTo, int? limit)?
         getByStatus,
     TResult? Function(String id)? getById,
-    TResult? Function(
+    TResult? Function(String status, DateTime dateFrom, DateTime dateTo)?
-            String status, DateTime dateFrom, DateTime dateTo, String? search)?
         loadMore,
     TResult? Function(String status)? refresh,
   }) {
-    return loadMore?.call(status, dateFrom, dateTo, search);
+    return loadMore?.call(status, dateFrom, dateTo);
   }
 
   @override
   @optionalTypeArgs
   TResult maybeWhen<TResult extends Object?>({
-    TResult Function(String status, DateTime dateFrom, DateTime dateTo,
+    TResult Function(
-            int? limit, String? search)?
+            String status, DateTime dateFrom, DateTime dateTo, int? limit)?
         getByStatus,
     TResult Function(String id)? getById,
-    TResult Function(
+    TResult Function(String status, DateTime dateFrom, DateTime dateTo)?
-            String status, DateTime dateFrom, DateTime dateTo, String? search)?
         loadMore,
     TResult Function(String status)? refresh,
     required TResult orElse(),
   }) {
     if (loadMore != null) {
-      return loadMore(status, dateFrom, dateTo, search);
+      return loadMore(status, dateFrom, dateTo);
     }
     return orElse();
   }
@@ -660,13 +622,11 @@ class _$LoadMoreImpl implements _LoadMore {
 abstract class _LoadMore implements OrderLoaderEvent {
   const factory _LoadMore(final String status,
       {required final DateTime dateFrom,
-      required final DateTime dateTo,
+      required final DateTime dateTo}) = _$LoadMoreImpl;
-      final String? search}) = _$LoadMoreImpl;
 
   String get status;
   DateTime get dateFrom;
   DateTime get dateTo;
-  String? get search;
 
   /// Create a copy of OrderLoaderEvent
   /// with the given fields replaced by the non-null parameter values.
@@ -743,12 +703,11 @@ class _$RefreshImpl implements _Refresh {
   @override
   @optionalTypeArgs
   TResult when<TResult extends Object?>({
-    required TResult Function(String status, DateTime dateFrom, DateTime dateTo,
+    required TResult Function(
-            int? limit, String? search)
+            String status, DateTime dateFrom, DateTime dateTo, int? limit)
         getByStatus,
     required TResult Function(String id) getById,
-    required TResult Function(
+    required TResult Function(String status, DateTime dateFrom, DateTime dateTo)
-            String status, DateTime dateFrom, DateTime dateTo, String? search)
         loadMore,
     required TResult Function(String status) refresh,
   }) {
@@ -758,12 +717,11 @@ class _$RefreshImpl implements _Refresh {
   @override
   @optionalTypeArgs
   TResult? whenOrNull<TResult extends Object?>({
-    TResult? Function(String status, DateTime dateFrom, DateTime dateTo,
+    TResult? Function(
-            int? limit, String? search)?
+            String status, DateTime dateFrom, DateTime dateTo, int? limit)?
         getByStatus,
     TResult? Function(String id)? getById,
-    TResult? Function(
+    TResult? Function(String status, DateTime dateFrom, DateTime dateTo)?
-            String status, DateTime dateFrom, DateTime dateTo, String? search)?
         loadMore,
     TResult? Function(String status)? refresh,
   }) {
@@ -773,12 +731,11 @@ class _$RefreshImpl implements _Refresh {
   @override
   @optionalTypeArgs
   TResult maybeWhen<TResult extends Object?>({
-    TResult Function(String status, DateTime dateFrom, DateTime dateTo,
+    TResult Function(
-            int? limit, String? search)?
+            String status, DateTime dateFrom, DateTime dateTo, int? limit)?
         getByStatus,
     TResult Function(String id)? getById,
-    TResult Function(
+    TResult Function(String status, DateTime dateFrom, DateTime dateTo)?
-            String status, DateTime dateFrom, DateTime dateTo, String? search)?
         loadMore,
     TResult Function(String status)? refresh,
     required TResult orElse(),

lib/presentation/sales/blocs/order_loader/order_loader_event.dart

@@ -2,19 +2,15 @@ part of 'order_loader_bloc.dart';
 
 @freezed
 class OrderLoaderEvent with _$OrderLoaderEvent {
-  const factory OrderLoaderEvent.getByStatus(
+  const factory OrderLoaderEvent.getByStatus(String status,
-    String status, {
+      {required DateTime dateFrom,
-    required DateTime dateFrom,
+      required DateTime dateTo,
-    required DateTime dateTo,
+      int? limit}) = _GetByStatus;
-    int? limit,
-    String? search,
-  }) = _GetByStatus;
   const factory OrderLoaderEvent.getById(String id) = _GetById;
   const factory OrderLoaderEvent.loadMore(
     String status, {
     required DateTime dateFrom,
     required DateTime dateTo,
-    String? search,
   }) = _LoadMore;
   const factory OrderLoaderEvent.refresh(String status) = _Refresh;
 }

lib/presentation/sales/pages/sales_page.dart

@@ -45,6 +45,18 @@ class _SalesPageState extends State<SalesPage> {
     super.initState();
   }
 
+  List<Order> _filterOrders(List<Order> orders) {
+    if (searchQuery.isEmpty) {
+      return orders;
+    }
+
+    return orders.where((order) {
+      final customerName = order.orderNumber?.toLowerCase() ?? "";
+      final queryLower = searchQuery.toLowerCase();
+      return customerName.contains(queryLower);
+    }).toList();
+  }
+
   @override
   Widget build(BuildContext context) {
     return SafeArea(
@@ -59,13 +71,8 @@ class _SalesPageState extends State<SalesPage> {
                   if (notification is ScrollEndNotification &&
                       scrollController.position.extentAfter == 0) {
                     context.read<OrderLoaderBloc>().add(
-                          OrderLoaderEvent.loadMore(
+                        OrderLoaderEvent.loadMore(widget.status,
-                            widget.status,
+                            dateFrom: startDate, dateTo: endDate));
-                            dateFrom: startDate,
-                            dateTo: endDate,
-                            search: searchQuery,
-                          ),
-                        );
                     return true;
                   }
 
@@ -85,16 +92,6 @@ class _SalesPageState extends State<SalesPage> {
                           setState(() {
                             searchQuery = value;
                           });
-                          Future.delayed(const Duration(milliseconds: 800), () {
-                            context.read<OrderLoaderBloc>().add(
-                                  OrderLoaderEvent.getByStatus(
-                                    widget.status,
-                                    dateFrom: startDate,
-                                    dateTo: endDate,
-                                    search: searchQuery,
-                                  ),
-                                );
-                          });
                         },
                         onDateRangeChanged: (start, end) {
                           setState(() {
@@ -128,7 +125,8 @@ class _SalesPageState extends State<SalesPage> {
                               ),
                               loaded: (orders, totalOrder, hasReachedMax,
                                   currentPage, isLoadingMore) {
-                                if (orders.isEmpty) {
+                                final filtered = _filterOrders(orders);
+                                if (filtered.isEmpty) {
                                   return Center(
                                     child: Text(
                                       "Belum ada transaksi saat ini. ",
@@ -140,17 +138,17 @@ class _SalesPageState extends State<SalesPage> {
                                   );
                                 } else {
                                   return ListView.builder(
-                                    itemCount: orders.length,
+                                    itemCount: filtered.length,
                                     controller: scrollController,
                                     itemBuilder: (context, index) {
                                       return GestureDetector(
                                         onTap: () {
                                           setState(() {
-                                            orderDetail = orders[index];
+                                            orderDetail = filtered[index];
                                           });
                                           context.read<OrderFormBloc>().add(
                                               OrderFormEvent.started(
-                                                  orders[index]));
+                                                  filtered[index]));
                                         },
                                         child: SalesCard(
                                           order: orders[index],