diff options
| -rw-r--r-- | core/models.py | 2 | ||||
| -rw-r--r-- | core/templates/core/order_list.html | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/core/models.py b/core/models.py index ee673ff..21cdfed 100644 --- a/core/models.py +++ b/core/models.py @@ -86,7 +86,7 @@ class Order(models.Model): pickup_point = models.ForeignKey(PickupPoint, on_delete=models.CASCADE) client_name = models.CharField(max_length=255, null=True, blank=True) pickup_code = models.IntegerField() - status = models.CharField(max_length=50, choices=STATUS_CHOICES, default="Новый") + status = models.CharField(max_length=50, choices=STATUS_CHOICES, default="new") user = models.ForeignKey(User, on_delete=models.SET_NULL, null=True, blank=True) class OrderItem(models.Model): diff --git a/core/templates/core/order_list.html b/core/templates/core/order_list.html index 8fe80bd..b3aa9c0 100644 --- a/core/templates/core/order_list.html +++ b/core/templates/core/order_list.html @@ -5,11 +5,12 @@ {% block h1 %}Заказы{% endblock %} {% block content %} -{% if user.role.name == "Администратор" or user.role.name == "Менеджер" %} +<div> + <a href="{% url 'product_list' %}" class="btn">Продукты</a> +</div> <div> <a href="{% url 'order_create' %}" class="btn">Добавить заказ</a> </div> -{% endif %} <div> {% for order in orders %} <div class="product-card"> @@ -20,7 +21,7 @@ {% endfor %} </strong><br/> Пункт выдачи: {{ order.pickup_point.address }}<br/> - Статус: {{ order.status }}<br/> + Статус: {{ order.get_status_display }}<br/> {% if user.role.name == "Администратор" or user.role.name == "Менеджер" %} <a href="{% url 'order_update' order.id %}">Редактировать заказ</a> {% endif %} |