@silexpert/core 1.1.225 → 1.1.227

package/ts/types/Interface/api/paymentExpectationCustomer/CreatePaymentExpectationCustomer.ts

@@ -1,3 +1,5 @@
+import { IsEmail, IsOptional, IsString } from 'class-validator';
+import { ApiProperty, ApiPropertyOptional } from '../../../../utils';
 import { IPaymentExpectationCustomer } from '../../models/IPaymentExpectationCustomer';
 
 export class CreateSocietyPaymentExpectationCustomer implements Partial<Omit<IPaymentExpectationCustomer, 'paymentExpectationEstimateInvoice' | 'thirdParty'>> {
@@ -14,4 +16,28 @@ export class CreateSocietyPaymentExpectationCustomer implements Partial<Omit<IPa
   idEstimateInvoice?: number | null | undefined;
 
   idSociety: number;
+}
+
+export class SendPaymentExpectationCustomer {
+  @ApiProperty()
+  @IsEmail()
+    to: string;
+
+  @ApiPropertyOptional()
+  @IsEmail()
+  @IsOptional()
+    copy?: string;
+
+  @ApiPropertyOptional()
+  @IsEmail()
+  @IsOptional()
+    replyTo?: string;
+
+  @ApiProperty()
+  @IsString()
+    object: string;
+
+  @ApiProperty()
+  @IsString()
+    content: string;
 }

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

@@ -357,4 +357,24 @@ export class GetNote {
     gedFileType: number;
 }
 
+export class QueryRevisionExport {
+  @ApiProperty()
+  @IsString()
+    dateStart: string;
+
+  @ApiProperty()
+  @IsString()
+    dateEnd: string;
+
+  @ApiProperty()
+  @IsBoolean()
+  @ToBoolean()
+    ik: boolean;
+
+  @ApiProperty()
+  @IsBoolean()
+  @ToBoolean()
+    sales: boolean;
+}
+
 

package/ts/types/Interface/models/ISocietyDetail.ts

@@ -124,6 +124,10 @@ export interface ISocietyDetail {
   CCASetup?: boolean | null;
   usingExpenseReports?: boolean | null;
   usingIK?: boolean | null;
+  unemploymentInsurance?: boolean | null;
+  hasMutualInsurance?: boolean | null;
+  hasProfessionalLiabilityInsurance?: boolean | null;
+  insuranceContractAudit?: boolean | null;
   createdAt?: Date | null;
   updatedAt?: Date | null;
 

package/ts/utils/checkup.ts

@@ -740,6 +740,47 @@ export const getCheckupDetailForm = (
       //     }
       ],
     },
