diff --git a/src/pretix/plugins/checkinlists/exporters.py b/src/pretix/plugins/checkinlists/exporters.py index 1c7d364137..37c0e6f165 100644 --- a/src/pretix/plugins/checkinlists/exporters.py +++ b/src/pretix/plugins/checkinlists/exporters.py @@ -414,6 +414,7 @@ class CSVCheckinList(CheckInListMixin, ListExporter): headers.append(_('Secret')) headers.append(_('E-mail')) + headers.append(_('Phone number')) if self.event.has_subevents: headers.append(pgettext('subevent', 'Date')) @@ -494,6 +495,7 @@ class CSVCheckinList(CheckInListMixin, ListExporter): if form_data['secrets']: row.append(op.secret) row.append(op.attendee_email or (op.addon_to.attendee_email if op.addon_to else '') or op.order.email or '') + row.append(str(op.order.phone) if op.order.phone else '') if self.event.has_subevents: row.append(str(op.subevent.name)) row.append(date_format(op.subevent.date_from.astimezone(self.event.timezone), 'SHORT_DATETIME_FORMAT')) diff --git a/src/tests/plugins/test_checkinlist.py b/src/tests/plugins/test_checkinlist.py index 716408609c..6fceff363b 100644 --- a/src/tests/plugins/test_checkinlist.py +++ b/src/tests/plugins/test_checkinlist.py @@ -28,7 +28,7 @@ def event(): event.checkin_lists.create(name="Default", all_products=True) order_paid = Order.objects.create( - code='FOO', event=event, email='dummy@dummy.test', + code='FOO', event=event, email='dummy@dummy.test', phone="+498912345678", status=Order.STATUS_PAID, datetime=datetime.datetime(2019, 2, 22, 14, 0, 0, tzinfo=pytz.UTC), expires=now() + datetime.timedelta(days=10), total=33, locale='en' @@ -69,12 +69,12 @@ def test_csv_simple(event): }) assert clean(content.decode()) == clean(""""Order code","Attendee name","Attendee name: Title","Attendee name: First name","Attendee name: Middle name","Attendee name: Family name","Product","Price","Checked in","Checked out","Automatically - checked in","Secret","E-mail","Company","Voucher code","Order date","Order time","Requires special attention","Comment","Seat ID","Seat name", + checked in","Secret","E-mail","Phone number","Company","Voucher code","Order date","Order time","Requires special attention","Comment","Seat ID","Seat name", "Seat zone","Seat row","Seat number","Address","ZIP code","City","Country","State" "FOO","Mr Peter A Jones","Mr","Peter","A","Jones","Ticket","23.00","","","No","hutjztuxhkbtwnesv2suqv26k6ttytxx", -"dummy@dummy.test","","","2019-02-22","14:00:00","No","","","","","","","","","","","" +"dummy@dummy.test","'+498912345678","","","2019-02-22","14:00:00","No","","","","","","","","","","","" "FOO","Mrs Andrea J Zulu","Mrs","Andrea","J","Zulu","Ticket","13.00","","","No","ggsngqtnmhx74jswjngw3fk8pfwz2a7k", -"dummy@dummy.test","","","2019-02-22","14:00:00","No","","","","","","","","","","","" +"dummy@dummy.test","'+498912345678","","","2019-02-22","14:00:00","No","","","","","","","","","","","" """) @@ -93,12 +93,12 @@ def test_csv_order_by_name_parts(event): # noqa }) assert clean(content.decode()) == clean(""""Order code","Attendee name","Attendee name: Title", "Attendee name: First name","Attendee name: Middle name","Attendee name: Family name","Product","Price", -"Checked in","Checked out","Automatically checked in","Secret","E-mail","Company","Voucher code","Order date","Order time","Requires special +"Checked in","Checked out","Automatically checked in","Secret","E-mail","Phone number","Company","Voucher code","Order date","Order time","Requires special attention","Comment","Seat ID","Seat name","Seat zone","Seat row","Seat number","Address","ZIP code","City","Country","State" "FOO","Mrs Andrea J Zulu","Mrs","Andrea","J","Zulu","Ticket","13.00","","","No","ggsngqtnmhx74jswjngw3fk8pfwz2a7k", -"dummy@dummy.test","","","2019-02-22","14:00:00","No","","","","","","","","","","","" +"dummy@dummy.test","'+498912345678","","","2019-02-22","14:00:00","No","","","","","","","","","","","" "FOO","Mr Peter A Jones","Mr","Peter","A","Jones","Ticket","23.00","","","No","hutjztuxhkbtwnesv2suqv26k6ttytxx", -"dummy@dummy.test","","","2019-02-22","14:00:00","No","","","","","","","","","","","" +"dummy@dummy.test","'+498912345678","","","2019-02-22","14:00:00","No","","","","","","","","","","","" """) c = CSVCheckinList(event) _, _, content = c.render({ @@ -110,12 +110,12 @@ def test_csv_order_by_name_parts(event): # noqa }) assert clean(content.decode()) == clean(""""Order code","Attendee name","Attendee name: Title", "Attendee name: First name","Attendee name: Middle name","Attendee name: Family name","Product","Price", -"Checked in","Checked out","Automatically checked in","Secret","E-mail","Company","Voucher code","Order date","Order time","Requires special +"Checked in","Checked out","Automatically checked in","Secret","E-mail","Phone number","Company","Voucher code","Order date","Order time","Requires special attention","Comment","Seat ID","Seat name","Seat zone","Seat row","Seat number","Address","ZIP code","City","Country","State" "FOO","Mr Peter A Jones","Mr","Peter","A","Jones","Ticket","23.00","","","No","hutjztuxhkbtwnesv2suqv26k6ttytxx", -"dummy@dummy.test","","","2019-02-22","14:00:00","No","","","","","","","","","","","" +"dummy@dummy.test","'+498912345678","","","2019-02-22","14:00:00","No","","","","","","","","","","","" "FOO","Mrs Andrea J Zulu","Mrs","Andrea","J","Zulu","Ticket","13.00","","","No","ggsngqtnmhx74jswjngw3fk8pfwz2a7k", -"dummy@dummy.test","","","2019-02-22","14:00:00","No","","","","","","","","","","","" +"dummy@dummy.test","'+498912345678","","","2019-02-22","14:00:00","No","","","","","","","","","","","" """) @@ -131,7 +131,7 @@ def test_csv_order_by_inherited_name_parts(event): # noqa op.attendee_name_parts = {} op.save() order2 = Order.objects.create( - code='BAR', event=event, email='dummy@dummy.test', + code='BAR', event=event, email='dummy@dummy.test', phone='+498912345678', status=Order.STATUS_PAID, datetime=datetime.datetime(2019, 2, 22, 14, 0, 0, tzinfo=pytz.UTC), expires=now() + datetime.timedelta(days=10), total=33, locale='en' @@ -165,12 +165,12 @@ def test_csv_order_by_inherited_name_parts(event): # noqa }) assert clean(content.decode()) == clean(""""Order code","Attendee name","Attendee name: Title", "Attendee name: First name","Attendee name: Middle name","Attendee name: Family name","Product","Price", -"Checked in","Checked out","Automatically checked in","Secret","E-mail","Company","Voucher code","Order date","Order time","Requires special +"Checked in","Checked out","Automatically checked in","Secret","E-mail","Phone number","Company","Voucher code","Order date","Order time","Requires special attention","Comment","Seat ID","Seat name","Seat zone","Seat row","Seat number","Address","ZIP code","City","Country","State" "BAR","Mr Albert J Zulu","Mr","Albert","J","Zulu","Ticket","23.00","","","No","hutjztuxhkbtwnesv2suqv26k6ttytyy", -"dummy@dummy.test","BARCORP","","2019-02-22","14:00:00","No","","","","","","","","","","","" +"dummy@dummy.test","'+498912345678","BARCORP","","2019-02-22","14:00:00","No","","","","","","","","","","","" "FOO","Mr Paul A Jones","Mr","Paul","A","Jones","Ticket","23.00","","","No","hutjztuxhkbtwnesv2suqv26k6ttytxx", -"dummy@dummy.test","FOOCORP","","2019-02-22","14:00:00","No","","","","","","","","","","","" +"dummy@dummy.test","'+498912345678","FOOCORP","","2019-02-22","14:00:00","No","","","","","","","","","","","" """) c = CSVCheckinList(event) _, _, content = c.render({ @@ -182,12 +182,12 @@ def test_csv_order_by_inherited_name_parts(event): # noqa }) assert clean(content.decode()) == clean(""""Order code","Attendee name","Attendee name: Title", "Attendee name: First name","Attendee name: Middle name","Attendee name: Family name","Product","Price", -"Checked in","Checked out","Automatically checked in","Secret","E-mail","Company","Voucher code","Order date","Order time","Requires special +"Checked in","Checked out","Automatically checked in","Secret","E-mail","Phone number","Company","Voucher code","Order date","Order time","Requires special attention","Comment","Seat ID","Seat name","Seat zone","Seat row","Seat number","Address","ZIP code","City","Country","State" "BAR","Mr Albert J Zulu","Mr","Albert","J","Zulu","Ticket","23.00","","","No","hutjztuxhkbtwnesv2suqv26k6ttytyy", -"dummy@dummy.test","BARCORP","","2019-02-22","14:00:00","No","","","","","","","","","","","" +"dummy@dummy.test","'+498912345678","BARCORP","","2019-02-22","14:00:00","No","","","","","","","","","","","" "FOO","Mr Paul A Jones","Mr","Paul","A","Jones","Ticket","23.00","","","No","hutjztuxhkbtwnesv2suqv26k6ttytxx", -"dummy@dummy.test","FOOCORP","","2019-02-22","14:00:00","No","","","","","","","","","","","" +"dummy@dummy.test","'+498912345678","FOOCORP","","2019-02-22","14:00:00","No","","","","","","","","","","","" """) c = CSVCheckinList(event) _, _, content = c.render({ @@ -199,10 +199,10 @@ def test_csv_order_by_inherited_name_parts(event): # noqa }) assert clean(content.decode()) == clean(""""Order code","Attendee name","Attendee name: Title", "Attendee name: First name","Attendee name: Middle name","Attendee name: Family name","Product","Price", -"Checked in","Checked out","Automatically checked in","Secret","E-mail","Company","Voucher code","Order date","Order time","Requires special +"Checked in","Checked out","Automatically checked in","Secret","E-mail","Phone number","Company","Voucher code","Order date","Order time","Requires special attention","Comment","Seat ID","Seat name","Seat zone","Seat row","Seat number","Address","ZIP code","City","Country","State" "FOO","Mr Paul A Jones","Mr","Paul","A","Jones","Ticket","23.00","","","No","hutjztuxhkbtwnesv2suqv26k6ttytxx", -"dummy@dummy.test","FOOCORP","","2019-02-22","14:00:00","No","","","","","","","","","","","" +"dummy@dummy.test","'+498912345678","FOOCORP","","2019-02-22","14:00:00","No","","","","","","","","","","","" "BAR","Mr Albert J Zulu","Mr","Albert","J","Zulu","Ticket","23.00","","","No","hutjztuxhkbtwnesv2suqv26k6ttytyy", -"dummy@dummy.test","BARCORP","","2019-02-22","14:00:00","No","","","","","","","","","","","" +"dummy@dummy.test","'+498912345678","BARCORP","","2019-02-22","14:00:00","No","","","","","","","","","","","" """)