From 36b4e395f06c17e232ae562427a9a3fbf96c5e5e Mon Sep 17 00:00:00 2001
From: Parsa Nazer <parsa.nazerrr@gmail.com>
Date: Sun, 28 Dec 2025 12:04:29 +0330
Subject: [PATCH] fix: Convert Jalali date to datetime for order creation
 timestamp

---
 backend/core/settings/base.py |  2 +-
 backend/order/signals.py      | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/backend/core/settings/base.py b/backend/core/settings/base.py
index c05a736..83f9c4b 100644
--- a/backend/core/settings/base.py
+++ b/backend/core/settings/base.py
@@ -17,7 +17,7 @@ API_DOMAIN = os.getenv("API_DOMAIN")
 
 # API Keys and Tokens
 OPENAI_API_KEY = os.getenv("OPENAI_API_KEY")
-TELEGRAM_BOT_TOKEN = os.getenv("TELEGRAM_BOT_TOKEN")
+TELEGRAM_BOT_TOKEN = '7068288679:AAGecMnyt9A6R78OQu8nQeISMK1LepX718g'
 VAPID_PRIVATE_KEY = os.getenv("VAPID_PRIVATE_KEY")
 
 # Email Configuration
diff --git a/backend/order/signals.py b/backend/order/signals.py
index 2fcebf0..adcb23d 100644
--- a/backend/order/signals.py
+++ b/backend/order/signals.py
@@ -142,6 +142,20 @@ def create_shop_orders_on_payment(sender, instance: OrderModel, created, **kwarg
                 address_province = instance.address.province
                 address_recipient_name = instance.address.name
 
+            # Convert Jalali date to datetime if needed
+            order_created_datetime = None
+            if instance.created_at:
+                try:
+                    # If it's already a datetime, use it
+                    if hasattr(instance.created_at, 'hour'):
+                        order_created_datetime = instance.created_at
+                    else:
+                        # If it's a date, convert to datetime at midnight
+                        from datetime import datetime, time
+                        order_created_datetime = datetime.combine(instance.created_at, time.min)
+                except Exception:
+                    order_created_datetime = None
+
             shop_order = ShopOrderModel.objects.create(
                 order=instance,
                 shop=shop,
@@ -165,7 +179,7 @@ def create_shop_orders_on_payment(sender, instance: OrderModel, created, **kwarg
                 commission_amount=commission_amount,
                 tax_amount=allocated_tax,
                 payable_amount=payable,
-                order_created_at=instance.created_at,
+                order_created_at=order_created_datetime,
             )
 
             # Create ShopOrderItem rows linking to original OrderItemModel