npm - @silexpert/core - Versions diffs - 1.1.250 → 1.1.252 - Mend

@silexpert/core 1.1.250 → 1.1.252

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (82) hide show

package/dist/mjs/utils/cerfa.js CHANGED Viewed

@@ -1,12 +1,38 @@
 import { GlobalRegime } from '../types/Enum/GlobalRegime';
+import { Code, ErrorType } from '../types';
+import { isDefined } from 'class-validator';
+export class ServiceException extends Error {
+    code;
+    type;
+    constructor(params) {
+        if (typeof params === 'string') {
+            super(params);
+            return;
+        }
+        super(params.message);
+        this.code = params.code;
+        this.type = params.type;
+    }
+}
 export function retrieveCerfaFromSocietyInformations(idLegalForm, idTaxSystem, idFiscalRegime, profitsType) {
     const globalRegimes = Object.values(GlobalRegime);
     const selectedGlobalRegime = globalRegimes.find((gr) => gr.idLegalForms.includes(idLegalForm));
     if (!selectedGlobalRegime)
-        throw new Error('Missing informations to retrieve CERFA informations');
+        throw new ServiceException({ code: Code.validationError, type: ErrorType.resourceError, message: 'Votre raison sociale ne vous permet pas de générer votre bilan chez nous' });
+    if (!isDefined(idFiscalRegime) || !isDefined(profitsType) || !isDefined(idTaxSystem)) {
+        const missingData = [];
+        if (!isDefined(idFiscalRegime))
+            missingData.push('Régime de droit commun');
+        if (!isDefined(profitsType))
+            missingData.push('Régime d\'imposition');
+        if (!isDefined(idTaxSystem))
+            missingData.push('Activité (BNC, BIC)');
+        const errorMEssage = `Les informations suivantes sont manquantes pour déterminer votre régime ficscal: ${missingData.join(', ')}`;
+        throw new ServiceException({ code: Code.validationError, type: ErrorType.resourceError, message: errorMEssage });
+    }
     const choiceIndex = selectedGlobalRegime.choices.findIndex((sgr) => sgr.idFiscalRegime === idFiscalRegime && sgr.profitsType === profitsType && sgr.idTaxSystem === idTaxSystem);
     if (choiceIndex < 0)
-        throw new Error('Missing informations to retrieve CERFA informations');
+        throw new ServiceException({ code: Code.validationError, type: ErrorType.resourceError, message: 'Au vu des informations remplis, nous somme dans l\'incapacité de générer votre bilan chez nous' });
     const { declaration, annexe } = selectedGlobalRegime.choices[choiceIndex];
     return { declaration, annex: annexe ?? null };
 }
@@ -14,7 +40,7 @@ export function retreiveChoicesDependingLegalForm(idLegalForm) {
     const globalRegimes = Object.values(GlobalRegime);
     const selectedGlobalRegime = globalRegimes.find((gr) => gr.idLegalForms.includes(idLegalForm));
     if (!selectedGlobalRegime)
-        throw new Error(`LegalForm #${idLegalForm} not implemented`);
+        throw new ServiceException({ code: Code.validationError, type: ErrorType.resourceError, message: `LegalForm #${idLegalForm} not implemented` });
     return selectedGlobalRegime;
 }
 //# sourceMappingURL=cerfa.js.map

