@silexpert/core 1.2.30 → 1.2.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@silexpert/core",
-  "version": "1.2.30",
+  "version": "1.2.32",
   "description": "Silex Core perform HTTP Request and object binding. Silex core helps developers to retrieve and return formatted object",
   "homepage": "https://gitlab.compta-clementine.fr/dev/silex-api",
   "main": "dist/cjs/index.js",

package/ts/api/resources/CalendarEvent.ts

@@ -45,8 +45,8 @@ export class CalendarEvent extends Resource {
     });
   }
 
-  compareCalendarCall(params: QueryCalendarEventCall): Promise<ReadCalendarEventCall> {
-    return this.axios.$get('/calendar-events/compare-calendar-call', { params });
+  compareCalendarCall(params: QueryCalendarEventCall, signal?: AbortSignal): Promise<ReadCalendarEventCall> {
+    return this.axios.$get('/calendar-events/compare-calendar-call', { params, ...(signal ? { signal } : {}) });
   }
 
   update(id: number, payload: UpdateCalendarEvent): Promise<ICalendarEvent> {

package/ts/api/resources/PaymentExpectation.ts

@@ -1,4 +1,4 @@
-import { CreatePaymentExpecation, IPaymentExpectation, QueryGetPaymentExpectation } from '../../types';
+import { BasePaginate, CreatePaymentExpecation, IPaymentExpectation, QueryGetPaymentExpectation, QueryGetPaymentExpectationPaginated } from '../../types';
 import { Resource } from '../Resource';
 
 export class PaymentExpectation extends Resource {
@@ -6,10 +6,22 @@ export class PaymentExpectation extends Resource {
     return this.axios.$get('/payment-expectations', { params });
   }
 
+  getPaginate(params: QueryGetPaymentExpectationPaginated, signal?: AbortSignal): Promise<BasePaginate<IPaymentExpectation>> {
+    return this.axios.$get('/payment-expectations/paginate', { params, ...(signal ? { signal } : {}) });
+  }
+
   create(idSociety: number, payload: CreatePaymentExpecation): Promise<IPaymentExpectation> {
     return this.axios.$post(`/societies/${idSociety}/payment-expectations`, payload);
   }
 
+  update(id: number, payload: Partial<IPaymentExpectation>): Promise<IPaymentExpectation> {
+    return this.axios.$patch(`/payment-expectations/${id}`, payload);
+  }
+
+  delete(id: number): Promise<boolean> {
+    return this.axios.$delete(`/payment-expectations/${id}`);
+  }
+
   /**
    * Update only one paymentExpectation, linked to prestation
    * @param idPrestation 

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

@@ -35,12 +35,6 @@ export class CreateContact {
     
 }
 
-export class ReadContact {
-  @ApiProperty()
-  @IsNumber()
-    id: number;
-}
-
 export class ChangeContact {
   @ApiProperty()
   @IsString({ each: true })

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

@@ -0,0 +1,10 @@
+export type ReadContact = {
+  id: number,
+}
+
+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';
@@ -608,4 +608,88 @@ export class UpdateSaleEmail {
   @IsBoolean()
   @ToBoolean()
     isDefault?: boolean;
+}
+
+export class CreateGeneralConditionOfSale {
+  @ApiProperty()
+  @IsString()
+    name: string;
+
+  @ApiProperty()
+  @IsString()
+    content: string;
+
+  @ApiProperty()
+  @IsBoolean()
+  @ToBoolean()
+    isDefault: boolean;
+}
+
+export class UpdateGeneralConditionOfSale {
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+    name?: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+    content?: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @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/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/previsionalForm/CreatePrevisionalForm.ts

@@ -2,7 +2,7 @@ import { LegalFormTypeEnum } from '../../../Enum/LegalForm';
 import { TaxSystem } from '../../../Enum/TaxSystem';
 import { LoanInformation, NumberFiscalYears, OptionNumberFiscalYears, PrevisionalFormActivity, PrevisionalFormPayload } from '../../..';
 import { ApiProperty, ApiPropertyOptional } from '../../../../utils';
-import { IsNumber, IsBoolean, IsEnum, IsOptional, ValidateNested, IsIn } from 'class-validator';
+import { IsNumber, IsBoolean, IsEnum, IsOptional, ValidateNested, IsIn, IsString } from 'class-validator';
 import { ToBoolean } from '../../../../utils/transforms/boolean.transform';
 
 export class NumberFiscalYearsValidation implements NumberFiscalYears {
@@ -132,8 +132,8 @@ export class CreatePrevisionalFormData implements PrevisionalFormPayload {
   @ValidateNested()
     outsourcing: Required<NumberFiscalYearsValidation>[];
 
-  @ApiProperty()
-    merchandisePurchase: OptionNumberFiscalYears[];
+  @ApiPropertyOptional()
+    merchandisePurchase?: OptionNumberFiscalYears[];
 
   /**
    * Consommables
@@ -239,6 +239,13 @@ export class CreatePrevisionalFormData implements PrevisionalFormPayload {
 
   @ApiProperty()
     otherTaxes: NumberFiscalYears | undefined;
+
+  /**
+   * Récapitulatif
+   */
+  @ApiProperty()
+  @IsString()
+    summary: string;
 }
 
 export class CreatePrevisionalForm {

package/ts/types/Interface/api/previsionalForm/PrevisionalFormPayload.ts

@@ -49,7 +49,7 @@ export interface Financing {
 
 export interface Turnover {
   turnover: Required<NumberFiscalYears>[]; // Ventes de marchandises / Ventes de matières premières / Ventes de prestations de services
-  merchandisePurchase: OptionNumberFiscalYears[]; // Achats de marchandises / matières premières
+  merchandisePurchase?: OptionNumberFiscalYears[]; // Achats de marchandises / matières premières
 }
 
 export interface Charges {
@@ -92,4 +92,8 @@ export interface SocialAndRemuneration {
   remunerationManager: NumberFiscalYears; // Rémunération gérant
 }
 
-export interface PrevisionalFormPayload extends CompanyDescription, Investment, Financing, Turnover, Charges, Taxes, Consumables, OtherCharges, SocialAndRemuneration {}
+export interface ProjectSummary {
+  summary: string // Récapitulatif du projet
+}
+
+export interface PrevisionalFormPayload extends CompanyDescription, Investment, Financing, Turnover, Charges, Taxes, Consumables, OtherCharges, SocialAndRemuneration, ProjectSummary {}

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/IGeneralConditionOfSale.ts

@@ -0,0 +1,15 @@
+import { ISociety } from './ISociety';
+
+export interface IGeneralConditionOfSale {
+  id?: number;
+  name: string;
+  content: string;
+  isDefault: boolean;
+  idSociety?: number | null;
+  createdAt?: Date | null;
+  updatedAt?: Date | null;
+  deletedAt?: Date | null;
+
+  // Associations
+  society?: ISociety
+}

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/index.ts

@@ -339,6 +339,8 @@ export * from './Interface/models/IPrevisionalForm';
 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
@@ -561,6 +563,7 @@ export * from './Enum/PaymentRecovery';
 export * from './Enum/JuridicalSociety';
 export * from './Enum/Pdf2PicLocalType';
 export * from './Enum/DocumentForHumanResourceType';
+export * from './Enum/ReasonCancelSignatureRequest';
 
 // Interfaces API
 export * from './Interface/api/exercice/ReadExercice';
@@ -1097,6 +1100,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/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));