diff --git a/hosting/static/hosting/css/order.css b/hosting/static/hosting/css/order.css index f2f7993b..bdd124c9 100644 --- a/hosting/static/hosting/css/order.css +++ b/hosting/static/hosting/css/order.css @@ -1,4 +1,9 @@ -.order-detail-container {padding-top: 70px;padding-bottom: 70px;/* margin-bottom: 70px; */max-width: 720px;margin: 0 auto;} +.order-detail-container { + max-width: 600px; + margin: 100px auto; + border: 1px solid #ccc; + padding: 30px; +} .order-detail-container .invoice-title h2, .invoice-title h3 { display: inline-block; diff --git a/hosting/templates/hosting/order_detail.html b/hosting/templates/hosting/order_detail.html index f07aa998..3d1ffd35 100644 --- a/hosting/templates/hosting/order_detail.html +++ b/hosting/templates/hosting/order_detail.html @@ -9,161 +9,155 @@ {% if messages %}
{% for message in messages %} - {{ message }} + {{ message }} {% endfor %}
{% endif %} {% if not error %} -
-
-
-

{{page_header_text}}

-

- {% if order %} - {% trans "Order #"%} {{order.id}} - {% endif %} -

-
-
-
-
-
- {% trans "Date"%}:
- - {% if order %} - {{order.created_at|date:'Y-m-d H:i'}} - {% else %} - {% now "Y-m-d H:i" %} - {% endif %} -

- {% if order %} - {% trans "Status:"%}
- {% if order.status == 'Approved' %} - - {% trans "Approved" %} - - {% else %} - - {% trans "Declined" %} - - {% endif %} -

- {% endif %} -
- -
-
-
-

{% trans "Billed To:"%}

- {% if order %} - {{user.name}}
- {{order.billing_address.street_address}},{{order.billing_address.postal_code}}
- {{order.billing_address.city}}, - {{order.billing_address.country}}. - {% else %} - {% with request.session.billing_address_data as billing_address %} - {{billing_address.cardholder_name}}
- {{billing_address.street_address}}, - {{billing_address.postal_code}}
- {{billing_address.city}}, - {{billing_address.country}}. - {% endwith %} - {% endif %} -
-
- -
-
-
-
- {% trans "Payment Method:"%}
- {% if order %} - {{order.cc_brand}} {% trans "ending in" %} **** - {{order.last4}}
- {{user.email}} - {% else %} - {{cc_brand}} {% trans "ending in" %} **** - {{cc_last4}}
- {{request.session.user.email}} - {% endif %} -
-
-
-
-
- -
-
-

{% trans "Order summary"%}

-
-
- {% if request.session.specs %} - {% with request.session.specs as vm %} -

{% trans "Cores"%} - {{vm.cpu}} -

-
-

{% trans "Memory"%} - {{vm.memory}} GB -

-
-

{% trans "Disk space"%} - {{vm.disk_size}} GB -

-
-

{% trans "Configuration"%} - {{request.session.template.name}} -

-
-

{% trans "Total"%} -

- {{vm.price}} CHF - /{% trans "Month" %} - -

-

- {% endwith %} - {% else %} -

{% trans "Cores"%} - {{vm.cores}} -

-
-

{% trans "Memory"%} - {{vm.memory}} GB -

-
-

{% trans "Disk space"%} - {{vm.disk_size}} GB -

-
-

{% trans "Total"%}

{{vm.price}} - CHF /{% trans "Month" %} -

- {% endif %} -
-
- {% if not order %} -
- {% csrf_token %} -
-
-

{% blocktrans with vm_price=request.session.specs.price %}By clicking "Place order" this plan will charge your credit card account with the fee of {{ vm_price }}CHF/month{% endblocktrans %}.

-
-
- -
-
-
+

+ {% blocktrans %}{{page_header_text|default:'Invoice'}}{% endblocktrans %} +

+
+

+ {% if order %} + {% trans "Order #"%} {{order.id}} {% endif %} +

+
+
+
+
+
+ {% trans "Date"%}:
+ + {% if order %} + {{order.created_at|date:'Y-m-d H:i'}} + {% else %} + {% now "Y-m-d H:i" %} + {% endif %} +

+ {% if order %} + {% trans "Status:"%}
+ {% if order.status == 'Approved' %} + + {% trans "Approved" %} + + {% else %} + + {% trans "Declined" %} + + {% endif %} +

+ {% endif %} +
+ +
+
+
+

{% trans "Billed To:"%}

+ {% if order %} + {{user.name}}
+ {{order.billing_address.street_address}},{{order.billing_address.postal_code}}
+ {{order.billing_address.city}}, + {{order.billing_address.country}}. + {% else %} + {% with request.session.billing_address_data as billing_address %} + {{billing_address.cardholder_name}}
+ {{billing_address.street_address}}, + {{billing_address.postal_code}}
+ {{billing_address.city}}, + {{billing_address.country}}. + {% endwith %} + {% endif %} +
+
+ +
+
+
+
+ {% trans "Payment Method:"%}
+ {% if order %} + {{order.cc_brand}} {% trans "ending in" %} **** + {{order.last4}}
+ {{user.email}} + {% else %} + {{cc_brand}} {% trans "ending in" %} **** + {{cc_last4}}
+ {{request.session.user.email}} + {% endif %} +
+ +

{% trans "Order summary"%}

+
+
+ {% if request.session.specs %} + {% with request.session.specs as vm %} +

{% trans "Cores"%} + {{vm.cpu}} +

+
+

{% trans "Memory"%} + {{vm.memory}} GB +

+
+

{% trans "Disk space"%} + {{vm.disk_size}} GB +

+
+

{% trans "Configuration"%} + {{request.session.template.name}} +

+
+

{% trans "Total"%} +

+ {{vm.price}} CHF + /{% trans "Month" %} + +

+

+ {% endwith %} + {% else %} +

{% trans "Cores"%} + {{vm.cores}} +

+
+

{% trans "Memory"%} + {{vm.memory}} GB +

+
+

{% trans "Disk space"%} + {{vm.disk_size}} GB +

+
+

{% trans "Total"%}

{{vm.price}} + CHF /{% trans "Month" %} +

+ {% endif %} +
+
+ {% if not order %} +
+ {% csrf_token %} +
+
+

{% blocktrans with vm_price=request.session.specs.price %}By clicking "Place order" this plan will charge your credit card account with the fee of {{ vm_price }}CHF/month{% endblocktrans %}.

+
+
+ +
+
+
+ {% endif %} {% endif %}