Update main.py

main.py

@@ -183,7 +183,8 @@ def get_user_profile():
 def get_user_dashboard():
     """
     Retrieves and aggregates data for the user's dashboard with correct profit calculation.
-    **FIXED**: Multiplies price and cost by quantity for accurate financial totals.
+    **FIXED**: Now segregates all financial totals by currency and intelligently infers
+    the currency for transactions where it is missing.
     """
     uid = verify_token(request.headers.get('Authorization'))
     if not uid: return jsonify({'error': 'Invalid or expired token'}), 401
@@ -202,42 +203,78 @@ def get_user_dashboard():
         bot_data_id = phone_number.lstrip('+')
         bot_user_ref = db.collection('users').document(bot_data_id)
         
-        # --- THE FIX IS HERE ---
+        # --- REVISED LOGIC FOR MULTI-CURRENCY ---
+        # Use dictionaries to store totals for each currency
+        sales_revenue_by_currency = {}
+        cogs_by_currency = {}
+        expenses_by_currency = {}
+        sales_count = 0
+
+        # Establish the user's default currency as the initial fallback
+        last_seen_currency = user_data.get('defaultCurrency', 'USD') 
+
+        # Process Sales
         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', {})
-            # Default quantity to 1 if not present
+            
+            # Infer currency: use the transaction's currency, or fall back to the last seen one
+            currency = details.get('currency')
+            if currency:
+                last_seen_currency = currency
+            else:
+                currency = last_seen_currency
+
             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_revenue_by_currency[currency] = sales_revenue_by_currency.get(currency, 0) + (price * quantity)
+            cogs_by_currency[currency] = cogs_by_currency.get(currency, 0) + (cost * quantity)
             sales_count += 1
         
+        # Process Expenses
         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)
-
-        gross_profit = total_sales_revenue - total_cogs
-        net_profit = gross_profit - total_expenses
+        for doc in expenses_docs:
+            details = doc.to_dict().get('details', {})
             
+            # Infer currency using the same logic
+            currency = details.get('currency')
+            if currency:
+                last_seen_currency = currency
+            else:
+                currency = last_seen_currency
+            
+            amount = float(details.get('amount', 0))
+            expenses_by_currency[currency] = expenses_by_currency.get(currency, 0) + amount
+
+        # Calculate final totals by currency
+        all_currencies = set(sales_revenue_by_currency.keys()) | set(cogs_by_currency.keys()) | set(expenses_by_currency.keys())
+        gross_profit_by_currency = {}
+        net_profit_by_currency = {}
+
+        for curr in all_currencies:
+            revenue = sales_revenue_by_currency.get(curr, 0)
+            cogs = cogs_by_currency.get(curr, 0)
+            expenses = expenses_by_currency.get(curr, 0)
+            gross_profit_by_currency[curr] = round(revenue - cogs, 2)
+            net_profit_by_currency[curr] = round(revenue - cogs - expenses, 2)
+
         dashboard_data = {
-            'totalSalesRevenue': round(total_sales_revenue, 2),
-            'totalCostOfGoodsSold': round(total_cogs, 2),
-            'grossProfit': round(gross_profit, 2),
-            'totalExpenses': round(total_expenses, 2),
-            'netProfit': round(net_profit, 2),
+            'totalSalesRevenueByCurrency': sales_revenue_by_currency,
+            'totalCostOfGoodsSoldByCurrency': cogs_by_currency,
+            'grossProfitByCurrency': gross_profit_by_currency,
+            'totalExpensesByCurrency': expenses_by_currency,
+            'netProfitByCurrency': net_profit_by_currency,
             'salesCount': sales_count,
         }
-        # --- END OF FIX ---
+        # --- END OF REVISED LOGIC ---
         return jsonify(dashboard_data), 200
         
     except Exception as e:
         logging.error(f"Error fetching dashboard data for user {uid} (phone: {phone_number}): {e}")
         return jsonify({'error': 'An error occurred while fetching your dashboard data.'}), 500
 
-
 # Replace your existing PUT /api/user/profile with this one.
 @app.route('/api/user/profile', methods=['PUT'])
 def update_user_profile():
@@ -723,20 +760,25 @@ def admin_remove_member_from_org(org_id, member_uid):
 @app.route('/api/admin/dashboard/stats', methods=['GET'])
 def get_admin_dashboard_stats():
     """
-    Retrieves global statistics for the admin dashboard, including leaderboards.
-    **FIXED**: Correctly groups expenses by the 'description' field for the leaderboard.
+    Retrieves global statistics for the admin dashboard, including multi-currency totals
+    and leaderboards.
     """
     try:
         verify_admin_and_get_uid(request.headers.get('Authorization'))
 
