apps/web: add preparedValues.typeRepayment

results: add _resultPiRepayment

apps/web/Components/Output/Results/config.ts

@@ -7,6 +7,7 @@ export const titles: Record<keyof ResultValues, string> = {
   _resultContractEconomy: 'Экономика',
   _resultContractEconomyWithVAT: 'Экономика, с НДС',
   _resultPi: 'PI',
+  _resultPiRepayment: 'PI для досрочки',
   _resultSumCredit: 'Сумма кредита',
   _resultSumCreditPayment: 'Сумма платежей по кредиту',
   _resultVatRecoverable: 'НДС к возмещению',
@@ -46,6 +47,7 @@ export const formatters = {
   _resultContractEconomy: moneyFormatter,
   _resultContractEconomyWithVAT: moneyFormatter,
   _resultPi: percentFormatter,
+  _resultPiRepayment: percentFormatter,
   _resultSumCredit: moneyFormatter,
   _resultSumCreditPayment: moneyFormatter,
   _resultVatRecoverable: moneyFormatter,
@@ -74,6 +76,7 @@ export const elements: Array<keyof ResultValues> = [
   '_resultContractEconomy',
   '_resultContractEconomyWithVAT',
   '_resultPi',
+  '_resultPiRepayment',
   '_resultSumCredit',
   '_resultSumCreditPayment',
   '_resultVatRecoverable',

apps/web/api/core/types/calculate.ts

@@ -111,6 +111,7 @@ export const PreparedValuesSchema = z.object({
   transTax: z.number(),
   transportTaxGr: z.number(),
   transportTaxGrYear: z.number(),
+  typeRepayment: z.number(),
 });
 
 export type PreparedValues = z.infer<typeof PreparedValuesSchema>;
@@ -399,6 +400,7 @@ const ColumnsSchema = z.object({
     values: z.number().array(),
   }),
   sumRepaymentColumn: z.object({
+    pi: z.number(),
     values: z.number().array(),
   }),
   sumVATCreditColumn: z.object({

apps/web/config/schema/results.ts

@@ -4,6 +4,7 @@ export const ResultValuesSchema = z.object({
   _resultContractEconomy: z.number(),
   _resultContractEconomyWithVAT: z.number(),
   _resultPi: z.number(),
+  _resultPiRepayment: z.number(),
   _resultSumCredit: z.number(),
   _resultSumCreditPayment: z.number(),
   _resultVatRecoverable: z.number(),

apps/web/server/routers/calculate/lib/request.ts

@@ -1237,6 +1237,13 @@ export async function createRequestData({
     async transportTaxGrYear() {
       return values.vehicleTaxInYear;
     },
+    async typeRepayment() {
+      if (values.graphType === 100_000_000) {
+        return 100_000_000;
+      }
+
+      return 0;
+    },
   };
 
   const preparedValuesResult = await Promise.all(

apps/web/server/routers/calculate/lib/transform.ts

@@ -42,6 +42,7 @@ export function transformCalculateResults({
     _resultContractEconomy: postValues.contractEconomy,
     _resultContractEconomyWithVAT: postValues.contractEconomyWithVAT,
     _resultPi: columns?.piColumn.values[0],
+    _resultPiRepayment: columns?.sumRepaymentColumn.pi,
     _resultSumCredit: columns?.sumCreditColumn.values[1],
     _resultSumCreditPayment: columns?.creditPaymentColumn.values[0],
     _resultVatRecoverable: columns?.vatRecoverableColumn.values[0],

apps/web/stores/results/default-values.ts

@@ -4,6 +4,7 @@ export const defaultResultsValues: ResultValues = {
   _resultContractEconomy: 0,
   _resultContractEconomyWithVAT: 0,
   _resultPi: 0,
+  _resultPiRepayment: 0,
   _resultSumCredit: 0,
   _resultSumCreditPayment: 0,
   _resultVatRecoverable: 0,