ungleich-public/dynamicweb
6
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Wiki Activity

Merge pull request #632 from tiwariav/task/4559/calculator_discount

Browse source 
bugfix/ discount calculator styles and translation
This commit is contained in:
Arvind Tiwari 2018-05-12 22:09:32 +05:30 committed by GitHub
commit 4e971c23a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
datacenterlight/locale/de/LC_MESSAGES/django.po
View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-05-12 03:46+0530\n" "POT-Creation-Date: 2018-05-12 21:43+0530\n"
"PO-Revision-Date: 2018-03-30 23:22+0000\n" "PO-Revision-Date: 2018-03-30 23:22+0000\n"
"Last-Translator: b'Anonymous User <coder.purple+25@gmail.com>'\n" "Last-Translator: b'Anonymous User <coder.purple+25@gmail.com>'\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -143,6 +143,9 @@ msgstr "Monat"
msgid "VAT included" msgid "VAT included"
msgstr "MwSt. inklusive" msgstr "MwSt. inklusive"
msgid "You save"
msgstr "Du sparst"
msgid "Hosted in Switzerland" msgid "Hosted in Switzerland"
msgstr "Standort: Schweiz" msgstr "Standort: Schweiz"

2
datacenterlight/templates/datacenterlight/includes/_calculator_form.html
View file

@ -24,7 +24,7 @@
<p> <p>
{% if vm_pricing.vat_inclusive %}{% trans "VAT included" %} <br>{% endif %} {% if vm_pricing.vat_inclusive %}{% trans "VAT included" %} <br>{% endif %}
{% if vm_pricing.discount_amount %} {% if vm_pricing.discount_amount %}
You save {{ vm_pricing.discount_amount }} CHF {% trans "You save" %} {{ vm_pricing.discount_amount }} CHF
{% endif %} {% endif %}
</p> </p>
</div> </div>

8
datacenterlight/templates/datacenterlight/order_detail.html
View file

@ -65,8 +65,12 @@
<span>{% trans "Disk space" %}: </span> <span>{% trans "Disk space" %}: </span>
<strong class="pull-right">{{vm.disk_size|intcomma}} GB</strong> <strong class="pull-right">{{vm.disk_size|intcomma}} GB</strong>
</p> </p>
</div>
<div class="col-sm-12">
<hr class="thin-hr"> <hr class="thin-hr">
</div>
{% if vm.vat > 0 or vm.discount.amount > 0 %} {% if vm.vat > 0 or vm.discount.amount > 0 %}
<div class="col-sm-6">
<div class="subtotal-price"> <div class="subtotal-price">
{% if vm.vat > 0 %} {% if vm.vat > 0 %}
<p> <p>
@ -86,8 +90,12 @@
</p> </p>
{% endif %} {% endif %}
</div> </div>
</div>
<div class="col-sm-12">
<hr class="thin-hr"> <hr class="thin-hr">
</div>
{% endif %} {% endif %}
<div class="col-sm-6">
<p class="total-price"> <p class="total-price">
<strong>{% trans "Total" %} </strong> <strong>{% trans "Total" %} </strong>
<strong class="pull-right">{{vm.total_price|floatformat:2|intcomma}} CHF</strong> <strong class="pull-right">{{vm.total_price|floatformat:2|intcomma}} CHF</strong>

8
hosting/templates/hosting/order_detail.html
View file

@ -127,8 +127,12 @@
<span>{% trans "Disk space" %}: </span> <span>{% trans "Disk space" %}: </span>
<strong class="pull-right">{{vm.disk_size}} GB</strong> <strong class="pull-right">{{vm.disk_size}} GB</strong>
</p> </p>
</div>
<div class="col-sm-12">
<hr class="thin-hr"> <hr class="thin-hr">
</div>
{% if vm.vat > 0 or vm.discount.amount > 0 %} {% if vm.vat > 0 or vm.discount.amount > 0 %}
<div class="col-sm-6">
<div class="subtotal-price"> <div class="subtotal-price">
{% if vm.vat > 0 %} {% if vm.vat > 0 %}
<p> <p>
@ -148,8 +152,12 @@
</p> </p>
{% endif %} {% endif %}
</div> </div>
</div>
<div class="col-sm-12">
<hr class="thin-hr"> <hr class="thin-hr">
</div>
{% endif %} {% endif %}
<div class="col-sm-6">
<p class="total-price"> <p class="total-price">
<strong>{% trans "Total" %} </strong> <strong>{% trans "Total" %} </strong>
<strong class="pull-right">{% if vm.total_price %}{{vm.total_price|floatformat:2|intcomma}}{% else %}{{vm.price|floatformat:2|intcomma}}{% endif %} CHF</strong> <strong class="pull-right">{% if vm.total_price %}{{vm.total_price|floatformat:2|intcomma}}{% else %}{{vm.price|floatformat:2|intcomma}}{% endif %} CHF</strong>