@silexpert/core 1.2.34 → 1.2.36

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

@@ -202,6 +202,12 @@ export class CreateCommercialSetting {
   @ToBoolean()
     areLinesSeparationHidden?: boolean;
 
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsBoolean()
+  @ToBoolean()
+    areExternalBordersHidden?: boolean;
+
   @ApiPropertyOptional()
   @IsOptional()
   @IsBoolean()
@@ -295,6 +301,22 @@ export class CreateCommercialSetting {
   @IsOptional()
   @IsInt()
     idSignatureFile?: number | null;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+    logoUrl?: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+    paymentType?: string;
+
+  @ApiPropertyOptional()
+  @IsBoolean()
+  @ToBoolean()
+  @IsOptional()
+  bonPour?: boolean;
 }
 
 export class CreateCommercialMail {

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

@@ -8,42 +8,42 @@ import { ToBoolean } from '../../../../utils/transforms/boolean.transform';
 export class NumberFiscalYearsValidation implements NumberFiscalYears {
   @ApiProperty()
   @IsNumber()
-    n: number;
+  n: number;
 
   @ApiProperty()
   @IsNumber()
-    n1: number;
+  n1: number;
 
   @ApiProperty()
   @IsNumber()
-    n2: number;
+  n2: number;
 
   @ApiPropertyOptional()
   @IsOptional()
   @IsNumber()
-    vat?: number;
+  vat?: number;
 }
 
 export class LoansInformations implements LoanInformation {
   @ApiProperty()
   @IsIn(['n', 'n1', 'n2'])
-    year: 'n' | 'n1' | 'n2';
+  year: 'n' | 'n1' | 'n2';
 
   @ApiProperty()
   @IsNumber()
-    duration: number;
+  duration: number;
 
   @ApiProperty()
   @IsNumber()
-    rate: number;
+  rate: number;
 
   @ApiProperty()
   @IsNumber()
-    payment: number;
+  payment: number;
 
   @ApiProperty()
   @IsNumber()
-    amount: number;
+  amount: number;
 }
 
 export class CreatePrevisionalFormData implements PrevisionalFormPayload {
@@ -53,207 +53,208 @@ export class CreatePrevisionalFormData implements PrevisionalFormPayload {
   @ApiProperty()
   @IsBoolean()
   @ToBoolean()
-    isCompanyCreation: boolean;
+  isCompanyCreation: boolean;
 
   @ApiProperty()
   @IsEnum(LegalFormTypeEnum)
-    idLegalForm: LegalFormTypeEnum;
+  idLegalForm: LegalFormTypeEnum;
 
   @ApiProperty()
   @IsEnum(TaxSystem)
-    idTaxSystem: TaxSystem;
+  idTaxSystem: TaxSystem;
 
   @ApiProperty()
   @IsEnum(PrevisionalFormActivity)
-    activity: PrevisionalFormActivity;
+  activity: PrevisionalFormActivity;
 
   /**
    * Investissement
    */
   @ApiProperty()
   @ValidateNested()
-    computerHardware: Required<NumberFiscalYearsValidation>;
+  computerHardware: Required<NumberFiscalYearsValidation>;
 
   @ApiProperty()
   @ValidateNested()
-    utilityVehicle: Required<NumberFiscalYearsValidation>;
+  utilityVehicle: Required<NumberFiscalYearsValidation>;
 
   @ApiProperty()
   @ValidateNested()
-    personalVehicle: Required<NumberFiscalYearsValidation>;
+  personalVehicle: Required<NumberFiscalYearsValidation>;
 
   @ApiProperty()
   @ValidateNested()
-    toolsEquipment: Required<NumberFiscalYearsValidation>;
+  toolsEquipment: Required<NumberFiscalYearsValidation>;
 
   @ApiProperty()
   @ValidateNested()
-    software: Required<NumberFiscalYearsValidation>;
+  software: Required<NumberFiscalYearsValidation>;
 
   @ApiProperty()
   @ValidateNested()
-    website: Required<NumberFiscalYearsValidation>;
+  website: Required<NumberFiscalYearsValidation>;
 
   @ApiProperty()
   @ValidateNested()
-    businessAssets: Required<NumberFiscalYearsValidation>;
+  businessAssets: Required<NumberFiscalYearsValidation>;
 
   @ApiProperty()
   @ValidateNested()
-    immobilizedSecurities: Required<NumberFiscalYearsValidation>;
+  immobilizedSecurities: Required<NumberFiscalYearsValidation>;
 
   @ApiProperty()
   @ValidateNested()
-    deposit: Required<NumberFiscalYearsValidation>;
+  deposit: Required<NumberFiscalYearsValidation>;
 
   /**
    * Financement
    */
   @ApiProperty()
   @ValidateNested()
-    socialCapital: NumberFiscalYearsValidation;
+  socialCapital: NumberFiscalYearsValidation;
 
   @ApiProperty()
   @ValidateNested()
-    accountContribution: NumberFiscalYearsValidation;
+  accountContribution: NumberFiscalYearsValidation;
 
   @ApiProperty()
-  @ValidateNested()
-    loans: LoansInformations[];
+  @ValidateNested({ each: true })
+  loans: LoansInformations[];
 
   /**
    * Chiffres d’affaires et charge liées à l’activité
    */
   @ApiProperty()
-  @ValidateNested()
-    turnover: Required<NumberFiscalYearsValidation>[];
+  @ValidateNested({ each: true })
+  turnover: Required<NumberFiscalYearsValidation>[];
 
   @ApiProperty()
-  @ValidateNested()
-    outsourcing: Required<NumberFiscalYearsValidation>[];
+  @ValidateNested({ each: true })
+  outsourcing: Required<NumberFiscalYearsValidation>[];
 
   @ApiPropertyOptional()
-    merchandisePurchase?: OptionNumberFiscalYears[];
+  @ValidateNested({ each: true })
+  merchandisePurchase?: OptionNumberFiscalYears[];
 
   /**
    * Consommables
    */
   @ApiProperty()
   @ValidateNested()
-    packaging: Required<NumberFiscalYearsValidation>;
+  packaging: Required<NumberFiscalYearsValidation>;
 
   @ApiProperty()
   @ValidateNested()
-    utilities: Required<NumberFiscalYearsValidation>;
+  utilities: Required<NumberFiscalYearsValidation>;
 
   @ApiProperty()
   @ValidateNested()
-    fuel: Required<NumberFiscalYearsValidation>;
+  fuel: Required<NumberFiscalYearsValidation>;
 
   @ApiProperty()
   @ValidateNested()
-    equipmentAndSupplies: Required<NumberFiscalYearsValidation>;
+  equipmentAndSupplies: Required<NumberFiscalYearsValidation>;
 
   @ApiProperty()
   @ValidateNested()
-    administrativeSupplies: Required<NumberFiscalYearsValidation>;
+  administrativeSupplies: Required<NumberFiscalYearsValidation>;
 
   /**
    * Autes charges liées à l’activité
    */
   @ApiProperty()
   @ValidateNested()
-    realEstateRental: Required<NumberFiscalYearsValidation>;
+  realEstateRental: Required<NumberFiscalYearsValidation>;
 
   @ApiProperty()
   @ValidateNested()
-    otherRental: Required<NumberFiscalYearsValidation>;
+  otherRental: Required<NumberFiscalYearsValidation>;
 
   @ApiProperty()
   @ValidateNested()
-    maintenanceAndRepair: Required<NumberFiscalYearsValidation>;
+  maintenanceAndRepair: Required<NumberFiscalYearsValidation>;
 
   @ApiProperty()
   @ValidateNested()
-    insuranceAndProfessionalLiability: Required<NumberFiscalYearsValidation>;
+  insuranceAndProfessionalLiability: Required<NumberFiscalYearsValidation>;
 
   @ApiProperty()
   @ValidateNested()
-    accountingFees: Required<NumberFiscalYearsValidation>;
+  accountingFees: Required<NumberFiscalYearsValidation>;
 
   @ApiProperty()
   @ValidateNested()
-    otherFees: Required<NumberFiscalYearsValidation>;
+  otherFees: Required<NumberFiscalYearsValidation>;
 
   @ApiProperty()
   @ValidateNested()
-    advertising: Required<NumberFiscalYearsValidation>;
+  advertising: Required<NumberFiscalYearsValidation>;
 
   @ApiProperty()
   @ValidateNested()
-    kilometricAllowances: Required<NumberFiscalYearsValidation>;
+  kilometricAllowances: Required<NumberFiscalYearsValidation>;
 
   @ApiProperty()
   @ValidateNested()
-    otherTravelExpenses: Required<NumberFiscalYearsValidation>;
+  otherTravelExpenses: Required<NumberFiscalYearsValidation>;
 
   @ApiProperty()
   @ValidateNested()
-    telephonyInternetNetworks: Required<NumberFiscalYearsValidation>;
+  telephonyInternetNetworks: Required<NumberFiscalYearsValidation>;
 
   @ApiProperty()
   @ValidateNested()
-    bankFees: Required<NumberFiscalYearsValidation>;
+  bankFees: Required<NumberFiscalYearsValidation>;
 
   /**
    * Social et rémunération
    */
   @ApiProperty()
   @ValidateNested()
-    employee1GrossSalary: NumberFiscalYearsValidation;
+  employee1GrossSalary: NumberFiscalYearsValidation;
 
   @ApiProperty()
   @ValidateNested()
-    employee2GrossSalary: NumberFiscalYearsValidation;
+  employee2GrossSalary: NumberFiscalYearsValidation;
 
   @ApiProperty()
   @ValidateNested()
-    employee3GrossSalary: NumberFiscalYearsValidation;
+  employee3GrossSalary: NumberFiscalYearsValidation;
 
   @ApiProperty()
   @ValidateNested()
-    remunerationPresident: NumberFiscalYearsValidation;
+  remunerationPresident: NumberFiscalYearsValidation;
 
   @ApiProperty()
   @ValidateNested()
-    remunerationManager: NumberFiscalYearsValidation;
+  remunerationManager: NumberFiscalYearsValidation;
 
   /**
    * Impôts
    */
   @ApiProperty()
-    cfe: NumberFiscalYears | undefined;
+  cfe: NumberFiscalYears | undefined;
 
   @ApiProperty()
-    tvs: NumberFiscalYears | undefined;
+  tvs: NumberFiscalYears | undefined;
 
   @ApiProperty()
-    otherTaxes: NumberFiscalYears | undefined;
+  otherTaxes: NumberFiscalYears | undefined;
 
   /**
    * Récapitulatif
    */
   @ApiProperty()
   @IsString()
-    summary: string;
+  summary: string;
 }
 
 export class CreatePrevisionalForm {
   @ApiProperty()
   @IsNumber()
-    idSociety: number;
+  idSociety: number;
 
   @ApiProperty()
   @ValidateNested()
-    payload: CreatePrevisionalFormData;
+  payload: CreatePrevisionalFormData;
 }

package/ts/types/Interface/api/report/CreateReport.ts

@@ -1,50 +1,83 @@
+import { IsInt, IsOptional, IsString } from 'class-validator';
 import { IReport } from '../../..';
 import { ApiProperty, ApiPropertyOptional } from '../../../../utils';
 import { TFile } from '../file/TFile';
 
 export class CreateReport implements IReport {
   @ApiPropertyOptional()
-    idReportType?: number;
+  @IsOptional()
+  @IsInt()
+  idReportType?: number;
 
   @ApiPropertyOptional()
-    idSociety?: number;
+  @IsOptional()
+  @IsInt()
+  idSociety?: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+  idFile?: number;
 
   @ApiProperty()
-    idUser: number;
+  @IsInt()
+  idUser: number;
 
   @ApiPropertyOptional()
-    idServiceConcerned?: number;
+  @IsOptional()
+  @IsInt()
+  idServiceConcerned?: number;
 
   @ApiProperty()
-    comment: string;
+  @IsString()
+  comment: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+  search?: string;
 
   @ApiPropertyOptional()
-    search?: string;
+  @IsOptional()
+  declareSoupcons?: boolean;
 
   @ApiPropertyOptional()
-    declareSoupcons?: boolean;
+  @IsOptional()
+  @IsInt()
+  state?: number;
 
   @ApiPropertyOptional()
-    state?: number;
+  @IsOptional()
+  informerjlb?: boolean;
 
   @ApiPropertyOptional()
-    informerjlb?: boolean;
+  @IsOptional()
+  @IsInt()
+  ressenti?: number;
 
   @ApiPropertyOptional()
-    ressenti?: number;
+  @IsOptional()
+  @IsInt()
+  action?: number;
 
   @ApiPropertyOptional()
-    action?: number;
+  @IsOptional()
+  processed?: boolean;
 
   @ApiPropertyOptional()
-    processed?: boolean;
+  @IsOptional()
+  letterDate?: Date;
 
   @ApiPropertyOptional()
-    letterDate?: Date;
+  @IsOptional()
+  receivedFile?: TFile;
 
   @ApiPropertyOptional()
-    receivedFile?: TFile;
+  @IsOptional()
+  responseFile?: TFile;
 
   @ApiPropertyOptional()
-    responseFile?: TFile;
+  @IsOptional()
+  @IsString()
+  token?: string;
 }

package/ts/types/Interface/api/report/ExternalReport.ts

@@ -0,0 +1,30 @@
+import { IsEnum, IsInt, IsNumber, IsOptional, IsString } from 'class-validator';
+import { ApiProperty, ApiPropertyOptional } from '../../../../utils';
+import { IssueTypeEnum } from '../../../Enum/IssueType';
+import { ReportTypeEnum } from '../../../Enum/ReportType';
+import { TFile } from '../file/TFile';
+
+export class CreateExternalReport {
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+  @IsEnum(IssueTypeEnum)
+  idIssueType?: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+  @IsEnum(ReportTypeEnum)
+  idReportType?: number;
+
+  @ApiProperty()
+  @IsNumber()
+  idSociety: number;
+
+  @ApiProperty()
+  @IsString()
+  comment: string;
+
+  @ApiPropertyOptional()
+  file?: TFile;
+}

package/ts/types/Interface/models/IFile.ts

@@ -1,7 +1,7 @@
 import { IAttachmentFile } from './IAttachmentFile';
 import { IFolderFile } from './IFolderFile';
 import { IFileType } from './IFileType';
-import { ICommercialMail, IEstimateInvoice, IMail, IMailAttachment, ISociety } from '../..';
+import { ICommercialMail, IEstimateInvoice, IMail, IMailAttachment, IReport, ISociety } from '../..';
 import { IPaymentRecovery } from './IPaymentRecovery';
 
 // files
@@ -25,4 +25,5 @@ export interface IFile {
   mailAttachment?: IMailAttachment | null;
   paymentRecovery?: IPaymentRecovery | null;
   estimateInvoice?: IEstimateInvoice | null;
+  report?: IReport | null;
 }

package/ts/types/Interface/models/IReport.ts

@@ -1,14 +1,20 @@
-import { IReportType } from './IReportType';
+import { ReportTypeEnum } from '../../Enum/ReportType';
+import { ICalendarEvent } from './ICalendarEvent';
+import { IComment } from './IComment';
+import { ICustomerAcceptance } from './ICustomerAcceptance';
+import { IFile } from './IFile';
+import { ILetter } from './ILetter';
 import { ISociety } from './ISociety';
 
 // report
 export interface IReport {
   id?: number;
   idSociety?: number | null;
-  idReportType?: number | null;
+  idReportType?: ReportTypeEnum | null;
   idCalendarEvent?: number;
   idServiceConcerned?: number | null;
   idService?: number | null;
+  idFile?: number | null;
   idLetterType?: number | null;
   declareSoupcons?: boolean | null;
   token?: string | null;
@@ -24,6 +30,10 @@ export interface IReport {
   updatedAt?: Date | null;
 
   // Associations
-  reportType?: IReportType;
   society?: ISociety;
+  file?: IFile;
+  calendarEvent?: ICalendarEvent;
+  comments?: IComment[];
+  customerAcceptance?: ICustomerAcceptance;
+  letter?: ILetter;
 }

package/ts/types/Interface/models/ITicketSupport.ts

@@ -1,10 +1,39 @@
+import { IssueTypeEnum } from '../../Enum/IssueType';
+import { IFile } from './IFile';
+import { ISociety } from './ISociety';
+import { IUser } from './IUser';
+
 // ticketSupport
 export interface ITicketSupport {
   id?: number;
   title: string;
   message: string;
-  path: string;
-  done: boolean;
+  url?: string | null;
+  idIssueType: IssueTypeEnum;
+  idSociety: number;
+  idUser: number;
+  idUserWithSameProblem?: number;
+  idUserConstatation?: number;
+  dateChangeConstatation?: Date;
+  idUserState?: number;
+  dateChangeState?: Date;
+  idFile?: number;
+  idFile2?: number;
+  tool: number;
+  reproduce?: boolean;
+  isUrgent?: boolean;
+  constatation?: number;
+  state?: number;
+  dateRdvProgram?: Date;
   createdAt?: Date | null;
   updatedAt?: Date | null;
+
+  // Associations
+  society?: ISociety;
+  user?: IUser;
+  userWithSameProblem?: IUser;
+  userConstatation?: IUser;
+  file?: IFile;
+  file2?: IFile;
+
 }

package/ts/types/index.ts

@@ -404,6 +404,7 @@ export * from './Enum/SurveyType';
 export * from './Enum/SurveyTypeDatas';
 export * from './Enum/PaymentMethod';
 export * from './Enum/ReportType';
+export * from './Enum/IssueType';
 export * from './Enum/AdjustmentType';
 export * from './Enum/ReportState';
 export * from './Enum/Proceding';
@@ -882,6 +883,7 @@ export * from './Interface/api/humanResourceLibrary/QueryPaginatedHumanResourceL
 export * from './Interface/api/humanResourceLibrary/QueryHumanResourceLibrary';
 export * from './Interface/api/humanResourceLibrary/CreateHumanResourceLibrary';
 export * from './Interface/api/humanResourceLibrary/CreateUserHumanResourceLibrary';
+export * from './Interface/api/report/ExternalReport';
 
 export * from './Interface/api/library/QueryLibrary';
 export * from './Interface/api/library/ReadLibraryFile';

package/ts/utils/commercialManagement/saleEmail.ts

@@ -15,7 +15,7 @@ export function transformModelWithCharcodeToString(datas: InfoToUseType, templat
 
   const charcodesFound: RegExpMatchArray | [] = template.match(reg) ?? [];
   const charcodesFoundWithoutBrackets: string[] = [];
-  charcodesFound.forEach((f) => charcodesFoundWithoutBrackets.push(f.replace(/[\[\]']+/g, '')));
+  charcodesFound.forEach((f) => charcodesFoundWithoutBrackets.push((f as unknown as string).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/email/templates/signature.ts

@@ -46,7 +46,7 @@ const footer = `<% if(commercialName === 'Clementine') { %>
                 Une question ? Découvrez votre <a href="https://www.clementine.fr/aide/" style="color: #FF7E3C">centre d'aide</a>
               </span>
               <span style="text-align: right; text-decoration: none; color: #A0A1A6; white-space: nowrap; float: right;">
-                Jusqu’à 500€ avec notre <a href="https://www.clementine.fr/parrainage/?utm_source=signature&utm_medium=email&utm_campaign=signature&utm_content=cta" style="color: #FF7E3C">programme de parrainage</a>
+                Jusqu’à 600€ avec notre <a href="https://www.clementine.fr/parrainage/?utm_source=signature&utm_medium=email&utm_campaign=signature&utm_content=cta" style="color: #FF7E3C">programme de parrainage</a>
               </span>
             </td>
           </tr>

package/ts/utils/vat/utils.ts

@@ -54,6 +54,7 @@ export function textFormatting(value: any, length: number | null = null): string
     formattedValue = formattedValue.replace(/^ */, ''); // Suppression des espaces de début
     formattedValue = formattedValue.replace(/ *$/, ''); // Suppression des espaces de fin
     formattedValue = formattedValue.replace(/€/g, 'EUR');
+    formattedValue = formattedValue.replace(/œ/g, 'oe');
     if (length) formattedValue = formattedValue.slice(0, length);
     return formattedValue;
   }