CGM_Public/pretix_original
3
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-08-24 13:02:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Invoice addresses: Ask for a state in some countries (#1362)

Browse Source 
* Invoice addresses: Ask for a state in some countries

* API, tests, noscript

* Fix shredder tests

* Add test for addresses with long state names
This commit is contained in:
Raphael Michel
2019-08-09 09:55:46 +02:00
committed by GitHub
parent 547f71aac6
commit d919605d79
19 changed files with 367 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tests/api/test_orders.py
+75 -3
View File
@@ -218,6 +218,7 @@ TEST_ORDER_RES = {
"zipcode": "",
"city": "",
"country": "NZ",
"state": "",
"internal_reference": "",
"vat_id": "DE123",
"vat_id_validated": True
@@ -792,7 +793,7 @@ TEST_INVOICE_RES = {
"number": "DUMMY-00001",
"is_cancellation": False,
"invoice_from": "",
"invoice_to": "Sample company\n\n\n \nNew Zealand\nVAT-ID: DE123",
"invoice_to": "Sample company\nNew Zealand\nVAT-ID: DE123",
"date": "2017-12-10",
"refers": None,
"locale": "en",
@@ -1348,6 +1349,7 @@ ORDER_CREATE_PAYLOAD = {
"company": "Sample company",
"name_parts": {"full_name": "Fo"},
"street": "Bar",
"state": "",
"zipcode": "",
"city": "Sample City",
"country": "NZ",
@@ -2970,6 +2972,74 @@ def test_order_update_only_partial(token_client, organizer, event, order):
assert resp.status_code == 405
@pytest.mark.django_db
def test_order_update_state_validation(token_client, organizer, event, order):
resp = token_client.patch(
'/api/v1/organizers/{}/events/{}/orders/{}/'.format(
organizer.slug, event.slug, order.code
), format='json', data={
'invoice_address': {
"is_business": False,
"company": "This is my company name",
"name": "John Doe",
"name_parts": {},
"street": "",
"state": "",
"zipcode": "",
"city": "Paris",
"country": "NONEXISTANT",
"internal_reference": "",
"vat_id": "",
}
}
)
assert resp.status_code == 400
resp = token_client.patch(
'/api/v1/organizers/{}/events/{}/orders/{}/'.format(
organizer.slug, event.slug, order.code
), format='json', data={
'invoice_address': {
"is_business": False,
"company": "This is my company name",
"name": "John Doe",
"name_parts": {},
"street": "",
"state": "NONEXISTANT",
"zipcode": "",
"city": "Test",
"country": "AU",
"internal_reference": "",
"vat_id": "",
}
}
)
assert resp.status_code == 400
resp = token_client.patch(
'/api/v1/organizers/{}/events/{}/orders/{}/'.format(
organizer.slug, event.slug, order.code
), format='json', data={
'invoice_address': {
"is_business": False,
"company": "This is my company name",
"name": "John Doe",
"name_parts": {},
"street": "",
"state": "QLD",
"zipcode": "",
"city": "Test",
"country": "AU",
"internal_reference": "",
"vat_id": "",
}
}
)
assert resp.status_code == 200
order.invoice_address.refresh_from_db()
assert order.invoice_address.state == "QLD"
assert order.invoice_address.country == "AU"
@pytest.mark.django_db
def test_order_update_allowed_fields(token_client, organizer, event, order):
event.settings.locales = ['de', 'en']
@@ -2987,9 +3057,10 @@ def test_order_update_allowed_fields(token_client, organizer, event, order):
"name": "John Doe",
"name_parts": {},
"street": "",
"state": "",
"zipcode": "",
"city": "Paris",
"country": "Fr",
"country": "FR",
"internal_reference": "",
"vat_id": "",
}
@@ -3040,6 +3111,7 @@ def test_order_update_invoiceaddress_delete_create(token_client, organizer, even
"name": "",
"name_parts": {},
"street": "",
"state": "",
"zipcode": "",
"city": "Paris",
"country": "Fr",
@@ -3107,7 +3179,7 @@ def test_order_create_invoice(token_client, organizer, event, order):
'number': 'DUMMY-00001',
'is_cancellation': False,
'invoice_from': '',
'invoice_to': 'Sample company\n\n\n \nNew Zealand\nVAT-ID: DE123',
'invoice_to': 'Sample company\nNew Zealand\nVAT-ID: DE123',
'date': now().date().isoformat(),
'refers': None,
'locale': 'en',
src/tests/base/test_invoices.py
+24 -2
View File
@@ -113,7 +113,29 @@ def test_address_old_country(env):
zipcode='12345', city='London', country_old='England', country='',
order=order)
inv = generate_invoice(order)
assert inv.invoice_to == "Acme Company\n\n221B Baker Street\n12345 London\nEngland"
assert inv.invoice_to == "Acme Company\n221B Baker Street\n12345 London\nEngland"
@pytest.mark.django_db
def test_address_with_state(env):
event, order = env
event.settings.set('invoice_language', 'en')
InvoiceAddress.objects.create(company='Acme Company', street='221B Baker Street',
zipcode='46530', city='Granger', country=Country('US'), state='IN',
order=order)
inv = generate_invoice(order)
assert inv.invoice_to == "Acme Company\n221B Baker Street\n46530 Granger IN\nUnited States of America"
@pytest.mark.django_db
def test_address_with_state_long(env):
event, order = env
event.settings.set('invoice_language', 'en')
InvoiceAddress.objects.create(company='Acme Company', street='221B Baker Street',
zipcode='46530', city='Granger', country=Country('MY'), state='10',
order=order)
inv = generate_invoice(order)
assert inv.invoice_to == "Acme Company\n221B Baker Street\n46530 Granger Selangor\nMalaysia"
@pytest.mark.django_db
@@ -124,7 +146,7 @@ def test_address(env):
zipcode='12345', city='London', country=Country('GB'),
order=order)
inv = generate_invoice(order)
assert inv.invoice_to == "Acme Company\n\n221B Baker Street\n12345 London\nUnited Kingdom"
assert inv.invoice_to == "Acme Company\n221B Baker Street\n12345 London\nUnited Kingdom"
@pytest.mark.django_db
src/tests/base/test_shredders.py
+4 -2
View File
@@ -171,6 +171,7 @@ def test_invoice_address_shredder(event, order):
data={
"data": [{"attendee_name": "Hans", "question_1": "Test"}],
"invoice_data": {"name": "Peter", "country": "DE", "is_business": False, "internal_reference": "",
"state": "",
"company": "ACME", "street": "Sesam Street", "city": "Sample City", "zipcode": "12345"}
}
)
@@ -189,6 +190,7 @@ def test_invoice_address_shredder(event, order):
'last_modified': ia.last_modified.isoformat().replace('+00:00', 'Z'),
'name': '',
'name_parts': {},
'state': '',
'street': '221B Baker Street',
'vat_id': '',
'vat_id_validated': False,
@@ -202,7 +204,7 @@ def test_invoice_address_shredder(event, order):
assert l1.parsed_data == {
"data": [{"attendee_name": "Hans", "question_1": "Test"}],
"invoice_data": {"name": "█", "country": "█", "is_business": False, "internal_reference": "", "company": "█",
"street": "█", "city": "█", "zipcode": "█"}
"street": "█", "city": "█", "zipcode": "█", "state": ""}
}
@@ -258,7 +260,7 @@ def test_invoice_shredder(event, order):
inv = generate_invoice(order)
invoice_pdf_task.apply(args=(inv.pk,))
inv.refresh_from_db()
assert inv.invoice_to == "Acme Company\n\n221B Baker Street\n12345 London"
assert inv.invoice_to == "Acme Company\n221B Baker Street\n12345 London"
assert inv.file
fname = inv.file.path
assert os.path.exists(fname)