@7365admin1/layer-common 4.99.0 → 4.99.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/layer-common
 
+## 4.99.1
+
+### Patch Changes
+
+- 1e71b4c: Provider change dialog: only the newest preview is shown (typing a date could leave an older "Straight away" preview on screen), and "On a date" without a date asks for the date. Inventory quantity boxes show "1 pc" / "2 pcs" (the suffix follows the number).
+
 ## 4.99.0
 
 ### Minor Changes
@@ -2969,11 +2975,11 @@
   `utils/console-tier.ts` + `composables/useConsoleTier.ts` mirror the server's
   own rule from two endpoints the console already calls, unprojected:
 
-                                                                                                                                                                                                                                                                                                                                                                                            GET /api/members/user/:user/app/admin    the Seven365 staff membership
-                                                                                                                                                                                                                                                                                                                                                                                            GET /api/roles/id/:role                  that membership's role document
+                                                                                                                                                                                                                                                                                                                                                                                              GET /api/members/user/:user/app/admin    the Seven365 staff membership
+                                                                                                                                                                                                                                                                                                                                                                                              GET /api/roles/id/:role                  that membership's role document
 
-                                                                                                                                                                                                                                                                                                                                                                                            owner  = member.type === "admin" && role.type === "admin" && role.default === true
-                                                                                                                                                                                                                                                                                                                                                                                            staff  = member.type === "admin" && role.type === "admin"
+                                                                                                                                                                                                                                                                                                                                                                                              owner  = member.type === "admin" && role.type === "admin" && role.default === true
+                                                                                                                                                                                                                                                                                                                                                                                              staff  = member.type === "admin" && role.type === "admin"
 
   `role.default` is the marker because it is the only property of a platform
   staff role no API caller can set - `role.controller.ts` validates create and

package/components/InventoryItemDetail.vue

@@ -40,7 +40,7 @@
           <AppCard class="pa-4">
             <div class="text-subtitle-2 mb-2">How many are on the shelf right now?</div>
             <div class="d-flex flex-wrap ga-2">
-              <v-text-field v-model.number="counted" type="number" min="0" label="Counted" :suffix="item.unit" density="comfortable" style="max-width: 160px" :rules="[(v: any) => (Number.isInteger(Number(v)) && Number(v) >= 0) || 'Enter a whole number']" />
+              <v-text-field v-model.number="counted" type="number" min="0" label="Counted" :suffix="unitWord(counted, item.unit)" density="comfortable" style="max-width: 160px" :rules="[(v: any) => (Number.isInteger(Number(v)) && Number(v) >= 0) || 'Enter a whole number']" />
               <v-text-field v-model="reason" label="Reason for the difference" density="comfortable" class="flex-grow-1" :rules="[requiredRule]" placeholder="e.g. 2 broken, found extra box" />
               <v-btn class="text-none screen-btn-primary" variant="flat" :loading="saving" @click="saveCount">Save count</v-btn>
             </div>
@@ -93,7 +93,7 @@ import useUtils from "../composables/useUtils";
 import { inventoryItemMeta } from "../utils/inventory-store-label";
 import { inventoryControls } from "../utils/inventory-presets";
 import { receiptRefText } from "../utils/inventory-receiving";
