some fix
This commit is contained in:
@@ -91,13 +91,12 @@
|
|||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th>Номер</th>
|
<th>Номер</th>
|
||||||
<th>Клиент</th>
|
<th>Дата</th>
|
||||||
<th>Дата доставки</th>
|
<th>Время</th>
|
||||||
<th>Тип</th>
|
<th>Тип</th>
|
||||||
<th>Статус</th>
|
<th>Статус</th>
|
||||||
<th>Сумма</th>
|
<th>Сумма</th>
|
||||||
<th>Оплата</th>
|
<th>Оплата</th>
|
||||||
<th class="d-none d-md-table-cell">Создан</th>
|
|
||||||
<th>Действия</th>
|
<th>Действия</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
@@ -109,17 +108,20 @@
|
|||||||
<strong>{{ order.order_number }}</strong>
|
<strong>{{ order.order_number }}</strong>
|
||||||
</a>
|
</a>
|
||||||
</td>
|
</td>
|
||||||
<td>{{ order.customer.name }}</td>
|
|
||||||
<td>
|
<td>
|
||||||
{% if order.delivery_date %}
|
{% if order.delivery_date %}
|
||||||
{{ order.delivery_date|date:"d.m.Y" }}
|
{{ order.delivery_date|date:"d.m.Y" }}
|
||||||
{% if order.delivery_time_start %}
|
|
||||||
<br><small class="text-muted">{{ order.delivery_time_window }}</small>
|
|
||||||
{% endif %}
|
|
||||||
{% else %}
|
{% else %}
|
||||||
<span class="text-muted">Не указано</span>
|
<span class="text-muted">Не указано</span>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
|
<td>
|
||||||
|
{% if order.delivery_time_start %}
|
||||||
|
<small class="text-muted">{{ order.delivery_time_window }}</small>
|
||||||
|
{% else %}
|
||||||
|
<span class="text-muted">—</span>
|
||||||
|
{% endif %}
|
||||||
|
</td>
|
||||||
<td>
|
<td>
|
||||||
{% if order.is_delivery %}
|
{% if order.is_delivery %}
|
||||||
<span class="badge bg-info">Доставка</span>
|
<span class="badge bg-info">Доставка</span>
|
||||||
@@ -156,7 +158,6 @@
|
|||||||
<span class="badge bg-danger">Не оплачен</span>
|
<span class="badge bg-danger">Не оплачен</span>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
<td class="d-none d-md-table-cell">{{ order.created_at|date:"d.m.Y H:i" }}</td>
|
|
||||||
<td>
|
<td>
|
||||||
<a href="{% url 'orders:order-detail' order.pk %}"
|
<a href="{% url 'orders:order-detail' order.pk %}"
|
||||||
class="btn btn-sm btn-outline-primary"
|
class="btn btn-sm btn-outline-primary"
|
||||||
|
|||||||
Reference in New Issue
Block a user