@silexpert/core 1.1.307 → 1.1.309

package/ts/types/Interface/api/commercialManagement/Query.ts

@@ -1,5 +1,5 @@
 import {
-  IsArray, IsBoolean, IsDateString, IsOptional, IsString,
+  IsArray, IsBoolean, IsDateString, IsInt, IsOptional, IsString,
 } from 'class-validator';
 import { Order } from '../../..';
 import { ApiProperty, ApiPropertyOptional } from '../../../../utils';
@@ -150,4 +150,24 @@ export class QueryCountByStatus {
   @ToBoolean()
   @IsOptional()
     isDraft?: boolean;
+}
+
+export class QueryExportCommercialManagementIntoCSV {
+  @ApiPropertyOptional()
+  @IsDateString()
+  @IsOptional()
+    startDate?: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsDateString()
+    endDate?: string;
+
+  @ApiProperty()
+  @IsInt()
+    idSociety: number;
+
+  @ApiProperty()
+  @IsArray()
+    types: EstimateInvoiceType[];
 }

package/ts/types/Interface/api/payment/Util.ts

@@ -11,6 +11,8 @@ export interface ParamsForPaymentsAuto {
   firstExerciceNonExpresssEndDate: Date;
   goToClient: Date;
   idPrestation: number;
+  idLegalForm: number;
+  isWithApplicationFees: boolean;
   idVat: number;
   prestationList: IPrestationList;
   yearlyAmountNonExpress: number;
@@ -21,6 +23,7 @@ export interface ParamsForPaymentsAuto {
 
 export interface PaymentAuto {
   amount: number;
+  isPaid?: boolean;
   datePayment: Date;
   idPrestation: number;
   idPaymentMethod: number;

package/ts/types/Interface/models/IPrestation.ts

@@ -32,6 +32,7 @@ export interface IPrestation {
   goToFacturation?: Date | null;
   dateLeavingFacturation?: Date | null;
   scoring: number | null;
+  isWithApplicationFees: boolean;
   state: boolean;
   commentPdf: string | null;
   token: string | null;

package/ts/utils/payment.ts

@@ -1,6 +1,6 @@
 'use strict';
 
-import { IPayment, IRegulation, ParamsForPaymentsAuto, PaymentMethod, PaymentAuto, getTaxesIncludedAmount } from '../types';
+import { IPayment, IRegulation, ParamsForPaymentsAuto, PaymentMethod, PaymentAuto, getTaxesIncludedAmount, LegalFormTypeEnum } from '../types';
 import * as dayjs from 'dayjs';
 import { PartialExercicePrestationExpress } from '../types/Interface/api/payment/Util';
 import { getPriceGrid } from './prestation';
@@ -78,6 +78,8 @@ const calculateFees = (amount: number, goToClient: Date, paymentDate: Date):numb
 //  * @param {number} firstPaymentAmount - amount of the first payment (first regulation of the customer)
  * @param {Date} firstExerciceNonExpresssEndDate - end date of the first exercice non express
  * @param {number} idPrestation - prestation id
+ * @param {number} idLegalForm - legal form id of the society
+ * @param {boolean} isWithApplicationFees - if the prestation has application fees to paid
  * @param {IPrestationList} prestationList - type of prestation (hidden: 0, isCatalog: 1, isComptable: 1)
  * @param {number} idVat - vat id of society linked
  * @param {number} yearlyAmountNonExpress - yearly amount of non express prestation (HT)
@@ -87,11 +89,10 @@ const calculateFees = (amount: number, goToClient: Date, paymentDate: Date):numb
  * @returns { IPayment[] } list of payment to create for billing auto, after each presta go to onBoarding
  */
 const calculatePaymentsAuto = (params: ParamsForPaymentsAuto):PaymentAuto[] => {
-  const { idTypeBrand, goToClient, firstExerciceNonExpresssEndDate, idPrestation, prestationList, idVat, yearlyAmountNonExpress, nextYearlyAmountNonExpress, listPartialExercicePrestationExpress, listRegulations } = params;
+  const { idTypeBrand, goToClient, isWithApplicationFees, firstExerciceNonExpresssEndDate, idPrestation, idLegalForm, prestationList, idVat, yearlyAmountNonExpress, nextYearlyAmountNonExpress, listPartialExercicePrestationExpress, listRegulations } = params;
   const initializedPaymentDate = dayjs().endOf('month').diff(dayjs(), 'day') < 3/*  || dayjs().date() >= 15 */
     ? dayjs().add(2, 'month').startOf('month').toDate()
     : dayjs().add(1, 'month').startOf('month').toDate();
-  let isApplicationAlreadyPaid = false;
 
   // On récupère la grille tarifaire pour savoir si les tarifs sont HT ou TTC 
   // et pour connaitre le montant du coût de l'app
@@ -100,6 +101,7 @@ const calculatePaymentsAuto = (params: ParamsForPaymentsAuto):PaymentAuto[] => {
   if (!priceGrid) throw new Error('Impossible de trouver la grille tarifaire correspondante');
   const { applicationCost, priceWithTaxesIncluded } = priceGrid;
   const applicationCostTotalTTC = (priceWithTaxesIncluded ? applicationCost : getTaxesIncludedAmount(applicationCost, idVat)) * 12;
+  const applicationFeesAmount = (idLegalForm === LegalFormTypeEnum.SCI) ? 150 : 50;
 
   if (prestationList?.isCatalog || !prestationList?.isComptable) throw new Error('Ce type de prestation ne correspond pas aux conditions attendues.');
   // if (!listRegulations?.length) throw new Error('List of regulations can not be empty');
@@ -110,7 +112,21 @@ const calculatePaymentsAuto = (params: ParamsForPaymentsAuto):PaymentAuto[] => {
   const listPayments:PaymentAuto[] = [];
 
   // on récupère le/les premiers réglements effectués, non alloués
-  const sumRegulations = listRegulations.reduce((acc: number, r:IRegulation) => acc + r.amount - r.amountUsed, 0);
+  let isApplicationFeesAlreadyPaid = false;
+  const sumRegulations = listRegulations.reduce((acc: number, r:IRegulation) => {
+    //Si la regulation est rattachée à un paymentExpectation, on récupère le détail
+    // et on ne prend que les frais de dossier (applicationFee) + le montant de la compta (accountingFee)
+    if (r.paymentsExpectation?.payload) {
+      const payload = JSON.parse(r.paymentsExpectation?.payload);
+      if (+payload?.applicationFee > 0) {
+        isApplicationFeesAlreadyPaid = true;
+      }
+      if (+payload?.accountingFee > 0) acc += +payload?.accountingFee;
+      return acc;
+    } else {
+      return acc + r.amount - r.amountUsed;
+    }
+  }, 0);
   let remainingAmount = -sumRegulations;  //TTC
   let paymentDate = initializedPaymentDate;
 
@@ -125,12 +141,26 @@ const calculatePaymentsAuto = (params: ParamsForPaymentsAuto):PaymentAuto[] => {
   if (sumRegulations) {
     listPayments.push({
       amount:sumRegulations,  //TTC
+      isPaid: true,
       datePayment: dayjs().toDate(),
       idPrestation,
       idPaymentMethod: PaymentMethod.DIRECT_DEBIT.id,
       closingDate: listPartialExercicePrestationExpress?.length ? listPartialExercicePrestationExpress[0].endDate : firstExerciceNonExpresssEndDate,
     });
   }
+
+  // Si les frais de dossiers sont facturés et qu'ils n'ont pas déjà été payés,
+  // on ajoute un paiement sur la première mensualité non express
+  if (isWithApplicationFees && !isApplicationFeesAlreadyPaid) {
+    listPayments.push({
+      amount: getTaxesIncludedAmount(applicationFeesAmount, idVat),  //TTC
+      isPaid: false,
+      datePayment: dayjs().startOf('month').add(1, 'month').toDate(),
+      idPrestation,
+      idPaymentMethod: PaymentMethod.DIRECT_DEBIT.id,
+      closingDate: listPartialExercicePrestationExpress?.length ? listPartialExercicePrestationExpress[0].endDate : firstExerciceNonExpresssEndDate,
+    });
+  }
   
   // =========================
   //          EXPRESS
@@ -175,37 +205,61 @@ const calculatePaymentsAuto = (params: ParamsForPaymentsAuto):PaymentAuto[] => {
   // sinon, ils sont à la suite des express
   if (nbExoExpress <= 1) paymentDate = initializedPaymentDate;
   let exerciceEndDate = dayjs(firstExerciceNonExpresssEndDate).toDate();
+
+  let hasGeneratedWholeYear = false;
+  let isFirstNonExpress = true;
   
-  //On génère un seul exercices plein, non express
-  //On compte le nb de mois restants entre la date à laquelle le paiement va être créé et la date de fin d'exercice
-  let countMonthsBeforeExerciceEnd = Math.ceil(dayjs(exerciceEndDate).diff(paymentDate, 'months', true));
-  if (countMonthsBeforeExerciceEnd < 3) countMonthsBeforeExerciceEnd = 3;
-  
-  const exoAmount = yearlyAmountNonExpress;
-  remainingAmount += priceWithTaxesIncluded ? exoAmount : getTaxesIncludedAmount(exoAmount, idVat);
+  //On génère des paiements jusqu'à ce qu'un exercice soit entier (12 mois), non express
+  while (!hasGeneratedWholeYear) {
+    
+    //On compte le nb de mois restants entre la date à laquelle le paiement va être créé et la date de fin d'exercice
+    let countMonthsBeforeExerciceEnd = Math.ceil(dayjs(exerciceEndDate).diff(paymentDate, 'months', true));
+    if (countMonthsBeforeExerciceEnd < 3) countMonthsBeforeExerciceEnd = 3;
 
-  let remainingAmountByExercicePrestation = remainingAmount;
-  let monthlyAmount = remainingAmountByExercicePrestation / countMonthsBeforeExerciceEnd;  //TTC
+    const exoAmount = isFirstNonExpress ? yearlyAmountNonExpress : nextYearlyAmountNonExpress;
+    remainingAmount += priceWithTaxesIncluded ? exoAmount : getTaxesIncludedAmount(exoAmount, idVat);
+
+    //TODO: CAS A TESTER : si sumRegulations couvre le premier exercice par exemple (cas rar mais à envisager)
+    //Si le premier règlement couvre le coût de cet exercicePrestation, on passe au suivant
+    // if (remainingAmount <= 0) {
+    //   continue;
+    // }
 
-  if (monthlyAmount > 0) {
-    for (let index = 1; index <= countMonthsBeforeExerciceEnd; index++) {
-      let amount = index < countMonthsBeforeExerciceEnd ? monthlyAmount : remainingAmountByExercicePrestation;
+    // Si on a ajouté une ligne pour les applications fees, alors on les déduit du montant total
+    if (isFirstNonExpress && isWithApplicationFees && !isApplicationFeesAlreadyPaid) {
+      remainingAmount -= getTaxesIncludedAmount(applicationFeesAmount, idVat);
+    }
+
+    let remainingAmountByExercicePrestation = remainingAmount;
+
+    // - frais d'application dès les second exo non express
+    if (!isFirstNonExpress) remainingAmountByExercicePrestation += applicationCostTotalTTC;
+
+    const monthlyAmount = remainingAmountByExercicePrestation / countMonthsBeforeExerciceEnd;  //TTC
+
+    if (monthlyAmount > 0) {
+      for (let index = 1; index <= countMonthsBeforeExerciceEnd; index++) {
+        let amount = index < countMonthsBeforeExerciceEnd ? monthlyAmount : remainingAmountByExercicePrestation;
       
-      // Si besoin, on applique les frais nécessaires :
-      // - 2,75% d'augmentation chaque année, sauf si souscriptiuon dans les 3 derniers mois de l'année civile)
-      amount = calculateFees(amount, goToClient, paymentDate);
+        // Si besoin, on applique les frais nécessaires :
+        // - 2,75% d'augmentation chaque année, sauf si souscriptiuon dans les 3 derniers mois de l'année civile)
+        amount = calculateFees(amount, goToClient, paymentDate);
       
-      listPayments.push({
-        amount: Math.round(100 * amount) / 100,
-        datePayment: paymentDate,
-        idPrestation,
-        idPaymentMethod: PaymentMethod.DIRECT_DEBIT.id,
-        closingDate: exerciceEndDate,
-      });
-      remainingAmountByExercicePrestation -= monthlyAmount; 
-      paymentDate = dayjs(paymentDate).add(1, 'month').startOf('month').toDate();
+        listPayments.push({
+          amount: Math.round(100 * amount) / 100,
+          datePayment: paymentDate,
+          idPrestation,
+          idPaymentMethod: PaymentMethod.DIRECT_DEBIT.id,
+          closingDate: exerciceEndDate,
+        });
+        remainingAmountByExercicePrestation -= monthlyAmount; 
+        paymentDate = dayjs(paymentDate).add(1, 'month').startOf('month').toDate();
+      }
+      exerciceEndDate = dayjs(exerciceEndDate).startOf('month').add(1, 'year').endOf('month').toDate();
     }
-    exerciceEndDate = dayjs(exerciceEndDate).startOf('month').add(1, 'year').endOf('month').toDate();
+    remainingAmount = 0;
+    if (countMonthsBeforeExerciceEnd === 12) hasGeneratedWholeYear = true;
+    isFirstNonExpress = false;
   }
 
   remainingAmount = 0;
@@ -216,20 +270,20 @@ const calculatePaymentsAuto = (params: ParamsForPaymentsAuto):PaymentAuto[] => {
   // On applique le taux de tva de la société, si besoin, selon la grille tarifaire
   remainingAmount += priceWithTaxesIncluded ? nextYearlyAmountNonExpress : getTaxesIncludedAmount(nextYearlyAmountNonExpress, idVat);
 
-  remainingAmountByExercicePrestation = remainingAmount;
+  let remainingAmountByExercicePrestation = remainingAmount;
   //On compte le nb de mois restants entre la date à laquelle le paiement va être créé et la date de fin d'exercice
-  countMonthsBeforeExerciceEnd = Math.ceil(dayjs(exerciceEndDate).diff(paymentDate, 'months', true));
+  let countMonthsBeforeExerciceEnd = Math.ceil(dayjs(exerciceEndDate).diff(paymentDate, 'months', true));
   if (countMonthsBeforeExerciceEnd < 3) countMonthsBeforeExerciceEnd = 3;
 
   // - frais d'application dès les second exo non express
   remainingAmountByExercicePrestation += applicationCostTotalTTC;
   
-  monthlyAmount = remainingAmountByExercicePrestation / countMonthsBeforeExerciceEnd;
+  const monthlyAmount = remainingAmountByExercicePrestation / countMonthsBeforeExerciceEnd;
   
   // Si aucun paiement généré, on stoppe là
   if (!listPayments.length) return [];
 
-  while (dayjs(listPayments.slice(-1)[0].datePayment).month() < 11 || !isApplicationAlreadyPaid) {
+  while (dayjs(listPayments.slice(-1)[0].datePayment).month() < 11) {
     let amount = monthlyAmount;
 
     // Si besoin, on applique les frais nécessaires :
@@ -245,7 +299,6 @@ const calculatePaymentsAuto = (params: ParamsForPaymentsAuto):PaymentAuto[] => {
       closingDate: exerciceEndDate,
     });
     paymentDate = dayjs(paymentDate).add(1, 'month').startOf('month').toDate();
-    isApplicationAlreadyPaid = true;
   }
 
   return listPayments;

package/ts/utils/tests/payment.spec.ts

@@ -1,5 +1,5 @@
 import * as dayjs from 'dayjs';
-import { IRegulation, Vat, PaymentMethod } from '../../types';
+import { IRegulation, Vat, PaymentMethod, LegalFormTypeEnum } from '../../types';
 import MockDate from 'mockdate';
 
 import { calculatePaymentsAuto } from '../payment';
@@ -83,6 +83,8 @@ describe('Payment', () => {
           goToClient: dayjs('2024-06-06').toDate(),
           firstExerciceNonExpresssEndDate, 
           idPrestation,
+          isWithApplicationFees: true,
+          idLegalForm: LegalFormTypeEnum.SARL,
           prestationList: {
             ...prestationList,
             isCatalog: true,
@@ -106,6 +108,8 @@ describe('Payment', () => {
           goToClient: dayjs('2024-06-06').toDate(),
           firstExerciceNonExpresssEndDate, 
           idPrestation,
+          isWithApplicationFees: true,
+          idLegalForm: LegalFormTypeEnum.SARL,
           prestationList,
           idVat,
           listPartialExercicePrestationExpress,
@@ -126,6 +130,8 @@ describe('Payment', () => {
           goToClient: dayjs('2024-06-06').toDate(),
           firstExerciceNonExpresssEndDate, 
           idPrestation,
+          isWithApplicationFees: true,
+          idLegalForm: LegalFormTypeEnum.SARL,
           prestationList,
           idVat,
           listPartialExercicePrestationExpress,
@@ -149,6 +155,8 @@ describe('Payment', () => {
         goToClient: dayjs('2024-06-06').toDate(),
         firstExerciceNonExpresssEndDate, 
         idPrestation,
+        isWithApplicationFees: true,
+        idLegalForm: LegalFormTypeEnum.SARL,
         prestationList,
         idVat,
         listPartialExercicePrestationExpress: [listPartialExercicePrestationExpress[0]],
@@ -166,6 +174,8 @@ describe('Payment', () => {
         goToClient: dayjs('2024-06-06').toDate(),
         firstExerciceNonExpresssEndDate, 
         idPrestation,
+        isWithApplicationFees: true,
+        idLegalForm: LegalFormTypeEnum.SARL,
         prestationList,
         idVat,
         listPartialExercicePrestationExpress,
@@ -190,6 +200,8 @@ describe('Payment', () => {
         goToClient: dayjs('2024-06-06').toDate(),
         firstExerciceNonExpresssEndDate: newFirstExerciceNonExpresssEndDate, 
         idPrestation,
+        isWithApplicationFees: true,
+        idLegalForm: LegalFormTypeEnum.SARL,
         prestationList,
         idVat,
         listPartialExercicePrestationExpress: [],
@@ -215,6 +227,8 @@ describe('Payment', () => {
         goToClient: dayjs('2024-06-06').toDate(),
         firstExerciceNonExpresssEndDate: newFirstExerciceNonExpresssEndDate, 
         idPrestation,
+        isWithApplicationFees: true,
+        idLegalForm: LegalFormTypeEnum.SARL,
         prestationList,
         idVat,
         listPartialExercicePrestationExpress: [],
@@ -243,6 +257,8 @@ describe('Payment', () => {
         goToClient: dayjs('2024-06-06').toDate(),
         firstExerciceNonExpresssEndDate: newFirstExerciceNonExpresssEndDate, 
         idPrestation,
+        isWithApplicationFees: true,
+        idLegalForm: LegalFormTypeEnum.SARL,
         prestationList,
         idVat,
         listPartialExercicePrestationExpress: [],
@@ -269,6 +285,8 @@ describe('Payment', () => {
         goToClient: dayjs('2024-06-06').toDate(),
         firstExerciceNonExpresssEndDate: newFirstExerciceNonExpresssEndDate, 
         idPrestation,
+        isWithApplicationFees: true,
+        idLegalForm: LegalFormTypeEnum.SARL,
         prestationList,
         idVat,
         listPartialExercicePrestationExpress: [],
@@ -293,6 +311,8 @@ describe('Payment', () => {
         goToClient: dayjs('2024-06-06').toDate(),
         firstExerciceNonExpresssEndDate: newFirstExerciceNonExpresssEndDate, 
         idPrestation,
+        isWithApplicationFees: true,
+        idLegalForm: LegalFormTypeEnum.SARL,
         prestationList,
         idVat,
         listPartialExercicePrestationExpress: [],
@@ -319,6 +339,8 @@ describe('Payment', () => {
         goToClient: dayjs('2024-06-06').toDate(),
         firstExerciceNonExpresssEndDate: newFirstExerciceNonExpresssEndDate, 
         idPrestation,
+        isWithApplicationFees: true,
+        idLegalForm: LegalFormTypeEnum.SARL,
         prestationList,
         idVat,
         listPartialExercicePrestationExpress: [],
@@ -346,6 +368,8 @@ describe('Payment', () => {
         goToClient: dayjs('2024-06-06').toDate(),
         firstExerciceNonExpresssEndDate: newFirstExerciceNonExpresssEndDate, 
         idPrestation,
+        isWithApplicationFees: true,
+        idLegalForm: LegalFormTypeEnum.SARL,
         prestationList,
         idVat,
         listPartialExercicePrestationExpress: [],
@@ -379,6 +403,8 @@ describe('Payment', () => {
         goToClient: dayjs('2024-06-06').toDate(),
         firstExerciceNonExpresssEndDate, 
         idPrestation,
+        isWithApplicationFees: true,
+        idLegalForm: LegalFormTypeEnum.SARL,
         prestationList,
         idVat,
         listPartialExercicePrestationExpress: listPartialExercicePrestationExpressCloned,
@@ -397,6 +423,8 @@ describe('Payment', () => {
         goToClient: dayjs('2024-06-06').toDate(),
         firstExerciceNonExpresssEndDate, 
         idPrestation,
+        isWithApplicationFees: true,
+        idLegalForm: LegalFormTypeEnum.SARL,
         prestationList,
         idVat,
         listPartialExercicePrestationExpress,
@@ -436,6 +464,8 @@ describe('Payment', () => {
         goToClient: dayjs('2024-06-06').toDate(),
         firstExerciceNonExpresssEndDate, 
         idPrestation,
+        isWithApplicationFees: true,
+        idLegalForm: LegalFormTypeEnum.SARL,
         prestationList,
         idVat,
         listPartialExercicePrestationExpress,
@@ -455,6 +485,8 @@ describe('Payment', () => {
         goToClient: dayjs('2024-06-06').toDate(),
         firstExerciceNonExpresssEndDate, 
         idPrestation,
+        isWithApplicationFees: true,
+        idLegalForm: LegalFormTypeEnum.SARL,
         prestationList,
         idVat,
         listPartialExercicePrestationExpress,
@@ -470,6 +502,8 @@ describe('Payment', () => {
         goToClient: dayjs('2024-06-06').toDate(),
         firstExerciceNonExpresssEndDate, 
         idPrestation,
+        isWithApplicationFees: true,
+        idLegalForm: LegalFormTypeEnum.SARL,
         prestationList,
         idVat,
         listPartialExercicePrestationExpress: [],
@@ -484,6 +518,8 @@ describe('Payment', () => {
         goToClient: dayjs('2024-06-06').toDate(),
         firstExerciceNonExpresssEndDate: dayjs('2024-12-31').toDate(), 
         idPrestation,
+        isWithApplicationFees: true,
+        idLegalForm: LegalFormTypeEnum.SARL,
         prestationList,
         idVat: Vat.TX_20.id,
         listPartialExercicePrestationExpress: [],