From 970f294c9bdf7e771f346654ad3c7772f57e268c Mon Sep 17 00:00:00 2001 From: kobold-ai Date: Tue, 22 Sep 2026 11:27:46 +0200 Subject: [PATCH] fix: hamburger menu vertical stack, lock paid orders, order cancellation with balance refund, deduplicate admin drawer --- app/main.py | 93 +++++++++++++++++++++++++++++++++++++++- app/static/style.css | 19 +++++++- app/templates/admin.html | 28 ++++++++---- app/templates/base.html | 44 ++++++++++--------- app/templates/buyer.html | 52 ++++++++++++---------- app/templates/index.html | 77 ++++++++++++++++++++++++++++----- 6 files changed, 247 insertions(+), 66 deletions(-) diff --git a/app/main.py b/app/main.py index 63261cf..29250ba 100644 --- a/app/main.py +++ b/app/main.py @@ -1,6 +1,7 @@ import os import re import secrets +import urllib.parse from datetime import datetime, timedelta, date from typing import Optional, Dict, List, Set from decimal import Decimal @@ -130,7 +131,14 @@ def seed_demo_users_if_needed(tenant: Tenant, db: Session): @app.get("/", response_class=HTMLResponse) -def index(request: Request, event_id: Optional[int] = None, token: Optional[str] = None, db: Session = Depends(get_db)): +def index( + request: Request, + event_id: Optional[int] = None, + token: Optional[str] = None, + success: Optional[str] = None, + error: Optional[str] = None, + db: Session = Depends(get_db) +): tenant = resolve_tenant(request, db) if not tenant: return templates.TemplateResponse(request, "not_found_tenant.html", context={}) @@ -207,6 +215,8 @@ def index(request: Request, event_id: Optional[int] = None, token: Optional[str] "existing_order": existing_order, "user_items": user_items, "order_count": order_count, + "success": success, + "error": error, "now": now }) @@ -456,6 +466,11 @@ async def place_order( ).first() if existing_order: + if existing_order.is_paid: + raise HTTPException( + status_code=400, + detail="Diese Bestellung wurde bereits als bezahlt verbucht und kann nicht mehr geändert werden. Bitte wende dich an deinen Organisator." + ) db.query(OrderItem).filter(OrderItem.order_id == existing_order.id).delete() existing_order.total_price = total_price existing_order.guest_display_name = guest_name_str @@ -484,6 +499,43 @@ async def place_order( return RedirectResponse(url=f"/order/{order_id}/success", status_code=status.HTTP_303_SEE_OTHER) +@app.post("/order/cancel") +def cancel_order( + request: Request, + event_id: int = Form(...), + db: Session = Depends(get_db) +): + tenant = resolve_tenant(request, db) + current_user = get_current_user(request, db) + if not current_user: + return RedirectResponse(url="/login", status_code=status.HTTP_303_SEE_OTHER) + + event = db.query(Event).filter(Event.id == event_id, Event.tenant_id == tenant.id).first() + if not event: + raise HTTPException(status_code=404, detail="Event nicht gefunden") + + if event.status != "open" or event.deadline < datetime.now(): + raise HTTPException(status_code=400, detail="Die Frist ist abgelaufen. Bestellungen können nicht mehr storniert werden.") + + order = db.query(Order).filter( + Order.tenant_id == tenant.id, + Order.event_id == event.id, + Order.user_id == current_user.id + ).first() + + if not order: + return RedirectResponse(url=f"/?event_id={event.id}", status_code=status.HTTP_303_SEE_OTHER) + + if order.is_paid: + raise HTTPException(status_code=400, detail="Bereits bezahlte Bestellungen können nur vom Organisator storniert werden.") + + db.delete(order) + db.commit() + + success_msg = urllib.parse.quote("Deine Bestellung wurde erfolgreich storniert") + return RedirectResponse(url=f"/?event_id={event.id}&success={success_msg}", status_code=status.HTTP_303_SEE_OTHER) + + @app.get("/order/{order_id}/success", response_class=HTMLResponse) def order_success(order_id: int, request: Request, db: Session = Depends(get_db)): tenant = resolve_tenant(request, db) @@ -1522,6 +1574,45 @@ def toggle_paid(order_id: int, request: Request, db: Session = Depends(get_db)): return RedirectResponse(url=f"/admin?event_id={ev_id}&tab=orders", status_code=status.HTTP_303_SEE_OTHER) +@app.post("/admin/orders/{order_id}/delete") +def admin_delete_order( + order_id: int, + request: Request, + db: Session = Depends(get_db) +): + tenant = resolve_tenant(request, db) + actor = require_organizer_or_admin(request, db) + + order = db.query(Order).filter(Order.id == order_id, Order.tenant_id == tenant.id).first() + if not order: + raise HTTPException(status_code=404, detail="Bestellung nicht gefunden") + + ev_id = order.event_id + + # Falls per Guthaben bezahlt, Betrag automatisch zurückerstatten! + if order.is_paid and order.payment_method == "balance" and order.user: + order.user.balance += order.total_price + ev_title = order.event.title if order.event else "Brotzeit" + tx = BalanceTransaction( + tenant_id=tenant.id, + user_id=order.user.id, + order_id=order.id, + amount=order.total_price, + transaction_type="refund", + description=f"Rückerstattung wegen Stornierung: {ev_title}", + created_by_id=actor.id + ) + db.add(tx) + + db.delete(order) + db.commit() + + referer = request.headers.get("referer", "") + if "/einkauf" in referer: + return RedirectResponse(url=f"/einkauf?event_id={ev_id}&success=Bestellung erfolgreich storniert und ggf. erstattet", status_code=status.HTTP_303_SEE_OTHER) + return RedirectResponse(url=f"/admin?event_id={ev_id}&tab=orders&success=Bestellung erfolgreich storniert und ggf. erstattet", status_code=status.HTTP_303_SEE_OTHER) + + @app.get("/health") def health(): return {"status": "ok", "app": "Schmankerl"} diff --git a/app/static/style.css b/app/static/style.css index db008f6..a1fe693 100644 --- a/app/static/style.css +++ b/app/static/style.css @@ -133,12 +133,29 @@ body { transform: translateY(-1px); } +.hamburger-icon { + display: flex; + flex-direction: column; + justify-content: center; + gap: 3.5px; + width: 16px; + height: 14px; + flex-shrink: 0; +} + +.hamburger-icon .bar, .menu-toggle-btn .bar { display: block; - width: 16px; + width: 100%; height: 2px; background-color: var(--text-main); border-radius: 2px; + transition: all 0.2s ease; +} + +.menu-toggle-btn:hover .hamburger-icon .bar, +.menu-toggle-btn:hover .bar { + background-color: var(--accent); } .menu-btn-text { diff --git a/app/templates/admin.html b/app/templates/admin.html index 6062547..4498b5f 100644 --- a/app/templates/admin.html +++ b/app/templates/admin.html @@ -295,15 +295,25 @@ {% if event.sponsor_name %}
von Sponsor{% endif %} - {% if event.sponsor_name %} - - {% else %} -
- -
- {% endif %} +
+ {% if event.sponsor_name %} + + {% else %} +
+ +
+ {% endif %} + +
+ +
+
{% else %} diff --git a/app/templates/base.html b/app/templates/base.html index 178a980..e596520 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -23,9 +23,11 @@
@@ -121,14 +123,6 @@ Brotzeit bestellen - {% if current_user and (current_user.role in ['admin', 'organizer']) %} - - 🛒 - Einkaufsliste & Kasse - Einkauf - - {% endif %} - {% if current_user and current_user.role != 'guest' %}
KASSE & GUTHABEN
@@ -138,7 +132,16 @@ {% endif %} {% if current_user and current_user.role in ['admin', 'organizer'] %} -
ORGANISATION
+
VERWALTUNG & ORGA
+ + 🛒 + Einkaufsliste & Kasse + Theke + + + 📋 + Bestellungen & Abrechnung + 📅 Termine & Runden @@ -147,18 +150,17 @@ 🥨 Sortiment & Preise - - ✉️ - Einladungen & Gast-Links - - {% endif %} - - {% if current_user and current_user.role == 'admin' %} -
SYSTEM-ADMINISTRATION
👥 - Team- & Rollenverwaltung + {% if current_user.role == 'admin' %}Team, Rollen & Einladungen{% else %}Team & Einladungen{% endif %} + {% if current_user.role == 'admin' %} Admin + {% endif %} + + {% elif current_user and current_user.role == 'user' %} + + 🛒 + Einkaufsliste (Theke) {% endif %} diff --git a/app/templates/buyer.html b/app/templates/buyer.html index e949edd..96d3f29 100644 --- a/app/templates/buyer.html +++ b/app/templates/buyer.html @@ -247,34 +247,40 @@ {% if event.sponsor_name %}
von Sponsor{% endif %} - {% if event.sponsor_name %} - - {% elif order.is_paid %} -
- -
- {% else %} -
- {% if order.user and order.user.balance >= order.total_price %} -
-
+ {% else %} +
+ {% if order.user and order.user.balance >= order.total_price %} +
+ +
+ {% endif %} +
+ +
+
{% endif %} -
- + + +
- {% endif %} {% else %} diff --git a/app/templates/index.html b/app/templates/index.html index 961e102..351122c 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -3,6 +3,18 @@ {% block content %}
+ {% if success %} +
+ ✓ {{ success }} +
+ {% endif %} + + {% if error %} +
+ ⚠️ {{ error }} +
+ {% endif %} + {% if open_events|length > 1 %}
@@ -53,6 +65,8 @@
{% endif %} + {% set is_locked = is_closed or (existing_order and existing_order.is_paid) %} +
@@ -65,7 +79,7 @@
{% for product in products %} {% set current_qty = user_items.get(product.id, 0) %} -
+

{{ product.name }}

{{ product.description }}

@@ -79,9 +93,9 @@
- - - + + +
{% endfor %} @@ -125,11 +139,22 @@
{% endif %} + {% set is_locked = is_closed or (existing_order and existing_order.is_paid) %} + {% if existing_order %} -
- ℹ️ Du hast bereits für diese Runde bestellt ({% if existing_order.is_paid %}Bereits bezahlt ✓{% else %}Noch offen{% endif %}). - {% if not is_closed %}Du kannst deine Mengen anpassen und aktualisieren.{% endif %} -
+ {% if existing_order.is_paid %} +
+ 🔒 Bestellung bereits bezahlt ({{ "%.2f"|format(existing_order.total_price) }} €)
+ Deine Bestellung wurde vom Organisator bereits als bezahlt verbucht + ({% if existing_order.payment_method == 'balance' %}Guthaben abgebucht{% else %}Barzahlung vermerkt{% endif %}). + Änderungen sind gesperrt. Wende dich an deinen Organisator für Anpassungen. +
+ {% else %} +
+ ℹ️ Du hast bereits für diese Runde bestellt (Status: Noch offen). + {% if not is_closed %}Du kannst deine Mengen bis zum Fristende anpassen oder die Bestellung stornieren.{% endif %} +
+ {% endif %} {% endif %}
@@ -145,8 +170,10 @@
{% endif %} - - {% if not is_closed %} + {% if existing_order and not existing_order.is_paid and not is_closed %} +
+ +
+ {% endif %} + + {% if not is_closed and not (existing_order and existing_order.is_paid) %} Du kannst deine Bestellung bis zum Bestellschluss jederzeit hier anpassen. + {% elif existing_order and existing_order.is_paid %} + Bereits abgerechnet – Änderungen nur über den Organisator. {% else %} Die Frist ist abgelaufen. {% endif %} @@ -261,6 +298,24 @@ if (timerEl) timerEl.innerText = "Frist beendet"; {% endif %} + function cancelMyOrder() { + if (!confirm('Möchtest du deine Bestellung für diese Runde wirklich komplett stornieren?')) { + return; + } + const form = document.createElement('form'); + form.method = 'POST'; + form.action = '/order/cancel'; + + const evInput = document.createElement('input'); + evInput.type = 'hidden'; + evInput.name = 'event_id'; + evInput.value = '{{ event.id if event else "" }}'; + form.appendChild(evInput); + + document.body.appendChild(form); + form.submit(); + } + document.addEventListener('DOMContentLoaded', updateTotal); {% endblock %}