From 8202d3fdb1dfa694fece079d022a8f734e2687fb Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Fri, 24 Mar 2017 01:55:09 +0100 Subject: [PATCH] fixup the order detail page a bit --- src/shop/templates/order_detail.html | 200 +++++++++++++++------------ 1 file changed, 108 insertions(+), 92 deletions(-) diff --git a/src/shop/templates/order_detail.html b/src/shop/templates/order_detail.html index 1392a15a..b894065a 100644 --- a/src/shop/templates/order_detail.html +++ b/src/shop/templates/order_detail.html @@ -3,107 +3,123 @@ {% load shop_tags %} {% block shop_content %} +
+
+
+

Details for Order #{{ order.id }}

+
+
+ {% if not order.paid %} +
+ {% csrf_token %} + {% endif %} + -

Order #{{ order.id }}

+ + + + {% for order_product in order.orderproductrelation_set.all %} + + - -
+ Name + + Quantity + + Price + + Total -{% if not order.paid %} - - {% csrf_token %} -{% endif %} +
+ {{ order_product.product.name }} + + {% if not order.open == None %} + + {% bootstrap_button '' button_type="submit" button_class="btn-danger" name="remove_product" value=order_product.pk %} + {% else %} + {{ order_product.quantity }} + {% endif %} + + {{ order_product.product.price|currency }} + + {{ order_product.total|currency }} - + {% endfor %} - - - + -{% for order_product in order.orderproductrelation_set.all %} - - +
- Name - - Quantity - - Price - - Total +
+ + Included VAT (25%) + + {{ order.vat|currency }} -
- {{ order_product.product.name }} - - {% if not order.open == None %} - - {% bootstrap_button '' button_type="submit" button_class="btn-danger" name="remove_product" value=order_product.pk %} - {% else %} - {{ order_product.quantity }} - {% endif %} - - {{ order_product.product.price|currency }} - - {{ order_product.total|currency }} +
+ + Total + + {{ order.total|currency }} -{% endfor %} +
-
- - Hereof VAT (25%) - - {{ order.vat|currency }} + {% if order.open == None and order.customer_comment or order.open %} +

Comment:

+

+ {% endif %} -
- - Total - - {{ order.total|currency }} + {% if not order.open == None %} + {% bootstrap_button "Update order" button_type="submit" button_class="btn-primary" name="update_order" %} + {% endif %} -
- -{% if order.open == None and order.customer_comment or order.open %} -

Shipping Address:

-

-{% endif %} - -{% if not order.open == None %} - {% bootstrap_button "Update order" button_type="submit" button_class="btn-primary" name="update_order" %} -{% endif %} - -{% if not order.paid %} - {% bootstrap_button "Cancel order" button_type="submit" button_class="btn-danger" name="cancel_order" %} -{% endif %} - -
- -

Payment

-{% if not order.paid %} -

Your order is currently unpaid. Please pick a payment option below.

-

Once you accept the terms and go to the payment your order will be -finalized and you will no longer be able to change the products or -quantities - so make sure your order is correct before proceeding!

- - {% csrf_token %} -

-

- + {% if not order.paid %} + {% bootstrap_button "Cancel order" button_type="submit" button_class="btn-danger" name="cancel_order" %} + {% endif %} +
+ {% if order.paid %} +
+

Your order is paid in full.

+
+ {% endif %}
-

- {% bootstrap_button " Blockchain" button_type="submit" button_class="btn-primary" name="payment_method" value="blockchain" %} - {% bootstrap_button " Bank transfer" button_type="submit" button_class="btn-primary" name="payment_method" value="bank_transfer" %} - {% bootstrap_button " Cash" button_type="submit" button_class="btn-primary" name="payment_method" value="cash" %} - -
-

If you have already paid but your order is still showing unpaid, -you can email us or use the -contact page for other options. -Please allow for up to a week for bank transfers to be registered, -the other payment methods should be more or less instant.

-{% else %} -

Your order is paid in full.

-{% endif %} + {% if not order.paid %} +
+
+

Terms and Payment Options

+
+
+
+ {% csrf_token %} +
+ +
+
+
+ {% bootstrap_button " Blockchain" button_type="submit" button_class="btn-primary" name="payment_method" value="blockchain" %} +
+
+ {% bootstrap_button " Bank transfer" button_type="submit" button_class="btn-primary" name="payment_method" value="bank_transfer" %} +
+
+ {% bootstrap_button " Cash" button_type="submit" button_class="btn-primary" name="payment_method" value="cash" %} +
+
+ {% bootstrap_button " Credit card*" button_type="submit" button_class="btn-primary" name="payment_method" value="credit_card" %} +
+
+
+
* Please consider the alternatives before choosing credit card. Credit cards are expensive and difficult for us to handle. Thank you!
+
+
+ Bank transfers take up to a week to get registered, but the other + payment methods should be more or less instant. Please + contact us if your have questions. +
+
+ {% endif %} +
{% endblock %}