@silexpert/core 1.1.208 → 1.1.209

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

@@ -1,5 +1,5 @@
 import {
-  IsBoolean, IsNumber, IsOptional, IsPositive,
+  IsBoolean, IsNumber, IsOptional, IsPositive, IsInt,
 } from 'class-validator';
 import { ApiProperty, ApiPropertyOptional } from '../../../../utils';
 import { ToBoolean } from '../../../../utils/transforms/boolean.transform';
@@ -20,4 +20,11 @@ export class UpdateAttribution {
   @IsBoolean()
   @ToBoolean()
     randomSwap?: boolean;
+
+  @ApiPropertyOptional()
+  @IsOptional()
+  @IsInt({
+    each: true,
+  })
+    idCollaboratersToExclude: number[];
 }

package/ts/types/Interface/models/ISocietyDetail.ts

@@ -21,6 +21,7 @@ export interface ISocietyDetail {
   isPersoAdress?: string | null;
   vehicle?: string | null;
   interestOtherCompanies?: string | null;
+  listCompaniesInterestedIn?: string | null;
   areOtherCompaniesOnOurBrand?: string | null;
   listTva?: string | null;
   nbAssociates?: number | null;

package/ts/types/Interface/models/IUser.ts

@@ -21,6 +21,7 @@ import { IAccountingStatementHistory } from './IAccountingStatementHistory';
 import { ICountry } from './ICountry';
 import { INationality } from './INationality';
 import { IUserBrand } from './IUserBrand';
+import { ICollaboraterDetail } from './ICollaboraterDetail';
 
 type isAny<T> = T | any;
 
@@ -129,4 +130,5 @@ export interface IUser {
   countryLiving?: ICountry;
   nationality?: INationality;
   usersBrands?: IUserBrand[];
+  collaboraterDetails?: ICollaboraterDetail;
 }

package/ts/utils/checkup.ts

@@ -113,7 +113,7 @@ export const getCheckupDetailForm = (
             items: SelectYesNoStatementBool.map(i => ({ ...i, value: i.value.toString() })),
             hideDetails: true,
           },
-          lg: 4,
+          lg: societyDetail.isPersoAdress === '1' ? 4 : 8,
         },
         {
           component: 'FormInputSelect', //'FormInputRadio',
@@ -124,19 +124,19 @@ export const getCheckupDetailForm = (
             hideDetails: true,
           },
           condition: societyDetail.isPersoAdress === '1',
-          lg: societyDetail.isPersoAdress === '1' ? 4 : 8,
+          lg: 4,
         },
         {
           component: 'FormInputSelect', //'FormInputRadio',
-          text: 'Si non, avez-vous un bail commercial ?',
+          text: 'Avez-vous un bail commercial ?',
           value: 'hasCommercialLease',
           meta: {
             items: SelectYesNoStatementBool.map(i => ({ ...i, value: i.value.toString() })),
             hideDetails: true,
           },
           //TODO: conseil à afficher
-          condition: societyDetail.isPersoAdress === '1',
-          lg: societyDetail.isPersoAdress === '1' ? 4 : 8,
+          condition: societyDetail.isPersoAdress !== '1',
+          lg: societyDetail.hasCommercialLease === '1' ? 4 : 12,
         },
         {
           component: 'FormInputText',
@@ -147,8 +147,8 @@ export const getCheckupDetailForm = (
             suffix: 'm²',
             hideDetails:true,
           },
-          condition: societyDetail.isPersoAdress === '1',
-          lg: societyDetail.isPersoAdress === '1' ? 4 : 8,
+          condition: societyDetail.isPersoAdress !== '1' && societyDetail.hasCommercialLease === '1',
+          lg: 4,
         },
         {
           component: 'FormInputText',
@@ -159,8 +159,8 @@ export const getCheckupDetailForm = (
             suffix: '€',
             hideDetails:true,
           },
-          condition: societyDetail.isPersoAdress === '1',
-          lg: societyDetail.isPersoAdress === '1' ? 4 : 8,
+          condition: societyDetail.isPersoAdress !== '1' && societyDetail.hasCommercialLease === '1',
+          lg: 4,
         },
         {
           component: 'FormInputSelect',
@@ -187,7 +187,7 @@ export const getCheckupDetailForm = (
         {
           component: 'FormInputText',
           text: 'Si oui, quels sont les noms des sociétés ?',
-          value: 'commercialRentAmount',
+          value: 'listCompaniesInterestedIn',
           condition: parseInt(societyDetail.interestOtherCompanies, 10) > 0,
           lg: parseInt(societyDetail.interestOtherCompanies, 10) > 0 ? 4 : 12,
         },

package/ts/utils/vat/centuries.ts

@@ -26,7 +26,7 @@ const vatDocuments: VatDocument[] = [
     fileName: '3310-2023',
     annex: {
       name: '3519',
-      century: '23',
+      century: dayjs().format('YY'),
       shouldInclude: (data: Cerfa3310_2023) => Boolean(data.credit?.refundAsked && data.credit.refundAsked > 0),
       payload: (amount: number, payload: PayloadCerfa3519_2017) => getCerfa3519Century17Payload(amount, payload),
       asponePayload: (data: Cerfa3519_2017) => getCerfa3519Century23RegistrationFields(data),