From 8e3fb86169c27162c2dccb0194cfa9a6abfeb2b1 Mon Sep 17 00:00:00 2001 From: vchikalkin Date: Mon, 29 May 2023 11:59:02 +0300 Subject: [PATCH] leaseObjectUsed improvements --- apps/web/process/elt/validation.ts | 24 ++++++++++++++++++++++++ apps/web/process/used-pl/validation.ts | 21 ++++++--------------- 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/apps/web/process/elt/validation.ts b/apps/web/process/elt/validation.ts index ddfe9b2..3f0b1a6 100644 --- a/apps/web/process/elt/validation.ts +++ b/apps/web/process/elt/validation.ts @@ -16,15 +16,18 @@ export function createValidationSchema({ apolloClient }: ValidationContext) { leaseObjectPrice: true, leaseObjectType: true, leaseObjectUseFor: true, + leaseObjectUsed: true, leaseObjectYear: true, leasingPeriod: true, leasingWithoutKasko: true, legalClientRegion: true, maxMass: true, + mileage: true, model: true, objectRegistration: true, opportunity: true, townRegistration: true, + vin: true, withTrailer: true, }).superRefine( async ( @@ -45,6 +48,9 @@ export function createValidationSchema({ apolloClient }: ValidationContext) { leaseObjectPrice, leaseObjectYear, leasingPeriod, + vin, + mileage, + leaseObjectUsed, }, ctx ) => { @@ -198,6 +204,24 @@ export function createValidationSchema({ apolloClient }: ValidationContext) { } } + if (leaseObjectUsed) { + if (!vin) { + ctx.addIssue({ + code: z.ZodIssueCode.custom, + message: 'Не указан ' + titles.tbxVIN, + path: ['eltKasko'], + }); + } + + if (!mileage) { + ctx.addIssue({ + code: z.ZodIssueCode.custom, + message: 'Не указан ' + titles.tbxMileage, + path: ['eltKasko'], + }); + } + } + if (insDecentral) { ctx.addIssue({ code: z.ZodIssueCode.custom, diff --git a/apps/web/process/used-pl/validation.ts b/apps/web/process/used-pl/validation.ts index a14b65a..a926499 100644 --- a/apps/web/process/used-pl/validation.ts +++ b/apps/web/process/used-pl/validation.ts @@ -48,21 +48,12 @@ export function createValidationSchema({ apolloClient }: ValidationContext) { } } - if (leaseObjectUsed) { - if (!mileage) { - ctx.addIssue({ - code: z.ZodIssueCode.custom, - message: 'Не заполнено поле', - path: ['tbxMileage'], - }); - } - if (!vin) { - ctx.addIssue({ - code: z.ZodIssueCode.custom, - message: 'Не заполнено поле', - path: ['tbxVIN'], - }); - } + if (leaseObjectUsed && !mileage) { + ctx.addIssue({ + code: z.ZodIssueCode.custom, + message: 'Не заполнено поле', + path: ['tbxMileage'], + }); } /**