@7365admin1/layer-common 4.35.1-staging.434 → 4.35.1-staging.436

package/components/InventoryImportDialog.vue

@@ -1,16 +1,12 @@
 <template>
   <ImportExcelDialog
     v-model="show"
-    :title="kind === 'receipts' ? 'Import Deliveries from Excel' : 'Import Items from Excel'"
-    :noun="kind === 'receipts' ? 'delivery lines' : 'items'"
-    name-label="Item"
-    :fill-hint="
-      kind === 'receipts'
-        ? 'One row per item delivered: date received, supplier, PO no., the item (pick from the dropdown), quantity and price. Rows with the same date, supplier and PO no. are saved as one delivery.'
-        : 'One row per item. Unit, Packing and Category have dropdowns with this store\'s values. Current Stock and the columns after it are the opening stock (date, supplier, PO no.), recorded like a delivery.'
-    "
-    :duplicate-note="kind === 'receipts' ? 'Every row is a delivery — uploading the same file twice records it twice.' : 'Items already in the store are skipped and never changed, so uploading twice never doubles stock.'"
-    :template-file-name="kind === 'receipts' ? `receive-stock-${slug}.xlsx` : `inventory-items-${slug}.xlsx`"
+    :title="copy.title"
+    :noun="copy.noun"
+    :name-label="kind === 'suppliers' ? 'Supplier' : 'Item'"
+    :fill-hint="copy.fill"
+    :duplicate-note="copy.duplicate"
+    :template-file-name="`${copy.file}-${slug}.xlsx`"
     :download-template="downloadTemplate"
     :check="(file: File) => run(file, false)"
     :commit="(file: File) => run(file, true)"
@@ -26,21 +22,54 @@ import type { TImportResult } from "../utils/import-result";
 const show = defineModel<boolean>({ default: false });
 const props = defineProps({
   store: { type: Object as PropType<TInventoryStore>, required: true },
-  /** items: the item list with opening stock. receipts: bulk deliveries of existing items. */
-  kind: { type: String as PropType<"items" | "receipts">, default: "items" },
+  /** items: the item list with opening stock. receipts: bulk deliveries of existing items. suppliers: the supplier list. */
+  kind: { type: String as PropType<"items" | "receipts" | "suppliers">, default: "items" },
 });
 const emit = defineEmits(["done"]);
 
-const { importItems, importTemplate, receiveTemplate, importReceipts } = useInventory();
+const { importItems, importTemplate, receiveTemplate, importReceipts, supplierTemplate, importSuppliers } = useInventory();
 const notify = inject<(text: string, color?: string) => void>("inventoryNotify", () => {});
 const slug = computed(() => String(props.store.name ?? "store").toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "") || "store");
 
-const downloadTemplate = () => (props.kind === "receipts" ? receiveTemplate(props.store._id) : importTemplate(props.store._id));
+const COPY = {
+  items: {
+    title: "Import Items from Excel",
+    noun: "items",
+    fill: "One row per item. Unit, Packing, Category and Supplier have dropdowns with this store's values (a new supplier can still be typed in). Current Stock and the columns after it are the opening stock (date, supplier, PO no.), recorded like a delivery.",
+    duplicate: "Items already in the store are skipped and never changed, so uploading twice never doubles stock.",
+    file: "inventory-items",
+    done: (n: number) => `${n} item(s) added.`,
+  },
+  receipts: {
+    title: "Import Deliveries from Excel",
+    noun: "delivery lines",
+    fill: "One row per item delivered: date received, supplier (pick from the dropdown, or type a new one), PO no., the item (pick from the dropdown), quantity and price. Rows with the same date, supplier and PO no. are saved as one delivery.",
+    duplicate: "Every row is a delivery — uploading the same file twice records it twice.",
+    file: "receive-stock",
+    done: (n: number) => `${n} delivery line(s) received.`,
+  },
+  suppliers: {
+    title: "Import Suppliers from Excel",
+    noun: "suppliers",
+    fill: "One row per supplier. Only Supplier Name is required; contact person, phone, email, address, payment terms and notes are optional.",
+    duplicate: "Suppliers already in your list are skipped and left unchanged.",
+    file: "suppliers",
+    done: (n: number) => `${n} supplier(s) added.`,
+  },
+};
+const copy = computed(() => COPY[props.kind]);
+
+const downloadTemplate = () =>
+  props.kind === "receipts" ? receiveTemplate(props.store._id) : props.kind === "suppliers" ? supplierTemplate(props.store._id) : importTemplate(props.store._id);
 const run = (file: File, commit: boolean) =>
