Add Delivery.instructions field

This commit is contained in:
Yohan Boniface 2019-04-02 19:51:28 +02:00
parent d8e9e6f714
commit 8227f1566c
3 changed files with 7 additions and 1 deletions

View file

@ -138,6 +138,7 @@ class Delivery(Base):
to_date: datetime_field to_date: datetime_field
order_before: datetime_field order_before: datetime_field
description: str = "" description: str = ""
instructions: str = ""
where: str = "Marché de la Briche" where: str = "Marché de la Briche"
products: List[Product] = field(default_factory=lambda *a, **k: []) products: List[Product] = field(default_factory=lambda *a, **k: [])
orders: Dict[str, Order] = field(default_factory=lambda *a, **k: {}) orders: Dict[str, Order] = field(default_factory=lambda *a, **k: {})

View file

@ -27,6 +27,10 @@
<h5>Date de limite de commande</h5> <h5>Date de limite de commande</h5>
<input type="date" name="order_before" value="{{ delivery.order_before.date() if delivery.order_before else '' }}" required> <input type="date" name="order_before" value="{{ delivery.order_before.date() if delivery.order_before else '' }}" required>
</label> </label>
<label>
<h5>Instructions particulières</h5>
<input type="text" name="instructions" value="{{ delivery.instructions or '' }}">
</label>
<div> <div>
<input type="submit" name="submit" value="Valider"> <input type="submit" name="submit" value="Valider">
</div> </div>

View file

@ -1,6 +1,7 @@
<ul class="delivery-head"> <ul class="delivery-head">
<li><i class="icon-basket"></i> <strong>Produits</strong> {{ delivery.description }}</li> <li><i class="icon-basket"></i> <strong>Produits</strong> {{ delivery.description }}</li>
<li><i class="icon-map-pin"></i> <strong>Lieu</strong> {{ delivery.where }}</li> <li><i class="icon-streetsign"></i> <strong>Lieu</strong> {{ delivery.where }}</li>
<li><i class="icon-clock"></i> <strong>Date de livraison</strong> <time datetime="{{ delivery.from_date }}">{{ delivery.from_date|date }} de {{ delivery.from_date|time }} à {{ delivery.to_date|time }}</time></li> <li><i class="icon-clock"></i> <strong>Date de livraison</strong> <time datetime="{{ delivery.from_date }}">{{ delivery.from_date|date }} de {{ delivery.from_date|time }} à {{ delivery.to_date|time }}</time></li>
<li><i class="icon-hourglass"></i> {% if delivery.is_open %}<strong>Date limite de commande</strong> <time datetime="{{ delivery.order_before.date() }}">{{ delivery.order_before|date }}</time>{% else %}<strong>Fermée</strong>{% endif %}</li> <li><i class="icon-hourglass"></i> {% if delivery.is_open %}<strong>Date limite de commande</strong> <time datetime="{{ delivery.order_before.date() }}">{{ delivery.order_before|date }}</time>{% else %}<strong>Fermée</strong>{% endif %}</li>
{% if delivery.instructions %}<li><i class="icon-lightbulb"></i> <strong>À savoir</strong> {{ delivery.instructions }}</li>{% endif %}
</ul> </ul>