update info

lib/features/cart/presentation/pages/cart_page.dart

@@ -43,12 +43,9 @@ class _CartPageState extends ConsumerState<CartPage> {
     });
   }
 
-  @override
-  void dispose() {
-    // Force sync any pending quantity updates before leaving cart page
-    ref.read(cartProvider.notifier).forceSyncPendingUpdates();
-    super.dispose();
-  }
+  // Note: Sync is handled in PopScope.onPopInvokedWithResult for back navigation
+  // and in checkout button handler for checkout flow.
+  // No dispose() method needed - using ref.read() in dispose() is unsafe.
 
   @override
   Widget build(BuildContext context) {
@@ -63,13 +60,21 @@ class _CartPageState extends ConsumerState<CartPage> {
     final itemCount = cartState.itemCount;
     final hasSelection = cartState.selectedCount > 0;
 
-    return Scaffold(
-      backgroundColor: const Color(0xFFF4F6F8),
-      appBar: AppBar(
-        leading: IconButton(
-          icon: const FaIcon(FontAwesomeIcons.arrowLeft, color: Colors.black, size: 20),
-          onPressed: () => context.pop(),
-        ),
+    return PopScope(
+      // Intercept back navigation to sync pending updates
+      onPopInvokedWithResult: (didPop, result) async {
+        if (didPop) {
+          // Sync any pending quantity updates before leaving the page
+          await ref.read(cartProvider.notifier).forceSyncPendingUpdates();
+        }
+      },
+      child: Scaffold(
+        backgroundColor: const Color(0xFFF4F6F8),
+        appBar: AppBar(
+          leading: IconButton(
+            icon: const FaIcon(FontAwesomeIcons.arrowLeft, color: Colors.black, size: 20),
+            onPressed: () => context.pop(),
+          ),
         title: Text(
           'Giỏ hàng ($itemCount)',
           style: const TextStyle(color: Colors.black),
@@ -144,6 +149,7 @@ class _CartPageState extends ConsumerState<CartPage> {
                         ),
                       ],
                     ),
+      ),
     );
   }
 

lib/features/cart/presentation/providers/cart_data_providers.dart

@@ -0,0 +1,50 @@
+/// Cart Data Providers
+///
+/// State management for cart data layer using Riverpod.
+/// Provides access to datasources and repositories.
+library;
+
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:worker/core/database/hive_service.dart';
+import 'package:worker/core/network/dio_client.dart';
+import 'package:worker/features/cart/data/datasources/cart_local_datasource.dart';
+import 'package:worker/features/cart/data/datasources/cart_remote_datasource.dart';
+import 'package:worker/features/cart/data/repositories/cart_repository_impl.dart';
+import 'package:worker/features/cart/domain/repositories/cart_repository.dart';
+
+part 'cart_data_providers.g.dart';
+
+/// Cart Local DataSource Provider
+///
+/// Provides instance of CartLocalDataSource.
+/// keepAlive: true to persist with cart provider.
+@Riverpod(keepAlive: true)
+CartLocalDataSource cartLocalDataSource(Ref ref) {
+  final hiveService = HiveService();
+  return CartLocalDataSourceImpl(hiveService);
+}
+
+/// Cart Remote DataSource Provider
+///
+/// Provides instance of CartRemoteDataSource with DioClient.
+/// keepAlive: true to persist with cart provider.
+@Riverpod(keepAlive: true)
+Future<CartRemoteDataSource> cartRemoteDataSource(Ref ref) async {
+  final dioClient = await ref.watch(dioClientProvider.future);
+  return CartRemoteDataSourceImpl(dioClient);
+}
+
+/// Cart Repository Provider
+///
+/// Provides instance of CartRepository implementation.
+/// keepAlive: true to persist with cart provider.
+@Riverpod(keepAlive: true)
+Future<CartRepository> cartRepository(Ref ref) async {
+  final remoteDataSource = await ref.watch(cartRemoteDataSourceProvider.future);
+  final localDataSource = ref.watch(cartLocalDataSourceProvider);
+
+  return CartRepositoryImpl(
+    remoteDataSource: remoteDataSource,
+    localDataSource: localDataSource,
+  );
+}

lib/features/cart/presentation/providers/cart_data_providers.g.dart

@@ -0,0 +1,180 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'cart_data_providers.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// ignore_for_file: type=lint, type=warning
+/// Cart Local DataSource Provider
+///
+/// Provides instance of CartLocalDataSource.
+/// keepAlive: true to persist with cart provider.
+
+@ProviderFor(cartLocalDataSource)
+const cartLocalDataSourceProvider = CartLocalDataSourceProvider._();
+
+/// Cart Local DataSource Provider
+///
+/// Provides instance of CartLocalDataSource.
+/// keepAlive: true to persist with cart provider.
+
+final class CartLocalDataSourceProvider
+    extends
+        $FunctionalProvider<
+          CartLocalDataSource,
+          CartLocalDataSource,
+          CartLocalDataSource
+        >
+    with $Provider<CartLocalDataSource> {
+  /// Cart Local DataSource Provider
+  ///
+  /// Provides instance of CartLocalDataSource.
+  /// keepAlive: true to persist with cart provider.
+  const CartLocalDataSourceProvider._()
+    : super(
+        from: null,
+        argument: null,
+        retry: null,
+        name: r'cartLocalDataSourceProvider',
+        isAutoDispose: false,
+        dependencies: null,
+        $allTransitiveDependencies: null,
+      );
+
+  @override
+  String debugGetCreateSourceHash() => _$cartLocalDataSourceHash();
+
+  @$internal
+  @override
+  $ProviderElement<CartLocalDataSource> $createElement(
+    $ProviderPointer pointer,
+  ) => $ProviderElement(pointer);
+
+  @override
+  CartLocalDataSource create(Ref ref) {
+    return cartLocalDataSource(ref);
+  }
+
+  /// {@macro riverpod.override_with_value}
+  Override overrideWithValue(CartLocalDataSource value) {
+    return $ProviderOverride(
+      origin: this,
+      providerOverride: $SyncValueProvider<CartLocalDataSource>(value),
+    );
+  }
+}
+
+String _$cartLocalDataSourceHash() =>
+    r'81a8c1688dff786d4ecebbd8239ae1c8174008c0';
+
+/// Cart Remote DataSource Provider
+///
+/// Provides instance of CartRemoteDataSource with DioClient.
+/// keepAlive: true to persist with cart provider.
+
+@ProviderFor(cartRemoteDataSource)
+const cartRemoteDataSourceProvider = CartRemoteDataSourceProvider._();
+
+/// Cart Remote DataSource Provider
+///
+/// Provides instance of CartRemoteDataSource with DioClient.
+/// keepAlive: true to persist with cart provider.
+
+final class CartRemoteDataSourceProvider
+    extends
+        $FunctionalProvider<
+          AsyncValue<CartRemoteDataSource>,
+          CartRemoteDataSource,
+          FutureOr<CartRemoteDataSource>
+        >
+    with
+        $FutureModifier<CartRemoteDataSource>,
+        $FutureProvider<CartRemoteDataSource> {
+  /// Cart Remote DataSource Provider
+  ///
+  /// Provides instance of CartRemoteDataSource with DioClient.
+  /// keepAlive: true to persist with cart provider.
+  const CartRemoteDataSourceProvider._()
+    : super(
+        from: null,
+        argument: null,
+        retry: null,
+        name: r'cartRemoteDataSourceProvider',
+        isAutoDispose: false,
+        dependencies: null,
+        $allTransitiveDependencies: null,
+      );
+
+  @override
+  String debugGetCreateSourceHash() => _$cartRemoteDataSourceHash();
+
+  @$internal
+  @override
+  $FutureProviderElement<CartRemoteDataSource> $createElement(
+    $ProviderPointer pointer,
+  ) => $FutureProviderElement(pointer);
+
+  @override
+  FutureOr<CartRemoteDataSource> create(Ref ref) {
+    return cartRemoteDataSource(ref);
+  }
+}
+
+String _$cartRemoteDataSourceHash() =>
+    r'758905224c472f1e088c3be7c7451c2321959bd8';
+
+/// Cart Repository Provider
+///
+/// Provides instance of CartRepository implementation.
+/// keepAlive: true to persist with cart provider.
+
+@ProviderFor(cartRepository)
+const cartRepositoryProvider = CartRepositoryProvider._();
+
+/// Cart Repository Provider
+///
+/// Provides instance of CartRepository implementation.
+/// keepAlive: true to persist with cart provider.
+
+final class CartRepositoryProvider
+    extends
+        $FunctionalProvider<
+          AsyncValue<CartRepository>,
+          CartRepository,
+          FutureOr<CartRepository>
+        >
+    with $FutureModifier<CartRepository>, $FutureProvider<CartRepository> {
+  /// Cart Repository Provider
+  ///
+  /// Provides instance of CartRepository implementation.
+  /// keepAlive: true to persist with cart provider.
+  const CartRepositoryProvider._()
+    : super(
+        from: null,
+        argument: null,
+        retry: null,
+        name: r'cartRepositoryProvider',
+        isAutoDispose: false,
+        dependencies: null,
+        $allTransitiveDependencies: null,
+      );
+
+  @override
+  String debugGetCreateSourceHash() => _$cartRepositoryHash();
+
+  @$internal
+  @override
+  $FutureProviderElement<CartRepository> $createElement(
+    $ProviderPointer pointer,
+  ) => $FutureProviderElement(pointer);
+
+  @override
+  FutureOr<CartRepository> create(Ref ref) {
+    return cartRepository(ref);
+  }
+}
+
+String _$cartRepositoryHash() => r'f6bbe5ab247737887e6b51f7ca8050bb6898ac2a';

lib/features/cart/presentation/providers/cart_provider.dart

@@ -6,7 +6,7 @@ library;
 import 'dart:async';
 
 import 'package:riverpod_annotation/riverpod_annotation.dart';
-import 'package:worker/features/cart/data/providers/cart_data_providers.dart';
+import 'package:worker/features/cart/presentation/providers/cart_data_providers.dart';
 import 'package:worker/features/cart/presentation/providers/cart_state.dart';
 import 'package:worker/features/products/domain/entities/product.dart';
 import 'package:worker/features/products/presentation/providers/products_provider.dart';

lib/features/cart/presentation/widgets/cart_item_widget.dart

@@ -22,9 +22,9 @@ import 'package:worker/features/cart/presentation/providers/cart_state.dart';
 /// - Quantity controls (-, text field for input, +, unit label)
 /// - Converted quantity display: "(Quy đổi: X.XX m² = Y viên)"
 class CartItemWidget extends ConsumerStatefulWidget {
-  final CartItemData item;
 
   const CartItemWidget({super.key, required this.item});
+  final CartItemData item;
 
   @override
   ConsumerState<CartItemWidget> createState() => _CartItemWidgetState();
@@ -298,10 +298,10 @@ class _CartItemWidgetState extends ConsumerState<CartItemWidget> {
 ///
 /// Matches HTML design with 20px size, 6px radius, blue when checked.
 class _CustomCheckbox extends StatelessWidget {
-  final bool value;
-  final ValueChanged<bool?>? onChanged;
 
   const _CustomCheckbox({required this.value, this.onChanged});
+  final bool value;
+  final ValueChanged<bool?>? onChanged;
 
   @override
   Widget build(BuildContext context) {
@@ -334,10 +334,10 @@ class _CustomCheckbox extends StatelessWidget {
 ///
 /// Small button for incrementing/decrementing quantity.
 class _QuantityButton extends StatelessWidget {
-  final IconData icon;
-  final VoidCallback onPressed;
 
   const _QuantityButton({required this.icon, required this.onPressed});
+  final IconData icon;
+  final VoidCallback onPressed;
 
   @override
   Widget build(BuildContext context) {