-  (props.kind === "receipts" ? importReceipts(props.store._id, file, commit) : importItems(props.store._id, file, commit)) as Promise<TImportResult>;
+  (props.kind === "receipts"
+    ? importReceipts(props.store._id, file, commit)
+    : props.kind === "suppliers"
+      ? importSuppliers(props.store._id, file, commit)
+      : importItems(props.store._id, file, commit)) as Promise<TImportResult>;
 
 function finished(result: TImportResult) {
-  notify(props.kind === "receipts" ? `${result.ready} delivery line(s) received.` : `${result.ready} item(s) added.`);
+  notify(copy.value.done(result.ready));
   emit("done");
 }
 </script>

package/components/InventoryItemDialog.vue

@@ -58,7 +58,7 @@
               </v-col>
               <v-col cols="12" sm="6">
                 <InputLabel title="Supplier" class="mb-1" />
-                <v-text-field v-model="f.openingSupplier" density="comfortable" maxlength="200" :disabled="!f.openingQty" hint="Optional" persistent-hint />
+                <InventorySupplierField v-if="show" v-model="f.openingSupplier" :store-id="store._id" :disabled="!f.openingQty" hint="Optional. Pick from your supplier list, or type a new one." />
               </v-col>
               <v-col cols="12" sm="6">
                 <InputLabel title="PO no." class="mb-1" />

package/components/InventoryLinesDialog.vue

@@ -83,7 +83,7 @@
           <v-row v-if="mode === 'receive'" dense>
             <v-col cols="12" md="6">
               <InputLabel title="Supplier" class="mb-1" />
-              <v-text-field v-model="supplier" density="comfortable" placeholder="e.g. GSK Hardware Pte Ltd" />
+              <InventorySupplierField v-if="show" v-model="supplier" :store-id="store._id" />
             </v-col>
             <v-col cols="12" md="3">
               <InputLabel title="PO number" class="mb-1" />

package/components/InventoryMain.vue

@@ -100,6 +100,9 @@
         <v-window-item v-if="isStaff" value="reports">
           <InventoryReportsTab :store="store" :sites="storeSites" />
         </v-window-item>
+        <v-window-item v-if="isStaff" value="suppliers">
+          <InventorySuppliersTab :store="store" />
+        </v-window-item>
         <v-window-item v-if="store.access.canManage" value="settings">
           <InventorySettingsTab :store="store" :org-sites="orgSites" @saved="loadStores" />
         </v-window-item>
@@ -182,6 +185,7 @@ const tabs = computed(() => {
     { value: "requests", label: a.canApprove ? "Requests" : "My Requests", badge: a.canApprove ? pendingCount.value : 0 },
     ...(a.canApprove ? [{ value: "technicians", label: worker.many }] : []),
     ...(isStaff.value ? [{ value: "reports", label: "Reports" }] : []),
+    ...(isStaff.value ? [{ value: "suppliers", label: "Suppliers" }] : []),
     ...(a.canManage ? [{ value: "settings", label: "Settings" }] : []),
   ];
 });

package/components/InventorySupplierField.vue

@@ -0,0 +1,93 @@
+<template>
+  <div>
+    <v-combobox
+      v-model="model"
+      v-model:search="search"
+      :items="names"
+      :loading="loading"
+      :disabled="disabled"
+      :placeholder="placeholder"
+      density="comfortable"
+      clearable
+      hide-details
+      maxlength="200"
+      aria-label="Supplier — pick from your list or type a new one"
+      @blur="snap"
+    >
+      <template #no-data>
+        <v-list-item v-if="typed" prepend-icon="mdi-plus" @click="model = typed">
+          <v-list-item-title>Add "{{ typed }}" as a new supplier</v-list-item-title>
+        </v-list-item>
+        <v-list-item v-else>
+          <v-list-item-title class="text-medium-emphasis">No suppliers yet — type a name to add one</v-list-item-title>
+        </v-list-item>
+      </template>
+      <template v-if="typed && !listedSupplierName(typed, names)" #append-item>
+        <v-divider />
+        <v-list-item prepend-icon="mdi-plus" @click="model = typed">
+          <v-list-item-title>Add "{{ typed }}" as a new supplier</v-list-item-title>
+        </v-list-item>
+      </template>
+    </v-combobox>
+    <div class="text-caption mt-1" style="min-height: 20px">
+      <span v-if="near" class="text-warning">
+        Did you mean <a href="#" class="text-warning font-weight-bold" @click.prevent="model = near">{{ near }}</a>? Otherwise "{{ current }}" is added as a new supplier.
+      </span>
+      <span v-else-if="isNew" class="text-medium-emphasis">New supplier — it is added to your supplier list when you save.</span>
+      <span v-else class="text-medium-emphasis">{{ hint }}</span>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import useInventory from "../composables/useInventory";
+import { listedSupplierName, nearSupplierName } from "../utils/inventory-suppliers";
+
+/**
+ * Supplier picker: the organisation's supplier list as a searchable dropdown.
+ * A name not in the list can still be typed; the server adds it to the list
+ * (name only) when the delivery is saved, and matches any spelling of a listed name.
+ */
+const model = defineModel<string>({ default: "" });
+const props = defineProps({
+  storeId: { type: String, required: true },
+  disabled: { type: Boolean, default: false },
+  placeholder: { type: String, default: "Pick a supplier or type a new one" },
+  hint: { type: String, default: "Pick from your supplier list, or type a new one." },
+});
+
+const { getSuppliers } = useInventory();
+const names = ref<string[]>([]);
+const loading = ref(false);
+const search = ref<string | null>("");
+
+const typed = computed(() => String(search.value ?? "").replace(/\s+/g, " ").trim());
+const current = computed(() => String(model.value ?? "").replace(/\s+/g, " ").trim());
+const isNew = computed(() => !!current.value && !listedSupplierName(current.value, names.value));
+const near = computed(() => (isNew.value ? nearSupplierName(current.value, names.value) : undefined));
+
+/** A listed supplier typed in another spelling becomes the list's spelling. */
+function snap() {
+  if (model.value == null) return void (model.value = ""); // cleared: no supplier, never null to the server
+  const listed = listedSupplierName(model.value, names.value);
+  if (listed && listed !== model.value) model.value = listed;
+}
+watch(model, snap);
+
+async function load() {
+  if (!props.storeId) return;
+  loading.value = true;
+  try {
+    const res = await getSuppliers(props.storeId);
+    names.value = [...res.items.map((s) => s.name), ...(res.fromDeliveries ?? []).map((s) => s.name)].sort((a, b) =>
+      a.localeCompare(b, "en", { numeric: true, sensitivity: "base" }),
+    );
+  } catch {
+    names.value = []; // typing a name still works
+  } finally {
+    loading.value = false;
+  }
+}
+watch(() => props.storeId, load, { immediate: true });
+defineExpose({ reload: load });
+</script>

