@silexpert/core 1.0.34 → 1.0.39

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

@@ -204,13 +204,13 @@ export class CreateCommercialSetting {
 
   @ApiPropertyOptional()
   @IsOptional()
-  accountingCategory: AccountingCategoryId;
+  accountingCategory?: AccountingCategoryId;
 
   @ApiPropertyOptional()
   @IsOptional()
   @IsBoolean()
   @ToBoolean()
-  shouldPayTaxAfterDebit: boolean;
+  shouldPayTaxAfterDebit?: boolean;
 }
 
 export class CreateCommercialMail {
@@ -258,18 +258,18 @@ export class CommercialDocumentInputs {
 
   @ApiProperty()
   @IsString()
-  reference: string; //
+  reference: string;
 
   @ApiProperty()
-  thirdParty: IThirdParty; //
+  thirdParty: IThirdParty;
 
   @ApiProperty()
   @IsDateString()
-  emissionDate: string; //
+  emissionDate: string;
 
   @ApiProperty()
   @IsDateString()
-  dueDate: string; //
+  dueDate: string;
 
   @ApiProperty({ description: 'Date d\'expiration pour la facture d\'acompte' })
   expirationDate: string | null;
@@ -283,23 +283,23 @@ export class CommercialDocumentInputs {
 
   @ApiProperty({ description: 'Escompte' })
   @IsString()
-  discount: string; //
+  discount: string;
 
   @ApiProperty()
-  comment: string | null; //
+  comment: string | null;
 
   @ApiProperty({ description: 'Pénalité de retard' })
-  penalties: string | null; //
+  penalties: string | null;
 
   @ApiProperty({ description: 'Remise globale' })
   @IsNumber()
-  generalDiscount2: number; //
+  generalDiscount2: number;
 
   @ApiProperty({ description: 'Indemnité forfaitaire' })
-  compensation: string | null; //
+  compensation: string | null;
 
   @ApiProperty()
-  vatMention: string | null; //
+  vatMention: string | null;
 
   @ApiProperty()
   @IsBoolean()
@@ -307,7 +307,7 @@ export class CommercialDocumentInputs {
   disableVat: boolean;
 
   @ApiProperty()
-  title: string | null; //
+  title: string | null;
 
   @ApiProperty({ description: 'Commercial name of seller' })
   @IsString()
@@ -326,7 +326,7 @@ export class CommercialDocumentInputs {
   city: string | null;
 
   @ApiProperty()
-  settings?: ISocietyGescom;
+  settings: ISocietyGescom;
 
   @ApiProperty()
   cgv: string | null;
@@ -337,12 +337,12 @@ export class CommercialDocumentInputs {
   @ApiProperty()
   @IsBoolean()
   @ToBoolean()
-  isStripeAllowed?: boolean;
+  isStripeAllowed: boolean;
 
   @ApiProperty()
   @IsBoolean()
   @ToBoolean()
-  isDraft?: boolean;
+  isDraft: boolean;
 
   @ApiProperty()
   idEstimateInvoiceType: EstimateInvoiceType;
@@ -353,7 +353,7 @@ export class CommercialDocumentInputs {
   @ApiProperty()
   @IsBoolean()
   @ToBoolean()
-  shouldPayTaxAfterDebit: boolean;
+  shouldPayTaxAfterDebit?: boolean;
 }
 
 export class CreatePreSaleDocument extends CommercialDocumentInputs {

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

@@ -1,5 +1,5 @@
 import {
-  IsArray, IsBoolean, IsDateString, IsNumber, IsOptional, IsString,
+  IsArray, IsBoolean, IsDateString, IsOptional, IsString,
 } from 'class-validator';
 import { Order } from '../../..';
 import { ApiProperty, ApiPropertyOptional } from '../../../../utils';
@@ -37,6 +37,13 @@ export class QueryInvoice {
   @ApiPropertyOptional()
   @IsBoolean()
   @ToBoolean()
+  @IsOptional()
+  toAnnotate?: boolean;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsBoolean()
+  @ToBoolean()
   isDescending?: boolean;
 }
 
@@ -49,19 +56,18 @@ export interface ParamPaginatedInvoices {
   status?: InvoiceStatus;
   search?: string;
   pagination: QueryPaginate;
+  toAnnotate?: boolean;
   order?: Order;
 }
 
 export class QueryGetDefaultPayload {
   @ApiProperty()
-  @IsNumber()
-  idEstimateInvoiceType: number;
+  idEstimateInvoiceType: EstimateInvoiceType;
 }
 
 export class QueryNextReference {
   @ApiProperty()
-  @IsNumber()
-  idEstimateInvoiceType: number;
+  idEstimateInvoiceType: EstimateInvoiceType;
 
   @ApiPropertyOptional()
   @IsBoolean()
@@ -119,6 +125,7 @@ export class QueryDocumentPaginated {
   @ApiPropertyOptional()
   @IsBoolean()
   @ToBoolean()
+  @IsOptional()
   isDraft?: boolean;
 }
 

package/ts/types/Interface/api/thirdParty/CreateThirdPartyForm.ts

@@ -1,4 +1,4 @@
-import { IsEnum, IsOptional, IsString } from 'class-validator';
+import { IsEnum, IsOptional } from 'class-validator';
 import { ThirdPartyType } from '../../..';
 import { ApiProperty, ApiPropertyOptional } from '../../../../utils';
 
@@ -66,15 +66,13 @@ export class CreateThirdPartyForm {
 
   @ApiPropertyOptional()
   @IsOptional()
-  @IsString()
-  deliveryAddress: string | null;
+  deliveryAddress?: string | null;
 
   @ApiPropertyOptional()
   @IsOptional()
-  @IsString()
-  deliveryCity: string | null;
+  deliveryCity?: string | null;
 
   @ApiPropertyOptional()
   @IsOptional()
-  deliveryZipCode: string | null;
+  deliveryZipCode?: string | null;
 }

package/ts/types/Interface/api/thirdParty/UpdateThirdPartyForm.ts

@@ -1,4 +1,4 @@
-import { IsEnum, IsOptional, IsString } from 'class-validator';
+import { IsEnum, IsOptional } from 'class-validator';
 import { ThirdPartyType } from '../../..';
 import { ApiPropertyOptional } from '../../../../utils';
 
@@ -86,15 +86,13 @@ export class UpdateThirdPartyForm {
 
   @ApiPropertyOptional()
   @IsOptional()
-  @IsString()
-  deliveryAddress: string | null;
+  deliveryAddress?: string | null;
 
   @ApiPropertyOptional()
   @IsOptional()
-  @IsString()
-  deliveryCity: string | null;
+  deliveryCity?: string | null;
 
   @ApiPropertyOptional()
   @IsOptional()
-  deliveryZipCode: string | null;
+  deliveryZipCode?: string | null;
 }

package/ts/utils/commercialManagement/document.ts

@@ -26,12 +26,12 @@ export function generateCommercialDocument(idEstimateInvoiceType: EstimateInvoic
     phoneContact: payload.settings?.phoneContact ?? null,
     products,
     vats,
-    totalTaxExcluded: _sumBy(products, 'totalTaxExcluded'),
-    totalTaxIncluded: _sumBy(products, 'totalTaxExcluded') + _sumBy(vats, 'amount'),
-    totalTaxAndDiscountIncluded: _sumBy(products, 'totalTaxExcluded') + _sumBy(vats, 'amount') - (payload.generalDiscount2 ?? 0),
+    totalTaxExcluded: _sumBy(products, 'totalTaxExcluded') - (payload.deposit ?? 0),
+    totalTaxIncluded: _sumBy(products, 'totalTaxExcluded') + _sumBy(vats, 'amount') - (payload.deposit ?? 0),
+    totalTaxAndDiscountIncluded: _sumBy(products, 'totalTaxExcluded') + _sumBy(vats, 'amount') - (payload.generalDiscount2 ?? 0) - (payload.deposit ?? 0),
     generalDiscountFormatted: payload.generalDiscount2 ? integerToFormattedAmountString(payload.generalDiscount2) : null,
     depositFormatted: payload.deposit ? integerToFormattedAmountString(payload.deposit) : null,
-    totalTaxExcludedFormatted: integerToFormattedAmountString(_sumBy(products, 'totalTaxExcluded')),
+    totalTaxExcludedFormatted: integerToFormattedAmountString(_sumBy(products, 'totalTaxExcluded') - (payload.deposit ?? 0)),
     totalTaxIncludedFormatted: integerToFormattedAmountString(_sumBy(products, 'totalTaxExcluded') + _sumBy(vats, 'amount') - (payload.deposit ?? 0)),
     totalTaxAndDiscountIncludedFormatted: integerToFormattedAmountString(_sumBy(products, 'totalTaxExcluded') + _sumBy(vats, 'amount') - (payload.generalDiscount2 ?? 0) - (payload.deposit ?? 0)),
     totalVatAmountFormatted: integerToFormattedAmountString(_sumBy(vats, 'amount')),
@@ -50,16 +50,7 @@ export function generateCommercialDocument(idEstimateInvoiceType: EstimateInvoic
   };
 
   const commonTemplate = new CommercialDocumentCommonHTML();
-
-  let documentFreeText: string | null | undefined;
-
-  // A GERER EN FONCTION DU DOCUMENT
-  if ([EstimateInvoiceType.DEVIS, EstimateInvoiceType.BON].includes(idEstimateInvoiceType)) {
-    documentFreeText = payload?.settings?.freeEstimateText;
-  } else {
-    documentFreeText = payload?.settings?.freeInvoiceText;
-  }
-  //
+  const documentFreeText = [EstimateInvoiceType.DEVIS, EstimateInvoiceType.BON].includes(idEstimateInvoiceType) ? payload?.settings?.freeEstimateText : payload?.settings?.freeInvoiceText;
 
   return {
     header: ejs.render(commonTemplate.header, data),

package/ts/utils/commercialManagement/product.ts

@@ -19,7 +19,7 @@ export function getDiscount(product: IProductInvoice): number {
 
 export function getTotalTaxExcluded(product: IProductInvoice): number {
   const discount = product.discount2 && product.discount2 > 0 ? getDiscount(product) : 0;
-  return (product.priceTaxExcluded ?? 0) * (product.quantity ?? 1) - (discount * (product.quantity ?? 1));
+  return ((product.priceTaxExcluded ?? 0) - discount) * (product.quantity ?? 1);
 }
 
 export function productToReadProductEditing(payload: IProductInvoice): ReadProductEditing {

package/ts/utils/commercialManagement/recurrence.ts

@@ -22,7 +22,7 @@ export function getAllRecurrences(params: {
 
   if (type === RecurrenceType.MONHLY) recurrency = 'month';
   // @ts-ignore
-  else if (type === RecurrenceType.QUATERLY) recurrency = 'quarter';
+  else if (type === RecurrenceType.QUARTERLY) recurrency = 'quarter';
   else if (type === RecurrenceType.WEEKLY) recurrency = 'week';
   else if (type === RecurrenceType.YEARLY) recurrency = 'year';