From 438ca5d5152689c891532eb653b64805ce2d148d Mon Sep 17 00:00:00 2001
From: Andrey Smakotin <slamfromm@gmail.com>
Date: Sat, 29 Nov 2025 02:34:08 +0300
Subject: [PATCH] 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.

---
 .../orders/templates/orders/order_form.html   | 84 ++++++++++---------
 1 file changed, 44 insertions(+), 40 deletions(-)

diff --git a/myproject/orders/templates/orders/order_form.html b/myproject/orders/templates/orders/order_form.html
index 53bf0d4..24f2831 100644
--- a/myproject/orders/templates/orders/order_form.html
+++ b/myproject/orders/templates/orders/order_form.html
@@ -631,46 +631,6 @@
                 </div>
                 {% 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 %}
                 <div class="border-top pt-3 mt-3">
@@ -686,9 +646,53 @@
                     </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>
+                </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">
+                    {% 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-header">
                 <h5 class="mb-0"><i class="bi bi-three-dots"></i> Дополнительно</h5>