From 5db3b8bf234a1e033de8585992e33cd34862860e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Wed, 27 Mar 2019 09:51:48 +0100 Subject: [PATCH] Fix some minor visual things. --- .../templates/account/password_change.html | 2 +- src/profiles/templates/shop/order_detail.html | 256 +++++++++--------- .../templates/tickets/ticket_detail.html | 2 +- 3 files changed, 133 insertions(+), 127 deletions(-) diff --git a/src/profiles/templates/account/password_change.html b/src/profiles/templates/account/password_change.html index a616160e..1e00a9d3 100644 --- a/src/profiles/templates/account/password_change.html +++ b/src/profiles/templates/account/password_change.html @@ -16,7 +16,7 @@
{% csrf_token %} {% bootstrap_form form %} - +
diff --git a/src/profiles/templates/shop/order_detail.html b/src/profiles/templates/shop/order_detail.html index 0bd0b1dd..c659be04 100644 --- a/src/profiles/templates/shop/order_detail.html +++ b/src/profiles/templates/shop/order_detail.html @@ -4,133 +4,139 @@ {% block profile_content %} -
-
-
-

Details for Order #{{ order.id }}

-
-
- {% if not order.paid %} -
- {% csrf_token %} - {% endif %} - - - - - - {% for order_product in order.orderproductrelation_set.all %} - - - -
- Name - - Quantity - - Price - - Total - -
- {{ 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 %} - -
- - Included VAT (25%) - - {{ order.vat|currency }} - -
- - Total - - {{ order.total|currency }}
- -
- - {% if not order.open == None %} -

Comment:

-

- {% elif order.open == None and order.comment %} -
{{ order.comment|linebreaks }}
- {% endif %} - - {% if not order.open == None %} -

Invoice Address:

-

- {% elif order.open == None and order.invoice_address %} -

Invoice Address:

-
{{ order.invoice_address|linebreaks }}
- {% endif %} - - {% if order.open %} - {% 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 %} - -
- {% if order.paid %} -
-

Your order is paid in full.

-
+
+
+

Details for Order #{{ order.id }}

+
+
+ {% if not order.paid %} + + {% csrf_token %} + {% endif %} + + + + + + {% for order_product in order.orderproductrelation_set.all %} + + + +
+ Name + + Quantity + + Price + + Total + +
+ {{ 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 %} + +
+ + Included VAT (25%) + + {{ order.vat|currency }} + +
+ + Total + + {{ order.total|currency }}
+ +
+ + {% if not order.open == None %} +

Comment:

+

+ {% elif order.open == None and order.comment %} +
{{ order.comment|linebreaks }}
+ {% endif %} + + {% if not order.open == None %} +

Invoice Address:

+

+ {% elif order.open == None and order.invoice_address %} +

Invoice Address:

+
{{ order.invoice_address|linebreaks }}
+ {% endif %} + + {% if order.open %} + {% 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 %} -
- {% 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 %} + {% if order.paid %} +
+

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 %} diff --git a/src/profiles/templates/tickets/ticket_detail.html b/src/profiles/templates/tickets/ticket_detail.html index 3452e45a..16d24de7 100644 --- a/src/profiles/templates/tickets/ticket_detail.html +++ b/src/profiles/templates/tickets/ticket_detail.html @@ -15,7 +15,7 @@ {% csrf_token %} {% bootstrap_field form.name %} {% bootstrap_field form.email %} - +