@silexpert/core 1.0.73 → 1.0.75

package/ts/types/Interface/api/society/QueryPaginatedSocietyWithFacturation.ts

@@ -0,0 +1,46 @@
+import {
+  IsInt, IsOptional, IsString,
+} from 'class-validator';
+import { ApiPropertyOptional } from '../../../../utils';
+
+export class QueryPaginatedSocietyWithFacturation {
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+  search?: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+  day?: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+  month?: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+  year?: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+  idUser?: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+  idBillingState?: number;
+
+  @ApiPropertyOptional({ default: 20 })
+  @IsOptional()
+  @IsInt()
+  limit?: number;
+
+  @ApiPropertyOptional({ default: 1 })
+  @IsOptional()
+  @IsInt()
+  page?: number;
+}

package/ts/types/Interface/api/society/QuerySociety.ts

@@ -1,4 +1,4 @@
-import { IsIn } from 'class-validator';
+import { IsIn, IsOptional } from 'class-validator';
 import { ApiPropertyOptional } from '../../../../utils/decorators';
 
 export class QuerySociety {
@@ -6,9 +6,11 @@ export class QuerySociety {
   id?: number;
 
   @ApiPropertyOptional()
+  @IsOptional()
   attributes?: string[];
 
   @ApiPropertyOptional()
+  @IsOptional()
   @IsIn(['brandType', 'societyGescom', 'societyBank', 'societyDetails', 'oldExpertInfo', 'activity', 'follows', 'compta', 'subscriptionType', 'nafCode', 'connector', 'societyCgv', 'societyConfig', 'exercices', 'businessPartners'], { each: true })
   include?: string[];
 }

package/ts/types/Interface/models/IBillingHistory.ts

@@ -0,0 +1,21 @@
+import { IUser } from './IUser';
+import { IExercice, ISociety } from '../..';
+
+// comments
+export interface IBillingHistory {
+  id?: number;
+  totalAmount: number;
+  numberOfMonths: number;
+  comment: string;
+  hasToBeAccruals?: boolean;
+  idUser?: number | null;
+  idSociety?: number | null;
+  idExercice?: number | null;
+  createdAt?: Date | null;
+  updatedAt?: Date | null;
+
+  // Associations
+  user?: IUser;
+  society?: ISociety;
+  exercice?: IExercice;
+}

package/ts/types/Interface/models/IExercice.ts

@@ -33,6 +33,7 @@ export interface IExercice {
   receiptJeDeclare: boolean;
   annualFolderEdition: boolean;
   turnoverDone: string;
+  turnoverMax?: string;
   processClossingExercice: boolean;
   idFilePaymentSchedule?: number | null;
   isDefault: boolean;

package/ts/types/Interface/models/ISociety.ts

@@ -48,7 +48,7 @@ import { ISms } from './ISms';
 import { IUser } from './IUser';
 import { ISocietyEvent } from './ISocietyEvent';
 import {
-  ComptaType, Country, INafCode, IPartneredAccountantCompanyService, Sector, UnpaidDetail, IPartneredAccountantToSociety, IMail, IAccountingTransaction, IFecFile, IGedFile, IBusinessPartner,
+  ComptaType, CountryId, INafCode, IPartneredAccountantCompanyService, Sector, UnpaidDetail, IPartneredAccountantToSociety, IMail, IAccountingTransaction, IFecFile, IGedFile, IBusinessPartner, IPaymentSchedule,
 } from '../..';
 import { IBrandType } from './IBrandType';
 
@@ -112,7 +112,7 @@ export interface ISociety {
   idComptaType: ComptaType | null;
   idTypeBrand: number | null;
   idSubscriptionType: number | null;
-  idCountry: Country | null;
+  idCountry: CountryId | null;
   idSector: Sector | null;
   idSocietyNotes: number | null;
   folderNote: string | null;
@@ -158,6 +158,7 @@ export interface ISociety {
   societiesFollowedQualityMail?: IFollowedQualityMail[];
   societyFollow?: IFollow[];
   paymentsExpectations?: IPaymentExpectation[];
+  paymentSchedules?: IPaymentSchedule[];
   legalForm?: ILegalForm;
   oldExpertInfo?: IOldExpertInfo;
   prestationsSocieties?: IPrestation[];

package/ts/types/Interface/models/IThirdParty.ts

@@ -30,6 +30,7 @@ export interface IThirdParty {
   deliveryAddress?: string | null;
   deliveryZipCode?: string | null;
   deliveryCity?: string | null;
+  deliveryIdCountry?: number | null;
   createdAt?: Date;
   updatedAt?: Date;
   deletedAt?: Date | null;

package/ts/types/index.ts

@@ -49,6 +49,7 @@ export * from './Interface/models/ICivility';
 export * from './Interface/models/IErrorCode';
 export * from './Interface/models/IColor';
 export * from './Interface/models/IComment';
+export * from './Interface/models/IBillingHistory';
 export * from './Interface/models/IConnector';
 export * from './Interface/models/ICotation';
 export * from './Interface/models/ICountry';
@@ -518,6 +519,9 @@ export * from './Interface/api/society/SocietyWithStatsCaParams';
 export * from './Interface/api/society/QuerySociety';
 export * from './Interface/api/society/QueryPaginatedSociety';
 export * from './Interface/api/society/QueryPaginatedSocietyWithStatsCa';
+export * from './Interface/api/society/QueryPaginatedSocietyWithFacturation';
+export * from './Interface/api/billingHistory/QueryPaginatedBillingHistory';
+export * from './Interface/api/facturation/CreateRebilling';
 export * from './Interface/api/commercial/QueryGetStats';
 export * from './Interface/api/commercial/QueryFetchDialogDatasInfosOk';
 export * from './Interface/api/commercial/QueryMovePrestationsToNextMonth';
@@ -824,6 +828,7 @@ export * from './Interface/api/legalNotice/UpdateLegalNotice';
 export * from './Interface/api/wallet/QueryWallet';
 export * from './Interface/api/terminationList/QueryTerminationList';
 export * from './Interface/api/terminationList/DestroyTerminationList';
+export * from './Interface/api/pdf/ReadPdfizer';
 
 // Enums types
 export * from './Interface/enum/Util';

package/ts/utils/commercialManagement/document.ts

@@ -14,14 +14,18 @@ import { bodyTemplate } from './templates/body';
 import { productToReadProductEditing } from './product';
 import { vatToReadVatEditing } from './vat';
 import { CreateInvoiceDocument, CreatePreSaleDocument } from '../../types';
+import { thirdPartyToReadThirdPartyEditing } from './thirdParty';
 
 const ejs = require('ejs');
 
 export function generateCommercialDocument(idEstimateInvoiceType: EstimateInvoiceType, payload: CreateInvoiceDocument | CreatePreSaleDocument): ReadCommercialDocumentTemplate {
   const products = _orderBy(payload.products.map((product) => productToReadProductEditing(product), 'reorder'));
   const vats = _orderBy(Object.values(_groupBy(products, 'vatFormatted')).map((v) => (vatToReadVatEditing(v)), 'value')).filter((v) => v.id !== Vat.MARGE.id);
+  const thirdParty = thirdPartyToReadThirdPartyEditing(payload.thirdParty);
+
   const data: ReadDocumentEditing = {
     ...payload,
+    thirdParty,
     paymentLink: payload.paymentLink ?? '#',
     idEstimateInvoiceType,
     title: payload.title ?? null,

package/ts/utils/commercialManagement/templates/body.ts

@@ -56,9 +56,10 @@ const headOfDocument = `<div class="row space-between">
           <% if(thirdParty.fullname) {%><b><%= thirdParty.fullname %></b><br/><% } %>
           <% if(thirdParty.company) {%><%= thirdParty.company %><br/><% } %>
           <% if(thirdParty.address) {%><%= thirdParty.address %><br/><% } %>
-          <% if(thirdParty.zipCode) {%><%= thirdParty.zipCode + ' ' %><% } %><%= thirdParty.city %><br/>
-          <% if(thirdParty.deliveryAddress && thirdParty.deliveryCity && thirdParty.deliveryZipCode) {%>Adresse de livraison : <%= thirdParty.deliveryAddress %> <%= thirdParty.deliveryZipCode %> <%= thirdParty.deliveryCity %><br/><% } %>
-          <% if(thirdParty.nSiret) {%>SIRET : <%= thirdParty.nSiret %><% } %>
+          <% if(thirdParty.zipCode) {%><%= thirdParty.zipCode + ' ' %><% } %><%= thirdParty.city %> <%= thirdParty.country %><br/>
+          <% if(thirdParty.deliveryAddress && thirdParty.deliveryCity && thirdParty.deliveryZipCode) {%>Adresse de livraison : <%= thirdParty.deliveryAddress %> <%= thirdParty.deliveryZipCode %> <%= thirdParty.deliveryCity %> <%= thirdParty.deliveryCountry %><br/><% } %>
+          <% if(thirdParty.nSiret) {%>SIRET : <%= thirdParty.nSiret %><br/><% } %>
+          <% if(thirdParty.nTva) {%>N° TVA : <%= thirdParty.nTva %><% } %>
         </div>
       <% } %>
     </div>

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

@@ -129,7 +129,7 @@ export class CommercialDocumentCommonHTML {
   <% } %>
   <% if ([${EstimateInvoiceType.FACTURE}, ${EstimateInvoiceType.RESTE}, ${EstimateInvoiceType.ACOMPTE}].includes(idEstimateInvoiceType)) { %>
     <tr>
-      <td><b>Net à payer</b></td>
+      <td><b><%= depositFormatted ? 'Reste à payer' : 'Net à payer' %></b></td>
       <td><%= totalTaxAndDiscountIncludedFormatted %>€</td>
     </tr>
   <% } %>

package/ts/utils/commercialManagement/thirdParty.ts

@@ -0,0 +1,11 @@
+import { isDefined } from 'class-validator';
+import { IThirdParty, ReadThirdPartyEditing } from '../../types';
+import { CountryList } from '../../types/Enum/Country';
+
+export function thirdPartyToReadThirdPartyEditing(payload: IThirdParty): ReadThirdPartyEditing {
+  return {
+    ...payload,
+    country: isDefined(payload.idCountry) ? CountryList.find((c) => c.id === payload.idCountry)?.name?.toUpperCase() ?? null : null,
+    deliveryCountry: isDefined(payload.deliveryIdCountry) ? CountryList.find((c) => c.id === payload.deliveryIdCountry)?.name?.toUpperCase() ?? null : null,
+  };
+}