Merge pull request #9 from gmbcode/beta_l

Merge into main

Author: rahuln-07

.gitignore

@@ -17,7 +17,7 @@ migrate_working_dir/
 *.ipr
 *.iws
 .idea/
-
+.vscode/
 # The .vscode folder contains launch configuration and tasks you configure in
 # VS Code which you may wish to be included in version control, so this line
 # is commented out by default.

android/build.gradle.kts

@@ -5,20 +5,23 @@ allprojects {
     }
 }
 
-val newBuildDir: Directory =
-    rootProject.layout.buildDirectory
-        .dir("../../build")
-        .get()
+// Remove ': Directory' type annotation here
+val newBuildDir = rootProject.layout.buildDirectory
+    .dir("../../build")
+    .get()
+
 rootProject.layout.buildDirectory.value(newBuildDir)
 
 subprojects {
-    val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name)
+    // Remove ': Directory' type annotation here as well
+    val newSubprojectBuildDir = newBuildDir.dir(project.name)
     project.layout.buildDirectory.value(newSubprojectBuildDir)
 }
+
 subprojects {
     project.evaluationDependsOn(":app")
 }
 
 tasks.register<Delete>("clean") {
     delete(rootProject.layout.buildDirectory)
-}
+}

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+# Updated to version 8.11.1 as required by the error message
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
+zipStorePath=wrapper/dists

lib/features/auth/presentation/pages/roleselection/customer_role.dart

@@ -1,3 +1,5 @@
+// lib/features/auth/presentation/pages/roleselection/customer_role.dart
+
 import 'package:azt/features/auth/presentation/components/my_button.dart';
 import 'package:azt/features/auth/presentation/components/my_textfield.dart';
 import 'package:azt/features/auth/presentation/cubits/auth_cubit.dart';
@@ -31,18 +33,19 @@ class _customerRoleState extends State<customerRole> {
     if(address.isEmpty || pincode.isEmpty){
       ScaffoldMessenger.of(context).showSnackBar(
           const SnackBar(content: Text("Please enter all Fields!")));
+      return; // Add return to stop execution
     }
 
     if (!isPincodeValid) {
       ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(content: Text("Pincode must be exactly 6 digits!!")),
+        const SnackBar(content: Text("Pincode must be exactly 6 digits!!")),
       );
       return;
     }
 
     if(address.length>200){
       ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(content: Text("Address is too Long!")),
+        const SnackBar(content: Text("Address is too Long!")),
       );
       return;
     }
