@silexpert/core 1.2.31 → 1.2.34

package/ts/api/resources.ts

@@ -172,6 +172,9 @@ import { Refund } from './resources/Refund';
 import { HumanResourceLibrary } from './resources/HumanResourceLibrary';
 import { YouSign } from './resources/YouSign';
 import { RegistrationForm } from './resources/RegistrationForm';
+import { CommercialEmail } from './resources/CommercialEmail';
+import { CommercialDocumentTemplate } from './resources/CommercialDocumentTemplate';
+import { CommercialConditionOfSale } from './resources/CommercialConditionOfSale';
 
 export const resources = {
   simulation: Simulation,
@@ -348,4 +351,7 @@ export const resources = {
   humanResourceLibrary: HumanResourceLibrary,
   youSign: YouSign,
   registrationForm: RegistrationForm,
+  commercialEmail: CommercialEmail,
+  commercialDocumentTemplate: CommercialDocumentTemplate,
+  commercialConditionOfSale: CommercialConditionOfSale
 };

package/ts/types/Enum/PaymentRecovery.ts

@@ -25,6 +25,108 @@ export enum PaymentRecoveryEvent {
   SUBMITTED = 'submitted',
   SENT_TO_AMICABLE_SETTLEMENT = 'sentToAmicableSettlement',
 }
+export const PaymentRecoveryEventDetails = [
+  {
+    slug: PaymentRecoveryEvent.NEW_PAYMENT,
+    description: 'Versement reçu'
+  },
+  {
+    slug: PaymentRecoveryEvent.AROK,
+    description: 'Dossier pris en charge par l\'étude'
+  },
+  {
+    slug: PaymentRecoveryEvent.DISPUTE,
+    description: 'Le débiteur conteste la créance'
+  },
+  {
+    slug: PaymentRecoveryEvent.NO_ANSWER,
+    description: 'Le débiteur ne répond pas'
+  },
+  {
+    slug: PaymentRecoveryEvent.CLAIM_ENDED_RJ,
+    description: 'Le débiteur est en redressement judiciaire'
+  },
+  {
+    slug: PaymentRecoveryEvent.CLAIM_ENDED_LJ,
+    description: 'Le débiteur est en liquidation judiciaire'
+  },
+  {
+    slug: PaymentRecoveryEvent.CLAIM_ENDED_PAYED,
+    description: 'Les sommes dues ont été réglées'
+  },
+  {
+    slug: PaymentRecoveryEvent.CLAIM_ENDED,
+    description: 'Dossier clôturé en amiable'
+  },
+  {
+    slug: PaymentRecoveryEvent.PAY_SCHEDULE_SETUP,
+    description: 'Le débiteur accepte de régler'
+  },
+  {
+    slug: PaymentRecoveryEvent.PAY_SCHEDULE_ERROR,
+    description: 'Le débiteur n\'a pas respecté son échéance de paiement'
+  },
+  {
+    slug: PaymentRecoveryEvent.NEW_ACTION,
+    description: 'Nouvelle action réalisée'
+  },
+  {
+    slug: PaymentRecoveryEvent.COURT_SETTLEMENT_PAID,
+    description: 'Frais de recouvrement réglés : lancement procédure judiciaire'
+  },
+  {
+    slug: PaymentRecoveryEvent.NEW_PAYMENT_CLIENT,
+    description: 'Un nouveau versement a été effectué sur votre compte'
+  },
+  {
+    slug: PaymentRecoveryEvent.FILED_IP,
+    description: 'Votre facture a été déposée au tribunal'
+  },
+  {
+    slug: PaymentRecoveryEvent.IP_OK,
+    description: 'Votre injonction de payer a été obtenue'
+  },
+  {
+    slug: PaymentRecoveryEvent.IP_KO,
+    description: 'Votre injonction de payer a été refusée'
+  },
+  {
+    slug: PaymentRecoveryEvent.SIGNIFIED_IP,
+    description: 'Votre injonction de payer a été présentée et signifiée auprès de votre débiteur'
+  },
+  {
+    slug: PaymentRecoveryEvent.ON_GOING_NEGOCIAITION,
+    description: 'Négociation en cours'
+  },
+  {
+    slug: PaymentRecoveryEvent.IP_PARTIEL,
+    description: 'Votre injonction de payer a été obtenue partiellement'
+  },
+  {
+    slug: PaymentRecoveryEvent.DIRECT_PAYMENT_TO_DEBTOR,
+    description: 'Demande de suspension temporaire'
+  },
+  {
+    slug: PaymentRecoveryEvent.CLAIM_DELETION_REQUEST,
+    description: 'Demande de suspension définitive'
+  },
+  {
+    slug: PaymentRecoveryEvent.TEMPORARY_PAUSE_REQUEST,
+    description: 'Demande de suspension temporaire'
+  },
+  {
+    slug: PaymentRecoveryEvent.SENT_TO_COURT_SETTLEMENT,
+    description: 'Facture envoyée à l\'étude, en attente de paiement'
+  },
+  {
+    slug: PaymentRecoveryEvent.SUBMITTED,
+    description: 'Facture déposée'
+  },
+  {
+    slug: PaymentRecoveryEvent.SENT_TO_AMICABLE_SETTLEMENT,
+    description: 'Facture envoyée à l\'étude'
+  },
+]; 
 
 export enum PaymentRecoveryStatus {
   OPENED = 'opened',
@@ -38,6 +140,54 @@ export enum PaymentRecoveryStatus {
   SENT_TO_COURT = 'sent_to_court',
 }
 
+export const PaymentRecoveryStatusDetails = [
+  {
+    slug: PaymentRecoveryStatus.OPENED,
+    shortLabel: 'En attente',
+    label: 'Facture déposée sur la plateforme'
+  },
+  {
+    slug: PaymentRecoveryStatus.SENT_TO_AMICABLE,
+    shortLabel: 'Envoyée',
+    label: 'Facture envoyée à l\'étude de Commissaires de Justice'
+  },
+  {
+    slug: PaymentRecoveryStatus.AMICABLE_SETTLEMENT,
+    shortLabel: 'Amiable',
+    label: 'Facture en recouvrement amiable'
+  },
+  {
+    slug: PaymentRecoveryStatus.RJ,
+    shortLabel: 'Red. jud.',
+    label: 'Dossier clôturé : le débiteur est en Redressement Judiciaire'
+  },
+  {
+    slug: PaymentRecoveryStatus.LJ,
+    shortLabel: 'Liq. jud.',
+    label: 'Dossier clôturé : le débiteur est en Liquidation Judiciaire'
+  },
+  {
+    slug: PaymentRecoveryStatus.PAYED,
+    shortLabel: 'Recouvré',
+    label: 'Les sommes dues ont été réglées'
+  },
+  {
+    slug: PaymentRecoveryStatus.CLOSED,
+    shortLabel: 'Clôturé',
+    label: 'Dossier clôturé'
+  },
+  {
+    slug: PaymentRecoveryStatus.JUDICIARY_PROCEDURE,
+    shortLabel: 'Judiciaire',
+    label: 'Facture en recouvrement judiciaire'
+  },
+  {
+    slug: PaymentRecoveryStatus.SENT_TO_COURT,
+    shortLabel: 'Env. jud.',
+    label: 'Facture envoyée à l\'étude de Commissaires de Justice pour procédure judiciaire'
+  },
+];
+
 export enum PaymentRecoveryTag {
   RECOVERED = 'recovered',
   WAITING = 'waiting',

package/ts/types/Enum/QualificationLead.ts

@@ -0,0 +1,35 @@
+export enum QualificationLead {
+  NOT_SUBSCRIBED = 1,
+  SMALL_INTEREST = 2,
+  NEUTRAL = 3,
+  INTERESSEMENT = 4,
+  VERY_INTERESSEMENT = 5,
+  PROMISE_CONTRACT = 6,
+}
+
+export const QualificationLeadType: Array<{ id: QualificationLead, label: string }> = [
+  {
+    id: QualificationLead.NOT_SUBSCRIBED,
+    label: 'Non souscris/abandon',
+  },
+  {
+    id: QualificationLead.SMALL_INTEREST,
+    label: 'Peu intéressé',
+  },
+  {
+    id: QualificationLead.NEUTRAL,
+    label: 'Neutre',
+  },
+  {
+    id: QualificationLead.INTERESSEMENT,
+    label: 'Intéressé',
+  },
+  {
+    id: QualificationLead.VERY_INTERESSEMENT,
+    label: 'Très intéressé',
+  },
+  {
+    id: QualificationLead.PROMISE_CONTRACT,
+    label: 'Promesse contrat',
+  },
+];

package/ts/types/Enum/ReasonCancelSignatureRequest.ts

@@ -0,0 +1,5 @@
+export enum ReasonCancelSignatureRequest {
+  CONTRACTUALIZATION_ABORTED = 'contractualization_aborted',
+  ERRORS_IN_DOCUMENT = 'errors_in_document',
+  OTHER = 'other'
+};

package/ts/types/Interface/api/brevo/BrevoElement.ts

@@ -1,4 +1,5 @@
 import {
+  IsArray,
   IsInt, IsNotEmpty, IsNumber, IsOptional, IsString,
 } from 'class-validator';
 import { ApiProperty, ApiPropertyOptional } from '../../../../utils';
@@ -35,10 +36,20 @@ export class CreateContact {
     
 }
 
-export class ReadContact {
+export class GetContact {
   @ApiProperty()
-  @IsNumber()
-    id: number;
+  @IsString()
+    email: string;
+}
+
+export class UpdateContact {
+  @ApiProperty()
+  @IsString()
+  @IsNotEmpty()
+    email: string;
+
+  @ApiProperty()
+    attributes: Partial<CreateContact>;
 }
 
 export class ChangeContact {
@@ -52,12 +63,9 @@ export class ChangeContact {
     listId: number;
 }
 
-export class UpdateContact {
-  @ApiProperty()
-  @IsString()
-  @IsNotEmpty()
-    email: string;
-
-  @ApiProperty()
-    attributes: Partial<CreateContact>;
+export class BrevoTermination {
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsArray()
+    idSociety: number[];
 }

package/ts/types/Interface/api/brevo/Read.ts

@@ -0,0 +1,22 @@
+export type ReadCreateContact = {
+  id: number,
+}
+
+export type ReadGetContact = {
+  email: string,
+  id: number,
+  emailBlacklisted: boolean,
+  smsBlacklisted: boolean,
+  createdAt: Date,
+  modifiedAt: Date,
+  attributes: object
+  listIds: number[],
+  statistics: object
+}
+
+export type ReadContactChange = {
+  contacts: {
+    success: string[],
+    failure: string[],
+  };
+}

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

@@ -1,5 +1,5 @@
 import {
-  IsArray, IsBoolean, IsDateString, IsEnum, IsInt, IsNumber, IsOptional, IsString, Min,
+  IsArray, IsBoolean, IsDateString, IsEnum, IsIn, IsInt, IsNumber, IsObject, IsOptional, IsString, Min,
 } from 'class-validator';
 import { IFile, ReadProductEditing } from '../../..';
 import { ApiProperty, ApiPropertyOptional } from '../../../../utils';
@@ -576,10 +576,6 @@ export class CreateSaleEmail {
   @IsBoolean()
   @ToBoolean()
     isDefault?: boolean;
-  
-  @ApiProperty()
-  @IsInt()
-    idSociety: number;
 }
 
 export class UpdateSaleEmail {
@@ -641,4 +637,55 @@ export class UpdateGeneralConditionOfSale {
   @IsBoolean()
   @ToBoolean()
     isDefault?: boolean;
+}
+
+export class CreateSaleDocumentTemplate {
+  @ApiProperty()
+  @IsIn(Object.values(InvoiceLanguage))
+  language: InvoiceLanguage;
+
+  @ApiProperty()
+  @IsString()
+    name: string;
+
+  @ApiProperty()
+  @IsObject()
+    template: CreateInvoiceDocument | CreatePreSaleDocument;
+
+  @ApiProperty()
+  @IsEnum(EstimateInvoiceType)
+    idEstimateInvoiceType: EstimateInvoiceType;
+
+  @ApiProperty()
+  @IsBoolean()
+  @ToBoolean()
+    isDefault: boolean;
+}
+
+export class UpdateSaleDocumentTemplate {
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsIn(Object.values(InvoiceLanguage))
+    language?: InvoiceLanguage;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+    name?: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsObject()
+    template?: CreateInvoiceDocument | CreatePreSaleDocument;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsEnum(EstimateInvoiceType)
+    idEstimateInvoiceType?: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsBoolean()
+  @ToBoolean()
+  isDefault?: boolean;
 }

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

@@ -1,5 +1,6 @@
 import {
   IsArray, IsBoolean, IsDateString, IsInt, IsNumber, IsOptional, IsString,
+  Min,
 } from 'class-validator';
 import { Order } from '../../..';
 import { ApiProperty, ApiPropertyOptional } from '../../../../utils';
@@ -175,4 +176,24 @@ export class QueryExportCommercialManagementIntoCSV {
   @ApiProperty()
   @IsArray()
     types: EstimateInvoiceType[];
+}
+
+export class QueryRecentActivity {
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+  @Min(1)
+    page?: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+  @Min(1)
+    limit?: number;
+
+  
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+    search?: string;
 }

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

@@ -106,4 +106,13 @@ export type ReadCommercialMailTemplate = {
 
 export type ReadSaleEmail = ISaleEmail & {
   defaultFromApplication: boolean;
-};
+};
+
+export type ReadRecentActivity = {
+  id: number;
+  type: 'estimate' | 'product' | 'tier';
+  label: string;
+  updatedAt: string;
+  // i don't know if needed, it is in the type but not return from service for now
+  item?: IEstimateInvoice | IProductInvoice | IThirdParty;
+}

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

@@ -1,5 +1,7 @@
 import { IsDate, IsInt, IsOptional, IsString } from 'class-validator';
 import { ApiPropertyOptional } from '../../../../utils';
+import { WhereOptions } from 'sequelize';
+import { ICustomerSignature } from '../../models/ICustomerSignature';
 
 export class QueryCustomerSignature {
   @ApiPropertyOptional()
@@ -86,4 +88,7 @@ export class QueryCustomerSignature {
   @IsOptional()
   @IsString({ each: true })
     includes?: string[];
+
+  @ApiPropertyOptional()
+    where?: WhereOptions<ICustomerSignature>;
 }

package/ts/types/Interface/api/paymentExpectation/QueryPaymentExpectation.ts

@@ -1,8 +1,29 @@
-import { IsInt } from 'class-validator';
-import { ApiProperty } from '../../../../utils';
+import { IsDate, IsInt, IsOptional, IsString } from 'class-validator';
+import { ApiProperty, ApiPropertyOptional } from '../../../../utils';
+import { RequiredQueryPaginate } from '../BasePaginate';
 
 export class QueryGetPaymentExpectation {
   @ApiProperty()
   @IsInt()
     idPrestation: number;
+}
+
+export class QueryGetPaymentExpectationPaginated extends RequiredQueryPaginate {
+  @ApiPropertyOptional()
+  @IsString()
+  @IsOptional()
+    search?: string;
+
+  @ApiPropertyOptional()
+  @IsString()
+  @IsOptional()
+    searchAmount?: string;
+
+  @ApiProperty()
+  @IsDate()
+    startDate: Date;
+
+  @ApiProperty()
+  @IsDate()
+    endDate: Date;
 }

package/ts/types/Interface/api/terminationList/CreateTerminationList.ts

@@ -161,6 +161,16 @@ export class UpdateTerminationList {
   @IsInt()
     idRefund?: number;
 
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsNumber()
+    commercialGestureAmount?: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt({each: true})
+  listIdTypeBrand?: number[];
+
   @ApiPropertyOptional()
   @IsOptional()
   @IsNumber()

package/ts/types/Interface/api/vatDeclaration/QueryVatDeclaration.ts

@@ -1,5 +1,5 @@
 import {
-  IsDate, IsDateString, IsEnum, IsNumber, IsOptional, IsString,
+  IsDate, IsDateString, IsEnum, IsIn, IsNumber, IsOptional, IsString,
 } from 'class-validator';
 import { CerfaType } from '../../../Enum/CerfaType';
 import { ApiProperty, ApiPropertyOptional } from '../../../../utils/decorators';
@@ -54,4 +54,10 @@ export class QueryVatEntry {
   @IsString()
   @IsOptional()
     type?: 'collected' | 'deductible';
+
+  // TODO: Passer le paramètre en requis une fois le front mis à jour
+  @ApiPropertyOptional()
+  @IsIn(Object.values(CerfaType))
+  @IsOptional()
+  idCerfaType?: CerfaType;
 }

package/ts/types/Interface/models/IPaymentExpectation.ts

@@ -15,6 +15,8 @@ export interface IPaymentExpectation {
   idSociety: number;
   idRegulation: number | null;
   idPrestation: number | null;
+  idUserNotifyPaiementProceed?: number | null;
+  idUserTaskPaiementProceed?: number | null;
   createdAt?: Date | null;
   updatedAt?: Date | null;
 

package/ts/types/Interface/models/ISaleDocumentTemplate.ts

@@ -0,0 +1,18 @@
+import { CreateInvoiceDocument, CreatePreSaleDocument, InvoiceLanguage } from '../..';
+import { EstimateInvoiceType } from '../../Enum/EstimateInvoice';
+import { ISociety } from './ISociety';
+
+export interface ISaleDocumentTemplate {
+  id?: number;
+  name: string;
+  language: InvoiceLanguage;
+  template: CreateInvoiceDocument | CreatePreSaleDocument;
+  idEstimateInvoiceType: EstimateInvoiceType;
+  isDefault: boolean;
+  idSociety: number;
+  createdAt?: Date | null;
+  updatedAt?: Date | null;
+
+  // association
+  society?: ISociety
+}

package/ts/types/Interface/models/ITerminationList.ts

@@ -22,6 +22,7 @@ export interface ITerminationList {
   monthlyPrice?: number | null;
   monthNumber?: number | null;
   monthOffer?: number | null;
+  commercialGestureAmount?: number | null;
   idReasonTermination?: number[] | null;
   idSociety?: number | null;
   idPrestation?: number | null;

package/ts/types/index.ts

@@ -340,6 +340,7 @@ export * from './Interface/models/IHumanResourceLibrary';
 export * from './Interface/models/IUserHumanResourceLibrary';
 export * from './Interface/models/ISaleEmail';
 export * from './Interface/models/IGeneralConditionOfSale';
+export * from './Interface/models/ISaleDocumentTemplate';
 
 
 // Schemas
@@ -562,6 +563,8 @@ export * from './Enum/PaymentRecovery';
 export * from './Enum/JuridicalSociety';
 export * from './Enum/Pdf2PicLocalType';
 export * from './Enum/DocumentForHumanResourceType';
+export * from './Enum/ReasonCancelSignatureRequest';
+export * from './Enum/QualificationLead';
 
 // Interfaces API
 export * from './Interface/api/exercice/ReadExercice';
@@ -1098,6 +1101,7 @@ export * from './Interface/api/userRoomEquipment/CreateSignature';
 export * from './Interface/api/paymentExpectation/CreatePaymentExpecation';
 export * from './Interface/api/expertAnnuary/Query';
 export * from './Interface/api/brevo/BrevoElement';
+export * from './Interface/api/brevo/Read';
 export * from './Interface/api/bankAccount/Create';
 export * from './Interface/api/echo/Mission';
 export * from './Interface/api/echo/CreateOrder';

package/ts/utils/commercialManagement/internationalization/choices.ts

@@ -129,7 +129,7 @@ export const internationalizationChoices: InternationalizationChoicesType = {
       estimate: {
         headers: {
           title: 'Devis',
-          dueDate: 'Valide jusq\'au',
+          dueDate: 'Valide jusqu\'au',
           termsOfPayment: 'Conditions de règlement',
         },
       },
@@ -143,7 +143,7 @@ export const internationalizationChoices: InternationalizationChoicesType = {
       },
       deposit: {
         headers: {
-          title: 'Accompte',
+          title: 'Acompte',
           expirationDate: 'Date d\'expiration',
           termsOfPayment: 'Date limite de règlement',
         },

package/ts/utils/commercialManagement/saleEmail.ts

@@ -13,9 +13,9 @@ export function transformModelWithCharcodeToString(datas: InfoToUseType, templat
   // this regex match the carac with []
   const reg = /\[(.*?)\]/g;
 
-  const charcodesFound = template.match(reg) ?? [];
+  const charcodesFound: RegExpMatchArray | [] = template.match(reg) ?? [];
   const charcodesFoundWithoutBrackets: string[] = [];
-  charcodesFound?.forEach((f: string) => charcodesFoundWithoutBrackets.push(f.replace(/[\[\]']+/g, '')));
+  charcodesFound.forEach((f) => 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/commercialManagement/templates/body.ts

@@ -92,7 +92,7 @@ export const bodyTemplate = `<html class="pdf-content">
       <div>
         ${commonTemplate.amountRecapitulation}
 
-        <% if (isStripeAllowed) { %>
+        <% if (isStripeAllowed && ![${EstimateInvoiceType.BON}, ${EstimateInvoiceType.DEVIS}].includes(idEstimateInvoiceType)) { %>
           <div style="text-align: right; margin-top: 30px;">${commonTemplate.paymentButton}</div>
         <% } %>
       </div>

package/ts/utils/commercialManagement/templates/common.ts

@@ -245,7 +245,7 @@ export class CommercialDocumentCommonHTML {
   .pdf-content .logo-placeholder { width: 300px; max-height: 150px;text-align:  <%= settings && settings.logoAlignment === 'left' ? 'left' : 'right' %>; margin-bottom: <%= settings && settings.logoAlignment === 'left' ? '10px;' : '0px' %>}
   .pdf-content .logo-placeholder > svg, .pdf-content .logo-placeholder > img { max-width: 100%; max-height: 150px; }
   .pdf-content .document-reference { font-size: 20px !important; }
-  .pdf-content .customer-border { border: <%= settings && settings.customerBlockBorderThickness ? settings.customerBlockBorderThickness + 'px' : '2px' %> solid <% settings && settings.customerBlockBorderColor ? settings.customerBlockBorderColor : '#EAEAEA' %>; border-radius: 6px; padding: 7px; }
+  .pdf-content .customer-border { border: <%= settings && settings.customerBlockBorderThickness ? settings.customerBlockBorderThickness + 'px' : '2px' %> solid <%= settings && settings.customerBlockBorderColor ? settings.customerBlockBorderColor : '#EAEAEA' %>; border-radius: 6px; padding: 7px; }
 
   /* Body */
   .pdf-content table.commercial-table-preview { border-spacing: 1px; border-collapse: collapse; }