@movalib/movalib-commons 1.68.6 → 1.68.7

package/devIndex.tsx

@@ -77,7 +77,7 @@ const App = () => {
   const getQRCodeData = ():string => {
     // On renvoie les données pour le QR Code, l'url change selon l'environnement (variables d'environnement)
     //return `https://app.movalib.com/#/garage/2?redirect=garage`;
-    return `https://movalib.com/info-contact-agiless-2/`;
+    return `https://forms.gle/TabzYcYiaLNfhTu7A`;
   }
 
   const handleScheduleChange = (schedule: DaySchedule[]) => {

package/dist/devIndex.js

@@ -105,7 +105,7 @@ var App = function () {
     var getQRCodeData = function () {
         // On renvoie les données pour le QR Code, l'url change selon l'environnement (variables d'environnement)
         //return `https://app.movalib.com/#/garage/2?redirect=garage`;
-        return "https://movalib.com/info-contact-agiless-2/";
+        return "https://forms.gle/TabzYcYiaLNfhTu7A";
     };
     var handleScheduleChange = function (schedule) {
         if (schedule) {

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

@@ -96,6 +96,7 @@ export default class Event {
     orderComment?: string;
     vehicleReceived?: boolean;
     garageVehicleId?: number;
+    goodForAgreement?: boolean;
     garageVehicleRequest?: boolean;
     origin?: string;
     quoteLastSendingTime?: Date;
@@ -106,7 +107,7 @@ export default class Event {
     quoteFirstSendingTime?: Date;
     lastQuoteCreationDate?: Date;
     urgent?: boolean;
-    constructor(id: string, ownerId: number, type: EventType, title: string, garageName: string, garageId: number, color: string, state: EventState, garageAddress?: Address, start?: Date, end?: Date, prestations?: Prestation[], operations?: Operation[], products?: Product[], guestsId?: string[], vehicleId?: number, quoteId?: number, notes?: string, vehicleAvailableNotified?: boolean, editable?: boolean, resourceId?: number, garageVehicleId?: number, garageVehicleRequest?: boolean, vehicleAvailableNotificationTime?: Date, interventionEndTime?: Date, quoteLastSendingTime?: Date, invoiceSendingDate?: Date, orders?: Order[], creationDate?: Date, updatedDate?: Date, lastQuoteCreationDate?: Date, quoteFirstSendingTime?: Date, urgent?: boolean, garageVehicleBookings?: LoanVehicle[]);
+    constructor(id: string, ownerId: number, type: EventType, title: string, garageName: string, garageId: number, color: string, state: EventState, garageAddress?: Address, start?: Date, end?: Date, prestations?: Prestation[], operations?: Operation[], products?: Product[], guestsId?: string[], vehicleId?: number, quoteId?: number, notes?: string, vehicleAvailableNotified?: boolean, editable?: boolean, resourceId?: number, garageVehicleId?: number, garageVehicleRequest?: boolean, vehicleAvailableNotificationTime?: Date, interventionEndTime?: Date, quoteLastSendingTime?: Date, invoiceSendingDate?: Date, orders?: Order[], creationDate?: Date, updatedDate?: Date, lastQuoteCreationDate?: Date, quoteFirstSendingTime?: Date, urgent?: boolean, garageVehicleBookings?: LoanVehicle[], goodForAgreement?: boolean);
     static getPrestationsList(event: Event): string[];
     static getCurrentQuote(event: Event): Document | null;
 }

package/dist/src/models/Event.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var Enums_1 = require("../helpers/Enums");
 var Event = /** @class */ (function () {
-    function Event(id, ownerId, type, title, garageName, garageId, color, state, garageAddress, start, end, prestations, operations, products, guestsId, vehicleId, quoteId, notes, vehicleAvailableNotified, editable, resourceId, garageVehicleId, garageVehicleRequest, vehicleAvailableNotificationTime, interventionEndTime, quoteLastSendingTime, invoiceSendingDate, orders, creationDate, updatedDate, lastQuoteCreationDate, quoteFirstSendingTime, urgent, garageVehicleBookings) {
+    function Event(id, ownerId, type, title, garageName, garageId, color, state, garageAddress, start, end, prestations, operations, products, guestsId, vehicleId, quoteId, notes, vehicleAvailableNotified, editable, resourceId, garageVehicleId, garageVehicleRequest, vehicleAvailableNotificationTime, interventionEndTime, quoteLastSendingTime, invoiceSendingDate, orders, creationDate, updatedDate, lastQuoteCreationDate, quoteFirstSendingTime, urgent, garageVehicleBookings, goodForAgreement) {
         this.id = id;
         this.notes = notes;
         this.ownerId = ownerId;
@@ -49,6 +49,7 @@ var Event = /** @class */ (function () {
             : undefined;
         this.urgent = urgent;
         this.garageVehicleBookings = garageVehicleBookings;
+        this.goodForAgreement = goodForAgreement;
     }
     Event.getPrestationsList = function (event) {
         if (event && event.prestations) {
@@ -57,29 +58,29 @@ var Event = /** @class */ (function () {
         return [];
     };
     Event.getCurrentQuote = function (event) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         if (event.documents) {
             var quoteDocument = event.documents.filter(function (doc) { return doc.type === Enums_1.DocumentType.USER_APPOINTMENT_QUOTE; });
             if (event.type === Enums_1.EventType.QUOTE) {
                 var state = event.state;
                 if (state === Enums_1.QuoteState.QUOTE_DRAFT ||
                     state === Enums_1.QuoteState.QUOTE_SENT) {
-                    return ((_a = quoteDocument.find(function (doc) { return doc.state === Enums_1.DocumentState.PENDING; })) !== null && _a !== void 0 ? _a : null);
+                    return ((_b = (_a = quoteDocument.find(function (doc) { return doc.state === Enums_1.DocumentState.PENDING; })) !== null && _a !== void 0 ? _a : quoteDocument.find(function (doc) { return doc.state === Enums_1.DocumentState.APPROVED; })) !== null && _b !== void 0 ? _b : null);
                 }
                 else if (state === Enums_1.QuoteState.QUOTE_REJECTED) {
-                    return ((_b = quoteDocument
+                    return ((_c = quoteDocument
                         .filter(function (doc) { return doc.state === Enums_1.DocumentState.REJECTED; })
                         .sort(function (a, b) {
                         return new Date(b.creationDate).getTime() -
                             new Date(a.creationDate).getTime();
-                    })[0]) !== null && _b !== void 0 ? _b : null);
+                    })[0]) !== null && _c !== void 0 ? _c : null);
                 }
                 else if (state === Enums_1.QuoteState.QUOTE_ACCEPTED) {
-                    return ((_c = quoteDocument.find(function (doc) { return doc.state === Enums_1.DocumentState.APPROVED; })) !== null && _c !== void 0 ? _c : null);
+                    return ((_d = quoteDocument.find(function (doc) { return doc.state === Enums_1.DocumentState.APPROVED; })) !== null && _d !== void 0 ? _d : null);
                 }
             }
             else {
-                return ((_d = quoteDocument.find(function (doc) { return doc.state === Enums_1.DocumentState.APPROVED; })) !== null && _d !== void 0 ? _d : null);
+                return ((_e = quoteDocument.find(function (doc) { return doc.state === Enums_1.DocumentState.APPROVED; })) !== null && _e !== void 0 ? _e : null);
             }
         }
         return null;

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

@@ -62,7 +62,6 @@ export default class Garage {
     billingSimulationActive?: boolean;
     demoBillingActive?: boolean;
     appId?: number;
-    quoteRequestStart?: Date;
     companyRegistrationNumber?: string;
     establishmentRegistrationNumber?: string;
     reopeningDate?: Date;
@@ -70,6 +69,8 @@ export default class Garage {
     onlyBilling?: boolean;
     settings: Settings[];
     newDocumentEditor?: boolean;
-    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, settings: Settings[], 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, establishmentRegistrationNumber?: string, companyRegistrationNumber?: string, quoteRequestStart?: Date, reopeningDate?: Date, targetMargin?: number, demoBillingActive?: boolean, onlyBilling?: boolean, newDocumentEditor?: boolean, googleReviewUrl?: string);
+    isOnlineAppointment?: boolean;
+    isOnlineQuote?: boolean;
+    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, settings: Settings[], 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, establishmentRegistrationNumber?: string, companyRegistrationNumber?: string, reopeningDate?: Date, targetMargin?: number, demoBillingActive?: boolean, onlyBilling?: boolean, newDocumentEditor?: boolean, googleReviewUrl?: string, isOnlineAppointment?: boolean, isOnlineQuote?: boolean);
 }
 export declare function isStockActive(g: Garage): boolean;

package/dist/src/models/Garage.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isStockActive = void 0;
 var Settings_1 = require("./Settings");
 var Garage = /** @class */ (function () {
-    function Garage(id, adminId, name, address, workforce, prestations, schedules, contactPhone, prestationCategories, dayPeriodFastServiceExcluded, loanerVehicleFastServiceExcluded, fastServiceThreshold, timezone, settings, vehicles, contactEmail, logo, suppliers, documents, subscriptions, loanerVehicleActive, loanerVehicleRequestActive, customStyle, subscription, partialWorkforce, mailCustomization, billingActive, billingToken, billingSimulationActive, appId, establishmentRegistrationNumber, companyRegistrationNumber, quoteRequestStart, reopeningDate, targetMargin, demoBillingActive, onlyBilling, newDocumentEditor, googleReviewUrl) {
+    function Garage(id, adminId, name, address, workforce, prestations, schedules, contactPhone, prestationCategories, dayPeriodFastServiceExcluded, loanerVehicleFastServiceExcluded, fastServiceThreshold, timezone, settings, vehicles, contactEmail, logo, suppliers, documents, subscriptions, loanerVehicleActive, loanerVehicleRequestActive, customStyle, subscription, partialWorkforce, mailCustomization, billingActive, billingToken, billingSimulationActive, appId, establishmentRegistrationNumber, companyRegistrationNumber, reopeningDate, targetMargin, demoBillingActive, onlyBilling, newDocumentEditor, googleReviewUrl, isOnlineAppointment, isOnlineQuote) {
         if (onlyBilling === void 0) { onlyBilling = false; }
         if (newDocumentEditor === void 0) { newDocumentEditor = false; }
         this.id = id;
@@ -35,7 +35,6 @@ var Garage = /** @class */ (function () {
         this.billingToken = billingToken;
         this.billingSimulationActive = billingSimulationActive;
         this.appId = appId;
-        this.quoteRequestStart = quoteRequestStart;
         this.companyRegistrationNumber = companyRegistrationNumber;
         this.establishmentRegistrationNumber = establishmentRegistrationNumber;
         this.reopeningDate = reopeningDate;
@@ -45,6 +44,8 @@ var Garage = /** @class */ (function () {
         this.googleReviewUrl = googleReviewUrl;
         this.settings = settings;
         this.newDocumentEditor = newDocumentEditor;
+        this.isOnlineAppointment = isOnlineAppointment;
+        this.isOnlineQuote = isOnlineQuote;
     }
     return Garage;
 }());

package/package.json

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

package/src/models/Event.ts

@@ -109,6 +109,7 @@ export default class Event {
   orderComment?: string;
   vehicleReceived?: boolean;
   garageVehicleId?: number;
+  goodForAgreement?:boolean
   garageVehicleRequest?: boolean;
   origin?: string;
   quoteLastSendingTime?: Date;
@@ -155,7 +156,8 @@ export default class Event {
     lastQuoteCreationDate?: Date,
     quoteFirstSendingTime?: Date,
     urgent?: boolean,
-    garageVehicleBookings?: LoanVehicle[]
+    garageVehicleBookings?: LoanVehicle[],
+    goodForAgreement?:boolean,
   ) {
     this.id = id;
     this.notes = notes;
@@ -204,6 +206,7 @@ export default class Event {
       : undefined;
     this.urgent = urgent;
     this.garageVehicleBookings = garageVehicleBookings;
+    this.goodForAgreement = goodForAgreement;
   }
 
   static getPrestationsList(event: Event): string[] {
@@ -226,7 +229,7 @@ export default class Event {
         ) {
           return (
             quoteDocument.find((doc) => doc.state === DocumentState.PENDING) ??
-            null
+             quoteDocument.find((doc) => doc.state === DocumentState.APPROVED) ?? null
           );
         } else if (state === QuoteState.QUOTE_REJECTED) {
           return (
@@ -238,13 +241,15 @@ export default class Event {
                   new Date(a.creationDate!).getTime()
               )[0] ?? null
           );
-        } else if (state === QuoteState.QUOTE_ACCEPTED) {
+        }
+        else if (state === QuoteState.QUOTE_ACCEPTED) {
           return (
             quoteDocument.find((doc) => doc.state === DocumentState.APPROVED) ??
             null
           );
         }
-      } else {
+      }
+      else {
         return (
           quoteDocument.find((doc) => doc.state === DocumentState.APPROVED) ??
           null

package/src/models/Garage.ts

@@ -63,7 +63,6 @@ export default class Garage {
   billingSimulationActive?: boolean;
   demoBillingActive?: boolean;
   appId?: number;
-  quoteRequestStart?: Date;
   companyRegistrationNumber?: string;
   establishmentRegistrationNumber?: string;
   reopeningDate?: Date;
@@ -71,6 +70,8 @@ export default class Garage {
   onlyBilling?: boolean;
   settings: Settings[];
   newDocumentEditor?: boolean;
+  isOnlineAppointment?:boolean;
+  isOnlineQuote?:boolean;
   constructor(
     id: string,
     adminId: string,
@@ -104,14 +105,14 @@ export default class Garage {
     appId?: number,
     establishmentRegistrationNumber?: string,
     companyRegistrationNumber?: string,
-    quoteRequestStart?: Date,
     reopeningDate?: Date,
     targetMargin?: number,
     demoBillingActive?: boolean,
     onlyBilling: boolean = false,
     newDocumentEditor: boolean = false,
     googleReviewUrl?:string,
-
+    isOnlineAppointment?: boolean,
+  isOnlineQuote?: boolean,
   ) {
     this.id = id;
     this.adminId = adminId;
@@ -142,7 +143,6 @@ export default class Garage {
     this.billingToken = billingToken;
     this.billingSimulationActive = billingSimulationActive;
     this.appId = appId;
-    this.quoteRequestStart = quoteRequestStart;
     this.companyRegistrationNumber = companyRegistrationNumber;
     this.establishmentRegistrationNumber = establishmentRegistrationNumber;
     this.reopeningDate = reopeningDate;
@@ -152,6 +152,8 @@ export default class Garage {
     this.googleReviewUrl = googleReviewUrl;
     this.settings = settings;
     this.newDocumentEditor = newDocumentEditor;
+    this.isOnlineAppointment = isOnlineAppointment;
+    this.isOnlineQuote = isOnlineQuote;
   }