-        # --- Initialization ---
         all_users_docs = list(db.collection('users').stream())
         all_orgs_docs = list(db.collection('organizations').stream())
         
-        user_sales_data = {}
-        global_item_revenue = {}
-        global_expense_totals = {} # This will be populated correctly now
+        # --- Initialize data structures ---
+        user_sales_data = {} 
+        global_item_revenue = {} 
+        global_expense_totals = {} 
         phone_to_user_map = {}
+        
+        # Global financial accumulators are now dictionaries
+        global_sales_rev_by_curr = {}
+        global_cogs_by_curr = {}
+        global_expenses_by_curr = {}
 
         # --- First Pass: Get user info and list of approved phones ---
         pending_approvals, approved_users, admin_count = 0, 0, 0
@@ -752,7 +794,8 @@ def get_admin_dashboard_stats():
                 approved_phone_numbers.append(phone)
                 phone_to_user_map[phone] = {
                     'displayName': user_data.get('displayName', 'N/A'),
-                    'uid': user_data.get('uid')
+                    'uid': user_data.get('uid'),
+                    'defaultCurrency': user_data.get('defaultCurrency', 'USD') # Store default currency
                 }
             if user_data.get('isAdmin', False):
                 admin_count += 1
@@ -761,55 +804,55 @@ def get_admin_dashboard_stats():
         org_stats = {'total': len(all_orgs_docs)}
 
         # --- Second Pass: Aggregate financial data ---
-        total_sales_revenue, total_cogs, total_expenses, sales_count = 0, 0, 0, 0
+        sales_count = 0
         
         for phone in approved_phone_numbers:
             try:
                 bot_data_id = phone.lstrip('+')
                 bot_user_ref = db.collection('users').document(bot_data_id)
                 
-                user_sales_data[phone] = {'total_revenue': 0, 'item_sales': {}}
+                user_sales_data[phone] = {'total_revenue_by_currency': {}, 'item_sales': {}}
+                user_info = phone_to_user_map.get(phone, {})
+                last_seen_currency = user_info.get('defaultCurrency', 'USD')
 
                 # Process Sales
-                sales_docs = bot_user_ref.collection('sales').stream()
-                for sale_doc in sales_docs:
+                for sale_doc in bot_user_ref.collection('sales').stream():
                     details = sale_doc.to_dict().get('details', {})
-                    quantity = int(details.get('quantity', 1))
-                    price = float(details.get('price', 0))
-                    cost = float(details.get('cost', 0))
-                    item_name = details.get('item', 'Unknown Item')
-                    sale_revenue = price * quantity
+                    currency = details.get('currency')
+                    if currency: last_seen_currency = currency
+                    else: currency = last_seen_currency
 
-                    total_sales_revenue += sale_revenue
-                    total_cogs += cost * quantity
+                    quantity, price = int(details.get('quantity', 1)), float(details.get('price', 0))
+                    sale_revenue = price * quantity
+                    
+                    global_sales_rev_by_curr[currency] = global_sales_rev_by_curr.get(currency, 0) + sale_revenue
+                    global_cogs_by_curr[currency] = global_cogs_by_curr.get(currency, 0) + (float(details.get('cost', 0)) * quantity)
                     sales_count += 1
                     
-                    user_sales_data[phone]['total_revenue'] += sale_revenue
+                    item_name = details.get('item', 'Unknown Item')
+                    user_sales_data[phone]['total_revenue_by_currency'][currency] = user_sales_data[phone]['total_revenue_by_currency'].get(currency, 0) + sale_revenue
                     user_sales_data[phone]['item_sales'][item_name] = user_sales_data[phone]['item_sales'].get(item_name, 0) + sale_revenue
                     global_item_revenue[item_name] = global_item_revenue.get(item_name, 0) + sale_revenue
-
+                
                 # Process Expenses
-                expenses_docs = bot_user_ref.collection('expenses').stream()
-                for expense_doc in expenses_docs:
+                for expense_doc in bot_user_ref.collection('expenses').stream():
                     details = expense_doc.to_dict().get('details', {})
-                    amount = float(details.get('amount', 0))
+                    currency = details.get('currency')
+                    if currency: last_seen_currency = currency
+                    else: currency = last_seen_currency
                     