package/dist/mjs/utils/cerfa.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"cerfa.js","sourceRoot":"","sources":["../../../ts/utils/cerfa.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAA2B,MAAM,4BAA4B,CAAC;~~AAGnF~~,MAAM,UAAU,oCAAoC,CAAC,WAAmB,EAAE,WAAsB,EAAE,cAA4B,EAAE,WAAwB;IACtJ,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IAClD,MAAM,oBAAoB,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC;IAE/F,IAAI,CAAC,oBAAoB;QAAE,MAAM,IAAI,~~KAAK~~,CAAC,~~qDAAqD~~,CAAC,CAAC;~~IAElG~~,MAAM,WAAW,GAAG,oBAAoB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,cAAc,KAAK,cAAc,IAAI,GAAG,CAAC,WAAW,KAAK,WAAW,IAAI,GAAG,CAAC,WAAW,KAAK,WAAW,CAAC,CAAC;IAEjL,IAAI,WAAW,GAAG,CAAC;QAAE,MAAM,IAAI,~~KAAK~~,CAAC,~~qDAAqD~~,CAAC,CAAC;~~IAE5F~~,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,oBAAoB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAE1E,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,IAAI,IAAI,EAAE,CAAC;AAChD,CAAC;AAED,MAAM,UAAU,iCAAiC,CAAC,WAAmB;IACnE,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IAClD,MAAM,oBAAoB,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC;IAE/F,IAAI,CAAC,oBAAoB;QAAE,MAAM,IAAI,~~KAAK~~,CAAC,cAAc,WAAW,kBAAkB,CAAC,CAAC;~~IACxF~~,OAAO,oBAAoB,CAAC;AAC9B,CAAC","sourcesContent":["import { ReadCerfaToComplete } from '../types/Interface/api/cerfa/ReadCerfa';\nimport { GlobalRegime, GlobalRegimeTypeContent } from '../types/Enum/GlobalRegime';\nimport { ProfitsType, FiscalRegime, TaxSystem } from '../types';\n\nexport function retrieveCerfaFromSocietyInformations(idLegalForm: number, idTaxSystem: TaxSystem, idFiscalRegime: FiscalRegime, profitsType: ProfitsType):ReadCerfaToComplete {\n const globalRegimes = Object.values(GlobalRegime);\n const selectedGlobalRegime = globalRegimes.find((gr) => gr.idLegalForms.includes(idLegalForm));\n\n if (!selectedGlobalRegime) throw new ~~Error~~('~~Missing~~ informations to ~~retrieve~~ ~~CERFA~~ ~~informations~~');\n\n const choiceIndex = selectedGlobalRegime.choices.findIndex((sgr) => sgr.idFiscalRegime === idFiscalRegime && sgr.profitsType === profitsType && sgr.idTaxSystem === idTaxSystem);\n\n if (choiceIndex < 0) throw new ~~Error~~('~~Missing~~ informations to ~~retrieve~~ ~~CERFA~~ ~~informations~~');\n\n const { declaration, annexe } = selectedGlobalRegime.choices[choiceIndex];\n\n return { declaration, annex: annexe ?? null };\n}\n\nexport function retreiveChoicesDependingLegalForm(idLegalForm: number): GlobalRegimeTypeContent {\n const globalRegimes = Object.values(GlobalRegime);\n const selectedGlobalRegime = globalRegimes.find((gr) => gr.idLegalForms.includes(idLegalForm));\n\n if (!selectedGlobalRegime) throw new ~~Error~~(`LegalForm #${idLegalForm} not implemented`);\n return selectedGlobalRegime;\n}"]}
1	+ {"version":3,"file":"cerfa.js","sourceRoot":"","sources":["../../../ts/utils/cerfa.ts"],"names":[],"mappings":"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","sourcesContent":["import { ReadCerfaToComplete } from '../types/Interface/api/cerfa/ReadCerfa';\nimport { GlobalRegime, GlobalRegimeTypeContent } from '../types/Enum/GlobalRegime';\nimport { ProfitsType, FiscalRegime, TaxSystem, Code, ErrorType } from '../types';\nimport { isDefined } from 'class-validator';\n\ntype ErrorParams = { code: Code, type: ErrorType, message?: string } \| string;\n\nexport class ServiceException extends Error {\n private readonly code: Code;\n\n private readonly type: ErrorType;\n\n constructor(params: ErrorParams) {\n if (typeof params === 'string') {\n super(params);\n return;\n }\n super(params.message);\n this.code = params.code;\n this.type = params.type;\n }\n}\n\nexport function retrieveCerfaFromSocietyInformations(idLegalForm: number, idTaxSystem: TaxSystem, idFiscalRegime: FiscalRegime, profitsType: ProfitsType):ReadCerfaToComplete {\n const globalRegimes = Object.values(GlobalRegime);\n const selectedGlobalRegime = globalRegimes.find((gr) => gr.idLegalForms.includes(idLegalForm));\n\n if (!selectedGlobalRegime) throw new ServiceException({ code: Code.validationError, type: ErrorType.resourceError, message: 'Votre raison sociale ne vous permet pas de générer votre bilan chez nous' });\n\n if (!isDefined(idFiscalRegime) \|\| !isDefined(profitsType) \|\| !isDefined(idTaxSystem)) {\n const missingData: string[] = [];\n if (!isDefined(idFiscalRegime)) missingData.push('Régime de droit commun');\n if (!isDefined(profitsType)) missingData.push('Régime d\\'imposition');\n if (!isDefined(idTaxSystem)) missingData.push('Activité (BNC, BIC)');\n const errorMEssage = `Les informations suivantes sont manquantes pour déterminer votre régime ficscal: ${missingData.join(', ')}`;\n throw new ServiceException({ code: Code.validationError, type: ErrorType.resourceError, message: errorMEssage });\n }\n\n const choiceIndex = selectedGlobalRegime.choices.findIndex((sgr) => sgr.idFiscalRegime === idFiscalRegime && sgr.profitsType === profitsType && sgr.idTaxSystem === idTaxSystem);\n\n if (choiceIndex < 0) throw new ServiceException({ code: Code.validationError, type: ErrorType.resourceError, message: 'Au vu des informations remplis, nous somme dans l\\'incapacité de générer votre bilan chez nous' });\n const { declaration, annexe } = selectedGlobalRegime.choices[choiceIndex];\n\n return { declaration, annex: annexe ?? null };\n}\n\nexport function retreiveChoicesDependingLegalForm(idLegalForm: number): GlobalRegimeTypeContent {\n const globalRegimes = Object.values(GlobalRegime);\n const selectedGlobalRegime = globalRegimes.find((gr) => gr.idLegalForms.includes(idLegalForm));\n\n if (!selectedGlobalRegime) throw new ServiceException({ code: Code.validationError, type: ErrorType.resourceError, message: `LegalForm #${idLegalForm} not implemented` });\n return selectedGlobalRegime;\n}"]}

package/dist/mjs/utils/email/templates/signature.js CHANGED Viewed

@@ -189,8 +189,8 @@ ${logoClementine}
         <% } %>
         Nos horaires : <%= horaires %>
