@silexpert/core 1.0.158 → 1.0.161

package/ts/types/Enum/Holidays.ts

@@ -0,0 +1 @@
+export const DateHolidays = ['2028-01-01', '2028-04-17', '2028-05-01', '2028-05-08', '2028-05-25', '2028-06-05', '2028-07-14', '2028-08-15', '2028-11-01', '2028-11-11', '2028-12-25', '2027-01-01', '2027-03-29', '2027-05-01', '2027-05-06', '2027-05-08', '2027-05-17', '2027-07-14', '2027-08-15', '2027-11-01', '2027-11-11', '2027-12-25', '2026-01-01', '2026-04-06', '2026-05-01', '2026-05-08', '2026-05-14', '2026-05-25', '2026-07-14', '2026-08-15', '2026-11-01', '2026-11-11', '2026-12-25', '2025-01-01', '2025-04-21', '2025-05-01', '2025-05-08', '2025-05-29', '2025-06-09', '2025-07-14', '2025-08-15', '2025-11-01', '2025-11-11', '2025-12-25', '2024-01-01', '2024-04-01', '2024-05-01', '2024-05-08', '2024-05-09', '2024-05-20', '2024-07-14', '2024-08-15', '2024-11-01', '2024-11-11', '2024-12-25', '2023-01-01', '2023-04-10', '2023-05-01', '2023-05-08', '2023-05-18', '2023-05-29', '2023-07-14', '2023-08-15', '2023-11-01', '2023-11-11', '2023-12-25'];

package/ts/types/Enum/PrestationType.ts

@@ -255,7 +255,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: '400,54,569,90',
     signaturePage: 5,
-    point: 0,
+    point: 125,
   },
   PREVISIONNEL: {
     id: 6,

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

@@ -58,5 +58,5 @@ export interface IPrestation {
   societiesPrestations?: ISociety;
   prestationsDetailsBeforeExercice?: IExercicePrestation[];
   customersSignatures?: ICustomerSignature[];
-  terminationsList?: ITerminationList;
+  terminationList?: ITerminationList;
 }

package/ts/types/index.ts

@@ -476,6 +476,7 @@ export * from './Enum/GeneralThirdParty';
 export * from './Enum/MailDomainType';
 export * from './Enum/TextMessageType';
 export * from './Enum/JobTitle';
+export * from './Enum/Holidays';
 
 // Interfaces API
 export * from './Interface/api/partnerTransactionType/ReadPartnerTransactionType';

package/ts/utils/prestation.ts

@@ -31,24 +31,24 @@ const isExpress = (idPrestationList: number):boolean => {
 };
 
 const calculateScoringOfPrestation = (idPrestationType: PrestationType, prestations: IPrestation[]): number => {
+  const prestationsSignedPaid = prestations.filter((prestation) => prestation.paid && prestation.signed && prestation.terminationList === null);
+
   // Get the list of prestations that are half price
   const prestationHalfPriceList = Object.values(PrestationDetail).filter((p) => p.isComptable && !p.isCatalog);
   const prestationHalfPriceIds = prestationHalfPriceList.map((t) => t.id);
 
-  // Get the number of points for the prestation
+  // Get the number of points for the new prestation
   const prestaDetails = Object.values(PrestationDetail).find((prestaDetail) => prestaDetail.id === idPrestationType);
   const numberPoint = prestaDetails?.point || 0;
 
-  // Find the prestation with the same idPrestationList and they need to be paid and signed
-  const samePrestation = prestations.filter((prestation) => (prestation.idPrestationList === idPrestationType) && (prestation.paid === true && prestation.signed === true && prestation.terminationsList === null));
-
-  // If there is no prestation with the same idPrestationList, return 100% of points
-  if (samePrestation.length === 0) return numberPoint;
+  // Get list of prestations that are already done and check if one of them is in the list of prestations that are half price
+  const prestationsExistIds = prestationsSignedPaid.map((prestation) => prestation.idPrestationList);
+  const prestationHalfPriceAlreadyDoneIds = prestationsExistIds.filter((id) => prestationHalfPriceIds.includes(id));
 
-  // If the prestation is in the list of half price prestation, return 50% of points
-  if (prestationHalfPriceIds.includes(idPrestationType)) return numberPoint * 0.5;
+  // If one of the prestations already done is in the list of prestations that are half price and if the idPrestationType is in prestationHalfPriceIds, return 50% of points
+  if (prestationHalfPriceAlreadyDoneIds.length && prestationHalfPriceIds.includes(idPrestationType)) return Math.floor(numberPoint * 0.5);
 
-  return 0;
+  return numberPoint;
 };
 
 export {