@silexpert/core 1.0.44 → 1.0.50

package/ts/types/Interface/api/statistic/ExitRequest.ts

@@ -0,0 +1,108 @@
+import { ISociety } from '../../models/ISociety';
+
+export interface CountLateToDoDone {
+  late: string[],
+  toDo: string[],
+  done: string[]
+}
+
+export interface Count {
+  count: number,
+  societiesList: string[]
+}
+
+export interface CountIsIr {
+  IS: string[],
+  IR: string[],
+}
+
+export interface CountComplementaryPrestation {
+  waitingClient: string[],
+  waitingDirection: string[],
+  acceptedDirection: string[],
+  refusedDirection: string[],
+}
+
+interface TotalAverage {
+  total: number,
+  average: number,
+}
+
+export interface TotalAverageProfit {
+  factured: TotalAverage,
+  payed: TotalAverage
+}
+
+export interface StatsLabBySocieties {
+  late: string[],
+  toDo: string[],
+  done: string[]
+}
+export interface StatsMailsBySocieties {
+  late: string[],
+  toDo: string[],
+  done: string[]
+}
+
+export interface StatsCallsBySocieties {
+  late: string[],
+  toDo: string[],
+  done: string[]
+}
+
+export interface StatsReportsBySocieties {
+  late: string[],
+  toDo: string[],
+  done: string[]
+}
+
+export interface ExitApplication {
+  done: {
+    count: number,
+    societies: string[],
+  },
+  undone: {
+    count: number,
+    societies: string[],
+  }
+}
+
+export interface StatisticBalanceSheetDetail {
+  goodToAttested: string[],
+  attested: string[],
+  attestedRefused: string[],
+  attestedObserved: string[],
+  toReview: string[],
+  toRevised: string[],
+  toSupervised: string[],
+  acceptedSIE: string[],
+  ARCAttested: string[],
+  ARCNoAttested: string[],
+}
+
+export interface ReturnListType {
+  societies?: ISociety[],
+  active?: ISociety[],
+  unpayed?: string[],
+  terminated?: string[],
+  archived?: string[],
+  labDetail?: CountLateToDoDone,
+  balanceSheet?: CountLateToDoDone,
+  balanceSheetDetailed?: StatisticBalanceSheetDetail,
+  additionnalSell?: CountComplementaryPrestation,
+  tva?: CountLateToDoDone,
+  checklist?: CountLateToDoDone,
+  checklistReinforced?: CountLateToDoDone,
+  revision?: Count,
+  annotate?: string[],
+  isIr?: CountIsIr,
+  task?: StatsLabBySocieties,
+  mail?: StatsMailsBySocieties,
+  call?: StatsCallsBySocieties,
+  report?: StatsReportsBySocieties,
+  profitability?: TotalAverageProfit,
+  synchronised?: string[],
+  applicationJustified?: ExitApplication,
+  applicationAnnoted?: ExitApplication,
+  applicationSynchronised?: ExitApplication,
+}

package/ts/types/Interface/api/statistic/QueryAccountant.ts

@@ -0,0 +1,20 @@
+import {
+  IsNumber, IsDate, IsIn,
+} from 'class-validator';
+import { ApiProperty } from '../../../../utils';
+import { StatisticType } from '../../../Enum/StatisticType';
+
+export class QueryAccountant {
+  @ApiProperty()
+  @IsNumber()
+  idUser: number;
+
+  @ApiProperty()
+  @IsDate()
+  endDate: Date;
+
+  @ApiProperty()
+  @IsNumber()
+  @IsIn(Object.values(StatisticType))
+  type: number;
+}

package/ts/types/Interface/api/statistic/QueryDirection.ts

@@ -0,0 +1,20 @@
+import {
+  IsNumber, IsDate, IsIn, IsOptional,
+} from 'class-validator';
+import { ApiProperty, ApiPropertyOptional } from '../../../../utils';
+import { StatisticType } from '../../../Enum/StatisticType';
+
+export class QueryDirection {
+  @ApiPropertyOptional()
+  @IsOptional()
+  idUser: number[];
+
+  @ApiProperty()
+  @IsDate()
+  endDate: Date;
+
+  @ApiProperty()
+  @IsNumber()
+  @IsIn(Object.values(StatisticType))
+  type: number;
+}

