upstream/v2026.1.0 #12

Merged
simon merged 241 commits from upstream/v2026.1.0 into master 2026-02-03 21:56:32 +00:00
2 changed files with 6 additions and 1 deletions
Showing only changes of commit 2aa27f56f1 - Show all commits

View File

@@ -24,6 +24,8 @@
<small>
{% blocktrans trimmed %}
Orders paid in multiple payments are shown with the date of their last payment.
Placed orders include all orders (pending, paid, cancelled, and expired);
paid orders include only paid orders and exclude all cancelled orders.
{% endblocktrans %}
</small>
</p>

View File

@@ -103,7 +103,10 @@ class IndexView(EventPermissionRequiredMixin, ChartContainingView, TemplateView)
day = o['datetime'].astimezone(tz).date()
ordered_by_day[day] = ordered_by_day.get(day, 0) + 1
paid_by_day = {}
for o in oqs.filter(event=self.request.event, payment_date__isnull=False).values('payment_date'):
for o in oqs.filter(
event=self.request.event, payment_date__isnull=False,
status=Order.STATUS_PAID, all_positions__canceled=False
).distinct().values('payment_date'):
day = o['payment_date'].astimezone(tz).date()
paid_by_day[day] = paid_by_day.get(day, 0) + 1