Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix Order and Cart totals in default templates

  • Loading branch information...
commit 4f0ec1e3d9ce94286161bd299c5a9d3064250aaf 1 parent df93bfc
@brew authored
View
2  examples/demo/templates/satchless/checkout/snippets/order_preview.html
@@ -69,7 +69,7 @@
{% endif %}
<tr>
<td class="product-price" colspan="5">
- <span class="fullprice">{{ group.total|gross|floatformat:2 }}</span>
+ <span class="fullprice">{{ group.get_total|gross|floatformat:2 }}</span>
<span class="currency">{{ order.currency }}</span><br />
</td>
</tr>
View
4 examples/demo/templates/satchless/checkout/snippets/order_view.html
@@ -53,14 +53,14 @@
{% endif %}
<tr>
<td class="product-price" colspan="5">
- <span class="fullprice">{{ group.total|gross|floatformat:2 }}</span>
+ <span class="fullprice">{{ group.get_total|gross|floatformat:2 }}</span>
<span class="currency">{{ order.currency }}</span><br />
</td>
</tr>
</tfoot>
</table>
{% endfor %}
-<p>Total amount to pay: {{ order.total|gross|floatformat:2 }} <span class="currency">{{ order.currency }}</span></p>
+<p>Total amount to pay: {{ order.get_total|gross|floatformat:2 }} <span class="currency">{{ order.currency }}</span></p>
{% if order.paymentvariant %}
<p>{% trans "Payment method" %}: {{ order.paymentvariant.get_subtype_instance }}
{% endif %}
View
4 satchless/cart/templates/satchless/cart/view.html
@@ -79,12 +79,12 @@
<tr class="total">
<th colspan="4" rowspan="2">{% trans "Total" %}:</th>
<td class="numerical">
- {{ cart.total|gross|floatformat:2 }} <span class="currency">{{ cart.currency }}</span><br />
+ {{ cart.get_total|gross|floatformat:2 }} <span class="currency">{{ cart.currency }}</span><br />
</td>
<td colspan="2" rowspan="2"></td>
</tr>
<tr>
- <td class="numerical netPrice">{{ cart.total|net|floatformat:2 }} <span class="currency">{{ cart.currency }}</span></td>
+ <td class="numerical netPrice">{{ cart.get_total|net|floatformat:2 }} <span class="currency">{{ cart.currency }}</span></td>
</tr>
</tfoot>
</table>
View
4 satchless/cart/templates/satchless/cart/view_ajax.html
@@ -72,12 +72,12 @@
<tr class="total">
<th colspan="4" rowspan="2">{% trans "Total" %}:</th>
<td class="numerical">
- {{ cart.total|gross|floatformat:2 }} <span class="currency">{{ cart.currency }}</span><br />
+ {{ cart.get_total|gross|floatformat:2 }} <span class="currency">{{ cart.currency }}</span><br />
</td>
<td colspan="2" rowspan="2"></td>
</tr>
<tr>
- <td class="numerical netPrice">{{ cart.total|net|floatformat:2 }} <span class="currency">{{ cart.currency }}</span></td>
+ <td class="numerical netPrice">{{ cart.get_total|net|floatformat:2 }} <span class="currency">{{ cart.currency }}</span></td>
</tr>
</tfoot>
</table>
View
4 satchless/contrib/checkout/multistep/tests/templates/satchless/cart/view.html
@@ -71,12 +71,12 @@
<tr class="total">
<th colspan="4" rowspan="2">{% trans "Total" %}:</th>
<td class="numerical">
- {{ cart.total|gross|floatformat:2 }} <span class="currency">{{ cart.currency }}</span><br />
+ {{ cart.get_total|gross|floatformat:2 }} <span class="currency">{{ cart.currency }}</span><br />
</td>
<td colspan="2" rowspan="2"></td>
</tr>
<tr>
- <td class="numerical netPrice">{{ cart.total|net|floatformat:2 }} <span class="currency">{{ cart.currency }}</span></td>
+ <td class="numerical netPrice">{{ cart.get_total|net|floatformat:2 }} <span class="currency">{{ cart.currency }}</span></td>
</tr>
</tfoot>
</table>
View
2  satchless/order/templates/satchless/order/list.html
@@ -18,7 +18,7 @@
<td><a href="{{ order_url }}">{{ order.pk }}</a></td>
<td>{{ order.created|date }} {{ order.created|time }}</td>
<td>{{ order.get_status_display }}</td>
- <td>{{ order.total|floatformat:2 }} <span class="currency">{{ order.currency }}</span></td>
+ <td>{{ order.get_total|floatformat:2 }} <span class="currency">{{ order.currency }}</span></td>
</tr>
{% endfor %}
</tbody>
View
4 satchless/order/templates/satchless/order/snippets/order_view.html
@@ -27,7 +27,7 @@
{% endwith %}{% endif %}
<tr>
<th class="numerical" colspan="3">{% trans "Total" %}:</th>
- <td class="numerical">{{ group.total|gross|floatformat:2 }} <span class="currency">{{ order.currency }}</span></td>
+ <td class="numerical">{{ group.get_total|gross|floatformat:2 }} <span class="currency">{{ order.currency }}</span></td>
</tr>
</tfoot>
<tbody>
@@ -51,7 +51,7 @@
</tbody>
</table>
{% endfor %}
-<p>Total amount to pay: {{ order.total|gross|floatformat:2 }} <span class="currency">{{ order.currency }}</span></p>
+<p>Total amount to pay: {{ order.get_total|gross|floatformat:2 }} <span class="currency">{{ order.currency }}</span></p>
{% if order.paymentvariant %}
<p>{% trans "Payment method" %}: {{ order.paymentvariant.get_subtype_instance }}
{% endif %}
Please sign in to comment.
Something went wrong with that request. Please try again.