Update main.py

main.py

@@ -192,7 +192,7 @@ def update_user_phone():
 def get_user_dashboard():
     """
     Retrieves and aggregates data for the user's dashboard with correct profit calculation.
-    **FIXED**: Normalizes the phone number to match the bot's data document ID.
+    **FIXED**: Multiplies price and cost by quantity for accurate financial totals.
     """
     uid = verify_token(request.headers.get('Authorization'))
     if not uid: return jsonify({'error': 'Invalid or expired token'}), 401
@@ -208,21 +208,21 @@ def get_user_dashboard():
     if not phone_number: return jsonify({'error': 'No phone number is associated with your account.'}), 404
     
     try:
-        # --- THE FIX IS HERE ---
-        # Strip the leading '+' from the phone number to match the document ID
-        # used by the WhatsApp bot (e.g., '+263...' becomes '263...').
         bot_data_id = phone_number.lstrip('+')
-        
-        # Use the corrected ID to reference the bot's data document
         bot_user_ref = db.collection('users').document(bot_data_id)
-        # --- END OF FIX ---
         
+        # --- THE FIX IS HERE ---
         sales_docs = bot_user_ref.collection('sales').stream()
         total_sales_revenue, total_cogs, sales_count = 0, 0, 0
         for doc in sales_docs:
             details = doc.to_dict().get('details', {})
-            total_sales_revenue += float(details.get('price', 0))
-            total_cogs += float(details.get('cost', 0))
+            # Default quantity to 1 if not present
+            quantity = int(details.get('quantity', 1))
+            price = float(details.get('price', 0))
+            cost = float(details.get('cost', 0))
+
+            total_sales_revenue += price * quantity
+            total_cogs += cost * quantity
             sales_count += 1
         
         expenses_docs = bot_user_ref.collection('expenses').stream()
@@ -239,6 +239,7 @@ def get_user_dashboard():
             'netProfit': round(net_profit, 2),
             'salesCount': sales_count,
         }
+        # --- END OF FIX ---
         return jsonify(dashboard_data), 200
         
     except Exception as e:
@@ -557,12 +558,11 @@ def admin_remove_member_from_org(org_id, member_uid):
 # -----------------------------------------------------------------------------
 # 7. ADMIN DASHBOARD ENDPOINT (INCLUDED)
 # -----------------------------------------------------------------------------
-
 @app.route('/api/admin/dashboard/stats', methods=['GET'])
 def get_admin_dashboard_stats():
     """
     Retrieves global statistics for the admin dashboard with correct profit calculation.
-    **FIXED**: Normalizes phone numbers to match bot's data document IDs.
+    **FIXED**: Multiplies price and cost by quantity for accurate financial totals.
     """
     try:
         verify_admin_and_get_uid(request.headers.get('Authorization'))
@@ -585,37 +585,35 @@ def get_admin_dashboard_stats():
                 admin_count += 1
         
         user_stats = {
-            'total': len(all_users_docs),
-            'admins': admin_count,
-            'approvedForBot': approved_users,
-            'pendingApproval': pending_approvals,
+            'total': len(all_users_docs), 'admins': admin_count,
+            'approvedForBot': approved_users, 'pendingApproval': pending_approvals,
         }
-        
         org_stats = {'total': len(all_orgs_docs)}
 
+        # --- THE FIX IS HERE ---
         total_sales_revenue, total_cogs, total_expenses, sales_count = 0, 0, 0, 0
         
         for phone in approved_phone_numbers:
             try:
-                # --- THE FIX IS HERE ---
-                # Strip the leading '+' before querying for each user's bot data
                 bot_data_id = phone.lstrip('+')
                 bot_user_ref = db.collection('users').document(bot_data_id)
-                # --- END OF FIX ---
 
                 sales_docs = bot_user_ref.collection('sales').stream()
                 for sale_doc in sales_docs:
                     details = sale_doc.to_dict().get('details', {})
-                    total_sales_revenue += float(details.get('price', 0))
-                    total_cogs += float(details.get('cost', 0))
+                    quantity = int(details.get('quantity', 1))
+                    price = float(details.get('price', 0))
+                    cost = float(details.get('cost', 0))
+
+                    total_sales_revenue += price * quantity
+                    total_cogs += cost * quantity
                     sales_count += 1
                 
                 expenses_docs = bot_user_ref.collection('expenses').stream()
                 total_expenses += sum(float(doc.to_dict().get('details', {}).get('amount', 0)) for doc in expenses_docs)
             except Exception as e:
-                # Log an error for a specific user but continue the loop
                 logging.error(f"Admin stats: Could not process data for phone {phone}. Error: {e}")
-                continue # Move to the next phone number
+                continue
         
         gross_profit = total_sales_revenue - total_cogs
         net_profit = gross_profit - total_expenses
@@ -627,12 +625,9 @@ def get_admin_dashboard_stats():
             'totalNetProfit': round(net_profit, 2),
             'totalSalesCount': sales_count,
         }
+        # --- END OF FIX ---
 
-        return jsonify({
-            'userStats': user_stats, 
-            'organizationStats': org_stats,
-            'systemStats': system_stats
-        }), 200
+        return jsonify({'userStats': user_stats, 'organizationStats': org_stats, 'systemStats': system_stats}), 200
 
     except PermissionError as e:
         return jsonify({'error': str(e)}), 403