diff --git a/RIGS/rigboard.py b/RIGS/rigboard.py index 050e0eda..cdbd2865 100644 --- a/RIGS/rigboard.py +++ b/RIGS/rigboard.py @@ -47,6 +47,7 @@ class EventCreate(generic.CreateView): def get_context_data(self, **kwargs): context = super(EventCreate, self).get_context_data(**kwargs) context['edit'] = True + context['currentVAT'] = models.VatRate.objects.current_rate() form = context['form'] if re.search('"-\d+"', form['items_json'].value()): diff --git a/RIGS/templates/RIGS/item_table.html b/RIGS/templates/RIGS/item_table.html index 199f92c3..0c652daf 100644 --- a/RIGS/templates/RIGS/item_table.html +++ b/RIGS/templates/RIGS/item_table.html @@ -29,8 +29,13 @@ £ {{object.sum_total|default:0|floatformat:2}} - VAT @ - {{object.vat_rate.as_percent|floatformat|default:"TBD"}}% + {% if not object.pk %} + VAT @ + {{currentVAT.as_percent|floatformat}}% (TBC) + {% else %} + VAT @ + {{object.vat_rate.as_percent|floatformat|default:"TBD"}}% + {% endif %} £ {{object.vat|default:0|floatformat:2}} diff --git a/RIGS/test_functional.py b/RIGS/test_functional.py index c9b5c906..dfb5a5da 100644 --- a/RIGS/test_functional.py +++ b/RIGS/test_functional.py @@ -143,6 +143,8 @@ class EventTest(LiveServerTestCase): self.profile.set_password("EventTestPassword") self.profile.save() + self.vatrate = models.VatRate.objects.create(start_at='2014-03-05',rate=0.20,comment='test1') + self.browser = webdriver.Firefox() os.environ['RECAPTCHA_TESTING'] = 'True' @@ -375,9 +377,9 @@ class EventTest(LiveServerTestCase): # Check totals self.assertEqual("47.90", self.browser.find_element_by_id('sumtotal').text) - self.assertIn("TBD%", self.browser.find_element_by_id('vat-rate').text) - self.assertEqual("0.00", self.browser.find_element_by_id('vat').text) - self.assertEqual("47.90", self.browser.find_element_by_id('total').text) + self.assertIn("(TBC)", self.browser.find_element_by_id('vat-rate').text) + self.assertEqual("9.58", self.browser.find_element_by_id('vat').text) + self.assertEqual("57.48", self.browser.find_element_by_id('total').text) # Attempt to save - missing title save.click()