@movalib/movalib-commons 1.59.1 → 1.59.3

package/dist/index.d.ts

@@ -51,5 +51,5 @@ export { validateField, formatVehicleTire, formatFrenchVehiclePlate, isEmpty, ge
 export { validatePhoneNumber, validateText, validateEmail } from './src/helpers/Validator';
 export { formatDateByCountryCode, getLongFormattedDateTime } from './src/helpers/DateUtils';
 export { request, API_BASE_URL } from './src/helpers/ApiHelper';
-export { RoleType, MovaAppType, DayOfWeek, EventState, EventType, DocumentType, DigitalPassportIndex, DocumentState, Gender, DateFormatTypes, PartsApplicationType, ProductType, OrderPreference, OrderState, SlotAlgorithm, VehiclePlateFormat as VehiclePlateType, SubscriptionPaymentInterval, RegistrationState, PrestationType, PrestationState, CountryCode, SubscriptionState, SubscriptionType, APIMethod, } from './src/helpers/Enums';
+export { CustomerType, RoleType, MovaAppType, DayOfWeek, EventState, EventType, DocumentType, DigitalPassportIndex, DocumentState, Gender, DateFormatTypes, PartsApplicationType, ProductType, OrderPreference, OrderState, SlotAlgorithm, VehiclePlateFormat as VehiclePlateType, SubscriptionPaymentInterval, RegistrationState, PrestationType, PrestationState, CountryCode, SubscriptionState, SubscriptionType, APIMethod, } from './src/helpers/Enums';
 export { openDialogPrint } from './src/utils/DialogPrint';

package/dist/index.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatVehicleTire = exports.validateField = exports.deleteCookie = exports.readCookie = exports.CategoryPrestation = exports.VehicleTire = exports.Event = exports.Schedule = exports.Garage = exports.Document = exports.Vehicle = exports.Address = exports.Role = exports.User = exports.Customer = exports.Logger = exports.Operation = exports.Prestation = exports.Product = exports.Supplier = exports.Employee = exports.Absence = exports.Subscription = exports.PrintSize = exports.PLVComponent = exports.QrCodePLVContainer = exports.GenderSelector = exports.ConfirmationDialog = exports.MovaVehicleTireField = exports.MovaCopyright = exports.MovaSignUp = exports.MovaLogin = exports.MovaSnackbar = exports.TestButton = exports.VehiclePlateField = exports.QRCode = exports.MovaDialog = exports.Loader = exports.MovaDigitalPassport = exports.VehicleFullCard = exports.ScheduleFields = exports.AddressFields = exports.AccountValidation = exports.GaragePLV = exports.IbanInput = exports.DialogForgotPassword = exports.UserService = exports.GarageService = exports.AuthenticationService = exports.VehicleService = void 0;
-exports.openDialogPrint = exports.APIMethod = exports.SubscriptionType = exports.SubscriptionState = exports.CountryCode = exports.PrestationState = exports.PrestationType = exports.RegistrationState = exports.SubscriptionPaymentInterval = exports.VehiclePlateType = exports.SlotAlgorithm = exports.OrderState = exports.OrderPreference = exports.ProductType = exports.PartsApplicationType = exports.DateFormatTypes = exports.Gender = exports.DocumentState = exports.DigitalPassportIndex = exports.DocumentType = exports.EventType = exports.EventState = exports.DayOfWeek = exports.MovaAppType = exports.RoleType = exports.API_BASE_URL = exports.request = exports.getLongFormattedDateTime = exports.formatDateByCountryCode = exports.validateEmail = exports.validateText = exports.validatePhoneNumber = exports.getApplicationsShortLabels = exports.isSafariOniOS = exports.getDayOfWeekLabel = exports.findScheduleByDayOfWeek = exports.getFormattedIntervals = exports.getFormattedSchedule = exports.formatPhoneNumber = exports.flexLeftRow = exports.capitalizeFirstLetter = exports.getApplicationShortLabel = exports.isEmpty = exports.formatFrenchVehiclePlate = void 0;
+exports.openDialogPrint = exports.APIMethod = exports.SubscriptionType = exports.SubscriptionState = exports.CountryCode = exports.PrestationState = exports.PrestationType = exports.RegistrationState = exports.SubscriptionPaymentInterval = exports.VehiclePlateType = exports.SlotAlgorithm = exports.OrderState = exports.OrderPreference = exports.ProductType = exports.PartsApplicationType = exports.DateFormatTypes = exports.Gender = exports.DocumentState = exports.DigitalPassportIndex = exports.DocumentType = exports.EventType = exports.EventState = exports.DayOfWeek = exports.MovaAppType = exports.RoleType = exports.CustomerType = exports.API_BASE_URL = exports.request = exports.getLongFormattedDateTime = exports.formatDateByCountryCode = exports.validateEmail = exports.validateText = exports.validatePhoneNumber = exports.getApplicationsShortLabels = exports.isSafariOniOS = exports.getDayOfWeekLabel = exports.findScheduleByDayOfWeek = exports.getFormattedIntervals = exports.getFormattedSchedule = exports.formatPhoneNumber = exports.flexLeftRow = exports.capitalizeFirstLetter = exports.getApplicationShortLabel = exports.isEmpty = exports.formatFrenchVehiclePlate = void 0;
 // Export des services
 var VehicleService_1 = require("./src/services/VehicleService");
 Object.defineProperty(exports, "VehicleService", { enumerable: true, get: function () { return __importDefault(VehicleService_1).default; } });
@@ -131,6 +131,7 @@ Object.defineProperty(exports, "request", { enumerable: true, get: function () {
 Object.defineProperty(exports, "API_BASE_URL", { enumerable: true, get: function () { return ApiHelper_1.API_BASE_URL; } });
 // Export des enums
 var Enums_1 = require("./src/helpers/Enums");
+Object.defineProperty(exports, "CustomerType", { enumerable: true, get: function () { return Enums_1.CustomerType; } });
 Object.defineProperty(exports, "RoleType", { enumerable: true, get: function () { return Enums_1.RoleType; } });
 Object.defineProperty(exports, "MovaAppType", { enumerable: true, get: function () { return Enums_1.MovaAppType; } });
 Object.defineProperty(exports, "DayOfWeek", { enumerable: true, get: function () { return Enums_1.DayOfWeek; } });

package/dist/src/MovaSignUp.js

@@ -231,7 +231,7 @@ var MovaSignUp = function (_a) {
                                     }
                                 } }), usePhoneNumber && (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(material_1.TextField, { type: "tel", margin: "normal", required: true, fullWidth: true, id: "phoneNumber", label: "N\u00B0 de t\u00E9l\u00E9phone", name: "phoneNumber", autoComplete: "tel", onChange: function (e) { return handleInputChange(e); }, value: userForm.phoneNumber.value, error: Boolean(userForm.phoneNumber.error), helperText: userForm.phoneNumber.error, InputProps: {
                                             endAdornment: ((0, jsx_runtime_1.jsx)(InputAdornment_1.default, __assign({ position: "end" }, { children: (0, jsx_runtime_1.jsx)(material_1.IconButton, __assign({ edge: "end", onClick: function () { return setOpenPhoneNumberInfo(!openPhoneNumberInfo); } }, { children: (0, jsx_runtime_1.jsx)(Info_1.default, {}) })) }))),
-                                        } }), openPhoneNumberInfo && (0, jsx_runtime_1.jsx)(material_1.Alert, __assign({ severity: "info", variant: 'standard' }, { children: "Indispensable en cas d'impr\u00E9vu avec votre v\u00E9hicule." }))] }), (0, jsx_runtime_1.jsx)(material_1.TextField, { margin: "normal", required: true, fullWidth: true, id: "email", label: "Adresse email", name: "email", autoComplete: "email", onChange: function (e) { return handleInputChange(e); }, value: userForm.email.value, error: !userForm.email.isValid, helperText: userForm.email.error, sx: {
+                                        } }), openPhoneNumberInfo && (0, jsx_runtime_1.jsx)(material_1.Alert, __assign({ severity: "info", variant: 'standard' }, { children: "Entrez le num\u00E9ro de t\u00E9l\u00E9phone que vous avez utilis\u00E9 pour r\u00E9server, afin de suivre facilement vos rendez-vous." }))] }), (0, jsx_runtime_1.jsx)(material_1.TextField, { margin: "normal", required: true, fullWidth: true, id: "email", label: "Adresse email", name: "email", autoComplete: "email", onChange: function (e) { return handleInputChange(e); }, value: userForm.email.value, error: !userForm.email.isValid, helperText: userForm.email.error, sx: {
                                     '& .MuiOutlinedInput-notchedOutline': {
                                         borderColor: darkMode ? 'white' : 'default', // Couleur de la bordure
                                     }

package/dist/src/components/QrCodePLVContainer/QrCodePLVContainer.d.ts

@@ -1,4 +1,5 @@
 import '../../style/QRCode.css';
+export declare const getPdfDocument: (url: string) => import("pdfjs-dist/types/src/display/api").PDFDocumentLoadingTask;
 export declare const QrCodePLVContainer: ({ data }: {
     data: string;
 }) => import("react/jsx-runtime").JSX.Element;

package/dist/src/components/QrCodePLVContainer/QrCodePLVContainer.js

@@ -73,7 +73,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.QrCodePLVContainer = void 0;
+exports.QrCodePLVContainer = exports.getPdfDocument = void 0;
 var jsx_runtime_1 = require("react/jsx-runtime");
 var icons_material_1 = require("@mui/icons-material");
 var material_1 = require("@mui/material");
@@ -88,7 +88,11 @@ var Tools_1 = require("../../helpers/Tools");
 var pdf_lib_1 = require("pdf-lib");
 var PLVComponent_1 = require("./PLVComponent");
 var pdfjsLib = __importStar(require("pdfjs-dist"));
-pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.mjs';
+pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.min.mjs';
+var getPdfDocument = function (url) {
+    return pdfjsLib.getDocument(url);
+};
+exports.getPdfDocument = getPdfDocument;
 var QrCodePLVContainer = function (_a) {
     var data = _a.data;
     var _b = (0, react_1.useState)(null), selectedChoice = _b[0], setSelectedChoice = _b[1];
@@ -144,24 +148,14 @@ var QrCodePLVContainer = function (_a) {
         var urlA4 = printPLV('A4').then(function (url) {
             setUrlA4(url);
         });
-        var urlA3 = printPLV('A3').then(function (url) {
-            setUrlA3(url);
-        });
     }, [data]);
-    (0, react_1.useEffect)(function () {
-        if (PLVrefA4.current || PLVrefA3.current) {
-            setIsReady(true);
-        }
-        else {
-            setIsReady(false);
-        }
-    }, [PLVrefA4.current, PLVrefA3.current]);
     function printPLV(format) {
         return __awaiter(this, void 0, void 0, function () {
             var pdfUrl, response, existingPdfBytes, pdfDoc, qrCodeBlob, qrImageBytes, qrImage, pages, firstPage, _a, width, height, optionQrcode, modifiedPdfBytes, blob, url, loadingTask, pdf, page, canvas, context, viewport, renderContext, imageUrl;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
+                        setIsReady(false);
                         pdfUrl = "/Movalib_".concat(format, ".pdf");
                         return [4 /*yield*/, fetch(pdfUrl)];
                     case 1:
@@ -208,7 +202,7 @@ var QrCodePLVContainer = function (_a) {
                         modifiedPdfBytes = _b.sent();
                         blob = new Blob([modifiedPdfBytes], { type: 'application/pdf' });
                         url = URL.createObjectURL(blob);
-                        loadingTask = pdfjsLib.getDocument(url);
+                        loadingTask = (0, exports.getPdfDocument)(url);
                         return [4 /*yield*/, loadingTask.promise];
                     case 8:
                         pdf = _b.sent();
@@ -217,7 +211,7 @@ var QrCodePLVContainer = function (_a) {
                         page = _b.sent();
                         canvas = document.createElement('canvas');
                         context = canvas.getContext('2d');
-                        viewport = page.getViewport({ scale: 4 });
+                        viewport = page.getViewport({ scale: 3 });
                         canvas.width = viewport.width;
                         canvas.height = viewport.height;
                         renderContext = {
@@ -228,6 +222,7 @@ var QrCodePLVContainer = function (_a) {
                     case 10:
                         _b.sent();
                         imageUrl = canvas.toDataURL('image/png');
+                        setIsReady(true);
                         return [2 /*return*/, imageUrl];
                 }
             });
@@ -268,6 +263,11 @@ var QrCodePLVContainer = function (_a) {
         qrCode.append(qrCodeRef.current);
     }, [qrCode.append]);
     var onChangeSelectedChoice = function (e) {
+        if (e.target.value === 'A3' && !urlA3) {
+            printPLV('A3').then(function (url) {
+                setUrlA3(url);
+            });
+        }
         setSelectedChoice(e.target.value);
     };
     var printA3PLV = (0, react_to_print_1.useReactToPrint)({

package/dist/src/helpers/Enums.d.ts

@@ -1,3 +1,7 @@
+export declare enum CustomerType {
+    INDIVIDUAL = "INDIVIDUAL",
+    PROFESSIONAL = "PROFESSIONAL"
+}
 export declare enum SubscriptionType {
     PRO_FREE = "PRO_FREE",
     PRO_STANDARD = "PRO_STANDARD"

package/dist/src/helpers/Enums.js

@@ -1,6 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RoleType = exports.MovaAppType = exports.DocumentType = exports.DocumentState = exports.DayOfWeek = exports.EventType = exports.EventState = exports.DigitalPassportIndex = exports.Gender = exports.DateFormatTypes = exports.APIMethod = exports.PartsApplicationType = exports.ProductType = exports.OrderPreference = exports.OrderState = exports.SlotAlgorithm = exports.VehiclePlateFormat = exports.RegistrationState = exports.SubscriptionPaymentInterval = exports.PrestationType = exports.PrestationState = exports.CountryCode = exports.SubscriptionState = exports.SubscriptionType = void 0;
+exports.RoleType = exports.MovaAppType = exports.DocumentType = exports.DocumentState = exports.DayOfWeek = exports.EventType = exports.EventState = exports.DigitalPassportIndex = exports.Gender = exports.DateFormatTypes = exports.APIMethod = exports.PartsApplicationType = exports.ProductType = exports.OrderPreference = exports.OrderState = exports.SlotAlgorithm = exports.VehiclePlateFormat = exports.RegistrationState = exports.SubscriptionPaymentInterval = exports.PrestationType = exports.PrestationState = exports.CountryCode = exports.SubscriptionState = exports.SubscriptionType = exports.CustomerType = void 0;
+var CustomerType;
+(function (CustomerType) {
+    CustomerType["INDIVIDUAL"] = "INDIVIDUAL";
+    CustomerType["PROFESSIONAL"] = "PROFESSIONAL";
+})(CustomerType = exports.CustomerType || (exports.CustomerType = {}));
 var SubscriptionType;
 (function (SubscriptionType) {
     SubscriptionType["PRO_FREE"] = "PRO_FREE";

package/dist/src/models/Customer.d.ts

@@ -1,3 +1,4 @@
+import { CustomerType } from "../helpers/Enums";
 import Address from "./Address";
 import Role from "./Role";
 import User from "./User";
@@ -8,8 +9,24 @@ export default class Customer extends User {
         key: string;
         value: number;
     }[];
+    /**
+     * Type de client (professionnel / particulier)
+     */
+    type: CustomerType;
+    /**
+     * 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;
     constructor(id: string, roles: Role[] | undefined, firstname: string | undefined, lastname: string | undefined, avatar: string | undefined, addresses: Address[] | undefined, vehicles: Vehicle[], email: string | undefined, turnover: {
         key: string;
         value: number;
-    }[]);
+    }[], type: CustomerType, companyName: string, companyPhoneNumber: string, notes: string);
 }

package/dist/src/models/Customer.js

@@ -21,7 +21,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var User_1 = __importDefault(require("./User"));
 var Customer = /** @class */ (function (_super) {
     __extends(Customer, _super);
-    function Customer(id, roles, firstname, lastname, avatar, addresses, vehicles, email, turnover) {
+    function Customer(id, roles, firstname, lastname, avatar, addresses, vehicles, email, turnover, type, companyName, companyPhoneNumber, notes) {
         if (roles === void 0) { roles = []; }
         if (firstname === void 0) { firstname = ''; }
         if (lastname === void 0) { lastname = ''; }
@@ -31,6 +31,10 @@ var Customer = /** @class */ (function (_super) {
         var _this = _super.call(this, id, roles, firstname, lastname, avatar, email) || this;
         _this.vehicles = vehicles;
         _this.turnover = turnover;
+        _this.type = type;
+        _this.companyName = companyName;
+        _this.companyPhoneNumber = companyPhoneNumber;
+        _this.notes = notes;
         return _this;
     }
     return Customer;

package/index.ts

@@ -86,6 +86,7 @@ export { request, API_BASE_URL } from './src/helpers/ApiHelper';
 
 // Export des enums
 export {
+  CustomerType,
   RoleType,
   MovaAppType,
   DayOfWeek,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@movalib/movalib-commons",
-  "version": "1.59.1",
+  "version": "1.59.3",
   "description": "Bibliothèque d'objets communs à l'ensemble des projets React de Movalib",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/MovaSignUp.tsx

@@ -302,7 +302,7 @@ const MovaSignUp: FunctionComponent<MovaSignUpProps> = ({ loading, movaAppType,
                             ),
                           }}   
                       />
-                      {openPhoneNumberInfo && <Alert severity="info" variant='standard'>Indispensable en cas d'imprévu avec votre véhicule.</Alert>}
+                      {openPhoneNumberInfo && <Alert severity="info" variant='standard'>Entrez le numéro de téléphone que vous avez utilisé pour réserver, afin de suivre facilement vos rendez-vous.</Alert>}
                       </>
                     }
                     <TextField

package/src/components/QrCodePLVContainer/QrCodePLVContainer.tsx

@@ -24,8 +24,10 @@ import { flexCenter } from '../../helpers/Tools';
 import { PDFDocument } from 'pdf-lib';
 import { PLVComponentV2, PrintSize } from './PLVComponent';
 import * as pdfjsLib from 'pdfjs-dist';
-pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.mjs';
-
+pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.min.mjs';
+export const getPdfDocument = (url: string) => {
+  return pdfjsLib.getDocument(url);
+};
 type SelectChoice = null | 'A3' | 'A4' | 'QR_Headless' | 'QR_Google';
 export const QrCodePLVContainer = ({ data }: { data: string }) => {
   const [selectedChoice, setSelectedChoice] = useState<SelectChoice>(null);
@@ -88,20 +90,13 @@ export const QrCodePLVContainer = ({ data }: { data: string }) => {
     const urlA4 = printPLV('A4').then((url) => {
       setUrlA4(url);
     });
-    const urlA3 = printPLV('A3').then((url) => {
-      setUrlA3(url);
-    });
   }, [data]);
 
-  useEffect(() => {
-    if (PLVrefA4.current || PLVrefA3.current) {
-      setIsReady(true);
-    } else {
-      setIsReady(false);
-    }
-  }, [PLVrefA4.current, PLVrefA3.current]); 
+
 
   async function printPLV(format: string) {
+    setIsReady(false);
+
     // Chemin du fichier PDF
    const pdfUrl = `/Movalib_${format}.pdf`;
     // Récupérer le fichier PDF depuis le serveur
@@ -156,7 +151,7 @@ export const QrCodePLVContainer = ({ data }: { data: string }) => {
   
 
     // Convertir le PDF en image
-    const loadingTask = pdfjsLib.getDocument(url);
+    const loadingTask = getPdfDocument(url);
     const pdf = await loadingTask.promise;
   
     // Récupérer la première page
@@ -166,7 +161,7 @@ export const QrCodePLVContainer = ({ data }: { data: string }) => {
     const canvas = document.createElement('canvas');
     const context = canvas.getContext('2d');
   
-    const viewport = page.getViewport({ scale: 4});
+    const viewport = page.getViewport({ scale: 3});
     canvas.width = viewport.width;
     canvas.height = viewport.height;
   
@@ -179,6 +174,7 @@ export const QrCodePLVContainer = ({ data }: { data: string }) => {
   
     // Convertir le canvas en URL d'image (data URL)
     const imageUrl = canvas.toDataURL('image/png');
+    setIsReady(true);
     return imageUrl;
   }
 
@@ -226,6 +222,11 @@ export const QrCodePLVContainer = ({ data }: { data: string }) => {
   }, [qrCode.append]);
 
   const onChangeSelectedChoice: SelectProps<SelectChoice>['onChange'] = (e) => {
+    if(e.target.value === 'A3' && !urlA3){
+      printPLV('A3').then((url) => {
+        setUrlA3(url);
+      });
+    }
     setSelectedChoice(e.target.value as SelectChoice);
   };
   
@@ -256,7 +257,7 @@ export const QrCodePLVContainer = ({ data }: { data: string }) => {
   return (
     <Box display='flex' flexDirection='column' alignItems='center' gap='24px'>
       {urlA4 && <PLVComponentV2 ref={PLVrefA4} url={urlA4} printSize={PrintSize.A4} />}
-      {urlA3 &&<PLVComponentV2 ref={PLVrefA3} url={urlA3} printSize={PrintSize.A3} />}
+      {urlA3 && <PLVComponentV2 ref={PLVrefA3} url={urlA3} printSize={PrintSize.A3} />}
 
       <Grid container justifyContent='center' alignItems='center'>
         <Grid item xs={7}>

package/src/helpers/Enums.ts

@@ -1,3 +1,7 @@
+export enum CustomerType {
+    INDIVIDUAL = 'INDIVIDUAL',
+    PROFESSIONAL = 'PROFESSIONAL',
+  }
 
 export enum SubscriptionType {
     PRO_FREE = 'PRO_FREE',

package/src/models/Customer.ts

@@ -1,3 +1,4 @@
+import { CustomerType } from "../helpers/Enums";
 import Address from "./Address";
 import Role from "./Role";
 import User from "./User";
@@ -9,6 +10,25 @@ export default class Customer extends User {
     // Properties
     vehicles: Vehicle[];
     turnover: { key: string, value: number }[];
+    /**
+     * Type de client (professionnel / particulier)
+     */
+    type: CustomerType;
+
+    /**
+     * 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;
 
     constructor(
         id: string,
@@ -19,11 +39,19 @@ export default class Customer extends User {
         addresses : Address[] = [],
         vehicles: Vehicle[],
         email: string = '',
-        turnover: { key: string, value: number }[]) {
+        turnover: { key: string, value: number }[],
+        type: CustomerType,
+        companyName: string,
+        companyPhoneNumber: string,
+        notes: 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;
         }
 }