@autologix-engineering/shared 1.2.387 → 1.2.388

package/package.json

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

package/src/lib/models/src/ltr.payout.model.d.ts

@@ -17,7 +17,8 @@ export declare enum LTRPayoutField {
     SignOffMethod = "signOffMethod",
     SignOffTimestamp = "signOffTimestamp",
     SignatureImageUrl = "signatureImageUrl",
-    LockedReason = "lockedReason"
+    LockedReason = "lockedReason",
+    DirectEntry = "directEntry"
 }
 export interface ILTRPayout {
     [LTRPayoutField.LTRPayoutId]: string;
@@ -37,6 +38,24 @@ export interface ILTRPayout {
     [LTRPayoutField.SignatureImageUrl]?: string;
     /** Set only while `Status` is `LTRPayoutStatus.Locked`. */
     [LTRPayoutField.LockedReason]?: LTRPayoutLockedReason;
+    /**
+     * These rows are one month typed as a summary, not a day-wise log.
+     * (AD-3279)
+     *
+     * Written on every submit, true or false, so the flag describes the rows the
+     * payout holds NOW rather than how the booking was once closed — a day-wise
+     * submit over a direct-entry month clears it.
+     *
+     * The booking's activity log already records that a closure happened and by
+     * what means, but a log row cannot be read by the screens that need this
+     * answer while they are drawing. Direct entry produces exactly one synthetic
+     * row, and without this flag the day-wise tab drew that row as though a
+     * driver had logged a single day, the chooser offered "use the driver app's
+     * logs" for a month no driver had touched, and the replace-the-driver's-
+     * record warning fired on a month that never had one. (QA run 3, items 10,
+     * 11 and 18)
+     */
+    [LTRPayoutField.DirectEntry]?: boolean;
 }
 export interface ILTRBillingSummary {
     lineItems: INumberedInvoiceLineItem[];

package/src/lib/models/src/ltr.payout.model.js

@@ -15,6 +15,7 @@ export var LTRPayoutField;
     LTRPayoutField["SignOffTimestamp"] = "signOffTimestamp";
     LTRPayoutField["SignatureImageUrl"] = "signatureImageUrl";
     LTRPayoutField["LockedReason"] = "lockedReason";
+    LTRPayoutField["DirectEntry"] = "directEntry";
 })(LTRPayoutField || (LTRPayoutField = {}));
 export var LTRPayoutRowField;
 (function (LTRPayoutRowField) {

package/src/lib/models/src/ltr.payout.model.js.map

@@ -1 +1 @@
-{"version":3,"file":"ltr.payout.model.js","sourceRoot":"","sources":["../../../../../../../libs/shared/src/lib/models/src/ltr.payout.model.ts"],"names":[],"mappings":"AASA,MAAM,CAAN,IAAY,cAgBX;AAhBD,WAAY,cAAc;IACzB,6CAA2B,CAAA;IAC3B,iDAA+B,CAAA;IAC/B,qCAAmB,CAAA;IACnB,yCAAuB,CAAA;IACvB,yCAAuB,CAAA;IACvB,mDAAiC,CAAA;IACjC,qDAAmC,CAAA;IACnC,uCAAqB,CAAA;IACrB,qCAAmB,CAAA;IACnB,mDAAiC,CAAA;IACjC,mCAAiB,CAAA;IACjB,iDAA+B,CAAA;IAC/B,uDAAqC,CAAA;IACrC,yDAAuC,CAAA;IACvC,+CAA6B,CAAA;AAC9B,CAAC,EAhBW,cAAc,KAAd,cAAc,QAgBzB;AAsCD,MAAM,CAAN,IAAY,iBA2FX;AA3FD,WAAY,iBAAiB;IAC5B,oCAAe,CAAA;IACf,iEAA4C,CAAA;IAC5C,6DAAwC,CAAA;IACxC,iDAA4B,CAAA;IAC5B,yCAAoB,CAAA;IACpB,qCAAgB,CAAA;IAChB,wCAAmB,CAAA;IACnB,kCAAa,CAAA;IACb,wCAAmB,CAAA;IACnB,sCAAiB,CAAA;IACjB,+CAA0B,CAAA;IAC1B,wCAAmB,CAAA;IACnB,2CAAsB,CAAA;IACtB,iDAA4B,CAAA;IAC5B,yDAAoC,CAAA;IACpC,iDAA4B,CAAA;IAC5B,0EAAqD,CAAA;IACrD,uEAAkD,CAAA;IAClD,2CAAsB,CAAA;IACtB,8FAAyE,CAAA;IACzE,6GAAwF,CAAA;IACxF,qDAAgC,CAAA;IAChC,mDAA8B,CAAA;IAC9B,uDAAkC,CAAA;IAClC,6CAAwB,CAAA;IACxB;;;;;;;OAOG;IACH,wDAAmC,CAAA;IACnC,4DAAuC,CAAA;IACvC,qDAAgC,CAAA;IAChC,gEAA2C,CAAA;IAC3C,oEAA+C,CAAA;IAC/C,yDAAoC,CAAA;IACpC,oEAA+C,CAAA;IAC/C,wEAAmD,CAAA;IACnD,+CAA0B,CAAA;IAC1B,iDAA4B,CAAA;IAC5B,uDAAkC,CAAA;IAClC,yDAAoC,CAAA;IACpC,qDAAgC,CAAA;IAChC,yDAAoC,CAAA;IACpC,sDAAiC,CAAA;IACjC,iDAA4B,CAAA;IAC5B,qEAAgD,CAAA;IAChD,uEAAkD,CAAA;IAClD,0DAAqC,CAAA;IACrC,0DAAqC,CAAA;IACrC,sDAAiC,CAAA;IACjC,sDAAiC,CAAA;IACjC,kDAA6B,CAAA;IAC7B,kDAA6B,CAAA;IAC7B,4DAAuC,CAAA;IACvC,4DAAuC,CAAA;IACvC,sDAAiC,CAAA;IACjC,wDAAmC,CAAA;IACnC,4CAAuB,CAAA;IACvB;;;;;;;;;OASG;IACH,kDAA6B,CAAA;IAC7B,4CAA4C;IAC5C,oDAA+B,CAAA;IAC/B,gDAA2B,CAAA;IAC3B,iEAA4C,CAAA;IAC5C,mEAA8C,CAAA;IAC9C;;;;;;;;;;OAUG;IACH,wCAAmB,CAAA;AACpB,CAAC,EA3FW,iBAAiB,KAAjB,iBAAiB,QA2F5B"}
+{"version":3,"file":"ltr.payout.model.js","sourceRoot":"","sources":["../../../../../../../libs/shared/src/lib/models/src/ltr.payout.model.ts"],"names":[],"mappings":"AASA,MAAM,CAAN,IAAY,cAiBX;AAjBD,WAAY,cAAc;IACzB,6CAA2B,CAAA;IAC3B,iDAA+B,CAAA;IAC/B,qCAAmB,CAAA;IACnB,yCAAuB,CAAA;IACvB,yCAAuB,CAAA;IACvB,mDAAiC,CAAA;IACjC,qDAAmC,CAAA;IACnC,uCAAqB,CAAA;IACrB,qCAAmB,CAAA;IACnB,mDAAiC,CAAA;IACjC,mCAAiB,CAAA;IACjB,iDAA+B,CAAA;IAC/B,uDAAqC,CAAA;IACrC,yDAAuC,CAAA;IACvC,+CAA6B,CAAA;IAC7B,6CAA2B,CAAA;AAC5B,CAAC,EAjBW,cAAc,KAAd,cAAc,QAiBzB;AAwDD,MAAM,CAAN,IAAY,iBA2FX;AA3FD,WAAY,iBAAiB;IAC5B,oCAAe,CAAA;IACf,iEAA4C,CAAA;IAC5C,6DAAwC,CAAA;IACxC,iDAA4B,CAAA;IAC5B,yCAAoB,CAAA;IACpB,qCAAgB,CAAA;IAChB,wCAAmB,CAAA;IACnB,kCAAa,CAAA;IACb,wCAAmB,CAAA;IACnB,sCAAiB,CAAA;IACjB,+CAA0B,CAAA;IAC1B,wCAAmB,CAAA;IACnB,2CAAsB,CAAA;IACtB,iDAA4B,CAAA;IAC5B,yDAAoC,CAAA;IACpC,iDAA4B,CAAA;IAC5B,0EAAqD,CAAA;IACrD,uEAAkD,CAAA;IAClD,2CAAsB,CAAA;IACtB,8FAAyE,CAAA;IACzE,6GAAwF,CAAA;IACxF,qDAAgC,CAAA;IAChC,mDAA8B,CAAA;IAC9B,uDAAkC,CAAA;IAClC,6CAAwB,CAAA;IACxB;;;;;;;OAOG;IACH,wDAAmC,CAAA;IACnC,4DAAuC,CAAA;IACvC,qDAAgC,CAAA;IAChC,gEAA2C,CAAA;IAC3C,oEAA+C,CAAA;IAC/C,yDAAoC,CAAA;IACpC,oEAA+C,CAAA;IAC/C,wEAAmD,CAAA;IACnD,+CAA0B,CAAA;IAC1B,iDAA4B,CAAA;IAC5B,uDAAkC,CAAA;IAClC,yDAAoC,CAAA;IACpC,qDAAgC,CAAA;IAChC,yDAAoC,CAAA;IACpC,sDAAiC,CAAA;IACjC,iDAA4B,CAAA;IAC5B,qEAAgD,CAAA;IAChD,uEAAkD,CAAA;IAClD,0DAAqC,CAAA;IACrC,0DAAqC,CAAA;IACrC,sDAAiC,CAAA;IACjC,sDAAiC,CAAA;IACjC,kDAA6B,CAAA;IAC7B,kDAA6B,CAAA;IAC7B,4DAAuC,CAAA;IACvC,4DAAuC,CAAA;IACvC,sDAAiC,CAAA;IACjC,wDAAmC,CAAA;IACnC,4CAAuB,CAAA;IACvB;;;;;;;;;OASG;IACH,kDAA6B,CAAA;IAC7B,4CAA4C;IAC5C,oDAA+B,CAAA;IAC/B,gDAA2B,CAAA;IAC3B,iEAA4C,CAAA;IAC5C,mEAA8C,CAAA;IAC9C;;;;;;;;;;OAUG;IACH,wCAAmB,CAAA;AACpB,CAAC,EA3FW,iBAAiB,KAAjB,iBAAiB,QA2F5B"}

package/src/lib/utilities/src/ba.payout.contract.selection.d.ts

@@ -1,38 +1,4 @@
 import { IBAContract } from '../../models/src/index';
-/**
- * Which BA contract a BA Payout row belongs to — AD-3098 QA re-open.
- *
- * The BA Payout template and the upload validator disagreed about contracts,
- * and the disagreement made a whole month's payout unuploadable:
- *
- *  • The template emitted one row per contract overlapping the period with no
- *    status filter at all, so a Cancelled contract got a row.
- *  • The validator hashed contracts into `Map<contractCode, contract>` —
- *    last write wins. `baContractCode` is NOT unique: an older extend flow
- *    minted duplicate `E<n>` codes (AD-3227, AD-3097), and a contract that is
- *    cancelled and re-raised keeps its code. On staging, `1004E1` exists twice
- *    for BA1002 — one Cancelled, one Surrendered — so the validator compared
- *    the template's Cancelled row against the Surrendered record and reported
- *    "Contract Start Date mismatch. Expected: 01/12/2025, Found: 02/05/2026".
- *    Nothing the user could type would satisfy it.
- *
- * The rule here is the single answer both sides now use, so they cannot drift:
- *
- *  1. Cancelled contracts are not payable and are dropped outright. This is
- *     the same predicate `loadReportContracts` applies to the RM and SD
- *     schedules and `findBAContractForBooking` applies to bookings, so the
- *     payout, the schedules and the booking attribution agree about which
- *     contracts exist.
- *  2. The same contract keyed in twice — same BA, same code, same vehicle —
- *     is ONE contract, collapsed to its most recently edited record. That is
- *     the tie-break `groupDuplicateContracts` already uses in the report
- *     builders. Without it the template would print the row twice and the
- *     payout would collect the RM twice.
- *  3. The same code on DIFFERENT vehicles stays as separate contracts (BA1000
- *     has six rows coded '1000' on six vehicles). Those are resolved by the
- *     vehicle registration carried on the uploaded row, which is the column
- *     that actually distinguishes them.
- */
 export declare const normalizeBAContractCode: (raw: unknown) => string;
 /**
  * Registrations are compared without spaces or punctuation: the template
@@ -77,3 +43,120 @@ export declare function selectBAPayoutContracts(contracts: IBAContract[] | undef
 export declare function resolveBAPayoutContract(candidates: IBAContract[] | undefined | null, criteria?: {
     vehicleRegistration?: unknown;
 }): IBAContract | null;
+/**
+ * Does this contract overlap the payout period?
+ *
+ * `periodStartIST` / `periodEndIST` are the period bounds already shifted into
+ * IST. A contract with no end date is open-ended and extends past the period.
+ * A contract with no *start* date cannot be judged and is kept, so that the
+ * template and the upload guard make the same call about it rather than one of
+ * them silently dropping it.
+ */
+export declare function isBAPayoutContractInPeriod(contract: IBAContract, periodStartIST: Date, periodEndIST: Date): boolean;
+/**
+ * The BA contracts that get a row in one payout period's template — and,
+ * therefore, exactly the rows the upload's completeness guard may demand back.
+ *
+ * AD-3098 QA re-open, second round. PR #3951 taught the template generator to
+ * run its contracts through `selectBAPayoutContracts` (dropping Cancelled
+ * records) but left the "rows were deleted" guard in
+ * `process.business.associate.payout.upload.controller.ts` building its
+ * expected set straight from `ba.contractDetails` with no status filter. The
+ * template then omitted a Cancelled contract and the guard immediately
+ * rejected the file the application had just produced:
+ *
+ *   "Some BA rows are missing from the uploaded Excel (it looks like rows were
+ *    deleted). Please re-download the template ... Missing: BA1061
+ *    (PARTHASARTHY YN) - 1022E2"
+ *
+ * Re-downloading omitted the row again, so there was no way through at all —
+ * 21 (context, period) combinations on staging were blocked outright.
+ *
+ * Both halves now call THIS function, which is the only place the question
+ * "which contracts does this period have?" is answered. Duplicating the
+ * status filter and the period filter is what let them drift; there is now
+ * nothing to keep in step by hand.
+ *
+ * Period bounds are already IST-shifted; pass null/undefined for either to
+ * select without a period filter.
+ */
+export declare function selectBAPayoutContractsForPeriod(contracts: IBAContract[] | undefined | null, periodStartIST?: Date | null, periodEndIST?: Date | null): IBAContract[];
+/** A stored contract date as its IST calendar day, `YYYY-MM-DD`. */
+export declare const istDayKey: (value: unknown) => string | null;
+/**
+ * A date as it arrives from an uploaded payout sheet, as `YYYY-MM-DD`.
+ *
+ * The template writes `DD/MM/YYYY`, but a cell a user retyped — or one Excel
+ * re-serialised — routinely comes back as `YYYY-MM-DD`, with or without a time
+ * part. Both are accepted; anything else is `null` and simply does not match.
+ */
+export declare const parseUploadedDayKey: (raw: unknown) => string | null;
+/**
+ * Does this uploaded row actually describe a CANCELLED record of its Contract
+ * ID, rather than the live record it was resolved to?
+ *
+ * AD-3098, Jahnavi's original report. `baContractCode` is not unique: on
+ * staging `1004E1` exists twice for BA1002 — Surrendered 2025-12-01 - 2026-05-01
+ * and Cancelled 2026-05-02 - 2027-03-02, on the same BA and the same vehicle.
+ * `resolveBAPayoutContract` deliberately drops the Cancelled record, so a row
+ * carrying the Cancelled record's dates was compared against the Surrendered
+ * sibling and the user was told
+ *
+ *   "Contract Start Date mismatch. Expected: 01/12/2025, Found: 2026-05-02"
+ *
+ * which names a contract the row was never about and cannot be satisfied by
+ * any edit to the sheet. When the row's own Contract Start Date identifies a
+ * Cancelled record instead, the honest message is that the contract is
+ * cancelled.
+ *
+ * The Contract Start Date is the discriminator on purpose: it is the field
+ * that differs between records sharing a code, and the only one a hand-built
+ * row reliably carries verbatim. But a start date alone does NOT identify a
+ * contract, and this check used to rely on it alone — the bug AD-3098's review
+ * caught. `candidates` is whatever the caller keyed under the row's Contract
+ * ID, and the upload validator keys its map by contract code across the WHOLE
+ * context: every BA, every vehicle. So the check could fire on a Cancelled
+ * record belonging to some unrelated BA or vehicle that merely started on the
+ * same day.
+ *
+ * That matters because firing is destructive to the rest of the report: the
+ * caller then treats the row as having no contract at all and skips the checks
+ * for BA linkage, vehicle, city, garage, end date, closure date and working
+ * days. A row whose real problem is a wrong BA ID or a wrong vehicle would have
+ * been told only "this contract is cancelled" — true of some other BA's
+ * contract, and no help at all.
+ *
+ * So the row must identify the contract on all three parts of its identity —
+ * BA ID, Contract ID, vehicle — before a Cancelled record's date match is
+ * treated as conclusive. That triple is exactly `selectBAPayoutContracts`'
+ * collapse key (`baId|code|vaId`) and exactly what the template emits per row.
+ * The comparison is against the row's OWN BA ID and Vehicle columns, not the
+ * resolved record's: the whole point is that a row naming the wrong BA or the
+ * wrong vehicle must fall through to that error instead of being absorbed here.
+ *
+ * A row missing either column returns false and is reported as "Missing BA ID"
+ * / "Missing Vehicle" — messages the user can act on — rather than being
+ * guessed at.
+ *
+ * What is left is genuinely narrow: it fires only when the row's start date
+ * does NOT match the record it resolved to (so only on rows that were going to
+ * be reported anyway) and DOES match, exactly, a Cancelled record on the same
+ * BA and the same vehicle. It can still displace the date-mismatch messages for
+ * such a row, which is the intent; it can no longer displace anything else.
+ */
+export interface BAPayoutContractCandidate {
+    contract: IBAContract;
+    /**
+     * The BA ID as the sheet spells it (the BA code sequence, e.g. "BA1002").
+     * The contract entity carries only the BA's internal uuid, so the caller
+     * that built the code -> contracts map supplies the sheet-level id.
+     */
+    baId?: unknown;
+}
+/** The three columns that identify which contract an uploaded row is about. */
+export interface BAPayoutUploadedRowIdentity {
+    baId?: unknown;
+    vehicleRegistration?: unknown;
+    contractStartDate?: unknown;
+}
+export declare function uploadedRowNamesCancelledRecord(candidates: readonly BAPayoutContractCandidate[] | undefined | null, resolved: IBAContract | null | undefined, row: BAPayoutUploadedRowIdentity): boolean;

package/src/lib/utilities/src/ba.payout.contract.selection.js

@@ -30,12 +30,27 @@ import { BAContractStatus } from '../../enums/src/index';
  *     the tie-break `groupDuplicateContracts` already uses in the report
  *     builders. Without it the template would print the row twice and the
  *     payout would collect the RM twice.
- *  3. The same code on DIFFERENT vehicles stays as separate contracts (BA1000
- *     has six rows coded '1000' on six vehicles). Those are resolved by the
- *     vehicle registration carried on the uploaded row, which is the column
- *     that actually distinguishes them.
+ *  3. The same code on DIFFERENT vehicles stays as separate contracts. Those
+ *     are resolved by the vehicle registration carried on the uploaded row,
+ *     which is the column that actually distinguishes them.
+ *
+ * On the scope of the identity: a code bucket here is per business context —
+ * the validator builds its map from one context's BAs. Code '1000' exists eight
+ * times on staging, but in eight different contexts, one BA and one vehicle
+ * each; within any single context no code is currently shared across two BAs or
+ * two vehicles (measured 2026-09-28, read-only). The reuse that DOES exist
+ * inside a context is AD-3416's: `generateExtendedContractCode()` re-mints the
+ * same `E<n>` code on the same BA and the same vehicle. So BA and vehicle are
+ * checked defensively, not because the collision is common — but a check that
+ * suppresses other checks must not be able to fire on a contract the row is not
+ * about. See `uploadedRowNamesCancelledRecord`.
+ */
+/**
+ * An identifier as a sheet spells it — trimmed and upper-cased. Contract codes
+ * and BA IDs are both short, human-typed keys and are compared the same way.
  */
-export const normalizeBAContractCode = (raw) => raw == null ? '' : String(raw).trim().toUpperCase();
+const normalizeSheetIdentifier = (raw) => raw == null ? '' : String(raw).trim().toUpperCase();
+export const normalizeBAContractCode = normalizeSheetIdentifier;
 /**
  * Registrations are compared without spaces or punctuation: the template
  * writes the stored value verbatim, but a user who retypes a cell may enter
@@ -134,4 +149,132 @@ export function resolveBAPayoutContract(candidates, criteria) {
         : eligible;
     return pool.reduce((best, c) => (isNewerRecord(c, best) ? c : best));
 }
+/** IST is UTC+5:30. The BA payout period bounds are stored as the UTC instants
+ * of IST month boundaries, so every comparison here is done on the IST shift of
+ * both sides — the same arithmetic the payout template, the upload validator
+ * and the row calculator have always used. */
+const IST_OFFSET_MS = 5.5 * 60 * 60 * 1000;
+const toIST = (value) => {
+    if (value === null || value === undefined || value === '')
+        return null;
+    const ms = new Date(value).getTime();
+    return Number.isNaN(ms) ? null : new Date(ms + IST_OFFSET_MS);
+};
+/**
+ * Does this contract overlap the payout period?
+ *
+ * `periodStartIST` / `periodEndIST` are the period bounds already shifted into
+ * IST. A contract with no end date is open-ended and extends past the period.
+ * A contract with no *start* date cannot be judged and is kept, so that the
+ * template and the upload guard make the same call about it rather than one of
+ * them silently dropping it.
+ */
+export function isBAPayoutContractInPeriod(contract, periodStartIST, periodEndIST) {
+    const startIST = toIST(contract?.[BAContractField.ContractStartDate]);
+    if (!startIST)
+        return true;
+    const endIST = toIST(contract[BAContractField.ContractEndDate]);
+    const surrenderIST = toIST(contract[BAContractField.SurrenderEffectiveDate]);
+    // Ended, or surrendered, before the period even started.
+    if (endIST && endIST < periodStartIST)
+        return false;
+    if (surrenderIST && surrenderIST < periodStartIST)
+        return false;
+    // Effective end: the surrender date when it lands inside the period,
+    // otherwise the contract end (null = open-ended, still matches).
+    const effectiveEnd = surrenderIST && surrenderIST <= periodEndIST ? surrenderIST : endIST;
+    return (startIST <= periodEndIST &&
+        (effectiveEnd === null || effectiveEnd >= periodStartIST));
+}
+/**
+ * The BA contracts that get a row in one payout period's template — and,
+ * therefore, exactly the rows the upload's completeness guard may demand back.
+ *
+ * AD-3098 QA re-open, second round. PR #3951 taught the template generator to
+ * run its contracts through `selectBAPayoutContracts` (dropping Cancelled
+ * records) but left the "rows were deleted" guard in
+ * `process.business.associate.payout.upload.controller.ts` building its
+ * expected set straight from `ba.contractDetails` with no status filter. The
+ * template then omitted a Cancelled contract and the guard immediately
+ * rejected the file the application had just produced:
+ *
+ *   "Some BA rows are missing from the uploaded Excel (it looks like rows were
+ *    deleted). Please re-download the template ... Missing: BA1061
+ *    (PARTHASARTHY YN) - 1022E2"
+ *
+ * Re-downloading omitted the row again, so there was no way through at all —
+ * 21 (context, period) combinations on staging were blocked outright.
+ *
+ * Both halves now call THIS function, which is the only place the question
+ * "which contracts does this period have?" is answered. Duplicating the
+ * status filter and the period filter is what let them drift; there is now
+ * nothing to keep in step by hand.
+ *
+ * Period bounds are already IST-shifted; pass null/undefined for either to
+ * select without a period filter.
+ */
+export function selectBAPayoutContractsForPeriod(contracts, periodStartIST, periodEndIST) {
+    const eligible = selectBAPayoutContracts(contracts);
+    if (!periodStartIST || !periodEndIST)
+        return eligible;
+    return eligible.filter((contract) => isBAPayoutContractInPeriod(contract, periodStartIST, periodEndIST));
+}
+/** A stored contract date as its IST calendar day, `YYYY-MM-DD`. */
+export const istDayKey = (value) => {
+    const ist = toIST(value);
+    if (!ist)
+        return null;
+    const y = ist.getUTCFullYear();
+    const m = String(ist.getUTCMonth() + 1).padStart(2, '0');
+    const d = String(ist.getUTCDate()).padStart(2, '0');
+    return `${y}-${m}-${d}`;
+};
+/**
+ * A date as it arrives from an uploaded payout sheet, as `YYYY-MM-DD`.
+ *
+ * The template writes `DD/MM/YYYY`, but a cell a user retyped — or one Excel
+ * re-serialised — routinely comes back as `YYYY-MM-DD`, with or without a time
+ * part. Both are accepted; anything else is `null` and simply does not match.
+ */
+export const parseUploadedDayKey = (raw) => {
+    if (raw === null || raw === undefined)
+        return null;
+    if (raw instanceof Date)
+        return istDayKey(raw);
+    const text = String(raw).trim();
+    if (!text)
+        return null;
+    const iso = /^(\d{4})-(\d{1,2})-(\d{1,2})(?:[T\s].*)?$/.exec(text);
+    if (iso) {
+        return `${iso[1]}-${iso[2].padStart(2, '0')}-${iso[3].padStart(2, '0')}`;
+    }
+    const dmy = /^(\d{1,2})[/-](\d{1,2})[/-](\d{4})$/.exec(text);
+    if (dmy) {
+        return `${dmy[3]}-${dmy[2].padStart(2, '0')}-${dmy[1].padStart(2, '0')}`;
+    }
+    return null;
+};
+export function uploadedRowNamesCancelledRecord(candidates, resolved, row) {
+    if (!candidates?.length || !resolved)
+        return false;
+    const rowStart = parseUploadedDayKey(row?.contractStartDate);
+    if (!rowStart)
+        return false;
+    // Only rows the resolved record already contradicts.
+    const resolvedStart = istDayKey(resolved[BAContractField.ContractStartDate]);
+    if (resolvedStart === null || resolvedStart === rowStart)
+        return false;
+    // The row has to say WHICH contract it means. Without both identity
+    // columns there is nothing to scope against, and guessing is how this
+    // check would suppress the very errors that name the missing column.
+    const rowBaId = normalizeSheetIdentifier(row?.baId);
+    const rowRegistration = normalizeVehicleRegistration(row?.vehicleRegistration);
+    if (!rowBaId || !rowRegistration)
+        return false;
+    return candidates.some(({ contract, baId }) => !!contract &&
+        !isBAPayoutEligibleContract(contract) &&
+        normalizeSheetIdentifier(baId) === rowBaId &&
+        registrationOf(contract) === rowRegistration &&
+        istDayKey(contract[BAContractField.ContractStartDate]) === rowStart);
+}
 //# sourceMappingURL=ba.payout.contract.selection.js.map

package/src/lib/utilities/src/ba.payout.contract.selection.js.map

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

package/src/lib/utilities/src/normalize.phone.number.d.ts

@@ -1,7 +1,8 @@
 /**
- * Normalises a raw phone value to E.164 (+91XXXXXXXXXX) format.
+ * Normalises a raw phone value to E.164 (`+<country><subscriber>`) format.
  * Returns null for blank, non-numeric, or out-of-range inputs.
- * Default country code is +91 (India).
+ * Default country code is +91 (India) — applied only to numbers that do *not*
+ * already carry one of their own.
  *
  * **Every number handed to the SMS gateway must come through here.** The
  * gateway refuses anything that is not exactly 13 characters with `91` in
@@ -10,6 +11,16 @@
  * as a failed SMS log, so the caller is told the message went out and nothing
  * arrives.
  *
+ * A leading `+` (or the `00` international trunk prefix) is the operator saying
+ * "this number already carries its own country code", and is honoured as such.
+ * It has to be: every digit-only rule below is length-based, and for a good
+ * many countries the country code plus the subscriber number comes to exactly
+ * ten digits — Singapore (+65), Australia (+61), Denmark (+45), Norway (+47),
+ * New Zealand (+64) among them. Dropping the `+` made `+65-83663164` look like
+ * a bare Indian ten-digit number, so it went out as `+916583663164`: a number
+ * that does not belong to the guest and may well belong to somebody else
+ * (ZD-71141).
+ *
  * Lives in the shared package rather than beside the alert handlers because the
  * gatekeeper's OTP paths need it too, and a second copy over there is how the
  * two would drift apart on which shapes they accept.

package/src/lib/utilities/src/normalize.phone.number.js

@@ -1,7 +1,8 @@
 /**
- * Normalises a raw phone value to E.164 (+91XXXXXXXXXX) format.
+ * Normalises a raw phone value to E.164 (`+<country><subscriber>`) format.
  * Returns null for blank, non-numeric, or out-of-range inputs.
- * Default country code is +91 (India).
+ * Default country code is +91 (India) — applied only to numbers that do *not*
+ * already carry one of their own.
  *
  * **Every number handed to the SMS gateway must come through here.** The
  * gateway refuses anything that is not exactly 13 characters with `91` in
@@ -10,10 +11,23 @@
  * as a failed SMS log, so the caller is told the message went out and nothing
  * arrives.
  *
+ * A leading `+` (or the `00` international trunk prefix) is the operator saying
+ * "this number already carries its own country code", and is honoured as such.
+ * It has to be: every digit-only rule below is length-based, and for a good
+ * many countries the country code plus the subscriber number comes to exactly
+ * ten digits — Singapore (+65), Australia (+61), Denmark (+45), Norway (+47),
+ * New Zealand (+64) among them. Dropping the `+` made `+65-83663164` look like
+ * a bare Indian ten-digit number, so it went out as `+916583663164`: a number
+ * that does not belong to the guest and may well belong to somebody else
+ * (ZD-71141).
+ *
  * Lives in the shared package rather than beside the alert handlers because the
  * gatekeeper's OTP paths need it too, and a second copy over there is how the
  * two would drift apart on which shapes they accept.
  */
+/** Longest and shortest digit strings E.164 allows. */
+const MIN_E164_DIGITS = 10;
+const MAX_E164_DIGITS = 15;
 export function normalizePhoneNumber(phone, countryCode = '+91') {
     if (phone === null || phone === undefined) {
         return null;
@@ -27,6 +41,19 @@ export function normalizePhoneNumber(phone, countryCode = '+91') {
     if (!digits) {
         return null;
     }
+    // Brackets, spaces and hyphens are decoration; the `+` is not. Strip the
+    // decoration first so `(+91) 1234567890` is recognised as carrying a code.
+    const marker = raw.replace(/[^\d+]/g, '');
+    const carriesOwnCountryCode = marker.startsWith('+') || /^00[1-9]/.test(marker);
+    if (carriesOwnCountryCode) {
+        // `+` and `00` are alternative spellings of the same thing, and no
+        // country code starts with a zero, so any leading zeros are prefix.
+        const international = digits.replace(/^0+/, '');
+        return international.length >= MIN_E164_DIGITS &&
+            international.length <= MAX_E164_DIGITS
+            ? `+${international}`
+            : null;
+    }
     if (digits.length === 10) {
         return `+${ccDigits}${digits}`;
     }
@@ -37,7 +64,7 @@ export function normalizePhoneNumber(phone, countryCode = '+91') {
     if (noLeadingZero.length === 10) {
         return `+${ccDigits}${noLeadingZero}`;
     }
-    if (digits.length >= 10 && digits.length <= 15) {
+    if (digits.length >= MIN_E164_DIGITS && digits.length <= MAX_E164_DIGITS) {
         return `+${digits}`;
     }
     return null;

package/src/lib/utilities/src/normalize.phone.number.js.map

@@ -1 +1 @@
-{"version":3,"file":"normalize.phone.number.js","sourceRoot":"","sources":["../../../../../../../libs/shared/src/lib/utilities/src/normalize.phone.number.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,oBAAoB,CACnC,KAAyC,EACzC,cAAsB,KAAK;IAE3B,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QAC3C,OAAO,IAAI,CAAC;IACb,CAAC;IACD,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;IACjC,IAAI,CAAC,GAAG,EAAE,CAAC;QACV,OAAO,IAAI,CAAC;IACb,CAAC;IAED,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC;IACxD,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACtC,IAAI,CAAC,MAAM,EAAE,CAAC;QACb,OAAO,IAAI,CAAC;IACb,CAAC;IAED,IAAI,MAAM,CAAC,MAAM,KAAK,EAAE,EAAE,CAAC;QAC1B,OAAO,IAAI,QAAQ,GAAG,MAAM,EAAE,CAAC;IAChC,CAAC;IAED,IAAI,MAAM,CAAC,MAAM,KAAK,EAAE,IAAI,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QACzD,OAAO,IAAI,MAAM,EAAE,CAAC;IACrB,CAAC;IAED,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAChD,IAAI,aAAa,CAAC,MAAM,KAAK,EAAE,EAAE,CAAC;QACjC,OAAO,IAAI,QAAQ,GAAG,aAAa,EAAE,CAAC;IACvC,CAAC;IAED,IAAI,MAAM,CAAC,MAAM,IAAI,EAAE,IAAI,MAAM,CAAC,MAAM,IAAI,EAAE,EAAE,CAAC;QAChD,OAAO,IAAI,MAAM,EAAE,CAAC;IACrB,CAAC;IAED,OAAO,IAAI,CAAC;AACb,CAAC"}
+{"version":3,"file":"normalize.phone.number.js","sourceRoot":"","sources":["../../../../../../../libs/shared/src/lib/utilities/src/normalize.phone.number.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAEH,uDAAuD;AACvD,MAAM,eAAe,GAAG,EAAE,CAAC;AAC3B,MAAM,eAAe,GAAG,EAAE,CAAC;AAE3B,MAAM,UAAU,oBAAoB,CACnC,KAAyC,EACzC,cAAsB,KAAK;IAE3B,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QAC3C,OAAO,IAAI,CAAC;IACb,CAAC;IACD,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;IACjC,IAAI,CAAC,GAAG,EAAE,CAAC;QACV,OAAO,IAAI,CAAC;IACb,CAAC;IAED,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC;IACxD,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACtC,IAAI,CAAC,MAAM,EAAE,CAAC;QACb,OAAO,IAAI,CAAC;IACb,CAAC;IAED,yEAAyE;IACzE,2EAA2E;IAC3E,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;IAC1C,MAAM,qBAAqB,GAC1B,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAEnD,IAAI,qBAAqB,EAAE,CAAC;QAC3B,mEAAmE;QACnE,oEAAoE;QACpE,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAChD,OAAO,aAAa,CAAC,MAAM,IAAI,eAAe;YAC7C,aAAa,CAAC,MAAM,IAAI,eAAe;YACvC,CAAC,CAAC,IAAI,aAAa,EAAE;YACrB,CAAC,CAAC,IAAI,CAAC;IACT,CAAC;IAED,IAAI,MAAM,CAAC,MAAM,KAAK,EAAE,EAAE,CAAC;QAC1B,OAAO,IAAI,QAAQ,GAAG,MAAM,EAAE,CAAC;IAChC,CAAC;IAED,IAAI,MAAM,CAAC,MAAM,KAAK,EAAE,IAAI,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QACzD,OAAO,IAAI,MAAM,EAAE,CAAC;IACrB,CAAC;IAED,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAChD,IAAI,aAAa,CAAC,MAAM,KAAK,EAAE,EAAE,CAAC;QACjC,OAAO,IAAI,QAAQ,GAAG,aAAa,EAAE,CAAC;IACvC,CAAC;IAED,IAAI,MAAM,CAAC,MAAM,IAAI,eAAe,IAAI,MAAM,CAAC,MAAM,IAAI,eAAe,EAAE,CAAC;QAC1E,OAAO,IAAI,MAAM,EAAE,CAAC;IACrB,CAAC;IAED,OAAO,IAAI,CAAC;AACb,CAAC"}