kobold-ai/schmankerl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: hamburger menu vertical stack, lock paid orders, order cancellation with balance refund, deduplicate admin drawer

Browse Source
This commit is contained in:
kobold-ai
2026-09-22 11:27:46 +02:00
parent 896f1d7d08
commit 970f294c9b
6 changed files with 247 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/templates/admin.html
+19 -9
View File
@@ -295,15 +295,25 @@
{% if event.sponsor_name %}<br><small class="text-muted">von Sponsor</small>{% endif %}
</td>
<td>
{% if event.sponsor_name %}
<span class="badge-btn paid" style="cursor: default;">✓ Gesponsert</span>
{% else %}
<form action="/admin/toggle-paid/{{ order.id }}" method="POST" style="margin: 0;">
<button type="submit" class="badge-btn {% if order.is_paid %}paid{% else %}unpaid{% endif %}">
{% if order.is_paid %}✓ Bezahlt{% else %}⏳ Offen{% endif %}
</button>
</form>
{% endif %}
<div style="display: flex; align-items: center; justify-content: space-between; gap: 6px;">
{% if event.sponsor_name %}
<span class="badge-btn paid" style="cursor: default;">✓ Gesponsert</span>
{% else %}
<form action="/admin/toggle-paid/{{ order.id }}" method="POST" style="margin: 0;">
<button type="submit" class="badge-btn {% if order.is_paid %}paid{% else %}unpaid{% endif %}" title="Klick um Bezahlstatus umzuschalten (Guthaben wird automatisch erstattet)">
{% if order.is_paid %}
{% if order.payment_method == 'balance' %}✓ Guthaben{% else %}✓ Bezahlt{% endif %}
{% else %}
⏳ Offen
{% endif %}
</button>
</form>
{% endif %}
<form action="/admin/orders/{{ order.id }}/delete" method="POST" style="margin: 0;" onsubmit="return confirm('Bestellung für {{ order.display_name|escape }} wirklich stornieren? Bereits bezahltes Guthaben wird sofort erstattet.');">
<button type="submit" class="btn-revoke-small" title="Bestellung stornieren / löschen" style="padding: 2px 6px; font-size: 0.8rem;">🗑️</button>
</form>
</div>
</td>
</tr>
{% else %}
app/templates/base.html
+23 -21
View File
@@ -23,9 +23,11 @@
<!-- LEFT: Menu Toggle + Brand -->
<div class="nav-left">
<button class="menu-toggle-btn" id="drawerToggleBtn" onclick="openDrawer()" aria-label="Menü öffnen" aria-expanded="false">
<span class="bar"></span>
<span class="bar"></span>
<span class="bar"></span>
<span class="hamburger-icon">
<span class="bar"></span>
<span class="bar"></span>
<span class="bar"></span>
</span>
<span class="menu-btn-text">Menü</span>
</button>
@@ -121,14 +123,6 @@
<span class="nav-item-text">Brotzeit bestellen</span>
</a>
{% if current_user and (current_user.role in ['admin', 'organizer']) %}
<a href="/einkauf" class="drawer-nav-item" onclick="closeDrawer()">
<span class="nav-item-icon">🛒</span>
<span class="nav-item-text">Einkaufsliste & Kasse</span>
<span class="nav-badge-pill">Einkauf</span>
</a>
{% endif %}
{% if current_user and current_user.role != 'guest' %}
<div class="nav-group-title">KASSE & GUTHABEN</div>
<a href="/kasse" class="drawer-nav-item" onclick="closeDrawer()">
@@ -138,7 +132,16 @@
{% endif %}
{% if current_user and current_user.role in ['admin', 'organizer'] %}
<div class="nav-group-title">ORGANISATION</div>
<div class="nav-group-title">VERWALTUNG & ORGA</div>
<a href="/einkauf" class="drawer-nav-item" onclick="closeDrawer()">
<span class="nav-item-icon">🛒</span>
<span class="nav-item-text">Einkaufsliste & Kasse</span>
<span class="nav-badge-pill">Theke</span>
</a>
<a href="/admin?tab=orders" class="drawer-nav-item" onclick="closeDrawer()">
<span class="nav-item-icon">📋</span>
<span class="nav-item-text">Bestellungen & Abrechnung</span>
</a>
<a href="/admin?tab=event" class="drawer-nav-item" onclick="closeDrawer()">
<span class="nav-item-icon">📅</span>
<span class="nav-item-text">Termine & Runden</span>
@@ -147,18 +150,17 @@
<span class="nav-item-icon">🥨</span>
<span class="nav-item-text">Sortiment & Preise</span>
</a>
<a href="/admin?tab=team" class="drawer-nav-item" onclick="closeDrawer()">
<span class="nav-item-icon">✉️</span>
<span class="nav-item-text">Einladungen & Gast-Links</span>
</a>
{% endif %}
{% if current_user and current_user.role == 'admin' %}
<div class="nav-group-title">SYSTEM-ADMINISTRATION</div>
<a href="/admin?tab=team" class="drawer-nav-item" onclick="closeDrawer()">
<span class="nav-item-icon">👥</span>
<span class="nav-item-text">Team- & Rollenverwaltung</span>
<span class="nav-item-text">{% if current_user.role == 'admin' %}Team, Rollen & Einladungen{% else %}Team & Einladungen{% endif %}</span>
{% if current_user.role == 'admin' %}
<span class="nav-badge-pill admin">Admin</span>
{% endif %}
</a>
{% elif current_user and current_user.role == 'user' %}
<a href="/einkauf" class="drawer-nav-item" onclick="closeDrawer()">
<span class="nav-item-icon">🛒</span>
<span class="nav-item-text">Einkaufsliste (Theke)</span>
</a>
{% endif %}
app/templates/buyer.html
+29 -23
View File
@@ -247,34 +247,40 @@
{% if event.sponsor_name %}<br><small class="text-muted">von Sponsor</small>{% endif %}
</td>
<td>
{% if event.sponsor_name %}
<span class="badge-btn paid" style="cursor: default;">✓ Gesponsert</span>
{% elif order.is_paid %}
<form action="/admin/toggle-paid/{{ order.id }}" method="POST" style="margin: 0; display: inline;">
<button type="submit" class="badge-btn paid" title="Klick um Bezahlung zurückzusetzen">
{% if order.payment_method == 'balance' %}
✓ Bezahlt (Guthaben)
{% else %}
✓ Bezahlt (Bar)
{% endif %}
</button>
</form>
{% else %}
<div style="display: flex; gap: 6px; flex-wrap: wrap;">
{% if order.user and order.user.balance >= order.total_price %}
<form action="/kasse/charge-order/{{ order.id }}?method=balance" method="POST" style="margin: 0;">
<button type="submit" class="badge-btn paid" style="background: rgba(34, 197, 94, 0.15); color: var(--success);" title="Vom Guthaben des Mitarbeiters abbuchen">
💰 Abbuchen
<div style="display: flex; align-items: center; justify-content: space-between; gap: 8px; flex-wrap: wrap;">
{% if event.sponsor_name %}
<span class="badge-btn paid" style="cursor: default;">✓ Gesponsert</span>
{% elif order.is_paid %}
<form action="/admin/toggle-paid/{{ order.id }}" method="POST" style="margin: 0; display: inline;">
<button type="submit" class="badge-btn paid" title="Klick um Bezahlung zurückzusetzen (Guthaben wird automatisch erstattet)">
{% if order.payment_method == 'balance' %}
✓ Bezahlt (Guthaben)
{% else %}
✓ Bezahlt (Bar)
{% endif %}
</button>
</form>
{% else %}
<div style="display: flex; gap: 6px; flex-wrap: wrap;">
{% if order.user and order.user.balance >= order.total_price %}
<form action="/kasse/charge-order/{{ order.id }}?method=balance" method="POST" style="margin: 0;">
<button type="submit" class="badge-btn paid" style="background: rgba(34, 197, 94, 0.15); color: var(--success);" title="Vom Guthaben des Mitarbeiters abbuchen">
💰 Abbuchen
</button>
</form>
{% endif %}
<form action="/kasse/charge-order/{{ order.id }}?method=cash" method="POST" style="margin: 0;">
<button type="submit" class="badge-btn unpaid" title="Barzahlung annehmen">
💵 Bar bezahlt
</button>
</form>
</div>
{% endif %}
<form action="/kasse/charge-order/{{ order.id }}?method=cash" method="POST" style="margin: 0;">
<button type="submit" class="badge-btn unpaid" title="Barzahlung annehmen">
💵 Bar bezahlt
</button>
<form action="/admin/orders/{{ order.id }}/delete" method="POST" style="margin: 0; display: inline;" onsubmit="return confirm('Bestellung für {{ order.display_name|escape }} wirklich stornieren? Bereits bezahltes Guthaben wird sofort erstattet.');">
<button type="submit" class="btn-revoke-small" title="Bestellung stornieren / löschen" style="padding: 2px 6px; font-size: 0.8rem;">🗑️</button>
</form>
</div>
{% endif %}
</td>
</tr>
{% else %}
app/templates/index.html
+66 -11
View File
@@ -3,6 +3,18 @@
{% block content %}
<div class="container">
{% if success %}
<div class="alert-success" style="margin-bottom: 20px;">
✓ {{ success }}
</div>
{% endif %}
{% if error %}
<div class="alert-error" style="margin-bottom: 20px;">
⚠️ {{ error }}
</div>
{% endif %}
<!-- Multi-Event Picker (wenn mehrere anstehende Runden offen sind) -->
{% if open_events|length > 1 %}
<div class="multi-event-banner">
@@ -53,6 +65,8 @@
</div>
{% endif %}
{% set is_locked = is_closed or (existing_order and existing_order.is_paid) %}
<!-- Order Form -->
<form action="/order" method="POST" class="order-form" id="orderForm">
<input type="hidden" name="event_id" value="{{ event.id }}">
@@ -65,7 +79,7 @@
<div class="product-list">
{% for product in products %}
{% set current_qty = user_items.get(product.id, 0) %}
<div class="product-card {% if is_closed %}disabled{% endif %}" data-price="{{ product.price }}" data-id="{{ product.id }}">
<div class="product-card {% if is_locked %}disabled{% endif %}" data-price="{{ product.price }}" data-id="{{ product.id }}">
<div class="product-info">
<h3>{{ product.name }}</h3>
<p class="product-desc">{{ product.description }}</p>
@@ -79,9 +93,9 @@
</div>
</div>
<div class="quantity-control">
<button type="button" class="qty-btn" onclick="changeQty({{ product.id }}, -1)" {% if is_closed %}disabled{% endif %}>-</button>
<input type="number" id="qty_{{ product.id }}" name="qty_{{ product.id }}" value="{{ current_qty }}" min="0" max="50" class="qty-input" onchange="updateTotal()" {% if is_closed %}disabled{% endif %}>
<button type="button" class="qty-btn" onclick="changeQty({{ product.id }}, 1)" {% if is_closed %}disabled{% endif %}>+</button>
<button type="button" class="qty-btn" onclick="changeQty({{ product.id }}, -1)" {% if is_locked %}disabled{% endif %}>-</button>
<input type="number" id="qty_{{ product.id }}" name="qty_{{ product.id }}" value="{{ current_qty }}" min="0" max="50" class="qty-input" onchange="updateTotal()" {% if is_locked %}disabled{% endif %}>
<button type="button" class="qty-btn" onclick="changeQty({{ product.id }}, 1)" {% if is_locked %}disabled{% endif %}>+</button>
</div>
</div>
{% endfor %}
@@ -125,11 +139,22 @@
</div>
{% endif %}
{% set is_locked = is_closed or (existing_order and existing_order.is_paid) %}
{% if existing_order %}
<div class="notice-box">
ℹ️ Du hast bereits für diese Runde bestellt ({% if existing_order.is_paid %}<strong>Bereits bezahlt ✓</strong>{% else %}Noch offen{% endif %}).
{% if not is_closed %}Du kannst deine Mengen anpassen und aktualisieren.{% endif %}
</div>
{% if existing_order.is_paid %}
<div class="alert-success" style="margin-bottom: 16px; border-left: 4px solid var(--success); font-size: 0.88rem; line-height: 1.4;">
🔒 <strong>Bestellung bereits bezahlt ({{ "%.2f"|format(existing_order.total_price) }} €)</strong><br>
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.
</div>
{% else %}
<div class="notice-box" style="margin-bottom: 14px;">
ℹ️ Du hast bereits für diese Runde bestellt (Status: <strong>Noch offen</strong>).
{% if not is_closed %}Du kannst deine Mengen bis zum Fristende anpassen oder die Bestellung stornieren.{% endif %}
</div>
{% endif %}
{% endif %}
<hr class="divider">
@@ -145,8 +170,10 @@
</div>
{% endif %}
<button type="submit" class="btn-submit" id="submitBtn" {% if is_closed %}disabled{% endif %}>
{% if is_closed %}
<button type="submit" class="btn-submit" id="submitBtn" {% if is_locked %}disabled{% endif %}>
{% if existing_order and existing_order.is_paid %}
🔒 Bestellung bereits bezahlt & gesperrt
{% elif is_closed %}
🔒 Bestellschluss vorüber
{% elif existing_order %}
🥨 Bestellung aktualisieren
@@ -155,8 +182,18 @@
{% endif %}
</button>
{% if not is_closed %}
{% if existing_order and not existing_order.is_paid and not is_closed %}
<div style="margin-top: 10px;">
<button type="button" onclick="cancelMyOrder()" class="btn-secondary" style="width: 100%; border-color: var(--danger); color: var(--danger); font-size: 0.85rem; padding: 8px 12px; cursor: pointer;">
✕ Bestellung komplett stornieren
</button>
</div>
{% endif %}
{% if not is_closed and not (existing_order and existing_order.is_paid) %}
<small class="form-hint">Du kannst deine Bestellung bis zum Bestellschluss jederzeit hier anpassen.</small>
{% elif existing_order and existing_order.is_paid %}
<small class="form-hint">Bereits abgerechnet – Änderungen nur über den Organisator.</small>
{% else %}
<small class="form-hint text-warning">Die Frist ist abgelaufen.</small>
{% 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);
</script>
{% endblock %}