diff --git a/src/client/stores/CalculationStore/Effects/reactions/recalcWoRevisionReactions.ts b/src/client/stores/CalculationStore/Effects/reactions/recalcWoRevisionReactions.ts index 56eefd7..cdd5e10 100644 --- a/src/client/stores/CalculationStore/Effects/reactions/recalcWoRevisionReactions.ts +++ b/src/client/stores/CalculationStore/Effects/reactions/recalcWoRevisionReactions.ts @@ -134,19 +134,32 @@ const reactionEffects: IReactionEffect[] = [ const quote = calculationStore.getOption('selectQuote'); + const leaseObjectUsed = calculationStore.getValue('leaseObjectUsed'); + const maxCondition1 = + leaseObjectUsed === false && quote?.evo_max_price_change && !product?.evo_sale_without_nds && price - supplierDiscountRub + addEquipmentPrice - importProgramSum > quote.evo_max_price_change; const maxCondition2 = + leaseObjectUsed === false && quote?.evo_max_price_change && product?.evo_sale_without_nds && leaseObjectPriceWthtVAT > quote.evo_max_price_change - (quote.evo_nds_in_price_supplier_currency || 0); + const maxCondition3 = + leaseObjectUsed === true && + quote?.evo_supplier_currency_price && + price - supplierDiscountRub + addEquipmentPrice - importProgramSum > + quote.evo_supplier_currency_price - + (quote.evo_discount_supplier_currency || 0) + + (quote.evo_equip_price || 0) - + (quote.evo_program_import_subsidy_sum || 0); + const minCondition1 = quote?.evo_min_change_price && !product?.evo_sale_without_nds && @@ -160,7 +173,7 @@ const reactionEffects: IReactionEffect[] = [ quote.evo_min_change_price - (quote.evo_nds_in_price_supplier_currency || 0); - if (maxCondition1 || maxCondition2) { + if (maxCondition1 || maxCondition2 || maxCondition3) { calculationStore.setValidation('tbxLeaseObjectPrice', false); openNotification({ type: 'error', diff --git a/src/core/services/CrmService/graphql/query/quote/fragments/quoteFields.graphql b/src/core/services/CrmService/graphql/query/quote/fragments/quoteFields.graphql index 0d3b50e..27f90f3 100644 --- a/src/core/services/CrmService/graphql/query/quote/fragments/quoteFields.graphql +++ b/src/core/services/CrmService/graphql/query/quote/fragments/quoteFields.graphql @@ -72,9 +72,7 @@ fragment quoteFields on quote { evo_payment_redemption_sum evo_client_typeid - evo_supplier_currency_price evo_transactioncurrencyid - evo_discount_supplier_currency evo_discount_perc evo_last_payment_calc evo_last_payment_rub @@ -142,7 +140,6 @@ fragment quoteFields on quote { evo_nds_in_price_supplier_currency evo_engine_hours evo_program_import_subsidyid - evo_equip_price evo_accept_period evo_db_accept_registration evo_vin diff --git a/src/core/services/CrmService/graphql/query/quote/fragments/quoteFieldsLite.graphql b/src/core/services/CrmService/graphql/query/quote/fragments/quoteFieldsLite.graphql index 69b84fe..46bd182 100644 --- a/src/core/services/CrmService/graphql/query/quote/fragments/quoteFieldsLite.graphql +++ b/src/core/services/CrmService/graphql/query/quote/fragments/quoteFieldsLite.graphql @@ -25,4 +25,8 @@ fragment quoteFieldsLite on quote { evo_last_payment_perc evo_purchases_participation evo_baseproductid + evo_discount_supplier_currency + evo_program_import_subsidy_sum + evo_equip_price + evo_supplier_currency_price }