From ac991431c88092a0a857987c6d927ac4ee517873 Mon Sep 17 00:00:00 2001 From: efrilm Date: Fri, 21 Aug 2026 23:24:46 +0700 Subject: [PATCH] feat: add order --- lib/application/order/order_loader/order_loader_state.dart | 2 +- lib/presentation/pages/main/main_page.dart | 1 + lib/presentation/pages/main/widgets/bottom_navbar.dart | 5 +++++ lib/presentation/pages/order/order_list/order_page.dart | 2 +- lib/presentation/router/app_router.dart | 1 + 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/application/order/order_loader/order_loader_state.dart b/lib/application/order/order_loader/order_loader_state.dart index fdce154..894f60b 100644 --- a/lib/application/order/order_loader/order_loader_state.dart +++ b/lib/application/order/order_loader/order_loader_state.dart @@ -20,6 +20,6 @@ class OrderLoaderState with _$OrderLoaderState { failureOptionOrder: none(), dateFrom: DateTime.now(), dateTo: DateTime.now(), - status: 'all', + status: 'pending', ); } diff --git a/lib/presentation/pages/main/main_page.dart b/lib/presentation/pages/main/main_page.dart index b26c209..eba7507 100644 --- a/lib/presentation/pages/main/main_page.dart +++ b/lib/presentation/pages/main/main_page.dart @@ -13,6 +13,7 @@ class MainPage extends StatelessWidget { return AutoTabsRouter.pageView( routes: [ HomeRoute(), + OrderRoute(), ExclusiveSummaryRoute(), InventoryRoute(), ProfileRoute(), diff --git a/lib/presentation/pages/main/widgets/bottom_navbar.dart b/lib/presentation/pages/main/widgets/bottom_navbar.dart index a3a6a9e..2423003 100644 --- a/lib/presentation/pages/main/widgets/bottom_navbar.dart +++ b/lib/presentation/pages/main/widgets/bottom_navbar.dart @@ -30,6 +30,11 @@ class _MainBottomNavbarState extends State { label: context.lang.home, tooltip: context.lang.home, ), + BottomNavigationBarItem( + icon: HugeIcon(icon: HugeIcons.strokeRoundedBorderFull), + label: context.lang.order, + tooltip: context.lang.order, + ), BottomNavigationBarItem( icon: HugeIcon(icon: HugeIcons.strokeRoundedChart03), label: context.lang.report, diff --git a/lib/presentation/pages/order/order_list/order_page.dart b/lib/presentation/pages/order/order_list/order_page.dart index 66bce4e..85bbe97 100644 --- a/lib/presentation/pages/order/order_list/order_page.dart +++ b/lib/presentation/pages/order/order_list/order_page.dart @@ -49,7 +49,7 @@ class _OrderPageState extends State with TickerProviderStateMixin { final ScrollController _scrollController = ScrollController(); // Filter state - final List filterOptions = ['All', 'Completed', 'Pending']; + final List filterOptions = ['All', 'Pending', 'Completed']; @override void initState() { diff --git a/lib/presentation/router/app_router.dart b/lib/presentation/router/app_router.dart index c90dc7e..771c493 100644 --- a/lib/presentation/router/app_router.dart +++ b/lib/presentation/router/app_router.dart @@ -16,6 +16,7 @@ class AppRouter extends RootStackRouter { page: MainRoute.page, children: [ AutoRoute(page: HomeRoute.page), + AutoRoute(page: OrderRoute.page), AutoRoute(page: InventoryRoute.page), AutoRoute(page: ExclusiveSummaryRoute.page), AutoRoute(page: ProfileRoute.page),