From 0d5f0d2015a46088ebb0287ce4adfdeb39081631 Mon Sep 17 00:00:00 2001 From: Andrey Smakotin Date: Thu, 13 Nov 2025 00:39:59 +0300 Subject: [PATCH] some fix --- .../orders/templates/orders/order_list.html | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/myproject/orders/templates/orders/order_list.html b/myproject/orders/templates/orders/order_list.html index 4ea9b43..820fc36 100644 --- a/myproject/orders/templates/orders/order_list.html +++ b/myproject/orders/templates/orders/order_list.html @@ -91,13 +91,12 @@ Номер - Клиент - Дата доставки + Дата + Время Тип Статус Сумма Оплата - Создан Действия @@ -109,17 +108,20 @@ {{ order.order_number }} - {{ order.customer.name }} {% if order.delivery_date %} {{ order.delivery_date|date:"d.m.Y" }} - {% if order.delivery_time_start %} -
{{ order.delivery_time_window }} - {% endif %} {% else %} Не указано {% endif %} + + {% if order.delivery_time_start %} + {{ order.delivery_time_window }} + {% else %} + + {% endif %} + {% if order.is_delivery %} Доставка @@ -156,7 +158,6 @@ Не оплачен {% endif %} - {{ order.created_at|date:"d.m.Y H:i" }}