From 82ce30961bb518d70ca0c05594abc084340becf2 Mon Sep 17 00:00:00 2001 From: Phuoc Nguyen Date: Fri, 24 Oct 2025 16:38:41 +0700 Subject: [PATCH] fix cart --- lib/features/home/presentation/pages/home_page.dart | 8 ++++++-- .../products/presentation/pages/products_page.dart | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/features/home/presentation/pages/home_page.dart b/lib/features/home/presentation/pages/home_page.dart index ead7062..3e15497 100644 --- a/lib/features/home/presentation/pages/home_page.dart +++ b/lib/features/home/presentation/pages/home_page.dart @@ -9,6 +9,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; import 'package:worker/core/router/app_router.dart'; import 'package:worker/core/theme/colors.dart'; +import 'package:worker/features/cart/presentation/providers/cart_provider.dart'; import 'package:worker/features/home/presentation/providers/member_card_provider.dart'; import 'package:worker/features/home/presentation/providers/promotions_provider.dart'; import 'package:worker/features/home/presentation/widgets/member_card_widget.dart'; @@ -38,6 +39,9 @@ class HomePage extends ConsumerWidget { // Watch promotions state final promotionsAsync = ref.watch(promotionsProvider); + // Watch cart item count + final cartItemCount = ref.watch(cartItemCountProvider); + return Scaffold( backgroundColor: const Color(0xFFF4F6F8), // --background-gray from CSS body: CustomScrollView( @@ -136,8 +140,8 @@ class HomePage extends ConsumerWidget { QuickAction( icon: Icons.shopping_cart, label: 'Giỏ hàng', - badge: '3', - onTap: () => context.push('/cart'), + badge: cartItemCount > 0 ? '$cartItemCount' : null, + onTap: () => context.push(RouteNames.cart), ), QuickAction( icon: Icons.favorite, diff --git a/lib/features/products/presentation/pages/products_page.dart b/lib/features/products/presentation/pages/products_page.dart index c8b98c9..c041e58 100644 --- a/lib/features/products/presentation/pages/products_page.dart +++ b/lib/features/products/presentation/pages/products_page.dart @@ -57,7 +57,7 @@ class ProductsPage extends ConsumerWidget { isLabelVisible: cartItemCount > 0, child: const Icon(Icons.shopping_cart_outlined, color: Colors.black), ), - onPressed: () => context.go(RouteNames.cart), + onPressed: () => context.push(RouteNames.cart), ), const SizedBox(width: AppSpacing.sm), ],