@movalib/movalib-commons 1.62.3 → 1.63.0

package/src/components/vehicle/VehiclePlateField.tsx

@@ -1,12 +1,16 @@
 import React, { FunctionComponent, ReactNode, useEffect, useState } from 'react';
 import TextField from '@mui/material/TextField';
-import { IconButton, InputAdornment } from '@mui/material';
-import SearchIcon from '@mui/icons-material/SearchRounded';
 import { VehiclePlateFormat } from '../../helpers/Enums';
 import Logger from '../../helpers/Logger';
+import { Box, IconButton, InputAdornment, MenuItem, Select, SelectChangeEvent } from '@mui/material';
+import SearchIcon from '@mui/icons-material/SearchRounded';
 
 interface VehiclePlateFieldProps {
-    onValidVehiclePlate: (vehiclePlate: string) => void;
+    onValidVehiclePlate: (vehiclePlate: string, country: 'FR' | 'INTL') => void;
+    onCountryChange?: (country: 'FR' | 'INTL') => void;
+    country: 'FR' | 'INTL';
+    model?: string; 
+    onModelChange?: (model :string) => void;
   }
 
 // Regex pour une plaque d'immatriculation française (nouveau format SIV)
@@ -15,20 +19,26 @@ export const regexPlate = /^[A-Z]{2}-\d{3}-[A-Z]{2}$/;
 export const oldRegexPlate = /^\d{1,4}[ -]?[A-Z]{1,4}[ -]?\d{1,4}$/;
 
 
