@silexpert/core 1.2.80 → 1.2.82

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

@@ -8,6 +8,7 @@ import {
   IsNumber,
   IsOptional,
   IsString,
+  Length,
 } from 'class-validator';
 import { ApiPropertyOptional } from '../../../../utils';
 import { ToBoolean } from '../../../../utils/transforms/boolean.transform';
@@ -144,3 +145,32 @@ export class UpdateRecurrence {
   @IsOptional()
   idSaleEmail?: number;
 }
+
+export class UpdateReminder2 {
+  @ApiPropertyOptional()
+  @IsString()
+  @Length(0, 255)
+  @IsOptional()
+  email: string | null;
+
+  @ApiPropertyOptional()
+  @IsString()
+  @IsOptional()
+  content: string | null;
+
+  @ApiPropertyOptional()
+  @IsString()
+  @Length(0, 255)
+  @IsOptional()
+  subject: string | null;
+
+  @ApiPropertyOptional()
+  @IsInt()
+  @IsOptional()
+  idEstimateInvoice: number | null;
+
+  @ApiPropertyOptional()
+  @IsInt()
+  @IsOptional()
+  idSaleEmail: number | null;
+}

package/ts/types/Interface/models/IEstimateInvoice.ts

@@ -9,6 +9,7 @@ import { IFile } from './IFile';
 import { IInvoiceRecurrence } from './IInvoiceRecurrence';
 import { ReadEstimateInvoiceStatus } from '../api/commercialManagement/Read';
 import { AccountingCategoryId, InvoiceLanguage } from '../../Enum/CommercialManagement';
