Merge branch 'development'

src/client/stores/CalculationStore/Effects/actions/calculate/prepareData.ts

@@ -199,15 +199,20 @@ export default function (this: ICalculationStore): PreparedData {
   if (selectLeasingWithoutKasko?.evo_evokasko_calc_type === 100_000_001) {
     preparedValues.insuranceEvoKasko =
       (selectLeasingWithoutKasko?.evo_cost_service_provider_withoutnds || 0) *
-      (plPriceRub -
+        (plPriceRub -
-        discountRub -
+          discountRub -
-        importProgramSum +
+          importProgramSum +
-        values.addEquipmentPrice -
+          values.addEquipmentPrice -
-        values.firstPaymentRub);
+          values.firstPaymentRub) +
+      (selectLeasingWithoutKasko?.evo_price_service_provider_withoutnds || 0);
   } else {
     preparedValues.insuranceEvoKasko =
       (selectLeasingWithoutKasko?.evo_cost_service_provider_withoutnds || 0) *
-      (plPriceRub - discountRub - importProgramSum + values.addEquipmentPrice);
+        (plPriceRub -
+          discountRub -
+          importProgramSum +
+          values.addEquipmentPrice) +
+      (selectLeasingWithoutKasko?.evo_price_service_provider_withoutnds || 0);
   }
 
   preparedValues.insuranceBonusLoss = 0;

src/core/services/CrmService/graphql/query/options/main_options.graphql

@@ -317,5 +317,6 @@ query GetMainOptions(
       evo_modelid
     }
     evo_evokasko_calc_type
+    evo_price_service_provider_withoutnds
   }
 }

src/core/services/CrmService/graphql/schema.graphql