-const VehiclePlateField: FunctionComponent<VehiclePlateFieldProps> = ({ onValidVehiclePlate }) => {
+const VehiclePlateField: FunctionComponent<VehiclePlateFieldProps> = ({ onValidVehiclePlate, onCountryChange, country, onModelChange, model }) => {
 
   const [value, setValue] = useState<string>('');
   const [error, setError] = useState<boolean>(false);
   const [lastLength, setLastLength] = useState<number>(0); // Ajout d'un état pour stocker la longueur précédente
   const [helperText, setHelperText] = useState<ReactNode>('');
+  const MIN_FOREIGN_PLATE_LENGTH = 6;
 
   // Hook de validation de la plaque
   useEffect(() => {
-    if (!error && value !== '' && value.match(regexPlate)) {
-        onValidVehiclePlate(value);
+    if (country === 'FR') {
+      if (!error && value !== '' && value.match(regexPlate)) {
+        onValidVehiclePlate(value, country);
+      }
+    } else {
+      if (value.length >= MIN_FOREIGN_PLATE_LENGTH) {
+        onValidVehiclePlate(value, country);
+      }
     }
-
-  }, [error, value, onValidVehiclePlate]);
+  }, [error, value, country, onValidVehiclePlate]);
 
   const getPlateFormat = (plate: string): VehiclePlateFormat | undefined  => {
     if (plate === '') {
@@ -49,9 +59,23 @@ const VehiclePlateField: FunctionComponent<VehiclePlateFieldProps> = ({ onValidV
     }
   }
 
+  
   const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
 
-    let inputValue = e.target.value.toUpperCase().replace(/[^A-Z0-9]/g, ''); // Convertir en majuscules et supprimer les caractères non valides
+    let inputValue = e.target.value.toUpperCase();
+
+    if (country === 'INTL') {
+      setValue(inputValue);
+      setHelperText(
+        inputValue.length >= MIN_FOREIGN_PLATE_LENGTH
+          ? <></>
+          : <>Veuillez saisir au moins {MIN_FOREIGN_PLATE_LENGTH} caractères</>
+      );
+      setError(inputValue.length > 0 && inputValue.length < MIN_FOREIGN_PLATE_LENGTH);
+      return;
+    }
+
+    inputValue = inputValue.replace(/[^A-Z0-9]/g, '');
 
     // Si la saisie commence par une lettre, on contrôle l'ancien format, sinon le nouveau
     switch(getPlateFormat(inputValue)){
@@ -83,12 +107,21 @@ const VehiclePlateField: FunctionComponent<VehiclePlateFieldProps> = ({ onValidV
   };
 
   const validatePlate = () => {
-
-    if(oldRegexPlate.test(value)){
-      onValidVehiclePlate(value);
+    if (country === 'FR') {
+      if (oldRegexPlate.test(value)) {
+        onValidVehiclePlate(value, country);
+        setError(false);
+      } else {
+        setError(true);
+      }
+    } else {
+      if (value.length >= MIN_FOREIGN_PLATE_LENGTH) {
+        onValidVehiclePlate(value, country);
+        setError(false);
+      } else {
+        setError(true);
+      }
     }
-
-    setError(!oldRegexPlate.test(value));
   }
 
   const handleChangeFrenchOld = (inputValue: string) => {
@@ -130,9 +163,46 @@ const VehiclePlateField: FunctionComponent<VehiclePlateFieldProps> = ({ onValidV
       setLastLength(inputValue.length); // Mettre à jour la longueur précédente
   }
 
+  const handleCountryChange = (event: SelectChangeEvent<'FR' | 'INTL'>) => {
+    const newCountry = event.target.value as 'FR' | 'INTL';
+    setValue('');
+    setHelperText('');
+    setError(false);
+
+    onCountryChange?.(newCountry); // ✅ callback vers parent
+  };  
+
+  const handleModelChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+    const newModel = event.target.value.toUpperCase() as string;
+    onModelChange?.(newModel); // ✅ callback vers parent
+  };  
+
   return (
+    <>
+    <Box display="flex" alignItems="start" gap={1} width="100%">
+      <Select
+        value={country}
+        onChange={handleCountryChange}
+        variant="outlined"
+        sx={{
+          minWidth: 70,
+          '.MuiSelect-select': {
+            display: 'flex',
+            alignItems: 'center',
+            height: '100%',
+          },
+          '.MuiOutlinedInput-notchedOutline': {
+            height: '100%',
+          },
+          p: 0,
+          pb: '4px'
+        }}
+      >
+        <MenuItem value="FR">🇫🇷</MenuItem>
+        <MenuItem value="INTL">🌐</MenuItem>
+      </Select>
     <TextField
-      label="Plaque d'immatriculation"
+      label={country === "INTL" ? "Plaque étrangère / non reconnue" : "Plaque d'immatriculation (FR)"}
       variant="outlined"
       value={value}
       onChange={handleChange}
@@ -142,23 +212,37 @@ const VehiclePlateField: FunctionComponent<VehiclePlateFieldProps> = ({ onValidV
         width: '100%', 
         '& input': { textTransform: 'uppercase' } // CSS pour forcer les majuscules dans l'input
       }}
-      helperText={lastLength > 0 ? helperText : ''}
+      helperText={lastLength > 0 || country === 'INTL' ? helperText : ''}
       InputProps={{
-        endAdornment: (
+        endAdornment: 
              
-          <InputAdornment position="end" sx={{ mr: 1, display: getPlateFormat(value) === VehiclePlateFormat.FRENCH_OLD ? 'inherit' : 'none' }} >
-            <IconButton
-              edge="end"
-              onClick={validatePlate}
-            >
-              <SearchIcon />
-            </IconButton>
-          </InputAdornment>
+          country === 'FR' && getPlateFormat(value) === VehiclePlateFormat.FRENCH_OLD ? (
+            <InputAdornment position="end" sx={{ mr: 1 }}>
+              <IconButton edge="end" onClick={validatePlate}>
+                <SearchIcon />
+              </IconButton>
+            </InputAdornment>
+          ) : undefined,
           
-        ),
       }} 
-    />
+    />   
+  </Box>
+      {(country === 'INTL') && <Box>
+      <TextField
+        label="Précisez le modèle ..."
+        variant="outlined"
+        value={model}
+        onChange={handleModelChange}
+        autoFocus
+        sx={{ 
+          width: '100%', 
+          mt: 1,
+          '& input': { textTransform: 'uppercase' } // CSS pour forcer les majuscules dans l'input
+        }}
+      />    
+    </Box>} 
+    </>
   );
 };
 
-export default VehiclePlateField;
+export default VehiclePlateField;

package/src/helpers/Enums.ts

@@ -92,6 +92,7 @@ export enum RegistrationState {
 export enum VehiclePlateFormat {
   FRENCH_NEW = "FRENCH_NEW",
   FRENCH_OLD = "FRENCH_OLD",
+  FOREIGN = "FOREIGN"
 }
 
 export enum SlotAlgorithm {
@@ -252,6 +253,7 @@ export enum DocumentType {
   EVENT_OTHER = "EVENT_OTHER",
   EVENT_VISUAL_PROOFS = "EVENT_VISUAL_PROOFS",
   EVENT_MAINTENANCE = "EVENT_MAINTENANCE",
+  VEHICLE_MAINTENANCE_INVOICE_AVOID = "VEHICLE_MAINTENANCE_INVOICE_AVOID",
 }
 
 export enum MovaAppType {

package/src/helpers/Tools.ts

@@ -294,24 +294,28 @@ export const isEmpty = (data: Object): boolean => {
   return Object.keys(data).length === 0;
 };
 
-export const formatFrenchVehiclePlate = (input: string | undefined): string => {
+export const formatVehiclePlate = (input: string | undefined, isForeignPlate: boolean): string => {
   if (input) {
-    // On commence par détecter s'il s'agit d'un ancien ou nouveau format
+
     let plateFormat: VehiclePlateFormat | null = null;
 
-    if (/^[A-Za-z]/.test(input)) {
-      // Commence par une lettre => nouveau format
+    if(isForeignPlate) {
+      // Plaque étrangère
+      plateFormat = VehiclePlateFormat.FOREIGN;
+    } else if (/^[A-Za-z]/.test(input)) {
+      // Commence par une lettre => nouveau format FR
       plateFormat = VehiclePlateFormat.FRENCH_NEW;
     } else if (/^\d/.test(input)) {
-      // Commence par un chiffre => ancien format
+      // Commence par un chiffre => ancien format FR
       plateFormat = VehiclePlateFormat.FRENCH_OLD;
     }
 
-    // Supprimer tous les caractères non alphanumériques
-    let cleanedInput = input.replace(/[^A-Z0-9]/gi, "").toUpperCase();
+    let cleanedInput = input;
 
     switch (plateFormat) {
       case VehiclePlateFormat.FRENCH_NEW: {
+        // Supprimer tous les caractères non alphanumériques
+        cleanedInput = input.replace(/[^A-Z0-9]/gi, "").toUpperCase();
         // Ajouter des tirets aux positions appropriées
         if (cleanedInput.length >= 2) {
           cleanedInput = `${cleanedInput.slice(0, 2)}-${cleanedInput.slice(2)}`;
@@ -326,11 +330,17 @@ export const formatFrenchVehiclePlate = (input: string | undefined): string => {
       }
 
       case VehiclePlateFormat.FRENCH_OLD: {
+        // Supprimer tous les caractères non alphanumériques
+        cleanedInput = input.replace(/[^A-Z0-9]/gi, "").toUpperCase();
         // Rien de particulier, pas de tiret sur les anciennes plaques
         break;
       }
-    }
 
+      case VehiclePlateFormat.FOREIGN: {
+        // On retourne la plaque telle qu'enregistrée par l'utilisateur, ras
+
+      }
+    }
     return cleanedInput;
   }
 

package/src/models/Customer.ts

@@ -4,54 +4,58 @@ import Role from "./Role";
 import User from "./User";
 import Vehicle from "./Vehicle";
 
-
 export default class Customer extends User {
+  // Properties
+  vehicles: Vehicle[];
+  turnover: { key: string; value: number }[];
+  /**
+   * Type de client (professionnel / particulier)
+   */
+  type: CustomerType;
 
-    // Properties
-    vehicles: Vehicle[];
-    turnover: { key: string, value: number }[];
-    /**
-     * Type de client (professionnel / particulier)
-     */
-    type: CustomerType;
+  /**
+   * Raison sociale si client Professionnel
+   */
+  companyName: string;
 
-    /**
-     * Raison sociale si client Professionnel
-     */
-    companyName: string;
-  
-    /**
-     * Téléphone de contact additionnel (souvent un fixe pour les pro)
-     */
-    companyPhoneNumber: string;
-  
-    /**
-     * Notes relatives au client
-     */
-    notes: string;
+  /**
+   * Téléphone de contact additionnel (souvent un fixe pour les pro)
+   */
+  companyPhoneNumber: string;
 
-    constructor(
-        id: string,
-        roles: Role[] = [],
-        firstname: string = '',
-        lastname: string = '',
-        avatar: string = '',
-        addresses : Address[] = [],
-        vehicles: Vehicle[],
-        email: string = '',
-        turnover: { key: string, value: number }[],
-        type: CustomerType,
-        companyName: string,
-        companyPhoneNumber: string,
-        notes: string) {
+  /**
+   * Notes relatives au client
+   */
+  notes: string;
+  billingAddress?: Address;
+  siren?: string;
 
-            super(id, roles, firstname, lastname, avatar, email);
+  constructor(
+    id: string,
+    roles: Role[] = [],
+    firstname: string = "",
+    lastname: string = "",
+    avatar: string = "",
+    addresses: Address[] = [],
+    vehicles: Vehicle[],
+    email: string = "",
+    turnover: { key: string; value: number }[],
+    type: CustomerType,
+    companyName: string,
+    companyPhoneNumber: string,
+    billingAddress: Address | undefined = undefined,
+    notes: string,
+    siren: string = ""
+  ) {
+    super(id, roles, firstname, lastname, avatar, email);
 
-            this.vehicles = vehicles;
-            this.turnover = turnover;
-            this.type = type;
-            this.companyName = companyName;
-            this.companyPhoneNumber = companyPhoneNumber;
-            this.notes = notes;
-        }
-}
+    this.vehicles = vehicles;
+    this.turnover = turnover;
+    this.type = type;
+    this.companyName = companyName;
+    this.companyPhoneNumber = companyPhoneNumber;
+    this.notes = notes;
+    this.billingAddress = billingAddress;
+    this.siren = siren;
+  }
+}

package/src/models/Document.ts

@@ -7,6 +7,7 @@ export default class Document {
   state: DocumentState;
   fileName: string;
   originalFileName: string;
+  eventId?: string; // Optional, used for event documents
   fileType: string;
   fileSignedUrl: string;
   type: DocumentType;
@@ -19,6 +20,7 @@ export default class Document {
   totalAmountInclVat?: number;
   lastSendingTime?: Date;
   firstSendingTime?: Date;
+  sinaoDocumentId?: number;
   constructor(
     id: string,
     ownerId: number,
@@ -35,7 +37,9 @@ export default class Document {
     remindersCount?: number,
     totalAmountInclVat?: number,
     lastSendingTime?: Date,
-    firstSendingTime?: Date
+    firstSendingTime?: Date,
+    eventId?: string,
+    sinaoDocumentId?: number
   ) {
     this.id = id;
     this.state = state;
@@ -57,6 +61,8 @@ export default class Document {
     this.firstSendingTime = firstSendingTime
       ? new Date(firstSendingTime)
       : undefined;
+    this.eventId = eventId;
+    this.sinaoDocumentId = sinaoDocumentId;
   }
 
   static findByTypeAndReference(
@@ -66,7 +72,19 @@ export default class Document {
   ): Document | undefined {
     if (documents && type && reference) {
       return documents.find(
-        (document) => document.type === type && document.reference === reference
+        (document) => document.type === type && document.eventId === reference
+      );
+    }
+    return undefined;
+  }
+  static findManyByTypeAndReference(
+    documents: Document[],
+    type: DocumentType,
+    reference: string
+  ): Document[] | undefined {
+    if (documents && type && reference) {
+      return documents.filter(
+        (document) => document.type === type && document.eventId === reference
       );
     }
     return undefined;

package/src/models/Garage.ts

@@ -1,113 +1,130 @@
+import {
+  OrderPreference,
+  RegistrationState,
+  SlotAlgorithm,
+  SubscriptionPaymentInterval,
+} from "../helpers/Enums";
 import Address from "./Address";
-import Schedule from "./Schedule";
+import CategoryPrestation from "./CategoryPrestation";
+import Document from "./Document";
+import Employee from "./Employee";
 import Prestation from "./Prestation";
+import Schedule from "./Schedule";
+import Subscription from "./Subscription";
 import Supplier from "./Supplier";
-import Document from "./Document";
-import { OrderPreference, RegistrationState, SlotAlgorithm, SubscriptionPaymentInterval } from "../helpers/Enums";
 import User from "./User";
-import Subscription from "./Subscription";
-import Employee from "./Employee";
-import CategoryPrestation from "./CategoryPrestation";
 import VehicleGarage from "./VehicleGarage";
 
 export default class Garage {
-    id:string;
-    adminId:string;
-    name:string;
-    address:Address;
-    workforce: number;
-    partialWorkforce?: number;
-    contactPhone: string;
-    prestationCategories: CategoryPrestation[];
-    prestations: Prestation[];
-    schedules: Schedule[];
-    dayPeriodFastServiceExcluded: boolean;
-    loanerVehicleFastServiceExcluded: boolean;
-    fastServiceThreshold: number;
-    vehicles?: VehicleGarage[];
-    countryCode?: string;
-    contactEmail?: string;
-    admin?: User;
-    logo?: string;
-    suppliers?: Supplier[];
-    orderPreference?: OrderPreference;
-    amVehicleDeposit?: Date;
-    pmVehicleDeposit?: Date;
-    appointmentRequestStart?: Date;
-    slotAlgorithm?: SlotAlgorithm;
-    customerQuoteActive?: boolean;
-    supplierOrderActive?: boolean;
-    registrationState?: RegistrationState;
-    subscriptionIban?: string;
-    subscriptionPaymentInterval?: SubscriptionPaymentInterval;
-    creationDate?: Date;
-    teamManagementActive?: boolean;
-    documents?: Document[];
-    subscriptions?: Subscription[];
-    subscription?: Subscription;
-    supportPhoneNumber?: string;
-    operatorsActive?: boolean;
-    employees?: Employee[];
-    defaultView?: string;
-    loanerVehicleActive?: boolean;
-    loanerVehicleRequestActive?: boolean;
-    paymentAuthorizationActive?: boolean;
-    paymentAuthorizationMinDowntime?: number;
-    timezone: string;
-    customStyle?: string;
-    mailCustomization?: boolean;
+  id: string;
+  adminId: string;
+  name: string;
+  address: Address;
+  workforce: number;
+  partialWorkforce?: number;
+  contactPhone: string;
+  prestationCategories: CategoryPrestation[];
+  prestations: Prestation[];
+  schedules: Schedule[];
+  dayPeriodFastServiceExcluded: boolean;
+  loanerVehicleFastServiceExcluded: boolean;
+  fastServiceThreshold: number;
+  vehicles?: VehicleGarage[];
+  countryCode?: string;
+  contactEmail?: string;
+  admin?: User;
+  logo?: string;
+  suppliers?: Supplier[];
+  orderPreference?: OrderPreference;
+  amVehicleDeposit?: Date;
+  pmVehicleDeposit?: Date;
+  appointmentRequestStart?: Date;
+  slotAlgorithm?: SlotAlgorithm;
+  customerQuoteActive?: boolean;
+  supplierOrderActive?: boolean;
+  registrationState?: RegistrationState;
+  subscriptionIban?: string;
+  subscriptionPaymentInterval?: SubscriptionPaymentInterval;
+  creationDate?: Date;
+  teamManagementActive?: boolean;
+  documents?: Document[];
+  subscriptions?: Subscription[];
+  subscription?: Subscription;
+  supportPhoneNumber?: string;
+  operatorsActive?: boolean;
+  employees?: Employee[];
+  defaultView?: string;
+  loanerVehicleActive?: boolean;
+  loanerVehicleRequestActive?: boolean;
+  paymentAuthorizationActive?: boolean;
+  paymentAuthorizationMinDowntime?: number;
+  timezone: string;
+  customStyle?: string;
+  mailCustomization?: boolean;
+  billingActive?: boolean;
+  billingToken?: string;
+  billingSimulationActive?: boolean;
+  appId?: number;
 
-    constructor(
-        id:string,
-        adminId:string,
-        name:string,
-        address:Address,
-        workforce: number,
-        prestations: Prestation[],
-        schedules: Schedule[],
-        contactPhone: string,
-        prestationCategories: CategoryPrestation[],
-        dayPeriodFastServiceExcluded: boolean,
-        loanerVehicleFastServiceExcluded: boolean,
-        fastServiceThreshold: number,
-        timezone:string,
-        vehicles?: VehicleGarage[],
-        contactEmail?: string,
-        logo?:string,
-        suppliers?: Supplier[],
-        documents?: Document[],
-        subscriptions?: Subscription[],
-        loanerVehicleActive?: boolean,
-        loanerVehicleRequestActive?: boolean,
-        customStyle?: string,
-        subscription?: Subscription,
-        partialWorkforce?: number,
-        mailCustomization?: boolean,
-    ) {
-        this.id = id;
-        this.adminId = adminId;
-        this.name = name;
-        this.address = address;
-        this.workforce = workforce;
-        this.prestationCategories = prestationCategories;
-        this.prestations = prestations;
-        this.schedules = schedules;
-        this.contactPhone = contactPhone;
-        this.contactEmail = contactEmail;
-        this.logo = logo;
-        this.suppliers = suppliers;
-        this.documents = documents;
-        this.subscriptions = subscriptions;
-        this.vehicles = vehicles;
-        this.loanerVehicleActive = loanerVehicleActive;
-        this.loanerVehicleRequestActive = loanerVehicleRequestActive;
-        this.subscription = subscription;
-        this.partialWorkforce = partialWorkforce;
-        this.dayPeriodFastServiceExcluded = dayPeriodFastServiceExcluded;
-        this.loanerVehicleFastServiceExcluded = loanerVehicleFastServiceExcluded;
-        this.fastServiceThreshold = fastServiceThreshold;
-        this.customStyle = customStyle;
-        this.timezone = timezone;
-        this.mailCustomization = mailCustomization;
-    }
+  constructor(
+    id: string,
+    adminId: string,
+    name: string,
+    address: Address,
+    workforce: number,
+    prestations: Prestation[],
+    schedules: Schedule[],
+    contactPhone: string,
+    prestationCategories: CategoryPrestation[],
+    dayPeriodFastServiceExcluded: boolean,
+    loanerVehicleFastServiceExcluded: boolean,
+    fastServiceThreshold: number,
+    timezone: string,
+    vehicles?: VehicleGarage[],
+    contactEmail?: string,
+    logo?: string,
+    suppliers?: Supplier[],
+    documents?: Document[],
+    subscriptions?: Subscription[],
+    loanerVehicleActive?: boolean,
+    loanerVehicleRequestActive?: boolean,
+    customStyle?: string,
+    subscription?: Subscription,
+    partialWorkforce?: number,
+    mailCustomization?: boolean,
+    billingActive?: boolean,
+    billingToken?: string,
+    billingSimulationActive?: boolean,
+    appId?: number
+  ) {
+    this.id = id;
+    this.adminId = adminId;
+    this.name = name;
+    this.address = address;
+    this.workforce = workforce;
+    this.prestationCategories = prestationCategories;
+    this.prestations = prestations;
+    this.schedules = schedules;
+    this.contactPhone = contactPhone;
+    this.contactEmail = contactEmail;
+    this.logo = logo;
+    this.suppliers = suppliers;
+    this.documents = documents;
+    this.subscriptions = subscriptions;
+    this.vehicles = vehicles;
+    this.loanerVehicleActive = loanerVehicleActive;
+    this.loanerVehicleRequestActive = loanerVehicleRequestActive;
+    this.subscription = subscription;
+    this.partialWorkforce = partialWorkforce;
+    this.dayPeriodFastServiceExcluded = dayPeriodFastServiceExcluded;
+    this.loanerVehicleFastServiceExcluded = loanerVehicleFastServiceExcluded;
+    this.fastServiceThreshold = fastServiceThreshold;
+    this.customStyle = customStyle;
+    this.timezone = timezone;
+    this.mailCustomization = mailCustomization;
+    this.billingActive = billingActive;
+    this.billingToken = billingToken;
+    this.billingSimulationActive = billingSimulationActive;
+    this.appId = appId;
+  }
 }