More changes

app/app.py

@@ -97,7 +97,7 @@ async def check_expired_reservations(context: ContextTypes.DEFAULT_TYPE):
              )
              try:
                  await context.bot.send_message(chat_id=user_id, text=notification_text, parse_mode=ParseMode.MARKDOWN)
-                 logger.info(f"Notified user {user_id} about expired reservation.")
+                 logger.info(f"Notified user {user_id} (Name: {reservation['user_name']}) about expired reservation.")
              except Forbidden:
                  logger.warning(f"Cannot notify user {user_id} (Forbidden). Reservation cancelled anyway.")
              except BadRequest as e:

app/database.py

@@ -253,7 +253,7 @@ def get_expired_reservations(expiry_threshold_timestamp):
     cur = conn.cursor()
     try:
         cur.execute(
-            """SELECT p.id, p.user_id, p.user_name, p.raffle_id, p.numbers, r.name as raffle_name
+            """SELECT p.id, p.user_id, p.user_name, p.raffle_id, p.numbers, p.invoice_id, r.name as raffle_name
                FROM participants p
                JOIN raffles r ON p.raffle_id = r.id
                WHERE p.step = 'waiting_for_payment'

app/handlers.py

@@ -220,13 +220,14 @@ async def confirm_creation(update: Update, context: ContextTypes.DEFAULT_TYPE) -
         price = user_data.get('price')
         image_file_id = user_data.get('image_file_id')
         channel_id = user_data.get('channel')
+        international_shipping = user_data.get('international_shipping', 0)
 
-        if not all([name, description, image_file_id, price]):
+        if not all([name, description, image_file_id, price, international_shipping]):
             await context.bot.send_message(query.from_user.id, "Faltan datos. Creación cancelada.")
             context.user_data.pop('new_raffle', None)
             return ConversationHandler.END
 
-        raffle_id = create_raffle(name, description, price, image_file_id, channel_id)
+        raffle_id = create_raffle(name, description, price, image_file_id, channel_id, international_shipping)
 
         if raffle_id:
             await context.bot.send_message(query.from_user.id, f"✅ ¡Sorteo '{name}' creado con éxito!")

app/helpers.py

@@ -497,4 +497,4 @@ def get_paypal_amounts_for_invoice(invoice_id):
         fee_amount = float(breakdown.get("paypal_fee", {}).get("value", 0.0))
         net_amount = float(breakdown.get("net_amount", {}).get("value", gross_amount))
     
-    return gross_amount, net_amount, fee_amount
+    return gross_amount, net_amount, fee_amount