package/ts/types/Interface/api/statistic/QueryExpertAccountant.ts

@@ -0,0 +1,20 @@
+import {
+  IsNumber, IsDate, IsIn, IsOptional,
+} from 'class-validator';
+import { ApiProperty, ApiPropertyOptional } from '../../../../utils';
+import { StatisticType } from '../../../Enum/StatisticType';
+
+export class QueryExpertAccountant {
+  @ApiPropertyOptional()
+  @IsOptional()
+  idUser: number[];
+
+  @ApiProperty()
+  @IsDate()
+  endDate: Date;
+
+  @ApiProperty()
+  @IsNumber()
+  @IsIn(Object.values(StatisticType))
+  type: number;
+}

package/ts/types/Interface/api/statistic/QueryGetAccountant.ts

@@ -0,0 +1,14 @@
+import {
+  IsNumber, IsDate,
+} from 'class-validator';
+import { ApiProperty } from '../../../../utils';
+
+export class QueryGetAccountant {
+  @ApiProperty()
+  @IsNumber()
+  idUser: number;
+
+  @ApiProperty()
+  @IsDate()
+  endDate: Date;
+}

package/ts/types/Interface/api/statistic/QueryGetDirection.ts

@@ -0,0 +1,14 @@
+import {
+  IsDate, IsOptional,
+} from 'class-validator';
+import { ApiProperty, ApiPropertyOptional } from '../../../../utils';
+
+export class QueryGetDirection {
+  @ApiPropertyOptional()
+  @IsOptional()
+  idUser: number[];
+
+  @ApiProperty()
+  @IsDate()
+  endDate: Date;
+}

package/ts/types/Interface/api/statistic/QueryGetExpertAccountant.ts

@@ -0,0 +1,14 @@
+import {
+  IsDate, IsOptional,
+} from 'class-validator';
+import { ApiProperty, ApiPropertyOptional } from '../../../../utils';
+
+export class QueryGetExpertAccountant {
+  @ApiPropertyOptional()
+  @IsOptional()
+  idUser: number[];
+
+  @ApiProperty()
+  @IsDate()
+  endDate: Date;
+}

package/ts/types/Interface/api/wallet/UpdateAttribution.ts

@@ -0,0 +1,23 @@
+import {
+  IsBoolean, IsNumber, IsOptional, IsPositive,
+} from 'class-validator';
+import { ApiProperty, ApiPropertyOptional } from '../../../../utils/decorators';
+import { ToBoolean } from '../../../../utils/transforms/boolean.transform';
+
+export class UpdateAttribution {
+  @ApiProperty()
+  @IsNumber()
+  @IsPositive()
+  idRoles: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsNumber()
+  swapUserId?: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsBoolean()
+  @ToBoolean()
+  randomSwap?: boolean;
+}

package/ts/types/Interface/models/IAttributionHistory.ts

@@ -13,8 +13,8 @@ export interface IAttributionHistory {
   updatedAt?: Date | null;
 
   // Associations
-  userAttribute: IUser;
-  userMakeAttribution: IUser;
-  society: ISociety;
-  role: IRole;
+  userAttribute?: IUser;
+  userMakeAttribution?: IUser;
+  society?: ISociety;
+  role?: IRole;
 }

package/ts/types/Interface/models/IPrestationComplementary.ts

