diff --git a/apps/web/server/routers/calculate/lib/request.ts b/apps/web/server/routers/calculate/lib/request.ts index 014ef38..efb6364 100644 --- a/apps/web/server/routers/calculate/lib/request.ts +++ b/apps/web/server/routers/calculate/lib/request.ts @@ -305,12 +305,12 @@ export async function createRequestData({ }, async deliverySum() { - if (values.calcDoubleAgentRewardCondition) { + if (values.dealerRewardCondition) { const { data: { evo_reward_condition }, } = await apolloClient.query({ query: CRMTypes.GetRewardConditionDocument, - variables: { conditionId: values.calcDoubleAgentRewardCondition }, + variables: { conditionId: values.dealerRewardCondition }, }); if (evo_reward_condition?.evo_calc_reward_rules === 100_000_001) { @@ -461,18 +461,18 @@ export async function createRequestData({ }); if (evo_reward_condition?.evo_calc_reward_rules === 100_000_001) { - return values.dealerRewardSumm / (1 + VAT); + return values.finDepartmentRewardSumm / (1 + VAT); } else if ( evo_reward_condition?.evo_agency_agreementidData?.evo_leasingobject_price === 100_000_001 ) { const discount = await this.discount(); const plPriceWithVAT = await this.plPriceWithVAT(); - return (values.dealerRewardSumm / 100) * (plPriceWithVAT - discount * (1 + VAT)); + return (values.finDepartmentRewardSumm / 100) * (plPriceWithVAT - discount * (1 + VAT)); } else { const acceptSum = await this.acceptSum(); - return (values.dealerRewardSumm / 100) * acceptSum; + return (values.finDepartmentRewardSumm / 100) * acceptSum; } } @@ -583,9 +583,11 @@ export async function createRequestData({ }, async importerSum() { + if (values.importerRewardRub > 0) return values.importerRewardRub; + const acceptSum = await this.acceptSum(); - return values.importerRewardRub || (values.importerRewardPerc / 100) * acceptSum; + return (values.importerRewardPerc / 100) * acceptSum; }, async insuranceBonus() {