From 7c1780697a5d5741cd4bd6696476f6634d3b0c3e Mon Sep 17 00:00:00 2001
From: Andrey Smakotin <slamfromm@gmail.com>
Date: Sat, 29 Nov 2025 20:38:15 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=BE=20=D1=81=D0=B2=D0=BE=D0=B9=D1=81=D1=82=D0=B2=D0=BE?=
 =?UTF-8?q?=20overpayment=20=D0=B4=D0=BB=D1=8F=20=D0=BA=D0=BE=D1=80=D1=80?=
 =?UTF-8?q?=D0=B5=D0=BA=D1=82=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=BE=D1=82=D0=BE?=
 =?UTF-8?q?=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BF=D0=B5?=
 =?UTF-8?q?=D1=80=D0=B5=D0=BF=D0=BB=D0=B0=D1=82=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 myproject/orders/models/order.py                  | 5 +++++
 myproject/orders/templates/orders/order_form.html | 4 +---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/myproject/orders/models/order.py b/myproject/orders/models/order.py
index c11a2cc..a913779 100644
--- a/myproject/orders/models/order.py
+++ b/myproject/orders/models/order.py
@@ -372,6 +372,11 @@ class Order(models.Model):
         """Остаток к оплате"""
         return max(self.total_amount - self.amount_paid, 0)
 
+    @property
+    def overpayment(self):
+        """Переплата (если amount_paid > total_amount)"""
+        return max(self.amount_paid - self.total_amount, 0)
+
     @property
     def subtotal(self):
         """Сумма только товаров (без доставки)"""
diff --git a/myproject/orders/templates/orders/order_form.html b/myproject/orders/templates/orders/order_form.html
index 4a27da6..8a9dfbd 100644
--- a/myproject/orders/templates/orders/order_form.html
+++ b/myproject/orders/templates/orders/order_form.html
@@ -612,17 +612,15 @@
                         
                         <!-- Предупреждение о переплате -->
                         {% if order.amount_paid > order.total_amount %}
-                        {% with overpayment=order.amount_paid|add:"-"|add:order.total_amount %}
                         <div class="alert alert-warning mb-3">
                             <i class="bi bi-exclamation-triangle-fill"></i> <strong>Обнаружена переплата!</strong><br>
                             <small>
                                 Оплачено <strong>{{ order.amount_paid|floatformat:2 }} руб.</strong>, 
                                 сумма заказа <strong>{{ order.total_amount|floatformat:2 }} руб.</strong><br>
-                                Переплата: <strong class="text-danger">{{ overpayment|floatformat:2 }} руб.</strong><br>
+                                Переплата: <strong class="text-danger">{{ order.overpayment|floatformat:2 }} руб.</strong><br>
                                 Создайте возврат в кошелёк клиента во вкладке «Создать возврат» ниже.
                             </small>
                         </div>
-                        {% endwith %}
                         {% endif %}
                         
                         <div class="row mb-3">