diff --git a/src/pretix/control/templates/pretixcontrol/event/new_index.html b/src/pretix/control/templates/pretixcontrol/event/new_index.html index 330e660351..4a3b280382 100644 --- a/src/pretix/control/templates/pretixcontrol/event/new_index.html +++ b/src/pretix/control/templates/pretixcontrol/event/new_index.html @@ -129,16 +129,6 @@
-
- - {{ attendees_ordered.content|safe }} - -
-
{{ attendees_paid_ordered.content|safe }} diff --git a/src/pretix/control/views/new_dashboard.py b/src/pretix/control/views/new_dashboard.py index dbcb1f9fbe..3824ba2f8d 100644 --- a/src/pretix/control/views/new_dashboard.py +++ b/src/pretix/control/views/new_dashboard.py @@ -96,34 +96,15 @@ class IndexView(EventPermissionRequiredMixin, ChartContainingView, TemplateView) order__event=self.request.event, item__admission=True, order__status__in=(Order.STATUS_PAID, Order.STATUS_PENDING), ).count() - ctx['attendees_ordered'] = { - 'content': NUM_WIDGET.format(num=f'{tickc} ', - text=_('Attendees (ordered)'), - text_add=''), - 'priority': 100, - 'url': reverse('control:event.orders', kwargs={ - 'event': self.request.event.slug, - 'organizer': self.request.event.organizer.slug - }) + ('?subevent={}'.format(subevent.pk) if subevent else '') - } paidc = opqs.filter( order__event=self.request.event, item__admission=True, order__status=Order.STATUS_PAID, ).count() - ctx['attendees_paid'] = { - 'content': NUM_WIDGET.format(num=f'{paidc} ', text=_('Attendees (paid)'), - text_add=''), - 'priority': 100, - 'url': reverse('control:event.orders.overview', kwargs={ - 'event': self.request.event.slug, - 'organizer': self.request.event.organizer.slug - }) + ('?subevent={}'.format(subevent.pk) if subevent else '') - } ctx['attendees_paid_ordered'] = { 'content': NUM_WIDGET.format( - num='', - text=_(f'{paidc} paid, {tickc - paidc} pending'), - text_add=''), + num=f' {tickc}', + text=_('Attendees'), + text_add=f'{paidc} paid, {tickc - paidc} pending'), 'priority': 100, 'url': reverse('control:event.orders.overview', kwargs={ 'event': self.request.event.slug, @@ -145,9 +126,13 @@ class IndexView(EventPermissionRequiredMixin, ChartContainingView, TemplateView) ctx['total_revenue'] = { 'content': NUM_WIDGET.format( - num=formats.localize(round_decimal(rev, self.request.event.currency)), - text=_('Total revenue ({currency})').format(currency=self.request.event.currency), - text_add=''), + num='{currency} {amount}'.format( + currency=self.request.event.currency, + amount=formats.localize(round_decimal(rev, self.request.event.currency)) + ), + text='', + text_add=_('Total revenue') + ), 'priority': 100, 'url': reverse('control:event.orders.overview', kwargs={ 'event': self.request.event.slug, @@ -213,7 +198,6 @@ class IndexView(EventPermissionRequiredMixin, ChartContainingView, TemplateView) }) ctx['rev_data'] = json.dumps(data) cache.set('statistics_rev_data' + ckey, ctx['rev_data']) - # ctx = ctx | statistics.get_context_data(IndexView(request=request)) ctx['has_overpaid_orders'] = can_view_orders and Order.annotate_overpayments(self.request.event.orders).filter( Q(~Q(status=Order.STATUS_CANCELED) & Q(pending_sum_t__lt=0)) diff --git a/src/pretix/static/pretixcontrol/scss/_dashboard.scss b/src/pretix/static/pretixcontrol/scss/_dashboard.scss index f546dd903d..5fc087feb3 100644 --- a/src/pretix/static/pretixcontrol/scss/_dashboard.scss +++ b/src/pretix/static/pretixcontrol/scss/_dashboard.scss @@ -36,6 +36,12 @@ .dashboard .widget-container.widget-small { width: 25%; + + .icon { + color: lighten($brand-primary, 15%); + font-size: 34px; + font-weight: bold; + } } .dashboard .widget-container.widget-lazy-loading {