+    {
+      name: 'Assurance',
+      questions: [
+        {
+          component: 'FormInputSwitch', //'FormInputRadio',
+          text: 'Êtes-vous indemnisé par l’assurance chômage ?',
+          value: 'unemploymentInsurance',
+          meta: {
+            hideDetails: true,
+          },
+          lg: 6,
+        },
+        {
+          component: 'FormInputSwitch', //'FormInputRadio',
+          text: 'Avez-vous une couverture mutuelle ?',
+          value: 'hasMutualInsurance',
+          meta: {
+            hideDetails: true,
+          },
+          lg: 6,
+        },
+        {
+          component: 'FormInputSwitch', //'FormInputRadio',
+          text: 'Avez-vous une responsabilité civile professionnelle (RC Pro) ?',
+          value: 'hasProfessionalLiabilityInsurance',
+          meta: {
+            hideDetails: true,
+          },
+          lg: 6,
+        },
+        {
+          component: 'FormInputSwitch', //'FormInputRadio',
+          text: 'Souhaitez-vous faire un audit de vos contracts d’assurances ?',
+          value: 'insuranceContractAudit',
+          meta: {
+            hideDetails: true,
+          },
+          lg: 6,
+        },
+      ],
+    },
     {
       name: 'Conclusion',
       questions: [

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

@@ -14,7 +14,7 @@ const logoClementine = `<% if (commercialName === 'Clementine') { %><tr>
 colspan="3"
 class="logo"
 style=""
-width="850">
+width="950">
   <img
     src="https://clementine-website.s3.eu-west-3.amazonaws.com/logo_2022.png"
     alt="Logo"
@@ -51,9 +51,19 @@ const avatar = `<% if (!forceRole && user?.avatar?.token) { %>
 const footer = `<% if(commercialName === 'Clementine') { %>
     <tr>
       <td
-        style="clear:both; padding-top: 20px; font-size:17px; line-height:14px; color:#ADADAD; text-align: justify; font-family: Arial;"
+        style="clear:both; padding-top: 15px; font-size:17px; line-height:14px; color:#ADADAD; text-align: justify; font-family: Arial;"
         colspan="4">
         <table style="width: 100%" width="100%">
+          <tr>
+            <td colspan="7" style="padding-bottom: 12px">
+              <span style="text-align: left; text-decoration: none; color: #A0A1A6; white-space: nowrap; float: left;">
+                Une question ? Découvrez votre <a href="https://www.clementine.fr/aide/" style="color: #FF7E3C">centre d'aide</a>
+              </span>
+              <span style="text-align: right; text-decoration: none; color: #A0A1A6; white-space: nowrap; float: right;">
+                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>
+              </span>
+            </td>
+          </tr>
           <tr>
             <td style="padding:0 10px 0 0" width="120">
               <a href="https://app.clementine.fr/" target="_blank"  style="text-decoration: none; color: #6E6E71; white-space: nowrap;">
@@ -65,13 +75,24 @@ const footer = `<% if(commercialName === 'Clementine') { %>
               </a>
             </td>
             <td style="padding:0 10px 0 0" width="170">
-              <a href="mailto:<%= supportMail %>" target="_blank" style="text-decoration: none; color: #6E6E71; white-space: nowrap;">
+              <!-- <a href="mailto:<%= supportMail %>" target="_blank" style="text-decoration: none; color: #6E6E71; white-space: nowrap;">
                 <img
                   src="https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_support2.png"
                   style="vertical-align: text-top;"
                   width="17"
                   alt="Support technique"> Support technique
-              </a>
+              </a>-->
+            </td>
+            <td style="text-align: right; vertical-align: middle; color: #6E6E71" width="430">
+              <!--<span>Télécharger l'app</span>
+              <a href="https://apps.apple.com/fr/app/clementine/id1119493780" target="_blank" style="vertical-align: middle; margin-left: 10px"><img
+                src="https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_appstore.png"
+                alt="App Store"
+                style="width: 20px"></a>
+              <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
+                src="https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_playstore.png"
+                alt="Play Store"
+                style="width: 20px"></a>-->
             </td>
             <td style="padding:0 5px 0 0" width="24">
               <a href="https://www.youtube.com/channel/UCVnCpcLdRwuYBLvAphHsvig/" target="_blank" style="vertical-align: middle;"><img
@@ -91,27 +112,6 @@ const footer = `<% if(commercialName === 'Clementine') { %>
                 alt="Instagram"
                 style="width: 20px"></a>
             </td>
-            <td style="text-align: right; vertical-align: middle; color: #6E6E71" width="430">
-              <span>Télécharger l'app</span>
-              <a href="https://apps.apple.com/fr/app/clementine/id1119493780" target="_blank" style="vertical-align: middle; margin-left: 10px"><img
-                src="https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_appstore.png"
-                alt="App Store"
-                style="width: 20px"></a>
-              <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
-                src="https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_playstore.png"
-                alt="Play Store"
-                style="width: 20px"></a>
-            </td>
-          </tr>
-          <tr>
-            <td colspan="7" style="padding-top: 12px">
-              <span style="text-align: left; text-decoration: none; color: #A0A1A6; white-space: nowrap; float: left;">
-                Une question ? Découvrez votre <a href="https://www.clementine.fr/aide/" style="color: #FF7E3C">centre d'aide</a>
-              </span>
-              <span style="text-align: right; text-decoration: none; color: #A0A1A6; white-space: nowrap; float: right;">
-                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>
-              </span>
-            </td>
           </tr>
         </table>
       </td>
@@ -119,7 +119,7 @@ const footer = `<% if(commercialName === 'Clementine') { %>
   <% } else if(commercialName === 'Pourcentage') { %>
     <tr>
       <td
-        style="clear:both; padding-top: 20px; font-size:17px; line-height:14px; color:#ADADAD; text-align: justify; font-family: Arial;"
+        style="clear:both; padding-top: 15px; font-size:17px; line-height:14px; color:#ADADAD; text-align: justify; font-family: Arial;"
         colspan="4">
         <table style="width: 100%" width="100%">
           <tr>
@@ -133,7 +133,7 @@ const footer = `<% if(commercialName === 'Clementine') { %>
               </a>
             </td>
             <td style="text-align: right; vertical-align: middle; color: #6E6E71" width="430">
-              <span>Télécharger l'app</span>
+              <!-- <span>Télécharger l'app</span>
               <a href="https://apps.apple.com/fr/app/pourcentage-fr/id1631156043" target="_blank" style="vertical-align: middle; margin-left: 10px"><img
                 src="https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_appstore.png"
                 alt="App Store"
@@ -141,7 +141,7 @@ const footer = `<% if(commercialName === 'Clementine') { %>
               <a href="https://play.google.com/store/apps/details?id=com.clementine.pourcentage" target="_blank" style="vertical-align: middle; margin-left: 10px"><img
                 src="https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_playstore.png"
                 alt="Play Store"
-                style="width: 20px"></a>
+                style="width: 20px"></a> -->
             </td>
           </tr>
         </table>
@@ -154,7 +154,7 @@ export const signatureTemplate = `${newIban}<table
 border="0"
 cellpadding="0"
 cellspacing="0"
-width="850"
+width="950"
 class="signatureClementine">
 
 ${logoClementine}
@@ -164,59 +164,91 @@ ${logoClementine}
   <td
     class="infos"
     style=" padding: 20px 0 20px 30px;font-size: 17px; font-family: Arial; color:#000"
-    width="290"
+    width="390"
     colspan="2">
     <table
       border="0"
       cellpadding="0"
       cellspacing="0"
-      width="290">
+      width="390">
       <tr>
-        <td width="290">
+        <td width="390">
           <p style="font-size: 17px; margin:0px 0; padding:0">
             <strong><span style="color:<%= primaryColor %>; font-weight: bold;"><%= user?.firstname ?? '' %> <%= user?.lastname ?? '' %></span></strong>
           </p>
 
           <% if(roleSignature) { %>
             <p style="font-size: 17px; margin:0px 0; padding:0">
-              <span style="color: #6E6E71; font-weight: bold;"><%= roleSignature %></span></p>
+              <span style="color: #6E6E71; font-weight: bold;"><%= roleSignature %></span>
             </p>
           <% } %>
         </td>
       </tr>
     </table>
-
-      <p style="margin:16px 0; color:#6E6E71; border-top: 2px solid #6E6E71; width: 100px; opacity: 0.2"><!-- --></p><p style="margin:0; padding:0px 0 4px; color:#6E6E71;">Nos horaires :<br/><%= horaires %></p>
+      <p style="margin:16px 0; color:#6E6E71; border-top: 2px solid #6E6E71; width: 100px; opacity: 0.2"><!-- --></p>
+      <p style="margin:0px 0; padding:0 0 4px;  color:#6E6E71;">
+        Standard : <%= standardPhoneSignature %><br/>
+        <% if(phoneSignature && phoneSignature !== standardPhoneSignature) { %>
+          Ligne directe : <%- phoneSignature %><br/>
+        <% } %>
+        Nos horaires : <%= horaires %>
+      </p>
     </td>
     
     <td class="infos" style="padding: 20px 20px 20px 0px; font-size: 17px; font-family: Arial; color:#000; <%= !user.calendlyUrl ? 'vertical-align: top;' : '' %>"
       width="370">
-        <p style="margin:0px 0; padding:2px 0; color:#6E6E71; padding-left: 10px">
-          <span style="float:right">Standard : <%= standardPhoneSignature %></span><br/>
-          <% if(phoneSignature && phoneSignature !== standardPhoneSignature) { %>
-            <span style="float:right">Ligne directe : <%- phoneSignature %></span><br/>
-          <% } %>
-        </p>
-  
-        <p style="margin:20px 60px 0 0; padding:0px 0 4px; color:#6E6E71; text-align: right; height: 54px;">
-          <% if(user.calendlyUrl) { %>
-            <img
-                src="https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_rightArrow.png"
+        <% if(['Clementine', 'Pourcentage', 'Comptalib'].includes(commercialName)) { %>
+          <table
+            border="0"
+            cellpadding="0"
+            cellspacing="0"
+            width="350">
+            <tr>
+              <td width="230">
+                <!-- image Télécharger l'app mobile -->
+                <img
+                    src="https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_download_app<%= commercialName === 'Pourcentage' ? '_pourcentage' : '' %><%= commercialName === 'Comptalib' ? '_comptalib' : '' %>.png"
+                    alt="Télécharger l'application mobile"
+                    style="width: 152px; float:right">
+                
+                <p style="float:right; margin-right: 45px">
+                  <span style="margin:0; padding:0 0 4px; color:#6E6E71;">Disponible sur<br/></span>
+                  <a href="https://apps.apple.com/fr/app/clementine/id1119493780" target="_blank" style="vertical-align: middle;"><img
+                    src="https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_appstore.png"
+                    alt="App Store"
+                    style="width: 20px"></a>
+                  <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
+                    src="https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_playstore.png"
+                    alt="Play Store"
+                    style="width: 20px"></a>
+                </p>
+              </td>
+              <td width="120">
+                <!-- QR Code -->
+                <img
+                src="https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_qrcode<%= commercialName === 'Pourcentage' ? '_pourcentage' : '' %><%= commercialName === 'Comptalib' ? '_comptalib' : '' %>.png"
+                style="width:128px"
                 alt="Prenez rendez-vous ici !">
-          <% } %>
-        </p>
-  
-      <p style="margin:0; padding:0px 0 4px; color:#6E6E71; text-align: right"><a href="https://www.smileyourpla.net/" style="display: inline-block; color:#6E6E71;" target="_blank"><img
-                src="https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_smileYourPlanet.png"
-                alt="Initiative Smile your planet" height="36"></a>
-        <% if(user.calendlyUrl) { %>
-          <a href="<%= user.calendlyUrl %>" style="display: inline-block; color:#6E6E71;" target="_blank">
-            <img
-            src="https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_rdv_tel<%= commercialName === 'Pourcentage' ? '_pourcentage' : '' %>.png"
-            alt="Demande de rdv téléphonique">
-          </a>
+              </td>
+            </tr>
+            <tr>
+              <td colspan="2">
+                <p style="margin:0; padding:0px 0 4px; color:#6E6E71; text-align: right">
+                  <a href="https://www.smileyourpla.net/" style="display: inline-block; color:#6E6E71;" target="_blank"><img
+                          src="https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_smileYourPlanet.png"
+                          alt="Initiative Smile your planet" height="36"></a>
+                  <% if(user.calendlyUrl) { %>
+                    <a href="<%= user.calendlyUrl %>" style="display: inline-block; color:#6E6E71;" target="_blank">
+                      <img
+                      src="https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_rdv_tel<%= commercialName === 'Pourcentage' ? '_pourcentage' : '' %>.png"
+                      alt="Demande de rdv téléphonique">
+                    </a>
+                  <% } %>
+                </p>
+              </td>
+            </tr>
+          </table>
         <% } %>
-      </p>
     </td>
   </tr>
   

package/ts/utils/prestation.ts

@@ -1,6 +1,7 @@
 import { IExercice, IPrestation, IPrestationList } from '../types';
 import { intersection } from './noLodash';
 import { PrestationDetail, PrestationType } from '../types/Enum/PrestationType';
+import { LegalFormTypeEnum } from '../types/Enum/LegalForm';
 import { PrestationOptionType, PrestationOption } from '../types/Enum/PrestationOption';
 import { PriceGridClementine } from '../types/Enum/PriceGridClementine';
 import { PriceGridPourcentage } from '../types/Enum/PriceGridPourcentage';
@@ -364,7 +365,10 @@ const calculatePrestationPrice = (
   }
   totalPrestation += (OptionTotalPrice ? OptionTotalPrice : 0);
 
-  if (isWithApplicationFees) totalPrestation += 50;
+  if (isWithApplicationFees) {
+    if (idLegalForm === LegalFormTypeEnum.SCI) totalPrestation += 150;
+    else totalPrestation += 50;
+  }
 
   const calculDetail = `${monthNbr > 0 ? monthNbr + ' mois x ' + (Math.round(price * 100) / 100) + '€' : (Math.round(price * 100) / 100) + '€'} ${totalAmount > 0 ? '- ' + totalAmount + '€' : ''} ${totalPercentage > 0 ? '- ' + totalPercentage + '%' : ''} ${isWithApplicationFees ? '+ 50€' : ''}`;