pricing: split agenda pricing list (#67675)

This commit is contained in:
Lauréline Guérin 2022-07-26 11:01:43 +02:00
parent a1eff5cb91
commit a179e2c0ff
No known key found for this signature in database
GPG Key ID: 1FAB9B9B4F93D473
2 changed files with 22 additions and 3 deletions

View File

@ -19,8 +19,9 @@
</div>
{% if object_list %}
<div>
<h3>{% trans "Pricings" context 'agenda pricing' %}</h3>
<ul class="objects-list single-links">
{% for object in object_list %}
{% for object in object_list %}{% if not object.flat_fee_schedule %}
<li>
<a href="{% url 'lingo-manager-agenda-pricing-detail' pk=object.pk %}">
{{ object }}
@ -30,7 +31,21 @@
</a>
<a href="{% url 'lingo-manager-pricing-detail' object.pricing.pk %}" class="link-action-icon link">{% trans "see" %}</a>
</li>
{% endfor %}
{% endif %}{% endfor %}
</ul>
<h3>{% trans "Flat fee schedule pricings" %}</h3>
<ul class="objects-list single-links">
{% for object in object_list %}{% if object.flat_fee_schedule %}
<li>
<a href="{% url 'lingo-manager-agenda-pricing-detail' pk=object.pk %}">
{{ object }}
({{ object.pricing }}
- {% blocktrans with start=object.date_start|date:'d/m/Y' end=object.date_end|date:'d/m/Y' %}From {{ start }} to {{ end }}{% endblocktrans %})
<span class="extra-info"> [{% trans "identifier:" %} {{ object.slug }}]</span>
</a>
<a href="{% url 'lingo-manager-pricing-detail' object.pricing.pk %}" class="link-action-icon link">{% trans "see" %}</a>
</li>
{% endif %}{% endfor %}
</ul>
</div>
{% else %}

View File

@ -744,7 +744,11 @@ class AgendaPricingListView(ListView):
model = AgendaPricing
def get_queryset(self):
return AgendaPricing.objects.all().select_related('pricing').order_by('date_start', 'date_end')
return (
AgendaPricing.objects.all()
.select_related('pricing')
.order_by('flat_fee_schedule', 'date_start', 'date_end')
)
agenda_pricing_list = AgendaPricingListView.as_view()