@silexpert/core 1.3.2 → 1.3.3

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

@@ -590,6 +590,7 @@ export class CreateReminder {
   customizedDate?: Date;
 
   @ApiPropertyOptional()
+  @IsOptional()
   @IsArray()
   @IsInt({ each: true })
   idFiles?: number[];
@@ -617,6 +618,16 @@ export class CreateRecurrence {
   @ToBoolean()
   @IsBoolean()
   isActive: boolean;
+
+  @ApiProperty()
+  @ToBoolean()
+  @IsBoolean()
+  shouldSendEmailOnCreation: boolean;
+
+  @ApiPropertyOptional()
+  @IsNumber()
+  @IsOptional()
+  idSaleEmail?: number;
 }
 
 export class CreateRegenerateDocument {

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

@@ -106,6 +106,7 @@ export class UpdateReminder {
   customizedDayDiff?: number;
 
   @ApiPropertyOptional()
+  @IsOptional()
   @IsArray()
   @IsInt({ each: true })
   idFiles?: number[];
@@ -132,4 +133,14 @@ export class UpdateRecurrence {
   @IsBoolean()
   @IsOptional()
   isActive?: boolean;
+
+  @ApiPropertyOptional()
+  @ToBoolean()
+  @IsOptional()
+  shouldSendEmailOnCreation?: boolean;
+
+  @ApiPropertyOptional()
+  @IsNumber()
+  @IsOptional()
+  idSaleEmail?: number;
 }

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

@@ -16,9 +16,9 @@ export class CreateFile {
   name: string;
 
   @ApiPropertyOptional()
+  @IsOptional()
   @IsBoolean()
   @ToBoolean()
-  @IsOptional()
   convertImage?: boolean;
 }
 

package/ts/types/Interface/api/marketing/NewLeadSheet.ts

@@ -0,0 +1,10 @@
+import { MarketingConversionName } from '../../../Enum/Marketing';
+
+export interface MarketingNewLeadSheet {
+  email: string;
+  prefix: string;
+  phone: string;
+  conversionName: MarketingConversionName;
+  conversionTime: Date;
+  conversionValue: number;
+}

package/ts/types/Interface/api/society/QueryUnpaid.ts

@@ -23,7 +23,13 @@ export class QueryUnpaidSociety {
   @IsOptional()
   @IsBoolean()
   @ToBoolean()
-  isRecoverable?: boolean;
+  isRecoverable?: boolean; 
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsBoolean()
+  @ToBoolean()
+  isRecovering?: boolean;
 
   @ApiPropertyOptional()
   @IsOptional()

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

@@ -2,6 +2,8 @@ import { IsArray, IsBoolean, IsIn, IsInt, IsNumber, IsOptional, IsString, Min }
 import { ApiProperty, ApiPropertyOptional } from '../../../../utils';
 import { ToBoolean } from '../../../../utils/transforms/boolean.transform';
 import { SubscriptionType } from '../../../Enum/SubscriptionType';
+import { WhereOptions } from 'sequelize';
+import { ISociety } from '../../models/ISociety';
 
 export class QueryConfirm {
   @ApiProperty()
@@ -83,11 +85,42 @@ export class QueryResendConfirmationLink {
   id: number;
 }
 
-export class QueryUserSociety {
+export class GetSocietyFromUser {
   @ApiPropertyOptional()
-  @IsNumber()
   @IsOptional()
+  @IsNumber()
   idSubscriptionType?: SubscriptionType;
+  
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsBoolean()
+  @ToBoolean()
+  displayArchived?: boolean;
+  
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsBoolean()
+  @ToBoolean()
+  onlyLabAccepted?: boolean;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString({each: true})
+  attributes?: Extract<keyof ISociety, string>[];
+
+  @ApiPropertyOptional({ 
+    default: ['societyConfig','brandType','societyGescom','oldExpertInfo','activity','follows','compta','subscriptionType','connector','permissions'] 
+  })
+  @IsOptional()
+  @IsString({
+    each: true,
+  })
+  @IsIn(['societyConfig','brandType','societyGescom','oldExpertInfo','activity','follows','compta','subscriptionType','connector','permissions','societyDetails'], { each: true })
+  include?: string[];
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  where?: WhereOptions<ISociety>;
 }
 
 export class QueryUpdatePassword {

package/ts/types/Interface/models/IInvoiceRecurrence.ts

@@ -8,7 +8,9 @@ export interface IInvoiceRecurrence {
   endDate: Date;
   lastSend: Date | null;
   isActive: boolean;
+  shouldSendEmailOnCreation: boolean;
   idEstimateInvoice: number;
+  idSaleEmail?: number | null;
   createdAt?: Date;
   updatedAt?: Date;
 

package/ts/types/Interface/models/ISociety.ts

@@ -181,6 +181,7 @@ export interface ISociety {
   cancelCompleteCreationModal?: Date | null;
   isCreatedInApp?: boolean;
   passwordIsuite?: string | null;
+  unpaidState?: number | null;
 
   // Associations
   accounts?: IAccount[];

package/ts/types/Interface/models/ISupervision.ts

@@ -10,36 +10,36 @@ import { IUser } from './IUser';
 export interface ISupervision {
   id?: number;
   state: number | null;
-  sendToJedeclare: boolean | null;
-  dueDate: Date | null;
-  revisionDate: Date | null;
-  superviseurId: number | null;
-  expertId: number | null;
-  dateAssignmentSuperviseur: Date | null;
+  sendToJedeclare?: boolean | null;
+  dueDate?: Date | null;
+  revisionDate?: Date | null;
+  superviseurId?: number | null;
+  expertId?: number | null;
+  dateAssignmentSuperviseur?: Date | null;
   idExercice: number;
-  idAccountant: number | null;
-  idFile: number | null;
-  idLetter: number | null;
-  checkDateRecommandation: Date | null;
-  freeText: string | null;
-  freeTextDate: Date | null;
-  freeTextUserId: number | null;
-  idBalanceSheet: number | null;
-  idUserWhoValidate: number | null;
+  idAccountant?: number | null;
+  idFile?: number | null;
+  idLetter?: number | null;
+  checkDateRecommandation?: Date | null;
+  freeText?: string | null;
+  freeTextDate?: Date | null;
+  freeTextUserId?: number | null;
+  idBalanceSheet?: number | null;
+  idUserWhoValidate?: number | null;
   validateDate?: Date | null;
   createdAt?: Date | null;
   updatedAt?: Date | null;
 
   // Associations
-  exercice: IExercice;
-  supervisionUsers: IUser;
-  supervisionExpertUsers: IUser;
-  supervisionAccountant: IUser;
-  freeTextUser: IUser;
-  balanceSheet: IBalanceSheet;
-  file: IFile;
-  letter: ILetter;
-  supervisionPendingPoints: ISupervisionPendingPoint[];
-  pendingPoints: IPendingPoint[];
-  userWhoValidate: IUser;
+  exercice?: IExercice;
+  supervisionUsers?: IUser;
+  supervisionExpertUsers?: IUser;
+  supervisionAccountant?: IUser;
+  freeTextUser?: IUser;
+  balanceSheet?: IBalanceSheet;
+  file?: IFile;
+  letter?: ILetter;
+  supervisionPendingPoints?: ISupervisionPendingPoint[];
+  pendingPoints?: IPendingPoint[];
+  userWhoValidate?: IUser;
 }

package/ts/types/index.ts

@@ -569,6 +569,7 @@ export * from './Enum/ReasonCancelSignatureRequest';
 export * from './Enum/ReasonNotSubscribed';
 export * from './Enum/QualificationLead';
 export * from './Enum/Template';
+export * from './Enum/Marketing';
 
 // Interfaces API
 export * from './Interface/api/exercice/ReadExercice';
@@ -1179,3 +1180,4 @@ export * from './Interface/api/IntermediateManagementRebate';
 export * from './Interface/api/regulation/Query';
 export * from './Interface/api/regulation/Read';
 export * from './Interface/api/regulation/Create';
+export * from './Interface/api/marketing/NewLeadSheet';

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

@@ -29,9 +29,9 @@ export class CommercialDocumentCommonHTML {
   </div>`;
 
   company = `<div>
-    <% if (name) { %><p><%= name %><p><% } %>
-    <% if (number || street) {%><p><%}%><% if (number) { %><%= number + ' ' %><% } if (street) { %><%= street %><% } if (number || street) { %><% } %><% if (number || street) {%></p><%}%>
-    <% if (zipCode || city) {%><p><%}%><% if (zipCode) { %><%= zipCode + ' ' %><% } if (city) { %><%= city %><% } if (zipCode || city) { %></p><% } %>
+    <% if (name) { %><p><%= name %></p><% } %>
+    <% if (number || street) { %><p><% } %><% if (number) { %><%= number + ' ' %><% } if (street) { %><%= street %><% } if (number || street) { %></p><% } %>
+    <% if (zipCode || city) { %><p><% } %><% if (zipCode) { %><%= zipCode + ' ' %><% } if (city) { %><%= city %><% } if (zipCode || city) { %></p><% } %>
   </div>
   <% if (phoneContact) { %><p><%= phoneContact %><p><% } %>
   <% if (settings && settings.mailContact) { %><p><%= settings.mailContact %></p><% } %>`;