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

Display shipping prices in the order summary

Browse source
This commit is contained in:
Alexis Métaireau 2021-04-07 22:07:03 +02:00
parent 0ba6dfcc45
commit b26f07ab5a
2 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
copanier/models.py
View file

@ -293,12 +293,15 @@ class Order(Base):
p.quantity * _get_price(ref) for ref, p in self.products.items()
)
total_shipping = 0
if include_shipping:
for producer in producers:
total_shipping = total_shipping + delivery.shipping_for(email, producer)
shipping = self.compute_shipping(delivery, producers, email) if include_shipping else 0
return round(total_products + total_shipping, 2)
return round(total_products + shipping, 2)
def compute_shipping(self, delivery, producers, email):
total_shipping = 0
for producer in producers:
total_shipping = total_shipping + delivery.shipping_for(email, producer)
return total_shipping
@property
def has_adjustments(self):

13
copanier/templates/includes/order_summary.html
View file

@ -1,13 +1,18 @@
<table class="order">
<tr><th class="product">Produit</th>{% if display_prices %}<th class="price">Prix unitaire</th>{% endif %}<th class="amount">Quantité</th></tr>
<tr><th class="product">Produit</th>{% if display_prices %}<th class="price">Prix unitaire (€)</th>{% endif %}<th class="amount">Quantité</th>{% if display_prices %}<th class="sum">Somme (€)</th>{% endif %}</tr>
{% for product in delivery.products %}
{% if order[product].quantity %}
<tr {% if product.rupture %}class="rupture"{% endif %}>
<th class="product" style="text-align: left;">{{ product }}{% if product.rupture %} (rupture){% endif %}</th>
{% if display_prices %}<td>{{ product.price | round(2) }} €</td>{% endif %}<td>{{ order[product].quantity }} x {{ product.unit }}</td>
{% if display_prices %}
<td>{{ product.price | round(2) }} €</td>
{% endif %}
<td>{{ order[product].quantity }} x {{ product.unit }}</td>
{% if display_prices %}
<td>{{ order.total([product], delivery, group_id, False) }}</td>
{% endif %}
</tr>
{% if product.rupture %}</del>{% endif %}
{% endif %}
{% endfor %}
</table>
<p>Total: {{ order.total(delivery.products, delivery, group_id) if order else 0 }} €</p>
<p>Total: {{ order.total(delivery.products, delivery, group_id) if order else 0 }} € (dont {{ order.compute_shipping(delivery, delivery.producers, group_id) | round(2) }} de port)</p>