diff --git a/src/pretix/base/orderimport.py b/src/pretix/base/orderimport.py index 68b389d91e..ba5a1ec0c8 100644 --- a/src/pretix/base/orderimport.py +++ b/src/pretix/base/orderimport.py @@ -295,7 +295,7 @@ class InvoiceAddressStreet(ImportColumn): return _('Invoice address') + ': ' + _('Address') def assign(self, value, order, position, invoice_address, **kwargs): - invoice_address.address = value or '' + invoice_address.street = value or '' class InvoiceAddressZip(ImportColumn): diff --git a/src/tests/base/test_orderimport.py b/src/tests/base/test_orderimport.py index 7b8caf441e..b083810281 100644 --- a/src/tests/base/test_orderimport.py +++ b/src/tests/base/test_orderimport.py @@ -450,6 +450,21 @@ def test_import_country_invalid(user, event, item): assert 'Error while importing value "Dieter" for column "Invoice address: Country" in line "1": Please enter a valid country code.' in str(excinfo.value) +@pytest.mark.django_db +@scopes_disabled() +def test_import_street(user, event, item): + settings = dict(DEFAULT_SETTINGS) + settings['item'] = 'static:{}'.format(item.pk) + settings['invoice_address_street'] = 'csv:H' + settings['attendee_street'] = 'csv:H' + settings['email'] = 'csv:C' + import_orders.apply( + args=(event.pk, inputfile_factory().id, settings, 'en', user.pk) + ) + assert str(event.orders.get(email='schneider@example.org').invoice_address.street) == 'Texas' + assert str(event.orders.get(email='schneider@example.org').positions.first().street) == 'Texas' + + @pytest.mark.django_db @scopes_disabled() def test_import_state(user, event, item): @@ -457,12 +472,16 @@ def test_import_state(user, event, item): settings['item'] = 'static:{}'.format(item.pk) settings['invoice_address_country'] = 'csv:G' settings['invoice_address_state'] = 'csv:H' + settings['attendee_country'] = 'csv:G' + settings['attendee_state'] = 'csv:H' settings['email'] = 'csv:C' import_orders.apply( args=(event.pk, inputfile_factory().id, settings, 'en', user.pk) ) assert str(event.orders.get(email='schneider@example.org').invoice_address.country) == 'US' - assert str(event.orders.get(email='schneider@example.org').invoice_address.state) == 'TX' + assert str(event.orders.get(email='schneider@example.org').invoice_address.country) == 'US' + assert str(event.orders.get(email='schneider@example.org').positions.first().state) == 'TX' + assert str(event.orders.get(email='schneider@example.org').positions.first().country) == 'US' @pytest.mark.django_db