@silexpert/core 1.1.181 → 1.1.183

package/ts/types/Enum/Supervision.ts

@@ -8,6 +8,7 @@ export enum Supervision {
   TO_REVIEW = 10,
   SUPERVISION_WAITING = 11,
   ESTABLISH_REFUSED = 12,
+  WITHOUT_ATTESTATION = 13,
 }
 
 export const SupervisionStateList = [
@@ -65,4 +66,10 @@ export const SupervisionStateList = [
     color: 'orange darken-1',
     textColor: 'orange--text text--darken-1',
   },
+  {
+    id: Supervision.WITHOUT_ATTESTATION,
+    label: 'Sans attestation',
+    color: 'orange lighten-1',
+    textColor: 'orange--text text--lighten-1',
+  },
 ];

package/ts/types/Interface/api/kilometricAllowance/ReadKilometricAllowance.ts

@@ -1,7 +1,14 @@
 import { ISocietyVehicle } from '../../models/ISocietyVehicle';
 
+export type ReadKilometricAllowanceByVehicleInfoPerYear = {
+  year: string;
+  amount: number;
+  kilometers: number;
+};
+
 export type ReadKilometricAllowanceByVehicle = {
   vehicle: ISocietyVehicle;
   amount: number;
   kilometers: number;
+  informationsPerYear: ReadKilometricAllowanceByVehicleInfoPerYear[]
 };

package/ts/types/Interface/api/paymentExpectation/QueryPaymentExpectation.ts

@@ -1,6 +1,8 @@
+import { IsInt } from 'class-validator';
 import { ApiProperty } from '../../../../utils';
 
 export class QueryGetPaymentExpectation {
   @ApiProperty()
+  @IsInt()
     idPrestation: number;
 }

package/ts/types/Interface/models/ICard.ts

@@ -9,7 +9,6 @@ import { IComment } from './IComment';
 
 export interface ICard {
   id?: number;
-  ref: string;
   type: CardType;
   state: CardState;
   isManual: boolean;

package/ts/types/Interface/models/ICommercialOffer.ts

@@ -3,6 +3,7 @@ import { IExercicePrestationOffer } from './IExercicePrestationOffer';
 export interface ICommercialOffer {
   id?: number,
   idCommercialOfferType: number,
+  brand: any,
   title: string,
   label: string,
   amount?: number,

package/ts/types/Interface/models/ICustomerVat.ts

@@ -21,6 +21,7 @@ export interface ICustomerVat {
   acceptation: boolean | null;
   acceptationDate: Date | null;
   idMail: number | null;
+  idCard: number | null;
   idVatDeclaration?: number | null; // Obsolète
   createdAt?: Date | null;
   updatedAt?: Date | null;

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

@@ -56,6 +56,7 @@ import {
 import { IBrandType } from './IBrandType';
 import { IFile } from './IFile';
 import { IBusinessSector } from './IBusinessSector';
+import { CityOfGreffe } from '../../Enum/CityOfGreffe';
 // societies
 export interface ISociety {
   id?: number;
@@ -74,6 +75,7 @@ export interface ISociety {
   city?: string | null;
   zipCode?: string | null;
   address?: string | null;
+  idCityOfGreffe?: CityOfGreffe | null;
   siret?: string | null;
   diaCode?: string | null;
   socialCapital?: string | null;

package/ts/types/index.ts

@@ -353,6 +353,7 @@ export * from './Enum/AbsenceType';
 export * from './Enum/Role';
 export * from './Enum/RoleDetail';
 export * from './Enum/MaritalStatus';
+export * from './Enum/CityOfGreffe';
 export * from './Enum/StatutsSection';
 export * from './Enum/PrestationOption';
 export * from './Enum/TimeCounterType';

package/ts/utils/commercialOffer.ts

@@ -27,8 +27,8 @@ const disableCommercialOffer = (idCurrentOffer: number, idOfferSelected: number[
   else return false;
 };
 
-const getCommercialOfferList = (idCommercialOfferType: number, offerList: ICommercialOffer[]): ICommercialOffer[] => {
-  const commercialOfferList: ICommercialOffer[] = offerList.filter((offer) => offer.idCommercialOfferType === idCommercialOfferType);
+const getCommercialOfferList = (idCommercialOfferType: number, societyBrand: number, offerList: ICommercialOffer[]): ICommercialOffer[] => {
+  const commercialOfferList: ICommercialOffer[] = offerList.filter((offer) => offer.idCommercialOfferType === idCommercialOfferType && offer.brand.includes(societyBrand));
   return commercialOfferList.filter(offer => dayjs().isBetween(dayjs(offer.startDate), dayjs(offer.endDate), 'day', '[]'));
 };
 

package/ts/utils/email/templates/signature.ts

@@ -177,9 +177,11 @@ ${logoClementine}
                 src="https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_smileYourPlanet.png"
                 alt="Initiative Smile your planet" height="36"></a>
         <% if(user.calendlyUrl) { %>
-          <a href="<%= user.calendlyUrl %>" style="display: inline-block; color:#6E6E71;" target="_blank"><img
-            src="https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_rdv_tel.png"
-            alt="Demande de rdv téléphonique"></a>
+          <a href="<%= user.calendlyUrl %>" style="display: inline-block; color:#6E6E71;" target="_blank">
+            <img
+            src="https://clementine-website.s3.eu-west-3.amazonaws.com/signaturemail_rdv_tel<%= brandName === 'Pourcentage' ? '_pourcentage' : '' %>.png"
+            alt="Demande de rdv téléphonique">
+          </a>
         <% } %>
       </p>
     </td>

package/ts/utils/prestation.ts

@@ -220,6 +220,12 @@ const calculatePrestationPrice = (idPrestationList: number, prestationList: IPre
       PrestationType.GESTION_JURIDIQUE,
       PrestationType.COMPTA_PRO_COMPTASTART,
       PrestationType.COMPTA_PRO_COMPTASTART_EXPRESS,
+      PrestationType.COMPTA_EI_KLEMS,
+      PrestationType.COMPTA_EI_KLEMS_EXPRESS,
+      PrestationType.COMPTA_MICRO_KLEMS,
+      PrestationType.COMPTA_MICRO_KLEMS_EXPRESS,
+      PrestationType.COMPTA_LOUEUR_MEUBLE_NON_PRO_KLEMS,
+      PrestationType.COMPTA_LOUEUR_MEUBLE_NON_PRO_KLEMS_EXPRESS,
     ].includes(idPrestationList)
   ) {
     totalWithReduce = calculatePrestationPriceWithPriceGrid(idPrestationList, endDate, NbrMonth, turnover, rentsNumber, employeesNumber, associatesNumber, idTypeBrand, idVatRegime, pastBalanceSheet, isYearly, totalMonth, idTaxSystem);