@silexpert/core 1.1.185 → 1.1.187

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/api/prestation/CreatePrestation.ts

@@ -13,3 +13,17 @@ export class CreatePrestation {
   @ApiPropertyOptional()
     label?: string;
 }
+
+export class CreateSocietyPrestationComplementary {
+  @ApiProperty()
+  @IsNumber()
+    idPrestationList: number;
+
+  @ApiProperty()
+  @IsNumber()
+    idExercice: number;
+
+  @ApiProperty()
+  @IsNumber()
+    totalTaxExcluded: number;
+}

package/ts/types/Interface/models/IPrestationComplementary.ts

@@ -2,34 +2,35 @@ import { IUser } from './IUser';
 import { IPaymentExpectation } from './IPaymentExpectation';
 import { IGedFile } from './IGedFile';
 import { IPrestation } from './IPrestation';
+import { AcceptationAdmin } from '../../Enum/AdditionnalSells';
 
 // prestationsCompl
 export interface IPrestationComplementary {
   id?: number;
   generateLink: boolean;
-  deadline: Date | null;
-  dateEstimateSigned: Date | null;
-  dateSendToClient: Date | null;
-  dateInvoice: Date | null;
-  datePayment: Date | null;
-  dateTransmission: Date | null;
-  idGedFile: number | null;
-  idCollaborater: number | null;
-  idUser: number | null;
-  idPaymentExpectation: number | null;
-  description: string | null;
-  note: string | null;
-  forOtherMission: string | null;
-  statePrestationJuridique: number | null;
-  acceptationAdmin: number;
+  deadline?: Date | null;
+  dateEstimateSigned?: Date | null;
+  dateSendToClient?: Date | null;
+  dateInvoice?: Date | null;
+  datePayment?: Date | null;
+  dateTransmission?: Date | null;
+  idGedFile?: number | null;
+  idCollaborater?: number | null;
+  idUser?: number | null;
+  idPaymentExpectation?: number | null;
+  description?: string | null;
+  note?: string | null;
+  forOtherMission?: string | null;
+  statePrestationJuridique?: number | null;
+  acceptationAdmin: AcceptationAdmin;
   createdAt?: Date | null;
   updatedAt?: Date | null;
   deletedAt?: Date | null;
 
   // Associations
-  prestationUser: IUser;
-  prestationCollaborater: IUser;
-  prestationPaymentExpectation: IPaymentExpectation;
-  prestationGedFile: IGedFile;
-  prestation: IPrestation;
+  prestationUser?: IUser;
+  prestationCollaborater?: IUser;
+  prestationPaymentExpectation?: IPaymentExpectation;
+  prestationGedFile?: IGedFile;
+  prestation?: IPrestation;
 }

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/commercialManagement/document.ts

@@ -4,7 +4,7 @@ import {
 import * as dayjs from 'dayjs';
 import { ReadCommercialDocumentTemplate, ReadDocumentEditing } from '../../types/Interface/api/commercialManagement/Read';
 import {
-  AccountingCategoryList, FontIds, fontList, VatMarginCategyList,
+  AccountingCategoryList, FontIds, fontList,
 } from '../../types/Enum/CommercialManagement';
 import { EstimateInvoiceType } from '../../types/Enum/EstimateInvoice';
 import { Vat } from '../../types/Enum/Vat';
@@ -122,98 +122,6 @@ export function generateCommercialDocument(idEstimateInvoiceType: EstimateInvoic
   };
 }
 
