diff --git a/apps/web/process/price/reactions/common.ts b/apps/web/process/price/reactions/common.ts index a7c53a4..9e46eb0 100644 --- a/apps/web/process/price/reactions/common.ts +++ b/apps/web/process/price/reactions/common.ts @@ -128,9 +128,15 @@ export default function reactions({ store, apolloClient }: ProcessContext) { ); reaction( - () => $calculation.$values.getValues(['comissionPerc', 'plPriceRub']), - ({ plPriceRub, comissionPerc }) => { - const rub = (comissionPerc * plPriceRub) / 100; + () => + $calculation.$values.getValues([ + 'comissionPerc', + 'plPriceRub', + 'addEquipmentPrice', + 'importProgramSum', + ]), + ({ plPriceRub, comissionPerc, addEquipmentPrice, importProgramSum }) => { + const rub = (comissionPerc * (plPriceRub + addEquipmentPrice - importProgramSum)) / 100; $calculation.element('tbxComissionRub').setValue(rub); } ); @@ -140,8 +146,9 @@ export default function reactions({ store, apolloClient }: ProcessContext) { reaction( () => $calculation.element('tbxComissionRub').getValue(), (comissionRub) => { - const { plPriceRub } = $calculation.$values.getValues(); - const perc = (comissionRub / plPriceRub) * 100; + const { plPriceRub, addEquipmentPrice, importProgramSum } = + $calculation.$values.getValues(); + const perc = (comissionRub / (plPriceRub + addEquipmentPrice - importProgramSum)) * 100; $calculation.element('tbxComissionPerc').setValue(perc); } ),