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

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

@@ -631,46 +631,6 @@
</div> </div>
{% endif %} {% endif %}
<!-- Форма добавления нового платежа -->
{% if order.pk %}
<div class="border rounded p-3 bg-white">
<h6 class="mb-3"><i class="bi bi-plus-circle"></i> Добавить новый платеж</h6>
<form method="post" action="{% url 'orders:payment-add' order.order_number %}" id="payment-add-form">
{% csrf_token %}
<div class="row align-items-end">
<div class="col-md-4">
<label class="form-label">Способ оплаты</label>
<select name="payment_method" class="form-select" required>
<option value="">---------</option>
{% load orders_tags %}
{% get_payment_methods as payment_methods %}
{% for pm in payment_methods %}
<option value="{{ pm.id }}">{{ pm.name }}</option>
{% endfor %}
</select>
</div>
<div class="col-md-3">
<label class="form-label">Сумма</label>
<input type="number" name="amount" step="0.01" min="0.01" class="form-control" placeholder="0.00" required>
</div>
<div class="col-md-3">
<label class="form-label">Примечания</label>
<input type="text" name="notes" class="form-control" placeholder="Опционально">
</div>
<div class="col-md-2">
<button type="submit" class="btn btn-success w-100">
<i class="bi bi-plus-lg"></i> Добавить
</button>
</div>
</div>
</form>
</div>
{% else %}
<div class="alert alert-warning mb-0">
<i class="bi bi-info-circle"></i> Сначала создайте заказ, затем вы сможете добавлять платежи.
</div>
{% endif %}
<!-- Итоговая сумма платежей --> <!-- Итоговая сумма платежей -->
{% if order.pk %} {% if order.pk %}
<div class="border-top pt-3 mt-3"> <div class="border-top pt-3 mt-3">
@@ -686,9 +646,53 @@
</div> </div>
</div> </div>
{% endif %} {% 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>
</div>
{% endif %}
</div> </div>
</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">
{% csrf_token %}
<div class="row align-items-end">
<div class="col-md-4">
<label class="form-label">Способ оплаты</label>
<select name="payment_method" class="form-select" required>
<option value="">---------</option>
{% load orders_tags %}
{% get_payment_methods as payment_methods %}
{% for pm in payment_methods %}
<option value="{{ pm.id }}">{{ pm.name }}</option>
{% endfor %}
</select>
</div>
<div class="col-md-3">
<label class="form-label">Сумма</label>
<input type="number" name="amount" step="0.01" min="0.01" class="form-control" placeholder="0.00" required>
</div>
<div class="col-md-3">
<label class="form-label">Примечания</label>
<input type="text" name="notes" class="form-control" placeholder="Опционально">
</div>
<div class="col-md-2">
<button type="submit" class="btn btn-success w-100">
<i class="bi bi-plus-lg"></i> Добавить
</button>
</div>
</div>
</form>
</div>
</div>
{% endif %}
<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>