@silexpert/core 1.2.93 → 1.2.95

package/dist/mjs/utils/commercialManagement/templates/body.js.map

@@ -1 +1 @@
-{"version":3,"file":"body.js","sourceRoot":"","sources":["../../../../../ts/utils/commercialManagement/templates/body.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAC;AAExD,MAAM,cAAc,GAAG,IAAI,4BAA4B,EAAE,CAAC;AAE1D,MAAM,cAAc,GAAG;;;YAGX,cAAc,CAAC,IAAI;YACnB,cAAc,CAAC,OAAO;;;4CAGU,cAAc,CAAC,OAAO;UACxD,cAAc,CAAC,IAAI;;;;;;;yCAOY,mBAAmB,CAAC,GAAG;;gDAEhB,mBAAmB,CAAC,KAAK;;gDAEzB,mBAAmB,CAAC,OAAO;;gDAE3B,mBAAmB,CAAC,KAAK;;gDAEzB,mBAAmB,CAAC,KAAK;;gDAEzB,mBAAmB,CAAC,OAAO;;;;;mDAKxB,mBAAmB,CAAC,OAAO;;oBAE1D,mBAAmB,CAAC,GAAG,KAAK,mBAAmB,CAAC,KAAK;;;;;;;2DAOd,mBAAmB,CAAC,OAAO;;;;kDAIpC,mBAAmB,CAAC,GAAG,KAAK,mBAAmB,CAAC,KAAK;;;;;;;;;;;;;;;;;SAiB9F,CAAC;AAEV,MAAM,CAAC,MAAM,YAAY,GAAG;;;;IAIxB,cAAc;;;;;;6BAMW,cAAc,CAAC,QAAQ;;;;;YAKxC,cAAc,CAAC,iBAAiB;;;;;;;;;;UAUlC,cAAc,CAAC,oBAAoB;;sCAEP,mBAAmB,CAAC,GAAG,KAAK,mBAAmB,CAAC,KAAK;8DAC7B,cAAc,CAAC,aAAa;;;;;;;;;;;;;;;;;;wEAkBlB,mBAAmB,CAAC,KAAK,iCAAiC,mBAAmB,CAAC,GAAG;;;;oFAIrE,mBAAmB,CAAC,KAAK,iCAAiC,mBAAmB,CAAC,GAAG;;;;;;;QAO7J,cAAc,CAAC,KAAK;;;QAGpB,cAAc,CAAC,YAAY;;QAE3B,CAAC","sourcesContent":["import { EstimateInvoiceType } from '../../../types/Enum/EstimateInvoice';\nimport { CommercialDocumentCommonHTML } from './common';\n\nconst commonTemplate = new CommercialDocumentCommonHTML();\n\nconst headOfDocument = `<div class=\"row space-between\">\n      <% if (settings && settings.logoAlignment === 'left') { %>\n        <div class=\"society-informations\">\n          ${commonTemplate.logo}\n          ${commonTemplate.company}\n        </div>\n      <% } else { %>\n        <div class=\"society-informations\">${commonTemplate.company}</div>\n        ${commonTemplate.logo}\n      <% } %>\n  </div>\n\n  <div class=\"row space-between items-end\" style=\"margin-top: 10px\">\n    <div style=\"width: 45%; margin-top: auto;\">\n      <span class=\"document-reference\">\n      <% if (idEstimateInvoiceType === ${EstimateInvoiceType.BON}) { %>\n        <%= languageTemplate.template.orderForm.headers.title %>\n      <% } else if (idEstimateInvoiceType === ${EstimateInvoiceType.DEVIS}) { %>\n        <%= languageTemplate.template.estimate.headers.title %>\n      <% } else if (idEstimateInvoiceType === ${EstimateInvoiceType.FACTURE}) { %>\n        <%= languageTemplate.template.invoice.headers.title %>\n      <% } else if (idEstimateInvoiceType === ${EstimateInvoiceType.AVOIR}) { %>\n        <%= languageTemplate.template.asset.headers.title %>\n      <% } else if (idEstimateInvoiceType === ${EstimateInvoiceType.RESTE}) { %>\n        <%= languageTemplate.template.remainder.headers.title %>\n      <% } else if (idEstimateInvoiceType === ${EstimateInvoiceType.ACOMPTE}) { %>\n        <%= languageTemplate.template.deposit.headers.title %>\n      <% } %>\n      <%= reference %></span><br/>\n      <% if(emissionDate) {%><span class=\"document-emission-date\"> <%= languageTemplate.template.common.headers.emissionDate %> : <%= emissionDateFormatted %></span><br/><% } %>\n      <% if(dueDate && idEstimateInvoiceType !== ${EstimateInvoiceType.ACOMPTE}) {%>\n        <span class=\"document-due-date\">\n          <% if ([${EstimateInvoiceType.BON}, ${EstimateInvoiceType.DEVIS}].includes(idEstimateInvoiceType)) {%>\n            <%= languageTemplate.template.estimate.headers.dueDate %> :\n          <% } else { %>\n            <%= languageTemplate.template.invoice.headers.dueDate %> :\n          <% } %>\n          <%= dueDateFormatted %></span>\n      <% } %>\n      <% if (expirationDate && idEstimateInvoiceType === ${EstimateInvoiceType.ACOMPTE}) {%>\n        <span class=\"document-due-date\"><%= languageTemplate.template.deposit.headers.expirationDate %> : : <%= expirationDateFormatted %></span>\n      <% } %>\n      <% if(termsOfPayment) { %>\n       <br/><p style=\"margin-bottom: 0px;\"><%= [${EstimateInvoiceType.BON}, ${EstimateInvoiceType.DEVIS}].includes(idEstimateInvoiceType) ? languageTemplate.template.estimate.headers.termsOfPayment : languageTemplate.template.invoice.headers.termsOfPayment %> : <%= termsOfPayment %></p>\n      <% } %>\n    </div>\n    <div style=\"width: 40%; margin-top: auto;\">\n      <p></p>\n      <% if (thirdParty) { %>\n        <div class=\"<%= settings && settings.isCoordinatesFrameDisplayed ? 'customer-border' : '' %>\">\n        <% if(thirdParty.company) {%><b><%= thirdParty.company %></b><br/><% } %>\n        <% if(thirdParty.fullname) {%><%= thirdParty.fullname %><br/><% } %>\n          <% if(thirdParty.address) {%><%= thirdParty.address %><br/><% } %>\n          <% if(thirdParty.zipCode) {%><%= thirdParty.zipCode + ' ' %><% } %><%= thirdParty.city %> <%= thirdParty.country %><br/>\n          <% if(thirdParty.deliveryAddress && thirdParty.deliveryCity && thirdParty.deliveryZipCode) {%>Adresse de livraison : <%= thirdParty.deliveryAddress %> <%= thirdParty.deliveryZipCode %> <%= thirdParty.deliveryCity %> <%= thirdParty.deliveryCountry %><br/><% } %>\n          <% if(thirdParty.nSiret) {%>SIRET : <%= thirdParty.nSiret %><br/><% } %>\n          <% if(thirdParty.nTva) {%>N° TVA : <%= thirdParty.nTva %><% } %>\n        </div>\n      <% } %>\n    </div>\n  </div>`;\n\nexport const bodyTemplate = `<html class=\"pdf-content\">\n\n  <body>\n\n  ${headOfDocument}\n\n    <div class=\"row mt-25\">\n      <% if (title) { %>Titre : <%= title %><% } %>\n    </div>\n\n    <div class=\"row mt-10\">${commonTemplate.products}</div>\n\n    <div class=\"row space-between mt-20\">\n      <div style=\"width: 55%;\">\n        <% if (disableVat !== true && vats.length) { %>\n          ${commonTemplate.vatRecapitulation}\n        <% } %>\n        <% if (vatMention) { %><div class=\"vat-mention <%= disableVat !== true ? 'mt-20' : ''%>\"><%= vatMention %></div><% } %>\n        <% if (comment) { %>\n          <p class=\"mt-20\"><%= languageTemplate.template.common.options.comment %> :<br/>\n          <%- comment %>\n        <% } %>\n      </div>\n\n      <div>\n        ${commonTemplate.amountRecapitulation}\n\n        <% if (isStripeAllowed && ![${EstimateInvoiceType.BON}, ${EstimateInvoiceType.DEVIS}].includes(idEstimateInvoiceType)) { %>\n          <div style=\"text-align: right; margin-top: 30px;\">${commonTemplate.paymentButton}</div>\n        <% } %>\n      </div>\n          \n    </div>\n\n    <% if ((settings && (settings.iban || settings.bic || settings.bank)) || paymentType) { %>\n      <div class=\"row mt-30 space-between\" style=\"page-break-inside: avoid !important;\">\n        <div>\n          <% if ((settings && (settings.iban || settings.bic || settings.bank)) || paymentType) { %>\n            <% if(paymentType) { %><%= languageTemplate.template.common.options.paymentType %> : <%= paymentType %><br/><% } %>\n            <% if(settings.bank) { %><%= languageTemplate.template.common.options.bank %> : <%= settings.bank %><br/><% } %>\n            <% if(settings.iban) { %>IBAN : <%= settings.iban %><br/><% } %>\n            <% if(settings.bic) { %>BIC : <%= settings.bic %><% } %>\n          <% } %>\n        </div>\n      </div>\n    <% } %>\n    <% if (settings && settings.bonPour && (idEstimateInvoiceType === ${EstimateInvoiceType.DEVIS} || idEstimateInvoiceType === ${EstimateInvoiceType.BON})) { %>\n      <br/><%= languageTemplate.template.common.options.approval %> : <br/><br/><br/><br/>\n    <% } %>\n\n    <% if (cgv && ((settings && settings.invoiceCgv) || idEstimateInvoiceType === ${EstimateInvoiceType.DEVIS} || idEstimateInvoiceType === ${EstimateInvoiceType.BON})) { %>\n      <br><div style=\"page-break-after:always;\"></div>\n      <div id=\"WYSIWYG\"><%- cgv %></div>\n    <% } %>\n  </body>\n\n  <style>\n      ${commonTemplate.style}\n  </style>\n  <style>\n      ${commonTemplate.styleWYSIWYG}\n  </style>\n</html>`;\n"]}
+{"version":3,"file":"body.js","sourceRoot":"","sources":["../../../../../ts/utils/commercialManagement/templates/body.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAC;AAExD,MAAM,cAAc,GAAG,IAAI,4BAA4B,EAAE,CAAC;AAE1D,MAAM,cAAc,GAAG;;;YAGX,cAAc,CAAC,IAAI;YACnB,cAAc,CAAC,OAAO;;;4CAGU,cAAc,CAAC,OAAO;UACxD,cAAc,CAAC,IAAI;;;;;;;yCAOY,mBAAmB,CAAC,GAAG;;gDAEhB,mBAAmB,CAAC,KAAK;;gDAEzB,mBAAmB,CAAC,OAAO;;gDAE3B,mBAAmB,CAAC,KAAK;;gDAEzB,mBAAmB,CAAC,KAAK;;gDAEzB,mBAAmB,CAAC,OAAO;;;;;mDAKxB,mBAAmB,CAAC,OAAO;;oBAE1D,mBAAmB,CAAC,GAAG,KAAK,mBAAmB,CAAC,KAAK;;;;;;;2DAOd,mBAAmB,CAAC,OAAO;;;;kDAIpC,mBAAmB,CAAC,GAAG,KAAK,mBAAmB,CAAC,KAAK;;;;;;;;;;;;;;;;;SAiB9F,CAAC;AAEV,MAAM,CAAC,MAAM,YAAY,GAAG;;;;IAIxB,cAAc;;;;;;6BAMW,cAAc,CAAC,QAAQ;;;;;YAKxC,cAAc,CAAC,iBAAiB;;;;;;;;;;UAUlC,cAAc,CAAC,oBAAoB;;sCAEP,mBAAmB,CAAC,GAAG,KAAK,mBAAmB,CAAC,KAAK;8DAC7B,cAAc,CAAC,aAAa;;;;;;;;;;;;;;;;;;wEAkBlB,mBAAmB,CAAC,KAAK,iCAAiC,mBAAmB,CAAC,GAAG;;;;oFAIrE,mBAAmB,CAAC,OAAO,iCAAiC,mBAAmB,CAAC,OAAO,iCAAiC,mBAAmB,CAAC,KAAK,iCAAiC,mBAAmB,CAAC,KAAK;;;;;;;QAOvR,cAAc,CAAC,KAAK;;;QAGpB,cAAc,CAAC,YAAY;;QAE3B,CAAC","sourcesContent":["import { EstimateInvoiceType } from '../../../types/Enum/EstimateInvoice';\nimport { CommercialDocumentCommonHTML } from './common';\n\nconst commonTemplate = new CommercialDocumentCommonHTML();\n\nconst headOfDocument = `<div class=\"row space-between\">\n      <% if (settings && settings.logoAlignment === 'left') { %>\n        <div class=\"society-informations\">\n          ${commonTemplate.logo}\n          ${commonTemplate.company}\n        </div>\n      <% } else { %>\n        <div class=\"society-informations\">${commonTemplate.company}</div>\n        ${commonTemplate.logo}\n      <% } %>\n  </div>\n\n  <div class=\"row space-between items-end\" style=\"margin-top: 10px\">\n    <div style=\"width: 45%; margin-top: auto;\">\n      <span class=\"document-reference\">\n      <% if (idEstimateInvoiceType === ${EstimateInvoiceType.BON}) { %>\n        <%= languageTemplate.template.orderForm.headers.title %>\n      <% } else if (idEstimateInvoiceType === ${EstimateInvoiceType.DEVIS}) { %>\n        <%= languageTemplate.template.estimate.headers.title %>\n      <% } else if (idEstimateInvoiceType === ${EstimateInvoiceType.FACTURE}) { %>\n        <%= languageTemplate.template.invoice.headers.title %>\n      <% } else if (idEstimateInvoiceType === ${EstimateInvoiceType.AVOIR}) { %>\n        <%= languageTemplate.template.asset.headers.title %>\n      <% } else if (idEstimateInvoiceType === ${EstimateInvoiceType.RESTE}) { %>\n        <%= languageTemplate.template.remainder.headers.title %>\n      <% } else if (idEstimateInvoiceType === ${EstimateInvoiceType.ACOMPTE}) { %>\n        <%= languageTemplate.template.deposit.headers.title %>\n      <% } %>\n      <%= reference %></span><br/>\n      <% if(emissionDate) {%><span class=\"document-emission-date\"> <%= languageTemplate.template.common.headers.emissionDate %> : <%= emissionDateFormatted %></span><br/><% } %>\n      <% if(dueDate && idEstimateInvoiceType !== ${EstimateInvoiceType.ACOMPTE}) {%>\n        <span class=\"document-due-date\">\n          <% if ([${EstimateInvoiceType.BON}, ${EstimateInvoiceType.DEVIS}].includes(idEstimateInvoiceType)) {%>\n            <%= languageTemplate.template.estimate.headers.dueDate %> :\n          <% } else { %>\n            <%= languageTemplate.template.invoice.headers.dueDate %> :\n          <% } %>\n          <%= dueDateFormatted %></span>\n      <% } %>\n      <% if (expirationDate && idEstimateInvoiceType === ${EstimateInvoiceType.ACOMPTE}) {%>\n        <span class=\"document-due-date\"><%= languageTemplate.template.deposit.headers.expirationDate %> : : <%= expirationDateFormatted %></span>\n      <% } %>\n      <% if(termsOfPayment) { %>\n       <br/><p style=\"margin-bottom: 0px;\"><%= [${EstimateInvoiceType.BON}, ${EstimateInvoiceType.DEVIS}].includes(idEstimateInvoiceType) ? languageTemplate.template.estimate.headers.termsOfPayment : languageTemplate.template.invoice.headers.termsOfPayment %> : <%= termsOfPayment %></p>\n      <% } %>\n    </div>\n    <div style=\"width: 40%; margin-top: auto;\">\n      <p></p>\n      <% if (thirdParty) { %>\n        <div class=\"<%= settings && settings.isCoordinatesFrameDisplayed ? 'customer-border' : '' %>\">\n        <% if(thirdParty.company) {%><b><%= thirdParty.company %></b><br/><% } %>\n        <% if(thirdParty.fullname) {%><%= thirdParty.fullname %><br/><% } %>\n          <% if(thirdParty.address) {%><%= thirdParty.address %><br/><% } %>\n          <% if(thirdParty.zipCode) {%><%= thirdParty.zipCode + ' ' %><% } %><%= thirdParty.city %> <%= thirdParty.country %><br/>\n          <% if(thirdParty.deliveryAddress && thirdParty.deliveryCity && thirdParty.deliveryZipCode) {%>Adresse de livraison : <%= thirdParty.deliveryAddress %> <%= thirdParty.deliveryZipCode %> <%= thirdParty.deliveryCity %> <%= thirdParty.deliveryCountry %><br/><% } %>\n          <% if(thirdParty.nSiret) {%>SIRET : <%= thirdParty.nSiret %><br/><% } %>\n          <% if(thirdParty.nTva) {%>N° TVA : <%= thirdParty.nTva %><% } %>\n        </div>\n      <% } %>\n    </div>\n  </div>`;\n\nexport const bodyTemplate = `<html class=\"pdf-content\">\n\n  <body>\n\n  ${headOfDocument}\n\n    <div class=\"row mt-25\">\n      <% if (title) { %>Titre : <%= title %><% } %>\n    </div>\n\n    <div class=\"row mt-10\">${commonTemplate.products}</div>\n\n    <div class=\"row space-between mt-20\">\n      <div style=\"width: 55%;\">\n        <% if (disableVat !== true && vats.length) { %>\n          ${commonTemplate.vatRecapitulation}\n        <% } %>\n        <% if (vatMention) { %><div class=\"vat-mention <%= disableVat !== true ? 'mt-20' : ''%>\"><%= vatMention %></div><% } %>\n        <% if (comment) { %>\n          <p class=\"mt-20\"><%= languageTemplate.template.common.options.comment %> :<br/>\n          <%- comment %>\n        <% } %>\n      </div>\n\n      <div>\n        ${commonTemplate.amountRecapitulation}\n\n        <% if (isStripeAllowed && ![${EstimateInvoiceType.BON}, ${EstimateInvoiceType.DEVIS}].includes(idEstimateInvoiceType)) { %>\n          <div style=\"text-align: right; margin-top: 30px;\">${commonTemplate.paymentButton}</div>\n        <% } %>\n      </div>\n          \n    </div>\n\n    <% if ((settings && (settings.iban || settings.bic || settings.bank)) || paymentType) { %>\n      <div class=\"row mt-30 space-between\" style=\"page-break-inside: avoid !important;\">\n        <div>\n          <% if ((settings && (settings.iban || settings.bic || settings.bank)) || paymentType) { %>\n            <% if(paymentType) { %><%= languageTemplate.template.common.options.paymentType %> : <%= paymentType %><br/><% } %>\n            <% if(settings.bank) { %><%= languageTemplate.template.common.options.bank %> : <%= settings.bank %><br/><% } %>\n            <% if(settings.iban) { %>IBAN : <%= settings.iban %><br/><% } %>\n            <% if(settings.bic) { %>BIC : <%= settings.bic %><% } %>\n          <% } %>\n        </div>\n      </div>\n    <% } %>\n    <% if (settings && settings.bonPour && (idEstimateInvoiceType === ${EstimateInvoiceType.DEVIS} || idEstimateInvoiceType === ${EstimateInvoiceType.BON})) { %>\n      <br/><%= languageTemplate.template.common.options.approval %> : <br/><br/><br/><br/>\n    <% } %>\n\n    <% if (cgv && (settings && settings.invoiceCgv) && (idEstimateInvoiceType === ${EstimateInvoiceType.FACTURE} || idEstimateInvoiceType === ${EstimateInvoiceType.ACOMPTE} || idEstimateInvoiceType === ${EstimateInvoiceType.AVOIR} || idEstimateInvoiceType === ${EstimateInvoiceType.RESTE} ) { %>\n      <br><div style=\"page-break-after:always;\"></div>\n      <div id=\"WYSIWYG\"><%- cgv %></div>\n    <% } %>\n  </body>\n\n  <style>\n      ${commonTemplate.style}\n  </style>\n  <style>\n      ${commonTemplate.styleWYSIWYG}\n  </style>\n</html>`;\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@silexpert/core",
-  "version": "1.2.93",
+  "version": "1.2.95",
   "description": "Silex Core perform HTTP Request and object binding. Silex core helps developers to retrieve and return formatted object",
   "homepage": "https://gitlab.compta-clementine.fr/dev/silex-api",
   "main": "dist/cjs/index.js",

package/ts/api/resources/BankStatement.ts

@@ -3,11 +3,25 @@ import {
   IAccountingTransaction,
   UploadBankStatement,
   QueryTransactionBankStatement,
-  ReadBankStatement,
+  ReadBankStatement
 } from '../../types';
 import { isDefined } from 'class-validator';
 
 export class BankStatement extends Resource {
+  uploadV2(file: File, params: Omit<UploadBankStatement, 'file'>): Promise<ReadBankStatement> {
+    const sendAccountingFiles = new FormData();
+
+    if (isDefined(params.fromRevision)) sendAccountingFiles.append('fromRevision', `${params.fromRevision}`);
+    sendAccountingFiles.append('useExtended', `${params.useExtended}`);
+    sendAccountingFiles.append('idBankAccount', params.idBankAccount.toString());
+    sendAccountingFiles.append('idSociety', params.idSociety.toString());
+    sendAccountingFiles.append('file', file);
+
+    return this.axios.$post('/bank-statements/upload/v2', sendAccountingFiles, {
+      headers: { 'Content-Type': 'multipart/form-data' },
+    });
+  }
+
   upload(file: File, params: Omit<UploadBankStatement, 'file'>): Promise<ReadBankStatement> {
     const sendAccountingFiles = new FormData();
 

package/ts/api/resources/Shine.ts

@@ -1,12 +1,5 @@
 import { Resource } from '../Resource';
-import {
-  IBankAccount,
-  CreateShineTransactions,
-  GetConnect,
-  CreateShineAccount,
-  ConnectResponse,
-  IBankConnection,
-} from '../../types';
+import { IBankAccount, CreateShineTransactions, GetConnect, CreateShineAccount, ConnectResponse } from '../../types';
 
 export class Shine extends Resource {
   connect(idSociety: number, params: GetConnect): Promise<ConnectResponse> {
@@ -18,7 +11,4 @@ export class Shine extends Resource {
   importTransactions(params: CreateShineTransactions): Promise<number> {
     return this.axios.$post('/connectors/shine/importTransactions', params);
   }
-  refreshConnection(idBankConnection: number): Promise<IBankConnection> {
-    return this.axios.$put(`/connectors/shine/${idBankConnection}/refresh-connection`);
-  }
 }

package/ts/types/Enum/CommercialManagement.ts

@@ -184,7 +184,7 @@ export const DefaultEmailTemplateList: Array<Omit<ISaleEmail, 'idSociety'>> = [
     name: 'modèle devis par défaut',
     subject: 'Votre devis',
     content:
-      '<p>Bonjour, <span style="color: rgb(131, 131, 132);">[nom_client]</span> </p> <p>Vous trouverez ci-joint votre devis N°<span style="color: rgb(131, 131, 132);">[reference_document]</span> d’un montant de <span style="color: rgb(131, 131, 132);">[montant_ttc_document]</span>. </p> <p>Vous en souhaitant bonne réception. </p> <p>Cordialement,</p><p><span style="color: rgb(131, 131, 132);">[raison_sociale]</span></p>',
+      '<p>Bonjour <span style="color: rgb(131, 131, 132);">[nom_client]</span>, </p> <p>Vous trouverez ci-joint votre devis N°<span style="color: rgb(131, 131, 132);">[reference_document]</span> d’un montant de <span style="color: rgb(131, 131, 132);">[montant_ttc_document]</span>. </p> <p>Vous en souhaitant bonne réception. </p> <p>Cordialement,</p><p><span style="color: rgb(131, 131, 132);">[raison_sociale]</span></p>',
     type: EmailType.ESTIMATE,
     isDefault: false,
   },
@@ -192,7 +192,7 @@ export const DefaultEmailTemplateList: Array<Omit<ISaleEmail, 'idSociety'>> = [
     name: 'modèle facture par défaut',
     subject: 'Votre facture',
     content:
-      '<p>Bonjour, <span style="color: rgb(131, 131, 132);">[nom_client]</span> </p> <p>Vous trouverez ci-joint votre facture N°<span style="color: rgb(131, 131, 132);">[reference_document]</span> d’un montant de <span style="color: rgb(131, 131, 132);">[montant_ttc_document]</span>.</p> <p>Vous en souhaitant bonne réception.</p> <p>Cordialement,</p><p><span style="color: rgb(131, 131, 132);">[raison_sociale]</span></p>',
+      '<p>Bonjour <span style="color: rgb(131, 131, 132);">[nom_client]</span>, </p> <p>Vous trouverez ci-joint votre facture N°<span style="color: rgb(131, 131, 132);">[reference_document]</span> d’un montant de <span style="color: rgb(131, 131, 132);">[montant_ttc_document]</span>.</p> <p>Vous en souhaitant bonne réception.</p> <p>Cordialement,</p><p><span style="color: rgb(131, 131, 132);">[raison_sociale]</span></p>',
     type: EmailType.INVOICE,
     isDefault: false,
   },
@@ -200,7 +200,7 @@ export const DefaultEmailTemplateList: Array<Omit<ISaleEmail, 'idSociety'>> = [
     name: 'modèle bon de commande par défaut',
     subject: 'Votre bon de commande',
     content:
-      '<p>Bonjour, <span style="color: rgb(131, 131, 132);">[nom_client]</span></p> <p>Vous trouverez ci-joint votre bon de commande N°<span style="color: rgb(131, 131, 132);">[reference_document]</span> d’un montant de <span style="color: rgb(131, 131, 132);">[montant_ttc_document]</span>. </p> <p>Vous en souhaitant bonne réception.</p> <p>Cordialement,</p><p><span style="color: rgb(131, 131, 132);">[raison_sociale]</span></p>',
+      '<p>Bonjour <span style="color: rgb(131, 131, 132);">[nom_client]</span>, </p> <p>Vous trouverez ci-joint votre bon de commande N°<span style="color: rgb(131, 131, 132);">[reference_document]</span> d’un montant de <span style="color: rgb(131, 131, 132);">[montant_ttc_document]</span>. </p> <p>Vous en souhaitant bonne réception.</p> <p>Cordialement,</p><p><span style="color: rgb(131, 131, 132);">[raison_sociale]</span></p>',
     type: EmailType.ORDER_FORM,
     isDefault: false,
   },
@@ -208,7 +208,7 @@ export const DefaultEmailTemplateList: Array<Omit<ISaleEmail, 'idSociety'>> = [
     name: 'modèle avoir par défaut',
     subject: 'Votre avoir',
     content:
-      '<p>Bonjour, <span style="color: rgb(131, 131, 132);">[nom_client]</span> </p> <p>Vous trouverez ci-joint votre facture.</p> <p>Vous trouverez ci-joint votre bon de commande N°<span style="color: rgb(131, 131, 132);">[reference_document]</span> d’un montant de <span style="color: rgb(131, 131, 132);">[montant_ttc_document]</span>. </p> <p>Vous en souhaitant bonne réception.</p> <p>Cordialement,</p><p><span style="color: rgb(131, 131, 132);">[raison_sociale]</span></p>',
+      '<p>Bonjour <span style="color: rgb(131, 131, 132);">[nom_client]</span>, </p> <p>Vous trouverez ci-joint votre facture.</p> <p>Vous trouverez ci-joint votre bon de commande N°<span style="color: rgb(131, 131, 132);">[reference_document]</span> d’un montant de <span style="color: rgb(131, 131, 132);">[montant_ttc_document]</span>. </p> <p>Vous en souhaitant bonne réception.</p> <p>Cordialement,</p><p><span style="color: rgb(131, 131, 132);">[raison_sociale]</span></p>',
     type: EmailType.ASSET,
     isDefault: false,
   },
@@ -216,7 +216,7 @@ export const DefaultEmailTemplateList: Array<Omit<ISaleEmail, 'idSociety'>> = [
     name: 'modèle relance par défaut',
     subject: 'Votre facture',
     content:
-      '<p>Bonjour, <span style="color: rgb(131, 131, 132);">[nom_client]</span> </p> <p>Je me permets de revenir vers vous concernant la facture N°<span style="color: rgb(131, 131, 132);">[reference_document]</span> d’un montant de <span style="color: rgb(131, 131, 132);">[montant_ttc_document]</span> pour laquelle le paiement est toujours en attente. </p> <p>Je vous joins à nouveau le document en pièce jointe en cas de besoin.</p> <p>Vous en souhaitant bonne réception.</p> <p>Cordialement,</p><p><span style="color: rgb(131, 131, 132);">[raison_sociale]</span></p>',
+      '<p>Bonjour <span style="color: rgb(131, 131, 132);">[nom_client]</span>, </p> <p>Je me permets de revenir vers vous concernant la facture N°<span style="color: rgb(131, 131, 132);">[reference_document]</span> d’un montant de <span style="color: rgb(131, 131, 132);">[montant_ttc_document]</span> pour laquelle le paiement est toujours en attente. </p> <p>Je vous joins à nouveau le document en pièce jointe en cas de besoin.</p> <p>Vous en souhaitant bonne réception.</p> <p>Cordialement,</p><p><span style="color: rgb(131, 131, 132);">[raison_sociale]</span></p>',
     type: EmailType.CUSTOMER_REMINDER,
     isDefault: false,
   },

package/ts/types/Enum/ReasonNotSubscribed.ts

@@ -20,7 +20,7 @@ export const ReasonNotSubscribed = [
   {
     id: 4,
     text: 'Prestation social pour salarié unique',
-    hidden: false,
+    hidden: true,
     isOver: null,
   },
   {
@@ -165,7 +165,7 @@ export const ReasonNotSubscribed = [
     id: 29,
     text: 'Prestation non prise en charge',
     hidden: false,
-    isOver: [2, 3, 4, 5, 6, 14, 15, 16, 21, 22, 30],
+    isOver: [2, 3, 5, 6, 14, 15, 16, 21, 22, 30],
   },
   {
     id: 30,

package/ts/types/Interface/api/balanceSheet/UpdateBalanceSheet.ts

@@ -52,4 +52,9 @@ export class UpdateBalanceSheet {
   @IsNumber()
   @IsOptional()
   idCard?: number;
+
+  @ApiPropertyOptional()
+  @IsString()
+  @IsOptional()
+  token?: string;
 }

package/ts/types/Interface/api/bankStatement/QueryBankStatement.ts

@@ -23,5 +23,11 @@ export class UploadBankStatement {
   @IsOptional()
   fromRevision?: boolean;
 
+  @ApiPropertyOptional()
+  @IsOptional()
+  @ToBoolean()
+  @IsBoolean()
+  useExtended?: boolean;
+
   file: File;
 }

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

@@ -1,5 +1,6 @@
-import { IsDate, IsOptional } from 'class-validator';
+import { IsBoolean, IsDate, IsInt, IsOptional, IsString } from 'class-validator';
 import { ApiPropertyOptional } from '../../../../utils';
+import { ToBoolean } from '../../../../utils/transforms/boolean.transform';
 
 export class QueryGetLeadByUser {
   @ApiPropertyOptional()
@@ -12,3 +13,79 @@ export class QueryGetLeadByUser {
   @IsDate()
   endDate?: Date;
 }
+
+export class QueryGetListSocietiesFilteredBetweenDate {
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+  search?: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsBoolean()
+  @ToBoolean()
+  isInCA?: boolean;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsBoolean()
+  @ToBoolean()
+  isAdditionalSales?: boolean;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsDate()
+  startDate?: Date;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsDate()
+  endDate?: Date;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+  idUser?: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+  idSource?: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt({ each: true })
+  idPrestationList?: number[];
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt({ each: true })
+  idOfferList?: number[];
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt({ each: true })
+  idState?: number[];
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt({ each: true })
+  idConstitutionState?: number[];
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsBoolean()
+  @ToBoolean()
+  goToFacturation?: boolean;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsBoolean()
+  @ToBoolean()
+  goToOnboarding?: boolean;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+  idTypeBrand?: number;
+}

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

@@ -389,6 +389,12 @@ export class CreateCommercialMail {
   @IsBoolean()
   @ToBoolean()
   shouldSaveToCustomTemplate?: boolean;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsBoolean()
+  @ToBoolean()
+  isTest?: boolean;
 }
 
 export class CreateCommercialMailWithMultipleFiles extends CreateCommercialMail {
@@ -511,6 +517,9 @@ export class CommercialDocumentInputs {
   @ToBoolean()
   shouldPayTaxAfterDebit?: boolean;
 
+  @ApiProperty()
+  idSaleDocumentTemplate?: number;
+
   @ApiPropertyOptional({ description: 'Moyen de paiement' })
   paymentType?: string | null;
 }

package/ts/types/Interface/api/config/ConfigType.ts

@@ -207,6 +207,7 @@ export interface Pappers {
 export interface Shine {
   host: string;
   hostV3: string;
+  publicHost: string;
   clientId: string;
   clientSecret: string;
   redirect_uris: string[];

package/ts/types/Interface/api/shine/ConnectResponse.ts

@@ -4,5 +4,4 @@ import { ShineBankAccount } from './CreateShine';
 export type ConnectResponse = {
   bankConnection: IBankConnection;
   bankAccounts: ShineBankAccount[];
-  alreadyExists: boolean;
 };

package/ts/types/Interface/api/shine/CreateShine.ts

@@ -21,94 +21,107 @@ export type ShineTokenInformations = {
   exp: number;
 };
 
+export enum ShineTransactionCategory {
+  DEFAULT = 'DEFAULT',
+  BANKING = 'BANKING',
+  CASH = 'CASH',
+  CONTRIBUTIONS = 'CONTRIBUTIONS',
+  EQUIPMENT = 'EQUIPMENT',
+  FOOD = 'FOOD',
+  HOTEL = 'HOTEL',
+  LEGAL = 'LEGAL',
+  LOAN = 'LOAN',
+  MAINTENANCE = 'MAINTENANCE',
+  MISC = 'MISC',
+  PERSONAL = 'PERSONAL',
+  RENT = 'RENT',
+  SERVICES = 'SERVICES',
+  TAX = 'TAX',
+  TELECOM = 'TELECOM',
+  ALCOOL_TOBACCO = 'ALCOOL_TOBACCO',
+  TRANSPORTATION = 'TRANSPORTATION',
+  UTILITIES = 'UTILITIES',
+  VEHICLE = 'VEHICLE',
+  BETTING = 'BETTING',
+}
+
 export type ShineBankAccount = {
   bankAccountId: string;
+  bic: string;
+  companyProfileId: string;
+  createdAt: number;
+  currency: string;
   currentBalance: number;
   currentBalanceFloat: number;
-  nextBalance: number;
-  nextBalanceFloat: number;
-  currency: string;
   iban: string;
-  bic: string;
+  isHidden: boolean;
   name: string;
+  nextBalance: number;
+  nextBalanceFloat: number;
   ownerName: string;
-  trzWalletId: string;
-  type: string;
-  createdAt: number;
   status: string;
-  uid: string;
-  companyProfileId: string;
+  type: string;
   updatedAt: number;
-  closedAt: number | null;
-  lockedCustomMessage: string | null;
-  lockedReason: string | null;
-  isHidden: boolean;
-  illustrationName: string | null;
-  balanceFromProviderUpdatedAt: string;
 };
 
 export type ShineBankTransaction = {
-  transactionId: string;
+  authorizationReleasedAt: null;
+  bankAccountId: string;
+  bankTransferId: string;
+  bankTransferStatus: string | null;
+  cardPaymentStatus: string | null;
+  category: ShineTransactionCategory;
+  companyUserId: string | null;
   createdAt: number;
   currency: string;
+  description: string;
+  directDebitMandateId: string;
+  executedAt: null;
+  fee: number;
+  feeType: string;
+  hasReceipts: boolean;
+  initiatorName: null;
+  is3DS: boolean;
+  isHidden: boolean;
+  isOnAgentWallet: boolean;
+  isRefund: boolean;
+  note: string;
+  payinVirtualStatus: null;
   paymentMethod: string;
-  paymentProvider: string;
-  providerTransactionId: string;
+  refundTransactionId: null;
+  sentToSepaNetworkAt: null;
   status: string;
   title: string;
   titleLatinised: string;
+  transactionAt: number;
+  transactionId: string;
+  transactionSettledAt: number;
+  transferPayinSenderName: string;
   type: 'payout' | 'payin';
-  uid: string;
+  uid: string | null;
   updatedAt: number;
   value: number;
-  bankTransferId: string;
-  transactionAt: number;
-  fee: number;
-  transferPayinSenderName: string;
-  feeType: string;
-  description: string;
-  category: string;
-  isRefund: boolean;
-  directDebitMandateId: string;
-  bankAccountId: string;
-  transactionSettledAt: number;
-  providerCardPaymentId: null;
-  providerCardTransactionId: null;
-  cardPaymentStatus: null;
   isPersonal: boolean;
-  hasReceipts: boolean;
-  note: string;
-  isHidden: boolean;
-  authorizationReleasedAt: null;
-  refundTransactionId: null;
-  executedAt: null;
-  companyUserId: null;
-  initiatorName: null;
-  remainingAuthorized: null;
-  expectedReleaseDate: null;
-  cardPaymentMethod: null;
-  paymentCurrency: string;
-  is3DS: boolean;
 };
 
 export type ShineTransactionReceipt = {
-  receiptId: string;
   bucketName: string;
   bucketPath: string;
+  category: string;
+  receiptId: string;
   companyProfileId: string;
   companyUserId: string;
   createdByCompanyUserId: string | null;
-  createdAt: number;
-  category: string;
   currency: string;
+  createdAt: number;
   deleted: boolean;
   fileRef: string;
   processing: boolean;
   sellerName: string;
   sellerNameLatinised: string;
   subtotal: number;
-  thumbUrl: string;
   total: number;
+  thumbUrl: string;
   transactionAt: number;
   transactionId: string | null;
   udpatedAt: number;

package/ts/utils/commercialManagement/document.ts

@@ -153,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

@@ -8,7 +8,8 @@ type InternationalizationConsistencyKey =
   | 'recoveryCost'
   | 'paymentType'
   | 'termsOfPayment'
-  | 'accountingCategory';
+  | 'accountingCategory'
+  | 'unit';
 
 export const internationalizationChoices: InternationalizationChoicesType = {
   fr: {
@@ -508,6 +509,28 @@ const internationalizationMatching: { [key: string]: { fr: string; en: string }[
       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>
     <% } %>