@autologix-engineering/shared 1.2.382 → 1.2.383

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autologix-engineering/shared",
-  "version": "1.2.382",
+  "version": "1.2.383",
   "dependencies": {
     "tslib": "^2.3.0"
   },

package/src/lib/data-transfer-objects/src/add.ltr.payout.rows.dto.d.ts

@@ -17,7 +17,21 @@ export declare class AddLTRPayoutRowImageDTO {
  * land on the last row so nothing is counted three times.
  */
 export declare class AddLTRPayoutRowsDTO {
-    contextId: string;
+    /**
+     * Optional, and only ever used for logging.
+     *
+     * The booking is the authority on which context an entry belongs to, and
+     * `requestId` already names it: the controller falls back to the vehicle
+     * master's own context, and the charge calculation reads the fuel-price
+     * context off the booking (`Request.vendorContextId`), never from here.
+     * The only value this field carries reaches a log line and nothing else.
+     *
+     * Required, it could reject an otherwise valid entry before the controller
+     * ran — a 400 from the validation pipe, which logs nothing — for a field
+     * that changes no behaviour. It is also the one context in the payload the
+     * server has no reason to take on the caller's word.
+     */
+    contextId?: string;
     requestId: string;
     /**
      * The driver making the entry. Recorded as the entry's author on the row

package/src/lib/data-transfer-objects/src/add.ltr.payout.rows.dto.js

@@ -29,6 +29,7 @@ export class AddLTRPayoutRowsDTO {
     }
 }
 __decorate([
+    IsOptional(),
     IsUUID(),
     __metadata("design:type", String)
 ], AddLTRPayoutRowsDTO.prototype, "contextId", void 0);

package/src/lib/data-transfer-objects/src/add.ltr.payout.rows.dto.js.map

@@ -1 +1 @@
-{"version":3,"file":"add.ltr.payout.rows.dto.js","sourceRoot":"","sources":["../../../../../../../libs/shared/src/lib/data-transfer-objects/src/add.ltr.payout.rows.dto.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"add.ltr.payout.rows.dto.js","sourceRoot":"","sources":["../../../../../../../libs/shared/src/lib/data-transfer-objects/src/add.ltr.payout.rows.dto.ts"],"names":[],"mappings":";AAAA,OAAO,EACN,OAAO,EACP,SAAS,EACT,KAAK,EACL,QAAQ,EACR,UAAU,EACV,QAAQ,EACR,MAAM,EACN,OAAO,EACP,GAAG,EACH,UAAU,EACV,cAAc,GACd,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAEpD,qEAAqE;AACrE,MAAM,iBAAiB,GAAG,oCAAoC,CAAC;AAE/D,0EAA0E;AAC1E,MAAM,OAAO,uBAAuB;CAUnC;AAJA;IADC,QAAQ,EAAE;;qDACE;AAGb;IADC,MAAM,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;;wDACV;AAGnB;;;;;;;;GAQG;AACH,MAAM,OAAO,mBAAmB;IAkL/B,YAAY,GAAkC;QAC7C,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC1B,CAAC;CACD;AApKA;IAFC,UAAU,EAAE;IACZ,MAAM,EAAE;;sDACU;AAGnB;IADC,MAAM,EAAE;;sDACS;AAWlB;IADC,MAAM,CAAC,CAAC,CAAC;;6DACe;AAazB;IALC,UAAU,EAAE;IACZ,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CACpB,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,KAAK,CACpD;IACA,SAAS,EAAE;;wDACU;AAUtB;IAHC,OAAO,CAAC,iBAAiB,EAAE;QAC3B,OAAO,EAAE,8CAA8C;KACvD,CAAC;;gEAC0B;AAK5B;IAHC,OAAO,CAAC,iBAAiB,EAAE;QAC3B,OAAO,EAAE,+CAA+C;KACxD,CAAC;;iEAC2B;AAK7B;IAHC,OAAO,CAAC,iBAAiB,EAAE;QAC3B,OAAO,EAAE,4CAA4C;KACrD,CAAC;;8DACwB;AAK1B;IAHC,OAAO,CAAC,iBAAiB,EAAE;QAC3B,OAAO,EAAE,0CAA0C;KACnD,CAAC;;4DACsB;AAIxB;IADC,QAAQ,EAAE;;wDACS;AAUpB;IAHC,UAAU,EAAE;IACZ,KAAK,EAAE;IACP,GAAG,CAAC,CAAC,CAAC;;kDACQ;AAYf;IAFC,UAAU,CAAC,CAAC,CAAsB,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;IACtD,QAAQ,EAAE;;0DACY;AAIvB;IAFC,UAAU,CAAC,CAAC,CAAsB,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;IACtD,QAAQ,EAAE;;2DACa;AAIxB;IAFC,UAAU,CAAC,CAAC,CAAsB,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;IACtD,QAAQ,EAAE;;oDACM;AAIjB;IAFC,UAAU,CAAC,CAAC,CAAsB,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;IACtD,QAAQ,EAAE;;kDACI;AAsBf;IANC,UAAU,EAAE;IACZ,OAAO,EAAE;IACT,OAAO,CAAC,uBAAuB,EAAE;QACjC,IAAI,EAAE,IAAI;QACV,OAAO,EAAE,2CAA2C;KACpD,CAAC;;2DACwB;AAW1B;IAHC,UAAU,EAAE;IACZ,cAAc,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAC9B,IAAI,CAAC,GAAG,EAAE,CAAC,uBAAuB,CAAC;;mDACD;AAKnC;IAFC,UAAU,EAAE;IACZ,QAAQ,EAAE;;iDACG;AAId;IAFC,UAAU,EAAE;IACZ,QAAQ,EAAE;;oDACM;AAIjB;IAFC,UAAU,EAAE;IACZ,QAAQ,EAAE;;mDACK;AAIhB;IAFC,UAAU,EAAE;IACZ,QAAQ,EAAE;;uDACS;AAIpB;IAFC,UAAU,EAAE;IACZ,QAAQ,EAAE;;wDACU;AAWrB;IAFC,UAAU,EAAE;IACZ,QAAQ,EAAE;;uDACS;AAIpB;IAFC,UAAU,EAAE;IACZ,QAAQ,EAAE;;oDACM"}

package/src/lib/data-transfer-objects/src/calculate.ltr.payout.rows.dto.d.ts

@@ -1,5 +1,18 @@
 export declare class CalculateLTRPayoutRowsDTO {
-    contextId: string;
+    /**
+     * Optional, and only ever used for logging.
+     *
+     * The controller destructures this for its opening `_logger.log` and
+     * nothing else — the context that drives the fuel-price lookups is read
+     * off the booking (`Request.vendorContextId`), never from here.
+     *
+     * Optional so the declared type matches how it is actually called:
+     * AddLTRPayoutRows invokes this controller as a direct method call, where
+     * no validation pipe runs, and passes its own `contextId` straight
+     * through. Once that field is optional too (#3850) the value is genuinely
+     * `string | undefined`, which is what this declaration now admits.
+     */
+    contextId?: string;
     validRows: any[];
     pickupTime?: string;
     dropTime?: string;

package/src/lib/data-transfer-objects/src/calculate.ltr.payout.rows.dto.js

@@ -6,6 +6,7 @@ export class CalculateLTRPayoutRowsDTO {
     }
 }
 __decorate([
+    IsOptional(),
     IsUUID(),
     IsNotEmpty(),
     __metadata("design:type", String)

package/src/lib/data-transfer-objects/src/calculate.ltr.payout.rows.dto.js.map

@@ -1 +1 @@
-{"version":3,"file":"calculate.ltr.payout.rows.dto.js","sourceRoot":"","sources":["../../../../../../../libs/shared/src/lib/data-transfer-objects/src/calculate.ltr.payout.rows.dto.ts"],"names":[],"mappings":";AAAA,OAAO,EACN,OAAO,EACP,SAAS,EACT,MAAM,EACN,UAAU,EACV,UAAU,EACV,QAAQ,GACR,MAAM,iBAAiB,CAAC;AAEzB,MAAM,OAAO,yBAAyB;IAyBrC,YAAY,GAAwC;QACnD,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC1B,CAAC;CACD;AAzBA;IAFC,MAAM,EAAE;IACR,UAAU,EAAE;;4DACK;AAIlB;IAFC,OAAO,EAAE;IACT,UAAU,EAAE;;4DACI;AAIjB;IAFC,QAAQ,EAAE;IACV,UAAU,EAAE;;6DACO;AAIpB;IAFC,QAAQ,EAAE;IACV,UAAU,EAAE;;2DACK;AAGlB;IADC,MAAM,EAAE;;4DACS;AAKlB;IAFC,SAAS,EAAE;IACX,UAAU,EAAE;;oEACe"}
+{"version":3,"file":"calculate.ltr.payout.rows.dto.js","sourceRoot":"","sources":["../../../../../../../libs/shared/src/lib/data-transfer-objects/src/calculate.ltr.payout.rows.dto.ts"],"names":[],"mappings":";AAAA,OAAO,EACN,OAAO,EACP,SAAS,EACT,MAAM,EACN,UAAU,EACV,UAAU,EACV,QAAQ,GACR,MAAM,iBAAiB,CAAC;AAEzB,MAAM,OAAO,yBAAyB;IAuCrC,YAAY,GAAwC;QACnD,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC1B,CAAC;CACD;AAzBA;IAHC,UAAU,EAAE;IACZ,MAAM,EAAE;IACR,UAAU,EAAE;;4DACM;AAInB;IAFC,OAAO,EAAE;IACT,UAAU,EAAE;;4DACI;AAIjB;IAFC,QAAQ,EAAE;IACV,UAAU,EAAE;;6DACO;AAIpB;IAFC,QAAQ,EAAE;IACV,UAAU,EAAE;;2DACK;AAGlB;IADC,MAAM,EAAE;;4DACS;AAKlB;IAFC,SAAS,EAAE;IACX,UAAU,EAAE;;oEACe"}

package/src/lib/data-transfer-objects/src/check.vehicle.allocation.conflicts.dto.d.ts

@@ -6,9 +6,12 @@
  * useful before a duty exists (a vehicle picker on a draft), in which case
  * nothing is excluded.
  *
- * `pickupTime` is the pickup of the duty being allocated, used for the
- * same-slot rule. Sent as an ISO-8601 instant (UTC) — never a wall-clock
- * string — so the server is not left guessing which timezone the browser meant.
+ * `pickupTime` is the pickup of the duty being allocated. Both time-based
+ * rules are anchored on it: the configured window brackets it either side, and
+ * the +/-30 minute same-slot rule sits inside that. Sent as an ISO-8601 instant
+ * (UTC) — never a wall-clock string — so the server is not left guessing which
+ * timezone the browser meant. Optional, and when it is absent or unparseable
+ * both of those rules are skipped; only the ongoing-trip check still applies.
  */
 export declare class CheckVehicleAllocationConflictsDTO {
     contextId: string;

package/src/lib/data-transfer-objects/src/check.vehicle.allocation.conflicts.dto.js

@@ -8,9 +8,12 @@ import { IsISO8601, IsOptional, IsUUID } from 'class-validator';
  * useful before a duty exists (a vehicle picker on a draft), in which case
  * nothing is excluded.
  *
- * `pickupTime` is the pickup of the duty being allocated, used for the
- * same-slot rule. Sent as an ISO-8601 instant (UTC) — never a wall-clock
- * string — so the server is not left guessing which timezone the browser meant.
+ * `pickupTime` is the pickup of the duty being allocated. Both time-based
+ * rules are anchored on it: the configured window brackets it either side, and
+ * the +/-30 minute same-slot rule sits inside that. Sent as an ISO-8601 instant
+ * (UTC) — never a wall-clock string — so the server is not left guessing which
+ * timezone the browser meant. Optional, and when it is absent or unparseable
+ * both of those rules are skipped; only the ongoing-trip check still applies.
  */
 export class CheckVehicleAllocationConflictsDTO {
     constructor(obj) {

package/src/lib/data-transfer-objects/src/check.vehicle.allocation.conflicts.dto.js.map

@@ -1 +1 @@
-{"version":3,"file":"check.vehicle.allocation.conflicts.dto.js","sourceRoot":"","sources":["../../../../../../../libs/shared/src/lib/data-transfer-objects/src/check.vehicle.allocation.conflicts.dto.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEhE;;;;;;;;;;;GAWG;AACH,MAAM,OAAO,kCAAkC;IAe9C,YAAY,GAAiD;QAC5D,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC1B,CAAC;CACD;AAhBA;IADC,MAAM,EAAE;;qEACS;AAGlB;IADC,MAAM,EAAE;;gFACoB;AAI7B;IAFC,UAAU,EAAE;IACZ,MAAM,EAAE;;qEACU;AAInB;IAFC,UAAU,EAAE;IACZ,SAAS,EAAE;;sEACQ"}
+{"version":3,"file":"check.vehicle.allocation.conflicts.dto.js","sourceRoot":"","sources":["../../../../../../../libs/shared/src/lib/data-transfer-objects/src/check.vehicle.allocation.conflicts.dto.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEhE;;;;;;;;;;;;;;GAcG;AACH,MAAM,OAAO,kCAAkC;IAe9C,YAAY,GAAiD;QAC5D,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC1B,CAAC;CACD;AAhBA;IADC,MAAM,EAAE;;qEACS;AAGlB;IADC,MAAM,EAAE;;gFACoB;AAI7B;IAFC,UAAU,EAAE;IACZ,MAAM,EAAE;;qEACU;AAInB;IAFC,UAAU,EAAE;IACZ,SAAS,EAAE;;sEACQ"}

package/src/lib/data-transfer-objects/src/create.update.ba.contract.dto.d.ts

@@ -25,6 +25,22 @@ export declare class CreateBAContractDTO {
     yourShare?: number;
     depositAmount?: number;
     sdStatus?: string;
+    /**
+     * The Cheque/UTR date. REQUIRED whenever a deposit amount is present, because
+     * it is the only thing that places the deposit in a financial year — the SD
+     * schedule (AD-3097) counts an addition in the year of this date and has no
+     * fallback, so an undated deposit is counted in no year at all while its
+     * refund still is, producing a negative closing balance.
+     *
+     * The contract form already enforces this (Yup, add.ba.contract.tsx), and the
+     * same form serves add, copy, update and extend. This is the server-side half:
+     * without it the rule holds for the browser and not for any other caller.
+     *
+     * `@ValidateIf` rather than `@IsOptional`: IsOptional skips validation whenever
+     * the value is null/undefined, which is exactly the case that must fail here.
+     * When there is no deposit, ValidateIf short-circuits and the field stays
+     * genuinely optional.
+     */
     transactionDate?: string;
     bankName?: string;
     transactionType?: string;

package/src/lib/data-transfer-objects/src/create.update.ba.contract.dto.js

@@ -1,5 +1,5 @@
 import { __decorate, __metadata } from "tslib";
-import { IsUUID, IsEnum, IsDateString, IsNumber, IsString, IsOptional, Min, Max, IsArray, ValidateNested, } from 'class-validator';
+import { IsUUID, IsEnum, IsDateString, IsNumber, IsString, IsOptional, Min, Max, IsArray, ValidateNested, ValidateIf, } from 'class-validator';
 import { Transform, Type } from 'class-transformer';
 import { BAContractType, FixedCostType, BAContractStatus, } from '../../enums/src';
 /**
@@ -159,8 +159,12 @@ __decorate([
     __metadata("design:type", String)
 ], CreateBAContractDTO.prototype, "sdStatus", void 0);
 __decorate([
-    IsOptional(),
-    IsDateString(),
+    ValidateIf((o) => o.depositAmount !== null &&
+        o.depositAmount !== undefined &&
+        Number(o.depositAmount) > 0),
+    IsDateString({}, {
+        message: 'transactionDate (Cheque/UTR date) is required when a deposit amount is entered.',
+    }),
     __metadata("design:type", String)
 ], CreateBAContractDTO.prototype, "transactionDate", void 0);
 __decorate([

package/src/lib/data-transfer-objects/src/create.update.ba.contract.dto.js.map

@@ -1 +1 @@
-{"version":3,"file":"create.update.ba.contract.dto.js","sourceRoot":"","sources":["../../../../../../../libs/shared/src/lib/data-transfer-objects/src/create.update.ba.contract.dto.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"create.update.ba.contract.dto.js","sourceRoot":"","sources":["../../../../../../../libs/shared/src/lib/data-transfer-objects/src/create.update.ba.contract.dto.ts"],"names":[],"mappings":"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"}

package/src/lib/data-transfer-objects/src/create.work.order.dispatch.dto.d.ts

@@ -1,4 +1,34 @@
+import { GetWorkOrdersToDispatchDTO } from './get.work.orders.to.dispatch.dto';
+/**
+ * The list filters "select all" resolves against, as they arrive nested in a
+ * dispatch request.
+ *
+ * Identical to `GetWorkOrdersToDispatchDTO` but for `contextId`, which is
+ * optional here: the controller always overwrites it with the request's
+ * top-level `contextId` before resolving ids, so the value sent in `filters`
+ * is never read. Left required, `@ValidateNested()` still enforced it, and a
+ * caller that sensibly omitted a field the backend ignores got the whole
+ * request rejected with "contextId must be a UUID" — pointing at the nested
+ * copy while the real one was supplied and valid.
+ *
+ * A subclass rather than a TypeScript `Omit<>`: `@Type()` resolves the class
+ * at runtime and class-validator validates against it, so a type-only omission
+ * would change nothing about the error. Declared here rather than by relaxing
+ * the shared query DTO, which would drop the guarantee for the GET endpoint
+ * that genuinely requires the field.
+ */
+export declare class WorkOrderDispatchFiltersDTO extends GetWorkOrdersToDispatchDTO {
+    contextId: string;
+}
 export declare class CreateWorkOrderDispatchDTO {
     contextId: string;
-    workOrderIds: string[];
+    /**
+     * Optional because `selectAll` mode resolves the ids server-side and
+     * legitimately sends none — `@ValidateIf` already only demands them when
+     * `selectAll` is falsy, so the required typing was contradicted at runtime.
+     */
+    workOrderIds?: string[];
+    selectAll?: boolean;
+    excludedIds?: string[];
+    filters?: WorkOrderDispatchFiltersDTO;
 }

package/src/lib/data-transfer-objects/src/create.work.order.dispatch.dto.js

@@ -1,5 +1,32 @@
 import { __decorate, __metadata } from "tslib";
-import { IsArray, IsNotEmpty, IsString, IsUUID } from 'class-validator';
+import { IsArray, IsBoolean, IsNotEmpty, IsOptional, IsString, IsUUID, ValidateIf, ValidateNested, } from 'class-validator';
+import { Type } from 'class-transformer';
+import { GetWorkOrdersToDispatchDTO } from './get.work.orders.to.dispatch.dto';
+/**
+ * The list filters "select all" resolves against, as they arrive nested in a
+ * dispatch request.
+ *
+ * Identical to `GetWorkOrdersToDispatchDTO` but for `contextId`, which is
+ * optional here: the controller always overwrites it with the request's
+ * top-level `contextId` before resolving ids, so the value sent in `filters`
+ * is never read. Left required, `@ValidateNested()` still enforced it, and a
+ * caller that sensibly omitted a field the backend ignores got the whole
+ * request rejected with "contextId must be a UUID" — pointing at the nested
+ * copy while the real one was supplied and valid.
+ *
+ * A subclass rather than a TypeScript `Omit<>`: `@Type()` resolves the class
+ * at runtime and class-validator validates against it, so a type-only omission
+ * would change nothing about the error. Declared here rather than by relaxing
+ * the shared query DTO, which would drop the guarantee for the GET endpoint
+ * that genuinely requires the field.
+ */
+export class WorkOrderDispatchFiltersDTO extends GetWorkOrdersToDispatchDTO {
+}
+__decorate([
+    IsOptional(),
+    IsUUID(),
+    __metadata("design:type", String)
+], WorkOrderDispatchFiltersDTO.prototype, "contextId", void 0);
 export class CreateWorkOrderDispatchDTO {
 }
 __decorate([
@@ -8,9 +35,27 @@ __decorate([
     __metadata("design:type", String)
 ], CreateWorkOrderDispatchDTO.prototype, "contextId", void 0);
 __decorate([
+    ValidateIf((o) => !o.selectAll),
     IsArray(),
     IsString({ each: true }),
     IsNotEmpty(),
     __metadata("design:type", Array)
 ], CreateWorkOrderDispatchDTO.prototype, "workOrderIds", void 0);
+__decorate([
+    IsOptional(),
+    IsBoolean(),
+    __metadata("design:type", Boolean)
+], CreateWorkOrderDispatchDTO.prototype, "selectAll", void 0);
+__decorate([
+    IsOptional(),
+    IsArray(),
+    IsString({ each: true }),
+    __metadata("design:type", Array)
+], CreateWorkOrderDispatchDTO.prototype, "excludedIds", void 0);
+__decorate([
+    ValidateIf((o) => !!o.selectAll),
+    ValidateNested(),
+    Type(() => WorkOrderDispatchFiltersDTO),
+    __metadata("design:type", WorkOrderDispatchFiltersDTO)
+], CreateWorkOrderDispatchDTO.prototype, "filters", void 0);
 //# sourceMappingURL=create.work.order.dispatch.dto.js.map

package/src/lib/data-transfer-objects/src/create.work.order.dispatch.dto.js.map

@@ -1 +1 @@
-{"version":3,"file":"create.work.order.dispatch.dto.js","sourceRoot":"","sources":["../../../../../../../libs/shared/src/lib/data-transfer-objects/src/create.work.order.dispatch.dto.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAExE,MAAM,OAAO,0BAA0B;CAStC;AANA;IAFC,UAAU,EAAE;IACZ,MAAM,EAAE;;6DACS;AAKlB;IAHC,OAAO,EAAE;IACT,QAAQ,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACxB,UAAU,EAAE;;gEACU"}
+{"version":3,"file":"create.work.order.dispatch.dto.js","sourceRoot":"","sources":["../../../../../../../libs/shared/src/lib/data-transfer-objects/src/create.work.order.dispatch.dto.ts"],"names":[],"mappings":";AAAA,OAAO,EACN,OAAO,EACP,SAAS,EACT,UAAU,EACV,UAAU,EACV,QAAQ,EACR,MAAM,EACN,UAAU,EACV,cAAc,GACd,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAE,0BAA0B,EAAE,MAAM,mCAAmC,CAAC;AAE/E;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,OAAO,2BAA4B,SAAQ,0BAA0B;CAI1E;AADQ;IAFP,UAAU,EAAE;IACZ,MAAM,EAAE;;8DACiB;AAG3B,MAAM,OAAO,0BAA0B;CA6BtC;AA1BA;IAFC,UAAU,EAAE;IACZ,MAAM,EAAE;;6DACS;AAWlB;IAJC,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC/B,OAAO,EAAE;IACT,QAAQ,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACxB,UAAU,EAAE;;gEACW;AAIxB;IAFC,UAAU,EAAE;IACZ,SAAS,EAAE;;6DACQ;AAKpB;IAHC,UAAU,EAAE;IACZ,OAAO,EAAE;IACT,QAAQ,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;;+DACF;AAKvB;IAHC,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAChC,cAAc,EAAE;IAChB,IAAI,CAAC,GAAG,EAAE,CAAC,2BAA2B,CAAC;8BAC9B,2BAA2B;2DAAC"}

package/src/lib/data-transfer-objects/src/get.contract.date.changes.dto.js

@@ -1,6 +1,6 @@
 import { __decorate, __metadata } from "tslib";
 import { Transform } from 'class-transformer';
-import { IsBoolean, IsDateString, IsEnum, IsNumber, IsOptional, IsString, IsUUID, Max, } from 'class-validator';
+import { IsBoolean, IsDateString, IsEnum, IsNumber, IsOptional, IsString, IsUUID, Max, Min, } from 'class-validator';
 import { TermRentalType } from '../../enums/src/index';
 /**
  * Current date-change budget for one (client, rental type) bucket.
@@ -51,6 +51,8 @@ __decorate([
 ], GetContractDateChangesDTO.prototype, "clientPersonaId", void 0);
 __decorate([
     IsOptional(),
+    IsNumber(),
+    Min(0),
     Transform(Number),
     __metadata("design:type", Number)
 ], GetContractDateChangesDTO.prototype, "skip", void 0);

package/src/lib/data-transfer-objects/src/get.contract.date.changes.dto.js.map

@@ -1 +1 @@
-{"version":3,"file":"get.contract.date.changes.dto.js","sourceRoot":"","sources":["../../../../../../../libs/shared/src/lib/data-transfer-objects/src/get.contract.date.changes.dto.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EACN,SAAS,EACT,YAAY,EACZ,MAAM,EACN,QAAQ,EACR,UAAU,EACV,QAAQ,EACR,MAAM,EACN,GAAG,GACH,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD;;;;;;GAMG;AACH,MAAM,OAAO,oCAAoC;IAgBhD,YAAY,GAAmD;QAC9D,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC1B,CAAC;CACD;AAjBA;IADC,MAAM,EAAE;;6EACe;AAGxB;IADC,MAAM,EAAE;;uEACS;AASlB;IAFC,UAAU,EAAE;IACZ,MAAM,CAAC,cAAc,CAAC;;wEACK;AAO7B;;;;;;;GAOG;AACH,MAAM,OAAO,yBAAyB;IAqErC,YAAY,GAAwC;QACnD,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC1B,CAAC;CACD;AAtEA;IADC,MAAM,EAAE;;4DACS;AAIlB;IAFC,UAAU,EAAE;IACZ,MAAM,EAAE;;kEACgB;AAIzB;IAFC,UAAU,EAAE;IACZ,SAAS,CAAC,MAAM,CAAC;;uDACJ;AAQd;IAJC,UAAU,EAAE;IACZ,QAAQ,EAAE;IACV,GAAG,CAAC,GAAG,CAAC;IACR,SAAS,CAAC,MAAM,CAAC;;uDACJ;AAKd;IAFC,UAAU,EAAE;IACZ,QAAQ,EAAE;;6DACS;AAIpB;IAFC,UAAU,EAAE;IACZ,YAAY,EAAE;;uDACD;AAId;IAFC,UAAU,EAAE;IACZ,YAAY,EAAE;;qDACH;AAIZ;IAFC,UAAU,EAAE;IACZ,MAAM,CAAC,cAAc,CAAC;;6DACK;AAsB5B;IAPC,UAAU,EAAE;IACZ,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CACpB,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,EAAE;QACpD,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,KAAK,KAAK,IAAI,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,MAAM,CAC7C;IACA,SAAS,EAAE;;iEACa;AAUzB;IAHC,UAAU,EAAE;IACZ,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,IAAI,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,MAAM,CAAC;IAChE,SAAS,EAAE;;uEACmB"}
+{"version":3,"file":"get.contract.date.changes.dto.js","sourceRoot":"","sources":["../../../../../../../libs/shared/src/lib/data-transfer-objects/src/get.contract.date.changes.dto.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EACN,SAAS,EACT,YAAY,EACZ,MAAM,EACN,QAAQ,EACR,UAAU,EACV,QAAQ,EACR,MAAM,EACN,GAAG,EACH,GAAG,GACH,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD;;;;;;GAMG;AACH,MAAM,OAAO,oCAAoC;IAgBhD,YAAY,GAAmD;QAC9D,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC1B,CAAC;CACD;AAjBA;IADC,MAAM,EAAE;;6EACe;AAGxB;IADC,MAAM,EAAE;;uEACS;AASlB;IAFC,UAAU,EAAE;IACZ,MAAM,CAAC,cAAc,CAAC;;wEACK;AAO7B;;;;;;;GAOG;AACH,MAAM,OAAO,yBAAyB;IAuErC,YAAY,GAAwC;QACnD,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC1B,CAAC;CACD;AAxEA;IADC,MAAM,EAAE;;4DACS;AAIlB;IAFC,UAAU,EAAE;IACZ,MAAM,EAAE;;kEACgB;AAMzB;IAJC,UAAU,EAAE;IACZ,QAAQ,EAAE;IACV,GAAG,CAAC,CAAC,CAAC;IACN,SAAS,CAAC,MAAM,CAAC;;uDACJ;AAQd;IAJC,UAAU,EAAE;IACZ,QAAQ,EAAE;IACV,GAAG,CAAC,GAAG,CAAC;IACR,SAAS,CAAC,MAAM,CAAC;;uDACJ;AAKd;IAFC,UAAU,EAAE;IACZ,QAAQ,EAAE;;6DACS;AAIpB;IAFC,UAAU,EAAE;IACZ,YAAY,EAAE;;uDACD;AAId;IAFC,UAAU,EAAE;IACZ,YAAY,EAAE;;qDACH;AAIZ;IAFC,UAAU,EAAE;IACZ,MAAM,CAAC,cAAc,CAAC;;6DACK;AAsB5B;IAPC,UAAU,EAAE;IACZ,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CACpB,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,EAAE;QACpD,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,KAAK,KAAK,IAAI,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,MAAM,CAC7C;IACA,SAAS,EAAE;;iEACa;AAUzB;IAHC,UAAU,EAAE;IACZ,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,IAAI,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,MAAM,CAAC;IAChE,SAAS,EAAE;;uEACmB"}

package/src/lib/data-transfer-objects/src/update.global.config.billing.dto.d.ts

@@ -1,4 +1,4 @@
-import { BillingToType, RequestType } from '../../enums/src';
+import { RequestType } from '../../enums/src';
 import { BillingAdjustmentStorage } from '../../models/src/configurations.model';
 export declare class UpdateGlobalConfigBillingDTO {
     contextId: string;
@@ -9,7 +9,7 @@ export declare class UpdateGlobalConfigBillingDTO {
 }
 export declare class BillMatrixDTO {
     reqType: RequestType;
-    billToType: BillingToType;
+    billToType: string;
     autoCloseBooking: boolean;
     autoGenerateInvoice: boolean;
 }

package/src/lib/data-transfer-objects/src/update.global.config.billing.dto.js

@@ -1,7 +1,7 @@
 import { __decorate, __metadata } from "tslib";
-import { BillingToType, RequestType } from '../../enums/src';
+import { RequestType } from '../../enums/src';
 import { BillingAdjustmentStorage } from '../../models/src/configurations.model';
-import { ArrayMinSize, IsArray, IsBoolean, IsEnum, IsNumber, IsOptional, IsUUID, ValidateNested, } from 'class-validator';
+import { ArrayMinSize, IsArray, IsBoolean, IsEnum, IsNotEmpty, IsNumber, IsOptional, IsString, IsUUID, ValidateNested, } from 'class-validator';
 import { Type } from 'class-transformer';
 export class UpdateGlobalConfigBillingDTO {
 }
@@ -39,7 +39,8 @@ __decorate([
     __metadata("design:type", String)
 ], BillMatrixDTO.prototype, "reqType", void 0);
 __decorate([
-    IsEnum(BillingToType),
+    IsString(),
+    IsNotEmpty(),
     __metadata("design:type", String)
 ], BillMatrixDTO.prototype, "billToType", void 0);
 __decorate([

package/src/lib/data-transfer-objects/src/update.global.config.billing.dto.js.map

@@ -1 +1 @@
-{"version":3,"file":"update.global.config.billing.dto.js","sourceRoot":"","sources":["../../../../../../../libs/shared/src/lib/data-transfer-objects/src/update.global.config.billing.dto.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EACN,YAAY,EACZ,OAAO,EACP,SAAS,EACT,MAAM,EACN,QAAQ,EACR,UAAU,EACV,MAAM,EACN,cAAc,GACd,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAEzC,MAAM,OAAO,4BAA4B;CAsBxC;AApBA;IADC,MAAM,EAAE;;+DACS;AAIlB;IAFC,UAAU,EAAE;IACZ,SAAS,EAAE;;uEACgB;AAI5B;IAFC,MAAM,CAAC,wBAAwB,CAAC;IAChC,UAAU,EAAE;;8EACuC;AAIpD;IAFC,QAAQ,EAAE;IACV,UAAU,EAAE;;+EACsB;AAOnC;IALC,UAAU,EAAE;IACZ,OAAO,EAAE;IACT,YAAY,CAAC,CAAC,CAAC;IACf,IAAI,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC;IACzB,cAAc,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;;mEACC;AAGjC,MAAM,OAAO,aAAa;CAYzB;AAVA;IADC,MAAM,CAAC,WAAW,CAAC;;8CACC;AAGrB;IADC,MAAM,CAAC,aAAa,CAAC;;iDACI;AAG1B;IADC,SAAS,EAAE;;uDACc;AAG1B;IADC,SAAS,EAAE;;0DACiB"}
+{"version":3,"file":"update.global.config.billing.dto.js","sourceRoot":"","sources":["../../../../../../../libs/shared/src/lib/data-transfer-objects/src/update.global.config.billing.dto.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EACN,YAAY,EACZ,OAAO,EACP,SAAS,EACT,MAAM,EACN,UAAU,EACV,QAAQ,EACR,UAAU,EACV,QAAQ,EACR,MAAM,EACN,cAAc,GACd,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAEzC,MAAM,OAAO,4BAA4B;CAsBxC;AApBA;IADC,MAAM,EAAE;;+DACS;AAIlB;IAFC,UAAU,EAAE;IACZ,SAAS,EAAE;;uEACgB;AAI5B;IAFC,MAAM,CAAC,wBAAwB,CAAC;IAChC,UAAU,EAAE;;8EACuC;AAIpD;IAFC,QAAQ,EAAE;IACV,UAAU,EAAE;;+EACsB;AAOnC;IALC,UAAU,EAAE;IACZ,OAAO,EAAE;IACT,YAAY,CAAC,CAAC,CAAC;IACf,IAAI,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC;IACzB,cAAc,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;;mEACC;AAGjC,MAAM,OAAO,aAAa;CAezB;AAbA;IADC,MAAM,CAAC,WAAW,CAAC;;8CACC;AAMrB;IAFC,QAAQ,EAAE;IACV,UAAU,EAAE;;iDACM;AAGnB;IADC,SAAS,EAAE;;uDACc;AAG1B;IADC,SAAS,EAAE;;0DACiB"}

package/src/lib/data-transfer-objects/src/update.work.order.dispatch.status.dto.d.ts

@@ -1,5 +1,7 @@
 export declare class UpdateWorkOrderDispatchStatusDTO {
     workOrderDispatchId: string;
     workOrderIds?: string[];
+    selectAll?: boolean;
+    excludedIds?: string[];
     isConfirmed: boolean;
 }

package/src/lib/data-transfer-objects/src/update.work.order.dispatch.status.dto.js

@@ -1,5 +1,5 @@
 import { __decorate, __metadata } from "tslib";
-import { ArrayMinSize, IsArray, IsBoolean, IsNotEmpty, IsOptional, IsUUID, } from 'class-validator';
+import { ArrayMinSize, IsArray, IsBoolean, IsNotEmpty, IsOptional, IsString, IsUUID, ValidateIf, } from 'class-validator';
 export class UpdateWorkOrderDispatchStatusDTO {
 }
 __decorate([
@@ -8,12 +8,24 @@ __decorate([
     __metadata("design:type", String)
 ], UpdateWorkOrderDispatchStatusDTO.prototype, "workOrderDispatchId", void 0);
 __decorate([
+    ValidateIf((o) => !o.selectAll),
     IsOptional(),
     IsArray(),
     ArrayMinSize(1),
     IsUUID('4', { each: true }),
     __metadata("design:type", Array)
 ], UpdateWorkOrderDispatchStatusDTO.prototype, "workOrderIds", void 0);
+__decorate([
+    IsOptional(),
+    IsBoolean(),
+    __metadata("design:type", Boolean)
+], UpdateWorkOrderDispatchStatusDTO.prototype, "selectAll", void 0);
+__decorate([
+    IsOptional(),
+    IsArray(),
+    IsString({ each: true }),
+    __metadata("design:type", Array)
+], UpdateWorkOrderDispatchStatusDTO.prototype, "excludedIds", void 0);
 __decorate([
     IsBoolean(),
     IsNotEmpty(),

package/src/lib/data-transfer-objects/src/update.work.order.dispatch.status.dto.js.map

@@ -1 +1 @@
-{"version":3,"file":"update.work.order.dispatch.status.dto.js","sourceRoot":"","sources":["../../../../../../../libs/shared/src/lib/data-transfer-objects/src/update.work.order.dispatch.status.dto.ts"],"names":[],"mappings":";AAAA,OAAO,EACN,YAAY,EACZ,OAAO,EACP,SAAS,EACT,UAAU,EACV,UAAU,EACV,MAAM,GACN,MAAM,iBAAiB,CAAC;AAEzB,MAAM,OAAO,gCAAgC;CAc5C;AAXA;IAFC,UAAU,EAAE;IACZ,MAAM,EAAE;;6EACmB;AAM5B;IAJC,UAAU,EAAE;IACZ,OAAO,EAAE;IACT,YAAY,CAAC,CAAC,CAAC;IACf,MAAM,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;;sEACJ;AAIxB;IAFC,SAAS,EAAE;IACX,UAAU,EAAE;;qEACQ"}
+{"version":3,"file":"update.work.order.dispatch.status.dto.js","sourceRoot":"","sources":["../../../../../../../libs/shared/src/lib/data-transfer-objects/src/update.work.order.dispatch.status.dto.ts"],"names":[],"mappings":";AAAA,OAAO,EACN,YAAY,EACZ,OAAO,EACP,SAAS,EACT,UAAU,EACV,UAAU,EACV,QAAQ,EACR,MAAM,EACN,UAAU,GACV,MAAM,iBAAiB,CAAC;AAEzB,MAAM,OAAO,gCAAgC;CAwB5C;AArBA;IAFC,UAAU,EAAE;IACZ,MAAM,EAAE;;6EACmB;AAO5B;IALC,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC/B,UAAU,EAAE;IACZ,OAAO,EAAE;IACT,YAAY,CAAC,CAAC,CAAC;IACf,MAAM,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;;sEACJ;AAIxB;IAFC,UAAU,EAAE;IACZ,SAAS,EAAE;;mEACQ;AAKpB;IAHC,UAAU,EAAE;IACZ,OAAO,EAAE;IACT,QAAQ,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;;qEACF;AAIvB;IAFC,SAAS,EAAE;IACX,UAAU,EAAE;;qEACQ"}

package/src/lib/enums/src/vehicle.allocation.conflict.enum.d.ts

@@ -12,14 +12,18 @@ export declare enum VehicleAllocationConflictReason {
     /** The vehicle is on a duty whose trip is running at this moment. */
     Ongoing = "Ongoing",
     /**
-     * The vehicle is allocated to a duty whose pickup falls inside the
-     * configured window measured from now (default 2 hours).
+     * The vehicle is allocated to a duty whose pickup falls within the
+     * configured window EITHER SIDE of the pickup of the duty being allocated
+     * (default 2 hours). Anchored on that pickup and not on `now` — AD-3373,
+     * requester's decision on 18 Sep — so allocating a duty for next Tuesday
+     * asks about next Tuesday.
      */
     UpcomingWithinWindow = "UpcomingWithinWindow",
     /**
-     * The vehicle is allocated to a duty whose pickup is close to the pickup of
-     * the duty being allocated. Anchored on the booking rather than on `now`,
-     * so allocating next Tuesday's duty still catches next Tuesday's clash.
+     * The vehicle is allocated to a duty whose pickup is within 30 minutes of
+     * the pickup of the duty being allocated. Subsumed by the rule above
+     * whenever the configured window is >= 30 minutes; it survives because it
+     * is the only look-ahead left when the window is set lower, or to 0.
      */
     SamePickupSlot = "SamePickupSlot"
 }

package/src/lib/enums/src/vehicle.allocation.conflict.enum.js

@@ -13,14 +13,18 @@ export var VehicleAllocationConflictReason;
     /** The vehicle is on a duty whose trip is running at this moment. */
     VehicleAllocationConflictReason["Ongoing"] = "Ongoing";
     /**
-     * The vehicle is allocated to a duty whose pickup falls inside the
-     * configured window measured from now (default 2 hours).
+     * The vehicle is allocated to a duty whose pickup falls within the
+     * configured window EITHER SIDE of the pickup of the duty being allocated
+     * (default 2 hours). Anchored on that pickup and not on `now` — AD-3373,
+     * requester's decision on 18 Sep — so allocating a duty for next Tuesday
+     * asks about next Tuesday.
      */
     VehicleAllocationConflictReason["UpcomingWithinWindow"] = "UpcomingWithinWindow";
     /**
-     * The vehicle is allocated to a duty whose pickup is close to the pickup of
-     * the duty being allocated. Anchored on the booking rather than on `now`,
-     * so allocating next Tuesday's duty still catches next Tuesday's clash.
+     * The vehicle is allocated to a duty whose pickup is within 30 minutes of
+     * the pickup of the duty being allocated. Subsumed by the rule above
+     * whenever the configured window is >= 30 minutes; it survives because it
+     * is the only look-ahead left when the window is set lower, or to 0.
      */
     VehicleAllocationConflictReason["SamePickupSlot"] = "SamePickupSlot";
 })(VehicleAllocationConflictReason || (VehicleAllocationConflictReason = {}));

package/src/lib/enums/src/vehicle.allocation.conflict.enum.js.map

@@ -1 +1 @@
-{"version":3,"file":"vehicle.allocation.conflict.enum.js","sourceRoot":"","sources":["../../../../../../../libs/shared/src/lib/enums/src/vehicle.allocation.conflict.enum.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEhD;;;;;;;GAOG;AACH,MAAM,CAAN,IAAY,+BAcX;AAdD,WAAY,+BAA+B;IAC1C,qEAAqE;IACrE,sDAAmB,CAAA;IACnB;;;OAGG;IACH,gFAA6C,CAAA;IAC7C;;;;OAIG;IACH,oEAAiC,CAAA;AAClC,CAAC,EAdW,+BAA+B,KAA/B,+BAA+B,QAc1C;AAED;;;;GAIG;AACH,MAAM,CAAC,MAAM,kDAAkD,GAAG,GAAG,CAAC;AAEtE;;;;GAIG;AACH,MAAM,CAAC,MAAM,8CAA8C,GAAG,KAAK,CAAC;AAEpE;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,8CAA8C,GAAG,EAAE,CAAC;AAEjE;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,+CAA+C,GAC3D,CAAC,aAAa,CAAC,MAAM,EAAE,aAAa,CAAC,QAAQ,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;AAE1E;;;;GAIG;AACH,MAAM,CAAC,MAAM,wCAAwC,GAAiB;IACrE,UAAU,CAAC,cAAc;IACzB,UAAU,CAAC,aAAa;IACxB,UAAU,CAAC,WAAW;CACtB,CAAC"}
+{"version":3,"file":"vehicle.allocation.conflict.enum.js","sourceRoot":"","sources":["../../../../../../../libs/shared/src/lib/enums/src/vehicle.allocation.conflict.enum.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEhD;;;;;;;GAOG;AACH,MAAM,CAAN,IAAY,+BAkBX;AAlBD,WAAY,+BAA+B;IAC1C,qEAAqE;IACrE,sDAAmB,CAAA;IACnB;;;;;;OAMG;IACH,gFAA6C,CAAA;IAC7C;;;;;OAKG;IACH,oEAAiC,CAAA;AAClC,CAAC,EAlBW,+BAA+B,KAA/B,+BAA+B,QAkB1C;AAED;;;;GAIG;AACH,MAAM,CAAC,MAAM,kDAAkD,GAAG,GAAG,CAAC;AAEtE;;;;GAIG;AACH,MAAM,CAAC,MAAM,8CAA8C,GAAG,KAAK,CAAC;AAEpE;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,8CAA8C,GAAG,EAAE,CAAC;AAEjE;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,+CAA+C,GAC3D,CAAC,aAAa,CAAC,MAAM,EAAE,aAAa,CAAC,QAAQ,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;AAE1E;;;;GAIG;AACH,MAAM,CAAC,MAAM,wCAAwC,GAAiB;IACrE,UAAU,CAAC,cAAc;IACzB,UAAU,CAAC,aAAa;IACxB,UAAU,CAAC,WAAW;CACtB,CAAC"}

package/src/lib/models/src/bill.matrix.model.d.ts

@@ -1,4 +1,4 @@
-import { BillingToType, RequestType } from '@autologix/shared/enums';
+import { RequestType } from '@autologix/shared/enums';
 export declare enum BillMatrixField {
     RequestType = "reqType",
     BillToType = "billToType",
@@ -7,7 +7,7 @@ export declare enum BillMatrixField {
 }
 export interface IBillMatrix {
     [BillMatrixField.RequestType]: RequestType;
-    [BillMatrixField.BillToType]: BillingToType;
+    [BillMatrixField.BillToType]: string;
     [BillMatrixField.AutoCloseBooking]: boolean;
     [BillMatrixField.AutoGenerateInvoice]: boolean;
 }

package/src/lib/models/src/configurations.model.d.ts

@@ -76,8 +76,9 @@ export declare enum ConfigurationField {
      */
     ComplianceUtilisationWindowDays = "cmplUtilDays",
     /**
-     * AD-3373 — how far ahead of NOW another duty on the same vehicle still
-     * counts as a clash worth warning about, in minutes.
+     * AD-3373 — how far EITHER SIDE of the pickup of the duty being allocated
+     * another duty on the same vehicle still counts as a clash worth warning
+     * about, in minutes.
      *
      * Null falls back to DEFAULT_VEHICLE_ALLOCATION_CONFLICT_WINDOW_MINUTES
      * (120 = the ticket's 2 hours). Zero is meaningful and switches off only

package/src/lib/models/src/configurations.model.js

@@ -67,8 +67,9 @@ export var ConfigurationField;
      */
     ConfigurationField["ComplianceUtilisationWindowDays"] = "cmplUtilDays";
     /**
-     * AD-3373 — how far ahead of NOW another duty on the same vehicle still
-     * counts as a clash worth warning about, in minutes.
+     * AD-3373 — how far EITHER SIDE of the pickup of the duty being allocated
+     * another duty on the same vehicle still counts as a clash worth warning
+     * about, in minutes.
      *
      * Null falls back to DEFAULT_VEHICLE_ALLOCATION_CONFLICT_WINDOW_MINUTES
      * (120 = the ticket's 2 hours). Zero is meaningful and switches off only

package/src/lib/models/src/configurations.model.js.map

@@ -1 +1 @@
-{"version":3,"file":"configurations.model.js","sourceRoot":"","sources":["../../../../../../../libs/shared/src/lib/models/src/configurations.model.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"configurations.model.js","sourceRoot":"","sources":["../../../../../../../libs/shared/src/lib/models/src/configurations.model.ts"],"names":[],"mappings":"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"}

package/src/lib/models/src/payment.model.d.ts

@@ -22,7 +22,8 @@ export declare enum PaymentField {
     UpdatedAt = "updAt",
     Active = "status",
     NotificationId = "notificationId",
-    NotificationDate = "notificationDate"
+    NotificationDate = "notificationDate",
+    ChargeAttempts = "chargeAttempts"
 }
 export interface IPayment extends TypedModel {
     [PaymentField.PaymentId]: string;
@@ -44,4 +45,5 @@ export interface IPayment extends TypedModel {
     [PaymentField.Active]: boolean;
     [PaymentField.NotificationId]: string;
     [PaymentField.NotificationDate]: Date;
+    [PaymentField.ChargeAttempts]: number;
 }

package/src/lib/models/src/payment.model.js

@@ -19,5 +19,6 @@ export var PaymentField;
     PaymentField["Active"] = "status";
     PaymentField["NotificationId"] = "notificationId";
     PaymentField["NotificationDate"] = "notificationDate";
+    PaymentField["ChargeAttempts"] = "chargeAttempts";
 })(PaymentField || (PaymentField = {}));
 //# sourceMappingURL=payment.model.js.map

package/src/lib/models/src/payment.model.js.map

@@ -1 +1 @@
-{"version":3,"file":"payment.model.js","sourceRoot":"","sources":["../../../../../../../libs/shared/src/lib/models/src/payment.model.ts"],"names":[],"mappings":"AAMA,MAAM,CAAN,IAAY,YAoBX;AApBD,WAAY,YAAY;IACvB,uCAAuB,CAAA;IACvB,qCAAqB,CAAA;IACrB,qCAAqB,CAAA;IACrB,2CAA2B,CAAA;IAC3B,+CAA+B,CAAA;IAC/B,+CAA+B,CAAA;IAC/B,8CAA8B,CAAA;IAC9B,kDAAkC,CAAA;IAClC,+CAA+B,CAAA;IAC/B,yCAAyB,CAAA;IACzB,yCAAyB,CAAA;IACzB,yCAAyB,CAAA;IACzB,mCAAmB,CAAA;IACnB,iCAAiB,CAAA;IACjB,mCAAmB,CAAA;IACnB,mCAAmB,CAAA;IACnB,iCAAiB,CAAA;IACjB,iDAAiC,CAAA;IACjC,qDAAqC,CAAA;AACtC,CAAC,EApBW,YAAY,KAAZ,YAAY,QAoBvB"}
+{"version":3,"file":"payment.model.js","sourceRoot":"","sources":["../../../../../../../libs/shared/src/lib/models/src/payment.model.ts"],"names":[],"mappings":"AAMA,MAAM,CAAN,IAAY,YAqBX;AArBD,WAAY,YAAY;IACvB,uCAAuB,CAAA;IACvB,qCAAqB,CAAA;IACrB,qCAAqB,CAAA;IACrB,2CAA2B,CAAA;IAC3B,+CAA+B,CAAA;IAC/B,+CAA+B,CAAA;IAC/B,8CAA8B,CAAA;IAC9B,kDAAkC,CAAA;IAClC,+CAA+B,CAAA;IAC/B,yCAAyB,CAAA;IACzB,yCAAyB,CAAA;IACzB,yCAAyB,CAAA;IACzB,mCAAmB,CAAA;IACnB,iCAAiB,CAAA;IACjB,mCAAmB,CAAA;IACnB,mCAAmB,CAAA;IACnB,iCAAiB,CAAA;IACjB,iDAAiC,CAAA;IACjC,qDAAqC,CAAA;IACrC,iDAAiC,CAAA;AAClC,CAAC,EArBW,YAAY,KAAZ,YAAY,QAqBvB"}

package/src/lib/utilities/src/booking.selected.package.gate.d.ts

@@ -0,0 +1,29 @@
+import { RequestType } from '@autologix/shared/enums';
+import { ConfigurationField, IConfigurations } from '@autologix/shared/models';
+/**
+ * Whether billing should use the package chosen at booking time rather than
+ * re-deriving one from actual usage.
+ *
+ * This answers the *whole* branch condition, not just the config lookup, and it
+ * is deliberately the single predicate behind every site that used to spell the
+ * rule out by hand:
+ *
+ *   - `bill.calculation.controller.ts` — the `_preferredPackage` prefetch and
+ *     the `if (…) { use selected package } else { derive from contract terms }`
+ *     that consumes it. Those two must agree: taking the `if` arm with a null
+ *     package skips the `else` arm's contract-terms derivation of
+ *     `distanceType` / `garageTime` / `garage` / `confGarageKm` / `fixedCost` /
+ *     `roundMins` and silently bills on client-persona defaults.
+ *   - `generate.bill.handler.new.ts` — the `_package` load and the
+ *     `sourcePackage = null` before `getApplicablePackage`. That handler is
+ *     what actually writes the invoice, so a disagreement there shows up as a
+ *     preview and a bill that differ.
+ *
+ * `PickupAndDrop` and `OutstationRide` were the only types that ever re-derived
+ * from usage, and they did so unconditionally — while the operator-facing
+ * setting meant to govern it (`Configurations.cityLocalPref` / `outstatnPref`)
+ * was written by the global-config controller and read by nothing on the
+ * server. This is the read side. Every other request type always billed against
+ * the selected package and keeps doing so.
+ */
+export declare function billsAgainstBookingSelectedPackage(requestType: RequestType | undefined | null, config: Pick<IConfigurations, ConfigurationField.CityLocalPreference | ConfigurationField.OutstationPreference> | null | undefined, hasBookingSelectedPackage: boolean): boolean;

package/src/lib/utilities/src/booking.selected.package.gate.js

@@ -0,0 +1,47 @@
+import { RequestType, TripConfigPreferences } from '@autologix/shared/enums';
+import { ConfigurationField } from '@autologix/shared/models';
+/**
+ * Whether billing should use the package chosen at booking time rather than
+ * re-deriving one from actual usage.
+ *
+ * This answers the *whole* branch condition, not just the config lookup, and it
+ * is deliberately the single predicate behind every site that used to spell the
+ * rule out by hand:
+ *
+ *   - `bill.calculation.controller.ts` — the `_preferredPackage` prefetch and
+ *     the `if (…) { use selected package } else { derive from contract terms }`
+ *     that consumes it. Those two must agree: taking the `if` arm with a null
+ *     package skips the `else` arm's contract-terms derivation of
+ *     `distanceType` / `garageTime` / `garage` / `confGarageKm` / `fixedCost` /
+ *     `roundMins` and silently bills on client-persona defaults.
+ *   - `generate.bill.handler.new.ts` — the `_package` load and the
+ *     `sourcePackage = null` before `getApplicablePackage`. That handler is
+ *     what actually writes the invoice, so a disagreement there shows up as a
+ *     preview and a bill that differ.
+ *
+ * `PickupAndDrop` and `OutstationRide` were the only types that ever re-derived
+ * from usage, and they did so unconditionally — while the operator-facing
+ * setting meant to govern it (`Configurations.cityLocalPref` / `outstatnPref`)
+ * was written by the global-config controller and read by nothing on the
+ * server. This is the read side. Every other request type always billed against
+ * the selected package and keeps doing so.
+ */
+export function billsAgainstBookingSelectedPackage(requestType, config, hasBookingSelectedPackage) {
+    // No package was chosen at booking, so there is nothing to bill against.
+    if (!hasBookingSelectedPackage)
+        return false;
+    // The column is nullable and defaults to BasedOnUsage, so an absent config
+    // row, a null value or a failed read all keep usage-based selection rather
+    // than silently switching a vendor's billing basis.
+    if (requestType === RequestType.PickupAndDrop) {
+        return (config?.[ConfigurationField.CityLocalPreference] ===
+            TripConfigPreferences.PackageDuringBooking);
+    }
+    if (requestType === RequestType.OutstationRide) {
+        return (config?.[ConfigurationField.OutstationPreference] ===
+            TripConfigPreferences.PackageDuringBooking);
+    }
+    // Every other request type never took the usage-based path.
+    return true;
+}
+//# sourceMappingURL=booking.selected.package.gate.js.map

package/src/lib/utilities/src/booking.selected.package.gate.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"booking.selected.package.gate.js","sourceRoot":"","sources":["../../../../../../../libs/shared/src/lib/utilities/src/booking.selected.package.gate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAC7E,OAAO,EAAE,kBAAkB,EAAmB,MAAM,0BAA0B,CAAC;AAE/E;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,MAAM,UAAU,kCAAkC,CACjD,WAA2C,EAC3C,MAOY,EACZ,yBAAkC;IAElC,yEAAyE;IACzE,IAAI,CAAC,yBAAyB;QAAE,OAAO,KAAK,CAAC;IAE7C,2EAA2E;IAC3E,2EAA2E;IAC3E,oDAAoD;IACpD,IAAI,WAAW,KAAK,WAAW,CAAC,aAAa,EAAE,CAAC;QAC/C,OAAO,CACN,MAAM,EAAE,CAAC,kBAAkB,CAAC,mBAAmB,CAAC;YAChD,qBAAqB,CAAC,oBAAoB,CAC1C,CAAC;IACH,CAAC;IACD,IAAI,WAAW,KAAK,WAAW,CAAC,cAAc,EAAE,CAAC;QAChD,OAAO,CACN,MAAM,EAAE,CAAC,kBAAkB,CAAC,oBAAoB,CAAC;YACjD,qBAAqB,CAAC,oBAAoB,CAC1C,CAAC;IACH,CAAC;IAED,4DAA4D;IAC5D,OAAO,IAAI,CAAC;AACb,CAAC"}

package/src/lib/utilities/src/index.d.ts

@@ -48,3 +48,4 @@ export * from './insurer.match';
 export * from './ba.payout.workshop.days';
 export * from './financial.year';
 export * from './vendor.operations.log';
+export * from './booking.selected.package.gate';

package/src/lib/utilities/src/index.js

@@ -48,4 +48,5 @@ export * from './insurer.match';
 export * from './ba.payout.workshop.days';
 export * from './financial.year';
 export * from './vendor.operations.log';
+export * from './booking.selected.package.gate';
 //# sourceMappingURL=index.js.map

package/src/lib/utilities/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../libs/shared/src/lib/utilities/src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,uBAAuB,CAAC;AACtC,cAAc,sBAAsB,CAAC;AACrC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,YAAY,CAAC;AAC3B,cAAc,oCAAoC,CAAC;AACnD,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC;AACnC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,mBAAmB,CAAC;AAClC,cAAc,mCAAmC,CAAC;AAClD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,kBAAkB,CAAC;AACjC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wCAAwC,CAAC;AACvD,cAAc,2BAA2B,CAAC;AAC1C,cAAc,OAAO,CAAC;AACtB,cAAc,yBAAyB,CAAC;AACxC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,mCAAmC,CAAC;AAClD,cAAc,0BAA0B,CAAC;AACzC,cAAc,kCAAkC,CAAC;AACjD,cAAc,sBAAsB,CAAC;AACrC,cAAc,qCAAqC,CAAC;AACpD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,qCAAqC,CAAC;AACpD,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,uCAAuC,CAAC;AACtD,cAAc,mBAAmB,CAAC;AAClC,cAAc,oCAAoC,CAAC;AACnD,cAAc,4BAA4B,CAAC;AAC3C,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,iCAAiC,CAAC;AAChD,cAAc,oBAAoB,CAAC;AACnC,cAAc,0BAA0B,CAAC;AACzC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,iCAAiC,CAAC;AAChD,cAAc,iBAAiB,CAAC;AAChC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,kBAAkB,CAAC;AACjC,cAAc,yBAAyB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../libs/shared/src/lib/utilities/src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,uBAAuB,CAAC;AACtC,cAAc,sBAAsB,CAAC;AACrC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,YAAY,CAAC;AAC3B,cAAc,oCAAoC,CAAC;AACnD,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC;AACnC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,mBAAmB,CAAC;AAClC,cAAc,mCAAmC,CAAC;AAClD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,kBAAkB,CAAC;AACjC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wCAAwC,CAAC;AACvD,cAAc,2BAA2B,CAAC;AAC1C,cAAc,OAAO,CAAC;AACtB,cAAc,yBAAyB,CAAC;AACxC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,mCAAmC,CAAC;AAClD,cAAc,0BAA0B,CAAC;AACzC,cAAc,kCAAkC,CAAC;AACjD,cAAc,sBAAsB,CAAC;AACrC,cAAc,qCAAqC,CAAC;AACpD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,qCAAqC,CAAC;AACpD,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,uCAAuC,CAAC;AACtD,cAAc,mBAAmB,CAAC;AAClC,cAAc,oCAAoC,CAAC;AACnD,cAAc,4BAA4B,CAAC;AAC3C,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,iCAAiC,CAAC;AAChD,cAAc,oBAAoB,CAAC;AACnC,cAAc,0BAA0B,CAAC;AACzC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,iCAAiC,CAAC;AAChD,cAAc,iBAAiB,CAAC;AAChC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,kBAAkB,CAAC;AACjC,cAAc,yBAAyB,CAAC;AACxC,cAAc,iCAAiC,CAAC"}

package/src/lib/view-models/src/ext.rate.card.d.ts

@@ -53,6 +53,16 @@ export interface IExtRateCardRow {
     included_kms_middle_day: number | null;
     /** `Hourly` only — the KM allowance that accrues per billed hour. */
     max_km_per_hour: number | null;
+    /**
+     * The hourly rate the card is priced at — the portal's "Rate per HR".
+     *
+     * Required to bill an `Hourly` row at all: those carry no `base_amount` and
+     * no `included_kms`, so hours x this rate plus `per_km_rate` for the
+     * distance is the whole fare. Passed through unfiltered, like the other
+     * rate fields, so a non-hourly package that happens to carry one still
+     * reports it rather than silently returning null.
+     */
+    rate_per_hour: number | null;
     extra_hour_rate: number | null;
     extra_km_rate: number | null;
     per_km_rate: number | null;

package/src/lib/view-models/src/vehicle.allocation.conflict.d.ts

@@ -22,7 +22,11 @@ export interface IVehicleAllocationConflict {
  */
 export interface IVehicleAllocationConflictResult {
     windowMinutes: number;
-    /** Server clock at evaluation, UTC. The window is measured from here. */
+    /**
+     * Server clock at evaluation, UTC. Diagnostic only — since AD-3373's
+     * re-anchor the window is measured around the pickup of the duty being
+     * allocated, not from here.
+     */
     evaluatedAt: string;
     conflicts: IVehicleAllocationConflict[];
 }