arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-20 15:02:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'vat-rate'

Browse Source
This commit is contained in:
David Taylor
2015-07-20 22:20:14 +01:00
parent 3c82c72822 0dd5a1d931
commit 987cd51911
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
RIGS/rigboard.py
View File

@@ -47,6 +47,7 @@ class EventCreate(generic.CreateView):
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = super(EventCreate, self).get_context_data(**kwargs) context = super(EventCreate, self).get_context_data(**kwargs)
context['edit'] = True context['edit'] = True
context['currentVAT'] = models.VatRate.objects.current_rate()
form = context['form'] form = context['form']
if re.search('"-\d+"', form['items_json'].value()): if re.search('"-\d+"', form['items_json'].value()):

9
RIGS/templates/RIGS/item_table.html
View File

@@ -29,8 +29,13 @@
<td colspan="2">£ <span id="sumtotal">{{object.sum_total|default:0|floatformat:2}}</span></td> <td colspan="2">£ <span id="sumtotal">{{object.sum_total|default:0|floatformat:2}}</span></td>
</tr> </tr>
<tr> <tr>
<td id="vat-rate" data-rate="{{object.vat_rate.rate}}">VAT @ {% if not object.pk %}
{{object.vat_rate.as_percent|floatformat|default:"TBD"}}%</td> <td id="vat-rate" data-rate="{{currentVAT.rate}}">VAT @
{{currentVAT.as_percent|floatformat}}% (TBC)</td>
{% else %}
<td id="vat-rate" data-rate="{{object.vat_rate.rate}}">VAT @
{{object.vat_rate.as_percent|floatformat|default:"TBD"}}%</td>
{% endif %}
<td colspan="2">£ <span id="vat">{{object.vat|default:0|floatformat:2}}</span></td> <td colspan="2">£ <span id="vat">{{object.vat|default:0|floatformat:2}}</span></td>
</tr> </tr>
<tr> <tr>

8
RIGS/test_functional.py
View File

@@ -143,6 +143,8 @@ class EventTest(LiveServerTestCase):
self.profile.set_password("EventTestPassword") self.profile.set_password("EventTestPassword")
self.profile.save() self.profile.save()
self.vatrate = models.VatRate.objects.create(start_at='2014-03-05',rate=0.20,comment='test1')
self.browser = webdriver.Firefox() self.browser = webdriver.Firefox()
os.environ['RECAPTCHA_TESTING'] = 'True' os.environ['RECAPTCHA_TESTING'] = 'True'
@@ -375,9 +377,9 @@ class EventTest(LiveServerTestCase):
# Check totals # Check totals
self.assertEqual("47.90", self.browser.find_element_by_id('sumtotal').text) 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.assertIn("(TBC)", self.browser.find_element_by_id('vat-rate').text)
self.assertEqual("0.00", self.browser.find_element_by_id('vat').text) self.assertEqual("9.58", self.browser.find_element_by_id('vat').text)
self.assertEqual("47.90", self.browser.find_element_by_id('total').text) self.assertEqual("57.48", self.browser.find_element_by_id('total').text)
# Attempt to save - missing title # Attempt to save - missing title
save.click() save.click()