smaa/octopus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Move payment form back to Payment section (outside main form)\n\nPayment add form is now positioned right after the Payment card section,\nmaking it more logical - all payment-related UI is together.\n\nThe form remains OUTSIDE the main order form to avoid nested forms issue.

Browse Source
This commit is contained in:
Andrey Smakotin
2025-11-29 02:34:08 +03:00
parent 84ed3a0c7d
commit 438ca5d515
1 changed files with 44 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
myproject/orders/templates/orders/order_form.html
View File

@@ -631,10 +631,35 @@
</div> </div>
{% endif %} {% endif %}
<!-- Форма добавления нового платежа --> <!-- Итоговая сумма платежей -->
{% if order.pk %} {% if order.pk %}
<div class="border rounded p-3 bg-white"> <div class="border-top pt-3 mt-3">
<div class="row align-items-center">
<div class="col">
<p class="mb-0 text-muted"><i class="bi bi-cash-stack"></i> Всего внесено:</p>
</div>
<div class="col-auto">
<h5 class="mb-0 text-success">
{{ order.amount_paid|default:"0.00"|floatformat:2 }}&nbsp;руб.
</h5>
</div>
</div>
</div>
{% endif %}
<!-- Форма добавления нового платежа (ОТДЕЛЬНАЯ форма внутри card-body) -->
{% if order.pk %}
<div class="border-top pt-3 mt-3">
<h6 class="mb-3"><i class="bi bi-plus-circle"></i> Добавить новый платеж</h6> <h6 class="mb-3"><i class="bi bi-plus-circle"></i> Добавить новый платеж</h6>
</div>
{% endif %}
</div>
</div>
<!-- Форма добавления платежа (ВНЕ основной формы, но сразу после секции Оплата) -->
{% if order.pk %}
<div class="card mb-3">
<div class="card-body">
<form method="post" action="{% url 'orders:payment-add' order.order_number %}" id="payment-add-form"> <form method="post" action="{% url 'orders:payment-add' order.order_number %}" id="payment-add-form">
{% csrf_token %} {% csrf_token %}
<div class="row align-items-end"> <div class="row align-items-end">
@@ -665,30 +690,9 @@
</div> </div>
</form> </form>
</div> </div>
{% else %}
<div class="alert alert-warning mb-0">
<i class="bi bi-info-circle"></i> Сначала создайте заказ, затем вы сможете добавлять платежи.
</div> </div>
{% endif %} {% endif %}
<!-- Итоговая сумма платежей -->
{% if order.pk %}
<div class="border-top pt-3 mt-3">
<div class="row align-items-center">
<div class="col">
<p class="mb-0 text-muted"><i class="bi bi-cash-stack"></i> Всего внесено:</p>
</div>
<div class="col-auto">
<h5 class="mb-0 text-success">
{{ order.amount_paid|default:"0.00"|floatformat:2 }}&nbsp;руб.
</h5>
</div>
</div>
</div>
{% endif %}
</div>
</div>
<div class="card mb-3"> <div class="card mb-3">
<div class="card-header"> <div class="card-header">
<h5 class="mb-0"><i class="bi bi-three-dots"></i> Дополнительно</h5> <h5 class="mb-0"><i class="bi bi-three-dots"></i> Дополнительно</h5>