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

invoice discount amount fix

Browse source
This commit is contained in:
Arvind Tiwari 2018-05-07 07:50:32 +05:30
commit 0fdb88b8aa
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
datacenterlight/migrations/0022_auto_20180506_1950.py
View file

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Generated by Django 1.9.4 on 2018-05-06 14:20 # Generated by Django 1.9.4 on 2018-05-07 02:19
from __future__ import unicode_literals from __future__ import unicode_literals
from django.db import migrations, models from django.db import migrations, models
@ -15,7 +15,8 @@ class Migration(migrations.Migration):
migrations.AddField( migrations.AddField(
model_name='vmpricing', model_name='vmpricing',
name='discount_amount', name='discount_amount',
field=models.DecimalField(decimal_places=2, default=0, max_digits=4), field=models.DecimalField(
decimal_places=2, default=0, max_digits=6),
), ),
migrations.AddField( migrations.AddField(
model_name='vmpricing', model_name='vmpricing',

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

@ -76,11 +76,11 @@
<span class="pull-right">{{vm.vat|floatformat:2|intcomma}} CHF</span> <span class="pull-right">{{vm.vat|floatformat:2|intcomma}} CHF</span>
</p> </p>
{% endif %} {% endif %}
{% if vm.discount > 0 %} {% if vm.discount.amount > 0 %}
<p class="text-primary"> <p class="text-primary">
{%trans "Discount" as discount_name %} {%trans "Discount" as discount_name %}
<span>{{ vm.discount.name|default:discount_name }}: </span> <span>{{ vm.discount.name|default:discount_name }}: </span>
<span class="pull-right">- {{ discount.amount }} CHF</span> <span class="pull-right">- {{ vm.discount.amount }} CHF</span>
</p> </p>
{% endif %} {% endif %}
<p> <p>

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

@ -138,11 +138,11 @@
<span class="pull-right">{{vm.vat|floatformat:2|intcomma}} CHF</span> <span class="pull-right">{{vm.vat|floatformat:2|intcomma}} CHF</span>
</p> </p>
{% endif %} {% endif %}
{% if vm.discount > 0 %} {% if vm.discount.amount > 0 %}
<p class="text-primary"> <p class="text-primary">
{%trans "Discount" as discount_name %} {%trans "Discount" as discount_name %}
<span>{{ vm.discount.name|default:discount_name }}: </span> <span>{{ vm.discount.name|default:discount_name }}: </span>
<span class="pull-right">- {{ discount.amount }} CHF</span> <span class="pull-right">- {{ vm.discount.amount }} CHF</span>
</p> </p>
{% endif %} {% endif %}
<p> <p>