@silexpert/core 1.0.74 → 1.0.76

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

@@ -649,6 +649,7 @@ export * from './Interface/api/statistic/QueryGetExpertAccountant';
 export * from './Interface/api/statistic/QueryAccountant';
 export * from './Interface/api/statistic/QueryGetAccountant';
 export * from './Interface/api/statistic/QueryDirection';
+export * from './Interface/api/statistic/QueryInternal';
 export * from './Interface/api/statistic/QueryGetDirection';
 export * from './Interface/api/pappers/CreatePappers';
 export * from './Interface/api/bankAccount/DeleteTransaction';
@@ -828,6 +829,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,
+  };
+}