@silexpert/core 1.3.3 → 1.3.4

package/ts/types/Interface/models/IInvoiceReminder.ts

@@ -3,6 +3,9 @@ import { IEstimateInvoice } from './IEstimateInvoice';
 import { IInvoiceReminderAttachment } from './IInvoiceReminderAttachment';
 
 // societyRelance
+/**
+ * @deprecated use IReminder
+ */
 export interface IInvoiceReminder {
   id?: number;
   beforeThree: boolean | null;

package/ts/types/Interface/models/IReminder.ts

@@ -0,0 +1,20 @@
+import { IReminderAttachment } from './IReminderAttachment';
+import { IScheduledReminder } from './IScheduledReminder';
+import { ISociety } from './ISociety';
+
+export interface IReminder {
+  id?: number;
+  email: string | null;
+  subject: string | null;
+  content: string | null;
+  idSaleEmail: number | null;
+  idEstimateInvoice: number | null;
+  idSociety: number;
+
+  attachments?: IReminderAttachment[];
+  schedules?: IScheduledReminder[];
+  society?: ISociety;
+
+  createdAt?: Date;
+  updatedAt?: Date;
+}

package/ts/types/Interface/models/IReminderAttachment.ts

@@ -0,0 +1,14 @@
+import { IFile } from './IFile';
+import { IReminder } from './IReminder';
+
+export interface IReminderAttachment {
+  id?: number;
+  idFile: number;
+  idReminder: number;
+
+  file?: IFile;
+  reminder?: IReminder;
+
+  createdAt?: Date;
+  updatedAt?: Date;
+}

package/ts/types/Interface/models/IRule.ts

@@ -3,6 +3,7 @@ import { IAccount } from './IAccount';
 import { IThirdParty } from './IThirdParty';
 import { IUser } from './IUser';
 import { INature } from './INature';
+import { VatLocationType } from '../../Enum/Vat';
 
 // rules
 export interface IRule {
@@ -15,6 +16,7 @@ export interface IRule {
   idSociety: number | null;
   idAccount: number | null;
   idTva: number | null;
+  vatType: VatLocationType | null;
   idThirdParty: number | null;
   createdBy: number | null;
   idNature: number | null;

package/ts/types/Interface/models/IScheduledReminder.ts

@@ -0,0 +1,7 @@
+export interface IScheduledReminder {
+  id?: number;
+  day: number;
+  idReminder: number;
+  createdAt?: Date;
+  updatedAt?: Date;
+}

package/ts/types/Interface/models/ISocietyGescom.ts

@@ -1,6 +1,6 @@
 import { AccountingCategoryId, FontIds, LogoAlignment } from '../../Enum/CommercialManagement';
 import { IFile } from './IFile';
-import { ISaleEmail } from './ISaleEmail';
+import { IReminder } from './IReminder';
 
 // societyGescom
 export interface ISocietyGescom {
@@ -65,12 +65,12 @@ export interface ISocietyGescom {
   externalBorderColor?: string | null;
   reminderCustomizedDayDiff?: number | null;
   idRibFile?: number | null;
+  idReminder?: number | null;
   idSignatureFile?: number | null;
   idGeneralConditionOfSale?: number | null;
-  idReminderSaleEmail?: number | null;
   ribFile?: IFile;
   signatureFile?: IFile;
-  defaultReminderSaleEmail?: ISaleEmail;
+  reminder?: IReminder | null;
   createdAt?: Date | null;
   updatedAt?: Date | null;
 }

package/ts/types/Interface/models/IStateBankAccount.ts

@@ -0,0 +1,18 @@
+import { IBankAccount } from './IBankAccount';
+import { IExercice } from './IExercice';
+
+// stateBankAccount
+export interface IStateBankAccount {
+  id?: number;
+  balanceState?: boolean | null;
+  balanceValue?: number | null;
+  balanceDate?: Date | null;
+  idBankAccount: number;
+  idExercice: number;
+  createdAt?: Date | null;
+  updatedAt?: Date | null;
+
+  // Associations
+  bankAccount?: IBankAccount;
+  exercice?: IExercice;
+}

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

@@ -75,6 +75,7 @@ export interface IUser {
   idCommercialDoublon?: number | null;
   idProspectIsWith?: number | null;
   apprentice?: boolean;
+  flexitime?: boolean;
   /**
    * @deprecated
    */
@@ -96,6 +97,7 @@ export interface IUser {
   streetNumber?: string | null;
   address?: string;
   zipCodeBirth?: string;
+  //@deprecated Use cityOfBirth instead
   birthPlace?: string;
   departmentBirth?: string;
   idCountryBirth?: number;

package/ts/types/index.ts

@@ -343,6 +343,10 @@ export * from './Interface/models/ISaleEmail';
 export * from './Interface/models/IGeneralConditionOfSale';
 export * from './Interface/models/ISaleDocumentTemplate';
 export * from './Interface/models/IInvoiceReminderAttachment';
+export * from './Interface/models/IReminder';
+export * from './Interface/models/IScheduledReminder';
+export * from './Interface/models/IReminderAttachment';
+export * from './Interface/models/IStateBankAccount';
 
 // Schemas
 export * from './Interface/schemas/IRegistrationDetail';
@@ -371,7 +375,6 @@ export * from './Enum/Aspone';
 export * from './Enum/ProfitsType';
 export * from './Enum/Tax';
 export * from './Enum/RegistrationSource';
-export * from './Enum/RegistrationSourceDetail';
 export * from './Enum/Log';
 export * from './Enum/Quality';
 export * from './Enum/AbsenceType';
@@ -570,6 +573,9 @@ export * from './Enum/ReasonNotSubscribed';
 export * from './Enum/QualificationLead';
 export * from './Enum/Template';
 export * from './Enum/Marketing';
+export * from './Enum/EnglishLevel';
+export * from './Enum/OCRPrompt';
+export * from './Enum/SocietyTypeExportCsv';
 
 // Interfaces API
 export * from './Interface/api/exercice/ReadExercice';
@@ -656,6 +662,7 @@ export * from './Interface/api/society/SocietyWithStatsCaParams';
 export * from './Interface/api/society/QuerySociety';
 export * from './Interface/api/society/QueryPaginatedSociety';
 export * from './Interface/api/commercial/QueryPaginatedNewProspect';
+export * from './Interface/api/commercial/QueryPaginatedFollowProspect';
 export * from './Interface/api/commercial/QueryPaginatedSocietyWithStatsCa';
 export * from './Interface/api/facturation/Query';
 export * from './Interface/api/facturation/QueryPaginatedSocietyWithFacturation';
@@ -670,6 +677,7 @@ export * from './Interface/api/commercial/QueryGetStatsHistory';
 export * from './Interface/api/commercial/RequiredDocsTypeParams';
 export * from './Interface/api/commercial/QueryFetchDialogDatasInfosOk';
 export * from './Interface/api/commercial/QueryMovePrestationsToNextMonth';
+export * from './Interface/api/commercial/ReadStatsProspect';
 export * from './Interface/api/society/GetDataSociety';
 export * from './Interface/api/society/CreateSociety';
 export * from './Interface/api/society/GetSocietyDetail';
@@ -679,6 +687,7 @@ export * from './Interface/api/society/CreateUserToSocietyWithPermission';
 export * from './Interface/api/society/UpdateUserToSocietyWithPermission';
 export * from './Interface/api/society/ReadSocietyUsers';
 export * from './Interface/api/society/ReadSocietyUnpaidStats';
+export * from './Interface/api/society/DataCustomersCsv';
 export * from './Interface/api/BasePaginate';
 export * from './Interface/api/BaseRequest';
 export * from './Interface/api/generalLedger/IGeneralLedgerAccount';
@@ -838,12 +847,14 @@ export * from './Interface/api/statistic/QueryInternal';
 export * from './Interface/api/statistic/QueryGetDirection';
 export * from './Interface/api/statistic/QueryCustomerSuccess';
 export * from './Interface/api/statistic/QueryDataOfficer';
+export * from './Interface/api/statistic/QueryMarketing';
 export * from './Interface/api/pappers/CreatePappers';
 export * from './Interface/api/bankAccount/Query';
 export * from './Interface/api/bankAccount/Update';
 export * from './Interface/api/stripe/QueryStripe';
 export * from './Interface/api/stripe/ReadStripe';
 export * from './Interface/api/supervision/Query';
+export * from './Interface/api/supervision/Read';
 export * from './Interface/api/salariesFile/ReadSalariesFile';
 export * from './Interface/api/salariesFile/CreateSalariesFile';
 export * from './Interface/api/shine/CreateShine';
@@ -891,6 +902,7 @@ 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/collaboraterDetail/CreateCollaboraterDetail';
 
 export * from './Interface/api/library/QueryLibrary';
 export * from './Interface/api/library/ReadLibraryFile';
@@ -990,6 +1002,7 @@ export * from './Interface/api/mobile/UpdateMobile';
 export * from './Interface/api/mobile/QueryMobileMigration';
 export * from './Interface/api/societyEvent/QuerySocietyEvent';
 export * from './Interface/api/societyEvent/CreateSocietyEvent';
+export * from './Interface/api/societyFollow/Query';
 export * from './Interface/api/synchronisation/Query';
 export * from './Interface/api/synchronisation/Read';
 export * from './Interface/api/task/QueryGetAllTask';
@@ -1036,6 +1049,7 @@ export * from './Interface/api/qonto/GetConnectionInformation';
 export * from './Interface/api/qonto/Read';
 export * from './Interface/api/file/Create';
 export * from './Interface/api/file/Read';
+export * from './Interface/api/file/Query';
 export * from './Interface/api/societyConfig/update';
 export * from './Interface/api/wallet/UpdateAttribution';
 export * from './Interface/api/exercicePrestation/Query';
@@ -1119,6 +1133,7 @@ export * from './Interface/api/echo/NewsPaper';
 export * from './Interface/api/echo/Order';
 export * from './Interface/api/userTimeSlot/QueryUserTimeSlot';
 export * from './Interface/api/workingSchedule/QueryAvailableTimeSlot';
+export * from './Interface/api/workingSchedule/Query';
 export * from './Interface/api/payment/Query';
 export * from './Interface/api/regulation/Query';
 export * from './Interface/api/terminationList/Read';
@@ -1146,6 +1161,13 @@ export * from './Interface/api/toDoExpress/Query';
 export * from './Interface/api/toDoExpress/Read';
 export * from './Interface/api/config/ConfigType';
 export * from './Interface/api/card/OrganizeBalanceSheets';
+export * from './Interface/api/user/RegisterProspect';
+export * from './Interface/api/stateBankAccount/Query';
+export * from './Interface/api/absenceRequest/QueryAbsenceRequest';
+export * from './Interface/api/absenceRequest/QueryCalendarAbsenceRequest';
+export * from './Interface/api/absenceRequest/UpdateAbsenceRequest';
+export * from './Interface/api/absenceRequest/CreateAbsenceRequest';
+export * from './Interface/api/absenceRequest/ReadAbsenceRequest';
 
 // Enums types
 export * from './Interface/enum/Util';

package/ts/utils/checkup.ts

@@ -706,44 +706,6 @@ export const getCheckupDetailForm = (
             hideDetails: true,
           },
         },
-        //FIXME: on garde ?  On supprime ?
-        // {
-        //   name: "Myclementine",
-        //   display: isItThisEnv("Clementine", process.env.NODE_ENV),
-        //   questions: [
-        //     {
-        //       component: "FormInputSelect",
-        //       text: "Nous allons synchroniser votre banque à présent :",
-        //       meta: {
-        //         items: bankSynchronisationItems,
-        //         classes: "rounded noBorder",
-        //         flat: true
-        //       },
-        //       value: "bankSynchronisationState",
-        //       type: "number"
-        //     },
-        //     {
-        //       component: "FormInputSelect",
-        //       text: "Avez-vous besoin d'une explication de la plateforme :",
-        //       meta: {
-        //         items: SelectYesNoStatementBool,
-        //         classes: "rounded noBorder",
-        //         flat: true
-        //       },
-        //       value: "platformExplanation",
-        //       type: "number"
-        //     },
-        //     {
-        //       component: "FormInputSelect",
-        //       text: "Avez-vous proposé à votre client d’installer l'application mobile :",
-        //       meta: {
-        //         items: SelectYesNoStatementBool,
-        //         classes: "rounded noBorder",
-        //         flat: true
-        //       },
-        //       value: "mobileAppInstallationProposal",
-        //       type: "number"
-        //     }
       ],
     },
     {

package/ts/utils/commercialManagement/document.ts

@@ -71,6 +71,8 @@ export function generateCommercialDocument(
   const locale = payload.language ?? InvoiceLanguage.FR;
   const languageOption = internationalizationChoices[locale];
 
+  const accountingCategory = AccountingCategoryList.find((a) => a.id === payload.accountingCategory)?.label ?? null;
+
   const data: ReadDocumentEditing & { brandColors: brandColorType; brandName: string; shouldHideBrandName: boolean } = {
     ...payload,
     thirdParty,
@@ -78,15 +80,17 @@ export function generateCommercialDocument(
     idEstimateInvoiceType,
     title: payload.title ?? null,
     penalties: payload.penalties
-      ? (internationalizationConsistency(locale, payload.penalties, 'penalties') ?? null)
+      ? (internationalizationConsistency(locale, payload.penalties, 'penalties') ?? payload.penalties)
       : null,
     termsOfPayment: payload.termsOfPayment
-      ? (internationalizationConsistency(locale, payload.termsOfPayment, 'termsOfPayment') ?? null)
+      ? (internationalizationConsistency(locale, payload.termsOfPayment, 'termsOfPayment') ?? payload.termsOfPayment)
       : null,
     compensation: payload.compensation
-      ? (internationalizationConsistency(locale, payload.compensation, 'recoveryCost') ?? null)
+      ? (internationalizationConsistency(locale, payload.compensation, 'recoveryCost') ?? payload.compensation)
+      : null,
+    discount: payload.discount
+      ? (internationalizationConsistency(locale, payload.discount, 'discount') ?? payload.discount)
       : null,
-    discount: payload.discount ? (internationalizationConsistency(locale, payload.discount, 'discount') ?? null) : null,
     vatMention: payload.vatMention
       ? (internationalizationConsistency(locale, payload.vatMention, 'vatMention') ?? null)
       : null,
@@ -123,7 +127,9 @@ export function generateCommercialDocument(
     shouldDisplayDiscountColumn: !!products.find((p) => p.discount2 && p.discount2 > 0),
     // @ts-ignore
     marginVats: _uniq(products.filter((p) => p.marginVatFormatted !== null).map((p) => p.marginVatFormatted)),
-    accountingCategoryFormatted: AccountingCategoryList.find((a) => a.id === payload.accountingCategory)?.label ?? null,
+    accountingCategoryFormatted: accountingCategory
+      ? (internationalizationConsistency(locale, accountingCategory, 'accountingCategory') ?? null)
+      : null,
     // @ts-ignore
     brandColors: getBrandConfig({ objectWaited: 'colors', nodeEnv }) as brandColorType,
     brandName: `${getBrandConfig({ objectWaited: 'name', nodeEnv }) as unknown as string}`,
@@ -147,6 +153,8 @@ export function generateCommercialDocument(
       products: data.products.map((p) => ({
         ...p,
         comment: p.comment && typeof p.comment === 'string' ? p.comment?.replace(/\n/g, '<br/>') : null,
+        // @ts-expect-error
+        unitFormatted: internationalizationConsistency(locale, p.unitFormatted, 'unit'),
       })),
       vats: forcedVats ?? vats,
     }),

package/ts/utils/commercialManagement/internationalization/choices.ts

@@ -7,7 +7,9 @@ type InternationalizationConsistencyKey =
   | 'vatMention'
   | 'recoveryCost'
   | 'paymentType'
-  | 'termsOfPayment';
+  | 'termsOfPayment'
+  | 'accountingCategory'
+  | 'unit';
 
 export const internationalizationChoices: InternationalizationChoicesType = {
   fr: {
@@ -249,7 +251,7 @@ export const internationalizationChoices: InternationalizationChoicesType = {
           accountingCategory: {
             title: 'Transaction type',
             choices: [
-              { id: AccountingCategoryId.DELIVERY_OF_GOOD, label: 'supply of goods' },
+              { id: AccountingCategoryId.DELIVERY_OF_GOOD, label: 'Supply of goods' },
               { id: AccountingCategoryId.SERVICE_DELIVERY, label: 'Services provision' },
               { id: AccountingCategoryId.GOOD_AND_SERVICE, label: 'Services provision and supply of goods' },
             ],
@@ -493,6 +495,42 @@ const internationalizationMatching: { [key: string]: { fr: string; en: string }[
       en: '60 days upon receipt of invoice',
     },
   ],
+  accountingCategory: [
+    {
+      fr: 'Livraison de biens',
+      en: 'Supply of goods',
+    },
+    {
+      fr: 'Prestation de services',
+      en: 'Services provision',
+    },
+    {
+      fr: 'Prestation de services et livraison de biens',
+      en: 'Services provision and supply of goods',
+    },
+  ],
+  unit: [
+    { fr: 'art', en: 'art' },
+    { fr: 'h', en: 'h' },
+    { fr: 'j', en: 'd' },
+    { fr: 'Kg', en: 'kg' },
+    { fr: 'l', en: 'l' },
+    { fr: 'km', en: 'km' },
+    { fr: 'demi j', en: 'half d' },
+    { fr: 'an', en: 'year' },
+    { fr: 'sem', en: 'week' },
+    { fr: 'mois', en: 'month' },
+    { fr: 'trim', en: 'quart' },
+    { fr: 'p', en: 'p' },
+    { fr: 'f', en: 'f' },
+    { fr: 'm2', en: 'm2' },
+    { fr: 'm3', en: 'm3' },
+    { fr: 'Mètre', en: 'meter' },
+    { fr: 'abo', en: 'sub' },
+    { fr: 'nuit', en: 'night' },
+    { fr: 't', en: 't' },
+    { fr: 'ha', en: 'ha' },
+  ],
 };
 
 export const internationalizationConsistency = (

package/ts/utils/commercialManagement/saleEmail.ts

@@ -47,6 +47,8 @@ export function transformModelWithCharcodeToString(datas: InfoToUseType, templat
     } else {
       newString = splitString.replace(`[${char.name}]`, `${dataToInfer}`) + endOfString;
     }
+    // then we remove the color of variable (tag) from the front
+    newString = newString.replace('style="color: rgb(131, 131, 132);"', '');
   });
   return newString;
 }

package/ts/utils/commercialManagement/templates/body.ts

@@ -115,7 +115,7 @@ export const bodyTemplate = `<html class="pdf-content">
       <br/><%= languageTemplate.template.common.options.approval %> : <br/><br/><br/><br/>
     <% } %>
 
-    <% if (cgv && ((settings && settings.invoiceCgv) || idEstimateInvoiceType === ${EstimateInvoiceType.DEVIS} || idEstimateInvoiceType === ${EstimateInvoiceType.BON})) { %>
+    <% if (cgv && (settings && settings.invoiceCgv) && (idEstimateInvoiceType === ${EstimateInvoiceType.FACTURE} || idEstimateInvoiceType === ${EstimateInvoiceType.ACOMPTE} || idEstimateInvoiceType === ${EstimateInvoiceType.AVOIR} || idEstimateInvoiceType === ${EstimateInvoiceType.RESTE} )) { %>
       <br><div style="page-break-after:always;"></div>
       <div id="WYSIWYG"><%- cgv %></div>
     <% } %>

package/ts/utils/email.ts

@@ -15,7 +15,6 @@ function getRoleSignature(user: any) {
   // eslint-disable-next-line @typescript-eslint/no-unsafe-return
   if (user.positionLabel) return user.positionLabel;
 
-
   const isStagiaireOrAlternant =
     // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     user.roles.map((r: any) => r.id).includes(Role.INTERN) || user.roles.map((r: any) => r.id).includes(Role.ALTERNATE);
@@ -213,8 +212,7 @@ function getMailSignature(user: any, idTypeBrand: number) {
 }
 
 function getPhoneSignature(user: any) {
-
-  if (user.phone !== '0383931414') {
+  if (user.phone && user.phone !== '0383931414') {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return user.phone.replace(/\B(?=(\d{2})+(?!\d))/g, ' ');
   }
@@ -222,8 +220,8 @@ function getPhoneSignature(user: any) {
 }
 
 export function generateSignature(params: any): string {
-  const { forceRole = null, idTypeBrand = 1, society, ...otherParams } = params;
-  let { user } = otherParams;
+  const { fromAddress = null, idTypeBrand = 1, society, ...otherParams } = params;
+  let { user, forceRole = null } = otherParams;
 
   const hostS3 = getBrandConfig({
     idTypeBrand,
@@ -303,6 +301,20 @@ export function generateSignature(params: any): string {
     objectWaited: 'listPhones.social',
   }) as unknown as string;
 
+  // Pour les cas hybrides des personnes ayant plusieurs rôles
+  // Comme Morgane (Facturation + Satisfaction) et qui peut choisir plusieurs emails d'expédition
+  // Il faut que la signature corresponde à l'adresse d'expédition
+  // donc actuellement, on ne gère que satisfaction/resiliation/facturation
+  const listGenericEmails: { email: string; forceRole: string }[] = [
+    { email: satisfactionMail, forceRole: 'satisfaction' },
+    { email: resiliationMail, forceRole: 'resiliation' },
+    { email: facturationMail, forceRole: 'facturation' },
+  ];
+  const genericEmailUsed = listGenericEmails.find((e) => e.email === fromAddress);
+  if (genericEmailUsed) {
+    forceRole = genericEmailUsed.forceRole;
+  }
+
   let roleSignature: string | null;
   let mailSignature: string | null;
   let phoneSignature: string | null;
@@ -322,7 +334,6 @@ export function generateSignature(params: any): string {
     };
     mailSignature = dataOfficerMail;
     roleSignature = '';
-
   } else if (
     intersection(
       // eslint-disable-next-line @typescript-eslint/no-unsafe-return

package/ts/utils/index.ts

@@ -18,7 +18,6 @@ export * from './amount';
 export * from './quotation';
 export * from './isHtml';
 export * from './isUrl';
-export { getCerfa3517DDRRegistrationField } from './vat/3517/century23';
 export * from './bankAccount';
 export * from './commercialOffer';
 export * from './subscription';