update

Author: 7wilightxdev

assets/locale/en.json

@@ -137,8 +137,9 @@
   "payment_on_receipt_of_goods": "Payment on receipt of goods",
   "online": "Online",
   "total": "Total",
-  "total_price": "Total price",
-  "total_delivery_fee": "Total delivery fee",
+  "price_of_goods": "Price of goods",
+  "delivery_fee": "Delivery fee",
+  "coupon": "Coupon",
   "products": "products",
   "your_feedback": "Your feeback",
   "support": "Support",
@@ -150,5 +151,9 @@
   "message_for_you": "Message for you",
   "recent_search": "Recent search",
   "hot_keywords": "Hot keywords",
-  "search_by_product_name": "Search by product name"
+  "search_by_product_name": "Search by product name",
+  "ship_to": "Ship to",
+  "payment_success": "Payment Success",
+  "detail_order": "Detail order",
+  "my_orders": "My orders"
 }

assets/locale/vi.json

@@ -112,18 +112,23 @@
   "payment_on_receipt_of_goods": "Thanh toán khi nhận hàng",
   "online": "Trực tuyến",
   "total": "Tổng ",
-  "total_price": "Tổng giá sản phẩm",
-  "total_delivery_fee": "Tổng chi phí vận chuyển",
+  "price_of_goods": "Tổng giá sản phẩm",
+  "delivery_fee": "Phí vận chuyển",
+  "coupon": "Phiếu mua hàng",
   "products": "sản phẩm",
   "your_feedback": "Phản hồi của bạn",
   "support": "Support",
   "created": "Được tạo",
-  "check_out": "Thủ tục thanh toán",
+  "check_out": "Thanh toán",
   "continue": "Tiếp tục",
   "don't_match_password": "Mật khẩu không khớp",
   "login_slogan": "Đăng nhập bằng email và mật khẩu",
   "message_for_you": "Tin nhắn cho bạn",
   "recent_search": "Tìm kiếm gần đây",
   "hot_keywords": "Từ khóa đang hot",
-  "search_by_product_name": "Tìm kiếm theo tên sản phẩm"
+  "search_by_product_name": "Tìm kiếm theo tên sản phẩm",
+  "ship_to": "Chuyển tới",
+  "payment_success": "Thanh toán thành công",
+  "detail_order": "Chi tiết đơn hàng",
+  "my_orders": "Đơn hàng của tôi"
 }

lib/app_view.dart

@@ -1,5 +1,4 @@
 import 'package:e_commerce_app/configs/application.dart';
-import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -34,6 +33,16 @@ class _AppViewState extends State<AppView> {
     super.dispose();
   }
 
+  void _onNavigate(String route) {
+    _navigator!.pushNamedAndRemoveUntil(route, (route) => false);
+  }
+
+  void _loadData() {
+    // Only load data when authenticated
+    BlocProvider.of<ProfileBloc>(context).add(LoadProfile());
+    BlocProvider.of<CartBloc>(context).add(LoadCart());
+  }
+
   @override
   Widget build(BuildContext context) {
     return BlocBuilder<LanguageBloc, LanguageState>(
@@ -61,8 +70,7 @@ class _AppViewState extends State<AppView> {
                 } else if (state is Unauthenticated) {
                   _onNavigate(AppRouter.LOGIN);
                 } else if (state is Authenticated) {
-                  _loadUserProfile(state.loggedFirebaseUser);
-                  _loadCart(state.loggedFirebaseUser);
+                  _loadData();
                   _onNavigate(AppRouter.LOGIN_SUCCESS);
                 } else {
                   _onNavigate(AppRouter.SPLASH);
@@ -75,16 +83,4 @@ class _AppViewState extends State<AppView> {
       },
     );
   }
-
-  void _onNavigate(String route) {
-    _navigator!.pushNamedAndRemoveUntil(route, (route) => false);
-  }
-
-  void _loadUserProfile(User loggedFirebaseUser) {
-    BlocProvider.of<ProfileBloc>(context).add(LoadProfile(loggedFirebaseUser));
-  }
-
-  void _loadCart(User loggedFirebaseUser) {
-    BlocProvider.of<CartBloc>(context).add(LoadCart(loggedFirebaseUser));
-  }
 }

lib/business_logic/common_blocs/cart/cart_bloc.dart

