From 6c5edfefaebbcb6be66abef322648d9ad620d30f Mon Sep 17 00:00:00 2001 From: vchikalkin Date: Fri, 10 Mar 2023 15:04:22 +0300 Subject: [PATCH] fix selectTarif --- .../web/process/configurator/reactions/values.ts | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/apps/web/process/configurator/reactions/values.ts b/apps/web/process/configurator/reactions/values.ts index 619f8bd..94af118 100644 --- a/apps/web/process/configurator/reactions/values.ts +++ b/apps/web/process/configurator/reactions/values.ts @@ -42,6 +42,8 @@ export default function valuesReactions({ store, apolloClient }: ProcessContext) }, }); + $calculation.element('selectTarif').setOptions(normalizeOptions(evo_tarifs)); + if (product && leasingPeriod && deliveryTime && evo_tarifs) { evo_tarifs = evo_tarifs?.filter( (tarif) => @@ -61,11 +63,9 @@ export default function valuesReactions({ store, apolloClient }: ProcessContext) tarif.evo_max_last_payment !== null && tarif.evo_max_last_payment >= lastPaymentPerc ); - } else { - $calculation.element('selectTarif').resetValue(); - } - if (leaseObjectUsed === true && evo_tarifs) { + $calculation.element('selectTarif').setValue(evo_tarifs?.at(0)?.evo_tarifid || null); + } else if (leaseObjectUsed === true && evo_tarifs) { evo_tarifs = evo_tarifs?.filter((tarif) => { if (leaseObjectUsed === true) { return tarif?.evo_used; @@ -73,12 +73,10 @@ export default function valuesReactions({ store, apolloClient }: ProcessContext) return true; }); + $calculation.element('selectTarif').setValue(evo_tarifs?.at(0)?.evo_tarifid || null); + } else { + $calculation.element('selectTarif').resetValue(); } - - $calculation - .element('selectTarif') - .setOptions(normalizeOptions(evo_tarifs)) - .setValue(evo_tarifs?.at(0)?.evo_tarifid || null); }, { delay: 10,