@silexpert/core 1.2.36 → 1.2.38

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

@@ -143,7 +143,7 @@ export const internationalizationChoices: InternationalizationChoicesType = {
       },
       deposit: {
         headers: {
-          title: 'Acompte',
+          title: 'Facture d\'acompte',
           expirationDate: 'Date d\'expiration',
           termsOfPayment: 'Date limite de règlement',
         },
@@ -157,7 +157,7 @@ export const internationalizationChoices: InternationalizationChoicesType = {
       },
       remainder: {
         headers: {
-          title: 'reste',
+          title: 'Facture de solde',
           dueDate: 'Date d\'échéance',
           termsOfPayment: 'Date limite de règlement',
         },

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

@@ -271,15 +271,15 @@ export class CommercialDocumentCommonHTML {
   <% } %>
 
   <% if (settings && !settings.areColumnsSeparationHidden) { %> 
-    .pdf-content td { border-left: <%= settings && settings.columnSeparationThickness ? settings.columnSeparationThickness + 'px' : '2px' %> <%= settings && settings.columnSeparationColor ?  settings.columnSeparationColor : 'solid' %> <%= settings && settings.columnSeparationColor ? settings.columnSeparationColor : '#EAEAEA' %> !important; border-right: <%= settings && settings.columnSeparationThickness ? settings.columnSeparationThickness + 'px' : '2px' %> <%= settings && settings.columnSeparationColor ?  settings.columnSeparationColor : 'solid' %> <%= settings && settings.columnSeparationColor ? settings.columnSeparationColor : '#EAEAEA' %> !important; }
+    .pdf-content td { border-left: <%= settings && settings.columnSeparationThickness ? settings.columnSeparationThickness + 'px' : '2px' %> <%= settings && settings.columnSeparationType ?  settings.columnSeparationType : 'solid' %> <%= settings && settings.columnSeparationColor ? settings.columnSeparationColor : '#EAEAEA' %> !important; border-right: <%= settings && settings.columnSeparationThickness ? settings.columnSeparationThickness + 'px' : '2px' %> <%= settings && settings.columnSeparationType ?  settings.columnSeparationType : 'solid' %> <%= settings && settings.columnSeparationColor ? settings.columnSeparationColor : '#EAEAEA' %> !important; }
   <% } %>
 
   <% if (settings && !settings.areExternalBordersHidden) { %> 
-    .pdf-content table.commercial-table-preview { border: <%= settings && settings.columnSeparationThickness ? settings.columnSeparationThickness + 'px' : '2px' %> <%= settings && settings.columnSeparationColor ? settings.columnSeparationColor : 'solid' %> <%= settings && settings.columnSeparationColor ? settings.columnSeparationColor : '#EAEAEA' %> !important; }
-    .pdf-content table.commercial-table-preview tr:last-child td { border-bottom: <%= settings && settings.columnSeparationThickness ? settings.columnSeparationThickness + 'px' : '2px' %> <%= settings && settings.columnSeparationColor ? settings.columnSeparationColor : 'solid' %> <%= settings && settings.columnSeparationColor ? settings.columnSeparationColor : '#EAEAEA' %> !important; }
-    .pdf-content table.commercial-table-preview thead td { border-top: <%= settings && settings.columnSeparationThickness ? settings.columnSeparationThickness + 'px' : '2px' %> <%= settings && settings.columnSeparationColor ? settings.columnSeparationColor : 'solid' %> <%= settings && settings.columnSeparationColor ? settings.columnSeparationColor : '#EAEAEA' %> !important; }
-    .pdf-content table.commercial-table-preview td:first-child { border-left: <%= settings && settings.columnSeparationThickness ? settings.columnSeparationThickness + 'px' : '2px' %> <%= settings && settings.columnSeparationColor ? settings.columnSeparationColor : 'solid' %> <%= settings && settings.columnSeparationColor ? settings.columnSeparationColor : '#EAEAEA' %> !important; }
-    .pdf-content table.commercial-table-preview td:last-child { border-right: <%= settings && settings.columnSeparationThickness ? settings.columnSeparationThickness + 'px' : '2px' %> <%= settings && settings.columnSeparationColor ? settings.columnSeparationColor : 'solid' %> <%= settings && settings.columnSeparationColor ? settings.columnSeparationColor : '#EAEAEA' %> !important; }
+    .pdf-content table.commercial-table-preview { border: <%= settings && settings.externalBorderThickness ? settings.externalBorderThickness + 'px' : '2px' %> <%= settings && settings.externalBorderType ? settings.externalBorderType : 'solid' %> <%= settings && settings.externalBorderColor ? settings.externalBorderColor : '#EAEAEA' %> !important; }
+    .pdf-content table.commercial-table-preview tr:last-child td { border-bottom: <%= settings && settings.externalBorderThickness ? settings.externalBorderThickness + 'px' : '2px' %> <%= settings && settings.externalBorderType ? settings.externalBorderType : 'solid' %> <%= settings && settings.externalBorderColor ? settings.externalBorderColor : '#EAEAEA' %> !important; }
+    .pdf-content table.commercial-table-preview thead td { border-top: <%= settings && settings.externalBorderThickness ? settings.externalBorderThickness + 'px' : '2px' %> <%= settings && settings.externalBorderType ? settings.externalBorderType : 'solid' %> <%= settings && settings.externalBorderColor ? settings.externalBorderColor : '#EAEAEA' %> !important; }
+    .pdf-content table.commercial-table-preview td:first-child { border-left: <%= settings && settings.externalBorderThickness ? settings.externalBorderThickness + 'px' : '2px' %> <%= settings && settings.externalBorderType ? settings.externalBorderType : 'solid' %> <%= settings && settings.externalBorderColor ? settings.externalBorderColor : '#EAEAEA' %> !important; }
+    .pdf-content table.commercial-table-preview td:last-child { border-right: <%= settings && settings.externalBorderThickness ? settings.externalBorderThickness + 'px' : '2px' %> <%= settings && settings.externalBorderType ? settings.externalBorderType : 'solid' %> <%= settings && settings.externalBorderColor ? settings.externalBorderColor : '#EAEAEA' %> !important; }
   <% } %>
   
   <% if (settings && settings.areLinesSeparationHidden) { %>

package/ts/utils/email.ts

@@ -11,7 +11,7 @@ import { intersection } from './noLodash';
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 const ejs = require('ejs');
 
-function getRoleSignature(user:any) {
+function getRoleSignature(user: any) {
   // eslint-disable-next-line @typescript-eslint/no-unsafe-return
   if (user.positionLabel) return user.positionLabel;
 
@@ -19,7 +19,7 @@ function getRoleSignature(user:any) {
   const isStagiaireOrAlternant = user.roles.map((r: any) => r.id).includes(Role.INTERN) || user.roles.map((r: any) => r.id).includes(Role.ALTERNATE);
   // eslint-disable-next-line @typescript-eslint/no-unsafe-return
   const isManager = user.roles.map((r: any) => r.id).includes(Role.MANAGER);
-// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-return
   const isSocial = user.roles.map((r: any) => r.id).includes(Role.SOCIAL);
   // eslint-disable-next-line @typescript-eslint/no-unsafe-return
   const isJuridic = user.roles.map((r: any) => r.id).includes(Role.JURIDIC);
@@ -88,12 +88,12 @@ function getRoleSignature(user:any) {
   return `Comptable dédié${user.idCivility === 2 ? 'e' : ''}`;
 }
 
-export function getHoraires(user:IUser) { // On affiche les horaires uniquement pour les front, et pas pour les TVA
+export function getHoraires(user: IUser) { // On affiche les horaires uniquement pour les front, et pas pour les TVA
 
   if (isItThisEnv('Pourcentage') && user?.entity && [EntityType.COMPTALIB, EntityType.AMEX, EntityType.CABINET_RONCHIERI_LANDRA].includes(user.entity)) {
     return 'Du lundi au vendredi de 9h à 18h';
   }
-    
+
   return 'Du lundi au vendredi de 9h à 19h';
 
   // if (!intersection([user.roles.map((r: any) => r.id), [Role.FRONT_OFFICE, Role.FRONT_OFFICE_EXPRESS, Role.COMMERCIAL]]).length) return 'Du lundi au vendredi de 9h à 19h';
@@ -134,7 +134,7 @@ export function getHoraires(user:IUser) { // On affiche les horaires uniquement
   // return resultHoraire;
 }
 
-function getMailSignature(user:any, idTypeBrand:number) {
+function getMailSignature(user: any, idTypeBrand: number) {
   const informatiqueMail = getBrandConfig({
     ...(idTypeBrand ? { idTypeBrand } : {}),
     objectWaited: 'listMails.informatique',
@@ -151,7 +151,7 @@ function getMailSignature(user:any, idTypeBrand:number) {
   return bonjourMail;
 }
 
-function getPhoneSignature(user:any) {
+function getPhoneSignature(user: any) {
   // eslint-disable-next-line @typescript-eslint/no-unsafe-return
   if (user.phone !== '0383931414') { return user.phone.replace(/\B(?=(\d{2})+(?!\d))/g, ' '); }
   return null;
@@ -164,7 +164,7 @@ export function generateSignature(params: any): string {
   let {
     user,
   } = otherParams;
-  
+
   const hostS3 = getBrandConfig({
     idTypeBrand,
     objectWaited: 'urlS3',
@@ -240,7 +240,7 @@ export function generateSignature(params: any): string {
   let phoneSignature: string | null;
   let horaires: string | null;
   [roleSignature, mailSignature, phoneSignature, horaires] = ['Expert-Comptable', bonjourMail, null, 'Du lundi au vendredi de 9h à 19h'];
-  
+
   if (user?.roles && user.roles.some((r: any) => r.id === Role.DATA_OFFICER)) { // Signature data_officer
     user = {
       firstname: `L'équipe ${commercialName}`,
@@ -302,11 +302,11 @@ export function generateSignature(params: any): string {
 
   // Si on a une société, alors on remplace le lien calendly de base par le lien calendly interne
   // on n'affiche uniquement si le collaboreatur a bien des créneaux horaires
-  if (society?.id && user?.roles?.some((r: any) => [Role.FRONT_OFFICE, Role.FACTURATION, Role.JURIDIC, Role.COMMERCIAL ].includes(r.id)) && user?.usersTimeSlots?.length) {
+  if (society?.id && user?.roles?.some((r: any) => [Role.FRONT_OFFICE, Role.FACTURATION, Role.JURIDIC, Role.COMMERCIAL].includes(r.id)) && user?.usersTimeSlots?.length) {
     const isJuridic = user?.roles?.some((r: any) => [Role.JURIDIC].includes(r.id));
     const isFactu = user?.roles?.some((r: any) => [Role.FACTURATION].includes(r.id));
     const isCommercial = user?.roles?.some((r: any) => [Role.COMMERCIAL].includes(r.id));
-    let idType = TimeSlot.ACCOUNTING_RDV;
+    let idType = TimeSlot.BILAN;
     if (isJuridic) idType = TimeSlot.EDIT_SOCIETY;
     if (isFactu) idType = TimeSlot.BILLING;
     if (isCommercial) idType = TimeSlot.SALES;