almet/copanier
1
0
Fork 0
mirror of https://github.com/almet/copanier.git synced 2025-04-28 19:42:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use more specific property Delivery.infos_url

Browse source
This commit is contained in:
Yohan Boniface 2019-04-23 23:16:04 +02:00
parent 77bf047974
commit 5437508b03
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
copanier/models.py
View file

@ -163,7 +163,7 @@ class Delivery(Base):
products: List[Product] = field(default_factory=list) products: List[Product] = field(default_factory=list)
orders: Dict[str, Order] = field(default_factory=dict) orders: Dict[str, Order] = field(default_factory=dict)
id: str = field(default_factory=lambda *a, **k: uuid.uuid4().hex) id: str = field(default_factory=lambda *a, **k: uuid.uuid4().hex)
url: str = "" infos_url: str = ""
@property @property
def status(self): def status(self):

2
copanier/templates/edit_delivery.html
View file

@ -37,7 +37,7 @@
</label> </label>
<label> <label>
<p>URL externe d'information</p> <p>URL externe d'information</p>
<input type="url" name="url" value="{{ delivery.url or '' }}"> <input type="url" name="infos_url" value="{{ delivery.infos_url or '' }}">
</label> </label>
<div> <div>
<input type="submit" name="submit" value="Valider" class="primary"> <input type="submit" name="submit" value="Valider" class="primary">

2
copanier/templates/includes/delivery_head.html
View file

@ -5,5 +5,5 @@
<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.status == delivery.OPEN %}<strong>Date limite de commande</strong> <time datetime="{{ delivery.order_before.date() }}">{{ delivery.order_before|date }}</time>{% elif delivery.status == delivery.ADJUSTMENT %}<strong>Ajustement en cours</strong>{% else %}<strong>Fermée</strong>{% endif %}</li> <li><i class="icon-hourglass"></i> {% if delivery.status == delivery.OPEN %}<strong>Date limite de commande</strong> <time datetime="{{ delivery.order_before.date() }}">{{ delivery.order_before|date }}</time>{% elif delivery.status == delivery.ADJUSTMENT %}<strong>Ajustement en cours</strong>{% else %}<strong>Fermée</strong>{% endif %}</li>
{% if delivery.instructions %}<li><i class="icon-lightbulb"></i> <strong>À savoir</strong> {{ delivery.instructions }}</li>{% endif %} {% if delivery.instructions %}<li><i class="icon-lightbulb"></i> <strong>À savoir</strong> {{ delivery.instructions }}</li>{% endif %}
{% if delivery.url %}<li><i class="icon-global"></i><strong>Plus d'infos</strong> <a href="{{ delivery.url }}" title="{{ delivery.url }}">{{ delivery.url|truncate(20)}}</a></li>{% endif %} {% if delivery.infos_url %}<li><i class="icon-global"></i><strong>Plus d'infos</strong> <a href="{{ delivery.infos_url }}" title="{{ delivery.infos_url }}">{{ delivery.infos_url|truncate(20)}}</a></li>{% endif %}
</ul> </ul>