@silexpert/core 1.2.92 → 1.2.94

package/ts/types/Interface/api/commercial/Query.ts

@@ -1,5 +1,6 @@
-import { IsDate, IsOptional } from 'class-validator';
+import { IsBoolean, IsDate, IsInt, IsOptional, IsString } from 'class-validator';
 import { ApiPropertyOptional } from '../../../../utils';
+import { ToBoolean } from '../../../../utils/transforms/boolean.transform';
 
 export class QueryGetLeadByUser {
   @ApiPropertyOptional()
@@ -12,3 +13,79 @@ export class QueryGetLeadByUser {
   @IsDate()
   endDate?: Date;
 }
+
+export class QueryGetListSocietiesFilteredBetweenDate {
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsString()
+  search?: string;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsBoolean()
+  @ToBoolean()
+  isInCA?: boolean;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsBoolean()
+  @ToBoolean()
+  isAdditionalSales?: boolean;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsDate()
+  startDate?: Date;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsDate()
+  endDate?: Date;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+  idUser?: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+  idSource?: number;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt({ each: true })
+  idPrestationList?: number[];
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt({ each: true })
+  idOfferList?: number[];
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt({ each: true })
+  idState?: number[];
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt({ each: true })
+  idConstitutionState?: number[];
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsBoolean()
+  @ToBoolean()
+  goToFacturation?: boolean;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsBoolean()
+  @ToBoolean()
+  goToOnboarding?: boolean;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt()
+  idTypeBrand?: number;
+}

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

@@ -389,6 +389,12 @@ export class CreateCommercialMail {
   @IsBoolean()
   @ToBoolean()
   shouldSaveToCustomTemplate?: boolean;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsBoolean()
+  @ToBoolean()
+  isTest?: boolean;
 }
 
 export class CreateCommercialMailWithMultipleFiles extends CreateCommercialMail {
@@ -511,6 +517,9 @@ export class CommercialDocumentInputs {
   @ToBoolean()
   shouldPayTaxAfterDebit?: boolean;
 
+  @ApiProperty()
+  idSaleDocumentTemplate?: number;
+
   @ApiPropertyOptional({ description: 'Moyen de paiement' })
   paymentType?: string | null;
 }

package/ts/types/Interface/api/config/ConfigType.ts

@@ -207,6 +207,7 @@ export interface Pappers {
 export interface Shine {
   host: string;
   hostV3: string;
+  publicHost: string;
   clientId: string;
   clientSecret: string;
   redirect_uris: string[];

package/ts/types/Interface/api/shine/ConnectResponse.ts

@@ -4,5 +4,4 @@ import { ShineBankAccount } from './CreateShine';
 export type ConnectResponse = {
   bankConnection: IBankConnection;
   bankAccounts: ShineBankAccount[];
-  alreadyExists: boolean;
 };

package/ts/types/Interface/api/shine/CreateShine.ts

@@ -21,94 +21,107 @@ export type ShineTokenInformations = {
   exp: number;
 };
 
+export enum ShineTransactionCategory {
+  DEFAULT = 'DEFAULT',
+  BANKING = 'BANKING',
+  CASH = 'CASH',
+  CONTRIBUTIONS = 'CONTRIBUTIONS',
+  EQUIPMENT = 'EQUIPMENT',
+  FOOD = 'FOOD',
+  HOTEL = 'HOTEL',
+  LEGAL = 'LEGAL',
+  LOAN = 'LOAN',
+  MAINTENANCE = 'MAINTENANCE',
+  MISC = 'MISC',
+  PERSONAL = 'PERSONAL',
+  RENT = 'RENT',
+  SERVICES = 'SERVICES',
+  TAX = 'TAX',
+  TELECOM = 'TELECOM',
+  ALCOOL_TOBACCO = 'ALCOOL_TOBACCO',
+  TRANSPORTATION = 'TRANSPORTATION',
+  UTILITIES = 'UTILITIES',
+  VEHICLE = 'VEHICLE',
+  BETTING = 'BETTING',
+}
+
 export type ShineBankAccount = {
   bankAccountId: string;
+  bic: string;
+  companyProfileId: string;
+  createdAt: number;
+  currency: string;
   currentBalance: number;
   currentBalanceFloat: number;
-  nextBalance: number;
-  nextBalanceFloat: number;
-  currency: string;
   iban: string;
-  bic: string;
+  isHidden: boolean;
   name: string;
+  nextBalance: number;
+  nextBalanceFloat: number;
   ownerName: string;
-  trzWalletId: string;
-  type: string;
-  createdAt: number;
   status: string;
-  uid: string;
-  companyProfileId: string;
+  type: string;
   updatedAt: number;
-  closedAt: number | null;
-  lockedCustomMessage: string | null;
-  lockedReason: string | null;
-  isHidden: boolean;
-  illustrationName: string | null;
-  balanceFromProviderUpdatedAt: string;
 };
 
 export type ShineBankTransaction = {
-  transactionId: string;
+  authorizationReleasedAt: null;
+  bankAccountId: string;
+  bankTransferId: string;
+  bankTransferStatus: string | null;
+  cardPaymentStatus: string | null;
+  category: ShineTransactionCategory;
+  companyUserId: string | null;
   createdAt: number;
   currency: string;
+  description: string;
+  directDebitMandateId: string;
+  executedAt: null;
+  fee: number;
+  feeType: string;
+  hasReceipts: boolean;
+  initiatorName: null;
+  is3DS: boolean;
+  isHidden: boolean;
+  isOnAgentWallet: boolean;
+  isRefund: boolean;
+  note: string;
+  payinVirtualStatus: null;
   paymentMethod: string;
-  paymentProvider: string;
-  providerTransactionId: string;
+  refundTransactionId: null;
+  sentToSepaNetworkAt: null;
   status: string;
   title: string;
   titleLatinised: string;
+  transactionAt: number;
+  transactionId: string;
+  transactionSettledAt: number;
+  transferPayinSenderName: string;
   type: 'payout' | 'payin';
-  uid: string;
+  uid: string | null;
   updatedAt: number;
   value: number;
-  bankTransferId: string;
-  transactionAt: number;
-  fee: number;
-  transferPayinSenderName: string;
-  feeType: string;
-  description: string;
-  category: string;
-  isRefund: boolean;
-  directDebitMandateId: string;
-  bankAccountId: string;
-  transactionSettledAt: number;
-  providerCardPaymentId: null;
-  providerCardTransactionId: null;
-  cardPaymentStatus: null;
   isPersonal: boolean;
-  hasReceipts: boolean;
-  note: string;
-  isHidden: boolean;
-  authorizationReleasedAt: null;
-  refundTransactionId: null;
-  executedAt: null;
-  companyUserId: null;
-  initiatorName: null;
-  remainingAuthorized: null;
-  expectedReleaseDate: null;
-  cardPaymentMethod: null;
-  paymentCurrency: string;
-  is3DS: boolean;
 };
 
 export type ShineTransactionReceipt = {
-  receiptId: string;
   bucketName: string;
   bucketPath: string;
+  category: string;
+  receiptId: string;
   companyProfileId: string;
   companyUserId: string;
   createdByCompanyUserId: string | null;
-  createdAt: number;
-  category: string;
   currency: string;
+  createdAt: number;
   deleted: boolean;
   fileRef: string;
   processing: boolean;
   sellerName: string;
   sellerNameLatinised: string;
   subtotal: number;
-  thumbUrl: string;
   total: number;
+  thumbUrl: string;
   transactionAt: number;
   transactionId: string | null;
   udpatedAt: number;

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

@@ -26,3 +26,10 @@ export class QueryInternalDataOfficer {
   @IsArray()
   idUsers?: number[];
 }
+
+export class QueryInternalMarketing {
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsArray()
+  idUsers?: number[];
+}

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

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

package/ts/types/Interface/api/toDoExpress/Query.ts

@@ -41,7 +41,7 @@ export class QueryToDoBalanceSheetPaginated extends RequiredQueryPaginate {
   @ApiPropertyOptional()
   @IsOptional()
   @IsInt()
-  onboardingState?: number;
+  idVatRegime?: number;
 
   @ApiPropertyOptional()
   @IsOptional()
@@ -142,11 +142,6 @@ export class QueryToDoBalanceSheetStats {
   @IsArray()
   turnoverMax?: number[];
 
-  @ApiPropertyOptional()
-  @IsOptional()
-  @IsInt()
-  onboardingState?: number;
-
   @ApiPropertyOptional()
   @IsOptional()
   @IsInt()

package/ts/types/index.ts

@@ -842,6 +842,7 @@ export * from './Interface/api/statistic/QueryInternal';
 export * from './Interface/api/statistic/QueryGetDirection';
 export * from './Interface/api/statistic/QueryCustomerSuccess';
 export * from './Interface/api/statistic/QueryDataOfficer';
+export * from './Interface/api/statistic/QueryMarketing';
 export * from './Interface/api/pappers/CreatePappers';
 export * from './Interface/api/bankAccount/Query';
 export * from './Interface/api/bankAccount/Update';

package/ts/utils/commercialManagement/document.ts

@@ -153,6 +153,8 @@ export function generateCommercialDocument(
       products: data.products.map((p) => ({
         ...p,
         comment: p.comment && typeof p.comment === 'string' ? p.comment?.replace(/\n/g, '<br/>') : null,
+        // @ts-expect-error
+        unitFormatted: internationalizationConsistency(locale, p.unitFormatted, 'unit'),
       })),
       vats: forcedVats ?? vats,
     }),

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

@@ -8,7 +8,8 @@ type InternationalizationConsistencyKey =
   | 'recoveryCost'
   | 'paymentType'
   | 'termsOfPayment'
-  | 'accountingCategory';
+  | 'accountingCategory'
+  | 'unit';
 
 export const internationalizationChoices: InternationalizationChoicesType = {
   fr: {
@@ -508,6 +509,28 @@ const internationalizationMatching: { [key: string]: { fr: string; en: string }[
       en: 'Services provision and supply of goods',
     },
   ],
+  unit: [
+    { fr: 'art', en: 'art' },
+    { fr: 'h', en: 'h' },
+    { fr: 'j', en: 'd' },
+    { fr: 'Kg', en: 'kg' },
+    { fr: 'l', en: 'l' },
+    { fr: 'km', en: 'km' },
+    { fr: 'demi j', en: 'half d' },
+    { fr: 'an', en: 'year' },
+    { fr: 'sem', en: 'week' },
+    { fr: 'mois', en: 'month' },
+    { fr: 'trim', en: 'quart' },
+    { fr: 'p', en: 'p' },
+    { fr: 'f', en: 'f' },
+    { fr: 'm2', en: 'm2' },
+    { fr: 'm3', en: 'm3' },
+    { fr: 'Mètre', en: 'meter' },
+    { fr: 'abo', en: 'sub' },
+    { fr: 'nuit', en: 'night' },
+    { fr: 't', en: 't' },
+    { fr: 'ha', en: 'ha' },
+  ],
 };
 
 export const internationalizationConsistency = (

package/ts/utils/commercialManagement/saleEmail.ts

@@ -47,6 +47,8 @@ export function transformModelWithCharcodeToString(datas: InfoToUseType, templat
     } else {
       newString = splitString.replace(`[${char.name}]`, `${dataToInfer}`) + endOfString;
     }
+    // then we remove the color of variable (tag) from the front
+    newString = newString.replace('style="color: rgb(131, 131, 132);"', '');
   });
   return newString;
 }

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

@@ -115,7 +115,7 @@ export const bodyTemplate = `<html class="pdf-content">
       <br/><%= languageTemplate.template.common.options.approval %> : <br/><br/><br/><br/>
     <% } %>
 
-    <% if (cgv && ((settings && settings.invoiceCgv) || idEstimateInvoiceType === ${EstimateInvoiceType.DEVIS} || idEstimateInvoiceType === ${EstimateInvoiceType.BON})) { %>
+    <% if (cgv && (settings && settings.invoiceCgv) && (idEstimateInvoiceType === ${EstimateInvoiceType.FACTURE} || idEstimateInvoiceType === ${EstimateInvoiceType.ACOMPTE} || idEstimateInvoiceType === ${EstimateInvoiceType.AVOIR} || idEstimateInvoiceType === ${EstimateInvoiceType.RESTE} ) { %>
       <br><div style="page-break-after:always;"></div>
       <div id="WYSIWYG"><%- cgv %></div>
     <% } %>