From a6695a103ffa3a9bf138820d0da36eb84775f1fe Mon Sep 17 00:00:00 2001 From: PCoder Date: Mon, 9 Dec 2019 18:05:57 +0530 Subject: [PATCH] Refactor PRE_EU_VAT_RATE + fix >= for first_vm_id_after_eu_vat --- dynamicweb/settings/base.py | 2 ++ hosting/views.py | 19 ++++++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py index 70d3ec2c..fc971141 100644 --- a/dynamicweb/settings/base.py +++ b/dynamicweb/settings/base.py @@ -727,7 +727,9 @@ AUTH_SEED = env('AUTH_SEED') AUTH_REALM = env('AUTH_REALM') OTP_SERVER = env('OTP_SERVER') OTP_VERIFY_ENDPOINT = env('OTP_VERIFY_ENDPOINT') + FIRST_VM_ID_AFTER_EU_VAT = int_env('FIRST_VM_ID_AFTER_EU_VAT') +PRE_EU_VAT_RATE = float(env('PRE_EU_VAT_RATE')) if DEBUG: diff --git a/hosting/views.py b/hosting/views.py index 1228b569..e196d91f 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -859,8 +859,8 @@ class OrdersHostingDetailView(LoginRequiredMixin, DetailView, FormView): if obj.vm_pricing else 'default'), vat_rate= ( user_country_vat_rate * 100 - if obj.vm_id > settings.FIRST_VM_ID_AFTER_EU_VAT - else 7.7 + if obj.vm_id >= settings.FIRST_VM_ID_AFTER_EU_VAT + else settings.PRE_EU_VAT_RATE ) ) context['vm']["after_eu_vat_intro"] = ( @@ -893,8 +893,8 @@ class OrdersHostingDetailView(LoginRequiredMixin, DetailView, FormView): if obj.vm_pricing else 'default'), vat_rate=( user_country_vat_rate * 100 - if obj.vm_id > settings.FIRST_VM_ID_AFTER_EU_VAT - else 7.7 + if obj.vm_id >= settings.FIRST_VM_ID_AFTER_EU_VAT + else settings.PRE_EU_VAT_RATE ) ) context['vm']["after_eu_vat_intro"] = ( @@ -1293,8 +1293,8 @@ class InvoiceDetailView(LoginRequiredMixin, DetailView): if obj.order.vm_pricing else 'default'), vat_rate=( user_country_vat_rate * 100 - if obj.order.vm_id > settings.FIRST_VM_ID_AFTER_EU_VAT - else 7.7 + if obj.order.vm_id >= settings.FIRST_VM_ID_AFTER_EU_VAT + else settings.PRE_EU_VAT_RATE ) ) context['vm']["after_eu_vat_intro"] = ( @@ -1322,7 +1322,12 @@ class InvoiceDetailView(LoginRequiredMixin, DetailView): ssd_size=context['vm']['disk_size'], memory=context['vm']['memory'], pricing_name=(obj.order.vm_pricing.name - if obj.order.vm_pricing else 'default') + if obj.order.vm_pricing else 'default'), + vat_rate=( + user_country_vat_rate * 100 + if obj.order.vm_id >= settings.FIRST_VM_ID_AFTER_EU_VAT + else settings.PRE_EU_VAT_RATE + ) ) context['vm']['vat'] = vat context['vm']['price'] = price