Update app.py (#9)

- Update app.py (45df9947a6499c5175ded893169ff6a28f44e8f6)


Co-authored-by: Rammohan <[email protected]>

app.py

@@ -254,6 +254,10 @@ def customer_details():
         print(f"Error fetching customer details: {str(e)}")
         return jsonify({"success": False, "message": f"Error fetching customer details: {str(e)}"})
 
+
+from datetime import datetime
+import pytz  # Library to handle timezone conversions
+
 @app.route("/order-history", methods=["GET"])
 def order_history():
     email = session.get('user_email')  # Get logged-in user's email
@@ -270,25 +274,54 @@ def order_history():
             ORDER BY CreatedDate DESC
         """)
 
+        print(f"Salesforce query result: {result}")  # Debugging line
+
         orders = result.get("records", [])  # Fetch all orders
 
-        # Strip image URLs from order details and split remaining data by new lines
+        if not orders:
+            print("No orders found for this email.")  # Debugging line
+
+        # Format the order details for better readability
         for order in orders:
             order_details = order.get("Order_Details__c", "")
-            # Remove image URLs using regex
-            cleaned_details = re.sub(r'http[s]?://\S+', '', order_details)
+            items = order_details.split("\n")  # Assuming each item is separated by a new line
+            formatted_items = []
+
+            # Loop through the items and format them as "item name * quantity"
+            for item in items:
+                item_details = item.split(" | ")
+                if len(item_details) > 1:
+                    name = item_details[0].strip()
+                    quantity = item_details[1].strip()
+                    formatted_items.append(f"{name} * {quantity}")
+
+            # Join the formatted items into a single string
+            order['formatted_items'] = ", ".join(formatted_items)
+
+            # Get the order date and time from CreatedDate
+            created_date = order.get("CreatedDate", "")
+            if created_date:
+                # Convert CreatedDate to datetime object in UTC
+                utc_datetime = datetime.strptime(created_date, '%Y-%m-%dT%H:%M:%S.000+0000')
+                utc_datetime = utc_datetime.replace(tzinfo=pytz.UTC)
             
-            # Now split the cleaned details by lines and join them with <br> to create line breaks
-            cleaned_details = cleaned_details.replace("\n", "  ")
+                # Convert UTC datetime to the desired timezone (e.g., IST)
+                local_timezone = pytz.timezone('Asia/Kolkata')  # Replace with your timezone
+                local_datetime = utc_datetime.astimezone(local_timezone)
 
-            # Update the order details with the cleaned and formatted details
-            order['Order_Details__c'] = cleaned_details
+                # Format the date and time in the desired format
+                order['formatted_date'] = local_datetime.strftime('%B %d, %I:%M %p')
 
         return render_template("order_history.html", orders=orders)
 
     except Exception as e:
         print(f"Error fetching order history: {str(e)}")
         return render_template("order_history.html", orders=[], error=str(e))
+
+
+
+
+
 app.permanent_session_lifetime = timedelta(minutes=5)
 @app.before_request
 def check_session_timeout():