Merge branch 'development'

This commit is contained in:
Chika 2021-12-21 15:41:04 +03:00
commit 79e9c43cbf
3 changed files with 35 additions and 14 deletions

View File

@ -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 {

View File

@ -31,7 +31,7 @@ export const conditions: TElements<ValidationCondition> = {
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<ValidationCondition> = {
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,
};

View File

@ -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',
};