+import { IReminder } from './IReminder';
 
 // estimatesInvoices
 export interface IEstimateInvoice {
@@ -66,7 +67,9 @@ export interface IEstimateInvoice {
   assetRelatedToThisEstimateInvoice?: IEstimateInvoice;
   estimateInvoiceForThisAsset?: IEstimateInvoice;
   estimateInvoiceForThisRepeat?: IEstimateInvoice;
+  /** @deprecated use reminder2 */
   reminder?: IInvoiceReminder;
+  reminder2?: IReminder | null;
   relatedInvoice?: IEstimateInvoice;
   recurrence?: IInvoiceRecurrence;
   file?: IFile;

package/ts/types/Interface/models/IInvoiceReminder.ts

@@ -3,6 +3,9 @@ import { IEstimateInvoice } from './IEstimateInvoice';
 import { IInvoiceReminderAttachment } from './IInvoiceReminderAttachment';
 
 // societyRelance
+/**
+ * @deprecated use IReminder
+ */
 export interface IInvoiceReminder {
   id?: number;
   beforeThree: boolean | null;

package/ts/types/Interface/models/IReminder.ts

@@ -0,0 +1,20 @@
+import { IReminderAttachment } from './IReminderAttachment';
+import { IScheduledReminder } from './IScheduledReminder';
+import { ISociety } from './ISociety';
+
+export interface IReminder {
+  id?: number;
+  email: string | null;
+  subject: string | null;
+  content: string | null;
+  idSaleEmail: number | null;
+  idEstimateInvoice: number | null;
+  idSociety: number;
+
+  attachments?: IReminderAttachment[];
+  schedules?: IScheduledReminder[];
+  society?: ISociety;
+
+  createdAt?: Date;
+  updatedAt?: Date;
+}

package/ts/types/Interface/models/IReminderAttachment.ts

@@ -0,0 +1,14 @@
+import { IFile } from './IFile';
+import { IReminder } from './IReminder';
+
+export interface IReminderAttachment {
+  id?: number;
+  idFile: number;
+  idReminder: number;
+
+  file?: IFile;
+  reminder?: IReminder;
+
+  createdAt?: Date;
+  updatedAt?: Date;
+}

package/ts/types/Interface/models/IScheduledReminder.ts

@@ -0,0 +1,7 @@
+export interface IScheduledReminder {
+  id?: number;
+  day: number;
+  idReminder: number;
+  createdAt?: Date;
+  updatedAt?: Date;
+}

package/ts/types/Interface/models/ISocietyGescom.ts

@@ -1,6 +1,6 @@
 import { AccountingCategoryId, FontIds, LogoAlignment } from '../../Enum/CommercialManagement';
 import { IFile } from './IFile';
-import { ISaleEmail } from './ISaleEmail';
+import { IReminder } from './IReminder';
 
 // societyGescom
 export interface ISocietyGescom {
@@ -65,12 +65,12 @@ export interface ISocietyGescom {
   externalBorderColor?: string | null;
   reminderCustomizedDayDiff?: number | null;
   idRibFile?: number | null;
+  idReminder?: number | null;
   idSignatureFile?: number | null;
   idGeneralConditionOfSale?: number | null;
-  idReminderSaleEmail?: number | null;
   ribFile?: IFile;
   signatureFile?: IFile;
-  defaultReminderSaleEmail?: ISaleEmail;
+  reminder?: IReminder | null;
   createdAt?: Date | null;
   updatedAt?: Date | null;
 }

package/ts/types/index.ts

@@ -343,6 +343,9 @@ export * from './Interface/models/ISaleEmail';
 export * from './Interface/models/IGeneralConditionOfSale';
 export * from './Interface/models/ISaleDocumentTemplate';
 export * from './Interface/models/IInvoiceReminderAttachment';
+export * from './Interface/models/IReminder';
+export * from './Interface/models/IScheduledReminder';
+export * from './Interface/models/IReminderAttachment';
 
 // Schemas
 export * from './Interface/schemas/IRegistrationDetail';

package/ts/utils/commercialManagement/document.ts

@@ -71,6 +71,8 @@ export function generateCommercialDocument(
   const locale = payload.language ?? InvoiceLanguage.FR;
   const languageOption = internationalizationChoices[locale];
 
+  const accountingCategory = AccountingCategoryList.find((a) => a.id === payload.accountingCategory)?.label ?? null;
+
   const data: ReadDocumentEditing & { brandColors: brandColorType; brandName: string; shouldHideBrandName: boolean } = {
     ...payload,
     thirdParty,
@@ -78,15 +80,17 @@ export function generateCommercialDocument(
     idEstimateInvoiceType,
     title: payload.title ?? null,
     penalties: payload.penalties
-      ? (internationalizationConsistency(locale, payload.penalties, 'penalties') ?? null)
+      ? (internationalizationConsistency(locale, payload.penalties, 'penalties') ?? payload.penalties)
       : null,
     termsOfPayment: payload.termsOfPayment
-      ? (internationalizationConsistency(locale, payload.termsOfPayment, 'termsOfPayment') ?? null)
+      ? (internationalizationConsistency(locale, payload.termsOfPayment, 'termsOfPayment') ?? payload.termsOfPayment)
       : null,
     compensation: payload.compensation
-      ? (internationalizationConsistency(locale, payload.compensation, 'recoveryCost') ?? null)
+      ? (internationalizationConsistency(locale, payload.compensation, 'recoveryCost') ?? payload.compensation)
+      : null,
+    discount: payload.discount
+      ? (internationalizationConsistency(locale, payload.discount, 'discount') ?? payload.discount)
       : null,
-    discount: payload.discount ? (internationalizationConsistency(locale, payload.discount, 'discount') ?? null) : null,
     vatMention: payload.vatMention
       ? (internationalizationConsistency(locale, payload.vatMention, 'vatMention') ?? null)
       : null,
@@ -123,7 +127,9 @@ export function generateCommercialDocument(
     shouldDisplayDiscountColumn: !!products.find((p) => p.discount2 && p.discount2 > 0),
     // @ts-ignore
     marginVats: _uniq(products.filter((p) => p.marginVatFormatted !== null).map((p) => p.marginVatFormatted)),
-    accountingCategoryFormatted: AccountingCategoryList.find((a) => a.id === payload.accountingCategory)?.label ?? null,
+    accountingCategoryFormatted: accountingCategory
+      ? (internationalizationConsistency(locale, accountingCategory, 'accountingCategory') ?? null)
+      : null,
     // @ts-ignore
     brandColors: getBrandConfig({ objectWaited: 'colors', nodeEnv }) as brandColorType,
     brandName: `${getBrandConfig({ objectWaited: 'name', nodeEnv }) as unknown as string}`,

package/ts/utils/commercialManagement/internationalization/choices.ts

@@ -7,7 +7,8 @@ type InternationalizationConsistencyKey =
   | 'vatMention'
   | 'recoveryCost'
   | 'paymentType'
-  | 'termsOfPayment';
+  | 'termsOfPayment'
+  | 'accountingCategory';
 
 export const internationalizationChoices: InternationalizationChoicesType = {
   fr: {
@@ -249,7 +250,7 @@ export const internationalizationChoices: InternationalizationChoicesType = {
           accountingCategory: {
             title: 'Transaction type',
             choices: [
-              { id: AccountingCategoryId.DELIVERY_OF_GOOD, label: 'supply of goods' },
+              { id: AccountingCategoryId.DELIVERY_OF_GOOD, label: 'Supply of goods' },
               { id: AccountingCategoryId.SERVICE_DELIVERY, label: 'Services provision' },
               { id: AccountingCategoryId.GOOD_AND_SERVICE, label: 'Services provision and supply of goods' },
             ],
@@ -493,6 +494,20 @@ const internationalizationMatching: { [key: string]: { fr: string; en: string }[
       en: '60 days upon receipt of invoice',
     },
   ],
+  accountingCategory: [
+    {
+      fr: 'Livraison de biens',
+      en: 'Supply of goods',
+    },
+    {
+      fr: 'Prestation de services',
+      en: 'Services provision',
+    },
+    {
+      fr: 'Prestation de services et livraison de biens',
+      en: 'Services provision and supply of goods',
+    },
+  ],
 };
 
 export const internationalizationConsistency = (