@silexpert/core 1.1.174 → 1.1.176

package/ts/types/Interface/api/webmail/GetPaginatedWhereObjectParams.ts

@@ -90,4 +90,9 @@ export class GetPaginatedWhereObjectParams {
   @IsOptional()
   @IsInt()
     idRole?: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt({ each: true })
+    idBrandType?: number[];
 }

package/ts/types/Interface/models/IBalanceSheet.ts

@@ -4,24 +4,26 @@ import { ISupervision } from './ISupervision';
 import { IPrestation } from './IPrestation';
 import { IGedFile } from './IGedFile';
 import { IFile } from './IFile';
+import { ICard } from './ICard';
 
 // balanceSheet
 export interface IBalanceSheet {
   id?: number;
   state: number;
-  dateBalanceSend: Date | null;
-  deadline: Date | null;
-  turnover: number | null;
-  netIncome: number | null;
-  total: number | null;
-  idFile: number | null;
-  attestationDetail: string | null;
-  endDate: Date | null;
-  bankCollectingState: number;
-  idExercice: number;
-  idCalendarEvent: number | null;
-  createdAt?: Date | null;
-  updatedAt?: Date | null;
+  dateBalanceSend?: Date;
+  deadline?: Date;
+  turnover?: number;
+  netIncome?: number;
+  total?: number;
+  idFile?: number;
+  attestationDetail?: string;
+  endDate?: Date;
+  bankCollectingState?: number;
+  idExercice?: number;
+  idCalendarEvent?: number;
+  idCard?: number;
+  createdAt?: Date;
+  updatedAt?: Date;
 
   // Associations
   exercice?: IExercice;
@@ -30,4 +32,5 @@ export interface IBalanceSheet {
   prestations?: IPrestation[];
   gedFiles?: IGedFile[];
   file?: IFile;
+  card?: ICard;
 }

package/ts/types/Interface/models/ICalendarEvent.ts

@@ -4,6 +4,7 @@ import { ISociety } from './ISociety';
 import { IExercice } from './IExercice';
 import { IUser } from './IUser';
 import { ITask } from './ITask';
+import { ICard } from './ICard';
 
 // calendarEvents
 export interface ICalendarEvent {
@@ -22,6 +23,7 @@ export interface ICalendarEvent {
   typeComptable: number | null;
   isDone: boolean;
   callState: number | null;
+  idCard: number | null;
   idRecurrence: number | null;
   idTask?: number;
   idPlace: number | null;
@@ -36,4 +38,5 @@ export interface ICalendarEvent {
   exercice: IExercice;
   calendarsEventsHasUsers: IUser[];
   task?: ITask;
+  card?: ICard;
 }

package/ts/types/Interface/models/ICard.ts

@@ -0,0 +1,31 @@
+import { CardType, CardState } from '../../Enum/Card';
+import { IUser } from './IUser';
+import { ISociety } from './ISociety';
+import { IBalanceSheet } from './IBalanceSheet';
+import { ICalendarEvent } from './ICalendarEvent';
+import { ICustomerVat } from './ICustomerVat';
+import { ICardHistory } from './ICardHistory';
+import { IComment } from './IComment';
+
+export interface ICard {
+  id?: number;
+  ref: string;
+  type: CardType;
+  state: CardState;
+  isManual: boolean;
+  plannedAt?: Date;
+  idUser: number;
+  idSociety: number;
+  createdAt?: Date;
+  updatedAt?: Date;
+  deletedAt?: Date;
+
+  // Associations
+  user?: IUser;
+  society?: ISociety;
+  balanceSheet?: IBalanceSheet;
+  customerVat?: ICustomerVat;
+  events?: ICalendarEvent[];
+  history?: ICardHistory[];
+  comment?: IComment;
+}

package/ts/types/Interface/models/ICardHistory.ts

@@ -0,0 +1,19 @@
+import { CardState } from '../../Enum/Card';
+import { IUser } from './IUser';
+import { ICard } from './ICard';
+
+export interface ICardHistory {
+  id?: number;
+  state: CardState;
+  plannedAt: Date;
+  idUserWhoChanged: number;
+  idUserOrigin: number;
+  idCard: number;
+  createdAt?: Date;
+  updatedAt?: Date;
+
+  // Associations
+  userWhoChanged?: Partial<IUser>;
+  userOrigin?: Partial<IUser>;
+  card?: ICard
+}

package/ts/types/Interface/models/IComment.ts

@@ -2,7 +2,7 @@ import { ICommentType } from './ICommentType';
 import { IChannelType } from './IChannelType';
 import { IUser } from './IUser';
 import { ISupervision } from './ISupervision';
-import { ITask } from '../..';
+import { ICard, ITask } from '../..';
 
 // comments
 export interface IComment {
@@ -14,6 +14,7 @@ export interface IComment {
   idReport?: number | null;
   idTask?: number | null;
   idUser?: number | null;
+  idCard?: number | null;
   idChecklist?: number | null;
   isPing?: boolean;
   createdAt?: Date | null;
@@ -26,4 +27,5 @@ export interface IComment {
   user?: IUser;
   supervision?: ISupervision;
   task?: ITask;
+  card?: ICard;
 }

package/ts/types/Interface/models/IPrestationList.ts

@@ -14,6 +14,7 @@ export interface IPrestationList {
   minimumPrice: number | null;
   price: number | null;
   isCatalog: boolean;
+  isPlannable: boolean;
   hidden: boolean;
   isComplementary: boolean;
   signaturePosition: string | null;

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

@@ -136,8 +136,17 @@ export interface ISociety {
   isLate?: boolean | null;
   unpaidDetails?: UnpaidDetail[] | null;
   owner?: IUser | null;
+  /**
+   * @deprecated
+   */
   social?: string | null;
+  /**
+   * @deprecated
+   */
   exercices?: string | null;
+  /**
+   * @deprecated
+   */
   recoveryDate?: string | null;
   createdAt?: Date | null;
   updatedAt?: Date | null;

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

@@ -20,6 +20,7 @@ import { IMailAddress } from './IMailAddress';
 import { IAccountingStatementHistory } from './IAccountingStatementHistory';
 import { ICountry } from './ICountry';
 import { INationality } from './INationality';
+import { IUserBrand } from './IUserBrand';
 
 type isAny<T> = T | any;
 
@@ -127,4 +128,5 @@ export interface IUser {
   country?: ICountry;
   countryLiving?: ICountry;
   nationality?: INationality;
+  usersBrands?: IUserBrand[];
 }

package/ts/types/Interface/models/IUserBrand.ts

@@ -0,0 +1,7 @@
+
+// userBrand
+export interface IUserBrand {
+  id?: number;
+  idUser: number;
+  idBrandType: number;
+}

package/ts/types/index.ts

@@ -252,6 +252,7 @@ export * from './Interface/models/ISubscriptionType';
 export * from './Interface/models/IThirdPartyType';
 export * from './Interface/models/IVehicleType';
 export * from './Interface/models/IUser';
+export * from './Interface/models/IUserBrand';
 export * from './Interface/models/IUserNotification';
 export * from './Interface/models/IUserSocietyPermission';
 export * from './Interface/models/IUserTeam';
@@ -316,7 +317,10 @@ export * from './Interface/models/IBusinessSector';
 export * from './Interface/models/IUserChangeLog';
 export * from './Interface/models/IConstitutionHistory';
 export * from './Interface/models/IBalanceSheetHistory';
+export * from './Interface/models/ICard';
+export * from './Interface/models/ICardHistory';
 export * from './Interface/models/IDubiousCustomer';
+
 // Schemas
 export * from './Interface/schemas/IRegistrationDetail';
 export * from './Interface/schemas/ITransactionHistory';
@@ -502,6 +506,7 @@ export * from './Enum/MissionAcceptation';
 export * from './Enum/Bank';
 export * from './Enum/VatControl';
 export * from './Enum/Cycle';
+export * from './Enum/Card';
 export * from './Enum/TimeTrackingSource';
 
 // Interfaces API
@@ -936,6 +941,7 @@ export * from './Interface/api/file/Create';
 export * from './Interface/api/file/Read';
 export * from './Interface/api/societyConfig/update';
 export * from './Interface/api/wallet/UpdateAttribution';
+export * from './Interface/api/exercicePrestation/Query';
 export * from './Interface/api/prestation/CreatePrestation';
 export * from './Interface/api/prestation/Query';
 export * from './Interface/api/prestation/QueryPrestation';
@@ -983,6 +989,11 @@ export * from './Interface/api/visualizedInformation/Update';
 export * from './Interface/api/society/QueryArchived';
 export * from './Interface/api/vatControl/CreateVatControl';
 export * from './Interface/api/vatControl/QueryVatControl';
+export * from './Interface/api/card/QueryUserCards';
+export * from './Interface/api/card/QueryUserCardsStats';
+export * from './Interface/api/card/UpdateCard';
+export * from './Interface/api/notion/NotionResponse';
+
 // Enums types
 export * from './Interface/enum/Util';
 export * from './Interface/enum/Date';

package/ts/utils/prestation.ts

@@ -193,7 +193,7 @@ const calculatePrestationPriceWithPrestationList = (prestationList: IPrestationL
   return totalPrestation;
 };
 
-const calculatePrestationPrice = (idPrestationList: number, prestationList: IPrestationList, endDate: string, NbrMonth: number, turnover: number, rentsNumber: number, employeesNumber: number, associatesNumber: number, idTypeBrand: number, idVatRegime: number, pastBalanceSheet: boolean, optionsList: number[], totalPercentage: number, totalAmount: number, totalMonth: number, isWithApplicationFees: boolean, idTaxSystem: number, isYearly: boolean = false): { totalPrestation: number, reduceMonth: number, canBeCreated: boolean, calculDetail: string, price: number } => {
+const calculatePrestationPrice = (idPrestationList: number, prestationList: IPrestationList, endDate: string, NbrMonth: number, turnover: number, rentsNumber: number, employeesNumber: number, associatesNumber: number, idTypeBrand: number, idVatRegime: number, pastBalanceSheet: boolean, optionsList: number[], totalPercentage: number, totalAmount: number, totalMonth: number, isWithApplicationFees: boolean, idTaxSystem: number, isYearly: boolean = false): { totalPrestation: number, reduceMonth: number, canBeCreated: boolean, calculDetail: string, monthlyPrice: string, price: number } => {
   let totalPrestation: number = 0;
   let reduceMonth: number = 0;
   let canBeCreated: boolean = true;
@@ -246,9 +246,9 @@ const calculatePrestationPrice = (idPrestationList: number, prestationList: IPre
 
   if (isWithApplicationFees) totalPrestation += 50;
 
-  const calculDetail = `${monthNbr > 0 ? monthNbr + ' mois x ' + price + '€' : price + '€'} ${totalAmount > 0 ? '- ' + totalAmount + '€' : ''} ${totalPercentage > 0 ? '- ' + totalPercentage + '%' : ''} ${isWithApplicationFees ? '+ 50€' : ''}`;
+  const calculDetail = `${monthNbr > 0 ? monthNbr + ' mois x ' + (Math.round(price * 100) / 100) + '€' : (Math.round(price * 100) / 100) + '€'} ${totalAmount > 0 ? '- ' + totalAmount + '€' : ''} ${totalPercentage > 0 ? '- ' + totalPercentage + '%' : ''} ${isWithApplicationFees ? '+ 50€' : ''}`;
 
-  return { totalPrestation, reduceMonth, canBeCreated, calculDetail, price };
+  return { totalPrestation, reduceMonth, canBeCreated, calculDetail, monthlyPrice: monthNbr > 0 ? price + '€/mois' : price + '€', price };
 };
 
 const getPrestationOptions = (idPrestationList: number): PrestationOptionType[] => {

package/ts/utils/quotation.ts

@@ -42,7 +42,7 @@ export function getLeadQuotation(params: getLeadQuotationParams):number {
   if (lastname) quotation += 5;
 
   /* cotation du numéro de téléphone */
-  if (['6', '7'].includes(phone.substr(0, 1))) {
+  if (phone && ['6', '7'].includes(phone.substr(0, 1))) {
     quotation += 15;
   } else {
     quotation += 5;