From 0adba15188a975038ffe595db66bebec7779624b Mon Sep 17 00:00:00 2001 From: JochemVH1 Date: Wed, 3 Jul 2024 16:20:41 +0200 Subject: [PATCH] Added seperate field for postalcode and city for client Also adjusted config.ts and clients.ts to have property for postalcode --- backend/src/models/clients.ts | 1 + backend/src/models/config.ts | 1 + frontend/src/components/client/models/ClientConfig.ts | 1 + frontend/src/trans.en.ts | 3 ++- frontend/src/trans.nl.ts | 3 ++- 5 files changed, 7 insertions(+), 2 deletions(-) diff --git a/backend/src/models/clients.ts b/backend/src/models/clients.ts index 3cdb67f7..af991f1f 100644 --- a/backend/src/models/clients.ts +++ b/backend/src/models/clients.ts @@ -31,6 +31,7 @@ export interface IClient { name: string; address: string; city: string; + postalCode: string; country: string; telephone: string; btw: string; diff --git a/backend/src/models/config.ts b/backend/src/models/config.ts index 442da408..f57933da 100644 --- a/backend/src/models/config.ts +++ b/backend/src/models/config.ts @@ -12,6 +12,7 @@ export interface ICompanyConfig { name: string; address: string; city: string; + postalCode: string; btw: string; bank: string; iban: string; diff --git a/frontend/src/components/client/models/ClientConfig.ts b/frontend/src/components/client/models/ClientConfig.ts index ae9a41ea..5aeccb23 100644 --- a/frontend/src/components/client/models/ClientConfig.ts +++ b/frontend/src/components/client/models/ClientConfig.ts @@ -11,6 +11,7 @@ export const defaultClientProperties: FullFormConfig = [ {key: 'slug', updateOnly: true}, {key: 'address'}, {key: 'city'}, + {key: 'postalCode'}, {key: 'country', component: 'CountrySelect'}, {key: 'telephone', component: 'phone'}, {key: 'contact', suffix: 'user'}, diff --git a/frontend/src/trans.en.ts b/frontend/src/trans.en.ts index 92968295..046efa11 100644 --- a/frontend/src/trans.en.ts +++ b/frontend/src/trans.en.ts @@ -368,7 +368,8 @@ export const trans = { name: 'Client', btw: 'Tax', address: 'Street & Nr', - city: 'Postal code & City', + city: 'City', + postalCode: 'Postal code', country: 'Country', slug: 'Name in the url', contactEmail: 'Email contact person', diff --git a/frontend/src/trans.nl.ts b/frontend/src/trans.nl.ts index e84972ee..91badcfb 100644 --- a/frontend/src/trans.nl.ts +++ b/frontend/src/trans.nl.ts @@ -368,7 +368,8 @@ export const trans = { name: 'Klant', btw: 'BTW', address: 'Straat & Nr', - city: 'Postcode & Stad', + city: 'Stad', + postalCode: 'Postcode', country: 'Land', slug: 'Bedrijfsnaam in de url', contactEmail: 'Email contact persoon',