package/components/InventorySuppliersTab.vue

@@ -0,0 +1,210 @@
+<template>
+  <div>
+    <AppCard class="pa-4 mb-4">
+      <p class="text-body-2 text-medium-emphasis mb-3">
+        Your organisation's suppliers, shared by all its stores. They appear in the Supplier dropdown on Receive Stock and on opening stock.
+        Only the name is needed — contact details are optional. A supplier typed on a delivery is added here automatically.
+      </p>
+      <div class="d-flex flex-wrap align-center ga-2">
+        <v-text-field
+          v-model="search"
+          density="compact"
+          prepend-inner-icon="mdi-magnify"
+          placeholder="Search name, contact, phone or email"
+          hide-details
+          clearable
+          style="min-width: 240px; max-width: 360px"
+        />
+        <v-switch v-if="canManage" v-model="includeInactive" color="primary" density="compact" hide-details label="Show inactive" class="ml-2" />
+        <v-spacer />
+        <template v-if="canManage">
+          <v-btn variant="outlined" class="text-none" prepend-icon="mdi-file-excel-outline" @click="importOpen = true">Import from Excel</v-btn>
+          <v-btn variant="flat" class="text-none screen-btn-primary" prepend-icon="mdi-plus" @click="edit()">Add Supplier</v-btn>
+        </template>
+      </div>
+    </AppCard>
+
+    <AppCard v-if="canManage && fromDeliveries.length" class="pa-4 mb-4">
+      <div class="text-subtitle-2 mb-1">Suppliers on past deliveries, not in the list yet</div>
+      <p class="text-caption text-medium-emphasis mb-2">Add them so they can be picked, and fill in their details if you want to.</p>
+      <div class="d-flex flex-wrap ga-2 align-center">
+        <v-chip v-for="s in fromDeliveries" :key="s.name" variant="outlined" append-icon="mdi-plus" :disabled="adding" @click="addName(s.name)">
+          {{ s.name }}
+        </v-chip>
+        <v-btn size="small" variant="text" class="text-none" :loading="adding" @click="addAll">Add all {{ fromDeliveries.length }}</v-btn>
+      </div>
+    </AppCard>
+
+    <AppCard class="pa-0">
+      <v-data-table :headers="headers" :items="items" :loading="loading" density="comfortable" :items-per-page="25" no-data-text="No suppliers yet. Add one, import a list, or type a new supplier on Receive Stock.">
+        <template #item.name="{ item }">
+          <span class="font-weight-medium">{{ item.name }}</span>
+          <v-chip v-if="item.status === 'inactive'" size="x-small" class="ml-2">Inactive</v-chip>
+        </template>
+        <template #item.contact="{ item }">
+          <div>{{ item.contactPerson || "—" }}</div>
+          <div class="text-caption text-medium-emphasis">{{ [item.phone, item.email].filter(Boolean).join(" · ") }}</div>
+        </template>
+        <template #item.actions="{ item }">
+          <v-btn v-if="canManage" size="small" variant="text" class="text-none" @click="edit(item)">Edit</v-btn>
+        </template>
+      </v-data-table>
+    </AppCard>
+
+    <v-dialog v-model="dialog" max-width="560">
+      <AppCard class="pa-6">
+        <div class="text-h6 mb-1">{{ editing ? "Edit supplier" : "Add supplier" }}</div>
+        <p class="text-body-2 text-medium-emphasis mb-4">Only the name is required. Fill in the rest only if you want to — you can come back to it later.</p>
+        <v-form ref="form" @submit.prevent="save">
+          <InputLabel title="Supplier name" required class="mb-1" />
+          <v-text-field v-model="f.name" density="comfortable" maxlength="200" :rules="[requiredRule]" autofocus />
+          <v-row dense>
+            <v-col cols="12" sm="6">
+              <InputLabel title="Contact person" class="mb-1" />
+              <v-text-field v-model="f.contactPerson" density="comfortable" maxlength="120" hint="Optional" persistent-hint />
+            </v-col>
+            <v-col cols="12" sm="6">
+              <InputLabel title="Phone" class="mb-1" />
+              <v-text-field v-model="f.phone" density="comfortable" maxlength="40" hint="Optional" persistent-hint />
+            </v-col>
+            <v-col cols="12" sm="6">
+              <InputLabel title="Email" class="mb-1" />
+              <v-text-field v-model="f.email" type="email" density="comfortable" maxlength="200" :rules="[emailRule]" hint="Optional" persistent-hint />
+            </v-col>
+            <v-col cols="12" sm="6">
+              <InputLabel title="Payment terms" class="mb-1" />
+              <v-text-field v-model="f.paymentTerms" density="comfortable" maxlength="120" placeholder="e.g. 30 days, COD" hint="Optional" persistent-hint />
+            </v-col>
+          </v-row>
+          <InputLabel title="Address" class="mb-1 mt-2" />
+          <v-textarea v-model="f.address" density="comfortable" rows="2" auto-grow maxlength="500" hint="Optional" persistent-hint />
+          <InputLabel title="Notes" class="mb-1 mt-2" />
+          <v-textarea v-model="f.notes" density="comfortable" rows="2" auto-grow maxlength="1000" hint="Optional" persistent-hint />
+          <v-switch
+            v-if="editing"
+            v-model="active"
+            color="primary"
+            hide-details
+            class="mt-2"
+            :label="active ? 'Active — shown in the Supplier dropdown' : 'Inactive — hidden from the dropdown, kept on past deliveries'"
+          />
+          <div class="d-flex justify-end ga-2 mt-4">
+            <v-btn variant="text" class="text-none" @click="dialog = false">Cancel</v-btn>
+            <v-btn type="submit" variant="flat" class="text-none screen-btn-primary" :loading="saving">{{ editing ? "Save" : "Add supplier" }}</v-btn>
+          </div>
+        </v-form>
+      </AppCard>
+    </v-dialog>
+
+    <InventoryImportDialog v-model="importOpen" :store="store" kind="suppliers" @done="load" />
+  </div>
+</template>
+
+<script setup lang="ts">
+import useInventory from "../composables/useInventory";
+import useUtils from "../composables/useUtils";
+
+const props = defineProps({
+  store: { type: Object as PropType<TInventoryStore>, required: true },
+});
+
+const { getSuppliers, createSupplier, updateSupplier } = useInventory();
+const { requiredRule, debounce } = useUtils();
+const notify = inject<(text: string, color?: string) => void>("inventoryNotify", () => {});
+
+const items = ref<TInventorySupplier[]>([]);
+const fromDeliveries = ref<{ name: string }[]>([]);
+const canManage = ref(false);
+const loading = ref(false);
+const search = ref<string | null>("");
+const includeInactive = ref(false);
+const importOpen = ref(false);
+const adding = ref(false);
+
+const headers = [
+  { title: "Supplier", key: "name" },
+  { title: "Contact", key: "contact", sortable: false },
+  { title: "Payment terms", key: "paymentTerms" },
+  { title: "", key: "actions", sortable: false, align: "end" as const },
+];
+
+async function load() {
+  loading.value = true;
+  try {
+    const res = await getSuppliers(props.store._id, { search: search.value || "", includeInactive: includeInactive.value });
+    items.value = res.items;
+    fromDeliveries.value = res.fromDeliveries ?? [];
+    canManage.value = res.canManage;
+  } catch (error: any) {
+    notify(error?.data?.message || "Could not load the suppliers.", "error");
+  } finally {
+    loading.value = false;
+  }
+}
+const reload = debounce(load, 300);
+watch(search, reload);
+watch(includeInactive, load);
+watch(() => props.store._id, load, { immediate: true });
+
+async function addName(name: string) {
+  adding.value = true;
+  try {
+    await createSupplier(props.store._id, { name });
+    notify(`"${name}" added to your suppliers.`);
+    await load();
+  } catch (error: any) {
+    notify(error?.data?.message || "Could not add the supplier.", "error");
+  } finally {
+    adding.value = false;
+  }
+}
+async function addAll() {
+  adding.value = true;
+  let added = 0;
+  for (const s of fromDeliveries.value) {
+    try {
+      await createSupplier(props.store._id, { name: s.name });
+      added++;
+    } catch {
+      /* already added by someone else: skip */
+    }
+  }
+  adding.value = false;
+  notify(`${added} supplier(s) added.`);
+  await load();
+}
+
+// ---- add / edit
+const blank = () => ({ name: "", contactPerson: "", phone: "", email: "", address: "", paymentTerms: "", notes: "" });
+const dialog = ref(false);
+const form = ref();
+const saving = ref(false);
+const editing = ref<TInventorySupplier | null>(null);
+const f = reactive(blank());
+const active = ref(true);
+const emailRule = (v: string) => !v || /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(v) || "Enter a valid email, or leave it blank";
+
+function edit(s?: TInventorySupplier) {
+  editing.value = s ?? null;
+  Object.assign(f, blank(), s ? { name: s.name, contactPerson: s.contactPerson, phone: s.phone, email: s.email, address: s.address, paymentTerms: s.paymentTerms, notes: s.notes } : {});
+  active.value = s ? s.status === "active" : true;
+  dialog.value = true;
+}
+
+async function save() {
+  const { valid } = await form.value.validate();
+  if (!valid) return;
+  saving.value = true;
+  try {
+    if (editing.value) await updateSupplier(props.store._id, editing.value._id, { ...f, status: active.value ? "active" : "inactive" });
+    else await createSupplier(props.store._id, { ...f });
+    notify(editing.value ? "Supplier saved." : `"${f.name.trim()}" added to your suppliers.`);
+    dialog.value = false;
+    await load();
+  } catch (error: any) {
+    notify(error?.data?.message || "Could not save the supplier.", "error");
+  } finally {
+    saving.value = false;
+  }
+}
+</script>

