@silexpert/core 1.1.343 → 1.1.346

package/ts/types/Interface/api/loan/UpdateLoan.ts

@@ -1,8 +1,10 @@
-import { IsNumber, IsOptional, IsString } from 'class-validator';
+import { IsOptional, IsString } from 'class-validator';
 import { ApiPropertyOptional } from '../../../../utils';
 
 export class UpdateLoanForm {
   @ApiPropertyOptional()
+  @IsString()
+  @IsOptional()
     name?: string;
 
   @ApiPropertyOptional()
@@ -14,34 +16,4 @@ export class UpdateLoanForm {
   @IsString()
   @IsOptional()
     number?: string;
-
-  @ApiPropertyOptional()
-  @IsNumber()
-  @IsOptional()
-    amount?: number;
-
-  @ApiPropertyOptional()
-  @IsNumber()
-  @IsOptional()
-    assetBeforeExercice?: number;
-
-  @ApiPropertyOptional()
-  @IsNumber()
-  @IsOptional()
-    assetAfterExercice?: number;
-
-  @ApiPropertyOptional()
-  @IsNumber()
-  @IsOptional()
-    idExercice?: number;
-
-  @ApiPropertyOptional()
-  @IsNumber()
-  @IsOptional()
-    monthDuration?: number;
-
-  @ApiPropertyOptional()
-  @IsNumber()
-  @IsOptional()
-    rate?: number;
 }

package/ts/types/Interface/models/ILoan.ts

@@ -2,6 +2,7 @@ import { ISociety } from './ISociety';
 import { IExercice } from './IExercice';
 import { IAccount } from './IAccount';
 import { ILoanFile } from './ILoanFile';
+import { ILoanEarlyRepayment } from './ILoanEarlyRepayment';
 
 export interface ILoan {
   id?: number;
@@ -14,6 +15,11 @@ export interface ILoan {
   assetAfterExercice: number;
   monthDuration?: number;
   rate?: number;
+  annuity: number | null;
+  unlockDate: Date | null;
+  firstDueDate: Date | null;
+  commission: number | null;
+  insurance: number | null;
   idExercice: number;
   idSociety: number;
   idAccountRefund: number;
@@ -33,4 +39,5 @@ export interface ILoan {
   accountCommission?: IAccount;
   accountReleaseLoanCapital?: IAccount;
   loanFiles?: ILoanFile[];
+  earlyRepayments?: ILoanEarlyRepayment[];
 }

package/ts/types/Interface/models/ILoanEarlyRepayment.ts

@@ -0,0 +1,13 @@
+import { ILoan } from './ILoan';
+
+export interface ILoanEarlyRepayment {
+  id?: number;
+  amount: number;
+  date: Date;
+  annuity: number;
+  idLoan: number;
+  createdAt?: Date;
+  updatedAt?: Date;
+
+  loan?: ILoan;
+}

package/ts/types/index.ts

@@ -333,6 +333,7 @@ export * from './Interface/models/IExpertAnnuary';
 export * from './Interface/models/IUserTimeSlot';
 export * from './Interface/models/ICompanyCreationForm';
 export * from './Interface/models/IAnnotation';
+export * from './Interface/models/ILoanEarlyRepayment';
 
 
 // Schemas
@@ -544,6 +545,7 @@ export * from './Enum/Contest';
 export * from './Enum/LetterResponseType';
 
 // Interfaces API
+export * from './Interface/api/exercice/ReadExercice';
 export * from './Interface/api/kilometricAllowance/ReadKilometricAllowance';
 export * from './Interface/api/cashAndExpense/Query';
 export * from './Interface/api/cerfa/das2';
@@ -814,6 +816,7 @@ export * from './Interface/api/promoCode/UpdatePromoCode';
 export * from './Interface/api/promoCode/CreatePromoCode';
 export * from './Interface/api/balanceBankAccount/CreateBudgetBalanceBankAccount';
 export * from './Interface/api/loan/CreateLoan';
+export * from './Interface/api/loan/ReadLoan';
 export * from './Interface/api/stock/StocksType';
 export * from './Interface/api/lettering/QueryRegroupLettering';
 // export * from './Interface/api/stock/StockEntries';

package/ts/utils/payment.ts

@@ -114,6 +114,11 @@ const calculatePaymentsAuto = (params: ParamsForPaymentsAuto):PaymentAuto[] => {
 
   if (prestationList?.isCatalog || !prestationList?.isComptable) throw new Error('Ce type de prestation ne correspond pas aux conditions attendues.');
   if (listPartialExercicePrestationExpress.length && listPartialExercicePrestationExpress?.some((ep: PartialExercicePrestationExpress) => !ep?.startDate)) throw new Error('Start date of some exercice are missing');
+  
+  let yearlyAmountNonExpressClone = yearlyAmountNonExpress;
+  if (isWithApplicationFees) {
+    yearlyAmountNonExpressClone -= getApplicationFeesAmount(idLegalForm); //HT
+  }
 
   const nbExoExpress = listPartialExercicePrestationExpress.length;
   const listPayments:PaymentAuto[] = [];
@@ -248,7 +253,7 @@ const calculatePaymentsAuto = (params: ParamsForPaymentsAuto):PaymentAuto[] => {
     let countMonthsBeforeExerciceEnd = Math.ceil(dayjs(exerciceEndDate).diff(paymentDate, 'months', true));
     if (countMonthsBeforeExerciceEnd < 3) countMonthsBeforeExerciceEnd = 3;
 
-    const exoAmount = isFirstNonExpress ? yearlyAmountNonExpress : nextYearlyAmountNonExpress;
+    const exoAmount = isFirstNonExpress ? yearlyAmountNonExpressClone : nextYearlyAmountNonExpress;
     const remainingBeforeThisExo = remainingAmount;
     remainingAmount += priceWithTaxesIncluded ? exoAmount : getTaxesIncludedAmount(exoAmount, idVat);
 

package/ts/utils/prestation.ts

@@ -119,7 +119,7 @@ const isExpress = (idPrestationList: number):boolean => {
 };
 
 const calculateScoringOfPrestation = (idPrestationType: PrestationType, prestations: IPrestation[]): number => {
-  const prestationsSignedPaid = prestations.filter((prestation) => prestation.paid && prestation.signed && prestation.terminationList === null);
+  const prestationsSignedPaid = prestations.filter((prestation) => prestation.terminationList === null);
 
   // Get the list of prestations that are half price
   const prestationHalfPriceList = Object.values(PrestationDetail).filter((p) => p.isComptable && !p.isCatalog);