From 8550020e7e8c7e019ab344a8875669d03d4927a2 Mon Sep 17 00:00:00 2001 From: vchikalkin Date: Wed, 29 Mar 2023 18:05:06 +0300 Subject: [PATCH] fix tbxImporterRewardPerc & tbxImporterRewardRub --- .../leasing-object/reactions/common.ts | 29 +++++++++---------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/apps/web/process/leasing-object/reactions/common.ts b/apps/web/process/leasing-object/reactions/common.ts index c51518c..0cbce4e 100644 --- a/apps/web/process/leasing-object/reactions/common.ts +++ b/apps/web/process/leasing-object/reactions/common.ts @@ -332,6 +332,9 @@ export default function reactions({ store, apolloClient }: ProcessContext) { return; } + let evo_importer_reward_perc = 0; + let evo_importer_reward_rub = 0; + if (modelId) { const { data: { evo_model }, @@ -341,17 +344,15 @@ export default function reactions({ store, apolloClient }: ProcessContext) { }); if (evo_model?.evo_importer_reward_perc) { - tbxImporterRewardPerc.setValue(evo_model?.evo_importer_reward_perc); - } else { - tbxImporterRewardPerc.resetValue(); + evo_importer_reward_perc = evo_model?.evo_importer_reward_perc; } if (evo_model?.evo_importer_reward_rub) { - tbxImporterRewardRub.setValue(evo_model?.evo_importer_reward_rub); - } else { - tbxImporterRewardRub.resetValue(); + evo_importer_reward_rub = evo_model?.evo_importer_reward_rub; } - } else if (brandId) { + } + + if (brandId && evo_importer_reward_perc === 0 && evo_importer_reward_rub === 0) { const { data: { evo_brand }, } = await apolloClient.query({ @@ -360,20 +361,16 @@ export default function reactions({ store, apolloClient }: ProcessContext) { }); if (evo_brand?.evo_importer_reward_perc) { - tbxImporterRewardPerc.setValue(evo_brand?.evo_importer_reward_perc); - } else { - tbxImporterRewardPerc.resetValue(); + evo_importer_reward_perc = evo_brand?.evo_importer_reward_perc; } if (evo_brand?.evo_importer_reward_rub) { - tbxImporterRewardRub.setValue(evo_brand?.evo_importer_reward_rub); - } else { - tbxImporterRewardRub.resetValue(); + evo_importer_reward_rub = evo_brand?.evo_importer_reward_rub; } - } else { - tbxImporterRewardPerc.resetValue(); - tbxImporterRewardRub.resetValue(); } + + tbxImporterRewardPerc.setValue(evo_importer_reward_perc); + tbxImporterRewardRub.setValue(evo_importer_reward_rub); } );