package/components/MemberMain.vue

@@ -168,6 +168,14 @@
                   Assign Role
                 </v-list-item>
 
+                <v-list-item
+                  v-if="siteAccessAllowed && item.user"
+                  data-test="member-site-access"
+                  @click="openSiteAccess(item)"
+                >
+                  Site access
+                </v-list-item>
+
                 <v-list-item
                   v-if="currentStatus === 'active' && canSuspendMembers"
                   @click="openUpdateDialog(item._id, 'suspended')"
@@ -241,6 +249,17 @@
       INSIDE the `v-form` because Submit is a `type="submit"` and moving it out
       would break the form's own submit.
     -->
+    <v-dialog v-model="siteAccessDialog" max-width="640">
+      <MemberSiteAccess
+        v-if="siteAccessDialog && siteAccessUser"
+        :org="props.orgId"
+        :user="siteAccessUser"
+        :name="siteAccessName"
+        @cancel="siteAccessDialog = false"
+        @saved="onSiteAccessSaved"
+      />
+    </v-dialog>
+
     <v-dialog v-model="assignRoleDialog" max-width="520">
       <v-card class="screen-modal">
         <v-card-title>Assign Role</v-card-title>
@@ -578,6 +597,24 @@ function setMember({
   if (dialog) refreshRoles();
 }
 
+/* Site access (owner request 2026-09-28): on the organisation-level Members
+   screen, whoever may assign roles can choose a member's sites. The server
+   decides again (owner / org-wide admin only). */
+const siteAccessAllowed = computed(() => props.assignRole && !props.siteId);
+const siteAccessDialog = ref(false);
+const siteAccessUser = ref("");
+const siteAccessName = ref("");
+function openSiteAccess(item: Record<string, any>) {
+  siteAccessUser.value = String(item.user ?? "");
+  siteAccessName.value = String(item.name || item.email || "");
+  siteAccessDialog.value = true;
+}
+function onSiteAccessSaved(msg: string) {
+  siteAccessDialog.value = false;
+  showMessage(msg, "success");
+  getAll();
+}
+
 const roles = ref<Array<Record<string, any>>>([]);
 // Web audit M1: the member's own role is always offered, even when the
 // site-scoped list below does not return it (widen-only, `utils/role.ts`).

package/components/MemberSiteAccess.vue

@@ -0,0 +1,135 @@
+<template>
+  <v-card class="screen-modal" data-test="site-access">
+    <v-card-title>Site access{{ props.name ? ` — ${props.name}` : "" }}</v-card-title>
+    <v-card-text class="screen-modal__body">
+      <p class="text-body-2 mb-3">
+        Choose the sites this person can open and their role at each. They will see only these sites.
+      </p>
+
+      <div v-if="loading" class="py-4 text-center"><v-progress-circular indeterminate /></div>
+      <p v-else-if="loadError" class="text-error">{{ loadError }}</p>
+      <template v-else>
+        <div v-if="orgWide.length" class="mb-4" data-test="site-access-org-wide">
+          <p class="text-body-2 mb-1">
+            <strong>Organisation access:</strong>
+            {{ orgWide.map((m) => m.roleName || "role").join(", ") }} — this reaches <strong>every</strong> site.
+          </p>
+          <v-checkbox
+            v-model="removeOrgAccess"
+            density="compact"
+            hide-details
+            label="Remove organisation access and limit this person to the sites below"
+          />
+          <p v-if="removeOrgAccess" class="text-caption">
+            They will no longer appear on the Organization app's Members list. You can change their sites again here from any site's member, or invite them again.
+          </p>
+        </div>
+
+        <p v-if="!choices.length" class="text-body-2">This organisation has no sites yet.</p>
+
+        <div v-else>
+          <div class="d-flex align-center ga-2 mb-2">
+            <v-select
+              v-model="sameRole"
+              :items="sharedNames"
+              label="Same role for all selected sites"
+              density="compact"
+              hide-details
+              clearable
+              class="filter-field"
+              data-test="site-access-same-role"
+            />
+            <v-btn variant="outlined" :disabled="!sameRole" @click="applySame()">Apply</v-btn>
+          </div>
+
+          <div v-for="(c, i) in choices" :key="c.site" class="d-flex align-center ga-2 py-1" data-test="site-access-row">
+            <v-checkbox v-model="choices[i].on" density="compact" hide-details :label="c.name" style="min-width: 220px" />
+            <v-select
+              v-if="c.roles.length"
+              v-model="choices[i].role"
+              :items="c.roles"
+              item-title="name"
+              item-value="_id"
+              :disabled="!c.on"
+              label="Role"
+              density="compact"
+              hide-details
+              class="filter-field"
+            />
+            <span v-else class="text-caption">No roles created for {{ c.name }} yet — create one in that site's Roles &amp; Permissions.</span>
+          </div>
+          <p v-for="c in choices.filter((x) => x.on && !x.role && x.replacedRole)" :key="`r-${c.site}`" class="text-caption">
+            {{ c.name }}: "{{ c.replacedRole }}" is not one of this site's own roles — choose one of {{ c.name }}'s roles.
+          </p>
+        </div>
+
+        <p v-if="missing.length" class="text-error text-caption mt-2">Choose a role for: {{ missing.join(", ") }}</p>
+        <p v-if="saveError" class="text-error mt-2">{{ saveError }}</p>
+      </template>
+    </v-card-text>
+    <div class="screen-modal__footer">
+      <v-btn class="screen-btn-ghost" variant="outlined" @click="emit('cancel')">Cancel</v-btn>
+      <v-btn class="screen-btn-primary" variant="flat" :loading="saving" :disabled="loading || !!loadError || missing.length > 0" @click="save()">
+        Save
+      </v-btn>
+    </div>
+  </v-card>
+</template>
+
+<script setup lang="ts">
+// Relative import: this layer's `utils/` is not auto-imported into consumers.
+import { applySameRole, initialChoices, sharedRoleNames, toPayload, type SiteChoice } from "../utils/site-access";
+
+const props = defineProps({
+  org: { type: String, required: true },
+  user: { type: String, required: true },
+  name: { type: String, default: "" },
+});
+const emit = defineEmits<{ (e: "cancel"): void; (e: "saved", message: string): void }>();
+
+const { getSiteAccess, saveSiteAccess } = useMember();
+
+const loading = ref(true);
+const loadError = ref("");
+const saving = ref(false);
+const saveError = ref("");
+const choices = ref<SiteChoice[]>([]);
+const orgWide = ref<Array<{ roleName?: string }>>([]);
+const removeOrgAccess = ref(false);
+const sameRole = ref<string | null>(null);
+
+const sharedNames = computed(() => sharedRoleNames(choices.value));
+const missing = computed(() => toPayload(choices.value).missing);
+
+function applySame() {
+  if (sameRole.value) choices.value = applySameRole(choices.value, sameRole.value);
+}
+
+async function load() {
+  loading.value = true;
+  loadError.value = "";
+  try {
+    const res = await getSiteAccess(props.org, props.user);
+    choices.value = initialChoices(res?.sites ?? []);
+    orgWide.value = res?.orgWide ?? [];
+  } catch (e: any) {
+    loadError.value = e?.data?.message || "Site access could not be loaded. Only the organisation's owner or an admin can change it.";
+  }
+  loading.value = false;
+}
+
+async function save() {
+  saving.value = true;
+  saveError.value = "";
+  try {
+    const { sites } = toPayload(choices.value);
+    await saveSiteAccess({ org: props.org, user: props.user, sites, removeOrgAccess: removeOrgAccess.value });
+    emit("saved", sites.length ? `Site access saved: ${sites.length} site(s).` : "Site access saved: no sites.");
+  } catch (e: any) {
+    saveError.value = e?.data?.message || "Site access could not be saved.";
+  }
+  saving.value = false;
+}
+
+load();
+</script>

package/composables/useInventory.ts

@@ -83,6 +83,20 @@ export default function useInventory() {
       body.append("file", file);
       return api<TImportResult>(`/stores/${store}/receive-import`, { method: "POST", body, query: { commit } });
     },
+
+    /** The organisation's supplier list (active), plus — for managers — past-delivery names not yet in it. */
+    getSuppliers: (store: string, query: { search?: string; includeInactive?: boolean } = {}) =>
+      api<{ items: TInventorySupplier[]; fromDeliveries: { name: string; lastUsed: string; count: number }[]; canManage: boolean }>(`/stores/${store}/suppliers`, { query }),
+    createSupplier: (store: string, body: Partial<TInventorySupplier> & { name: string }) =>
+      api<TInventorySupplier>(`/stores/${store}/suppliers`, { method: "POST", body }),
+    updateSupplier: (store: string, id: string, body: Partial<TInventorySupplier>) =>
+      api<TInventorySupplier>(`/stores/${store}/suppliers/${id}`, { method: "PATCH", body }),
+    supplierTemplate: (store: string) => api<Blob>(`/stores/${store}/suppliers-template`, { responseType: "blob" }),
+    importSuppliers: (store: string, file: File, commit: boolean) => {
+      const body = new FormData();
+      body.append("file", file);
+      return api<TImportResult>(`/stores/${store}/suppliers-import`, { method: "POST", body, query: { commit } });
+    },
   };
 }
 

