fixd a buncha stuff

SigSegvSquad · Jun 1, 2021 · 3e19003 · 3e19003
1 parent 775ca32
commit 3e19003
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 163 deletions.
diff --git a/lib/models/Cart.dart b/lib/models/Cart.dart
@@ -33,7 +33,7 @@ double getCheckoutPrice(List<CartProduct> yourCart) {
   for (var i = 0; i < yourCart.length; i++) {
     priceTotal += yourCart[i].numOfItem * yourCart[i].product.price;
   }
-  return priceTotal;
+  return priceTotal.toInt().toDouble();
 }
 
 void placeOrder(List<CartProduct> yourCart) {

diff --git a/lib/models/Order.dart b/lib/models/Order.dart
@@ -40,6 +40,7 @@ class Order{
       'amount':price,
       'date':date,
       'userDetails': userDetails,
+      'timestamp': DateTime.now().millisecondsSinceEpoch,
       'orderStatus': 'pending approval'
     }).
     then((value) =>{

diff --git a/lib/models/Product.dart b/lib/models/Product.dart
@@ -27,6 +27,7 @@ List<Product> supplementProductList = [];
 List<Product> lifestyleProductList = [];
 List<Product> tabletProductList = [];
 List<Product> surgeryProductList = [];
+List<Product> ayurvedaProductList = [];
 List<Product> otherProductList = [];
 
 Product getProductById(String id){
@@ -62,6 +63,8 @@ void getProductData() {
                 isPopular: true,
               );
               allProducts.add(product);
+              print("\n");
+              print(product.title+"\n");
               if (doc["category"] == "lifestyle") {
                 lifestyleProductList.add(product);
               } else if (doc["category"] == "tablet") {
@@ -70,11 +73,15 @@ void getProductData() {
                 supplementProductList.add(product);
               } else if (doc["category"] == "surgery") {
                 surgeryProductList.add(product);
-              } else if (doc["category"] == "other") {
+              } else if (doc["category"] == "ayurveda") {
+              ayurvedaProductList.add(product);
+              }
+              else if (doc["category"] == "other") {
                 otherProductList.add(product);
               }
             })
           });
+
 }
 
 List<Product> demoProducts = [

diff --git a/lib/screens/cart/components/body.dart b/lib/screens/cart/components/body.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 import 'package:shop_app/components/default_button.dart';
 import 'package:shop_app/constants.dart';
 import 'package:shop_app/tutorial/tutorialAdditionals.dart';
@@ -129,6 +130,15 @@ class _BodyState extends State<Body> {
                       text: "Check Out",
                       press: () {
                         placeOrder(yourCart);
+                        Fluttertoast.showToast(
+                            msg: 'Order placed!',
+                            toastLength: Toast.LENGTH_SHORT,
+                            gravity: ToastGravity.TOP,
+                            timeInSecForIos: 1,
+                            backgroundColor: Colors.black,
+                            textColor: Colors.white
+                        );
+                        Navigator.pop(context);
                       },
                     ),
                   ),

diff --git a/lib/screens/product_list/components/body.dart b/lib/screens/product_list/components/body.dart
@@ -38,15 +38,17 @@ class _BodyState extends State<Body> {
 }
 
 List<Product> getList(String category) {
-  if (category == "Lifestyle") {
+  if (category.toLowerCase() == "lifestyle") {
     return lifestyleProductList;
-  } else if (category == "General") {
+  } else if (category.toLowerCase() == "general") {
     return tabletProductList;
-  } else if (category == "Supplements") {
+  } else if (category.toLowerCase() == "supplements") {
     return supplementProductList;
-  } else if (category == "Surgery") {
+  } else if (category.toLowerCase() == "surgery") {
     return surgeryProductList;
-  } else if (category == "Other") {
+  } else if (category.toLowerCase() == "ayurveda") {
+    return ayurvedaProductList;
+  }else if (category.toLowerCase() == "other") {
     return otherProductList;
   }
 }