@@ -52,11 +55,16 @@ class _customerRoleState extends State<customerRole> {
     try{
       final authCubit = context.read<AuthCubit>();
       await authCubit.saveRoleSelection('customer', address, pincode);
+      
       if(mounted){
         ScaffoldMessenger.of(context).showSnackBar(
           const SnackBar(content: Text("Customer profile created successfully!")),
         );
         setState(() => _isLoading = false);
+        
+        //Navigate to home by popping it if profile creation sucessful
+        Navigator.of(context).pop(); 
+        
       }
     } catch(e){
       if (mounted) {  
@@ -80,10 +88,8 @@ class _customerRoleState extends State<customerRole> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-
       //body
       body: Center(
-        
         child: Padding(
           padding: const EdgeInsets.symmetric(horizontal: 100.0),
           child: Column(
@@ -128,12 +134,8 @@ class _customerRoleState extends State<customerRole> {
                   ),
                   GestureDetector(
                     onTap: (){
-                      Navigator.pushReplacement(
-                        context,
-                        MaterialPageRoute(
-                        builder: (context) => const RoleSelectionpage(),
-                        ),
-                      );
+                      // Use pop instead of pushReplacement to correctly go back
+                      Navigator.pop(context);
                     },
                     child: Text(
                       " Click Here to Go Back",
@@ -151,4 +153,4 @@ class _customerRoleState extends State<customerRole> {
       )
     );
   }
-}
+}

lib/features/auth/presentation/pages/roleselection/retailer_role.dart

@@ -65,6 +65,7 @@ class _retailerRoleState extends State<retailerRole> {
           const SnackBar(content: Text("Retailer profile created successfully!")),
         );
         setState(() => _isLoading = false);
+        Navigator.of(context).pop(); 
       }
     } catch (e) {
       if (mounted) {

lib/features/auth/presentation/pages/roleselection/wholesaler_role.dart

@@ -72,6 +72,7 @@ class _wholesalerRoleState extends State<wholesalerRole > {
           const SnackBar(content: Text("Wholesaler profile created successfully!")),
         );
         setState(() => _isLoading = false);
+        Navigator.of(context).pop(); 
       }
     } catch (e) {
       if (mounted) {

lib/features/customer/data/models/customer_cart_item_model.dart

@@ -0,0 +1,56 @@
+class CustomerCartItemModel {
+  final String productId;
+  final String retailerId;
+  final String inventoryItemId;
+  final String name;
+  final double price;
+  final String imageUrl;
+  final int qty;
+
+  CustomerCartItemModel({
+    required this.productId,
+    required this.retailerId,
+    required this.inventoryItemId,
+    required this.name,
+    required this.price,
+    required this.imageUrl,
+    required this.qty,
+  });
+
+  // --- ADD THIS FACTORY ---
+  factory CustomerCartItemModel.fromMap(Map<dynamic, dynamic> map) {
+    return CustomerCartItemModel(
+      productId: map['id']?.toString() ?? '',
+      retailerId: map['retailerId']?.toString() ?? '', // Ensure we save this key
+      inventoryItemId: map['inventoryItemId']?.toString() ?? '',
+      name: map['name']?.toString() ?? 'Unknown',
+      price: double.tryParse(map['price'].toString()) ?? 0.0,
+      imageUrl: map['imageUrl']?.toString() ?? '',
+      qty: int.tryParse(map['qty'].toString()) ?? 0,
+    );
+  }
+
+  CustomerCartItemModel copyWith({int? qty}) {
+    return CustomerCartItemModel(
+      productId: productId,
+      retailerId: retailerId,
+      inventoryItemId: inventoryItemId,
+      name: name,
+      price: price,
+      imageUrl: imageUrl,
+      qty: qty ?? this.qty,
+    );
+  }
+
+  Map<String, dynamic> toMap() {
+    return {
+      'id': productId,
+      'retailerId': retailerId, // Important: Add this to the map so we can retrieve it later
+      'inventoryItemId': inventoryItemId,
+      'name': name,
+      'price': price,
+      'imageUrl': imageUrl,
+      'qty': qty,
+    };
+  }
+}

lib/features/customer/data/models/customer_product_model.dart

@@ -0,0 +1,53 @@
+class CustomerProductModel {
+  final String id;
+  final String retailerId;
+  final String inventoryItemId; 
+  final String name;
+  final double price;
+  final int availableQty;
+  final String imageUrl;
+  final String category;
+
+  CustomerProductModel({
+    required this.id,
+    required this.retailerId,
+    required this.inventoryItemId,
+    required this.name,
+    required this.price,
+    required this.availableQty,
+    required this.imageUrl,
+    required this.category,
+  });
+
+  factory CustomerProductModel.fromMap(String id, Map<dynamic, dynamic> map) {
+    return CustomerProductModel(
+      id: id,
+      retailerId: map['retailerId']?.toString() ?? '',
+      inventoryItemId: map['inventoryItemId']?.toString() ?? '',
+      name: map['name']?.toString() ?? 'Unknown Product',
+      
+      // ROBUST PARSING: Handle String or Number for Price
+      price: _parseDouble(map['price']),
+      
+      // ROBUST PARSING: Handle String or Number for Qty
+      availableQty: _parseInt(map['available_listed_qty']),
+      
+      imageUrl: map['imageUrl']?.toString() ?? 'https://placehold.co/400?text=No+Image',
+      category: map['category']?.toString() ?? 'General',
+    );
+  }
+
+  static double _parseDouble(dynamic value) {
+    if (value == null) return 0.0;
+    if (value is num) return value.toDouble();
+    if (value is String) return double.tryParse(value) ?? 0.0;
+    return 0.0;
+  }
+
+  static int _parseInt(dynamic value) {
+    if (value == null) return 0;
+    if (value is num) return value.toInt();
+    if (value is String) return int.tryParse(value) ?? 0;
+    return 0;
+  }
+}