diff --git a/apps/admin-ui/gql/gql-types.ts b/apps/admin-ui/gql/gql-types.ts index 7bb622d6b..eccedeb2e 100644 --- a/apps/admin-ui/gql/gql-types.ts +++ b/apps/admin-ui/gql/gql-types.ts @@ -3587,7 +3587,7 @@ export type ReservationUnitCreateMutationInput = { publishEnds?: InputMaybe; purposes?: InputMaybe>>; qualifiers?: InputMaybe>>; - requireIntroduction?: InputMaybe; + requireAdultReservee?: InputMaybe; requireReservationHandling?: InputMaybe; reservationBegins?: InputMaybe; reservationBlockWholeDay?: InputMaybe; @@ -3662,7 +3662,7 @@ export type ReservationUnitCreateMutationPayload = { publishingState?: Maybe; purposes?: Maybe>>; qualifiers?: Maybe>>; - requireIntroduction?: Maybe; + requireAdultReservee?: Maybe; requireReservationHandling?: Maybe; reservationBegins?: Maybe; reservationBlockWholeDay?: Maybe; @@ -3801,7 +3801,7 @@ export type ReservationUnitNode = Node & { purposes: Array; qualifiers: Array; rank: Scalars["Int"]["output"]; - requireIntroduction: Scalars["Boolean"]["output"]; + requireAdultReservee: Scalars["Boolean"]["output"]; requireReservationHandling: Scalars["Boolean"]["output"]; reservableTimeSpans?: Maybe>>; reservationBegins?: Maybe; @@ -4183,7 +4183,7 @@ export type ReservationUnitUpdateMutationInput = { publishEnds?: InputMaybe; purposes?: InputMaybe>>; qualifiers?: InputMaybe>>; - requireIntroduction?: InputMaybe; + requireAdultReservee?: InputMaybe; requireReservationHandling?: InputMaybe; reservationBegins?: InputMaybe; reservationBlockWholeDay?: InputMaybe; @@ -4258,7 +4258,7 @@ export type ReservationUnitUpdateMutationPayload = { publishingState?: Maybe; purposes?: Maybe>>; qualifiers?: Maybe>>; - requireIntroduction?: Maybe; + requireAdultReservee?: Maybe; requireReservationHandling?: Maybe; reservationBegins?: Maybe; reservationBlockWholeDay?: Maybe; @@ -6338,7 +6338,7 @@ export type ReservationUnitEditQuery = { isDraft: boolean; authentication: Authentication; uuid: string; - requireIntroduction: boolean; + requireAdultReservee: boolean; termsOfUseFi?: string | null; termsOfUseSv?: string | null; termsOfUseEn?: string | null; @@ -11107,7 +11107,7 @@ export const ReservationUnitEditDocument = gql` nameFi } uuid - requireIntroduction + requireAdultReservee termsOfUseFi termsOfUseSv termsOfUseEn diff --git a/apps/admin-ui/src/i18n/messages.ts b/apps/admin-ui/src/i18n/messages.ts index 47584843b..473fb13f4 100644 --- a/apps/admin-ui/src/i18n/messages.ts +++ b/apps/admin-ui/src/i18n/messages.ts @@ -1486,10 +1486,8 @@ const translations: ITranslations = { `Voit määrittää, kuinka monta voimassaolevaa varausta käyttäjällä voi samanaikaisesti olla tähän varausyksikköön. Älä rajoita määrää tarpeettomasti. Väärinkäytösten ehkäisemiseksi suositus max 30/varausyksikkö. `, ], - introductionSettings: [ - `Toiminnallisuus ei ole vielä käytössä. - Suositus: - jätä tyhjäksi`, + requireAdultReservee: [ + "Valinta estää alle 18-vuotiasta tekemästä varausta tai hakemusta. Täysi-ikäisyys vaaditaan varauksen ja hakemuksen tekohetkellä.", ], handlingSettings: [ `Voit valita kaikki varaukset käsiteltäviksi ennen hyväksymistä. @@ -1597,6 +1595,7 @@ const translations: ITranslations = { requireReservationHandling: [ "Haluan käsitellä kaikki varaukset. Varaukset tulee aina käsitellä - hyväksyä tai hylätä -luvatussa ajassa, usein kolmen arkipäivän kuluessa.", ], + requireAdultReserveeLabel: ["Varaajan on oltava täysi-ikäinen"], requireIntroductionLabel: ["Varausyksikkö vaatii pakollisen perehdytyksen"], surfaceAreaHelperText: ["Tilojen yhteenlaskettua alaa ei voi pienentää"], maxPersonsHelperText: [ @@ -1671,7 +1670,7 @@ const translations: ITranslations = { ], reservationSettings: ["Varauskalenterin ajastus"], handlingSettings: ["Käsittely"], - introductionSettings: ["Perehdytys"], + requireAdultReserveeSettings: ["Iän tarkistus"], bufferSettings: ["Varauksen tauko"], cancellationSettings: ["Varauksen peruutus"], reservationBegins: ["Avaa varauskalenteri alkaen"], diff --git a/apps/admin-ui/src/spa/ReservationUnit/edit/form.ts b/apps/admin-ui/src/spa/ReservationUnit/edit/form.ts index 0f867cfa0..98d4447f6 100644 --- a/apps/admin-ui/src/spa/ReservationUnit/edit/form.ts +++ b/apps/admin-ui/src/spa/ReservationUnit/edit/form.ts @@ -377,7 +377,7 @@ export const ReservationUnitEditSchema = z reservationBeginsTime: z.string(), reservationEndsDate: z.string(), reservationEndsTime: z.string(), - requireIntroduction: z.boolean(), + requireAdultReservee: z.boolean(), requireReservationHandling: z.boolean(), reservationStartInterval: z.nativeEnum(ReservationStartInterval), canApplyFreeOfCharge: z.boolean(), @@ -826,7 +826,7 @@ export function convertReservationUnit( reservationEndsTime: data?.reservationEnds ? format(new Date(data.reservationEnds), "H:mm") : "", - requireIntroduction: data?.requireIntroduction ?? false, + requireAdultReservee: data?.requireAdultReservee ?? false, requireReservationHandling: data?.requireReservationHandling ?? false, reservationStartInterval: data?.reservationStartInterval ?? diff --git a/apps/admin-ui/src/spa/ReservationUnit/edit/index.tsx b/apps/admin-ui/src/spa/ReservationUnit/edit/index.tsx index e6dbd6697..4abb25bc2 100644 --- a/apps/admin-ui/src/spa/ReservationUnit/edit/index.tsx +++ b/apps/admin-ui/src/spa/ReservationUnit/edit/index.tsx @@ -1015,17 +1015,18 @@ function ReservationUnitSettings({ /> ( onChange(e.target.checked)} /> diff --git a/apps/admin-ui/src/spa/ReservationUnit/edit/queries.tsx b/apps/admin-ui/src/spa/ReservationUnit/edit/queries.tsx index 95d231f3a..a17af0dfc 100644 --- a/apps/admin-ui/src/spa/ReservationUnit/edit/queries.tsx +++ b/apps/admin-ui/src/spa/ReservationUnit/edit/queries.tsx @@ -54,7 +54,7 @@ export const RESERVATION_UNIT_EDIT_QUERY = gql` nameFi } uuid - requireIntroduction + requireAdultReservee termsOfUseFi termsOfUseSv termsOfUseEn diff --git a/apps/ui/gql/gql-types.ts b/apps/ui/gql/gql-types.ts index 46320467a..26949b589 100644 --- a/apps/ui/gql/gql-types.ts +++ b/apps/ui/gql/gql-types.ts @@ -3587,7 +3587,7 @@ export type ReservationUnitCreateMutationInput = { publishEnds?: InputMaybe; purposes?: InputMaybe>>; qualifiers?: InputMaybe>>; - requireIntroduction?: InputMaybe; + requireAdultReservee?: InputMaybe; requireReservationHandling?: InputMaybe; reservationBegins?: InputMaybe; reservationBlockWholeDay?: InputMaybe; @@ -3662,7 +3662,7 @@ export type ReservationUnitCreateMutationPayload = { publishingState?: Maybe; purposes?: Maybe>>; qualifiers?: Maybe>>; - requireIntroduction?: Maybe; + requireAdultReservee?: Maybe; requireReservationHandling?: Maybe; reservationBegins?: Maybe; reservationBlockWholeDay?: Maybe; @@ -3801,7 +3801,7 @@ export type ReservationUnitNode = Node & { purposes: Array; qualifiers: Array; rank: Scalars["Int"]["output"]; - requireIntroduction: Scalars["Boolean"]["output"]; + requireAdultReservee: Scalars["Boolean"]["output"]; requireReservationHandling: Scalars["Boolean"]["output"]; reservableTimeSpans?: Maybe>>; reservationBegins?: Maybe; @@ -4183,7 +4183,7 @@ export type ReservationUnitUpdateMutationInput = { publishEnds?: InputMaybe; purposes?: InputMaybe>>; qualifiers?: InputMaybe>>; - requireIntroduction?: InputMaybe; + requireAdultReservee?: InputMaybe; requireReservationHandling?: InputMaybe; reservationBegins?: InputMaybe; reservationBlockWholeDay?: InputMaybe; @@ -4258,7 +4258,7 @@ export type ReservationUnitUpdateMutationPayload = { publishingState?: Maybe; purposes?: Maybe>>; qualifiers?: Maybe>>; - requireIntroduction?: Maybe; + requireAdultReservee?: Maybe; requireReservationHandling?: Maybe; reservationBegins?: Maybe; reservationBlockWholeDay?: Maybe; diff --git a/apps/ui/modules/__tests__/reservation.test.ts b/apps/ui/modules/__tests__/reservation.test.ts index 2dbdd13df..d94857acd 100644 --- a/apps/ui/modules/__tests__/reservation.test.ts +++ b/apps/ui/modules/__tests__/reservation.test.ts @@ -60,7 +60,7 @@ function createMockReservationUnit({ images: [], isArchived: false, isDraft: false, - requireIntroduction: false, + requireAdultReservee: false, reservationKind: ReservationKind.Direct, reservationStartInterval: ReservationStartInterval.Interval_15Mins, reservationBegins: addDays(new Date(), -1).toISOString(), diff --git a/apps/ui/modules/__tests__/reservationUnit.test.ts b/apps/ui/modules/__tests__/reservationUnit.test.ts index b9cd45a1a..e6b8063e3 100644 --- a/apps/ui/modules/__tests__/reservationUnit.test.ts +++ b/apps/ui/modules/__tests__/reservationUnit.test.ts @@ -998,7 +998,7 @@ describe("isReservationUnitReservable", () => { pricings: [], purposes: [], qualifiers: [], - requireIntroduction: false, + requireAdultReservee: false, requireReservationHandling: false, reservationBlockWholeDay: false, reservationCancelledInstructions: "", diff --git a/packages/common/gql/gql-types.ts b/packages/common/gql/gql-types.ts index 95298d9cc..81250748a 100644 --- a/packages/common/gql/gql-types.ts +++ b/packages/common/gql/gql-types.ts @@ -3587,7 +3587,7 @@ export type ReservationUnitCreateMutationInput = { publishEnds?: InputMaybe; purposes?: InputMaybe>>; qualifiers?: InputMaybe>>; - requireIntroduction?: InputMaybe; + requireAdultReservee?: InputMaybe; requireReservationHandling?: InputMaybe; reservationBegins?: InputMaybe; reservationBlockWholeDay?: InputMaybe; @@ -3662,7 +3662,7 @@ export type ReservationUnitCreateMutationPayload = { publishingState?: Maybe; purposes?: Maybe>>; qualifiers?: Maybe>>; - requireIntroduction?: Maybe; + requireAdultReservee?: Maybe; requireReservationHandling?: Maybe; reservationBegins?: Maybe; reservationBlockWholeDay?: Maybe; @@ -3801,7 +3801,7 @@ export type ReservationUnitNode = Node & { purposes: Array; qualifiers: Array; rank: Scalars["Int"]["output"]; - requireIntroduction: Scalars["Boolean"]["output"]; + requireAdultReservee: Scalars["Boolean"]["output"]; requireReservationHandling: Scalars["Boolean"]["output"]; reservableTimeSpans?: Maybe>>; reservationBegins?: Maybe; @@ -4183,7 +4183,7 @@ export type ReservationUnitUpdateMutationInput = { publishEnds?: InputMaybe; purposes?: InputMaybe>>; qualifiers?: InputMaybe>>; - requireIntroduction?: InputMaybe; + requireAdultReservee?: InputMaybe; requireReservationHandling?: InputMaybe; reservationBegins?: InputMaybe; reservationBlockWholeDay?: InputMaybe; @@ -4258,7 +4258,7 @@ export type ReservationUnitUpdateMutationPayload = { publishingState?: Maybe; purposes?: Maybe>>; qualifiers?: Maybe>>; - requireIntroduction?: Maybe; + requireAdultReservee?: Maybe; requireReservationHandling?: Maybe; reservationBegins?: Maybe; reservationBlockWholeDay?: Maybe; diff --git a/tilavaraus.graphql b/tilavaraus.graphql index 388039aa4..f60ba96b3 100644 --- a/tilavaraus.graphql +++ b/tilavaraus.graphql @@ -3923,7 +3923,7 @@ input ReservationUnitCreateMutationInput { publishEnds: DateTime purposes: [Int] qualifiers: [Int] - requireIntroduction: Boolean + requireAdultReservee: Boolean requireReservationHandling: Boolean reservationBegins: DateTime reservationBlockWholeDay: Boolean @@ -3998,7 +3998,7 @@ type ReservationUnitCreateMutationPayload { publishingState: String purposes: [Int] qualifiers: [Int] - requireIntroduction: Boolean + requireAdultReservee: Boolean requireReservationHandling: Boolean reservationBegins: DateTime reservationBlockWholeDay: Boolean @@ -4189,7 +4189,7 @@ type ReservationUnitNode implements Node { pk: [Int] ): [QualifierNode!]! rank: Int! - requireIntroduction: Boolean! + requireAdultReservee: Boolean! requireReservationHandling: Boolean! reservableTimeSpans( endDate: Date! @@ -4555,7 +4555,7 @@ input ReservationUnitUpdateMutationInput { publishEnds: DateTime purposes: [Int] qualifiers: [Int] - requireIntroduction: Boolean + requireAdultReservee: Boolean requireReservationHandling: Boolean reservationBegins: DateTime reservationBlockWholeDay: Boolean @@ -4630,7 +4630,7 @@ type ReservationUnitUpdateMutationPayload { publishingState: String purposes: [Int] qualifiers: [Int] - requireIntroduction: Boolean + requireAdultReservee: Boolean requireReservationHandling: Boolean reservationBegins: DateTime reservationBlockWholeDay: Boolean