@silexpert/core 1.1.184 → 1.1.186

package/ts/types/Enum/PriceGridPourcentage.ts

@@ -100,20 +100,20 @@ export const PriceGridPourcentage = [
         ],
         turnoverMonthly: [
           {
-            turnoverValue: 50000,
-            price: 79,
+            turnoverValue: 150000,
+            price: 149,
           },
           {
-            turnoverValue: 100000,
-            price: 99,
+            turnoverValue: 300000,
+            price: 209,
           },
           {
-            turnoverValue: 150000,
-            price: 109,
+            turnoverValue: 500000,
+            price: 269,
           },
           {
-            turnoverValue: 200000,
-            price: 129,
+            turnoverValue: 750000,
+            price: 349,
           },
         ],
         vatRegimeMonthly: [
@@ -286,20 +286,20 @@ export const PriceGridPourcentage = [
         ],
         turnoverMonthly: [
           {
-            turnoverValue: 50000,
-            price: 79,
+            turnoverValue: 150000,
+            price: 149,
           },
           {
-            turnoverValue: 100000,
-            price: 99,
+            turnoverValue: 300000,
+            price: 209,
           },
           {
-            turnoverValue: 150000,
-            price: 109,
+            turnoverValue: 500000,
+            price: 269,
           },
           {
-            turnoverValue: 200000,
-            price: 129,
+            turnoverValue: 750000,
+            price: 349,
           },
         ],
         vatRegimeMonthly: [
@@ -472,20 +472,20 @@ export const PriceGridPourcentage = [
         ],
         turnoverMonthly: [
           {
-            turnoverValue: 50000,
-            price: 79,
+            turnoverValue: 150000,
+            price: 149,
           },
           {
-            turnoverValue: 100000,
-            price: 99,
+            turnoverValue: 300000,
+            price: 209,
           },
           {
-            turnoverValue: 150000,
-            price: 109,
+            turnoverValue: 500000,
+            price: 269,
           },
           {
-            turnoverValue: 200000,
-            price: 129,
+            turnoverValue: 750000,
+            price: 349,
           },
         ],
         vatRegimeMonthly: [
@@ -658,20 +658,20 @@ export const PriceGridPourcentage = [
         ],
         turnoverMonthly: [
           {
-            turnoverValue: 50000,
-            price: 79,
+            turnoverValue: 150000,
+            price: 149,
           },
           {
-            turnoverValue: 100000,
-            price: 99,
+            turnoverValue: 300000,
+            price: 209,
           },
           {
-            turnoverValue: 150000,
-            price: 109,
+            turnoverValue: 500000,
+            price: 269,
           },
           {
-            turnoverValue: 200000,
-            price: 129,
+            turnoverValue: 750000,
+            price: 349,
           },
         ],
         vatRegimeMonthly: [
@@ -844,20 +844,20 @@ export const PriceGridPourcentage = [
         ],
         turnoverMonthly: [
           {
-            turnoverValue: 50000,
-            price: 79,
+            turnoverValue: 150000,
+            price: 149,
           },
           {
-            turnoverValue: 100000,
-            price: 99,
+            turnoverValue: 300000,
+            price: 209,
           },
           {
-            turnoverValue: 150000,
-            price: 109,
+            turnoverValue: 500000,
+            price: 269,
           },
           {
-            turnoverValue: 200000,
-            price: 129,
+            turnoverValue: 750000,
+            price: 349,
           },
         ],
         vatRegimeMonthly: [
@@ -1030,20 +1030,20 @@ export const PriceGridPourcentage = [
         ],
         turnoverMonthly: [
           {
-            turnoverValue: 50000,
-            price: 79,
+            turnoverValue: 150000,
+            price: 149,
           },
           {
-            turnoverValue: 100000,
-            price: 99,
+            turnoverValue: 300000,
+            price: 209,
           },
           {
-            turnoverValue: 150000,
-            price: 109,
+            turnoverValue: 500000,
+            price: 269,
           },
           {
-            turnoverValue: 200000,
-            price: 129,
+            turnoverValue: 750000,
+            price: 349,
           },
         ],
         vatRegimeMonthly: [

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

@@ -0,0 +1,69 @@
+import { IsOptional, IsBoolean } from 'class-validator';
+import { ApiProperty, ApiPropertyOptional } from '../../../../utils';
+import { TFile } from '../file/TFile';
+import { ToBoolean } from '../../../../utils/transforms/boolean.transform';
+
+export class CreateUserContest {
+  @ApiProperty()
+    firstname: string;
+
+  @ApiProperty()
+    lastname: string;
+
+  @ApiProperty()
+    email: string;
+
+  @ApiProperty()
+    phone: string;
+
+  @ApiProperty()
+    societyName: string;
+
+  @ApiProperty()
+    siren: string;
+
+  @ApiPropertyOptional()
+    productDescription?: string;
+
+  @ApiPropertyOptional()
+    societyDescription?: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+    photo?: TFile;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+    logo?: TFile;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsBoolean()
+  @ToBoolean()
+    isTestMode?: boolean;
+
+  @ApiPropertyOptional()
+    recaptcha?: string;
+}
+
+export class CreateCheckVote {
+  @ApiProperty()
+    email: string;
+
+  @ApiProperty()
+    ipAddress: string;
+  
+  @ApiProperty()
+    idVoter: number;
+
+  @ApiPropertyOptional()
+    recaptcha?: string;
+}
+
+export class CreateVoteContest {
+  @ApiProperty()
+    emailHash: string;
+
+  @ApiProperty()
+    userHash: string;
+}

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

@@ -0,0 +1,20 @@
+import { IsBoolean, IsOptional } from 'class-validator';
+import {  ApiPropertyOptional } from '../../../../utils';
+import { ToBoolean } from '../../../../utils/transforms/boolean.transform';
+
+export class QueryFetchUserContest {
+  @ApiPropertyOptional()
+    search?: string;
+
+  @ApiPropertyOptional()
+    orderBy?: string;
+  
+  @ApiPropertyOptional()
+  @IsBoolean()
+  @ToBoolean()
+  @IsOptional()
+    top?: boolean | null;
+
+  @ApiPropertyOptional()
+    idToExclude?: number;
+}

package/ts/types/Interface/api/contest/Read.ts

@@ -0,0 +1,6 @@
+import { IUserContest } from '../../models/IUserContest';
+
+export type ReadVoteChecking = {
+  success: boolean;
+  existingVoteUser: IUserContest | null
+};

package/ts/types/Interface/models/IUserContest.ts

@@ -0,0 +1,22 @@
+import { IVoteContest } from './IVoteContest';
+
+export interface IUserContest {
+  id?: number;
+  firstname: string;
+  lastname: string;
+  email: string;
+  hash: string;
+  phone: string;
+  societyName: string;
+  siren: string;
+  productDescription?: string | null;
+  societyDescription?: string | null;
+  tokenPhoto?: string | null;
+  tokenLogo?: string | null;
+  createdAt?: Date | null;
+  updatedAt?: Date | null;
+  deletedAt?: Date | null;
+
+  // associations
+  voteContests: IVoteContest[]
+}

package/ts/types/Interface/models/IVoteContest.ts

@@ -0,0 +1,16 @@
+import { IUser } from '../..';
+
+export interface IVoteContest {
+  id?: number;
+  emailVoter: string;
+  emailHash: string;
+  ipAddress: string;
+  hasVoteBeenCompleted: boolean
+  idUserVoteFor?: number | null;
+  createdAt?: Date | null;
+  updatedAt?: Date | null;
+  deletedAt?: Date | null;
+
+  // Associations
+  userVoteFor?: IUser;
+}

package/ts/types/index.ts

@@ -320,6 +320,9 @@ export * from './Interface/models/IBalanceSheetHistory';
 export * from './Interface/models/ICard';
 export * from './Interface/models/ICardHistory';
 export * from './Interface/models/IDubiousCustomer';
+export * from './Interface/models/IUserContest';
+export * from './Interface/models/IVoteContest';
+
 
 // Schemas
 export * from './Interface/schemas/IRegistrationDetail';
@@ -998,7 +1001,9 @@ export * from './Interface/api/card/QueryUserCardsStats';
 export * from './Interface/api/card/UpdateCard';
 export * from './Interface/api/notion/NotionResponse';
 export * from './Interface/api/IntermediateManagementRebate';
-
+export * from './Interface/api/contest/Create';
+export * from './Interface/api/contest/Query';
+export * from './Interface/api/contest/Read';
 // Enums types
 export * from './Interface/enum/Util';
 export * from './Interface/enum/Date';

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

@@ -1,4 +1,15 @@
-const logoClementine = `<% if (brandName === 'Clementine') { %><tr>
+const newIban = `<% if (commercialName === 'Clementine' && isFacturation) { %>
+    <p style="font-size: 15px; font-family: Arial; margin:0; padding:0px 0 4px; color:#6E6E71; margin-bottom: 10px; font-weight: bold;">
+      <span style="color: #A0A0A0">Nos coordonnées bancaires </span>IBAN : <%= iban %> - BIC : <%= bic %>
+    </p>
+  <% }else if (commercialName === 'Pourcentage' && [5, 7].includes(idTypeBrand)) { %> 
+    <p style="font-size: 15px; font-family: Arial; margin:0; padding:0px 0 4px; color:#6E6E71; margin-bottom: 10px; font-weight: bold;">
+      <span style="color: #A0A0A0">Attention changement de RIB </span>IBAN : <%= iban %> - BIC : <%= bic %>
+    </p>
+<% } %>
+  `;
+
+const logoClementine = `<% if (commercialName === 'Clementine') { %><tr>
 <td
 colspan="3"
 class="logo"
@@ -17,17 +28,27 @@ const avatar = `<% if (!forceRole && user?.avatar?.token) { %>
       class="avatar"
       style="text-align:center; padding: 20px 0 20px 20px; position: relative;"
       width="100">
-      <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;">
-        <img
-          style="max-height: 90px;max-width: 90px; border-radius: 100%; padding-top: 10px"
+      <% if(commercialName === 'Clementine') { %>
+        <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;">
+          <img
+            style="max-height: 90px;max-width: 90px; border-radius: 100%; margin-top: 10px"
+            alt="Avatar"
+            src="<%= hostS3 %>users/<%= user.id %>/<%= user.avatar.token %>"
+          />
+        </p>
+      <% } else { %>
+        <p style="padding: 20px;">
+          <img
+          style="max-height: 90px;max-width: 90px; border-radius: 100%; margin-top: 10px"
           alt="Avatar"
           src="<%= hostS3 %>users/<%= user.id %>/<%= user.avatar.token %>"
-        />
-      </p>
+          />
+        </p>
+      <% } %>
     </td>
   <% } %>`;
 
-const footer = `<% if(brandName === 'Clementine') { %>
+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;"
@@ -95,7 +116,7 @@ const footer = `<% if(brandName === 'Clementine') { %>
         </table>
       </td>
     </tr>
-  <% } else if(brandName === 'Pourcentage') { %>
+  <% } 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;"
@@ -111,13 +132,25 @@ const footer = `<% if(brandName === 'Clementine') { %>
                   alt="Connexion"> Connexion
               </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/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"
+                style="width: 20px"></a>
+              <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>
+            </td>
+          </tr>
         </table>
       </td>
     </tr>
   <% } %>
 `;
 
-export const signatureTemplate = `<table
+export const signatureTemplate = `${newIban}<table
 border="0"
 cellpadding="0"
 cellspacing="0"
@@ -179,7 +212,7 @@ ${logoClementine}
         <% 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<%= brandName === 'Pourcentage' ? '_pourcentage' : '' %>.png"
+            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>
         <% } %>

package/ts/utils/email.ts

@@ -166,6 +166,18 @@ export function generateSignature(params: any): string {
     ...(idTypeBrand ? { idTypeBrand } : {}),
     objectWaited: 'name',
   }) as unknown as string;
+  const commercialName = getBrandConfig({
+    ...(idTypeBrand ? { idTypeBrand } : {}),
+    objectWaited: 'commercialName',
+  }) as unknown as string;
+  const iban = getBrandConfig({
+    ...(idTypeBrand ? { idTypeBrand } : {}),
+    objectWaited: 'bank.IBAN',
+  }) as unknown as string;
+  const bic = getBrandConfig({
+    ...(idTypeBrand ? { idTypeBrand } : {}),
+    objectWaited: 'bank.BIC',
+  }) as unknown as string;
   const bonjourMail = getBrandConfig({
     ...(idTypeBrand ? { idTypeBrand } : {}),
     objectWaited: 'listMails.bonjour',
@@ -242,7 +254,7 @@ export function generateSignature(params: any): string {
     phoneSignature = standardPhoneSignature;
   } else if (!user) { // Signature Clementine
     user = {
-      firstname: `L'équipe ${brandName}`,
+      firstname: `L'équipe ${commercialName}`,
       isAll: true,
     };
     roleSignature = '';
@@ -255,7 +267,12 @@ export function generateSignature(params: any): string {
 
   return ejs.render(signatureTemplate, {
     forceRole,
+    isFacturation: user.roles ? user.roles.some((r: any) => r.id === Role.FACTURATION) : false,
     brandName,
+    idTypeBrand,
+    commercialName,
+    iban,
+    bic,
     hostS3,
     user,
     roleSignature,

package/ts/utils/prestation.ts

@@ -190,7 +190,7 @@ const calculatePrestationPriceWithPriceGrid = (idPrestationList: number, endDate
 const calculatePrestationPriceWithPrestationList = (prestationList: IPrestationList): number => {
   let totalPrestation: number = 0;
 
-  totalPrestation = prestationList.price || 0;
+  totalPrestation = prestationList?.price || 0;
 
   return totalPrestation;
 };