-        <% if(!['Pourcentage ECE - AMEX', 'Pourcentage ECF'].includes(brandName)) { %>
-          Adresse : <%- brandPostalAddress %> - <%- brandCity %>
+        <% if(['Pourcentage ECE - AMEX', 'Pourcentage ECF'].includes(brandName)) { %>
+          <br/>Adresse : <%- brandPostalAddress %> - <%- brandCity %>
         <% } %>
       </p>

package/dist/mjs/utils/email/templates/signature.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"signature.js","sourceRoot":"","sources":["../../../../../ts/utils/email/templates/signature.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,GAAG;;;;;;;;;GASb,CAAC;AAEJ,MAAM,cAAc,GAAG;;;;;;;;;;;;aAYV,CAAC;AAEd,MAAM,MAAM,GAAG;;;;;;;;;;;;;;;;;;;;;;;UAuBL,CAAC;AAEX,MAAM,MAAM,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoGd,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,OAAO;;;;;;;EAOzC,cAAc;;;IAGZ,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAiGN,MAAM;;;;;;;;;SASD,CAAC","sourcesContent":["const newIban = `<% if (commercialName === 'Clementine' && isFacturation) { %>\n <p style=\"font-size: 15px; font-family: Arial; margin:0; padding:0px 0 4px; color:#6E6E71; margin-bottom: 10px; font-weight: bold;\">\n <span style=\"color: #A0A0A0\">Nos coordonnées bancaires </span>IBAN : <%= iban %> - BIC : <%= bic %>\n </p>\n <% }else if (commercialName === 'Pourcentage' && [5, 7].includes(idTypeBrand)) { %> \n <p style=\"font-size: 15px; font-family: Arial; margin:0; padding:0px 0 4px; color:#6E6E71; margin-bottom: 10px; font-weight: bold;\">\n <span style=\"color: #A0A0A0\">Attention changement de RIB </span>IBAN : <%= iban %> - BIC : <%= bic %>\n </p>\n<% } %>\n `;\n\nconst logoClementine = `<% if (commercialName === 'Clementine') { %><tr>\n<td\ncolspan=\"3\"\nclass=\"logo\"\nstyle=\"\"\nwidth=\"950\">\n <img\n src=\"https://clementine-website.s3.eu-west-3.amazonaws.com/logo_2022.png\"\n alt=\"Logo\"\n height=\"32\"\n style=\"padding-bottom: 10px;\">\n</td>\n</tr><% } %>`;\n\nconst avatar = `<% if (!forceRole && user?.avatar?.token) { %>\n <td\n class=\"avatar\"\n style=\"text-align:center; padding: 20px 0 20px 20px; position: relative;\"\n width=\"100\">\n <% if(commercialName === 'Clementine') { %>\n <p style=\"padding: 20px;background-image: url('https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_quotes.png');background-size: 26%;background-position: 81% -3%;background-repeat: no-repeat;\">\n <img\n style=\"max-height: 90px;max-width: 90px; border-radius: 100%; margin-top: 10px\"\n alt=\"Avatar\"\n src=\"<%= hostS3 %>users/<%= user.id %>/<%= user.avatar.token %>\"\n />\n </p>\n <% } else { %>\n <p style=\"padding: 20px;\">\n <img\n style=\"max-height: 90px;max-width: 90px; border-radius: 100%; margin-top: 10px\"\n alt=\"Avatar\"\n src=\"<%= hostS3 %>users/<%= user.id %>/<%= user.avatar.token %>\"\n />\n </p>\n <% } %>\n </td>\n <% } %>`;\n\nconst footer = `<% if(commercialName === 'Clementine') { %>\n <tr>\n <td\n style=\"clear:both; padding-top: 15px; font-size:17px; line-height:14px; color:#ADADAD; text-align: justify; font-family: Arial;\"\n colspan=\"4\">\n <table style=\"width: 100%\" width=\"100%\">\n <tr>\n <td colspan=\"7\" style=\"padding-bottom: 12px\">\n <span style=\"text-align: left; text-decoration: none; color: #A0A1A6; white-space: nowrap; float: left;\">\n Une question ? Découvrez votre <a href=\"https://www.clementine.fr/aide/\" style=\"color: #FF7E3C\">centre d'aide</a>\n </span>\n <span style=\"text-align: right; text-decoration: none; color: #A0A1A6; white-space: nowrap; float: right;\">\n Jusqu’à 500€ avec notre <a href=\"https://www.clementine.fr/parrainage/?utm_source=signature&utm_medium=email&utm_campaign=signature&utm_content=cta\" style=\"color: #FF7E3C\">programme de parrainage</a>\n </span>\n </td>\n </tr>\n <tr>\n <td style=\"padding:0 10px 0 0\" width=\"120\">\n <a href=\"https://app.clementine.fr/\" target=\"_blank\" style=\"text-decoration: none; color: #6E6E71; white-space: nowrap;\">\n <img\n src=\"https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_connect2.png\"\n style=\"vertical-align: text-top;\"\n width=\"20\"\n alt=\"Connexion\"> Connexion\n </a>\n </td>\n <td style=\"padding:0 10px 0 0\" width=\"170\">\n <!-- <a href=\"mailto:<%= supportMail %>\" target=\"_blank\" style=\"text-decoration: none; color: #6E6E71; white-space: nowrap;\">\n <img\n src=\"https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_support2.png\"\n style=\"vertical-align: text-top;\"\n width=\"17\"\n alt=\"Support technique\"> Support technique\n </a>-->\n </td>\n <td style=\"text-align: right; vertical-align: middle; color: #6E6E71\" width=\"430\">\n <!--<span>Télécharger l'app</span>\n <a href=\"https://apps.apple.com/fr/app/clementine/id1119493780\" target=\"_blank\" style=\"vertical-align: middle; margin-left: 10px\"><img\n src=\"https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_appstore.png\"\n alt=\"App Store\"\n style=\"width: 20px\"></a>\n <a href=\"https://play.google.com/store/apps/details?id=com.clementine.myclementine&hl=fr\" target=\"_blank\" style=\"vertical-align: middle; margin-left: 10px\"><img\n src=\"https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_playstore.png\"\n alt=\"Play Store\"\n style=\"width: 20px\"></a>-->\n </td>\n <td style=\"padding:0 5px 0 0\" width=\"24\">\n <a href=\"https://www.youtube.com/channel/UCVnCpcLdRwuYBLvAphHsvig/\" target=\"_blank\" style=\"vertical-align: middle;\"><img\n src=\"https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_youtube.png\"\n alt=\"YouTube\"\n style=\"width: 20px\"></a>\n </td>\n <td style=\"padding:0 5px 0 0\" width=\"24\">\n <a href=\"https://www.linkedin.com/company/compta-cl%C3%A9mentine/\" target=\"_blank\" style=\"vertical-align: middle;\"><img\n src=\"https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_linkedin.png\"\n alt=\"LinkedIn\"\n style=\"width: 20px\"></a>\n </td>\n <td style=\"padding:0 5px 0 0\" width=\"24\">\n <a href=\"https://www.instagram.com/comptaclementine/\" target=\"_blank\" style=\"vertical-align: middle;\"><img\n src=\"https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_instagram.png\"\n alt=\"Instagram\"\n style=\"width: 20px\"></a>\n </td>\n </tr>\n </table>\n </td>\n </tr>\n <% } else if(commercialName === 'Pourcentage') { %>\n <tr>\n <td\n style=\"clear:both; padding-top: 15px; font-size:17px; line-height:14px; color:#ADADAD; text-align: justify; font-family: Arial;\"\n colspan=\"4\">\n <table style=\"width: 100%\" width=\"100%\">\n <tr>\n <td style=\"padding:0 10px 0 0\" width=\"120\">\n <a href=\"https://app.pourcentage.fr/\" target=\"_blank\" style=\"text-decoration: none; color: #6E6E71; white-space: nowrap;\">\n <img\n src=\"https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_connect2.png\"\n style=\"vertical-align: text-top;\"\n width=\"20\"\n alt=\"Connexion\"> Connexion\n </a>\n </td>\n <td style=\"text-align: right; vertical-align: middle; color: #6E6E71\" width=\"430\">\n <!-- <span>Télécharger l'app</span>\n <a href=\"https://apps.apple.com/fr/app/pourcentage-fr/id1631156043\" target=\"_blank\" style=\"vertical-align: middle; margin-left: 10px\"><img\n src=\"https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_appstore.png\"\n alt=\"App Store\"\n style=\"width: 20px\"></a>\n <a href=\"https://play.google.com/store/apps/details?id=com.clementine.pourcentage\" target=\"_blank\" style=\"vertical-align: middle; margin-left: 10px\"><img\n src=\"https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_playstore.png\"\n alt=\"Play Store\"\n style=\"width: 20px\"></a> -->\n </td>\n </tr>\n </table>\n </td>\n </tr>\n <% } %>\n`;\n\nexport const signatureTemplate = `${newIban}<table\nborder=\"0\"\ncellpadding=\"0\"\ncellspacing=\"0\"\nwidth=\"950\"\nclass=\"signatureClementine\">\n\n${logoClementine}\n\n<tr style=\"background: #F4F8FB\">\n ${avatar}\n <td\n class=\"infos\"\n style=\" padding: 20px 0 20px 30px;font-size: 17px; font-family: Arial; color:#000\"\n width=\"390\"\n colspan=\"2\">\n <table\n border=\"0\"\n cellpadding=\"0\"\n cellspacing=\"0\"\n width=\"390\">\n <tr>\n <td width=\"390\">\n <p style=\"font-size: 17px; margin:0px 0; padding:0\">\n <strong><span style=\"color:<%= primaryColor %>; font-weight: bold;\"><%= user?.firstname ?? '' %> <%= user?.lastname ?? '' %></span></strong>\n </p>\n\n <% if(roleSignature) { %>\n <p style=\"font-size: 17px; margin:0px 0; padding:0\">\n <span style=\"color: #6E6E71; font-weight: bold;\"><%= roleSignature %></span>\n </p>\n <% } %>\n </td>\n </tr>\n </table>\n <p style=\"margin:16px 0; color:#6E6E71; border-top: 2px solid #6E6E71; width: 100px; opacity: 0.2\"><!-- --></p>\n <p style=\"margin:0px 0; padding:0 0 4px; color:#6E6E71;\">\n Standard : <%- standardPhoneSignature %><br/>\n <% if(phoneSignature && phoneSignature !== standardPhoneSignature) { %>\n Ligne directe : <%- phoneSignature %><br/>\n <% } %>\n Nos horaires : <%= horaires %>\n\n <% if(!['Pourcentage ECE - AMEX', 'Pourcentage ECF'].includes(brandName)) { %>\n Adresse : <%- brandPostalAddress %> - <%- brandCity %>\n <% } %>\n </p>\n\n </td>\n \n <td class=\"infos\" style=\"padding: 20px 20px 20px 0px; font-size: 17px; font-family: Arial; color:#000; <%= !user.calendlyUrl ? 'vertical-align: top;' : '' %>\"\n width=\"370\">\n <% if(['Clementine', 'Pourcentage', 'Comptalib'].includes(commercialName)) { %>\n <table\n border=\"0\"\n cellpadding=\"0\"\n cellspacing=\"0\"\n width=\"350\">\n <tr>\n <td width=\"230\">\n <!-- image Télécharger l'app mobile -->\n <img\n src=\"https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_download_app<%= commercialName === 'Pourcentage' ? '_pourcentage' : '' %><%= commercialName === 'Comptalib' ? '_comptalib' : '' %>.png\"\n alt=\"Télécharger l'application mobile\"\n style=\"width: 152px; float:right\">\n \n <p style=\"float:right; margin-right: 45px\">\n <span style=\"margin:0; padding:0 0 4px; color:#6E6E71;\">Disponible sur<br/></span>\n <a href=\"https://apps.apple.com/fr/app/clementine/id1119493780\" target=\"_blank\" style=\"vertical-align: middle;\"><img\n src=\"https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_appstore.png\"\n alt=\"App Store\"\n style=\"width: 20px\"></a>\n <a href=\"https://play.google.com/store/apps/details?id=com.clementine.myclementine&hl=fr\" target=\"_blank\" style=\"vertical-align: middle; margin-left: 10px\"><img\n src=\"https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_playstore.png\"\n alt=\"Play Store\"\n style=\"width: 20px\"></a>\n </p>\n </td>\n <td width=\"120\">\n <!-- QR Code -->\n <img\n src=\"https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_qrcode<%= commercialName === 'Pourcentage' ? '_pourcentage' : '' %><%= commercialName === 'Comptalib' ? '_comptalib' : '' %>.png\"\n style=\"width:128px\"\n alt=\"Prenez rendez-vous ici !\">\n </td>\n </tr>\n <tr>\n <td colspan=\"2\">\n <p style=\"margin:0; padding:0px 0 4px; color:#6E6E71; text-align: right\">\n <a href=\"https://www.smileyourpla.net/\" style=\"display: inline-block; color:#6E6E71;\" target=\"_blank\"><img\n src=\"https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_smileYourPlanet.png\"\n alt=\"Initiative Smile your planet\" height=\"36\"></a>\n <% if(user.calendlyUrl && !isDataOfficer) { %>\n <a href=\"<%= user.calendlyUrl %>\" style=\"display: inline-block; color:#6E6E71;\" target=\"_blank\">\n <img\n src=\"https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_rdv_tel<%= commercialName === 'Pourcentage' ? '_pourcentage' : '' %>.png\"\n alt=\"Demande de rdv téléphonique\">\n </a>\n <% } %>\n </p>\n </td>\n </tr>\n </table>\n <% } %>\n </td>\n </tr>\n \n ${footer}\n\n <tr>\n <td\n style=\"clear:both; padding-top: 20px; font-size:14px; line-height:18px; color:#ADADAD; text-align: justify; font-family: Arial;\"\n colspan=\"4\">\n Les informations contenues dans ce courrier électronique et ses pièces jointes sont confidentielles et couvertes par le secret professionnel. Si vous n'êtes pas le(s) destinataire(s) ou avez reçu ce courrier électronique par erreur, merci de bien vouloir supprimer l'email et d'en informer l'expéditeur dès que possible. Ce courrier électronique ne peut pas être divulgué, utilisé ou copié par quelqu'un d'autre que le(s) destinataire(s).\n </td>\n</tr>\n</table>`;"]}
1	+ {"version":3,"file":"signature.js","sourceRoot":"","sources":["../../../../../ts/utils/email/templates/signature.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,GAAG;;;;;;;;;GASb,CAAC;AAEJ,MAAM,cAAc,GAAG;;;;;;;;;;;;aAYV,CAAC;AAEd,MAAM,MAAM,GAAG;;;;;;;;;;;;;;;;;;;;;;;UAuBL,CAAC;AAEX,MAAM,MAAM,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoGd,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,OAAO;;;;;;;EAOzC,cAAc;;;IAGZ,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAiGN,MAAM;;;;;;;;;SASD,CAAC","sourcesContent":["const newIban = `<% if (commercialName === 'Clementine' && isFacturation) { %>\n <p style=\"font-size: 15px; font-family: Arial; margin:0; padding:0px 0 4px; color:#6E6E71; margin-bottom: 10px; font-weight: bold;\">\n <span style=\"color: #A0A0A0\">Nos coordonnées bancaires </span>IBAN : <%= iban %> - BIC : <%= bic %>\n </p>\n <% }else if (commercialName === 'Pourcentage' && [5, 7].includes(idTypeBrand)) { %> \n <p style=\"font-size: 15px; font-family: Arial; margin:0; padding:0px 0 4px; color:#6E6E71; margin-bottom: 10px; font-weight: bold;\">\n <span style=\"color: #A0A0A0\">Attention changement de RIB </span>IBAN : <%= iban %> - BIC : <%= bic %>\n </p>\n<% } %>\n `;\n\nconst logoClementine = `<% if (commercialName === 'Clementine') { %><tr>\n<td\ncolspan=\"3\"\nclass=\"logo\"\nstyle=\"\"\nwidth=\"950\">\n <img\n src=\"https://clementine-website.s3.eu-west-3.amazonaws.com/logo_2022.png\"\n alt=\"Logo\"\n height=\"32\"\n style=\"padding-bottom: 10px;\">\n</td>\n</tr><% } %>`;\n\nconst avatar = `<% if (!forceRole && user?.avatar?.token) { %>\n <td\n class=\"avatar\"\n style=\"text-align:center; padding: 20px 0 20px 20px; position: relative;\"\n width=\"100\">\n <% if(commercialName === 'Clementine') { %>\n <p style=\"padding: 20px;background-image: url('https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_quotes.png');background-size: 26%;background-position: 81% -3%;background-repeat: no-repeat;\">\n <img\n style=\"max-height: 90px;max-width: 90px; border-radius: 100%; margin-top: 10px\"\n alt=\"Avatar\"\n src=\"<%= hostS3 %>users/<%= user.id %>/<%= user.avatar.token %>\"\n />\n </p>\n <% } else { %>\n <p style=\"padding: 20px;\">\n <img\n style=\"max-height: 90px;max-width: 90px; border-radius: 100%; margin-top: 10px\"\n alt=\"Avatar\"\n src=\"<%= hostS3 %>users/<%= user.id %>/<%= user.avatar.token %>\"\n />\n </p>\n <% } %>\n </td>\n <% } %>`;\n\nconst footer = `<% if(commercialName === 'Clementine') { %>\n <tr>\n <td\n style=\"clear:both; padding-top: 15px; font-size:17px; line-height:14px; color:#ADADAD; text-align: justify; font-family: Arial;\"\n colspan=\"4\">\n <table style=\"width: 100%\" width=\"100%\">\n <tr>\n <td colspan=\"7\" style=\"padding-bottom: 12px\">\n <span style=\"text-align: left; text-decoration: none; color: #A0A1A6; white-space: nowrap; float: left;\">\n Une question ? Découvrez votre <a href=\"https://www.clementine.fr/aide/\" style=\"color: #FF7E3C\">centre d'aide</a>\n </span>\n <span style=\"text-align: right; text-decoration: none; color: #A0A1A6; white-space: nowrap; float: right;\">\n Jusqu’à 500€ avec notre <a href=\"https://www.clementine.fr/parrainage/?utm_source=signature&utm_medium=email&utm_campaign=signature&utm_content=cta\" style=\"color: #FF7E3C\">programme de parrainage</a>\n </span>\n </td>\n </tr>\n <tr>\n <td style=\"padding:0 10px 0 0\" width=\"120\">\n <a href=\"https://app.clementine.fr/\" target=\"_blank\" style=\"text-decoration: none; color: #6E6E71; white-space: nowrap;\">\n <img\n src=\"https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_connect2.png\"\n style=\"vertical-align: text-top;\"\n width=\"20\"\n alt=\"Connexion\"> Connexion\n </a>\n </td>\n <td style=\"padding:0 10px 0 0\" width=\"170\">\n <!-- <a href=\"mailto:<%= supportMail %>\" target=\"_blank\" style=\"text-decoration: none; color: #6E6E71; white-space: nowrap;\">\n <img\n src=\"https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_support2.png\"\n style=\"vertical-align: text-top;\"\n width=\"17\"\n alt=\"Support technique\"> Support technique\n </a>-->\n </td>\n <td style=\"text-align: right; vertical-align: middle; color: #6E6E71\" width=\"430\">\n <!--<span>Télécharger l'app</span>\n <a href=\"https://apps.apple.com/fr/app/clementine/id1119493780\" target=\"_blank\" style=\"vertical-align: middle; margin-left: 10px\"><img\n src=\"https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_appstore.png\"\n alt=\"App Store\"\n style=\"width: 20px\"></a>\n <a href=\"https://play.google.com/store/apps/details?id=com.clementine.myclementine&hl=fr\" target=\"_blank\" style=\"vertical-align: middle; margin-left: 10px\"><img\n src=\"https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_playstore.png\"\n alt=\"Play Store\"\n style=\"width: 20px\"></a>-->\n </td>\n <td style=\"padding:0 5px 0 0\" width=\"24\">\n <a href=\"https://www.youtube.com/channel/UCVnCpcLdRwuYBLvAphHsvig/\" target=\"_blank\" style=\"vertical-align: middle;\"><img\n src=\"https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_youtube.png\"\n alt=\"YouTube\"\n style=\"width: 20px\"></a>\n </td>\n <td style=\"padding:0 5px 0 0\" width=\"24\">\n <a href=\"https://www.linkedin.com/company/compta-cl%C3%A9mentine/\" target=\"_blank\" style=\"vertical-align: middle;\"><img\n src=\"https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_linkedin.png\"\n alt=\"LinkedIn\"\n style=\"width: 20px\"></a>\n </td>\n <td style=\"padding:0 5px 0 0\" width=\"24\">\n <a href=\"https://www.instagram.com/comptaclementine/\" target=\"_blank\" style=\"vertical-align: middle;\"><img\n src=\"https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_instagram.png\"\n alt=\"Instagram\"\n style=\"width: 20px\"></a>\n </td>\n </tr>\n </table>\n </td>\n </tr>\n <% } else if(commercialName === 'Pourcentage') { %>\n <tr>\n <td\n style=\"clear:both; padding-top: 15px; font-size:17px; line-height:14px; color:#ADADAD; text-align: justify; font-family: Arial;\"\n colspan=\"4\">\n <table style=\"width: 100%\" width=\"100%\">\n <tr>\n <td style=\"padding:0 10px 0 0\" width=\"120\">\n <a href=\"https://app.pourcentage.fr/\" target=\"_blank\" style=\"text-decoration: none; color: #6E6E71; white-space: nowrap;\">\n <img\n src=\"https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_connect2.png\"\n style=\"vertical-align: text-top;\"\n width=\"20\"\n alt=\"Connexion\"> Connexion\n </a>\n </td>\n <td style=\"text-align: right; vertical-align: middle; color: #6E6E71\" width=\"430\">\n <!-- <span>Télécharger l'app</span>\n <a href=\"https://apps.apple.com/fr/app/pourcentage-fr/id1631156043\" target=\"_blank\" style=\"vertical-align: middle; margin-left: 10px\"><img\n src=\"https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_appstore.png\"\n alt=\"App Store\"\n style=\"width: 20px\"></a>\n <a href=\"https://play.google.com/store/apps/details?id=com.clementine.pourcentage\" target=\"_blank\" style=\"vertical-align: middle; margin-left: 10px\"><img\n src=\"https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_playstore.png\"\n alt=\"Play Store\"\n style=\"width: 20px\"></a> -->\n </td>\n </tr>\n </table>\n </td>\n </tr>\n <% } %>\n`;\n\nexport const signatureTemplate = `${newIban}<table\nborder=\"0\"\ncellpadding=\"0\"\ncellspacing=\"0\"\nwidth=\"950\"\nclass=\"signatureClementine\">\n\n${logoClementine}\n\n<tr style=\"background: #F4F8FB\">\n ${avatar}\n <td\n class=\"infos\"\n style=\" padding: 20px 0 20px 30px;font-size: 17px; font-family: Arial; color:#000\"\n width=\"390\"\n colspan=\"2\">\n <table\n border=\"0\"\n cellpadding=\"0\"\n cellspacing=\"0\"\n width=\"390\">\n <tr>\n <td width=\"390\">\n <p style=\"font-size: 17px; margin:0px 0; padding:0\">\n <strong><span style=\"color:<%= primaryColor %>; font-weight: bold;\"><%= user?.firstname ?? '' %> <%= user?.lastname ?? '' %></span></strong>\n </p>\n\n <% if(roleSignature) { %>\n <p style=\"font-size: 17px; margin:0px 0; padding:0\">\n <span style=\"color: #6E6E71; font-weight: bold;\"><%= roleSignature %></span>\n </p>\n <% } %>\n </td>\n </tr>\n </table>\n <p style=\"margin:16px 0; color:#6E6E71; border-top: 2px solid #6E6E71; width: 100px; opacity: 0.2\"><!-- --></p>\n <p style=\"margin:0px 0; padding:0 0 4px; color:#6E6E71;\">\n Standard : <%- standardPhoneSignature %><br/>\n <% if(phoneSignature && phoneSignature !== standardPhoneSignature) { %>\n Ligne directe : <%- phoneSignature %><br/>\n <% } %>\n Nos horaires : <%= horaires %>\n\n <% if(['Pourcentage ECE - AMEX', 'Pourcentage ECF'].includes(brandName)) { %>\n <br/>Adresse : <%- brandPostalAddress %> - <%- brandCity %>\n <% } %>\n </p>\n\n </td>\n \n <td class=\"infos\" style=\"padding: 20px 20px 20px 0px; font-size: 17px; font-family: Arial; color:#000; <%= !user.calendlyUrl ? 'vertical-align: top;' : '' %>\"\n width=\"370\">\n <% if(['Clementine', 'Pourcentage', 'Comptalib'].includes(commercialName)) { %>\n <table\n border=\"0\"\n cellpadding=\"0\"\n cellspacing=\"0\"\n width=\"350\">\n <tr>\n <td width=\"230\">\n <!-- image Télécharger l'app mobile -->\n <img\n src=\"https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_download_app<%= commercialName === 'Pourcentage' ? '_pourcentage' : '' %><%= commercialName === 'Comptalib' ? '_comptalib' : '' %>.png\"\n alt=\"Télécharger l'application mobile\"\n style=\"width: 152px; float:right\">\n \n <p style=\"float:right; margin-right: 45px\">\n <span style=\"margin:0; padding:0 0 4px; color:#6E6E71;\">Disponible sur<br/></span>\n <a href=\"https://apps.apple.com/fr/app/clementine/id1119493780\" target=\"_blank\" style=\"vertical-align: middle;\"><img\n src=\"https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_appstore.png\"\n alt=\"App Store\"\n style=\"width: 20px\"></a>\n <a href=\"https://play.google.com/store/apps/details?id=com.clementine.myclementine&hl=fr\" target=\"_blank\" style=\"vertical-align: middle; margin-left: 10px\"><img\n src=\"https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_playstore.png\"\n alt=\"Play Store\"\n style=\"width: 20px\"></a>\n </p>\n </td>\n <td width=\"120\">\n <!-- QR Code -->\n <img\n src=\"https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_qrcode<%= commercialName === 'Pourcentage' ? '_pourcentage' : '' %><%= commercialName === 'Comptalib' ? '_comptalib' : '' %>.png\"\n style=\"width:128px\"\n alt=\"Prenez rendez-vous ici !\">\n </td>\n </tr>\n <tr>\n <td colspan=\"2\">\n <p style=\"margin:0; padding:0px 0 4px; color:#6E6E71; text-align: right\">\n <a href=\"https://www.smileyourpla.net/\" style=\"display: inline-block; color:#6E6E71;\" target=\"_blank\"><img\n src=\"https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_smileYourPlanet.png\"\n alt=\"Initiative Smile your planet\" height=\"36\"></a>\n <% if(user.calendlyUrl && !isDataOfficer) { %>\n <a href=\"<%= user.calendlyUrl %>\" style=\"display: inline-block; color:#6E6E71;\" target=\"_blank\">\n <img\n src=\"https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_rdv_tel<%= commercialName === 'Pourcentage' ? '_pourcentage' : '' %>.png\"\n alt=\"Demande de rdv téléphonique\">\n </a>\n <% } %>\n </p>\n </td>\n </tr>\n </table>\n <% } %>\n </td>\n </tr>\n \n ${footer}\n\n <tr>\n <td\n style=\"clear:both; padding-top: 20px; font-size:14px; line-height:18px; color:#ADADAD; text-align: justify; font-family: Arial;\"\n colspan=\"4\">\n Les informations contenues dans ce courrier électronique et ses pièces jointes sont confidentielles et couvertes par le secret professionnel. Si vous n'êtes pas le(s) destinataire(s) ou avez reçu ce courrier électronique par erreur, merci de bien vouloir supprimer l'email et d'en informer l'expéditeur dès que possible. Ce courrier électronique ne peut pas être divulgué, utilisé ou copié par quelqu'un d'autre que le(s) destinataire(s).\n </td>\n</tr>\n</table>`;"]}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@silexpert/core",
-  "version": "1.1.250",
+  "version": "1.1.252",
   "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/User.ts CHANGED Viewed

@@ -1,6 +1,7 @@
 import { Resource } from '../Resource';
 import {
   IUser, QueryConfirm, QueryResendConfirmationLink, CreateUser, CreateCoworker, QueryUserSmsConfirmation, QueryGetAllFromSociety, ISociety, Role, TimeCounterType, QueryGetAllCollaborators, QueryGetAllCollaboratorsByRoles, QueryUserSociety, QueryGetAllWithoutBp,
+  CollaboratorsByRoles,
 } from '../../types';
 export class User extends Resource {
@@ -31,7 +32,7 @@ export class User extends Resource {
   allCollaborators(params: QueryGetAllCollaborators): Promise<IUser[]> {
     return this.axios.$get('user/all-collaborators', { params });
   }
-  allCollaboratorsByRoles(data: QueryGetAllCollaboratorsByRoles): Promise<IUser> {
+  allCollaboratorsByRoles(data: QueryGetAllCollaboratorsByRoles): Promise<CollaboratorsByRoles[]> {
     const { idTimeCounterType, idRoles } = data;
     let params = { idRoles };
     if (idTimeCounterType) {

package/ts/types/Enum/Aspone.ts CHANGED Viewed

@@ -8,9 +8,12 @@ export enum RedactorDesignation {
 export enum Rof {
   TVA = 'TVA1',
   BNC = 'BNC1',
+  BNC2 = 'BNC2',
+  BNC3 = 'BNC3',
   IS = 'IS1',
   BIC = 'BIC1',
   BIC2 = 'BIC2',
+  BIC3 = 'BIC3',
 }
 export enum AsponeTaxSystem {

package/ts/types/Enum/BrandClementine.ts CHANGED Viewed

@@ -314,9 +314,9 @@ export const BrandClementine = [
       footerColor: '#f3692f',
     },
     listPhones: {
-      contact: '01 76 39 00 60',
-      qualite: '01 76 39 00 60',
-      juridique: '01 76 39 00 60',
+      contact: '03 83 93 14 14',
+      qualite: '03 83 93 14 14',
+      juridique: '03 83 93 14 14',
     },
     listMails: {
       contact: 'comptastart@legalstart.fr',

package/ts/types/Interface/api/society/CreateUserToSocietyWithPermission.ts CHANGED Viewed

@@ -1,19 +1,44 @@
+import { IsBoolean, IsEmail, IsOptional, IsString } from 'class-validator';
 import { ApiProperty, ApiPropertyOptional } from '../../../../utils';
 import { Permissions } from '../user/Permissions';
+import { ToBoolean } from '../../../../utils/transforms/boolean.transform';
 export class CreateUserToSocietyWithPermission {
   @ApiProperty()
+  @IsEmail()
     email: string;
   @ApiProperty()
+  @IsString()
     firstname: string;
   @ApiProperty()
+  @IsString()
     lastname: string;
-  @ApiProperty()
+  @ApiPropertyOptional()
+  @IsBoolean()
+  @ToBoolean()
+  @IsOptional()
     acceptCgv?: boolean; // not sure if needed (maybe more a front notion)
-  @ApiProperty()
-    permissions: Partial<Permissions>;
+  @ApiPropertyOptional()
+    permissions?: Partial<Permissions>;
   @ApiPropertyOptional()
+  @IsBoolean()
+  @ToBoolean()
+  @IsOptional()
     acceptNewsletter?: boolean;
   @ApiPropertyOptional()
+  @IsString()
+  @IsOptional()
     phone?: string;
+  @ApiPropertyOptional()
+  @IsBoolean()
+  @ToBoolean()
+  @IsOptional()
+    withoutPermissions?:  boolean;
 }

package/ts/types/Interface/api/society/UpdateSociety.ts CHANGED Viewed

@@ -67,6 +67,9 @@ export class UpdateSociety {
   @ApiPropertyOptional()
     canceledFirstStepTourAt?: Date;
+  @ApiPropertyOptional()
+    passwordIsuite?: string | null;
   @ApiPropertyOptional()
   @IsBoolean()
   @ToBoolean()

package/ts/types/Interface/models/ICollaboraterDetail.ts CHANGED Viewed

@@ -7,6 +7,7 @@ export interface ICollaboraterDetail {
   idNationality: number;
   idCountryOfBirth: number;
   maidenName?: string | null;
+  birthdate: Date;
   socialSecurityNumber: string;
   cityOfBirth: string;
   address: string;

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

@@ -165,6 +165,7 @@ export interface ISociety {
   hidePartneredAccountantsBubbleLink?: boolean | null;
   cancelCompleteCreationModal?: Date | null;
   isCreatedInApp?: boolean;
+  passwordIsuite?: string | null;
   // Associations
   accounts?: IAccount[];

package/ts/types/Interface/models/IVatDeclarationSocietyDetail.ts CHANGED Viewed

@@ -5,6 +5,7 @@ import { ISociety } from './ISociety';
 export interface IVatDeclarationSocietyDetail {
   id?: number;
   companyTaxRof: Rof | null;
+  balanceSheetRof: Rof | null;
   rof: Rof | null;
   ogaName: string | null;
   ogaId: string | null;

package/ts/utils/bankAccount.ts CHANGED Viewed

@@ -18,10 +18,17 @@ export function isSynchro(params: IBankAccount, dateOfTermination?: Date, bankCo
   // // Si JE DECLARE ou AUTRE alors tjs synchro
   if (params.idPartnerType && [PartnerTransactionType.JE_DECLARE, PartnerTransactionType.OTHER].includes(params.idPartnerType)) return StateSynchro.SYNCHRONIZED;
-  // // Si budget et lastUpdate = la date du jour alors synchro
+  /**  Si budget lastUpdate = la date du jour alors synchro
+   * Ou si lastupdate = inProgressImport et lastupdate est après lastTryImport
+   *
+   *
+   */
   if (params.idPartnerType && params.lastUpdate &&
-    [PartnerTransactionType.QONTO, PartnerTransactionType.SHINE, PartnerTransactionType.BUDGET_INSIGHT].includes(params.idPartnerType) &&
-  dayjs(params.lastUpdate).format('YYYY-MM-DD') === dayjs().format('YYYY-MM-DD')
+    [PartnerTransactionType.QONTO, PartnerTransactionType.SHINE, PartnerTransactionType.BUDGET_INSIGHT].includes(params.idPartnerType)
+    && ((dayjs(params.lastUpdate).format('YYYY-MM-DD') === dayjs().format('YYYY-MM-DD') ) ||
+    (dayjs(params.lastUpdate).format('YYYY-MM-DD') === dayjs(params.inProgressImport).format('YYYY-MM-DD') &&
+    (!params.lastTryImport || dayjs(params.lastUpdate).format('YYYYMMDD') >= dayjs(params.lastTryImport).format('YYYYMMDD')) )
+    )
   && (!bankConnection || bankConnection?.errorCode === null)
   ) return StateSynchro.SYNCHRONIZED;

package/ts/utils/cerfa.ts CHANGED Viewed

@@ -1,17 +1,44 @@
 import { ReadCerfaToComplete } from '../types/Interface/api/cerfa/ReadCerfa';
 import { GlobalRegime, GlobalRegimeTypeContent } from '../types/Enum/GlobalRegime';
-import { ProfitsType, FiscalRegime, TaxSystem } from '../types';
+import { ProfitsType, FiscalRegime, TaxSystem, Code, ErrorType } from '../types';
+import { isDefined } from 'class-validator';
+type ErrorParams = { code: Code, type: ErrorType, message?: string } | string;
+export class ServiceException extends Error {
+  private readonly code: Code;
+  private readonly type: ErrorType;
+  constructor(params: ErrorParams) {
+    if (typeof params === 'string') {
+      super(params);
+      return;
+    }
+    super(params.message);
+    this.code = params.code;
+    this.type = params.type;
+  }
+}
 export function retrieveCerfaFromSocietyInformations(idLegalForm: number, idTaxSystem: TaxSystem, idFiscalRegime: FiscalRegime, profitsType: ProfitsType):ReadCerfaToComplete {
   const globalRegimes = Object.values(GlobalRegime);
   const selectedGlobalRegime = globalRegimes.find((gr) => gr.idLegalForms.includes(idLegalForm));
-  if (!selectedGlobalRegime) throw new Error('Missing informations to retrieve CERFA informations');
+  if (!selectedGlobalRegime) throw new ServiceException({ code: Code.validationError, type: ErrorType.resourceError, message: 'Votre raison sociale ne vous permet pas de générer votre bilan chez nous' });
-  const choiceIndex = selectedGlobalRegime.choices.findIndex((sgr) => sgr.idFiscalRegime === idFiscalRegime && sgr.profitsType === profitsType && sgr.idTaxSystem === idTaxSystem);
+  if (!isDefined(idFiscalRegime) || !isDefined(profitsType) || !isDefined(idTaxSystem)) {
+    const missingData: string[] = [];
+    if (!isDefined(idFiscalRegime)) missingData.push('Régime de droit commun');
+    if (!isDefined(profitsType)) missingData.push('Régime d\'imposition');
+    if (!isDefined(idTaxSystem)) missingData.push('Activité (BNC, BIC)');
+    const errorMEssage = `Les informations suivantes sont manquantes pour déterminer votre régime ficscal: ${missingData.join(', ')}`;
+    throw new ServiceException({ code: Code.validationError, type: ErrorType.resourceError, message: errorMEssage });
+  }
-  if (choiceIndex < 0) throw new Error('Missing informations to retrieve CERFA informations');
+  const choiceIndex = selectedGlobalRegime.choices.findIndex((sgr) => sgr.idFiscalRegime === idFiscalRegime && sgr.profitsType === profitsType && sgr.idTaxSystem === idTaxSystem);
+  if (choiceIndex < 0) throw new ServiceException({ code: Code.validationError, type: ErrorType.resourceError, message: 'Au vu des informations remplis, nous somme dans l\'incapacité de générer votre bilan chez nous' });
   const { declaration, annexe } = selectedGlobalRegime.choices[choiceIndex];
   return { declaration, annex: annexe ?? null };
@@ -21,6 +48,6 @@ export function retreiveChoicesDependingLegalForm(idLegalForm: number): GlobalRe
   const globalRegimes = Object.values(GlobalRegime);
   const selectedGlobalRegime = globalRegimes.find((gr) => gr.idLegalForms.includes(idLegalForm));
-  if (!selectedGlobalRegime) throw new Error(`LegalForm #${idLegalForm} not implemented`);
+  if (!selectedGlobalRegime) throw new ServiceException({ code: Code.validationError, type: ErrorType.resourceError, message: `LegalForm #${idLegalForm} not implemented` });
   return selectedGlobalRegime;
 }

package/ts/utils/email/templates/signature.ts CHANGED Viewed

@@ -193,8 +193,8 @@ ${logoClementine}
         <% } %>
         Nos horaires : <%= horaires %>
-        <% if(!['Pourcentage ECE - AMEX', 'Pourcentage ECF'].includes(brandName)) { %>
-          Adresse : <%- brandPostalAddress %> - <%- brandCity %>
+        <% if(['Pourcentage ECE - AMEX', 'Pourcentage ECF'].includes(brandName)) { %>
+          <br/>Adresse : <%- brandPostalAddress %> - <%- brandCity %>
         <% } %>
       </p>