-import { availableText, inventoryStepsLive, lowStockAlertText, qtyUnit, writeOffLabel } from "../utils/inventory-ack";
+import { availableText, inventoryStepsLive, lowStockAlertText, qtyUnit, unitWord, writeOffLabel } from "../utils/inventory-ack";
 
 const show = defineModel<boolean>({ default: false });
 const props = defineProps({

package/components/InventoryLinesDialog.vue

@@ -71,7 +71,7 @@
               density="comfortable"
               style="max-width: 110px"
               :rules="[qtyRule(line)]"
-              :suffix="unitOf(line.item)"
+              :suffix="unitWord(line.qty, unitOf(line.item))"
             />
             <v-text-field
               v-if="mode === 'receive' && receivingType !== 'CASH'"
@@ -171,7 +171,7 @@
 import useInventory, { pickedDate } from "../composables/useInventory";
 import useUtils from "../composables/useUtils";
 import { normaliseUsedBy, usedByChips, usedByText } from "../utils/inventory-used-by";
-import { availableQty, availableText as availableTextOf, qtyUnit } from "../utils/inventory-ack";
+import { availableQty, availableText as availableTextOf, qtyUnit, unitWord } from "../utils/inventory-ack";
 import { RECEIVING_TYPES, receivingFields, receivingProblem, type TReceivingType } from "../utils/inventory-receiving";
 
 type TMode = "receive" | "issue" | "request" | "return";

package/components/InventoryMyStockTab.vue

@@ -170,7 +170,7 @@
               type="number"
               min="1"
               density="comfortable"
-              :suffix="give.holding?.unit"
+              :suffix="unitWord(give.qty, give.holding?.unit)"
               :rules="[giveQtyRule]"
               hint="Counted in the unit the store issues it in."
               persistent-hint
@@ -201,7 +201,7 @@
               type="number"
               min="1"
               density="comfortable"
-              :suffix="ret.holding.unit"
+              :suffix="unitWord(ret.qty, ret.holding.unit)"
               style="max-width: 200px"
               :rules="[retQtyRule]"
             />
@@ -237,7 +237,7 @@ import useUtils from "../composables/useUtils";
 import useLocalAuth from "../composables/useLocalAuth";
 import { inventoryControls } from "../utils/inventory-presets";
 import { colleagueDraftText, draftCardText } from "../utils/inventory-usage";
-import { ackText, holdText, inventoryStepsLive, qtyUnit } from "../utils/inventory-ack";
+import { ackText, holdText, inventoryStepsLive, qtyUnit, unitWord } from "../utils/inventory-ack";
 
 const props = defineProps({
   store: { type: Object as PropType<TInventoryStore>, required: true },

package/components/InventoryUsageDialog.vue

@@ -22,7 +22,7 @@
             type="number"
             min="1"
             :max="maxQty"
-            :suffix="holding.unit"
+            :suffix="unitWord(qty, holding.unit)"
             density="comfortable"
             style="max-width: 200px"
             :rules="[(v: any) => (Number.isInteger(Number(v)) && Number(v) >= 1 && Number(v) <= maxQty) || `1 to ${maxQty}`]"
@@ -134,7 +134,7 @@
 <script setup lang="ts">
 import useInventory, { pickedDate } from "../composables/useInventory";
 import useUtils from "../composables/useUtils";
-import { inventoryStepsLive, qtyUnit } from "../utils/inventory-ack";
+import { inventoryStepsLive, qtyUnit, unitWord } from "../utils/inventory-ack";
 
 const show = defineModel<boolean>({ default: false });
 const props = defineProps({

package/components/InventoryWriteOffDialog.vue

@@ -23,7 +23,7 @@
             min="1"
             :max="max"
             density="comfortable"
-            :suffix="unit"
+            :suffix="unitWord(qty, unit)"
             style="max-width: 200px"
             :rules="[(v: any) => (Number.isInteger(Number(v)) && Number(v) >= 1) || 'Enter a whole number', (v: any) => Number(v) <= max || `You can write off up to ${max}`]"
           />
@@ -48,7 +48,7 @@
 
 <script setup lang="ts">
 import useInventory from "../composables/useInventory";
-import { qtyUnit, WRITE_OFF_REASONS, writeOffDefaultReason, writeOffLabel, writeOffProblem } from "../utils/inventory-ack";
+import { qtyUnit, unitWord, WRITE_OFF_REASONS, writeOffDefaultReason, writeOffLabel, writeOffProblem } from "../utils/inventory-ack";
 
 /** Write-off (owner 2026-10-03): from the person's own stock (`holding`) or, for a store keeper, from the shelf (`store`). */
 const show = defineModel<boolean>({ default: false });

package/components/SiteProviderChange.vue

@@ -218,18 +218,31 @@ function body() {
   };
 }
 
+/** Only the newest preview may land: typing a date fires several, and they can answer out of order. */
+let previewSeq = 0;
 async function refresh() {
   if (!from.value) return;
+  const mine = ++previewSeq;
+  // "On a date" without a date would preview as "Straight away" - ask for the date instead.
+  if (when.value === "date" && !endDate.value) {
+    preview.value = null;
+    loading.value = false;
+    error.value = "Pick the date for this change.";
+    return;
+  }
   loading.value = true;
   error.value = "";
   try {
-    preview.value = await previewProviderChange(body());
-    replacements.value = preview.value?.replacements ?? [];
+    const res = await previewProviderChange(body());
+    if (mine !== previewSeq) return;
+    preview.value = res;
+    replacements.value = res?.replacements ?? [];
   } catch (e: any) {
+    if (mine !== previewSeq) return;
     preview.value = null;
     error.value = message(e);
   } finally {
-    loading.value = false;
+    if (mine === previewSeq) loading.value = false;
   }
 }
 

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.99.0",
+  "version": "4.99.1",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "//files": "What a consumer extending this layer actually loads. Without this npm ships the whole working tree - the changesets, the CI workflows, the render harness in tools/ and any scratch directory that happened to exist at publish time. Nuxt resolves a layer by directory, so every runtime directory below has to stay listed; adding a new top-level runtime directory means adding it here too.",

package/utils/inventory-ack.ts

@@ -20,11 +20,15 @@ const UNIT_FORMS: Record<string, [string, string]> = {
   metre: ["metre", "metres"], metres: ["metre", "metres"],
 };
 
+/** The unit word for a quantity: "pc" for 1, "pcs" otherwise; kg and unknown units unchanged. */
+export function unitWord(qty: number | string | null | undefined, unit?: string | null) {
+  const forms = UNIT_FORMS[String(unit ?? "").trim().toLowerCase()];
+  return forms ? forms[Math.abs(Number(qty)) === 1 ? 0 : 1] : (unit ?? "");
+}
+
 /** "1 pc", "2 pcs", "1 box", "3 boxes"; kg and unknown units unchanged. */
 export function qtyUnit(qty: number | string | null | undefined, unit?: string | null) {
-  const forms = UNIT_FORMS[String(unit ?? "").trim().toLowerCase()];
-  const word = forms ? forms[Math.abs(Number(qty)) === 1 ? 0 : 1] : (unit ?? "");
-  return `${qty ?? ""} ${word}`.trim();
+  return `${qty ?? ""} ${unitWord(qty, unit)}`.trim();
 }
 
 /** "you hold 2 pcs" or, while some still wait for Received, "you hold 2 pcs (2 waiting for you to tap Received)". */