diff --git a/myproject/orders/admin.py b/myproject/orders/admin.py index 766adfa..a88c1b6 100644 --- a/myproject/orders/admin.py +++ b/myproject/orders/admin.py @@ -95,7 +95,6 @@ class OrderAdmin(admin.ModelAdmin): ('Оплата', { 'fields': ( 'total_amount', - 'discount_amount', 'amount_paid', 'amount_due', 'payment_status', diff --git a/myproject/orders/forms.py b/myproject/orders/forms.py index 86daa68..2685d9a 100644 --- a/myproject/orders/forms.py +++ b/myproject/orders/forms.py @@ -102,7 +102,6 @@ class OrderForm(forms.ModelForm): 'recipient_name', 'recipient_phone', 'status', - 'discount_amount', 'is_anonymous', 'special_instructions', ] diff --git a/myproject/orders/models/order.py b/myproject/orders/models/order.py index 4d92eaa..4487ae0 100644 --- a/myproject/orders/models/order.py +++ b/myproject/orders/models/order.py @@ -137,15 +137,6 @@ class Order(models.Model): help_text="Общая сумма заказа включая доставку" ) - # Скидки - discount_amount = models.DecimalField( - max_digits=10, - decimal_places=2, - default=0, - verbose_name="Сумма скидки", - help_text="Применяется вручную или через систему скидок" - ) - # Частичная оплата amount_paid = models.DecimalField( max_digits=10, @@ -332,8 +323,7 @@ class Order(models.Model): # Пересчитываем стоимость доставки если она автоматическая self.recalculate_delivery_cost() - subtotal = items_total + self.delivery_cost - self.total_amount = subtotal - self.discount_amount + self.total_amount = items_total + self.delivery_cost return self.total_amount def update_payment_status(self): diff --git a/myproject/orders/templates/orders/order_detail.html b/myproject/orders/templates/orders/order_detail.html index 460d4da..50ff32c 100644 --- a/myproject/orders/templates/orders/order_detail.html +++ b/myproject/orders/templates/orders/order_detail.html @@ -312,12 +312,6 @@
{{ order.delivery_cost|floatformat:2 }} руб.
{% endif %} - {% if order.discount_amount > 0 %} -
-
Скидка:
-
-{{ order.discount_amount|floatformat:2 }} руб.
-
- {% endif %}
Итого:
diff --git a/myproject/orders/templates/orders/order_form.html b/myproject/orders/templates/orders/order_form.html index da3af02..08004f5 100644 --- a/myproject/orders/templates/orders/order_form.html +++ b/myproject/orders/templates/orders/order_form.html @@ -700,16 +700,6 @@
- - -
-
-
- - {{ form.discount_amount }} -
-
-