moep/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into task/5681/offer-512mb-ram

Browse source
This commit is contained in:
PCoder 2018-10-17 07:57:07 +02:00
commit 0d767e74a9
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Changelog
View file

@ -1,3 +1,5 @@
2.3.1: 2018-10-17
* bugfix: [hosting, dcl] Show VAT percent rounded to 2 decimal places in the order confirmation page (PR #673)
2.3: 2018-10-08 2.3: 2018-10-08
* #5690: Generic payment page - allow admin to add a onetime/monthly product and the frontend for user to pay for this product (PR #666) * #5690: Generic payment page - allow admin to add a onetime/monthly product and the frontend for user to pay for this product (PR #666)
2.2.2: 2018-09-28 2.2.2: 2018-09-28

2
utils/hosting_utils.py
View file

@ -130,7 +130,7 @@ def get_vm_price_with_vat(cpu, memory, ssd_size, hdd_size=0,
'amount': round(float(pricing.discount_amount), 2) 'amount': round(float(pricing.discount_amount), 2)
} }
return (round(float(price), 2), round(float(vat), 2), return (round(float(price), 2), round(float(vat), 2),
round(float(vat_percent)), discount) round(float(vat_percent), 2), discount)
def ping_ok(host_ipv6): def ping_ok(host_ipv6):