Skip to content

Commit 5e2d774

Browse files
committed
Use family/given name vs first/last name
1 parent 9ab5920 commit 5e2d774

File tree

8 files changed

+29
-29
lines changed

8 files changed

+29
-29
lines changed

backend/billing/migrations/0002_billingaddress_user_first_name_and_more.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ class Migration(migrations.Migration):
1212
operations = [
1313
migrations.AddField(
1414
model_name='billingaddress',
15-
name='user_first_name',
16-
field=models.TextField(default='', verbose_name='user first name'),
15+
name='user_given_name',
16+
field=models.TextField(default='', verbose_name='user given name'),
1717
preserve_default=False,
1818
),
1919
migrations.AddField(
2020
model_name='billingaddress',
21-
name='user_last_name',
22-
field=models.TextField(default='', verbose_name='user last name'),
21+
name='user_family_name',
22+
field=models.TextField(default='', verbose_name='user family name'),
2323
preserve_default=False,
2424
),
2525
migrations.AlterField(

backend/billing/models.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ class BillingAddress(TimeStampedModel):
2525
company_name = models.TextField(_("company name"), blank=True)
2626
# TODO: delete this in future
2727
user_name = models.TextField(_("user name"), default="", blank=True)
28-
user_first_name = models.TextField(_("user first name"))
29-
user_last_name = models.TextField(_("user last name"))
28+
user_given_name = models.TextField(_("user given name"))
29+
user_family_name = models.TextField(_("user family name"))
3030
zip_code = models.TextField(_("zip code"))
3131
city = models.TextField(_("city"))
3232
address = models.TextField(_("address"))

backend/pretix/__init__.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,8 @@ def get_quotas(conference: Conference) -> Dict[str, Quota]:
248248
@strawberry.type
249249
class InvoiceInformationErrors:
250250
company: list[str] = strawberry.field(default_factory=list)
251-
first_name: list[str] = strawberry.field(default_factory=list)
252-
last_name: list[str] = strawberry.field(default_factory=list)
251+
given_name: list[str] = strawberry.field(default_factory=list)
252+
family_name: list[str] = strawberry.field(default_factory=list)
253253
street: list[str] = strawberry.field(default_factory=list)
254254
zipcode: list[str] = strawberry.field(default_factory=list)
255255
city: list[str] = strawberry.field(default_factory=list)
@@ -317,8 +317,8 @@ def validate(
317317
class InvoiceInformation:
318318
is_business: bool
319319
company: Optional[str]
320-
first_name: str
321-
last_name: str
320+
given_name: str
321+
family_name: str
322322
street: str
323323
zipcode: str
324324
city: str
@@ -330,8 +330,8 @@ class InvoiceInformation:
330330

331331
def validate(self, errors: CreateOrderErrors) -> CreateOrderErrors:
332332
required_fields = [
333-
"first_name",
334-
"last_name",
333+
"given_name",
334+
"family_name",
335335
"street",
336336
"zipcode",
337337
"city",
@@ -528,8 +528,8 @@ def create_order(conference: Conference, order_data: CreateOrderInput) -> Order:
528528
"is_business": order_data.invoice_information.is_business,
529529
"company": order_data.invoice_information.company,
530530
"name_parts": {
531-
"given_name": order_data.invoice_information.first_name,
532-
"family_name": order_data.invoice_information.last_name,
531+
"given_name": order_data.invoice_information.given_name,
532+
"family_name": order_data.invoice_information.family_name,
533533
},
534534
"street": order_data.invoice_information.street,
535535
"zipcode": order_data.invoice_information.zipcode,

frontend/src/components/checkout-page-handler/billing-card.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,21 +129,21 @@ export const BillingCard = ({
129129
)}
130130
<InputWrapper
131131
required={true}
132-
title={<FormattedMessage id="orderInformation.firstName" />}
132+
title={<FormattedMessage id="orderInformation.givenName" />}
133133
>
134134
<Input
135-
{...text("firstName")}
135+
{...text("givenName")}
136136
required={true}
137137
placeholder={inputPlaceholder}
138-
errors={invoiceInformationErrors?.firstName}
138+
errors={invoiceInformationErrors?.givenName}
139139
/>
140140
</InputWrapper>
141141
<InputWrapper
142142
required={true}
143-
title={<FormattedMessage id="orderInformation.lastName" />}
143+
title={<FormattedMessage id="orderInformation.familyName" />}
144144
>
145145
<Input
146-
{...text("lastName")}
146+
{...text("familyName")}
147147
required={true}
148148
placeholder={inputPlaceholder}
149149
/>

frontend/src/components/checkout-page-handler/use-create-order.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ export const useCreateOrder = ({ userEmail }) => {
5656
invoiceInformation: {
5757
isBusiness: state.invoiceInformation.isBusiness,
5858
company: state.invoiceInformation.companyName,
59-
firstName: state.invoiceInformation.firstName,
60-
lastName: state.invoiceInformation.lastName,
59+
givenName: state.invoiceInformation.givenName,
60+
familyName: state.invoiceInformation.familyName,
6161
street: state.invoiceInformation.address,
6262
zipcode: state.invoiceInformation.zipCode,
6363
city: state.invoiceInformation.city,

frontend/src/components/tickets-page/review/create-order.graphql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ mutation CreateOrder($conference: String!, $input: CreateOrderInput!) {
55
nonFieldErrors
66
invoiceInformation {
77
company
8-
firstName
9-
lastName
8+
givenName
9+
familyName
1010
street
1111
zipcode
1212
city

frontend/src/components/tickets-page/types.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
export type InvoiceInformationState = {
22
isBusiness: boolean;
33
companyName: string;
4-
firstName: string;
5-
lastName: string;
4+
givenName: string;
5+
familyName: string;
66
fiscalCode: string;
77
pec: string;
88
sdi: string;

frontend/src/locale/index.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -651,8 +651,8 @@ Click the box to change. If left empty, we will assume you are available.`,
651651
"orderInformation.individualConsumer": "Individual Customer",
652652
"orderInformation.businessConsumer": "Business Customer",
653653
"orderInformation.companyName": "Company name",
654-
"orderInformation.firstName": "First name",
655-
"orderInformation.lastName": "Last name",
654+
"orderInformation.givenName": "Given name",
655+
"orderInformation.familyName": "Family name",
656656
"orderInformation.vatId": "VAT ID",
657657
"orderInformation.address": "Address",
658658
"orderInformation.zipCode": "Zip Code",
@@ -1435,8 +1435,8 @@ The sooner you buy your ticket, the more you save!`,
14351435
"orderInformation.individualConsumer": "Persona individuale",
14361436
"orderInformation.businessConsumer": "Azienda",
14371437
"orderInformation.companyName": "Nome azienda",
1438-
"orderInformation.firstName": "Nome",
1439-
"orderInformation.lastName": "Cognome",
1438+
"orderInformation.givenName": "Nome",
1439+
"orderInformation.familyName": "Cognome",
14401440
"orderInformation.vatId": "Partita IVA",
14411441
"orderInformation.address": "Indirizzo",
14421442
"orderInformation.zipCode": "CAP",

0 commit comments

Comments
 (0)