@7365admin1/layer-common 4.90.2-staging.491 → 4.90.3

package/components/InventoryItemDetail.vue

@@ -79,7 +79,6 @@ import useFile from "../composables/useFile";
 import useUtils from "../composables/useUtils";
 import { inventoryItemMeta } from "../utils/inventory-store-label";
 import { inventoryControls } from "../utils/inventory-presets";
-import { receiptRefText } from "../utils/inventory-receiving";
 
 const show = defineModel<boolean>({ default: false });
 const props = defineProps({
@@ -108,7 +107,7 @@ const formatDate = (d: string) => standardFormatDate(d);
 
 function describe(t: TInventoryTransaction) {
   const parts: string[] = [];
-  if (t.type === "receive") parts.push(t.supplier || "", receiptRefText(t));
+  if (t.type === "receive") parts.push(t.supplier || "", t.reference ? `PO ${t.reference}` : "");
   const who = (t as any).holderLabel || t.holderName;
   if (t.type === "issue") parts.push(`${t.qty} to ${who}`, t.reference || "");
   if (t.type === "return") parts.push(`${t.qty} from ${who}`);

package/components/InventoryLinesDialog.vue

@@ -10,13 +10,6 @@
       <v-card-text class="screen-modal__body">
         <p class="text-body-2 text-medium-emphasis mb-4">{{ copy.help }}</p>
         <v-form ref="form">
-          <template v-if="mode === 'receive'">
-            <InputLabel title="How did this stock come in?" required class="mb-1" />
-            <v-btn-toggle v-model="receivingType" mandatory divided variant="outlined" density="comfortable" class="mb-1 receiving-type">
-              <v-btn v-for="t in RECEIVING_TYPES" :key="t.value" :value="t.value" class="text-none">{{ t.title }}</v-btn>
-            </v-btn-toggle>
-            <p class="text-caption text-medium-emphasis mb-3">{{ receivingHelp }}</p>
-          </template>
           <template v-if="mode === 'issue' || mode === 'return'">
             <InputLabel :title="mode === 'issue' ? 'Give to' : 'Returned by'" required class="mb-1" />
             <v-autocomplete
@@ -72,18 +65,6 @@
               :rules="[qtyRule(line)]"
               :suffix="unitOf(line.item)"
             />
-            <v-text-field
-              v-if="mode === 'receive' && receivingType !== 'CASH'"
-              v-model.number="line.ordered"
-              type="number"
-              min="1"
-              label="Ordered (optional)"
-              density="comfortable"
-              style="max-width: 150px"
-              :rules="[orderedRule]"
-              hint="Qty on the PO"
-              persistent-hint
-            />
             <v-text-field
               v-if="mode === 'receive'"
               v-model.number="line.unitCost"
@@ -108,35 +89,18 @@
               <InputLabel title="Supplier" class="mb-1" />
               <InventorySupplierField v-if="show" v-model="supplier" :store-id="store._id" />
             </v-col>
-            <v-col cols="12" md="6">
+            <v-col cols="12" md="3">
+              <InputLabel title="PO number" class="mb-1" />
+              <v-text-field v-model="reference" density="comfortable" />
+            </v-col>
+            <v-col cols="12" md="3">
               <InputLabel title="Date received" class="mb-1" />
               <v-text-field v-model="date" type="date" :max="today" density="comfortable" />
             </v-col>
-            <v-col v-if="receivingType !== 'CASH'" cols="12" md="4">
-              <InputLabel :title="receivingType === 'PO' ? 'PO number' : 'PO number (optional)'" :required="receivingType === 'PO'" class="mb-1" />
-              <v-text-field v-model="reference" density="comfortable" placeholder="e.g. PO-0412" />
-            </v-col>
-            <template v-if="receivingType === 'DO'">
-              <v-col cols="12" sm="6" md="4">
-                <InputLabel title="DO number" required class="mb-1" />
-                <v-text-field v-model="doNumber" density="comfortable" />
-              </v-col>
-              <v-col cols="12" sm="6" md="4">
-                <InputLabel title="DO date" required class="mb-1" />
-                <v-text-field v-model="doDate" type="date" :max="today" density="comfortable" />
-              </v-col>
-            </template>
-            <v-col v-if="receivingType === 'CASH'" cols="12" md="6">
-              <InputLabel title="Receipt number (optional)" class="mb-1" />
-              <v-text-field v-model="receiptNumber" density="comfortable" placeholder="From the shop receipt" />
-            </v-col>
             <v-col cols="12">
-              <InputLabel title="Delivery photos (optional)" class="mb-1" />
+              <InputLabel title="Delivery photo (optional)" class="mb-1" />
               <InventoryPhotoInput v-model="photos" />
             </v-col>
-            <v-col v-if="receivingError" cols="12">
-              <v-alert type="warning" variant="tonal" density="compact">{{ receivingError }}</v-alert>
-            </v-col>
           </v-row>
 
           <template v-if="mode === 'request' || mode === 'issue'">
@@ -170,10 +134,9 @@
 import useInventory, { pickedDate } from "../composables/useInventory";
 import useUtils from "../composables/useUtils";
 import { normaliseUsedBy, usedByChips, usedByText } from "../utils/inventory-used-by";
-import { RECEIVING_TYPES, receivingFields, receivingProblem, type TReceivingType } from "../utils/inventory-receiving";
 
 type TMode = "receive" | "issue" | "request" | "return";
-type TRow = { item: string; qty: number | null; unitCost?: number | null; ordered?: number | null };
+type TRow = { item: string; qty: number | null; unitCost?: number | null };
 
 const show = defineModel<boolean>({ default: false });
 const props = defineProps({
@@ -206,7 +169,7 @@ const COPY: Record<TMode, { title: string; help: string; button: string; success
   },
   request: {
     title: "Request Stock",
-    help: "Ask the store for the items you need — up to what the store has (shown under each item). You will see them under My Stock once the store keeper approves.",
+    help: "Ask the store for the items you need. You will see them under My Stock once the store keeper approves.",
     button: "Send request",
     success: "Request sent to the store.",
   },
@@ -221,7 +184,7 @@ const copy = computed(() => COPY[props.mode]);
 
 const form = ref();
 const saving = ref(false);
-const blank = (): TRow => ({ item: "", qty: null, unitCost: null, ordered: null });
+const blank = (): TRow => ({ item: "", qty: null, unitCost: null });
 const rows = ref<TRow[]>([blank()]);
 const supplier = ref("");
 const reference = ref("");
@@ -231,19 +194,6 @@ const today = new Date().toLocaleDateString("en-CA");
 const date = ref(today);
 const holder = ref("");
 const site = ref(props.siteId);
-// Receiving (client 2026-10-02): PO / DO / cash, each with its own paperwork.
-const receivingType = ref<TReceivingType>("PO");
-const doNumber = ref("");
-const doDate = ref("");
-const receiptNumber = ref("");
-const tried = ref(false);
-const receivingHelp = computed(() => RECEIVING_TYPES.find((t) => t.value === receivingType.value)?.help ?? "");
-const hasOrdered = (r: TRow) => r.ordered !== null && r.ordered !== undefined && r.ordered !== ("" as any);
-const receivingCheck = () =>
-  receivingProblem({ type: receivingType.value, poNumber: reference.value, doNumber: doNumber.value, doDate: doDate.value, anyOrdered: receivingType.value !== "CASH" && rows.value.some(hasOrdered) });
-/** Shown once they have tried to save, so the form does not open with a warning. */
-const receivingError = computed(() => (props.mode === "receive" && tried.value ? receivingCheck() : ""));
-const orderedRule = (v: number | null | string) => v === null || v === "" || (Number.isInteger(Number(v)) && Number(v) >= 1) || "Whole number";
 
 const itemChoices = ref<TInventoryItem[]>([]);
 const choices = computed<any[]>(() =>
@@ -268,9 +218,7 @@ function qtyRule(line: TRow) {
     if (props.mode === "receive") return true;
     const available = availableOf(line.item);
     const total = rows.value.filter((r) => r.item === line.item).reduce((s, r) => s + Number(r.qty || 0), 0);
-    // Requests too (client 2026-10-02): nobody can ask for more than the store has; the server refuses it as well.
-    if (available !== undefined && total > available)
-      return available > 0 ? `Only ${available} ${unitOf(line.item)} in the store — ask for ${available} or fewer` : "None left in the store";
+    if (props.mode !== "request" && available !== undefined && total > available) return `Only ${available} available`;
     return true;
   };
 }
@@ -318,29 +266,16 @@ const searchPeople = debounce(async (q: string) => {
 }, 300);
 
 async function submit() {
-  tried.value = true;
   const { valid } = await form.value.validate();
-  if (!valid || (props.mode === "receive" && receivingCheck())) return;
+  if (!valid) return;
   const lines = rows.value.filter((r) => r.item && r.qty).map((r) => ({ item: r.item, qty: Number(r.qty) }));
   saving.value = true;
   try {
     if (props.mode === "receive") {
       await api.receive(props.store._id, {
-        lines: rows.value.map((r) => ({
-          item: r.item,
-          qty: Number(r.qty),
-          ...(r.unitCost !== null && r.unitCost !== undefined && r.unitCost !== ("" as any) ? { unitCost: Number(r.unitCost) } : {}),
-          ...(receivingType.value !== "CASH" && hasOrdered(r) ? { poOrderedQty: Number(r.ordered) } : {}),
-        })),
+        lines: rows.value.map((r) => ({ item: r.item, qty: Number(r.qty), ...(r.unitCost !== null && r.unitCost !== undefined && r.unitCost !== ("" as any) ? { unitCost: Number(r.unitCost) } : {}) })),
         supplier: supplier.value,
-        ...receivingFields({
-          type: receivingType.value,
-          poNumber: reference.value,
-          doNumber: doNumber.value,
-          // The server refuses a future time: today's DO date is "now", an earlier one noon that day.
-          doDateIso: doDate.value ? (pickedDate(doDate.value) ?? new Date().toISOString()) : undefined,
-          receiptNumber: receiptNumber.value,
-        }),
+        reference: reference.value,
         date: pickedDate(date.value),
         photos: photos.value,
         remarks: remarks.value,
@@ -372,20 +307,7 @@ watch(show, (open) => {
   date.value = today;
   holder.value = "";
   site.value = props.siteId;
-  receivingType.value = "PO";
-  doNumber.value = "";
-  doDate.value = "";
-  receiptNumber.value = "";
-  tried.value = false;
   if (props.mode !== "return") loadItems();
   if (props.mode === "issue") searchPeople("");
 });
 </script>
-
-<style scoped>
-/* Three choices side by side on a computer, wrapping on a phone. */
-.receiving-type {
-  height: auto !important;
-  flex-wrap: wrap;
-}
-</style>

package/components/InventoryPhotoInput.vue

@@ -16,18 +16,16 @@
         {{ label }}
       </v-btn>
     </div>
-    <input ref="picker" type="file" :accept="PHOTO_ACCEPT" multiple hidden @change="upload" />
-    <div class="text-caption text-medium-emphasis mt-1">{{ hint }}</div>
-    <div v-if="error" class="text-caption text-error mt-1" role="alert">{{ error }}</div>
+    <input ref="picker" type="file" accept="image/*" multiple hidden @change="upload" />
+    <div v-if="error" class="text-caption text-error mt-1">{{ error }}</div>
   </div>
 </template>
 
 <script setup lang="ts">
 import useFile from "../composables/useFile";
-import { photoCheck, scaledSize, PHOTO_ACCEPT, SHRINK_STEPS, PHOTO_MAX_BYTES } from "../utils/inventory-receiving";
 
 const model = defineModel<string[]>({ default: () => [] });
-const props = defineProps({
+defineProps({
   label: { type: String, default: "Add photo" },
   max: { type: Number, default: 5 },
 });
@@ -37,56 +35,20 @@ const picker = ref<HTMLInputElement>();
 const uploading = ref(false);
 const error = ref("");
 
-const hint = computed(() => `JPG, PNG or WebP, up to ${props.max} photo${props.max === 1 ? "" : "s"}, 5 MB each. Bigger photos are made smaller for you.`);
-
-/** Redraw a too-big photo smaller as a JPEG (no library: the browser's canvas). Null when it cannot get under 5 MB. */
-async function shrink(file: File): Promise<File | null> {
-  try {
-    const bitmap = await createImageBitmap(file);
-    for (const step of SHRINK_STEPS) {
-      const { width, height } = scaledSize(bitmap.width, bitmap.height, step.side);
-      const canvas = document.createElement("canvas");
-      Object.assign(canvas, { width, height });
-      const ctx = canvas.getContext("2d")!;
-      ctx.fillStyle = "#fff"; // a see-through PNG would turn black as a JPEG
-      ctx.fillRect(0, 0, width, height);
-      ctx.drawImage(bitmap, 0, 0, width, height);
-      const blob = await new Promise<Blob | null>((done) => canvas.toBlob(done, "image/jpeg", step.quality));
-      if (blob && blob.size <= PHOTO_MAX_BYTES) return new File([blob], file.name.replace(/\.[^.]+$/, "") + ".jpg", { type: "image/jpeg" });
-    }
-  } catch {
-    /* the browser could not read it */
-  }
-  return null;
-}
-
 async function upload(event: Event) {
   const files = Array.from((event.target as HTMLInputElement).files ?? []);
   (event.target as HTMLInputElement).value = "";
   if (!files.length) return;
   uploading.value = true;
-  const problems: string[] = [];
-  const room = props.max - model.value.length;
-  if (files.length > room) problems.push(`Only ${props.max} photo${props.max === 1 ? "" : "s"} can be added here, so the first ${room} were kept.`);
+  error.value = "";
   try {
-    for (const picked of files.slice(0, room)) {
-      const check = photoCheck(picked);
-      let file: File | null = picked;
-      if (check === "shrink") {
-        file = await shrink(picked);
-        if (!file) problems.push(`"${picked.name}" is too big (over 5 MB) and could not be made smaller. Please pick another photo.`);
-      } else if (check !== "ok") {
-        problems.push(check);
-        file = null;
-      }
-      if (!file) continue;
+    for (const file of files.slice(0, 5 - model.value.length)) {
       const res = await addFile(file);
       if (res?.id) model.value = [...model.value, res.id as string];
     }
   } catch {
-    problems.push("A photo could not be uploaded. Please check your connection and try again.");
+    error.value = "A photo could not be uploaded. Please try again.";
   } finally {
-    error.value = problems.join(" ");
     uploading.value = false;
   }
 }

package/components/InventoryReportsTab.vue

@@ -62,9 +62,6 @@
       />
       <v-checkbox v-if="report === 'usage' && canCheck" v-model="uncheckedOnly" label="Not checked yet" density="compact" hide-details class="flex-grow-0" />
       <v-spacer />
-      <v-btn v-if="report === 'purchases'" class="text-none screen-btn-ghost" variant="outlined" prepend-icon="mdi-clipboard-search-outline" @click="openPo('')">
-        Check a PO
-      </v-btn>
       <v-btn v-if="ctl.fullReports || report === 'usage'" class="text-none screen-btn-ghost" variant="outlined" prepend-icon="mdi-file-excel-outline" :loading="exporting" @click="exportExcel">
         Export Excel
       </v-btn>
@@ -172,16 +169,6 @@
         {{ item.received }}<span v-if="item.receivedOpening" class="d-block text-caption text-medium-emphasis">incl. {{ item.receivedOpening }} opening stock</span>
       </template>
       <template #item.receivedCost="{ value }">{{ money(value) }}</template>
-      <template #item.receivingType="{ item }">{{ item.kind === "Opening stock" ? "Opening stock" : receivingLabel(item.receivingType) }}</template>
-      <template #item.reference="{ item }">
-        <a v-if="report === 'purchases' && item.reference" href="#" class="text-primary" title="See ordered vs received for this PO" @click.prevent="openPo(item.reference)">{{ item.reference }}</a>
-        <span v-else>{{ item.reference || "—" }}</span>
-      </template>
-      <template #item.doNumber="{ item }">
-        <span v-if="item.doNumber">{{ item.doNumber }}<span v-if="item.doDate" class="d-block text-caption text-medium-emphasis">{{ standardFormatDate(item.doDate) }}</span></span>
-        <span v-else>—</span>
-      </template>
-      <template #item.poOrderedQty="{ value }">{{ value ?? "—" }}</template>
       <template #item.usedCost="{ value }">{{ money(value) }}</template>
       <template #item.siteUsedCost="{ value }">{{ money(value) }}</template>
       <!-- The supervisor checks usage against the technician's before/after photos (click to enlarge, with the time taken). -->
@@ -219,7 +206,6 @@
       </template>
     </v-data-table>
     <InventoryHistoryDialog v-model="drill.show" :store="store" :holder="drill.holder" :item="drill.item" :title="drill.title" />
-    <InventoryPoDialog v-model="po.show" :store="store" :initial-po="po.number" />
   </div>
 </template>
 
@@ -230,7 +216,6 @@ import useUtils from "../composables/useUtils";
 import { inventoryControls } from "../utils/inventory-presets";
 import { USED_BY_FILTERS } from "../utils/inventory-used-by";
 import { USAGE_FLAG_WORDS, USAGE_STATUS_CHOICES, usagePathText, usageQuery, usageTotals } from "../utils/inventory-usage";
-import { receivingLabel } from "../utils/inventory-receiving";
 
 const props = defineProps({
   store: { type: Object as PropType<TInventoryStore>, required: true },
@@ -268,8 +253,6 @@ const staleDays = ref(3);
 const flagWords = computed(() => ({ ...USAGE_FLAG_WORDS, old_draft: `Draft older than ${staleDays.value} days` }) as Record<string, string>);
 const flagChoices = computed(() => [{ value: "", title: "Everything" }, ...Object.entries(flagWords.value).map(([value, title]) => ({ value, title }))]);
 const drill = reactive({ show: false, holder: "", item: "", title: "" });
-const po = reactive({ show: false, number: "" });
-const openPo = (number: string) => Object.assign(po, { show: true, number });
 function openPerson(r: any) {
   Object.assign(drill, { show: true, holder: String(r.holder ?? ""), item: "", title: r.holderLabel || r.technician });
 }
@@ -295,7 +278,7 @@ const help: Record<string, string> = {
   movement: "For each item: stock at the start of the month, what came in (deliveries and opening stock), what was issued and returned, count differences, and stock at the end.",
   usage: "Every usage of this store's items, by anyone: who (company and service), where, which work order, before and after photos with their times, and how the stock reached them. Click a person or an item to see its full history. Use it for tenant billing; tick records and mark them checked once verified.",
   technicians: "For each person: stock they held at the start, took, used, returned, and hold at the end of the month.",
-  purchases: "Every delivery received — by PO, DO or cash — and opening stock entered with new items, with totals by month and by supplier. Click a PO number (or Check a PO) to see ordered against received.",
+  purchases: "Every delivery received, and opening stock entered with new items (Type: Opening stock), with totals by month and by supplier.",
   handovers: "Stock passed from one person to a colleague: who gave it, who received it, and whether they confirmed.",
 };
 
@@ -408,15 +391,12 @@ const headers: Record<string, any[]> = {
   ],
   purchases: [
     { title: "Date", key: "date" },
-    { title: "Type", key: "receivingType" },
+    { title: "Type", key: "kind" },
     { title: "Supplier", key: "supplier" },
     { title: "PO No.", key: "reference" },
-    { title: "DO No. / date", key: "doNumber" },
-    { title: "Receipt No.", key: "receiptNumber" },
     { title: "Item", key: "itemName" },
     { title: "Unit", key: "unit" },
-    { title: "Ordered", key: "poOrderedQty" },
-    { title: "Received", key: "qty" },
+    { title: "Qty", key: "qty" },
     { title: "Unit price", key: "unitCost" },
     { title: "Total", key: "totalCost" },
     { title: "Received by", key: "receivedBy" },

package/components/InventoryRequestsTab.vue

@@ -7,15 +7,6 @@
         <v-btn value="rejected" class="text-none">Rejected</v-btn>
         <v-btn value="" class="text-none">All</v-btn>
       </v-btn-toggle>
-      <v-text-field
-        v-model="search"
-        placeholder="Search item, person, reference or remarks"
-        prepend-inner-icon="mdi-magnify"
-        density="compact"
-        hide-details
-        clearable
-        class="request-search"
-      />
       <v-spacer />
       <v-btn v-if="ctl.request" class="text-none screen-btn-primary" variant="flat" prepend-icon="mdi-cart-arrow-down" @click="showRequest = true">
         Request Stock
@@ -24,7 +15,7 @@
 
     <v-progress-linear v-if="loading" indeterminate color="primary" />
     <div v-else-if="!requests.length" class="text-center text-medium-emphasis py-10">
-      {{ search ? `No requests match "${search}". Try another word, or pick "All" to look through every status.` : status === "pending" ? (store.access.canApprove ? "No requests waiting for approval." : "You have no requests waiting. Use Request Stock to ask the store for items.") : "No requests to show." }}
+      {{ status === "pending" ? (store.access.canApprove ? "No requests waiting for approval." : "You have no requests waiting. Use Request Stock to ask the store for items.") : "No requests to show." }}
     </div>
 
     <AppCard v-for="r in requests" :key="r._id" class="pa-4 mb-3">
@@ -72,11 +63,11 @@
                 v-model.number="l.give"
                 type="number"
                 min="0"
-                :max="Math.min(l.qty, l.onHand ?? l.qty)"
+                :max="l.qty"
                 label="Give"
                 density="comfortable"
                 style="max-width: 120px"
-                :rules="[(v: any) => (Number.isInteger(Number(v)) && Number(v) >= 0 && Number(v) <= l.qty) || `0 to ${l.qty}`, (v: any) => l.onHand === undefined || Number(v) <= l.onHand || `Only ${l.onHand} in store`]"
+                :rules="[(v: any) => (Number.isInteger(Number(v)) && Number(v) >= 0 && Number(v) <= l.qty) || `0 to ${l.qty}`]"
               />
             </div>
             <InputLabel title="Remarks" class="mb-1 mt-2" />
@@ -116,7 +107,6 @@ const notify = inject<(text: string, color?: string) => void>("inventoryNotify",
 const chip = REQUEST_STATUS;
 
 const status = ref("pending");
-const search = ref("");
 const requests = ref<TInventoryRequest[]>([]);
 const page = ref(1);
 const pages = ref(0);
@@ -129,7 +119,7 @@ const isMine = (r: TInventoryRequest) => String(r.requestedBy) === String(curren
 async function load(p = 1) {
   loading.value = true;
   try {
-    const res = await api.getRequests(props.store._id, { page: p, limit: 20, status: status.value || undefined, search: search.value?.trim() || undefined });
+    const res = await api.getRequests(props.store._id, { page: p, limit: 20, status: status.value || undefined });
     requests.value = p === 1 ? res.items : [...requests.value, ...res.items];
     page.value = p;
     pages.value = res.pages;
@@ -224,19 +214,6 @@ async function reject() {
 }
 
 watch(status, () => load(1));
-// Typed search waits until the typing stops.
-let typing: ReturnType<typeof setTimeout> | undefined;
-watch(search, () => {
-  clearTimeout(typing);
-  typing = setTimeout(() => load(1), 400);
-});
 watch(() => props.store._id, () => load(1));
 onMounted(() => load(1));
 </script>
-
-<style scoped>
-.request-search {
-  min-width: 220px;
-  max-width: 340px;
-}
-</style>

package/components/InventoryStockTab.vue

@@ -17,7 +17,6 @@
         <v-list density="compact">
           <v-list-item prepend-icon="mdi-truck-delivery-outline" title="Record a delivery" @click="open('receive')" />
           <v-list-item prepend-icon="mdi-file-excel-outline" title="Import deliveries from Excel" @click="showReceiveImport = true" />
-          <v-list-item prepend-icon="mdi-clipboard-search-outline" title="Check a purchase order (PO)" @click="showPo = true" />
         </v-list>
       </v-menu>
       <v-btn v-if="ctl.issue && !storeEmpty" class="text-none screen-btn-primary" variant="flat" prepend-icon="mdi-hand-extended-outline" @click="open('issue')">
@@ -118,7 +117,6 @@
     <InventoryItemDialog v-model="itemDialog.show" :store="store" :item="itemDialog.item" @done="done" />
     <InventoryImportDialog v-model="showImport" :store="store" @done="done" />
     <InventoryImportDialog v-model="showReceiveImport" :store="store" kind="receipts" @done="done" />
-    <InventoryPoDialog v-model="showPo" :store="store" />
     <InventoryLegacyImportDialog v-model="showLegacy" :store="store" @done="done" />
     <v-dialog v-model="bulk.show" max-width="480">
       <v-card class="screen-modal">
@@ -258,7 +256,6 @@ function openItem(item: TInventoryItem) {
 
 const showImport = ref(false);
 const showReceiveImport = ref(false);
-const showPo = ref(false);
 const showLegacy = ref(false);
 // Offer the old Equipment copy only where this store's sites have old records not yet copied.
 const legacyToCopy = ref(false);

package/components/InvitationClientForm.vue

@@ -388,27 +388,9 @@ watch(
 const roles = ref<any[]>([])
 const { getRoles } = useRole()
 
-/*
- * `type` is the ROLE type, not the service the client subscribes to, and the
- * only caller (`ClientMain.vue` "Invite Client") passes no `app` prop -- so
- * this sent `type: ""` and the endpoint applied no type filter at all. The
- * dropdown therefore listed every org-less role of every type, which includes
- * the platform's OWN staff roles (`type: "admin"` -- the two rows the console's
- * `/super-admin/role-permissions` screen edits). Offering a Seven365 console
- * staff role on a CLIENT invitation is the defect.
- *
- * A client admin's role is `type: "organization"`, which is what the client
- * roles screen (`org/[organization]/roles-permissions.vue`) already lists. This
- * narrows to exactly that. It is a narrowing of this one picker only: no role
- * changes, no permission changes, and the org-less `organization` roles that
- * were already being picked are all still offered.
- *
- * Keying off the selected service instead would empty the dropdown -- no
- * org-less role carries a service type -- so `props.app` is not the filter.
- */
 const { data: roleData, refresh: refreshRoles } = await useLazyAsyncData(
   "roles",
-  () => getRoles({ org: org.value?._id, type: "organization", limit: 50 }),
+  () => getRoles({ org: org.value?._id, type: props.app, limit: 50 }),
   { watch: [() => props.app] }
 )
 

package/components/InvitationForm.vue

@@ -88,24 +88,13 @@
                   persistent-hint
                   data-test="invite-fixed-site"
                 ></v-text-field>
-                <!--
-                  Several sites (owner request 2026-10-02): one invitation per
-                  site, one e-mail. One role for all of them, so 2+ sites offer
-                  organisation roles only (see `roleSiteFor`).
-                -->
                 <v-autocomplete
                   v-else
-                  v-model="invite.sites"
+                  v-model="invite.site"
                   :items="sites"
-                  multiple
-                  chips
-                  closable-chips
                   class="filter-field"
                   density="comfortable"
-                  :rules="[sitesRule]"
-                  :hint="invite.sites.length > 1 ? severalSitesHint : ''"
-                  :persistent-hint="invite.sites.length > 1"
-                  data-test="invite-sites"
+                  :rules="[requiredRule]"
                   @update:model-value="handleUpdateSite"
                 ></v-autocomplete>
               </v-col>
@@ -174,7 +163,6 @@ import { useLocalSetup } from '../composables/useLocalSetup';
 import useRole from '../composables/useRole';
 import useSite from '../composables/useSite';
 import { inviteRoleOptions } from '../utils/invite-role-options';
-import { roleSiteFor } from '../utils/invite-sites';
 import useUser from '../composables/useUser';
 import useUtils from '../composables/useUtils';
 
@@ -288,8 +276,6 @@ const invite = ref<Record<string, any>>({
   role: "",
   org: "",
   site: "",
-  // the sites picked in the Site field (several allowed); `site` follows it
-  sites: [] as string[],
   siteName: "",
   isMemberInvite: false,
 });
@@ -515,17 +501,9 @@ watchEffect(() => {
 
 const roleOptions = computed(() => inviteRoleOptions(roles.value));
 
-const severalSitesHint =
-  "Several sites: pick an organisation role - it applies at each site. For a different role per site, invite one site at a time.";
-
-const sitesRule = (v: string[]) =>
-  (Array.isArray(v) && v.length > 0) || "Pick at least one site";
-
 const noRolesText = computed(() =>
   rolesError?.value
     ? "The roles could not be loaded. You may not have access to this organisation's roles; refresh, or sign in again."
-    : !fixedSite.value && invite.value.sites.length > 1
-    ? "No organisation roles for this service yet. Create one in Roles & Permissions (Roles for <service>, use at any site), or invite one site at a time."
     : fixedSite.value
     ? "No roles have been created for this site yet. Create one in Roles & Permissions first."
     : "No roles have been created yet. Create one in Roles & Permissions first."
@@ -547,7 +525,6 @@ const rolesPageLink = computed(() => {
 async function handleUpdateApp(value: string)  {
   invite.value.role = "";
   if (!fixedSite.value) {
-    invite.value.sites = [];
     invite.value.site = "";
     invite.value.siteName = "";
   }
@@ -567,16 +544,12 @@ function resetInvite() {
   invite.value.role = "";
   // Same site as before: a fixed site stays fixed, a picked one is cleared.
   invite.value.site = fixedSite.value;
-  invite.value.sites = [];
   if (!invite.value.site) invite.value.siteName = "";
   message.value = "";
 }
 
-function handleUpdateSite(siteIds: string[]) {
-  // The roles list follows `site`: the one chosen site, or "" for several
-  // (organisation roles only); the role watch clears a role no longer offered.
-  invite.value.site = roleSiteFor(siteIds);
-  const obj = sites.value.find((x) => x?.value === invite.value.site);
+function handleUpdateSite(siteId: string) {
+  const obj = sites.value.find((x) => x?.value === siteId);
   invite.value.siteName = obj?.title || "";
 }