@7365admin1/layer-common 3.2.2-staging.106 → 3.2.2-staging.108

package/components/VisitorForm.vue

@@ -260,6 +260,8 @@
               :loading="entryPassSettingsPending || siteDataPending" :site-id="prop.site"
               :unit-id="visitor.unit || null" :visitor-type="prop.type" :hid-qr-code-enabled="hidQrCodePassAllowed"
               :hid-qr-printer-configured="hasHidQrPrinterConfig"
+              :hid-reader-name="hidQrReader?.name || ''"
+              :hid-portal-name="hidQrReader?.portalName || ''"
               @update:available-qr-count="(val) => availableQrCount = val" />
           </v-col>
 
@@ -269,6 +271,7 @@
               :settings="entryPassSettings" :settings-loading="entryPassSettingsPending || siteDataPending"
               :unit-id="visitor.unit || null" :hid-qr-code-enabled="hidQrCodePassAllowed"
               :hid-qr-printer-configured="hasHidQrPrinterConfig"
+              :hid-reader-name="hidQrReader?.name || ''" :hid-portal-name="hidQrReader?.portalName || ''"
               :selected-nfc-cards="passType === 'NFC' ? passCards : []" />
           </v-col>
 
@@ -533,6 +536,9 @@
           </v-btn>
 
           <div class="text-h6 font-weight-bold">{{ visitor.name }}</div>
+          <div v-if="hidQrReader?.portalName" class="text-caption text-medium-emphasis mt-1">
+            {{ hidQrReader.name || "HID Reader" }} · {{ hidQrReader.portalName }}
+          </div>
           <div v-if="hidQrPreview.expiresAt" class="text-caption text-medium-emphasis mt-1">
             Valid until {{ formatHidQrExpiry(hidQrPreview.expiresAt) }}
           </div>
