@silexpert/core 1.1.161 → 1.1.163

package/ts/types/Interface/models/ICommercialOffer.ts

@@ -0,0 +1,18 @@
+import { IExercicePrestationOffer } from './IExercicePrestationOffer';
+
+export interface ICommercialOffer {
+  id?: number,
+  idCommercialOfferType: number,
+  title: string,
+  label: string,
+  amount?: number,
+  startDate: Date,
+  endDate: Date,
+  cumulative: boolean,
+  createdAt?: Date,
+  updatedAt?: Date,
+  deletedAt?: Date
+
+  /* Associations */
+  exercicePrestationOffers?: IExercicePrestationOffer[];
+}

package/ts/types/Interface/models/IExercicePrestation.ts

@@ -1,6 +1,6 @@
 import { IPrestation } from './IPrestation';
 import { IBalanceSheet } from './IBalanceSheet';
-import { IExercice } from '../..';
+import { IExercice, IExercicePrestationOffer } from '../..';
 
 // exercicesPrestations
 export interface IExercicePrestation {
@@ -22,4 +22,5 @@ export interface IExercicePrestation {
   prestation?: IPrestation;
   balanceSheet?: IBalanceSheet;
   exercice?: IExercice;
+  exercicePrestationOffers?: IExercicePrestationOffer[];
 }

package/ts/types/Interface/models/IExercicePrestationOffer.ts

@@ -0,0 +1,13 @@
+import { ICommercialOffer, IExercicePrestation } from '../..';
+
+// exercicesPrestationsOffers
+export interface IExercicePrestationOffer {
+  id?: number;
+  subtractedAmount: number;
+  idExercicePrestation: number;
+  idOffer: number;
+
+  // Associations
+  exercicePrestation?: IExercicePrestation;
+  commercialOffer?: ICommercialOffer;
+}

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

@@ -11,6 +11,7 @@ export interface IPrestationList {
   isAttestation: boolean;
   inAverageCart: boolean;
   isBack: boolean;
+  minimumPrice: number | null;
   price: number | null;
   isCatalog: boolean;
   hidden: boolean;

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

@@ -59,99 +59,99 @@ import { IBusinessSector } from './IBusinessSector';
 // societies
 export interface ISociety {
   id?: number;
-  name: string | null;
-  commercialName: string | null;
-  descriptionActivity: string | null;
-  dateOfRegistration: Date | null;
-  dateInscription: Date | null;
-  dateIsClient: Date | null;
-  partnerSubscriptionECDate: Date | null;
-  dateStatus: Date | null;
-  socialStatut: number | null;
-  juridicalStatut: number | null;
-  mailSocial: Date | null;
-  mailJuridical: Date | null;
-  city: string | null;
-  zipCode: string | null;
-  address: string | null;
-  siret: string | null;
-  diaCode: string | null;
-  socialCapital: string | null;
-  archive: boolean;
-  archiveDate: Date | null;
-  isBlocked: boolean | null;
-  autoAnnotate: boolean;
-  managementSoftware: boolean | null;
-  cashbook: boolean | null;
-  balanceZero: boolean | null;
-  mailRecovery: boolean | null;
-  folderIsFinished: boolean | null;
-  hideInformationsBanner: boolean | null;
-  dateUploadTva: Date | null;
-  vatUploadDay: number | null;
-  lockImposition: boolean | null;
-  lockTva: boolean | null;
-  isWaitingEnd: boolean | null;
-  waitFirstContact: boolean | null;
-  sendFirstContact: boolean | null;
-  toConstitution: number | null;
-  numberFrp: string | null;
-  socialParts: string | null;
-  numberSie: string | null;
-  aga: string | null;
-  statutoryAuditor: string | null;
-  typeSales: string | null;
-  dateRelanceCommercial: Date | null;
-  firstPayslipDate: Date | null;
-  totalSharesHeld: number | null;
-  leadQuotation: number | null;
-  idVatRegime: number | null;
-  idTaxSystem: number | null;
-  idActivity: number | null;
-  profitsType: number | null;
-  idSource: number | null;
-  idFiscalRegime: number | null;
-  idRegion: number | null;
-  idLegalForm: number | null;
-  idComptaType: ComptaType | null;
-  idTypeBrand: number | null;
-  idSubscriptionType: number | null;
-  idCountry: CountryId | null;
-  idSector: Sector | null;
-  idSocietyNotes: number | null;
-  folderNote: string | null;
-  oldNafCode: string | null;
-  dateSendAdvise: Date | null;
-  idUserAdvise: number | null;
-  idVatForInternalInvoicing: number;
-  dateFirstSendUnpaid: Date | null;
-  reasonUnpaid: number | null;
-  stripeSubscriptionId: string | null;
-  stateSynchroBankAccount: number | null;
-  noShowPopUpSynchroDate: Date | null;
-  stateFollowCall: number | null;
-  folderCreation: boolean;
-  hideSimulationBetaMessage: boolean;
-  unpaid: number | null;
-  isLate: boolean | null;
-  unpaidDetails: UnpaidDetail[] | null;
-  owner: IUser | null;
-  social: string | null;
-  exercices: string | null;
-  recoveryDate: string | null;
+  name?: string | null;
+  commercialName?: string | null;
+  descriptionActivity?: string | null;
+  dateOfRegistration?: Date | null;
+  dateInscription?: Date | null;
+  dateIsClient?: Date | null;
+  partnerSubscriptionECDate?: Date | null;
+  dateStatus?: Date | null;
+  socialStatut?: number | null;
+  juridicalStatut?: number | null;
+  mailSocial?: Date | null;
+  mailJuridical?: Date | null;
+  city?: string | null;
+  zipCode?: string | null;
+  address?: string | null;
+  siret?: string | null;
+  diaCode?: string | null;
+  socialCapital?: string | null;
+  archive?: boolean;
+  archiveDate?: Date | null;
+  isBlocked?: boolean | null;
+  autoAnnotate?: boolean;
+  managementSoftware?: boolean | null;
+  cashbook?: boolean | null;
+  balanceZero?: boolean | null;
+  mailRecovery?: boolean | null;
+  folderIsFinished?: boolean | null;
+  hideInformationsBanner?: boolean | null;
+  dateUploadTva?: Date | null;
+  vatUploadDay?: number | null;
+  lockImposition?: boolean | null;
+  lockTva?: boolean | null;
+  isWaitingEnd?: boolean | null;
+  waitFirstContact?: boolean | null;
+  sendFirstContact?: boolean | null;
+  toConstitution?: number | null;
+  numberFrp?: string | null;
+  socialParts?: string | null;
+  numberSie?: string | null;
+  aga?: string | null;
+  statutoryAuditor?: string | null;
+  typeSales?: string | null;
+  dateRelanceCommercial?: Date | null;
+  firstPayslipDate?: Date | null;
+  totalSharesHeld?: number | null;
+  leadQuotation?: number | null;
+  idVatRegime?: number | null;
+  idTaxSystem?: number | null;
+  idActivity?: number | null;
+  profitsType?: number | null;
+  idSource?: number | null;
+  idFiscalRegime?: number | null;
+  idRegion?: number | null;
+  idLegalForm?: number | null;
+  idComptaType?: ComptaType | null;
+  idTypeBrand?: number | null;
+  idSubscriptionType?: number | null;
+  idCountry?: CountryId | null;
+  idSector?: Sector | null;
+  idSocietyNotes?: number | null;
+  folderNote?: string | null;
+  oldNafCode?: string | null;
+  dateSendAdvise?: Date | null;
+  idUserAdvise?: number | null;
+  idVatForInternalInvoicing?: number;
+  dateFirstSendUnpaid?: Date | null;
+  reasonUnpaid?: number | null;
+  stripeSubscriptionId?: string | null;
+  stateSynchroBankAccount?: number | null;
+  noShowPopUpSynchroDate?: Date | null;
+  stateFollowCall?: number | null;
+  folderCreation?: boolean;
+  hideSimulationBetaMessage?: boolean;
+  unpaid?: number | null;
+  isLate?: boolean | null;
+  unpaidDetails?: UnpaidDetail[] | null;
+  owner?: IUser | null;
+  social?: string | null;
+  exercices?: string | null;
+  recoveryDate?: string | null;
   createdAt?: Date | null;
   updatedAt?: Date | null;
   startAt?: Date | null;
-  idSoftware: number | null;
-  canceledFirstStepAt: Date | null;
-  completedFirstStepAt: Date | null;
-  lastMobileConnection: Date | null;
-  idNafCode: number | null;
-  canceledFirstStepTourAt: Date | null;
-  step: string | null;
-  hidePartneredAccountantsBubbleLink: boolean | null;
-  cancelCompleteCreationModal: Date | null;
-  isCreatedInApp: boolean;
+  idSoftware?: number | null;
+  canceledFirstStepAt?: Date | null;
+  completedFirstStepAt?: Date | null;
+  lastMobileConnection?: Date | null;
+  idNafCode?: number | null;
+  canceledFirstStepTourAt?: Date | null;
+  step?: string | null;
+  hidePartneredAccountantsBubbleLink?: boolean | null;
+  cancelCompleteCreationModal?: Date | null;
+  isCreatedInApp?: boolean;
 
   // Associations
   accounts?: IAccount[];
@@ -209,16 +209,16 @@ export interface ISociety {
   usersPermissions?: IUserSocietyPermission[];
   regulates?: IRegulate[];
   brandType?: IBrandType;
-  partneredAccountantCompaniesServices: IPartneredAccountantCompanyService[];
-  partneredAccountantRelated: IPartneredAccountantToSociety;
-  events: ISocietyEvent[];
-  mails: IMail[];
-  transactions: IAccountingTransaction[];
-  businessPartners: IBusinessPartner[];
-  fecFile: IFecFile | null;
-  gedFiles: IGedFile[];
-  files: IFile[];
-  unpaidCallHistory: IUnpaidCallHistory[];
+  partneredAccountantCompaniesServices?: IPartneredAccountantCompanyService[];
+  partneredAccountantRelated?: IPartneredAccountantToSociety;
+  events?: ISocietyEvent[];
+  mails?: IMail[];
+  transactions?: IAccountingTransaction[];
+  businessPartners?: IBusinessPartner[];
+  fecFile?: IFecFile | null;
+  gedFiles?: IGedFile[];
+  files?: IFile[];
+  unpaidCallHistory?: IUnpaidCallHistory[];
   accountingFiles?: IAccountingFile[];
-  businessSectors: IBusinessSector[];
+  businessSectors?: IBusinessSector[];
 }

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

@@ -5,7 +5,6 @@ import { IFile } from './IFile';
 import { IUserSocietyPermission } from './IUserSocietyPermission';
 import { IWorkingSchedule } from './IWorkingSchedule';
 import { IRecontactHistory } from './IRecontactHistory';
-import { IQuality } from './IQuality';
 import { IAllowedIp } from './IAllowedIp';
 import { IBusinessPartner } from './IBusinessPartner';
 import { ILog } from './ILog';
@@ -19,6 +18,8 @@ import { ITimeRecorder } from './ITimeRecorder';
 import { EntityType } from '../../Enum/EntityType';
 import { IMailAddress } from './IMailAddress';
 import { IAccountingStatementHistory } from './IAccountingStatementHistory';
+import { ICountry } from './ICountry';
+import { INationality } from './INationality';
 
 type isAny<T> = T | any;
 
@@ -38,8 +39,7 @@ export interface IUser {
   hash?: string | null;
   password?: string | null;
   idFile?: number | null;
-  quality?: string | null;
-  idQuality?: number | null;
+  quality?: string | null;  //FIXME: à supprimer ?
   phone?: string | null;
   phone2?: string | null;
   textMessageNumber?: string | null;
@@ -63,7 +63,6 @@ export interface IUser {
   validityDateOfResidencePermit?: Date | null;
   isNewProspect?: boolean;
   hasAccountNumberDisplay?: boolean;
-  isAssociate?: boolean | null;
   isResponderActive?: boolean;
   suppDoublon?: boolean | null;
   calendlyUrl?: string | null;
@@ -86,7 +85,21 @@ export interface IUser {
   tokenConfirmedAt?: string | null;
   idPoleLeader?: number | null;
   affiliateTrackingId?: number | null;
-
+  streetNumber?: string | null;
+  address?: string;
+  zipCodeBirth?: string;
+  birthPlace?: string;
+  departmentBirth?: string;
+  idCountryBirth?: number;
+  birthname?: string;
+  cityOfBirth?: string;
+  idCountry?: number;
+  zipCode?: string | null;
+  city?: string | null;
+  idNationality?: number;
+  maritalStatus?: string;
+  idMaritalStatus?: number;
+  
   // Associations
   userHasEvent?: isAny<ICalendarEvent>[];
   roles?: IRole[];
@@ -99,9 +112,8 @@ export interface IUser {
   workingSchedules?: IWorkingSchedule[];
   recontactHistories?: IRecontactHistory[];
   poleLeader?: IUser;
-  userQuality?: IQuality;
   allowedIps?: IAllowedIp[];
-  businessPartner?: IBusinessPartner;
+  businessPartners?: IBusinessPartner[];
   poleAccountants?: IUser[];
   logs?: ILog[];
   notifications?: INotification[];
@@ -112,4 +124,7 @@ export interface IUser {
   timeRecorders?: ITimeRecorder[];
   mailAddresses?: IMailAddress[];
   accountingStatementHistory?: IAccountingStatementHistory[];
+  country?: ICountry;
+  countryLiving?: ICountry;
+  nationality?: INationality;
 }

package/ts/types/index.ts

@@ -69,6 +69,7 @@ export * from './Interface/models/IExerciceDetail';
 export * from './Interface/models/IExerciceComment';
 export * from './Interface/models/IExercice';
 export * from './Interface/models/IExercicePrestation';
+export * from './Interface/models/IExercicePrestationOffer';
 export * from './Interface/models/IFailedLoginAttempt';
 export * from './Interface/models/IFileType';
 export * from './Interface/models/IFile';
@@ -305,6 +306,7 @@ export * from './Interface/models/ITimeRecorder';
 export * from './Interface/models/IInvoiceRecurrence';
 export * from './Interface/models/ILoanFile';
 export * from './Interface/models/ICommercialMail';
+export * from './Interface/models/ICommercialOffer';
 export * from './Interface/models/IRegistration';
 export * from './Interface/models/IVatRegimeHistory';
 export * from './Interface/models/ICustomerAcceptance';
@@ -330,6 +332,7 @@ export * from './Enum/NafCode';
 export * from './Enum/Acceptance';
 export * from './Enum/FolderFile';
 export * from './Enum/CommercialGrade';
+export * from './Enum/CommercialOfferType';
 export * from './Enum/CommercialManagement';
 export * from './Enum/Civility';
 export * from './Enum/Registration';
@@ -343,6 +346,7 @@ export * from './Enum/Quality';
 export * from './Enum/AbsenceType';
 export * from './Enum/Role';
 export * from './Enum/RoleDetail';
+export * from './Enum/MaritalStatus';
 export * from './Enum/StatutsSection';
 export * from './Enum/PrestationOption';
 export * from './Enum/TimeCounterType';
@@ -408,6 +412,9 @@ export * from './Enum/Util';
 export * from './Enum/RegisterCategory';
 export * from './Enum/FieldSocietyStat';
 export * from './Enum/PrestationType';
+export * from './Enum/PriceGridClementine';
+export * from './Enum/PriceGridPourcentage';
+export * from './Enum/PriceGridLegalstart';
 export * from './Enum/StatsCaStateDetail';
 export * from './Enum/Lab';
 export * from './Enum/ConstitutionState';
@@ -490,6 +497,7 @@ export * from './Enum/ThirdParty';
 export * from './Enum/PaymentExpectation';
 export * from './Enum/FollowList';
 export * from './Enum/ClientOrProspect';
+export * from './Enum/ClosingType';
 export * from './Enum/MissionAcceptation';
 export * from './Enum/Bank';
 export * from './Enum/VatControl';
@@ -507,6 +515,9 @@ export * from './Interface/api/jeDeclare/ReadJeDeclare';
 export * from './Interface/api/aspone/ReadInterchange';
 export * from './Interface/api/aspone/Util';
 export * from './Interface/api/businessPartner/ReadBusinessPartner';
+export * from './Interface/api/businessPartner/QueryBusinessPartnerAll';
+export * from './Interface/api/businessPartner/CreateBusinessPartnerParams';
+export * from './Interface/api/businessPartner/UpdateBusinessPartnerParams';
 export * from './Interface/api/simulation/CreateSimulation';
 export * from './Interface/api/ocr/CreateOcr';
 export * from './Interface/api/accountingEntry/AnnotateAccountingTransaction';
@@ -536,6 +547,7 @@ export * from './Interface/api/accountingTransaction/QueryBankAccountSum';
 export * from './Interface/api/user/QueryConfirm';
 export * from './Interface/api/user/QuerySocieties';
 export * from './Interface/api/user/QueryGetAllFromSociety';
+export * from './Interface/api/user/QueryGetAllWithoutBp';
 export * from './Interface/api/user/QueryGetAllCollaborators';
 export * from './Interface/api/user/QueryGetAllCollaboratorsByRoles';
 export * from './Interface/api/user/QueryResendConfirmationLink';
@@ -628,6 +640,7 @@ export * from './Interface/api/exercice/QueryExercice';
 export * from './Interface/api/exercice/CreateExercice';
 export * from './Interface/api/exercice/UpdateExercice';
 export * from './Interface/api/statutsGeneration/UpdateExerciceParams';
+export * from './Interface/api/statutsGeneration/TemplateParams';
 export * from './Interface/api/statutsGeneration/IntentToPayPrestationParams';
 export * from './Interface/api/statutsGeneration/SendInviteMailParams';
 export * from './Interface/api/statutsGeneration/CreateBusinessPartnersAndUsersParams';
@@ -904,6 +917,7 @@ export * from './Interface/api/commercialManagement/Create';
 export * from './Interface/api/commercialManagement/Read';
 export * from './Interface/api/commercialManagement/Query';
 export * from './Interface/api/commercialManagement/Update';
+export * from './Interface/api/commercialOffer/Query';
 export * from './Interface/api/documentSection/Update';
 export * from './Interface/api/connector/CreateConnector';
 export * from './Interface/api/connector/QueryConnector';
@@ -922,6 +936,7 @@ export * from './Interface/api/file/Read';
 export * from './Interface/api/societyConfig/update';
 export * from './Interface/api/wallet/UpdateAttribution';
 export * from './Interface/api/prestation/CreatePrestation';
+export * from './Interface/api/prestation/Query';
 export * from './Interface/api/prestation/QueryPrestation';
 export * from './Interface/api/prestation/BodyCreatePrestationSocieties';
 export * from './Interface/api/prestation/QueryGetPaginatedSocietiesFromPrestation';

package/ts/utils/commercialOffer.ts

@@ -0,0 +1,37 @@
+import { ICommercialOffer } from '../types';
+import { CommercialOfferTypeType, CommercialOfferTypeDetail } from '../types/Enum/CommercialOfferType';
+import { PrestationDetail } from '../types/Enum/PrestationType';
+import * as dayjs from 'dayjs';
+import * as isBetween from 'dayjs/plugin/isBetween';
+
+dayjs.extend(isBetween);
+
+const displayCommercialOffer = (idPrestationList: number, idCommercialOfferType: number): boolean => {
+  const prestationList = Object.values(PrestationDetail).find(prestation => prestation.id === idPrestationList);
+  const commercialOfferType: CommercialOfferTypeType | undefined = Object.values(CommercialOfferTypeDetail).find(offer => offer.id === idCommercialOfferType);
+  if (commercialOfferType?.idPrestationList.length && commercialOfferType?.idPrestationList.includes(idPrestationList)) return true;
+  else if (prestationList && 
+    !commercialOfferType?.idPrestationList.length &&
+    (
+      (!commercialOfferType?.isComptable || commercialOfferType?.isComptable === prestationList?.isComptable)
+      && (!commercialOfferType?.isCatalog || commercialOfferType?.isCatalog === prestationList.isCatalog)
+      && (!commercialOfferType?.isBack || commercialOfferType?.isBack === prestationList.isBack)
+    )
+  ) return true;
+  else return false;
+};
+
+const disableCommercialOffer = (idCurrentOffer: number, idOfferSelected: number[], commercialOfferList: ICommercialOffer[] ): boolean=> {
+  if (idOfferSelected.length && commercialOfferList.find(offer => offer.id === idCurrentOffer)?.cumulative === false) return true;
+  else if (commercialOfferList.find(offer => offer.id === idOfferSelected[0])?.cumulative === false) return true;
+  else return false;
+};
+
+const getCommercialOfferList = (idCommercialOfferType: number, offerList: ICommercialOffer[]): ICommercialOffer[] => {
+  const commercialOfferList: ICommercialOffer[] = offerList.filter((offer) => offer.idCommercialOfferType === idCommercialOfferType);
+  return commercialOfferList.filter(offer => dayjs().isBetween(dayjs(offer.startDate), dayjs(offer.endDate), 'day', '[]'));
+};
+
+export {
+  displayCommercialOffer, disableCommercialOffer, getCommercialOfferList,
+};

package/ts/utils/documents.ts

@@ -10,6 +10,8 @@ const requiredListDocs = (params: RequiredDocsType): GedFileType[] => {
   const { dontHaveOldExpert, recoveryDate } = oldExpertInfo || {};
   const { idLegalForm, dateOfRegistration } = society || {};
 
+  if (!idLegalForm) throw new Error('Missing idLegalForm');
+
   if (isOnlyPrevi) {
     return [GedFileType.IDENTITY_CARD, GedFileType.PLAQUETTE];
   }

package/ts/utils/index.ts

@@ -18,3 +18,4 @@ export * from './isHtml';
 export * from './isUrl';
 export { getCerfa3517DDRRegistrationField } from './vat/3517/century23';
 export * from './bankAccount';
+export * from './commercialOffer';