@@ -21,7 +21,7 @@ export interface IPrestationComplementary {
   note: string | null;
   forOtherMission: string | null;
   statePrestationJuridique: number | null;
-  acceptationAdmin: boolean;
+  acceptationAdmin: number;
   createdAt?: Date | null;
   updatedAt?: Date | null;
   deletedAt?: Date | null;

package/ts/types/Interface/models/IStatistic.ts

@@ -0,0 +1,13 @@
+import { IUser } from './IUser';
+
+export interface IStatistic {
+  id?: number,
+  idUser: number,
+  startDate?: Date,
+  endDate?: Date,
+  type: number,
+  payload: string,
+
+  // Associations
+  user?: IUser;
+}

package/ts/types/index.ts

@@ -293,6 +293,7 @@ export * from './Interface/models/IAccountingTransaction_new';
 export * from './Interface/models/IExerciceNote';
 export * from './Interface/models/IRevisionGuide';
 export * from './Interface/models/ISponsorshipWithSponsorInfo';
+export * from './Interface/models/IStatistic';
 export * from './Interface/models/ILastUpdateConnection';
 export * from './Interface/models/IAccountsSectors';
 export * from './Interface/models/IAnswerType';
@@ -376,7 +377,9 @@ export * from './Enum/GlobalRegime';
 export * from './Enum/TaxSystem';
 export * from './Enum/FiscalRegime';
 export * from './Enum/Activity';
+export * from './Enum/AdditionnalSells';
 export * from './Enum/CerfaType';
+export * from './Enum/StatisticType';
 export * from './Enum/StockType';
 export * from './Enum/SaleType';
 export * from './Enum/TypePayment';
@@ -620,6 +623,13 @@ export * from './Interface/api/pappers/ReadPappers';
 export * from './Interface/api/sponsorship/SendSponsorshipLink';
 export * from './Interface/api/sponsorship/CreateSponsorship';
 export * from './Interface/api/sponsorship/QuerySponsorship';
+export * from './Interface/api/statistic/ExitRequest';
+export * from './Interface/api/statistic/QueryExpertAccountant';
+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/QueryGetDirection';
 export * from './Interface/api/pappers/CreatePappers';
 export * from './Interface/api/bankAccount/DeleteTransaction';
 export * from './Interface/api/stripe/QueryStripe';
@@ -788,6 +798,7 @@ export * from './Interface/api/qonto/ReadCreateConnection';
 export * from './Interface/api/file/Create';
 export * from './Interface/api/file/Read';
 export * from './Interface/api/societyConfig/update';
+export * from './Interface/api/wallet/UpdateAttribution';
 
 // Enums types
 export * from './Interface/enum/Util';

package/ts/utils/commercialManagement/document.ts

@@ -18,7 +18,6 @@ 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 data: ReadDocumentEditing = {
     ...payload,
     paymentLink: payload.paymentLink ?? '#',

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

@@ -108,7 +108,7 @@ export const bodyTemplate = `<html class="pdf-content">
         </div>
       </div>
     <% } %>
-    <% if (settings && settings.bonPour) { %>
+    <% if (settings && settings.bonPour && (idEstimateInvoiceType === ${EstimateInvoiceType.DEVIS} || idEstimateInvoiceType === ${EstimateInvoiceType.BON})) { %>
       <br/>Bon pour accord : <br/><br/><br/><br/>
     <% } %>
 

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

@@ -8,30 +8,7 @@ export class CommercialDocumentCommonHTML {
     <span id="header-edging" style="position: absolute; top: 0; left: 0; width: 100vw; font-size: 10px; height: 15px; background-color: <%= settings && settings.edgingColor ? settings.edgingColor : '#333333' %>; margin-bottom: 20px;"></span>
   <% } %>`;
 
-  footer = `<div style="font-size: 10px; color: #838384; text-align: center; padding: 0 40px; display: block; width: 100%">
-    <% if (freeText) { %><%- freeText %><br/><br/><% } %>
-    <% if (accountingCategoryFormatted) {%>
-      <%= accountingCategoryFormatted %> |
-    <%}%>
-    <% if(marginVats.length > 0) { %>
-      Régime TVA sur marge - 
-      <% marginVats.forEach(function(v, index) { %>
-        <%= v %> - 
-      <% }) %>
-      ART 297-A du CGI ou directive 2006-212 CE |
-    <% } %>
-    <% if(penalties || compensation || discount) { %>
-      <%= penalties ? 'Pénalités en cas de retard : ' + penalties : ''%>
-      <%= penalties && compensation ? '|' : ''%>
-      <%= compensation ? 'Indemnité forfaitaire en cas de retard :' + compensation : '' %>
-      <%= (compensation || penalties) && discount ? '| ' : '' %>
-      <%= discount %><%= shouldPayTaxAfterDebit ? "| Option pour le paiement de la taxe d'après les débits" : '' %>
-      <% if(name || legalForm || capital || siren || rcs) {%>
-        <br/><br/>
-      <% } %>
-    <% } %>
-    <%= name %><%= name && (legalForm || capital || siren || rcs) ? ',' : ''%><%= legalForm %><%= capital ? ' au capital de ' + capitalFormatted + ' €' : '' %><%= siren ? ' immatriculée sous le SIREN ' + siren : ''%><%= rcs ? 'RCS ' + rcs + vatCode || nafCode ? '|' : '' : ''%><% if (vatCode || nafCode) {%><br/><% } %><%= vatCode ? 'N° TVA '+vatCode : ''%><% if(vatCode && nafCode){%>|<%}%><%= nafCode ? 'APE '+nafCode : '' %>
-    </div>`;
+  footer = '<div style="font-size: 10px; color: #838384; text-align: center; padding: 0 40px; display: block; width: 100%;"><% if (freeText) { %><%- freeText %><br/><br/><% } %><% if (accountingCategoryFormatted) {%><%= accountingCategoryFormatted %> |<%}%><% if(marginVats.length > 0) { %>Régime TVA sur marge - <% marginVats.forEach(function(v, index) { %><%= v %> - <% }) %>ART 297-A du CGI ou directive 2006-212 CE |<% } %><% if(penalties || compensation || discount) { %><%= penalties ? \'Pénalités en cas de retard : \' + penalties + \' \' : \'\'%><%= penalties && compensation ? \'|\' : \'\'%><%= compensation ? \'Indemnité forfaitaire en cas de retard :\' + compensation + \' \' : \'\' %><%= (compensation || penalties) && discount ? \' | \' : \'\' %><%= discount ? discount + \' \' : \'\' %><%= shouldPayTaxAfterDebit ? "| Option pour le paiement de la taxe d\'après les débits" : \'\' %><% if(name || legalForm || capital || siren || rcs) {%><br/><br/><% } %><% } %><%= name %><%= name && (legalForm || capital || siren || rcs) ? \', \' : \'\'%><%= legalForm %><%= capital ? \' au capital de \' + capitalFormatted + \' €\' : \'\' %><%= siren ? \' immatriculée sous le SIREN \' + siren : \'\'%><%= rcs ? \'| RCS \' + rcs : \'\'%><% if (vatCode || nafCode) {%><br/><% } %><%= vatCode ? \'N° TVA \'+vatCode : \'\'%><% if(vatCode && nafCode){%>|<%}%><%= nafCode ? \'APE \'+nafCode : \'\' %></div>';
 
   logo = `<div class="logo-placeholder">
     <% if (logoUrl) { %><img src="<%= logoUrl %>" alt="logo" /><% } %>
@@ -90,7 +67,7 @@ export class CommercialDocumentCommonHTML {
   <% } %>
 </table>`;
 
-  vatRecapitulation = `<table style="width: 80%;" class="commercial-table-preview">
+  vatRecapitulation = `<table style="width: 80%; page-break-inside: avoid !important;" class="commercial-table-preview">
   <thead>
     <tr>
       <td>Base</td>
@@ -107,7 +84,7 @@ export class CommercialDocumentCommonHTML {
     <% }) %>
   </table>`;
 
-  amountRecapitulation = `<table class="summary-prices commercial-table-preview" style="width: 100%; padding-left: 20px;">
+  amountRecapitulation = `<table class="summary-prices commercial-table-preview" style="width: 100%; padding-left: 20px; page-break-inside: avoid !important;">
   <thead>
     <tr>
       <td colspan="2">Récapitulatif</td>
@@ -137,6 +114,11 @@ export class CommercialDocumentCommonHTML {
         <td>Total <%= disableVat !== true ? 'TTC' : ''%></td>
         <td><%= totalTaxAndDiscountIncludedFormatted %>€</td>
       </tr>
+    <% } else if (disableVat === true && ![${EstimateInvoiceType.FACTURE}, ${EstimateInvoiceType.RESTE}, ${EstimateInvoiceType.ACOMPTE}].includes(idEstimateInvoiceType)) { %>
+      <tr>
+        <td>Total</td>
+        <td><%= totalTaxAndDiscountIncludedFormatted %>€</td>
+      </tr>
     <% } %>
     <% if (depositFormatted) { %>
       <tr>