@@ -668,7 +674,7 @@ const {
 const { getBySiteId: getEntryPassSettingsBySiteId } =
   useSiteEntryPassSettings();
 const { createVisitorPass, signQr } = useAccessManagement();
-const { issueVisitorQr } = useHidAmico();
+const { getReaders, issueVisitorQr } = useHidAmico();
 const { testConnection } = useWebUsb();
 const {
   findPersonByNRIC,
@@ -877,6 +883,23 @@ const hidQrValidityMinutes = computed(() => {
 });
 
 const hidQrReaderId = computed(() => String(hidQrCodePassConfig.value?.readerId || ""));
+const hidQrReader = ref<Record<string, any> | null>(null);
+
+watch(
+  [hidQrReaderId, () => prop.site],
+  async ([readerId, site]) => {
+    hidQrReader.value = null;
+    if (!readerId || !site) return;
+    try {
+      const response = await getReaders({ site, page: 1, limit: 100 });
+      const readers = response?.items ?? response?.data?.items ?? response?.data?.readers ?? [];
+      hidQrReader.value = readers.find((reader: Record<string, any>) => String(reader._id) === readerId) || null;
+    } catch {
+      hidQrReader.value = null;
+    }
+  },
+  { immediate: true },
+);
 
 const hidQrCodePassAllowed = computed(() => {
   return (
@@ -2100,6 +2123,12 @@ function validateHidQrReaderConfig() {
     return false;
   }
 
+  if (!hidQrReader.value?.portalId || !hidQrReader.value?.portalName) {
+    errorMessage.value =
+      "The selected HID reader has no portal configured. Reconnect the reader and select a portal before generating a QR code.";
+    return false;
+  }
+
   return true;
 }
 

package/composables/useHidAmico.ts

@@ -6,6 +6,8 @@ type HidReaderPayload = {
   username?: string;
   password?: string;
   deviceId?: string;
+  portalId?: number;
+  portalName?: string;
   monitorPath?: string;
   enabled?: boolean;
   status?: string;
@@ -34,6 +36,9 @@ type HidVisitorQrData = {
   hidUserId: number;
   qrValue: string;
   qrFormat: "0";
+  portalId: number;
+  portalName: string;
+  readerName: string;
   issuedAt: string;
   expiresAt: string;
 };
@@ -189,6 +194,13 @@ export default function useHidAmico() {
     );
   }
 
+  function discoverReader(payload: Pick<HidReaderPayload, "baseUrl" | "username" | "password">) {
+    return useNuxtApp().$api<Record<string, any>>(`${basePath}/readers/discover`, {
+      method: "POST",
+      body: payload,
+    });
+  }
+
   function getUserPinStatus(readerId: string, hidUserId: string | number) {
     return useNuxtApp().$api<{ data: { pinEnrolled: boolean } }>(
       `${basePath}/readers/${readerId}/users/${hidUserId}/pin`,
@@ -294,6 +306,7 @@ export default function useHidAmico() {
 
   return {
     getReaders,
+    discoverReader,
     createReader,
     updateReader,
     deleteReader,

package/composables/useSubscriptionPlan.ts

@@ -0,0 +1,62 @@
+export default function useSubscriptionPlan() {
+  function getAll({
+    page = 1,
+    search = "",
+    limit = 10,
+    status = "active",
+    planType = "",
+    billingCycle = "",
+  } = {}) {
+    return useNuxtApp().$api<Record<string, any>>(`/api/subscription-plans`, {
+      method: "GET",
+      query: {
+        page,
+        search,
+        limit,
+        status,
+        planType,
+        billingCycle,
+      },
+    });
+  }
+  function add(value: any) {
+    return useNuxtApp().$api<Record<string, any>>("/api/subscription-plans", {
+      method: "POST",
+      body: value,
+    });
+  }
+  function getById(id: string) {
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/subscription-plans/id/${id}`,
+      {
+        method: "GET",
+      }
+    );
+  }
+  function updateById(id: string, value: any) {
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/subscription-plans/${id}`,
+      {
+        method: "PUT",
+        body: value,
+      }
+    );
+  }
+  function updateStatusById(id: string, status: "active" | "deactive") {
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/subscription-plans/${id}/status`,
+      {
+        method: "PATCH",
+        body: { status },
+      }
+    );
+  }
+
+  return {
+    getAll,
+    add,
+    getById,
+    updateById,
+    updateStatusById,
+  };
+}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "3.2.2-staging.106",
+  "version": "3.2.2-staging.108",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "publishConfig": {

package/types/subscription.ts

@@ -5,10 +5,8 @@ export type PlanType = "free_bundle" | "paid_bundle" | "custom_apps";
 export type BillingCycle = "monthly" | "annually";
 
 export interface AppOption {
-  id: string;
-  name: string;
-  monthlyPrice: number;
-  yearlyPrice: number;
+  title: string;
+  value: string;
 }
 
 export interface SubscriptionPlan {
@@ -32,6 +30,7 @@ export interface PlanFormState {
   bundleApps: string[];
   bundlePrice: number | null;
   customApps: string[];
+  customAppPrices: Record<string, number>;
 }
 
 export const PLAN_TYPE_LABEL: Record<PlanType, string> = {
@@ -40,12 +39,20 @@ export const PLAN_TYPE_LABEL: Record<PlanType, string> = {
   custom_apps: "Paid (Custom Apps)",
 };
 
-// Mock catalogue of applications that can be bundled into a plan.
+// Catalogue of applications that can be bundled into a plan.
 // Replace with data fetched from your backend.
-export const AVAILABLE_APPLICATIONS: AppOption[] = [
-  { id: "crm", name: "CRM", monthlyPrice: 49, yearlyPrice: 490 },
-  { id: "hrm", name: "HRM", monthlyPrice: 39, yearlyPrice: 390 },
-  { id: "accounting", name: "Accounting", monthlyPrice: 59, yearlyPrice: 590 },
-  { id: "inventory", name: "Inventory", monthlyPrice: 45, yearlyPrice: 450 },
-  { id: "pos", name: "POS", monthlyPrice: 69, yearlyPrice: 690 },
+export const APP_LIST: AppOption[] = [
+  { title: "Organization", value: "organization" },
+  { title: "Security Agency", value: "security_agency" },
+  { title: "Cleaning Services", value: "cleaning_services" },
+  { title: "Property Management Agency", value: "property_management_agency" },
+  { title: "Mechanical & Electrical Services", value: "mechanical_electrical_services" },
+  { title: "Pest Control Services", value: "pest_control_services" },
+  { title: "Landscaping Services", value: "landscaping_services" },
+  { title: "Pool Maintenance Services", value: "pool_maintenance_services" },
 ];
+
+// Static placeholder price applied to every app, for now.
+// Replace with real per-app pricing once that's available.
+export const STATIC_APP_MONTHLY_PRICE = 49;
+export const STATIC_APP_YEARLY_PRICE = 490;