CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-07 15:34:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

change order-status info to text-blob

Browse Source
This commit is contained in:
Richard Schreiber
2024-11-18 08:39:00 +01:00
parent 8f7fca42e5
commit 4765dd5c9a
2 changed files with 55 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/pretix/presale/templates/pretixpresale/event/fragment_order_status.html
View File

@@ -3,29 +3,44 @@
{# Changes should be replicated in pretixcontrol/orders/fragment_order_status.html and in pretix/base/models/orders.py #} {# Changes should be replicated in pretixcontrol/orders/fragment_order_status.html and in pretix/base/models/orders.py #}
{% if order.status == "n" %} {% if order.status == "n" %}
{% if order.require_approval %} {% if order.require_approval %}
{% trans "Approval pending" %} <span class="text-blob-warning">
<i class="status-dot fa fa-exclamation-circle" aria-hidden="true"></i> {% trans "Approval pending" %}
</span>
{% elif order.total == 0 %} {% elif order.total == 0 %}
{% trans "Confirmation pending" context "order state" %} <span class="text-blob-warning">
<i class="status-dot fa fa-exclamation-circle" aria-hidden="true"></i> {% trans "Confirmation pending" context "order state" %}
</span>
{% elif event.settings.payment_pending_hidden %} {% elif event.settings.payment_pending_hidden %}
{# intentionally left blank #} {# intentionally left blank #}
{% elif order.valid_if_pending %} {% elif order.valid_if_pending %}
{% trans "Confirmed" context "order state" %} <span class="text-blob-info">
<i class="status-dot fa fa-info-circle" aria-hidden="true"></i> {% trans "Confirmed" context "order state" %}
</span>
{% else %} {% else %}
{% trans "Payment pending" %} <span class="text-blob-warning">
{% endif %} <i class="status-dot fa fa-exclamation-circle" aria-hidden="true"></i> {% trans "Payment pending" %}
{% if not event.settings.payment_pending_hidden %} </span>
<i class="status-dot fa fa-circle {% if order.valid_if_pending %}text-info{% else %}text-warning{% endif %}" aria-hidden="true"></i>
{% endif %} {% endif %}
{% elif order.status == "p" %} {% elif order.status == "p" %}
{% if order.count_positions == 0 %} {% if order.count_positions == 0 %}
{% trans "Canceled (paid fee)" %} <i class="status-dot fa fa-info-circle text-info" aria-hidden="true"></i> <span class="text-blob-info">
<i class="status-dot fa fa-info-circle" aria-hidden="true"></i> {% trans "Canceled (paid fee)" %}
</span>
{% elif order.total == 0 %} {% elif order.total == 0 %}
{% trans "Confirmed" context "order state" %} <i class="status-dot fa fa-check-circle text-success" aria-hidden="true"></i> <span class="text-blob-success">
<i class="status-dot fa fa-check-circle" aria-hidden="true"></i> {% trans "Confirmed" context "order state" %}
</span>
{% else %} {% else %}
{% trans "Paid" %} <i class="status-dot fa fa-check-circle text-success" aria-hidden="true"></i> <span class="text-blob-success">
<i class="status-dot fa fa-check-circle" aria-hidden="true"></i> {% trans "Paid" %}
</span>
{% endif %} {% endif %}
{% elif order.status == "e" %} {% elif order.status == "e" %}
{% trans "Expired" %} <i class="status-dot fa fa-minus-circle text-danger" aria-hidden="true"></i> <span class="text-blob-danger">
<i class="status-dot fa fa-minus-circle" aria-hidden="true"></i> {% trans "Expired" %}
</span>
{% elif order.status == "c" %} {% elif order.status == "c" %}
{% trans "Canceled" %} <i class="status-dot fa fa-times-circle text-danger" aria-hidden="true"></i> <span class="text-blob-danger">
<i class="status-dot fa fa-times-circle" aria-hidden="true"></i> {% trans "Canceled" %}
</span>
{% endif %} {% endif %}

28
src/pretix/static/pretixbase/scss/_theme.scss
View File

@@ -252,3 +252,31 @@ svg.svg-icon {
@include table-row-variant('info', var(--pretix-brand-info-success-lighten-30), var(--pretix-brand-info-success-lighten-25)); @include table-row-variant('info', var(--pretix-brand-info-success-lighten-30), var(--pretix-brand-info-success-lighten-25));
@include table-row-variant('warning', var(--pretix-brand-warning-lighten-40), var(--pretix-brand-warning-lighten-35)); @include table-row-variant('warning', var(--pretix-brand-warning-lighten-40), var(--pretix-brand-warning-lighten-35));
@include table-row-variant('danger', var(--pretix-brand-danger-lighten-30), var(--pretix-brand-danger-lighten-25)); @include table-row-variant('danger', var(--pretix-brand-danger-lighten-30), var(--pretix-brand-danger-lighten-25));
.text-blob-success, .text-blob-info, .text-blob-warning, .text-blob-danger {
padding: .25em .8em;
border-radius: 1em;
&:has(.status-dot) {
padding-left: .45em;
}
}
.text-blob-success {
color: var(--pretix-brand-success-darken-10);
background: var(--pretix-brand-success-lighten-48);
}
.text-blob-info {
color: var(--pretix-brand-info-darken-20);
background: var(--pretix-brand-info-lighten-33);
}
.text-blob-warning {
color: var(--pretix-brand-warning-darken-25);
background: var(--pretix-brand-warning-lighten-41);
.status-dot {
color: var(--pretix-brand-warning);
}
}
.text-blob-danger {
color: var(--pretix-brand-danger-darken-5);
background: var(--pretix-brand-danger-lighten-43);
}