-export function generateAdvanceDocument(payload: CreateInvoiceDocument, shouldHideBrandName = false, nodeEnv: string | undefined = undefined): ReadCommercialDocumentTemplate {
-  if (!payload.deposit) throw new Error('Aucun acompte défini');
-
-  const data: ReadDocumentEditing & { brandColors: brandColorType, brandName: string, shouldHideBrandName: boolean } = {
-    ...payload,
-    title: payload.title ?? null,
-    paymentLink: payload.paymentLink ?? '#',
-    idEstimateInvoiceType: EstimateInvoiceType.ACOMPTE,
-    phoneContact: payload.settings?.phoneContact ?? null,
-    products: [],
-    vats: [],
-    totalTaxExcluded: payload.deposit,
-    totalTaxIncluded: payload.deposit,
-    totalTaxAndDiscountIncluded: payload.deposit,
-    generalDiscountFormatted: null,
-    depositFormatted: integerToFormattedAmountString(payload.deposit),
-    totalTaxExcludedFormatted: integerToFormattedAmountString(payload.deposit),
-    totalTaxIncludedFormatted: integerToFormattedAmountString(payload.deposit),
-    totalTaxAndDiscountIncludedFormatted: integerToFormattedAmountString(
-      payload.deposit,
-    ),
-    totalVatAmountFormatted: integerToFormattedAmountString(0),
-    font: {
-      id: payload.settings?.idFont ?? FontIds.CIRCULAR_STD,
-      name:
-        fontList.find((f) => f.id === payload.settings?.idFont)?.name
-        ?? fontList[0].name,
-      url:
-        fontList.find((f) => f.id === payload.settings?.idFont)?.link
-        ?? fontList[0].link,
-    },
-    capitalFormatted: payload.capital
-      ? `${payload.capital}`
-        .split('')
-        .reduceRight(
-          (acc, char, i, { length }) => `${char}${(length - (i + 1)) % 3 === 0 ? ' ' : ''}${acc}`,
-          '',
-        )
-        .trim()
-      : null,
-    dueDateFormatted: payload.dueDate
-      ? dayjs(payload.dueDate).format('DD/MM/YYYY')
-      : null,
-    expirationDateFormatted: payload.expirationDate
-      ? dayjs(payload.expirationDate).format('DD/MM/YYYY')
-      : null,
-    emissionDateFormatted: payload.emissionDate
-      ? dayjs(payload.emissionDate).format('DD/MM/YYYY')
-      : null,
-    shouldDisplayDiscountColumn: false,
-    disableVat: true,
-    // @ts-ignore
-    marginVats: _uniq(
-      (payload.assetMarginVatIds ?? []).map(
-        (m) => VatMarginCategyList.find((c) => c.id === m)?.label ?? null,
-      ),
-    ),
-    accountingCategoryFormatted:
-      AccountingCategoryList.find((a) => a.id === payload.accountingCategory)
-        ?.label ?? null,
-    // @ts-ignore
-    brandColors: getBrandConfig({ objectWaited: 'colors', nodeEnv }) as brandColorType,
-    brandName: `${getBrandConfig({ objectWaited: 'name', nodeEnv })}`,
-    shouldHideBrandName,
-  };
-
-  const commonTemplate = new CommercialDocumentCommonHTML();
-
-  return {
-    header: ejs?.render(commonTemplate.header, data),
-    body: ejs?.render(bodyTemplate, {
-      ...data,
-      comment:
-        data.comment && typeof data.comment === 'string'
-          ? data.comment?.replace(/\n/g, '<br/>')
-          : null,
-      products: data.products.map((p) => ({
-        ...p,
-        comment:
-          p.comment && typeof p.comment === 'string'
-            ? p.comment?.replace(/\n/g, '<br/>')
-            : null,
-      })),
-    }),
-    footer: ejs?.render(commonTemplate.footer, {
-      ...data,
-      freeText: payload?.settings?.freeInvoiceText ?? null,
-    }),
-    data,
-  };
-}
-
 export function generateMailHeader(params: CreateMailHeader, shouldHideBrandName = false, nodeEnv: string | undefined = undefined): ReadCommercialMailTemplate {
   dayjs.locale('fr');
   const data = {

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

@@ -50,16 +50,6 @@ export class CommercialDocumentCommonHTML {
       <td>Montant <%= disableVat !== true ? 'HT' : ''%></td>
     </tr>
   </thead>
-  <% if (idEstimateInvoiceType === ${EstimateInvoiceType.ACOMPTE}) { %>
-    <tr>
-        <td class="product-title">
-          <%= title %>
-        </td>
-        <td class="product-quantity">1</td>
-        <td class="product-price-without-vat"><%= depositFormatted %>€</td>
-        <td class="product-total-price-without-vat"><%= depositFormatted %>€</td>
-      </tr>
-  <% } %>
   <% if (products) { %>
     <% products.forEach(function (product) { %>
       <tr>
@@ -107,42 +97,40 @@ export class CommercialDocumentCommonHTML {
       <td colspan="2">Récapitulatif</td>
     </tr>
   </thead>
-  <% if (idEstimateInvoiceType !== ${EstimateInvoiceType.ACOMPTE}) { %>
-    <% if (disableVat !== true) { %>
-      <tr>
-        <td>Total HT</td>
-        <td><%= totalTaxExcludedFormatted %>€</td>
-      </tr>
-    <% } %>
-    <% if (generalDiscountFormatted) { %>
-      <tr>
-        <td>Remise</td>
-        <td><%= generalDiscountFormatted %>€</td>
-      </tr>
-    <% } %>
-    <% if (disableVat !== true) { %>
-      <tr>
-        <td>TVA</td>
-        <td><%= totalVatAmountFormatted %>€</td>
-      </tr>
-    <% } %>
-    <% if (disableVat !== true || generalDiscountFormatted || depositFormatted) { %>
-      <tr>
-        <td>Total <%= disableVat !== true ? 'TTC' : ''%></td>
-        <td><%= totalTaxIncludedFormatted %>€</td>
-      </tr>
-    <% } else if (disableVat === true && ![${EstimateInvoiceType.FACTURE}, ${EstimateInvoiceType.RESTE}, ${EstimateInvoiceType.ACOMPTE}].includes(idEstimateInvoiceType)) { %>
-      <tr>
-        <td>Total</td>
-        <td><%= totalTaxIncludedFormatted %>€</td>
-      </tr>
-    <% } %>
-    <% if (depositFormatted) { %>
-      <tr>
-        <td>Acompte</td>
-        <td><%= depositFormatted %>€</td>
-      </tr>
-    <% } %>
+  <% if (disableVat !== true) { %>
+    <tr>
+      <td>Total HT</td>
+      <td><%= totalTaxExcludedFormatted %>€</td>
+    </tr>
+  <% } %>
+  <% if (generalDiscountFormatted) { %>
+    <tr>
+      <td>Remise</td>
+      <td><%= generalDiscountFormatted %>€</td>
+    </tr>
+  <% } %>
+  <% if (disableVat !== true) { %>
+    <tr>
+      <td>TVA</td>
+      <td><%= totalVatAmountFormatted %>€</td>
+    </tr>
+  <% } %>
+  <% if (disableVat !== true || generalDiscountFormatted || depositFormatted) { %>
+    <tr>
+      <td>Total <%= disableVat !== true ? 'TTC' : ''%></td>
+      <td><%= totalTaxIncludedFormatted %>€</td>
+    </tr>
+  <% } else if (disableVat === true && ![${EstimateInvoiceType.FACTURE}, ${EstimateInvoiceType.RESTE}, ${EstimateInvoiceType.ACOMPTE}].includes(idEstimateInvoiceType)) { %>
+    <tr>
+      <td>Total</td>
+      <td><%= totalTaxIncludedFormatted %>€</td>
+    </tr>
+  <% } %>
+  <% if (depositFormatted) { %>
+    <tr>
+      <td>Acompte</td>
+      <td><%= depositFormatted %>€</td>
+    </tr>
   <% } %>
   <% if ([${EstimateInvoiceType.FACTURE}, ${EstimateInvoiceType.RESTE}, ${EstimateInvoiceType.ACOMPTE}].includes(idEstimateInvoiceType)) { %>
     <tr>

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,