From 093ec71ddb5d654f06eab6062480364860553b0e Mon Sep 17 00:00:00 2001 From: Chika Date: Mon, 20 Dec 2021 13:07:18 +0300 Subject: [PATCH 1/2] =?UTF-8?q?[DYN-635]=20ELT(Kasko):=20=D0=94=D0=BE?= =?UTF-8?q?=D0=B1=D0=B0=D0=B2=D0=B8=D1=82=D1=8C=20ID=20=D0=A1=D0=BF=D0=B5?= =?UTF-8?q?=D1=86=D1=82=D0=B5=D1=85=D0=BD=D0=B8=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ELT/Content/Kasko/lib/composeRequest.ts | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/src/client/Components/Calculation/ELT/Content/Kasko/lib/composeRequest.ts b/src/client/Components/Calculation/ELT/Content/Kasko/lib/composeRequest.ts index b7a920a..6675a3a 100644 --- a/src/client/Components/Calculation/ELT/Content/Kasko/lib/composeRequest.ts +++ b/src/client/Components/Calculation/ELT/Content/Kasko/lib/composeRequest.ts @@ -69,7 +69,11 @@ export default function (this: ICalculationStore) { let country = 0, countrySpecified = false; - if (leaseObjectCategory === 100000002 || leaseObjectType?.evo_id === '9') + if ( + leaseObjectCategory === 100000002 || + (leaseObjectType?.evo_id && + ['6', '9', '10'].includes(leaseObjectType?.evo_id)) + ) if (brand?.evo_brand_owner === 100000001) { country = 1; countrySpecified = true; @@ -96,7 +100,11 @@ export default function (this: ICalculationStore) { selfIgnitionSpecified = false, outsideRoads, outsideRoadsSpecified = false; - if (leaseObjectCategory === 100000002 || leaseObjectType?.evo_id === '9') { + if ( + leaseObjectCategory === 100000002 || + (leaseObjectType?.evo_id && + ['6', '9', '10'].includes(leaseObjectType?.evo_id)) + ) { notConfirmedGlassesDamages = 3; notConfirmedGlassesDamagesSpecified = true; notConfirmedDamages = 2; @@ -118,7 +126,11 @@ export default function (this: ICalculationStore) { sex = '0', driversCount = 1; - const risk = leaseObjectType?.evo_id === '9' ? 3 : 0; + const risk = + leaseObjectType?.evo_id && + ['6', '9', '10'].includes(leaseObjectType?.evo_id) + ? 3 + : 0; if (this.getValue('insUnlimitDrivers')) { age = 18; @@ -183,16 +195,16 @@ export default function (this: ICalculationStore) { let specialMachineryType = 0, specialMachineryIndustry = 0, specialMachineryMover = 0; - if (leaseObjectType?.evo_id === '9') { + if ( + leaseObjectType?.evo_id && + ['6', '9', '10'].includes(leaseObjectType?.evo_id) + ) { specialMachineryType = parseInt( model?.evo_vehicle_body_typeidData?.evo_id_elt || '0', ); specialMachineryIndustry = mapLeaseObjectUseForToIndustry[leaseObjectUseForValue]; - specialMachineryMover = - leaseObjectType.evo_id === '9' && model?.evo_running_gear === 100000001 - ? 2 - : 1; + specialMachineryMover = model?.evo_running_gear === 100000001 ? 2 : 1; } return { From 42222fef40b2c927977132a5e00c6cecd25c3004 Mon Sep 17 00:00:00 2001 From: Chika Date: Tue, 21 Dec 2021 15:40:17 +0300 Subject: [PATCH 2/2] add for 093ec71 --- .../ELT/Content/Kasko/lib/validation.ts | 7 +++++-- .../Calculation/ELT/Content/lib/resetIns.ts | 14 ++++++++++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/client/Components/Calculation/ELT/Content/Kasko/lib/validation.ts b/src/client/Components/Calculation/ELT/Content/Kasko/lib/validation.ts index 8b1c844..caeb7b1 100644 --- a/src/client/Components/Calculation/ELT/Content/Kasko/lib/validation.ts +++ b/src/client/Components/Calculation/ELT/Content/Kasko/lib/validation.ts @@ -31,7 +31,7 @@ export const conditions: TElements = { if ( leaseObjectType?.evo_id && - !['1', '2', '3', '7', '9'].includes(leaseObjectType?.evo_id) + !['1', '2', '3', '6', '7', '9', '10'].includes(leaseObjectType?.evo_id) ) { return { isValid: false, @@ -78,7 +78,10 @@ export const conditions: TElements = { const leaseObjectType = calculationStore.getOption('selectLeaseObjectType'); if (!leaseObjectCategory) { - if (['6', '9', '10'].includes(leaseObjectType?.evo_id || '')) { + if ( + leaseObjectType?.evo_id && + ['6', '9', '10'].includes(leaseObjectType?.evo_id) + ) { return { isValid: true, }; diff --git a/src/client/Components/Calculation/ELT/Content/lib/resetIns.ts b/src/client/Components/Calculation/ELT/Content/lib/resetIns.ts index b2a1dbb..7602e1a 100644 --- a/src/client/Components/Calculation/ELT/Content/lib/resetIns.ts +++ b/src/client/Components/Calculation/ELT/Content/lib/resetIns.ts @@ -9,10 +9,16 @@ const mapInsType = { }; export const map_evo_id_elt_FieldName = { - kasko: (calculationStore: ICalculationStore) => - calculationStore.getOption('selectLeaseObjectType')?.evo_id !== '9' - ? 'evo_id_elt' - : 'evo_id_elt_smr', + kasko: (calculationStore: ICalculationStore) => { + const leaseObjectType = calculationStore.getOption('selectLeaseObjectType'); + if ( + leaseObjectType?.evo_id && + ['6', '9', '10'].includes(leaseObjectType?.evo_id) + ) { + return 'evo_id_elt_smr'; + } + return 'evo_id_elt'; + }, osago: (_: ICalculationStore) => 'evo_id_elt_osago', };