@silexpert/core 1.1.201 → 1.1.202

package/ts/types/Enum/PriceGridPourcentage.ts

@@ -10,24 +10,24 @@ export const PriceGridPourcentage = [
       {
         /* Compta Premium */
         idPrestationList: [PrestationType.COMPTA_PREMIUM, PrestationType.COMPTA_POURCENTAGE_PREMIUM, PrestationType.COMPTA_POURCENTAGE_PREMIUM_EXPRESS],
-        minimumMonthlyPayment: [
+        monthlyNbr: [
           {
-            id: ClosingType.IN_PROGRESS,
-            month: 9,
+            minimum: 0,
+            maximum: 4,
+            value: 6,
+            closingType: [ClosingType.OUTDATED, ClosingType.IN_PROGRESS],
           },
           {
-            id: ClosingType.OUTDATED,
-            month: 12,
-          },
-        ],
-        maximumMonthlyPayment: [
-          {
-            id: ClosingType.IN_PROGRESS,
-            month: 23,
+            minimum: 5,
+            maximum: 9,
+            value: 9,
+            closingType: [ClosingType.OUTDATED, ClosingType.IN_PROGRESS],
           },
           {
-            id: ClosingType.OUTDATED,
-            month: 23,
+            minimum: 12,
+            maximum: 16,
+            value: 16,
+            closingType: [ClosingType.OUTDATED],
           },
         ],
         turnoverMonthly: [
@@ -98,24 +98,24 @@ export const PriceGridPourcentage = [
       {
         /* Compta Pourcentage */
         idPrestationList: [PrestationType.COMPTA_POURCENTAGE, PrestationType.COMPTA_POURCENTAGE_EXPRESS],
-        minimumMonthlyPayment: [
+        monthlyNbr: [
           {
-            id: ClosingType.IN_PROGRESS,
-            month: 9,
+            minimum: 0,
+            maximum: 4,
+            value: 6,
+            closingType: [ClosingType.OUTDATED, ClosingType.IN_PROGRESS],
           },
           {
-            id: ClosingType.OUTDATED,
-            month: 12,
+            minimum: 5,
+            maximum: 9,
+            value: 9,
+            closingType: [ClosingType.OUTDATED, ClosingType.IN_PROGRESS],
           },
-        ],
-        maximumMonthlyPayment: [
           {
-            id: ClosingType.IN_PROGRESS,
-            month: 23,
-          },
-          {
-            id: ClosingType.OUTDATED,
-            month: 23,
+            minimum: 12,
+            maximum: 16,
+            value: 16,
+            closingType: [ClosingType.OUTDATED],
           },
         ],
         turnoverMonthly: [
@@ -320,24 +320,24 @@ export const PriceGridPourcentage = [
       {
         /* Compta Premium */
         idPrestationList: [PrestationType.COMPTA_PREMIUM, PrestationType.COMPTA_POURCENTAGE_PREMIUM, PrestationType.COMPTA_POURCENTAGE_PREMIUM_EXPRESS],
-        minimumMonthlyPayment: [
-          {
-            id: ClosingType.IN_PROGRESS,
-            month: 9,
-          },
+        monthlyNbr: [
           {
-            id: ClosingType.OUTDATED,
-            month: 12,
+            minimum: 0,
+            maximum: 4,
+            value: 6,
+            closingType: [ClosingType.OUTDATED, ClosingType.IN_PROGRESS],
           },
-        ],
-        maximumMonthlyPayment: [
           {
-            id: ClosingType.IN_PROGRESS,
-            month: 23,
+            minimum: 5,
+            maximum: 9,
+            value: 9,
+            closingType: [ClosingType.OUTDATED, ClosingType.IN_PROGRESS],
           },
           {
-            id: ClosingType.OUTDATED,
-            month: 23,
+            minimum: 12,
+            maximum: 16,
+            value: 16,
+            closingType: [ClosingType.OUTDATED],
           },
         ],
         turnoverMonthly: [
@@ -408,24 +408,24 @@ export const PriceGridPourcentage = [
       {
         /* Compta Pourcentage */
         idPrestationList: [PrestationType.COMPTA_POURCENTAGE, PrestationType.COMPTA_POURCENTAGE_EXPRESS],
-        minimumMonthlyPayment: [
+        monthlyNbr: [
           {
-            id: ClosingType.IN_PROGRESS,
-            month: 9,
+            minimum: 0,
+            maximum: 4,
+            value: 6,
+            closingType: [ClosingType.OUTDATED, ClosingType.IN_PROGRESS],
           },
           {
-            id: ClosingType.OUTDATED,
-            month: 12,
-          },
-        ],
-        maximumMonthlyPayment: [
-          {
-            id: ClosingType.IN_PROGRESS,
-            month: 23,
+            minimum: 5,
+            maximum: 9,
+            value: 9,
+            closingType: [ClosingType.OUTDATED, ClosingType.IN_PROGRESS],
           },
           {
-            id: ClosingType.OUTDATED,
-            month: 23,
+            minimum: 12,
+            maximum: 16,
+            value: 16,
+            closingType: [ClosingType.OUTDATED],
           },
         ],
         turnoverMonthly: [
@@ -630,24 +630,24 @@ export const PriceGridPourcentage = [
       {
         /* Compta Premium */
         idPrestationList: [PrestationType.COMPTA_PREMIUM, PrestationType.COMPTA_POURCENTAGE_PREMIUM, PrestationType.COMPTA_POURCENTAGE_PREMIUM_EXPRESS],
-        minimumMonthlyPayment: [
+        monthlyNbr: [
           {
-            id: ClosingType.IN_PROGRESS,
-            month: 9,
+            minimum: 0,
+            maximum: 4,
+            value: 6,
+            closingType: [ClosingType.OUTDATED, ClosingType.IN_PROGRESS],
           },
           {
-            id: ClosingType.OUTDATED,
-            month: 12,
+            minimum: 5,
+            maximum: 9,
+            value: 9,
+            closingType: [ClosingType.OUTDATED, ClosingType.IN_PROGRESS],
           },
-        ],
-        maximumMonthlyPayment: [
           {
-            id: ClosingType.IN_PROGRESS,
-            month: 23,
-          },
-          {
-            id: ClosingType.OUTDATED,
-            month: 23,
+            minimum: 12,
+            maximum: 16,
+            value: 16,
+            closingType: [ClosingType.OUTDATED],
           },
         ],
         turnoverMonthly: [
@@ -718,24 +718,24 @@ export const PriceGridPourcentage = [
       {
         /* Compta Pourcentage */
         idPrestationList: [PrestationType.COMPTA_POURCENTAGE, PrestationType.COMPTA_POURCENTAGE_EXPRESS],
-        minimumMonthlyPayment: [
-          {
-            id: ClosingType.IN_PROGRESS,
-            month: 9,
-          },
+        monthlyNbr: [
           {
-            id: ClosingType.OUTDATED,
-            month: 12,
+            minimum: 0,
+            maximum: 4,
+            value: 6,
+            closingType: [ClosingType.OUTDATED, ClosingType.IN_PROGRESS],
           },
-        ],
-        maximumMonthlyPayment: [
           {
-            id: ClosingType.IN_PROGRESS,
-            month: 23,
+            minimum: 5,
+            maximum: 9,
+            value: 9,
+            closingType: [ClosingType.OUTDATED, ClosingType.IN_PROGRESS],
           },
           {
-            id: ClosingType.OUTDATED,
-            month: 23,
+            minimum: 12,
+            maximum: 16,
+            value: 16,
+            closingType: [ClosingType.OUTDATED],
           },
         ],
         turnoverMonthly: [
@@ -940,24 +940,24 @@ export const PriceGridPourcentage = [
       {
         /* Compta Premium */
         idPrestationList: [PrestationType.COMPTA_PREMIUM, PrestationType.COMPTA_POURCENTAGE_PREMIUM, PrestationType.COMPTA_POURCENTAGE_PREMIUM_EXPRESS],
-        minimumMonthlyPayment: [
+        monthlyNbr: [
           {
-            id: ClosingType.IN_PROGRESS,
-            month: 9,
+            minimum: 0,
+            maximum: 4,
+            value: 6,
+            closingType: [ClosingType.OUTDATED, ClosingType.IN_PROGRESS],
           },
           {
-            id: ClosingType.OUTDATED,
-            month: 12,
-          },
-        ],
-        maximumMonthlyPayment: [
-          {
-            id: ClosingType.IN_PROGRESS,
-            month: 23,
+            minimum: 5,
+            maximum: 9,
+            value: 9,
+            closingType: [ClosingType.OUTDATED, ClosingType.IN_PROGRESS],
           },
           {
-            id: ClosingType.OUTDATED,
-            month: 23,
+            minimum: 12,
+            maximum: 16,
+            value: 16,
+            closingType: [ClosingType.OUTDATED],
           },
         ],
         turnoverMonthly: [
@@ -1028,24 +1028,24 @@ export const PriceGridPourcentage = [
       {
         /* Compta Pourcentage */
         idPrestationList: [PrestationType.COMPTA_POURCENTAGE, PrestationType.COMPTA_POURCENTAGE_EXPRESS],
-        minimumMonthlyPayment: [
+        monthlyNbr: [
           {
-            id: ClosingType.IN_PROGRESS,
-            month: 9,
+            minimum: 0,
+            maximum: 4,
+            value: 6,
+            closingType: [ClosingType.OUTDATED, ClosingType.IN_PROGRESS],
           },
           {
-            id: ClosingType.OUTDATED,
-            month: 12,
+            minimum: 5,
+            maximum: 9,
+            value: 9,
+            closingType: [ClosingType.OUTDATED, ClosingType.IN_PROGRESS],
           },
-        ],
-        maximumMonthlyPayment: [
           {
-            id: ClosingType.IN_PROGRESS,
-            month: 23,
-          },
-          {
-            id: ClosingType.OUTDATED,
-            month: 23,
+            minimum: 12,
+            maximum: 16,
+            value: 16,
+            closingType: [ClosingType.OUTDATED],
           },
         ],
         turnoverMonthly: [
@@ -1250,24 +1250,24 @@ export const PriceGridPourcentage = [
       {
         /* Compta Premium */
         idPrestationList: [PrestationType.COMPTA_PREMIUM, PrestationType.COMPTA_POURCENTAGE_PREMIUM, PrestationType.COMPTA_POURCENTAGE_PREMIUM_EXPRESS],
-        minimumMonthlyPayment: [
-          {
-            id: ClosingType.IN_PROGRESS,
-            month: 9,
-          },
+        monthlyNbr: [
           {
-            id: ClosingType.OUTDATED,
-            month: 12,
+            minimum: 0,
+            maximum: 4,
+            value: 6,
+            closingType: [ClosingType.OUTDATED, ClosingType.IN_PROGRESS],
           },
-        ],
-        maximumMonthlyPayment: [
           {
-            id: ClosingType.IN_PROGRESS,
-            month: 23,
+            minimum: 5,
+            maximum: 9,
+            value: 9,
+            closingType: [ClosingType.OUTDATED, ClosingType.IN_PROGRESS],
           },
           {
-            id: ClosingType.OUTDATED,
-            month: 23,
+            minimum: 12,
+            maximum: 16,
+            value: 16,
+            closingType: [ClosingType.OUTDATED],
           },
         ],
         turnoverMonthly: [
@@ -1338,24 +1338,24 @@ export const PriceGridPourcentage = [
       {
         /* Compta Pourcentage */
         idPrestationList: [PrestationType.COMPTA_POURCENTAGE, PrestationType.COMPTA_POURCENTAGE_EXPRESS],
-        minimumMonthlyPayment: [
+        monthlyNbr: [
           {
-            id: ClosingType.IN_PROGRESS,
-            month: 9,
+            minimum: 0,
+            maximum: 4,
+            value: 6,
+            closingType: [ClosingType.OUTDATED, ClosingType.IN_PROGRESS],
           },
           {
-            id: ClosingType.OUTDATED,
-            month: 12,
-          },
-        ],
-        maximumMonthlyPayment: [
-          {
-            id: ClosingType.IN_PROGRESS,
-            month: 23,
+            minimum: 5,
+            maximum: 9,
+            value: 9,
+            closingType: [ClosingType.OUTDATED, ClosingType.IN_PROGRESS],
           },
           {
-            id: ClosingType.OUTDATED,
-            month: 23,
+            minimum: 12,
+            maximum: 16,
+            value: 16,
+            closingType: [ClosingType.OUTDATED],
           },
         ],
         turnoverMonthly: [
@@ -1560,24 +1560,24 @@ export const PriceGridPourcentage = [
       {
         /* Compta Premium */
         idPrestationList: [PrestationType.COMPTA_PREMIUM, PrestationType.COMPTA_POURCENTAGE_PREMIUM, PrestationType.COMPTA_POURCENTAGE_PREMIUM_EXPRESS],
-        minimumMonthlyPayment: [
+        monthlyNbr: [
           {
-            id: ClosingType.IN_PROGRESS,
-            month: 9,
+            minimum: 0,
+            maximum: 4,
+            value: 6,
+            closingType: [ClosingType.OUTDATED, ClosingType.IN_PROGRESS],
           },
           {
-            id: ClosingType.OUTDATED,
-            month: 12,
+            minimum: 5,
+            maximum: 9,
+            value: 9,
+            closingType: [ClosingType.OUTDATED, ClosingType.IN_PROGRESS],
           },
-        ],
-        maximumMonthlyPayment: [
           {
-            id: ClosingType.IN_PROGRESS,
-            month: 23,
-          },
-          {
-            id: ClosingType.OUTDATED,
-            month: 23,
+            minimum: 12,
+            maximum: 16,
+            value: 16,
+            closingType: [ClosingType.OUTDATED],
           },
         ],
         turnoverMonthly: [
@@ -1648,24 +1648,24 @@ export const PriceGridPourcentage = [
       {
         /* Compta Pourcentage */
         idPrestationList: [PrestationType.COMPTA_POURCENTAGE, PrestationType.COMPTA_POURCENTAGE_EXPRESS],
-        minimumMonthlyPayment: [
-          {
-            id: ClosingType.IN_PROGRESS,
-            month: 9,
-          },
+        monthlyNbr: [
           {
-            id: ClosingType.OUTDATED,
-            month: 12,
+            minimum: 0,
+            maximum: 4,
+            value: 6,
+            closingType: [ClosingType.OUTDATED, ClosingType.IN_PROGRESS],
           },
-        ],
-        maximumMonthlyPayment: [
           {
-            id: ClosingType.IN_PROGRESS,
-            month: 23,
+            minimum: 5,
+            maximum: 9,
+            value: 9,
+            closingType: [ClosingType.OUTDATED, ClosingType.IN_PROGRESS],
           },
           {
-            id: ClosingType.OUTDATED,
-            month: 23,
+            minimum: 12,
+            maximum: 16,
+            value: 16,
+            closingType: [ClosingType.OUTDATED],
           },
         ],
         turnoverMonthly: [

package/ts/types/Interface/api/contest/Create.ts

@@ -28,9 +28,8 @@ export class CreateUserContest {
   @ApiPropertyOptional()
     societyDescription?: string;
 
-  @ApiPropertyOptional()
-  @IsOptional()
-    photo?: TFile;
+  @ApiProperty()
+    photo: TFile;
 
   @ApiPropertyOptional()
   @IsOptional()
@@ -62,6 +61,13 @@ export class CreateCheckVote {
 
   @ApiPropertyOptional()
     recaptcha?: string;
+
+  
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsBoolean()
+  @ToBoolean()
+    isTestMode?: boolean;
 }
 
 export class CreateVoteContest {

package/ts/types/Interface/api/userRoomEquipment/CreateSignature.ts

@@ -1,4 +1,4 @@
-import { IsInt, IsEmail } from 'class-validator';
+import { IsInt, IsEmail, IsString } from 'class-validator';
 import { ApiProperty } from '../../../../utils';
 
 export class CreateYousignSignature {
@@ -13,4 +13,12 @@ export class CreateYousignSignature {
   @ApiProperty()
   @IsEmail()
     email: string;
+  
+  @ApiProperty()
+  @IsString()
+    phone: string;
+
+  @ApiProperty()
+  @IsString()
+    prefix: string;
 }

package/ts/utils/documents.ts

@@ -41,7 +41,8 @@ const requiredListDocs = (params: RequiredDocsType): GedFileType[] => {
     generique.push(GedFileType.DISTRIBUTION_OF_SHARE);
   }
 
-  if ([LegalForm.SELARLU.id, LegalForm.EURL.id, LegalForm.SASU.id, LegalForm.SA.id, LegalForm.SAS.id, LegalForm.SARL.id, LegalForm.SCI.id, LegalForm.EARL.id].includes(idLegalForm)) {
+  if ([LegalForm.SELARLU.id, LegalForm.EURL.id, LegalForm.SASU.id, LegalForm.SA.id, 
+    LegalForm.SAS.id, LegalForm.SARL.id, LegalForm.SCI.id, LegalForm.EARL.id, LegalForm.GIE.id].includes(idLegalForm)) {
     return [...generique, GedFileType.KBIS, GedFileType.STATUTES, GedFileType.DBE2, GedFileType.SEPA];
   }
   if ([LegalForm.SELARL.id].includes(idLegalForm)) {

package/ts/utils/prestation.ts

@@ -17,8 +17,7 @@ type priceGridBrand = {
 
 type priceGrid = {
   idPrestationList: number[],
-  minimumMonthlyPayment?: monthlyPayment[],
-  maximumMonthlyPayment?: monthlyPayment[],
+  monthlyNbr?: monthlyNbr[],
   turnoverCreatedYear?: turnover[],
   turnoverPastYear?: turnover[],
   turnoverMonthly?: turnover[],
@@ -32,9 +31,11 @@ type priceGrid = {
   legalForm?: legalForm[],
 };
 
-type monthlyPayment = {
-  id: number,
-  month: number,
+type monthlyNbr = {
+  minimum: number,
+  maximum: number,
+  value: number,
+  closingType: number[],
 };
 
 type turnover = {
@@ -135,7 +136,7 @@ const getPriceGrid = (idTypeBrand: number, idPrestationList: number): priceGrid
   return currentPriceGrid;
 };
 
-const calculatePrestationPriceWithPriceGrid = (idPrestationList: number, endDate: string, NbrMonth: number, turnover: number, rentsNumber: number, employeesNumber: number, associatesNumber: number, idTypeBrand: number, idVatRegime: number, pastBalanceSheet: boolean, isYearly: boolean, totalMonth: number, idTaxSystem: number, idLegalForm: number): { totalPrestation: number, reduceMonth: number, canBeCreated: boolean, monthNbr: number, price: number } => {
+const calculatePrestationPriceWithPriceGrid = (idPrestationList: number, endDate: string, NbrMonth: number, turnover: number, rentsNumber: number, employeesNumber: number, associatesNumber: number, idTypeBrand: number, idVatRegime: number, pastBalanceSheet: boolean, isYearly: boolean, totalMonth: number, idTaxSystem: number, idLegalForm: number, balanceSheetOffered: number = 0): { totalPrestation: number, reduceMonth: number, canBeCreated: boolean, monthNbr: number, price: number } => {
   let totalPrestation: number = 0;
   let reduceMonth: number = 0;
   let monthNbr: number = NbrMonth;
@@ -175,21 +176,30 @@ const calculatePrestationPriceWithPriceGrid = (idPrestationList: number, endDate
     /* Gestion des mois */
     let cloturedPast: boolean = false;
     if (dayjs(endDate, 'YYYY-MM-DD').subtract(15, 'day').isBefore(dayjs())) cloturedPast = true;
-    const minimumMonth: number | undefined = currentPriceGrid.minimumMonthlyPayment?.find(monthlyPayment => monthlyPayment.id === (cloturedPast ? ClosingType.OUTDATED : ClosingType.IN_PROGRESS))?.month;
-    const maximumMonth: number | undefined = currentPriceGrid.maximumMonthlyPayment?.find(monthlyPayment => monthlyPayment.id === (cloturedPast ? ClosingType.OUTDATED : ClosingType.IN_PROGRESS))?.month;
-    if (totalMonth > 0) monthNbr = monthNbr - totalMonth;
-    if (minimumMonth && monthNbr < minimumMonth) {
-      monthNbr = minimumMonth;
-      recalculateMonthly = true;
-      if (totalMonth > 0) canBeCreated = false;
+    let monthlyNbrList: monthlyNbr[] | undefined;
+    let monthlyNbr: monthlyNbr | undefined;
+    if (currentPriceGrid.monthlyNbr) {
+      monthlyNbrList = currentPriceGrid.monthlyNbr?.filter(el => el.closingType.includes(cloturedPast ? ClosingType.OUTDATED : ClosingType.IN_PROGRESS));
+      if (monthlyNbrList) {
+        monthlyNbr = monthlyNbrList.find(el => (el.minimum <= monthNbr) && (monthNbr <= el.maximum));
+        if (monthlyNbr) {
+          monthNbr = monthlyNbr.value;
+        }
+      }
     }
-    if (maximumMonth && monthNbr > maximumMonth) {
-      monthNbr = maximumMonth;
+    if (totalMonth > 0) {
+      if (monthlyNbr && ((monthNbr - totalMonth) < monthlyNbr?.minimum)) canBeCreated = false; 
+      monthNbr = monthNbr - totalMonth;
       recalculateMonthly = true;
-      if (totalMonth > 0) canBeCreated = false;
     }
 
     reduceMonth = (monthNbr === NbrMonth - totalMonth ? totalMonth : 0);
+
+    if (balanceSheetOffered > 0) {
+      yearlyPrice = undefined;
+      recalculateMonthly = false;
+      finalMonthlyPrice = balanceSheetOffered / monthNbr;
+    }
     
     /* Prix Final */
     totalPrestation = (yearlyPrice ? yearlyPrice : finalMonthlyPrice * monthNbr);
@@ -205,7 +215,7 @@ const calculatePrestationPriceWithPrestationList = (prestationList: IPrestationL
   return totalPrestation;
 };
 
-const calculatePrestationPrice = (idPrestationList: number, prestationList: IPrestationList, endDate: string, NbrMonth: number, turnover: number, rentsNumber: number, employeesNumber: number, associatesNumber: number, idTypeBrand: number, idVatRegime: number, pastBalanceSheet: boolean, optionsList: number[], totalPercentage: number, totalAmount: number, totalMonth: number, isWithApplicationFees: boolean, idTaxSystem: number, idLegalForm: number, isYearly: boolean = false): { totalPrestation: number, reduceMonth: number, canBeCreated: boolean, calculDetail: string, monthlyPrice: string, price: number } => {
+const calculatePrestationPrice = (idPrestationList: number, prestationList: IPrestationList, endDate: string, NbrMonth: number, turnover: number, rentsNumber: number, employeesNumber: number, associatesNumber: number, idTypeBrand: number, idVatRegime: number, pastBalanceSheet: boolean, optionsList: number[], totalPercentage: number, totalAmount: number, totalMonth: number, isWithApplicationFees: boolean, idTaxSystem: number, idLegalForm: number, isYearly: boolean = false, balanceSheetOffered: number = 0): { totalPrestation: number, reduceMonth: number, canBeCreated: boolean, calculDetail: string, monthlyPrice: string, price: number } => {
   let totalPrestation: number = 0;
   let reduceMonth: number = 0;
   let canBeCreated: boolean = true;
@@ -241,7 +251,7 @@ const calculatePrestationPrice = (idPrestationList: number, prestationList: IPre
       PrestationType.STATUTS_OPTION_2,
     ].includes(idPrestationList)
   ) {
-    totalWithReduce = calculatePrestationPriceWithPriceGrid(idPrestationList, endDate, NbrMonth, turnover, rentsNumber, employeesNumber, associatesNumber, idTypeBrand, idVatRegime, pastBalanceSheet, isYearly, totalMonth, idTaxSystem, idLegalForm);
+    totalWithReduce = calculatePrestationPriceWithPriceGrid(idPrestationList, endDate, NbrMonth, turnover, rentsNumber, employeesNumber, associatesNumber, idTypeBrand, idVatRegime, pastBalanceSheet, isYearly, totalMonth, idTaxSystem, idLegalForm, balanceSheetOffered);
     totalPrestation = totalWithReduce.totalPrestation;
     reduceMonth = totalWithReduce.reduceMonth;
     canBeCreated = totalWithReduce.canBeCreated;