@silexpert/core 1.2.28 → 1.2.30

package/ts/types/Interface/api/previsionalForm/CreatePrevisionalForm.ts

@@ -2,7 +2,7 @@ import { LegalFormTypeEnum } from '../../../Enum/LegalForm';
 import { TaxSystem } from '../../../Enum/TaxSystem';
 import { LoanInformation, NumberFiscalYears, OptionNumberFiscalYears, PrevisionalFormActivity, PrevisionalFormPayload } from '../../..';
 import { ApiProperty, ApiPropertyOptional } from '../../../../utils';
-import { IsNumber, IsBoolean, IsEnum, IsOptional, ValidateNested, IsArray } from 'class-validator';
+import { IsNumber, IsBoolean, IsEnum, IsOptional, ValidateNested, IsIn } from 'class-validator';
 import { ToBoolean } from '../../../../utils/transforms/boolean.transform';
 
 export class NumberFiscalYearsValidation implements NumberFiscalYears {
@@ -24,6 +24,28 @@ export class NumberFiscalYearsValidation implements NumberFiscalYears {
     vat?: number;
 }
 
+export class LoansInformations implements LoanInformation {
+  @ApiProperty()
+  @IsIn(['n', 'n1', 'n2'])
+    year: 'n' | 'n1' | 'n2';
+
+  @ApiProperty()
+  @IsNumber()
+    duration: number;
+
+  @ApiProperty()
+  @IsNumber()
+    rate: number;
+
+  @ApiProperty()
+  @IsNumber()
+    payment: number;
+
+  @ApiProperty()
+  @IsNumber()
+    amount: number;
+}
+
 export class CreatePrevisionalFormData implements PrevisionalFormPayload {
   /**
    * Description de la société
@@ -96,8 +118,8 @@ export class CreatePrevisionalFormData implements PrevisionalFormPayload {
     accountContribution: NumberFiscalYearsValidation;
 
   @ApiProperty()
-  @IsArray()
-    loans: LoanInformation[];
+  @ValidateNested()
+    loans: LoansInformations[];
 
   /**
    * Chiffres d’affaires et charge liées à l’activité
@@ -186,9 +208,6 @@ export class CreatePrevisionalFormData implements PrevisionalFormPayload {
   /**
    * Social et rémunération
    */
-  @ApiProperty()
-    isACREBeneficiary: boolean;
-
   @ApiProperty()
   @ValidateNested()
     employee1GrossSalary: NumberFiscalYearsValidation;

package/ts/types/Interface/api/previsionalForm/PrevisionalFormPayload.ts

@@ -85,7 +85,6 @@ export interface OtherCharges {
 }
 
 export interface SocialAndRemuneration {
-  isACREBeneficiary: boolean; // Bénéficiaire de l'ACRE
   employee1GrossSalary: NumberFiscalYears; // Salaire brut employé 1
   employee2GrossSalary: NumberFiscalYears; // Salaire brut employé 2
   employee3GrossSalary: NumberFiscalYears; // Salaire brut employé 3

package/ts/types/Interface/api/statistic/QueryDataOfficer.ts

@@ -1,11 +1,11 @@
-import { IsNumber, IsDate, IsIn } from 'class-validator';
+import { IsNumber, IsIn, IsArray } from 'class-validator';
 import { ApiProperty } from '../../../../utils';
 import { StatisticType } from '../../../Enum/StatisticType';
 
 export class QueryDataOfficer {
   @ApiProperty()
-  @IsDate()
-    endDate: Date;
+  @IsArray()
+    endDate: Date[];
 
   @ApiProperty()
   @IsNumber()

package/ts/utils/commercialManagement/document.ts

@@ -21,7 +21,7 @@ import { thirdPartyToReadThirdPartyEditing } from './thirdParty';
 import { getBrandConfig } from '../brands';
 import { internationalizationChoices } from './internationalization/choices';
 
-import ejs from 'ejs';
+import * as ejs from 'ejs';
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 require('dayjs/locale/fr');
 

package/ts/utils/commercialManagement/saleEmail.ts

@@ -15,7 +15,7 @@ export function transformModelWithCharcodeToString(datas: InfoToUseType, templat
 
   const charcodesFound = template.match(reg) ?? [];
   const charcodesFoundWithoutBrackets: string[] = [];
-  charcodesFound?.forEach((f) => charcodesFoundWithoutBrackets.push(f.replace(/[\[\]']+/g, '')));
+  charcodesFound?.forEach((f: string) => charcodesFoundWithoutBrackets.push(f.replace(/[\[\]']+/g, '')));
 
   // we get the list of matching key template with key data
   const charcodesDetected = emailTemplateVariableAffiliatedData.filter((data) => intersection(emailTemplateVariableAffiliatedData.map((d) => d.name), charcodesFoundWithoutBrackets).includes(data.name));

package/ts/utils/vat/registration.ts

@@ -1,8 +1,9 @@
 import * as dayjs from 'dayjs';
 import { isDefined } from 'class-validator';
-import { reverse } from 'lodash';
+import { reverse, sumBy } from 'lodash';
 import {
   Cerfa2571_2023,
+  Cerfa2573_2024,
   Cerfa3310_2023,
   Cerfa3514_2022,
   CerfaType,
@@ -161,6 +162,9 @@ export function getTypeAndAmountFromRegistration(registration: IRegistration): {
     }
 
     return { type: CustomerVatType.VAT_TO_PAY, amount: payload.companyTax.toPay.total, collectable: 0, deductible: 0  };
+  } if ([CerfaType.CERFA_2573].includes(registration.idCerfaType)) {
+    const payload = registration.payload?.cerfa2573 as Cerfa2573_2024;
+    return { type: CustomerVatType.VAT_REFUND, amount: sumBy(payload?.refunds ?? [], (r) => r?.amount ?? 0), collectable: 0, deductible: 0 };
   }
 
   return {