@silexpert/core 1.3.271 → 1.3.274

package/ts/types/Enum/PrestationType.ts

@@ -279,6 +279,7 @@ export const allPrestations2025WithCGV = [
   PrestationType.ATTESTATION_1,
   PrestationType.ATTESTATION_NON_REMUNERATION_RECURRENTE,
   PrestationType.FORFAIT_EXPRESS,
+  PrestationType.BILAN_PREVISIONNEL,
 ];
 
 export const ClementineSubscriptionAccountancyExpertPrestations: PrestationType[] = [
@@ -616,7 +617,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: '400,54,569,90',
     signaturePage: 6,
-    point: 100,
+    point: 150,
   },
   JURIDIQUE: {
     id: 16,
@@ -3792,7 +3793,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: '400,54,569,90',
     signaturePage: 7,
-    point: 200,
+    point: 150,
   },
   //Software
   STEERING: {
@@ -3812,7 +3813,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: '400,54,569,90',
     signaturePage: 7,
-    point: 200,
+    point: 150,
   },
   //Software
   VAT: {
@@ -3832,7 +3833,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: '400,54,569,90',
     signaturePage: 7,
-    point: 200,
+    point: 150,
   },
   //Software
   BALANCESHEET: {
@@ -3852,7 +3853,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: '400,54,569,90',
     signaturePage: 7,
-    point: 200,
+    point: 150,
   },
   EXPERTISE: {
     id: PrestationType.EXPERTISE,
@@ -3871,7 +3872,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: '400,54,569,90',
     signaturePage: 7, //???
-    point: 200,
+    point: 150,
     listPcaTypes: [PcaType.ACCOUNTING],
   },
   SUPPORT: {
@@ -3891,7 +3892,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: '400,54,569,90',
     signaturePage: 7, //???
-    point: 200,
+    point: 400,
     listPcaTypes: [PcaType.ACCOUNTING, PcaType.LEGAL],
   },
   PREMIUM: {
@@ -3911,7 +3912,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: '400,54,569,90',
     signaturePage: 7, //???
-    point: 400,
+    point: 600,
     listPcaTypes: [PcaType.ACCOUNTING, PcaType.LEGAL],
   },
   CUSTOM_MADE: {
@@ -3931,7 +3932,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: '400,54,569,90',
     signaturePage: 7, //???
-    point: 400,
+    point: 600,
     listPcaTypes: [PcaType.ACCOUNTING, PcaType.LEGAL],
   },
   EI: {
@@ -3951,7 +3952,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: '400,54,569,90',
     signaturePage: 7, //???
-    point: 200, //???
+    point: 150, //???
     listPcaTypes: [PcaType.ACCOUNTING],
   },
   MICRO: {
@@ -3971,7 +3972,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: '400,54,569,90',
     signaturePage: 7, //???
-    point: 200, //???
+    point: 150, //???
   },
   GESTION_IMMO: {
     id: PrestationType.GESTION_IMMO,
@@ -3990,7 +3991,7 @@ export const PrestationDetail: PrestationDetailEnum = {
     isComplementary: false,
     signaturePosition: '400,54,569,90',
     signaturePage: 7, //???
-    point: 200, //???
+    point: 150, //???
     listPcaTypes: [PcaType.ACCOUNTING],
   },
   TERMINATION_FEES: {

package/ts/types/Interface/api/commercial/QueryGetStats.ts

@@ -1,12 +1,27 @@
-import { IsInt, IsOptional, IsString } from 'class-validator';
-import { ApiPropertyOptional } from '../../../../utils';
+import { IsBoolean, IsInt, IsOptional, IsString } from 'class-validator';
+import { ApiPropertyOptional } from '@nestjs/swagger';
+import { ToBoolean } from '../../../../utils/transforms/boolean.transform.js';
+import { ToNumber } from '../../../../utils/transforms/number.transform.js';
+import { OptionalQueryPaginate } from '../BasePaginate.js';
 
-export class QueryGetStats {
+export class QueryGetStats extends OptionalQueryPaginate {
   @ApiPropertyOptional()
   @IsOptional()
   @IsString()
   search?: string;
 
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsBoolean()
+  @ToBoolean()
+  isInCA?: boolean;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+  @ToNumber()
+  isAdditionalSales?: number;
+
   @ApiPropertyOptional()
   @IsOptional()
   @IsInt()
@@ -37,8 +52,23 @@ export class QueryGetStats {
   @IsInt({ each: true })
   idPrestationList?: number[];
 
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt({ each: true })
+  idOfferList?: number[];
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt({ each: true })
+  idState?: number[];
+
   @ApiPropertyOptional()
   @IsOptional()
   @IsInt({ each: true })
   idConstitutionState?: number[];
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+  idTypeBrand?: number;
 }

package/ts/utils/prestation.ts

@@ -1,23 +1,21 @@
-import { IExercice, IPrestation, IPrestationList } from '../types';
-import { Vat } from '../types/Enum/Vat';
-import { ReasonTerminationType } from '../types/Enum/ReasonTerminationType';
-import { getTaxesIncludedAmount } from './vat/utils';
-import { intersection } from './noLodash';
+import { IExercice, IPrestation, IPrestationList } from '../types/index.js';
+import { Vat } from '../types/Enum/Vat.js';
+import { ReasonTerminationType } from '../types/Enum/ReasonTerminationType.js';
+import { intersection } from './noLodash.js';
 import {
   ClementineSubscriptionAccountancySoftwarePrestations,
   PrestationDetail,
   PrestationType,
-} from '../types/Enum/PrestationType';
-import { LegalFormTypeEnum } from '../types/Enum/LegalForm';
-import { PrestationOptionType, PrestationOption } from '../types/Enum/PrestationOption';
-import { PriceGridClementine } from '../types/Enum/PriceGridClementine';
-import { PriceGridPourcentage } from '../types/Enum/PriceGridPourcentage';
-import { PriceGridLegalstart } from '../types/Enum/PriceGridLegalstart';
-import { PriceGridStatutsExpress } from '../types/Enum/PriceGridStatutsExpress';
-import { ClosingType } from '../types/Enum/ClosingType';
-import { getBrandNameByNodeEnv } from './brands';
-import * as dayjs from 'dayjs';
-import { exerciceNumber } from './exercice';
+} from '../types/Enum/PrestationType.js';
+import { PrestationOptionType, PrestationOption } from '../types/Enum/PrestationOption.js';
+import { PriceGridClementine } from '../types/Enum/PriceGridClementine.js';
+import { PriceGridPourcentage } from '../types/Enum/PriceGridPourcentage.js';
+import { PriceGridLegalstart } from '../types/Enum/PriceGridLegalstart.js';
+import { PriceGridStatutsExpress } from '../types/Enum/PriceGridStatutsExpress.js';
+import { ClosingType } from '../types/Enum/ClosingType.js';
+import { getBrandNameByNodeEnv } from './brands.js';
+import dayjs from 'dayjs';
+import { exerciceNumber } from './exercice.js';
 
 type priceGridBrand = {
   idTypeBrand: number;
@@ -154,10 +152,45 @@ const isConsultingHour = (idPrestationList: number[]): boolean =>
   !!intersection(idPrestationList, [PrestationType.CONSULTING_HOUR]).length;
 
 const isSoftwarePrestation = (idPrestationList: number[]): boolean =>
-  !!intersection(idPrestationList, [PrestationType.STEERING, PrestationType.VAT, PrestationType.BALANCESHEET])
-    .length; /*  &&
+  !!intersection(idPrestationList, [
+    PrestationType.STEERING,
+    PrestationType.VAT,
+    PrestationType.BALANCESHEET,
+    PrestationType.BILLING,
+  ]).length; /*  &&
   idPrestationList.length === 1 */ // Commenté car si un client résilie un software pour un utre software, condition non prise en charge
 
+/**
+ * Retourne la première prestation comptable non catalogue trouvée dans une liste.
+ *
+ * @param prestationsList Liste de prestations de référence.
+ * @returns La prestation comptable non catalogue, ou undefined si aucune n'est trouvée.
+ */
+const getComptableNotCatalogPrestation = (
+  prestationsList: Array<Partial<IPrestationList>>,
+): Partial<IPrestationList> | undefined =>
+  prestationsList.find((prestation) => !!prestation.isComptable && !prestation.isCatalog);
+
+/**
+ * Retourne true si une prestation comptable (isPlannable & isComptable & !isCatalog) est trouvée dans la liste.
+ *
+ * @param prestationsList Liste de prestations de référence.
+ * @returns true si une prestation comptable est trouvée, sinon false.
+ */
+const hasAccountingPrestation = (prestationsList: Array<Partial<IPrestationList>>): boolean =>
+  !!prestationsList.find((prestation) => !!prestation.isPlannable && !!prestation.isComptable && !prestation.isCatalog);
+
+/**
+ * Retourne la première prestation comptable (isPlannable & isComptable & !isCatalog) trouvée dans la liste.
+ *
+ * @param prestationsList Liste de prestations de référence.
+ * @returns La prestation comptable, ou undefined si aucune n'est trouvée.
+ */
+const getAccountingPrestation = (
+  prestationsList: Array<Partial<IPrestationList>>,
+): Partial<IPrestationList> | undefined =>
+  prestationsList.find((prestation) => !!prestation.isPlannable && !!prestation.isComptable && !prestation.isCatalog);
+
 const calculateScoringOfPrestation = (
   idPrestationType: PrestationType,
   prestations: IPrestation[],
@@ -196,7 +229,9 @@ const calculateScoringOfPrestation = (
       p.isComptable &&
       !p.isCatalog &&
       p.id &&
-      ![PrestationType.BALANCESHEET, PrestationType.VAT, PrestationType.STEERING].includes(p.id),
+      ![PrestationType.BALANCESHEET, PrestationType.VAT, PrestationType.STEERING, PrestationType.BILLING].includes(
+        p.id,
+      ),
   );
   const prestationHalfPriceIds = prestationHalfPriceList.map((t) => t.id);
 
@@ -227,9 +262,8 @@ const calculateScoringOfPrestation = (
   const prestationsExistIds = prestationsSignedPaid.map((prestation) => prestation.idPrestationList);
   const prestationHalfPriceAlreadyDoneIds = prestationsExistIds.filter((id) => prestationHalfPriceIds.includes(id));
 
-  // 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.3);
+  // 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 upsell points (250)
+  if (prestationHalfPriceAlreadyDoneIds.length && prestationHalfPriceIds.includes(idPrestationType)) return 250;
 
   return numberPoint;
 };
@@ -427,24 +461,6 @@ const calculatePrestationPriceWithPrestationList = (prestationList: IPrestationL
   return totalPrestation;
 };
 
-/**
- * From idLegalForm, get application fees amount (without taxes included if no idVat passed, or with taxes included calculated by given idVat)
- * @param idLegalForm
- * @param idVat
- * @returns amount of application fees, without taxes included
- * @deprecated Application fees are not charged anymore
- */
-const getApplicationFeesAmount = (idLegalForm: number, idVat?: number) => {
-  let applicationFeesAmount = 50;
-  if (idLegalForm === LegalFormTypeEnum.SCI) applicationFeesAmount = 150;
-
-  //Sans tva, on envoie le montant HT
-  if (!idVat) return applicationFeesAmount;
-
-  //Avec tva, on envoie le montant TTC
-  return getTaxesIncludedAmount(applicationFeesAmount, idVat);
-};
-
 const calculatePrestationPrice = (
   idPrestationList: number,
   prestationList: IPrestationList,
@@ -461,7 +477,6 @@ const calculatePrestationPrice = (
   totalPercentage: number /* total pourcentage offer (%) */,
   totalAmount: number /* total montant offer (€) */,
   totalMonth: number /* total mois offer (mois) */,
-  isWithApplicationFees: boolean /* frais de dossier */,
   idTaxSystem: number,
   idLegalForm: number,
   isYearly: boolean = false /* prestation annuel ou mensuel */,
@@ -552,11 +567,10 @@ const calculatePrestationPrice = (
   } else {
     totalPrestation = calculatePrestationPriceWithPrestationList(prestationList);
     if ([PrestationType.CREATION_SOCIETE].includes(idPrestationList) && !isSubPrestation) {
-      if ([LegalFormTypeEnum.EI, LegalFormTypeEnum.LMNP, LegalFormTypeEnum.AUTO_ENTREPRENEUR].includes(idLegalForm)) {
-        totalPrestation += 100;
-      } else {
-        totalPrestation += 300;
-      }
+      // totalPrestation += 50;
+      // La création est offerte désormais
+      // inutile d'ajouter les frais de greffe et d'annonce légale,
+      // car ne compte pas dans le calcul pour les sales
     }
   }
   /* Gestion des offres */
@@ -578,13 +592,8 @@ const calculatePrestationPrice = (
     });
   }
   totalPrestation += OptionTotalPrice ? OptionTotalPrice : 0;
-  /* Gestion des frais de dossier */
-  // if (isWithApplicationFees) {
-  //   const applicationFeesAmount = getApplicationFeesAmount(idLegalForm);
-  //   totalPrestation += applicationFeesAmount;
-  // }
 
-  const calculDetail = `${monthNbr > 0 ? monthNbr + ' mois x ' + Math.round(price * 100) / 100 + '€' : Math.round(price * 100) / 100 + '€'} ${totalAmount > 0 ? '- ' + totalAmount + '€' : ''} ${totalPercentage > 0 ? '- ' + totalPercentage + '%' : ''} ${isWithApplicationFees ? '+ 50€' : ''}`;
+  const calculDetail = `${monthNbr > 0 ? monthNbr + ' mois x ' + Math.round(price * 100) / 100 + '€' : Math.round(price * 100) / 100 + '€'} ${totalAmount > 0 ? '- ' + totalAmount + '€' : ''} ${totalPercentage > 0 ? '- ' + totalPercentage + '%' : ''}`;
 
   return {
     totalPrestation,
@@ -665,11 +674,13 @@ export {
   isExpress,
   isConsultingHour,
   isSoftwarePrestation,
+  getComptableNotCatalogPrestation,
+  hasAccountingPrestation,
+  getAccountingPrestation,
   calculateScoringOfPrestation,
   calculatePrestationPrice,
   getPrestationOptions,
   isAbleToUpdatePrice,
   calculatePrestationPriceWithPriceGrid,
-  getApplicationFeesAmount,
   idPrestationListToOfferType,
 };