@silexpert/core 1.2.30 → 1.2.31

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

@@ -603,6 +603,39 @@ export class UpdateSaleEmail {
   @IsEnum(EmailType)
     type?: number; 
 
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsBoolean()
+  @ToBoolean()
+    isDefault?: boolean;
+}
+
+export class CreateGeneralConditionOfSale {
+  @ApiProperty()
+  @IsString()
+    name: string;
+
+  @ApiProperty()
+  @IsString()
+    content: string;
+
+  @ApiProperty()
+  @IsBoolean()
+  @ToBoolean()
+    isDefault: boolean;
+}
+
+export class UpdateGeneralConditionOfSale {
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+    name?: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+    content?: string;
+
   @ApiPropertyOptional()
   @IsOptional()
   @IsBoolean()

package/ts/types/Interface/api/previsionalForm/CreatePrevisionalForm.ts

@@ -2,7 +2,7 @@ import { LegalFormTypeEnum } from '../../../Enum/LegalForm';
 import { TaxSystem } from '../../../Enum/TaxSystem';
 import { LoanInformation, NumberFiscalYears, OptionNumberFiscalYears, PrevisionalFormActivity, PrevisionalFormPayload } from '../../..';
 import { ApiProperty, ApiPropertyOptional } from '../../../../utils';
-import { IsNumber, IsBoolean, IsEnum, IsOptional, ValidateNested, IsIn } from 'class-validator';
+import { IsNumber, IsBoolean, IsEnum, IsOptional, ValidateNested, IsIn, IsString } from 'class-validator';
 import { ToBoolean } from '../../../../utils/transforms/boolean.transform';
 
 export class NumberFiscalYearsValidation implements NumberFiscalYears {
@@ -132,8 +132,8 @@ export class CreatePrevisionalFormData implements PrevisionalFormPayload {
   @ValidateNested()
     outsourcing: Required<NumberFiscalYearsValidation>[];
 
-  @ApiProperty()
-    merchandisePurchase: OptionNumberFiscalYears[];
+  @ApiPropertyOptional()
+    merchandisePurchase?: OptionNumberFiscalYears[];
 
   /**
    * Consommables
@@ -239,6 +239,13 @@ export class CreatePrevisionalFormData implements PrevisionalFormPayload {
 
   @ApiProperty()
     otherTaxes: NumberFiscalYears | undefined;
+
+  /**
+   * Récapitulatif
+   */
+  @ApiProperty()
+  @IsString()
+    summary: string;
 }
 
 export class CreatePrevisionalForm {

package/ts/types/Interface/api/previsionalForm/PrevisionalFormPayload.ts

@@ -49,7 +49,7 @@ export interface Financing {
 
 export interface Turnover {
   turnover: Required<NumberFiscalYears>[]; // Ventes de marchandises / Ventes de matières premières / Ventes de prestations de services
-  merchandisePurchase: OptionNumberFiscalYears[]; // Achats de marchandises / matières premières
+  merchandisePurchase?: OptionNumberFiscalYears[]; // Achats de marchandises / matières premières
 }
 
 export interface Charges {
@@ -92,4 +92,8 @@ export interface SocialAndRemuneration {
   remunerationManager: NumberFiscalYears; // Rémunération gérant
 }
 
-export interface PrevisionalFormPayload extends CompanyDescription, Investment, Financing, Turnover, Charges, Taxes, Consumables, OtherCharges, SocialAndRemuneration {}
+export interface ProjectSummary {
+  summary: string // Récapitulatif du projet
+}
+
+export interface PrevisionalFormPayload extends CompanyDescription, Investment, Financing, Turnover, Charges, Taxes, Consumables, OtherCharges, SocialAndRemuneration, ProjectSummary {}

package/ts/types/Interface/models/IGeneralConditionOfSale.ts

@@ -0,0 +1,15 @@
+import { ISociety } from './ISociety';
+
+export interface IGeneralConditionOfSale {
+  id?: number;
+  name: string;
+  content: string;
+  isDefault: boolean;
+  idSociety?: number | null;
+  createdAt?: Date | null;
+  updatedAt?: Date | null;
+  deletedAt?: Date | null;
+
+  // Associations
+  society?: ISociety
+}

package/ts/types/index.ts

@@ -339,6 +339,7 @@ export * from './Interface/models/IPrevisionalForm';
 export * from './Interface/models/IHumanResourceLibrary';
 export * from './Interface/models/IUserHumanResourceLibrary';
 export * from './Interface/models/ISaleEmail';
+export * from './Interface/models/IGeneralConditionOfSale';
 
 
 // Schemas