diff --git a/src/client/Containers/Calculation/Components/Sections/sectionsList.ts b/src/client/Containers/Calculation/Components/Sections/sectionsList.ts index 644ffcf..4863b05 100644 --- a/src/client/Containers/Calculation/Components/Sections/sectionsList.ts +++ b/src/client/Containers/Calculation/Components/Sections/sectionsList.ts @@ -473,7 +473,6 @@ const sections: ISection[] = [ // 'selectTarif', // 'tbxCreditRate', // 'selectRate', - // 'radioRequirementTelematic', // ], // }, // { @@ -483,6 +482,7 @@ const sections: ISection[] = [ // 'tbxMaxPriceChange', // 'tbxImporterRewardPerc', // 'tbxImporterRewardRub', + // 'tbxBonusCoefficient', // ], // }, // ], diff --git a/src/client/Containers/Calculation/Elements/components.ts b/src/client/Containers/Calculation/Elements/components.ts index 8bbd648..7086211 100644 --- a/src/client/Containers/Calculation/Elements/components.ts +++ b/src/client/Containers/Calculation/Elements/components.ts @@ -24,6 +24,7 @@ export default { tbxSupplierDiscountPerc: InputNumber, radioBalanceHolder: Radio, tbxSaleBonus: InputNumber, + tbxBonusCoefficient: InputNumber, tbxFirstPaymentPerc: InputNumber, tbxFirstPaymentRub: InputNumber, radioLastPaymentRule: Radio, diff --git a/src/client/Containers/Calculation/Elements/titles.ts b/src/client/Containers/Calculation/Elements/titles.ts index d025b1b..d7fc8e0 100644 --- a/src/client/Containers/Calculation/Elements/titles.ts +++ b/src/client/Containers/Calculation/Elements/titles.ts @@ -27,6 +27,7 @@ export const elementsTitles: Partial> = { tbxComissionPerc: 'Комиссия, %', tbxComissionRub: 'Комиссия, руб.', tbxSaleBonus: 'Размер бонуса МПЛ', + tbxBonusCoefficient: 'Коэффициент снижения бонуса', tbxIRR_Perc: 'IRR, %', selectLeaseObjectType: 'Тип предмета лизинга', radioDeliveryTime: 'Срок поставки', diff --git a/src/client/Containers/Calculation/Elements/values.ts b/src/client/Containers/Calculation/Elements/values.ts index bba0602..e0d32fd 100644 --- a/src/client/Containers/Calculation/Elements/values.ts +++ b/src/client/Containers/Calculation/Elements/values.ts @@ -41,6 +41,7 @@ const elementsValues: Record = { tbxComissionPerc: 'comissionPerc', tbxComissionRub: 'comissionRub', tbxSaleBonus: 'saleBonus', + tbxBonusCoefficient: 'bonusCoefficient', tbxIRR_Perc: 'IRR_Perc', selectLeaseObjectType: 'leaseObjectType', radioDeliveryTime: 'deliveryTime', diff --git a/src/client/Containers/Calculation/types/elements.ts b/src/client/Containers/Calculation/types/elements.ts index b628711..e2ecadb 100644 --- a/src/client/Containers/Calculation/types/elements.ts +++ b/src/client/Containers/Calculation/types/elements.ts @@ -25,6 +25,7 @@ export type ElementsNames = | 'tbxComissionPerc' | 'tbxComissionRub' | 'tbxSaleBonus' + | 'tbxBonusCoefficient' | 'tbxIRR_Perc' | 'selectLeaseObjectType' | 'radioDeliveryTime' diff --git a/src/client/stores/CalculationStore/Effects/reactions/otherReactions.ts b/src/client/stores/CalculationStore/Effects/reactions/otherReactions.ts index b6d7764..71023c5 100644 --- a/src/client/stores/CalculationStore/Effects/reactions/otherReactions.ts +++ b/src/client/stores/CalculationStore/Effects/reactions/otherReactions.ts @@ -857,13 +857,14 @@ const reactionEffects: IReactionEffect[] = [ calculationStore => ({ expression: () => { - const { saleBonus } = calculationStore.values; - return saleBonus; + const { saleBonus, product } = calculationStore.values; + return { saleBonus, product }; }, - effect: saleBonus => { + effect: ({ saleBonus, product }) => { + calculationStore.setStatus('tbxSaleBonus', ElementStatus.Default); const systemuser = calculationStore.getStaticData('systemuser'); - if (systemuser) { + if (systemuser && product) { const evo_sot_coefficient_type = calculationStore .getStaticData('evo_sot_coefficient_type') .find(x => x.evo_id === 'BONUS_LEASING'); @@ -873,13 +874,11 @@ const reactionEffects: IReactionEffect[] = [ x => x.evo_job_titleid === systemuser[0].evo_job_titleid && x.evo_sot_coefficient_typeid === - evo_sot_coefficient_type?.evo_sot_coefficient_typeid, + evo_sot_coefficient_type?.evo_sot_coefficient_typeid && + x.evo_baseproducts?.map(x => x.evo_id).includes(product), ); - if ( - evo_coefficient_bonus && - evo_coefficient_bonus.evo_sot_coefficient - ) { + if (evo_coefficient_bonus?.evo_sot_coefficient) { const max_sale_bonus = evo_coefficient_bonus.evo_sot_coefficient * 100; if (parseFloat(saleBonus) > round(max_sale_bonus, 2)) { @@ -894,6 +893,9 @@ const reactionEffects: IReactionEffect[] = [ } else { calculationStore.setValidation('tbxSaleBonus', undefined); } + } else { + calculationStore.setValue('saleBonus', 0); + calculationStore.setStatus('tbxSaleBonus', ElementStatus.Disabled); } } }, diff --git a/src/client/stores/CalculationStore/config/initialValues.ts b/src/client/stores/CalculationStore/config/initialValues.ts index 7c192d2..209452c 100644 --- a/src/client/stores/CalculationStore/config/initialValues.ts +++ b/src/client/stores/CalculationStore/config/initialValues.ts @@ -27,7 +27,8 @@ const initialValues: Partial> = { highSeasonStart: 100000000, comissionPerc: 0, comissionRub: 0, - saleBonus: 1.3, + saleBonus: 0, + bonusCoefficient: 1, IRR_Perc: 20, brand: null, model: null, diff --git a/src/client/stores/CalculationStore/init/index.ts b/src/client/stores/CalculationStore/init/index.ts index ce46f67..b66c767 100644 --- a/src/client/stores/CalculationStore/init/index.ts +++ b/src/client/stores/CalculationStore/init/index.ts @@ -52,15 +52,18 @@ export default async function (this: ICalculationStore) { x => x.evo_id === 'BONUS_LEASING', ); - const evo_coefficient_bonus = staticEntities?.evo_coefficient?.find( + const evo_coefficient_bonuses = staticEntities?.evo_coefficient?.filter( x => x.evo_job_titleid === systemuser?.evo_job_titleid && x.evo_sot_coefficient_typeid === evo_sot_coefficient_type?.evo_sot_coefficient_typeid, ); - if (evo_coefficient_bonus?.evo_sot_coefficient) - this.setValue('saleBonus', evo_coefficient_bonus.evo_sot_coefficient * 100); + const max_bonus = Math.max( + ...evo_coefficient_bonuses.map(x => x.evo_sot_coefficient || 0), + ); + + this.setValue('saleBonus', max_bonus * 100); calculationProcess.deleteProcess(Process.Init); } diff --git a/src/core/services/CrmService/graphql/query/staticData/static_data.graphql b/src/core/services/CrmService/graphql/query/staticData/static_data.graphql index 6a88575..202725d 100644 --- a/src/core/services/CrmService/graphql/query/staticData/static_data.graphql +++ b/src/core/services/CrmService/graphql/query/staticData/static_data.graphql @@ -42,6 +42,10 @@ query GetStaticData($statecode: Int, $currentDate: DateTime) { evo_businessunitid evo_sale_businessunitid } + evo_baseproducts { + evo_id + evo_baseproductid + } } evo_sot_coefficient_type: evo_sot_coefficient_types(statecode: $statecode) { evo_id diff --git a/src/core/services/CrmService/graphql/schema.graphql b/src/core/services/CrmService/graphql/schema.graphql index ff34c98..8075d42 100644 --- a/src/core/services/CrmService/graphql/schema.graphql +++ b/src/core/services/CrmService/graphql/schema.graphql @@ -1,9 +1,15 @@ -"""The cost directives is used to express the complexity of a field.""" +""" +The cost directives is used to express the complexity of a field. +""" directive @cost( - """Defines the complexity of the field.""" + """ + Defines the complexity of the field. + """ complexity: Int! = 1 - """Defines field arguments that act as complexity multipliers.""" + """ + Defines field arguments that act as complexity multipliers. + """ multipliers: [MultiplierPath!] ) on FIELD_DEFINITION @@ -23,7 +29,9 @@ Export this locally resolved field as a variable to be used in the remainder of https://www.apollographql.com/docs/react/essentials/local-state/#using-client-fields-as-variables """ directive @export( - """The variable name to export this field as.""" + """ + The variable name to export this field as. + """ as: String! ) on FIELD @@ -32,7 +40,9 @@ Specify a custom store key for this result. See https://www.apollographql.com/docs/react/advanced/caching/#the-connection-directive """ directive @connection( - """Specify the store key.""" + """ + Specify the store key. + """ key: String! """ @@ -49,78 +59,204 @@ scalar MultiplierPath type Query { account(accountid: Uuid!): account - """Контрагенты. statecode по умолчанию 0""" - accounts(evo_accnumber: String, evo_account_type: [Int!], evo_broker_accountid: Uuid, evo_fin_department_accountid: Uuid, evo_id_elt: String, evo_inn: String, evo_kpp: String, evo_legal_form: Int, evo_type_ins_policy: [Int!], ownerid: Uuid, owner_domainname: String, statecode: Int): [account] + """ + Контрагенты. statecode по умолчанию 0 + """ + accounts( + evo_accnumber: String + evo_account_type: [Int!] + evo_broker_accountid: Uuid + evo_fin_department_accountid: Uuid + evo_id_elt: String + evo_inn: String + evo_kpp: String + evo_legal_form: Int + evo_type_ins_policy: [Int!] + ownerid: Uuid + owner_domainname: String + statecode: Int + ): [account] - """Брокер. statecode по умолчанию 0""" + """ + Брокер. statecode по умолчанию 0 + """ broker_agents(ownnerid: Uuid!, statecode: Int): [account] contacts(parentcustomerid: Uuid, statecode: Int): [contact] email(activityid: Uuid!): email evo_addcontract(evo_addcontractid: Uuid!): evo_addcontract evo_addproduct(evo_addproductid: Uuid!): evo_addproduct evo_addproduct_type(evo_addproduct_typeid: Uuid!): evo_addproduct_type - evo_addproduct_types(evo_datefrom_param: DateParamInput, evo_dateto_param: DateParamInput, evo_max_period_param: DecimalParamInput, evo_min_period_param: DecimalParamInput, evo_product_type: Int, statecode: Int): [evo_addproduct_type] + evo_addproduct_types( + evo_datefrom_param: DateParamInput + evo_dateto_param: DateParamInput + evo_max_period_param: DecimalParamInput + evo_min_period_param: DecimalParamInput + evo_product_type: Int + statecode: Int + ): [evo_addproduct_type] evo_address(evo_addressid: Uuid!): evo_address - evo_addresses(evo_address_name: String, evo_fias: Boolean, statecode: Int): [evo_address] + evo_addresses( + evo_address_name: String + evo_fias: Boolean + statecode: Int + ): [evo_address] evo_agency_agreement(evo_agency_agreementid: Uuid!): evo_agency_agreement - evo_bank_detailses(evo_accountid: Uuid, orderby: OrderByInput, statecode: Int = 0): [evo_bank_details] + evo_bank_detailses( + evo_accountid: Uuid + orderby: OrderByInput + statecode: Int = 0 + ): [evo_bank_details] evo_baseproduct(evo_baseproductid: Uuid!): evo_baseproduct - evo_baseproducts(evo_datefrom_param: DateParamInput, evo_dateto_param: DateParamInput, evo_relation: [Int!], statecode: Int): [evo_baseproduct] + evo_baseproducts( + evo_datefrom_param: DateParamInput + evo_dateto_param: DateParamInput + evo_relation: [Int!] + statecode: Int + ): [evo_baseproduct] evo_brands(evo_vehicle_type: [Int!], statecode: Int): [evo_brand] evo_businessunits(statecode: Int): [evo_businessunit] evo_client_risks(statecode: Int): [evo_client_risk] evo_client_types(statecode: Int): [evo_client_type] - evo_coefficients(evo_client_riskid: Uuid, evo_client_typeid: Uuid, evo_corfficient_type: Int, evo_datefrom_param: DateParamInput, evo_dateto_param: DateParamInput, evo_job_titleid: Uuid, evo_max_period_param: DecimalParamInput, evo_min_period_param: DecimalParamInput, statecode: Int): [evo_coefficient] + evo_coefficients( + evo_client_riskid: Uuid + evo_client_typeid: Uuid + evo_corfficient_type: Int + evo_datefrom_param: DateParamInput + evo_dateto_param: DateParamInput + evo_job_titleid: Uuid + evo_max_period_param: DecimalParamInput + evo_min_period_param: DecimalParamInput + statecode: Int + ): [evo_coefficient] evo_contract(evo_contractid: Uuid!): evo_contract evo_contracts(evo_name: String, statecode: Int): [evo_contract] evo_countries(evo_code_numeric: String): [evo_countryGraphQL] evo_country(evo_countryid: Uuid!): evo_countryGraphQL - evo_currencychanges(evo_coursedate_param: DateParamInput, evo_ref_transactioncurrency: Uuid, statecode: Int): [evo_currencychange] + evo_currencychanges( + evo_coursedate_param: DateParamInput + evo_ref_transactioncurrency: Uuid + statecode: Int + ): [evo_currencychange] evo_debtwork_contract(debtworkContractId: Uuid!): evo_debtwork_contract evo_equipments(evo_modelid: Uuid, statecode: Int): [evo_equipment] - evo_external_supplier_codes(evo_id: String, statecode: Int): [evo_external_supplier_code] - evo_external_system_request(evo_external_system_requestid: Uuid!): evo_external_system_request - evo_external_system_requests(evo_integration_status: Int, evo_name: String, evo_system: Int, statecode: Int): [evo_external_system_request] + evo_external_supplier_codes( + evo_id: String + statecode: Int + ): [evo_external_supplier_code] + evo_external_system_request( + evo_external_system_requestid: Uuid! + ): evo_external_system_request + evo_external_system_requests( + evo_integration_status: Int + evo_name: String + evo_system: Int + statecode: Int + ): [evo_external_system_request] evo_finegibdd(evo_finegibddid: Uuid!): evo_finegibdd evo_gps_brands(statecode: Int): [evo_gps_brand] evo_gps_models(evo_gps_brandid: Uuid, statecode: Int): [evo_gps_model] evo_graphs(evo_contractid: Uuid, statecode: Int): [evo_graph] - evo_identity_documents(evo_employee_systemuserid: Uuid!): [evo_identity_document] + evo_identity_documents( + evo_employee_systemuserid: Uuid! + ): [evo_identity_document] evo_impairment_groups(statecode: Int): [evo_impairment_group] - evo_insurance_periods(evo_contractid: Uuid, statecode: Int): [evo_insurance_period] + evo_insurance_periods( + evo_contractid: Uuid + statecode: Int + ): [evo_insurance_period] evo_job_titles(statecode: Int): [evo_job_title] evo_leasingobject(evo_leasingobjectid: Uuid!): evo_leasingobject - evo_leasingobject_type(evo_leasingobject_typeid: Uuid!): evo_leasingobject_type + evo_leasingobject_type( + evo_leasingobject_typeid: Uuid! + ): evo_leasingobject_type evo_leasingobject_types(statecode: Int): [evo_leasingobject_type] evo_model(evo_modelid: Uuid!): evo_model - evo_models(evo_brandid: Uuid, evo_vehicle_type: Int, statecode: Int): [evo_model] + evo_models( + evo_brandid: Uuid + evo_vehicle_type: Int + statecode: Int + ): [evo_model] evo_orglegalform(evo_orglegalformid: Uuid!): evo_orglegalform evo_orglegalforms(statecode: Int = 0): [evo_orglegalform] - evo_paymentorders(evo_dds_1c: String, evo_name: String, evo_paydate_param: DateParamInput, evo_payment_number_1c: String, evo_paysum: Decimal, statecode: Int, statuscode: Int): [evo_paymentorder] - evo_planpayments(evo_addproduct_typeid: Uuid, statecode: Int): [evo_planpayment] + evo_paymentorders( + evo_dds_1c: String + evo_name: String + evo_paydate_param: DateParamInput + evo_payment_number_1c: String + evo_paysum: Decimal + statecode: Int + statuscode: Int + ): [evo_paymentorder] + evo_planpayments( + evo_addproduct_typeid: Uuid + statecode: Int + ): [evo_planpayment] evo_product_risk(evo_product_riskid: Uuid!): evo_product_risk evo_product_risks(statecode: Int): [evo_product_risk] evo_rate(evo_rateid: Uuid!): evo_rate - evo_rates(evo_datefrom_param: DateParamInput, evo_dateto_param: DateParamInput, statecode: Int): [evo_rate] + evo_rates( + evo_datefrom_param: DateParamInput + evo_dateto_param: DateParamInput + statecode: Int + ): [evo_rate] - """Регион. statecode по умолчанию 0""" - evo_regions(evo_businessunit_evolution: Boolean, evo_creditregistry_id: Int, statecode: Int): [evo_region] + """ + Регион. statecode по умолчанию 0 + """ + evo_regions( + evo_businessunit_evolution: Boolean + evo_creditregistry_id: Int + statecode: Int + ): [evo_region] evo_request_payment(evo_request_paymentid: Uuid!): evo_request_payment - evo_request_payments(evo_id: String, evo_name: String, statecode: Int): [evo_request_payment] + evo_request_payments( + evo_id: String + evo_name: String + statecode: Int + ): [evo_request_payment] evo_reward_condition(evo_reward_conditionid: Uuid!): evo_reward_condition - evo_reward_conditions(evo_agency_agreementid_param: GuidParamInput, evo_agent_accountid: Uuid, evo_datefrom_param: DateParamInput, evo_dateto_param: DateParamInput, statecode: Int): [evo_reward_condition] + evo_reward_conditions( + evo_agency_agreementid_param: GuidParamInput + evo_agent_accountid: Uuid + evo_datefrom_param: DateParamInput + evo_dateto_param: DateParamInput + statecode: Int + ): [evo_reward_condition] evo_sot_coefficient_types(statecode: Int): [evo_sot_coefficient_type] evo_statuscode(evo_id: String, evo_statuscodeid: Uuid): evo_statuscode evo_statuscodes(statecode: Int): [evo_statuscode] - evo_subsidies(evo_datefrom_param: DateParamInput, evo_dateto_param: DateParamInput, statecode: Int): [evo_subsidy] + evo_subsidies( + evo_datefrom_param: DateParamInput + evo_dateto_param: DateParamInput + statecode: Int + ): [evo_subsidy] evo_tarif(evo_tarifid: Uuid!): evo_tarif - evo_tarifs(evo_balance_holder: [Int!], evo_baseproductid: Uuid, evo_datefrom_param: DateParamInput, evo_dateto_param: DateParamInput, evo_graphtype_exception: [Int!], evo_ins_type: [Int!], evo_max_first_payment_param: DecimalParamInput, evo_max_last_payment_param: DecimalParamInput, evo_max_period_param: DecimalParamInput, evo_min_first_payment_param: DecimalParamInput, evo_min_last_payment_param: DecimalParamInput, evo_min_period_param: DecimalParamInput, evo_used: Boolean, statecode: Int): [evo_tarif] + evo_tarifs( + evo_balance_holder: [Int!] + evo_baseproductid: Uuid + evo_datefrom_param: DateParamInput + evo_dateto_param: DateParamInput + evo_graphtype_exception: [Int!] + evo_ins_type: [Int!] + evo_max_first_payment_param: DecimalParamInput + evo_max_last_payment_param: DecimalParamInput + evo_max_period_param: DecimalParamInput + evo_min_first_payment_param: DecimalParamInput + evo_min_last_payment_param: DecimalParamInput + evo_min_period_param: DecimalParamInput + evo_used: Boolean + statecode: Int + ): [evo_tarif] evo_town(evo_fias_id: String, evo_townid: Uuid): evo_town - """Города. statecode по умолчанию 0""" + """ + Города. statecode по умолчанию 0 + """ evo_towns(evo_regionid: Uuid, statecode: Int): [evo_town] evo_typedocpackages(statecode: Int): [evo_typedocpackage] - evo_vehicle_body_type(evo_vehicle_body_typeid: Uuid!): evo_vehicle_body_typeGraphQL + evo_vehicle_body_type( + evo_vehicle_body_typeid: Uuid! + ): evo_vehicle_body_typeGraphQL """ Лизинговые сделки. statecode по умолчанию 0, можно отфильтровать по ownerid и/или domainName @@ -130,8 +266,18 @@ type Query { """ Интересы. statecode по умолчанию 0, можно отфильтровать по ownerid и/или domainName """ - leads(evo_opportunityid: Uuid, ownerid: Uuid, owner_domainname: String, statecode: Int): [lead] - opportunities(evo_leadid: Uuid, ownerid: Uuid, owner_domainname: String, statecode: Int): [opportunity] + leads( + evo_opportunityid: Uuid + ownerid: Uuid + owner_domainname: String + statecode: Int + ): [lead] + opportunities( + evo_leadid: Uuid + ownerid: Uuid + owner_domainname: String + statecode: Int + ): [opportunity] opportunity(opportunityid: Uuid!): opportunity queue(emailaddress: String): queue quote(quoteId: Uuid!): quote @@ -139,18 +285,33 @@ type Query { """ Предложения. statecode по умолчанию 0, можно отфильтровать по ownerid и/или domainName """ - quotes(condition: ConditionInput, evo_leadid: Uuid, ownerid: Uuid, owner_domainname: String, statecode: Int): [quote] + quotes( + condition: ConditionInput + evo_leadid: Uuid + ownerid: Uuid + owner_domainname: String + statecode: Int + ): [quote] - """Агенты салона. statecode по умолчанию 0""" + """ + Агенты салона. statecode по умолчанию 0 + """ salon_agents(salonaccountid: Uuid!, statecode: Int): [account] - """Поставщики ЮЛ салона. statecode по умолчанию 0""" + """ + Поставщики ЮЛ салона. statecode по умолчанию 0 + """ salon_providers(salonaccountid: Uuid!, statecode: Int): [account] systemuser(domainname: String, systemuserid: Uuid): systemuser - systemusers(evo_employee_id: String, isdisabled: Boolean = false): [systemuser] + systemusers( + evo_employee_id: String + isdisabled: Boolean = false + ): [systemuser] templates(description: String): [template] - """Валюта. statecode по умолчанию 0""" + """ + Валюта. statecode по умолчанию 0 + """ transactioncurrencies(statecode: Int): [transactioncurrency] transactioncurrency(transactioncurrencyid: Uuid!): transactioncurrency } @@ -186,7 +347,10 @@ type account { evo_dadatdalog: String evo_dealer_responsible_systemuserid: Uuid evo_div_12month: Boolean - evo_documents(evo_documenttypeid_param: GuidParamInput, latestversion: Boolean = true): [evo_document] + evo_documents( + evo_documenttypeid_param: GuidParamInput + latestversion: Boolean = true + ): [evo_document] evo_economic_security_systemuserid: Uuid evo_employee_count: Int evo_fingap_number_rules: Int @@ -278,7 +442,9 @@ input GuidParamInput { in: [Uuid!] } -"""The built-in `Decimal` scalar type.""" +""" +The built-in `Decimal` scalar type. +""" scalar Decimal input OrderByInput { @@ -843,6 +1009,7 @@ type quote { evo_check_ins_result: Int evo_client_riskid: Uuid evo_client_typeid: Uuid + evo_coefficien_bonus_reducttion: Decimal evo_comission_perc: Decimal evo_comission_rub: Decimal evo_contact_name: String @@ -1083,7 +1250,12 @@ type quote { type evo_brand { createdon: DateTime - evo_baseproducts(evo_datefrom_param: DateParamInput, evo_dateto_param: DateParamInput, evo_relation: [Int!], statecode: Int): [evo_baseproduct] + evo_baseproducts( + evo_datefrom_param: DateParamInput + evo_dateto_param: DateParamInput + evo_relation: [Int!] + statecode: Int + ): [evo_baseproduct] evo_brandid: Uuid evo_brand_owner: Int evo_id: String @@ -1099,7 +1271,12 @@ type evo_brand { type evo_model { createdon: DateTime - evo_baseproducts(evo_datefrom_param: DateParamInput, evo_dateto_param: DateParamInput, evo_relation: [Int!], statecode: Int): [evo_baseproduct] + evo_baseproducts( + evo_datefrom_param: DateParamInput + evo_dateto_param: DateParamInput + evo_relation: [Int!] + statecode: Int + ): [evo_baseproduct] evo_brandid: Uuid evo_gps: Boolean evo_high_risk_vehicle: Boolean @@ -1125,7 +1302,12 @@ type evo_model { type evo_equipment { createdon: DateTime - evo_baseproducts(evo_datefrom_param: DateParamInput, evo_dateto_param: DateParamInput, evo_relation: [Int!], statecode: Int): [evo_baseproduct] + evo_baseproducts( + evo_datefrom_param: DateParamInput + evo_dateto_param: DateParamInput + evo_relation: [Int!] + statecode: Int + ): [evo_baseproduct] evo_equipmentid: Uuid evo_id: String evo_impairment_groupid: Uuid @@ -1347,6 +1529,8 @@ type evo_contract { evo_acquisition_costs: Decimal evo_act_date: DateTime evo_add_bonus_summ: Decimal + evo_add_director_bonus: Decimal + evo_add_region_director_bonus: Decimal evo_agent_accountid: Uuid evo_agent_reward: Decimal evo_agent_reward_conditionid: Uuid @@ -1370,6 +1554,7 @@ type evo_contract { evo_check_scan_result: Int evo_claim_pledge_agreementid: Uuid evo_client_type: Int + evo_coefficien_bonus_reducttion: Decimal evo_contractid: Uuid evo_contract_status_1c: Int evo_contract_status_change_date_in_crm: DateTime @@ -1413,6 +1598,7 @@ type evo_contract { evo_economic_with_nds_actual: Decimal evo_end_date_of_pledge_claim: DateTime evo_end_date_of_pledge_leasobject: DateTime + evo_equip_price: Decimal evo_expinput_actual_date: DateTime evo_fedres_xml_date: DateTime evo_finegibdds: [evo_finegibdd] @@ -1478,12 +1664,15 @@ type evo_contract { evo_price_without_discount: Decimal evo_price_without_discount_supplier_currency: Decimal evo_price_wthout_discount_nds_sup_currency: Decimal + evo_program_import_subsidy_sum: Decimal evo_purchases_participation: Boolean evo_quoteid: Uuid evo_rate: Decimal evo_rateid: Uuid evo_reason_change_account: Int evo_ref_opportunityid: Uuid + evo_region_director_bonus: Decimal + evo_region_director_fingap_bonus: Decimal evo_region_director_nsib_bonus: Decimal evo_registration_addproductid: Uuid evo_registration_addproductidData: evo_addproduct @@ -1936,6 +2125,8 @@ type evo_addcontract { evo_activdate_insurance: DateTime evo_addcontractid: Uuid evo_add_bonus_summ: Decimal + evo_add_director_bonus: Decimal + evo_add_region_director_bonus: Decimal evo_agent_reward_summ: Decimal evo_age_drivers: Int evo_age_drivers_new: Int @@ -2029,6 +2220,8 @@ type evo_addcontract { evo_engine_type_new: Int evo_engine_volume: Decimal evo_engine_volume_new: Decimal + evo_equip_price: Decimal + evo_equip_price_new: Decimal evo_exp_drivers: Int evo_exp_drivers_new: Int evo_fin_department_reward_conditionid: Uuid @@ -2091,6 +2284,7 @@ type evo_addcontract { evo_niatinception_msfo: Decimal evo_ni_at_inception: Decimal evo_not_require_signing: Boolean + evo_not_require_signing_send_date: DateTime evo_npvni_msfo: Decimal evo_npvni_msfo_final: Decimal evo_ns_bonus_summ: Decimal @@ -2140,6 +2334,8 @@ type evo_addcontract { evo_price_without_disc_supplier_currency_new: Decimal evo_price_wthout_disc_nds_sup_currency: Decimal evo_price_wthout_disc_nds_sup_currency_new: Decimal + evo_program_import_subsidy_sum: Decimal + evo_program_import_subsidy_sum_new: Decimal evo_prop_type: String evo_prop_type_new: String evo_pts_change: Boolean @@ -2151,6 +2347,7 @@ type evo_addcontract { evo_refuse_reason: Int evo_regionid: Uuid evo_regionid_new: Uuid + evo_region_director_bonus: Decimal evo_registration: Int evo_registration_addproduct_typeid: Uuid evo_registration_addproduct_typeid_new: Uuid @@ -2407,7 +2604,9 @@ type team { toObjectString: String } -"""The `DateTime` scalar represents an ISO-8601 compliant date time type.""" +""" +The `DateTime` scalar represents an ISO-8601 compliant date time type. +""" scalar DateTime input FilterInput { diff --git a/src/core/services/CrmService/types/entities.ts b/src/core/services/CrmService/types/entities.ts index 56f1bfc..d8fa984 100644 --- a/src/core/services/CrmService/types/entities.ts +++ b/src/core/services/CrmService/types/entities.ts @@ -351,6 +351,7 @@ export interface IEvoCoefficient extends BaseEntity { evo_leasingobject_types?: IEvoLeasingObjectType[]; evo_job_titleid?: string; evo_businessunits?: IEvoBusinessunit[]; + evo_baseproducts?: IEvoBaseproduct[]; } export interface IEvoAddproductType extends BaseEntity { diff --git a/src/core/types/Calculation/Store/values.ts b/src/core/types/Calculation/Store/values.ts index 93ce7c8..3b723e5 100644 --- a/src/core/types/Calculation/Store/values.ts +++ b/src/core/types/Calculation/Store/values.ts @@ -140,7 +140,8 @@ export type ValuesNames = | 'VATInLeaseObjectPrice' | 'engineHours' | 'importProgram' - | 'addEquipmentPrice'; + | 'addEquipmentPrice' + | 'bonusCoefficient'; export type ComputedValuesNames = | 'leaseObjectRiskName'