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

Make it work, again.

Browse source
This commit is contained in:
Alexis M 2019-09-23 21:41:53 +02:00
parent 83b78b3684
commit 90b2a92894
4 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
copanier/models.py
View file

@ -154,6 +154,7 @@ class Groups(PersistedBase):
class Producer(Base):
id: str
referent: str = ""
tel_referent: str = ""
contact: str = ""
location: str = ""
@ -169,6 +170,7 @@ class Product(Base):
img: str = ""
packing: int = None
producer: str = ""
rupture: bool = False
def __str__(self):
out = self.name

9
copanier/templates/emails/order_summary.txt
View file

@ -1,14 +1,11 @@
Salut salut,
Voici le résumé de votre commande «{{ delivery.name }}»
Voici le résumé de votre commande «{{ delivery.name }}» pour « {{ request['user']['group_name'] }} ».
Produit | Prix unitaire | Quantité
{% for product in delivery.products %}
{% if order[product].quantity %}
{{ product.name }} | {{ product.price }} € | {{ order[product].quantity }}
{% endif %}
{% endfor %}
{% for product in delivery.products %}{% if order[product].quantity %}{{ product.name }} | {{ product.price }} € | {{ order[product].quantity }}
{% endif %}{% endfor %}
Total: {{ order.total(delivery.products) if order else 0 }} €

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

@ -1,7 +1,7 @@
<ul class="delivery-head">
{% if delivery.description %}<li><i class="icon-basket"></i> <strong>Produits</strong> {{ delivery.description }}</li>{% endif %}
<li><i class="icon-streetsign"></i> <strong>Lieu</strong> {{ delivery.where }}</li>
<li><i class="icon-strategy"></i> <strong>Référent</strong> <a href="mailto:{{ delivery.contact }}">{{ delivery.contact }}</a></li>
<li><i class="icon-strategy"></i> <strong>Référent⋅e</strong> <a href="mailto:{{ delivery.contact }}">{{ delivery.contact }}</a></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>{% elif delivery.status == delivery.CLOSED %}<strong>Fermée</strong>{% else %}<strong>Archivée</strong>{% endif %}</li>
{% if delivery.instructions %}<li><i class="icon-lightbulb"></i> <strong>À savoir</strong> {{ delivery.instructions }}</li>{% endif %}

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

@ -26,7 +26,7 @@
<th class="product">{{ product }}</th>
<td>{{ product.price | round(2) }} €</td>
{% if delivery.has_packing %}
<td class="packing">{{ product.packing or '—'}}</td>
<td class="packing">{% if product.packing %}{{ product.packing }} x {% endif %} {{ product.unit }}</td>
{% endif %}
<th{% if delivery.status == delivery.ADJUSTMENT and delivery.product_missing(product) %} class="missing" title="Les commandes individuelles ne correspondent pas aux conditionnements"{% endif %}>
{{ delivery.product_wanted(product) }}