package/composables/useMember.ts

@@ -173,7 +173,30 @@ export default function useMember() {
     );
   }
 
+  /** One member's sites and the role at each (org owner / admin only). */
+  function getSiteAccess(org: string, user: string) {
+    return useNuxtApp().$api<Record<string, any>>("/api/members/site-access", {
+      method: "GET",
+      query: { org, user },
+    });
+  }
+
+  /** Replace one member's sites: [{ site, role }]; optionally drop org-wide access. */
+  function saveSiteAccess(body: {
+    org: string;
+    user: string;
+    sites: Array<{ site: string; role: string }>;
+    removeOrgAccess?: boolean;
+  }) {
+    return useNuxtApp().$api<Record<string, any>>("/api/members/site-access", {
+      method: "PUT",
+      body,
+    });
+  }
+
   return {
+    getSiteAccess,
+    saveSiteAccess,
     members,
     member,
     page,

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.35.1-staging.434",
+  "version": "4.35.1-staging.436",
   "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/types/inventory.d.ts

@@ -97,3 +97,16 @@ declare type TInventoryTransaction = {
 };
 
 declare type TInventoryPeriod = { from: string; to: string; site?: string; locationType?: string };
+
+/** An organisation's supplier (shared by its stores). Only the name is required. */
+declare type TInventorySupplier = {
+  _id: string;
+  name: string;
+  contactPerson: string;
+  phone: string;
+  email: string;
+  address: string;
+  paymentTerms: string;
+  notes: string;
+  status: "active" | "inactive";
+};

package/utils/inventory-suppliers.ts

@@ -0,0 +1,45 @@
+/**
+ * Supplier-name helpers for the inventory supplier picker. Browser-safe, no
+ * Node globals; names are unique so Nuxt auto-imports cannot clash.
+ * The server applies the same rules (API-core `utils/inventory-suppliers.ts`).
+ */
+
+/** Trimmed, spaces collapsed, lower case: two names with the same key are the same supplier. */
+export function supplierNameKey(name: unknown): string {
+  return String(name ?? "").replace(/\s+/g, " ").trim().toLowerCase();
+}
+
+/** The list's own spelling of `name`, when the list already has it in any spelling. */
+export function listedSupplierName(name: unknown, names: string[]): string | undefined {
+  const key = supplierNameKey(name);
+  return key ? names.find((n) => supplierNameKey(n) === key) : undefined;
+}
+
+const COMPANY_WORDS = /\b(pte|ltd|private|limited|co|company|llp|inc|corp|sdn|bhd|the)\b/g;
+const coreName = (name: string) => supplierNameKey(name).replace(/[^a-z0-9 ]+/g, " ").replace(COMPANY_WORDS, " ").replace(/\s+/g, " ").trim();
+
+function editDistanceWithin(a: string, b: string, cap: number) {
+  if (Math.abs(a.length - b.length) > cap) return cap + 1;
+  let prev = Array.from({ length: b.length + 1 }, (_, j) => j);
+  for (let i = 1; i <= a.length; i++) {
+    const cur = [i];
+    for (let j = 1; j <= b.length; j++) cur[j] = Math.min(prev[j] + 1, cur[j - 1] + 1, prev[j - 1] + (a[i - 1] === b[j - 1] ? 0 : 1));
+    prev = cur;
+  }
+  return prev[b.length];
+}
+
+/** A listed supplier a NEW name probably means ("ABC Trading" → "ABC Trading Pte Ltd"); undefined when listed or nothing close. */
+export function nearSupplierName(name: string, names: string[]): string | undefined {
+  if (!supplierNameKey(name) || listedSupplierName(name, names)) return undefined;
+  const c = coreName(name);
+  if (c.length < 3) return undefined;
+  const cap = c.length >= 8 ? 2 : 1;
+  return names.find((n) => {
+    const o = coreName(n);
+    if (!o) return false;
+    if (o === c) return true;
+    if (o.length >= 3 && (o.startsWith(`${c} `) || c.startsWith(`${o} `))) return true;
+    return o.length >= 4 && editDistanceWithin(c, o, cap) <= cap;
+  });
+}

package/utils/role.ts

@@ -76,12 +76,13 @@ export function otherSiteBannerText(count: unknown): string | null {
 
 /**
  * Can this member's CURRENT role be used on the screen's site? The server's
- * `roleState` is empty for a usable role and names the problem otherwise
+ * `roleState` is "ok" (or absent, older servers) for a usable role and names the problem otherwise
  * ("other-site", "other-org", "deleted", "missing"). An unusable role is never
  * pre-filled in Assign Role nor offered in its list (owner report 2026-09-28).
  */
 export function roleUsableHere(member: { role?: unknown; roleState?: unknown }): boolean {
-  return !!member?.role && !member?.roleState;
+  // The server sends "ok" for a usable role (older servers send nothing).
+  return !!member?.role && (!member?.roleState || member.roleState === "ok");
 }
 
 /** Assign Role's empty state when the site has no role of its own yet. */

package/utils/site-access.ts

@@ -0,0 +1,52 @@
+/**
+ * Site access editor state (owner request 2026-09-28). One row per site of the
+ * organisation; a chosen site needs one of ITS OWN roles (the server refuses an
+ * organisation-level role for a site, because it would reach every site).
+ */
+export type SiteAccessRole = { _id: string; name: string; type?: string };
+export type SiteAccessRow = {
+  site: string;
+  name: string;
+  membership: { role: string; roleName?: string } | null;
+  roles: SiteAccessRole[];
+};
+export type SiteChoice = { site: string; name: string; on: boolean; role: string; roles: SiteAccessRole[]; replacedRole?: string };
+
+/** Start from what the member has now. A current role that is not one of the site's roles is dropped. */
+export function initialChoices(rows: SiteAccessRow[]): SiteChoice[] {
+  return (rows ?? []).map((r) => {
+    const current = r.membership?.role ?? "";
+    const valid = r.roles.some((x) => x._id === current);
+    return {
+      site: r.site, name: r.name, on: !!r.membership, role: valid ? current : "", roles: r.roles ?? [],
+      // their current role here is not one of this site's own roles (e.g. an
+      // organisation role from an invitation) - say so rather than blank it silently
+      ...(r.membership && !valid ? { replacedRole: r.membership.roleName || "their current role" } : {}),
+    };
+  });
+}
+
+/** Role names offered by "Same role for all selected sites". */
+export function sharedRoleNames(choices: SiteChoice[]): string[] {
+  const names = new Set<string>();
+  for (const c of choices) if (c.on) for (const r of c.roles) names.add(r.name);
+  return [...names].sort((a, b) => a.localeCompare(b));
+}
+
+/** Give every selected site the role with this name, where that site has one. */
+export function applySameRole(choices: SiteChoice[], roleName: string): SiteChoice[] {
+  return choices.map((c) => {
+    if (!c.on) return c;
+    const match = c.roles.find((r) => r.name === roleName);
+    return match ? { ...c, role: match._id } : c;
+  });
+}
+
+/** What to send, and what still blocks saving (a chosen site with no role). */
+export function toPayload(choices: SiteChoice[]): { sites: Array<{ site: string; role: string }>; missing: string[] } {
+  const chosen = choices.filter((c) => c.on);
+  return {
+    sites: chosen.filter((c) => c.role).map((c) => ({ site: c.site, role: c.role })),
+    missing: chosen.filter((c) => !c.role).map((c) => c.name),
+  };
+}