From e6bb6a4d6f8e9186b8043f461ed5d65fac9e58aa Mon Sep 17 00:00:00 2001 From: Chika Date: Wed, 26 Oct 2022 17:49:42 +0300 Subject: [PATCH] store/calculation: use boolean validation flag --- process/supplier-agent/reactions/agents.ts | 6 +++--- stores/calculation/index.ts | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/process/supplier-agent/reactions/agents.ts b/process/supplier-agent/reactions/agents.ts index 0ca74bc..5db1fc7 100644 --- a/process/supplier-agent/reactions/agents.ts +++ b/process/supplier-agent/reactions/agents.ts @@ -510,14 +510,14 @@ export function validationReactions(store: RootStore, apolloClient: ApolloClient }); $calculation.element('tbxDealerRewardSumm').validate({ - invalid: () => + invalid: evo_reward_condition?.evo_reward_summ && dealerRewardSumm > evo_reward_condition.evo_reward_summ, message: 'Вознаграждение ЮЛ поставщика указано больше условия по агентскому договору!', }); $calculation.element('tbxDealerRewardSumm').validate({ - invalid: () => + invalid: !evo_reward_condition?.evo_reduce_reward && evo_reward_condition?.evo_reward_summ && dealerRewardSumm < evo_reward_condition.evo_reward_summ, @@ -525,7 +525,7 @@ export function validationReactions(store: RootStore, apolloClient: ApolloClient }); $calculation.element('tbxDealerRewardSumm').validate({ - invalid: () => + invalid: evo_reward_condition?.evo_min_reward_summ && dealerRewardSumm < evo_reward_condition?.evo_min_reward_summ, message: 'Вознаграждение ЮЛ поставщика указано меньше условия по агентскому договору!', diff --git a/stores/calculation/index.ts b/stores/calculation/index.ts index 01c8360..10618c4 100644 --- a/stores/calculation/index.ts +++ b/stores/calculation/index.ts @@ -11,7 +11,7 @@ import StatusStore from './statuses'; import ValuesStore from './values'; type ValidateParams = { - invalid: () => boolean; + invalid: boolean; message: string; }; @@ -92,7 +92,7 @@ export default class CalculationStore { }, validate: ({ invalid, message }: ValidateParams) => { - if (invalid()) { + if (invalid) { if (!this.$validation[elementName]) { this.$validation[elementName] = new Validation({ err_key: elementName,