-                    # --- THE FIX IS HERE ---
-                    # Use the 'description' field for grouping, as seen in Firestore.
+                    amount = float(details.get('amount', 0))
                     category = details.get('description', 'Uncategorized')
-                    # --- END OF FIX ---
-                    
-                    total_expenses += amount
+                    global_expenses_by_curr[currency] = global_expenses_by_curr.get(currency, 0) + amount
                     global_expense_totals[category] = global_expense_totals.get(category, 0) + amount
-
             except Exception as e:
                 logging.error(f"Admin stats: Could not process data for phone {phone}. Error: {e}")
                 continue
         
-        # --- Post-Processing: Calculate and Rank Leaderboards ---
-
-        # Rank Top Users by Revenue
-        sorted_users = sorted(user_sales_data.items(), key=lambda item: item[1]['total_revenue'], reverse=True)
+        # --- Post-Processing: Leaderboards & Final Totals ---
+        # Note: Ranking users with multiple currencies is complex. This example ranks them by the revenue
+        # in their default currency. A more advanced version might convert to a single currency.
+        sorted_users = sorted(user_sales_data.items(), key=lambda item: item[1]['total_revenue_by_currency'].get(phone_to_user_map.get(item[0], {}).get('defaultCurrency', 'USD'), 0), reverse=True)
         top_users_by_revenue = []
         for phone, data in sorted_users[:5]:
             user_info = phone_to_user_map.get(phone, {})
@@ -817,39 +860,35 @@ def get_admin_dashboard_stats():
             top_users_by_revenue.append({
                 'displayName': user_info.get('displayName'),
                 'uid': user_info.get('uid'),
-                'totalRevenue': round(data['total_revenue'], 2),
+                'revenueByCurrency': {k: round(v, 2) for k, v in data['total_revenue_by_currency'].items()},
                 'topSellingItem': top_item
             })
 
-        # Rank Top Selling Items Globally
         sorted_items = sorted(global_item_revenue.items(), key=lambda item: item[1], reverse=True)
         top_selling_items = [{'item': name, 'totalRevenue': round(revenue, 2)} for name, revenue in sorted_items[:5]]
-
-        # Rank Top Expenses Globally (This will now be correct)
         sorted_expenses = sorted(global_expense_totals.items(), key=lambda item: item[1], reverse=True)
         top_expenses = [{'category': name, 'totalAmount': round(amount, 2)} for name, amount in sorted_expenses[:5]]
 
-        # --- Final Assembly ---
-        gross_profit = total_sales_revenue - total_cogs
-        net_profit = gross_profit - total_expenses
-        
+        all_currencies = set(global_sales_rev_by_curr.keys()) | set(global_cogs_by_curr.keys()) | set(global_expenses_by_curr.keys())
+        global_net_profit_by_curr = {}
+        for curr in all_currencies:
+            revenue = global_sales_rev_by_curr.get(curr, 0)
+            cogs = global_cogs_by_curr.get(curr, 0)
+            expenses = global_expenses_by_curr.get(curr, 0)
+            global_net_profit_by_curr[curr] = round(revenue - cogs - expenses, 2)
+
         system_stats = {
-            'totalSalesRevenue': round(total_sales_revenue, 2),
-            'totalCostOfGoodsSold': round(total_cogs, 2),
-            'totalExpenses': round(total_expenses, 2),
-            'totalNetProfit': round(net_profit, 2),
+            'totalSalesRevenueByCurrency': {k: round(v, 2) for k, v in global_sales_rev_by_curr.items()},
+            'totalCostOfGoodsSoldByCurrency': {k: round(v, 2) for k, v in global_cogs_by_curr.items()},
+            'totalExpensesByCurrency': {k: round(v, 2) for k, v in global_expenses_by_curr.items()},
+            'totalNetProfitByCurrency': global_net_profit_by_curr,
             'totalSalesCount': sales_count,
         }
 
         return jsonify({
-            'userStats': user_stats, 
-            'organizationStats': org_stats,
+            'userStats': user_stats, 'organizationStats': org_stats,
             'systemStats': system_stats,
-            'leaderboards': {
-                'topUsersByRevenue': top_users_by_revenue,
-                'topSellingItems': top_selling_items,
-                'topExpenses': top_expenses
-            }
+            'leaderboards': {'topUsersByRevenue': top_users_by_revenue, 'topSellingItems': top_selling_items, 'topExpenses': top_expenses}
         }), 200
 
     except PermissionError as e: