@silexpert/core 1.1.272 → 1.1.274

package/ts/types/Enum/TimeSlot.ts

@@ -5,13 +5,27 @@ export enum TimeSlot {
   ONBOARDING_SHORT = 2,
   BILAN = 3,
   TVA = 4,
+  TVA_MANAGER = 5,
+  BALANCESHEET_OR_TIP = 6,
+  ACCOUNTING_RDV = 7,
+  BILLING = 8,
 }
 
+export type TimeSlotDetailType = {
+  id: number;
+  name: string;
+  internalName: string;
+  duration: number;
+  idRole: number[];
+  forWholeService?: boolean
+  idRoleExcluded?: number[];
+};
 
-export const TimeSlotDetail = [
+export const TimeSlotDetail:TimeSlotDetailType[] = [
   {
     id: TimeSlot.ONBOARDING,
     name: 'OnBoarding',
+    internalName: 'OnBoarding',
     duration: 45,
     idRole: [Role.ON_BOARDER],
     forWholeService: true,
@@ -19,22 +33,60 @@ export const TimeSlotDetail = [
   {
     id: TimeSlot.ONBOARDING_SHORT,
     name: 'OnBoarding court',
+    internalName: 'OnBoarding',
     duration: 45,
     idRole: [Role.ON_BOARDER],
     forWholeService: true,
   },
+  // {
+  //   id: TimeSlot.BILAN,
+  //   name: 'Bilan',
+  //   internalName: 'Bilan',
+  //   duration: 60,
+  //   idRole: [Role.ACCOUNTANT],
+  //   forWholeService: false,
+  // },
+  // {
+  //   id: TimeSlot.TVA,
+  //   name: 'Tva',
+  //   internalName: 'Tva',
+  //   duration: 15,
+  //   idRole:[Role.ACCOUNTANT],
+  //   idRoleExcluded:[Role.MANAGER],
+  //   forWholeService: false,
+  // },
+  // {
+  //   id: TimeSlot.TVA_MANAGER,
+  //   name: 'Tva',
+  //   internalName: 'Tva Manager',
+  //   duration: 15,
+  //   idRole:[Role.ACCOUNTANT, Role.MANAGER],
+  //   forWholeService: false,
+  // },
+  // {
+  //   id: TimeSlot.BALANCESHEET_OR_TIP,
+  //   name: 'Bilan ou Conseil',
+  //   internalName: 'Bilan ou Conseil',
+  //   duration: 30,
+  //   idRole:[Role.ACCOUNTANT],
+  //   idRoleExcluded:[Role.MANAGER],
+  //   forWholeService: false,
+  // },
   {
-    id: TimeSlot.BILAN,
-    name: 'Bilan',
-    duration: 60,
-    idRole: [Role.ACCOUNTANT],
+    id: TimeSlot.ACCOUNTING_RDV,
+    name: 'Rdv comptable',
+    internalName: 'Rdv comptable',
+    duration: 30,
+    idRole:[Role.ACCOUNTANT],
+    idRoleExcluded:[Role.MANAGER],
     forWholeService: false,
   },
   {
-    id: TimeSlot.TVA,
-    name: 'Tva',
-    duration: 30,
-    idRole:[Role.ACCOUNTANT],
+    id: TimeSlot.BILLING,
+    name: 'Facturation',
+    internalName: 'Facturation',
+    duration: 45,
+    idRole:[Role.FACTURATION],
     forWholeService: false,
   },
 ];

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

@@ -157,6 +157,32 @@ export class QueryRevisionMergeIntoAccount {
     idAccountingEntries?: Array<number>;
 }
 
+export class QueryRevisionMergeIntoThirdParty {
+  @ApiProperty()
+  @IsDate()
+    startDate: Date;
+
+  @ApiProperty()
+  @IsDate()
+    endDate: Date;
+
+  @ApiProperty()
+  @IsNumber()
+    idSociety: number;
+
+  @ApiPropertyOptional()
+  @IsArray()
+  @IsOptional()
+  @IsInt({ each:true })
+    idThirdParties?: Array<number>;
+
+  @ApiPropertyOptional()
+  @IsArray()
+  @IsOptional()
+  @IsInt({ each:true })
+    idAccountingEntries?: Array<number>;
+}
+
 export class QueryRevisionPaginate {
   @ApiProperty()
   @IsDate()

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

@@ -65,6 +65,10 @@ export interface ReadRevisionMergeIntoAccount {
   updated: number;
 }
 
+export interface ReadRevisionMergeIntoThirdParty {
+  updated: number;
+}
+
 export interface ReadRevisionTransactionDetail {
   id: number;
   invoiceNumber: string | null;

package/ts/types/Interface/api/workingSchedule/QueryAvailableTimeSlot.ts

@@ -1,14 +1,20 @@
 import {
   IsDate,
-  IsNumber,
+  IsInt,
   IsOptional,
 } from 'class-validator';
 import { ApiProperty, ApiPropertyOptional } from '../../../../utils';
 
 export class QueryAvailableTimeSlot {
-  @ApiProperty()
-  @IsNumber()
-    idUser: number ;
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+    idUser?: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+    idSociety?: number ;
 
   @ApiProperty()
   @IsDate()
@@ -20,11 +26,11 @@ export class QueryAvailableTimeSlot {
 
   @ApiPropertyOptional()
   @IsOptional()
-  @IsNumber()
+  @IsInt()
     duration?: number ;
 
   @ApiPropertyOptional()
   @IsOptional()
-  @IsNumber()
+  @IsInt()
     idType?: number;
 }

package/ts/types/Interface/models/IUser.ts

@@ -22,6 +22,7 @@ import { ICountry } from './ICountry';
 import { INationality } from './INationality';
 import { IUserBrand } from './IUserBrand';
 import { ICollaboraterDetail } from './ICollaboraterDetail';
+import { IUserTimeSlot } from './IUserTimeSlot';
 
 type isAny<T> = T | any;
 
@@ -130,5 +131,6 @@ export interface IUser {
   countryLiving?: ICountry;
   nationality?: INationality;
   usersBrands?: IUserBrand[];
+  usersTimeSlots?: IUserTimeSlot[];
   collaboraterDetails?: ICollaboraterDetail;
 }

package/ts/utils/email.ts

@@ -2,6 +2,7 @@
 // import { orderBy as orderByLodash } from 'lodash';
 import { EntityType } from '../types/Enum/EntityType';
 import { Role } from '../types/Enum/Role';
+import { TimeSlot } from '../types/Enum/TimeSlot';
 import { IUser } from '../types/Interface/models/IUser';
 import { getBrandConfig, isItThisEnv } from './brands';
 import { signatureTemplate } from './email/templates/signature';
@@ -137,7 +138,7 @@ function getPhoneSignature(user:any) {
 
 export function generateSignature(params: any): string {
   const {
-    forceRole = null, idTypeBrand = 1, ...otherParams
+    forceRole = null, idTypeBrand = 1, society, ...otherParams
   } = params;
   let {
     user,
@@ -270,6 +271,14 @@ export function generateSignature(params: any): string {
     phoneSignature = getPhoneSignature(user);
   }
 
+  // Si on a une société, alors on remplace le lien calendly de base par le lien calendly interne
+  // actuellement, géré uniquement pour les comptables
+  // on n'affiche uniquement si le comptable a bien des créneaux horaires dédiés à ce type de rdv
+  if (society?.id && user.roles.some((r: any) => r.id === Role.FRONT_OFFICE) && user?.usersTimeSlots?.length) {
+    const urlApp = getBrandConfig({ objectWaited: 'urlApp' }) as unknown as string;
+    user.calendlyUrl = `${urlApp}/appointment?uuid=${society?.externalId ? society.externalId : ''}&idType=${TimeSlot.ACCOUNTING_RDV}`;
+  }
+
   return ejs.render(signatureTemplate, {
     forceRole,
     isFacturation: user.roles ? user.roles.some((r: any) => r.id === Role.FACTURATION) : false,