@@ -101,6 +101,7 @@ type Query {
   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_parking(evo_parkingid: Uuid!): evo_parking
   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
@@ -159,6 +160,7 @@ type Query {
 
   """Поставщики ЮЛ салона. statecode по умолчанию 0"""
   salon_providers(salonaccountid: Uuid!, statecode: Int): [account]
+  subjects: [subjectGraphQL]
   systemuser(domainname: String, systemuserid: Uuid): systemuser
   systemusers(domainname: String, evo_employee_id: String, isdisabled: Boolean = false): [systemuser]
   templates(description: String): [template]
@@ -185,6 +187,7 @@ type evo_typedocpackage {
   evo_insurance_period: Boolean
   evo_name: String
   evo_opportunity: Boolean
+  evo_parking: Boolean
   evo_programsolution: [Int!]
   evo_request_client: Boolean
   evo_request_payment: Boolean
@@ -260,7 +263,12 @@ type evo_debtwork_contract {
   evo_name: String
   evo_non_payment_count: Decimal
   evo_opportunityid: Uuid
+  evo_other_losses_amount: Decimal
+  evo_other_sanctions_amount: Decimal
+  evo_parkingid: Uuid
+  evo_parkingidData: evo_parking
   evo_plan_date_transfer_pay: DateTime
+  evo_pl_estimated_value: Decimal
   evo_redemption_com: String
   evo_redemption_type: [Int!]
   evo_result_debt_restruct: Boolean
@@ -271,6 +279,7 @@ type evo_debtwork_contract {
   evo_result_termination: Boolean
   evo_result_wait_payment: Boolean
   evo_result_withdrawal: Boolean
+  evo_saldo_calculation_date: DateTime
   evo_statuscodeid: Uuid
   evo_statuscodeidData: evo_statuscode
   evo_statuscode_reason: String
@@ -278,6 +287,7 @@ type evo_debtwork_contract {
   evo_termination_add_registry: Int
   evo_termination_com: String
   evo_termination_com_lawyer: String
+  evo_termination_date: DateTime
   evo_termination_lawyer_systemuserid: Uuid
   evo_termination_lawyer_systemuseridData: systemuser
   evo_termination_notice_date: DateTime
@@ -300,7 +310,6 @@ type evo_debtwork_contract {
   evo_withdrawal_issue_done: Int
   evo_withdrawal_issue_done_date: DateTime
   evo_withdrawal_parking_addressid: Uuid
-  evo_withdrawal_parking_addressidData: evo_address
   evo_withdrawal_plan_date: DateTime
   evo_withdrawal_systemuserid: Uuid
   evo_withdrawal_systemuseridData: systemuser
@@ -356,6 +365,14 @@ type evo_subject_incident {
   toObjectString: String
 }
 
+type subjectGraphQL {
+  createdon: DateTime
+  modifiedon: DateTime
+  subjectid: Uuid
+  title: String
+  toObjectString: String
+}
+
 type incidentGraphQL {
   caseorigincode: Int
   createdon: DateTime
@@ -393,8 +410,10 @@ type incidentGraphQL {
 type evo_question_credit_committee {
   createdon: DateTime
   evo_accountid: Uuid
+  evo_confluence_file_referenceid: String
   evo_description_general_solution: String
   evo_opportunityid: Uuid
+  evo_ownerid_systemuser: Uuid
   evo_question_credit_committeeid: Uuid
   evo_statuscodeid: Uuid
   evo_summary_judgment: Int
@@ -403,6 +422,18 @@ type evo_question_credit_committee {
   toObjectString: String
 }
 
+type evo_parking {
+  createdon: DateTime
+  evo_address_legalid: Uuid
+  evo_address_legalidData: account
+  evo_documents: [evo_document]
+  evo_name: String
+  evo_parkingid: Uuid
+  evo_storage: String
+  modifiedon: DateTime
+  toObjectString: String
+}
+
 type entity_schema {
   entity_id: String
   entity_set_name: String
@@ -490,9 +521,13 @@ type account {
   evo_state_liquidation_date: DateTime
   evo_state_registration_date: DateTime
   evo_state_status: Int
+  evo_state_status_code: String
+  evo_storage: String
   evo_subsidies(statecode: Int): [evo_subsidy]
+  evo_supplier_financing_accept: Boolean
   evo_supplier_type: Int
   evo_tax_system: Int
+  evo_telematic_provider_accountid: Uuid
   evo_type_ins_policy: [Int!]
   evo_unscrupulous_supplier: Boolean
   incidents: [incidentGraphQL]
@@ -581,6 +616,7 @@ type evo_addproduct_type {
   evo_accountid: Uuid
   evo_addproduct_typeid: Uuid
   evo_addproduct_types: [evo_addproduct_type]
+  evo_brands: [evo_brand]
   evo_controls_program: [Int!]
   evo_cost_service_provider: Decimal
   evo_cost_service_provider_withoutnds: Decimal
@@ -609,6 +645,7 @@ type evo_addproduct_type {
   evo_name: String
   evo_nsib_limit: Decimal
   evo_planpayments(statecode: Int): [evo_planpayment]
+  evo_price_service_provider_withoutnds: Decimal
   evo_prime_cost: Decimal
   evo_product_type: Int
   evo_pts_type: [Int!]
@@ -643,6 +680,7 @@ type evo_baseproduct {
   evo_relation: [Int!]
   evo_sale_without_nds: Boolean
   evo_scoring_available: Boolean
+  evo_supplier_financing_accept: Boolean
   modifiedon: DateTime
   statecode: Int
   systemusers(statecode: Int): [systemuser]
@@ -1172,6 +1210,7 @@ type quote {
   evo_evokasko_insurer_accountidData: account
   evo_evokasko_price: Decimal
   evo_exp_drivers: Int
+  evo_financing_with_own_funds: Boolean
   evo_fingap_accountid: Uuid
   evo_fingap_bonus_sum: Decimal
   evo_fingap_payer: Int
@@ -1346,7 +1385,9 @@ type quote {
   evo_subsidyid: Uuid
   evo_subsidy_summ: Decimal
   evo_supplier_accountid: Uuid
+  evo_supplier_accountidData: account
   evo_supplier_currency_price: Decimal
+  evo_supplier_financing: Boolean
   evo_supplier_type: Int
   evo_tarifid: Uuid
   evo_tax_period: Decimal
@@ -1356,6 +1397,7 @@ type quote {
   evo_trailer: Boolean
   evo_transactioncurrencyid: Uuid
   evo_unlimit_drivers: Boolean
+  evo_untype_contract: Boolean
   evo_use_for: Int
   evo_vehicle_tax_approved: Decimal
   evo_vehicle_tax_period: Decimal
@@ -1447,6 +1489,7 @@ type evo_subsidy {
   evo_check_pts: Boolean
   evo_datefrom: DateTime
   evo_dateto: DateTime
+  evo_delivery_time: [Int!]
   evo_get_subsidy_payment: Int
   evo_leasingobject_types: [evo_leasingobject_type]
   evo_max_subsidy_summ: Decimal
@@ -1654,6 +1697,7 @@ type evo_request_payment {
   evo_request_payment_type: Int
   evo_service_list: [Int!]
   evo_statuscodeid: Uuid
+  evo_statuscodeidData: evo_statuscode
   evo_storage: String
   evo_supplier_payment_type: Int
   evo_top_agency_agreementid: Uuid
@@ -1673,8 +1717,6 @@ type evo_documenttype {
   evo_documenttypeid: Uuid
   evo_draftdoc: Boolean
   evo_edit_namedoc: Boolean
-  evo_edo_documenttypeid: Uuid
-  evo_edo_documenttypeidData: evo_documenttype
   evo_fill_docname: Boolean
   evo_formalized: Boolean
   evo_id: String
@@ -1731,6 +1773,7 @@ type evo_contract {
   evo_calc_profit: Decimal
   evo_cancel_contract: Boolean
   evo_card_bonus_summ: Decimal
+  evo_cession_opportunityid: Uuid
   evo_check_scan_comment: String
   evo_check_scan_result: Int
   evo_claim_pledge_agreementid: Uuid
@@ -1883,6 +1926,7 @@ type evo_contract {
   evo_registration_addproductid: Uuid
   evo_registration_addproductidData: evo_addproduct
   evo_registration_addproduct_typeid: Uuid
+  evo_request_payments: [evo_request_payment]
   evo_return_leasing: Boolean
   evo_sale_without_nds: Boolean
   evo_signer_different_contactid: Uuid
@@ -1902,6 +1946,7 @@ type evo_contract {
   evo_supplier_bank_detailsid: Uuid
   evo_supplier_bank_detailsidData: evo_bank_details
   evo_supplier_currency_price: Decimal
+  evo_supplier_financing: Boolean
   evo_supplier_pay1_sum: Decimal
   evo_supplier_pay2_sum: Decimal
   evo_supplier_payfull_date: DateTime
@@ -2042,6 +2087,7 @@ type evo_planpayment {
   evo_cost_price_telematics_withoutnds: Decimal
   evo_cost_telematics: Decimal
   evo_cost_telematics_withoutnds: Decimal
+  evo_credit_expenses: Decimal
   evo_early_repayment_sum: Decimal
   evo_fix_calc_sum: Decimal
   evo_graphid: Uuid
@@ -2222,6 +2268,7 @@ type systemuser {
   evo_can_export_cre: Boolean
   evo_can_import_sheduled_calls: Boolean
   evo_datebirth: DateTime
+  evo_editing_question_cc: Boolean
   evo_edo: Boolean
   evo_edo_department: [Int!]
   evo_edo_departmentData: [picklist_value]
@@ -2810,14 +2857,6 @@ type evo_document {
   toObjectString: String
 }
 
-type subjectGraphQL {
-  createdon: DateTime
-  modifiedon: DateTime
-  subjectid: Uuid
-  title: String
-  toObjectString: String
-}
-
 type picklist {
   name: String
   values: [picklist_value]
@@ -2863,6 +2902,7 @@ type evo_edo {
   evo_sign_required: Boolean
   evo_statuscodeid: Uuid
   evo_statuscodeidData: evo_statuscode
+  evo_use_box: Boolean
   modifiedon: DateTime
   toObjectString: String
 }
@@ -2940,6 +2980,7 @@ type tisa_phonecallprocessing {
 
 type role {
   createdon: DateTime
+  evo_connection_roleData: evo_connection_role
   evo_documenttypes: [evo_documenttype]
   modifiedon: DateTime
   name: String
@@ -2989,6 +3030,14 @@ enum FilterOperation {
   LESSOREQUALTHEN
 }
 
+type evo_connection_role {
+  createdon: DateTime
+  evo_connection_roleid: Uuid
+  evo_edo_department: Int
+  modifiedon: DateTime
+  toObjectString: String
+}
+
 input EntityFieldInput {
   activitypartiesvalue: [activitypartyInput]
   boolvalue: Boolean

src/core/services/CrmService/types/entities.ts

@@ -405,6 +405,7 @@ export interface IEvoAddproductType extends BaseEntity {
   evo_type_calc_cerebellum?: number;
   evo_addproduct_types?: IEvoAddproductType[];
   evo_evokasko_calc_type?: number;
+  evo_price_service_provider_withoutnds ?: number;
   evo_min_price?: number;
   evo_max_price?: number;
   evo_loss_kv?: number;