@@ -2,12 +2,16 @@ import 'dart:async';
 
 import 'package:e_commerce_app/business_logic/common_blocs/cart/bloc.dart';
 import 'package:e_commerce_app/business_logic/repository/app_repository.dart';
+import 'package:e_commerce_app/business_logic/repository/auth_repository/auth_repo.dart';
 import 'package:e_commerce_app/business_logic/repository/cart_repository/cart_repo.dart';
+import 'package:e_commerce_app/business_logic/repository/product_repository/product_repo.dart';
 import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
 class CartBloc extends Bloc<CartEvent, CartState> {
+  final AuthRepository _authRepository = AppRepository.authRepository;
   final CartRepository _cartRepository = AppRepository.cartRepository;
+  final ProductRepository _productRepository = AppRepository.productRepository;
   late User _loggedFirebaseUser;
   StreamSubscription? _cartStreamSub;
 
@@ -32,12 +36,11 @@ class CartBloc extends Bloc<CartEvent, CartState> {
 
   Stream<CartState> _mapLoadCartToState(LoadCart event) async* {
     try {
-      _loggedFirebaseUser = event.loggedFirebaseUser;
       _cartStreamSub?.cancel();
-      _cartStreamSub =
-          _cartRepository.cartStream(_loggedFirebaseUser.uid).listen(
-                (cart) => add(CartUpdated(cart)),
-              );
+      _loggedFirebaseUser = _authRepository.loggedFirebaseUser;
+      _cartStreamSub = _cartRepository
+          .cartStream(_loggedFirebaseUser.uid)
+          .listen((cart) => add(CartUpdated(cart)));
     } catch (e) {
       yield CartLoadFailure(e.toString());
     }
@@ -83,9 +86,26 @@ class CartBloc extends Bloc<CartEvent, CartState> {
   }
 
   Stream<CartState> _mapCartUpdatedToState(CartUpdated event) async* {
-    var totalCartPrice = 0;
-    event.cart.forEach((c) => totalCartPrice += c.price);
-    yield CartLoaded(event.cart, totalCartPrice);
+    yield CartLoading();
+
+    var updatedCart = event.updatedCart;
+    var priceOfGoods = 0;
+    for (var i = 0; i < updatedCart.length; i++) {
+      priceOfGoods += updatedCart[i].price;
+      // Get product by id that is provided from cart item
+      try {
+        var productInfo =
+            await _productRepository.getProductById(updatedCart[i].productId);
+        updatedCart[i] = updatedCart[i].cloneWith(productInfo: productInfo);
+      } catch (e) {
+        yield CartLoadFailure(e.toString());
+      }
+    }
+
+    yield CartLoaded(
+      cart: updatedCart,
+      priceOfGoods: priceOfGoods,
+    );
   }
 
   @override

lib/business_logic/common_blocs/cart/cart_event.dart

@@ -1,6 +1,5 @@
 import 'package:e_commerce_app/business_logic/entities/cart_item.dart';
 import 'package:equatable/equatable.dart';
-import 'package:firebase_auth/firebase_auth.dart';
 
 abstract class CartEvent extends Equatable {
   const CartEvent();
@@ -10,25 +9,19 @@ abstract class CartEvent extends Equatable {
 }
 
 /// When open cart screen -> load cart event
-class LoadCart extends CartEvent {
-  final User loggedFirebaseUser;
-
-  LoadCart(this.loggedFirebaseUser);
-
-  List<Object> get props => [loggedFirebaseUser];
-}
+class LoadCart extends CartEvent {}
 
 /// When user clicks to a clear cart => clear cart event
 class ClearCart extends CartEvent {}
 
 /// Cart was cleared
 class CartUpdated extends CartEvent {
-  final List<CartItem> cart;
+  final List<CartItem> updatedCart;
 
-  CartUpdated(this.cart);
+  CartUpdated(this.updatedCart);
 
   @override
-  List<Object> get props => [cart];
+  List<Object> get props => [updatedCart];
 }
 
 /// When user clicks to add button => add cart item event

lib/business_logic/common_blocs/cart/cart_state.dart

@@ -14,12 +14,16 @@ class CartLoading extends CartState {}
 /// Cart was loaded
 class CartLoaded extends CartState {
   final List<CartItem> cart;
-  final int totalCartPrice;
+  final int priceOfGoods;
 
-  CartLoaded(this.cart, this.totalCartPrice);
+
+  CartLoaded({
+    required this.cart,
+    required this.priceOfGoods,
+  });
 
   @override
-  List<Object> get props => [cart, totalCartPrice];
+  List<Object> get props => [cart, priceOfGoods];
 }
 
 /// Cart wasn't loaded

lib/business_logic/common_blocs/common_bloc.dart

@@ -2,6 +2,7 @@ import 'package:e_commerce_app/business_logic/common_blocs/application/bloc.dart
 import 'package:e_commerce_app/business_logic/common_blocs/auth/bloc.dart';
 import 'package:e_commerce_app/business_logic/common_blocs/cart/bloc.dart';
 import 'package:e_commerce_app/business_logic/common_blocs/language/bloc.dart';
+import 'package:e_commerce_app/business_logic/common_blocs/order/bloc.dart';
 import 'package:e_commerce_app/business_logic/common_blocs/profile/bloc.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
@@ -11,6 +12,7 @@ class CommonBloc {
   static final authencationBloc = AuthenticationBloc();
   static final languageBloc = LanguageBloc();
   static final cartBloc = CartBloc();
+  static final orderBloc = OrderBloc();
   static final profileBloc = ProfileBloc();
 
   static final List<BlocProvider> blocProviders = [
@@ -29,13 +31,17 @@ class CommonBloc {
     BlocProvider<CartBloc>(
       create: (context) => cartBloc,
     ),
+    BlocProvider<OrderBloc>(
+      create: (context) => orderBloc,
+    ),
   ];
 
   /// Dispose
   static void dispose() {
     applicationBloc.close();
     authencationBloc.close();
     cartBloc.close();
+    orderBloc.close();
     profileBloc.close();
     languageBloc.close();
   }

lib/business_logic/common_blocs/order/bloc.dart

@@ -0,0 +1,3 @@
+export 'order_bloc.dart';
+export 'order_event.dart';
+export 'order_state.dart';

lib/business_logic/common_blocs/order/order_bloc.dart

@@ -0,0 +1,40 @@
+import 'package:e_commerce_app/business_logic/common_blocs/order/bloc.dart';
+import 'package:e_commerce_app/business_logic/entities/entites.dart';
+import 'package:e_commerce_app/business_logic/repository/repository.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+class OrderBloc extends Bloc<OrderEvent, OrderState> {
+  OrderRepository _orderRepository = AppRepository.orderRepository;
+  AuthRepository _authRepository = AppRepository.authRepository;
+  OrderBloc() : super(MyOrdersLoading());
+
+  @override
+  Stream<OrderState> mapEventToState(OrderEvent event) async* {
+    if (event is LoadMyOrders) {
+      yield* _mapLoadMyOrdersToState(event);
+    } else if (event is AddOrder) {
+      yield* _mapAddOrderToState(event);
+    }
+  }
+
+  Stream<OrderState> _mapLoadMyOrdersToState(LoadMyOrders event) async* {
+    try {
+      var loggedFirebaseUser = _authRepository.loggedFirebaseUser;
+      List<Order> orders =
+          await _orderRepository.getOrders(loggedFirebaseUser.uid);
+      yield MyOrdersLoaded(myOrders: orders);
+    } catch (e) {
+      yield MyOrdersLoadFailure(e.toString());
+    }
+  }
+
+  Stream<OrderState> _mapAddOrderToState(AddOrder event) async* {
+    try {
+      var newOrder =
+          event.newOrder.cloneWith(uid: _authRepository.loggedFirebaseUser.uid);
+      await _orderRepository.addOrder(newOrder);
+    } catch (e) {
+      print(e.toString());
+    }
+  }
+}

lib/business_logic/common_blocs/order/order_event.dart

@@ -0,0 +1,26 @@
+import 'package:e_commerce_app/business_logic/entities/entites.dart';
+import 'package:equatable/equatable.dart';
+import 'package:firebase_auth/firebase_auth.dart';
+
+abstract class OrderEvent extends Equatable {
+  const OrderEvent();
+
+  @override
+  List<Object> get props => [];
+}
+
+class LoadMyOrders extends OrderEvent {
+  final User loggedFirebaseUser;
+
+  LoadMyOrders(this.loggedFirebaseUser);
+
+  List<Object> get props => [loggedFirebaseUser];
+}
+
+class AddOrder extends OrderEvent {
+  final Order newOrder;
+
+  AddOrder(this.newOrder);
+
+  List<Object> get props => [newOrder];
+}