@silexpert/core 1.1.186 → 1.1.188

package/ts/types/Interface/api/card/UpdateCard.ts

@@ -1,6 +1,7 @@
-import { IsBoolean, IsDate, IsEnum, IsInt, IsOptional, IsString } from 'class-validator';
+import { IsBoolean, IsEnum, IsInt, IsOptional, IsString } from 'class-validator';
 import {  ApiPropertyOptional } from '../../../../utils';
 import { CardState, CardType } from '../../../Enum/Card';
+import { ToBoolean } from '../../../../utils/transforms/boolean.transform';
 
 export class UpdateCard {
   @ApiPropertyOptional()
@@ -14,6 +15,12 @@ export class UpdateCard {
   @IsBoolean()
     isManual?: boolean;
 
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsBoolean()
+  @ToBoolean()
+    isBlocked?: string;
+
   @ApiPropertyOptional()
   @IsOptional()
   @IsInt()
@@ -22,8 +29,7 @@ export class UpdateCard {
 
   @ApiPropertyOptional()
   @IsOptional()
-  @IsDate()
-    plannedAt?: Date;
+    plannedAt?: Date | null;
 
   @ApiPropertyOptional()
   @IsOptional()

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/ICard.ts

@@ -12,7 +12,8 @@ export interface ICard {
   type: CardType;
   state: CardState;
   isManual: boolean;
-  plannedAt?: Date;
+  isBlocked: boolean;
+  plannedAt?: Date | null;
   idUser: number;
   idSociety: number;
   createdAt?: Date;
@@ -28,3 +29,10 @@ export interface ICard {
   history?: ICardHistory[];
   comment?: IComment;
 }
+
+export interface CardAnnotedTransaction { total: number, nbAnnoted: number, rate: number }
+
+export interface CardDetail {
+  card: ICard;
+  annotedTransaction: CardAnnotedTransaction;
+}

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/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>