@7365admin1/layer-common 1.11.46 → 1.11.48

package/components/VehicleManagement.vue

@@ -17,13 +17,9 @@
       <template #item.block="{ value }">
         {{ value ? `Blk ${value}` : "" }}
       </template>
-      <!-- <template #item.status="{ value }">
-        <v-chip :color="formatVehicleStatus(value).color" size="x-small" dark>
-          {{ formatVehicleStatus(value).label }}
-        </v-chip>
-
-
-      </template> -->
+      <template #item.nric="{ value }">
+       {{ maskNRIC(value) }}
+      </template>
 
       <template #item.plates="{ value, item }">
         <PlateNumberDisplay :plate-numbers="value" :default-value="item.plateNumber" />
@@ -61,7 +57,12 @@
           <v-row no-gutters class="ga-1 mb-5">
 
             <template v-for="(label, key) in formattedFields" :key="key">
-              <v-col v-if="key === 'plates'" class="d-flex flex-column ga-2">
+
+              <v-col v-if="key === 'nric' && selectedVehicleObject['nric']" cols="12">
+                <span class="d-flex ga-3 align-center"><strong>{{ label }}:</strong> {{ maskNRIC(selectedVehicleObject[key]) }}</span>
+              </v-col>
+
+              <v-col v-else-if="key === 'plates'" class="d-flex flex-column ga-2">
                 <span class="d-flex ga-3 align-center"><strong>{{ label }}:</strong></span>
                 <!-- <PlateNumberDisplay :plate-numbers="selectedVehicleObject[key]" show-all :default-value="selectedVehicleObject.plateNumber" />   -->
                 <v-col cols="12">
@@ -186,7 +187,7 @@ const plateHeaders = [
 
 
 
-const { formatCamelCaseToWords, formatDate, debounce } = useUtils();
+const { formatCamelCaseToWords, formatDate, debounce, maskNRIC } = useUtils();
 const { getVehicles, deleteVehicle, formatVehicleStatus, approveVehicle, updateVehicle, getSpecificVehicleById } = useVehicle();
 
 const items = ref<Array<Record<string, any>>>([]);

package/components/VisitorManagement.vue

@@ -340,6 +340,11 @@
                   :disabled="loading.checkingOut" @click="handleCheckout(selectedVisitorId as string)" />
               </span>
 
+              <span v-else-if="
+                key === 'nric' && selectedVisitorObject['nric']" class="d-flex align-center">
+                <strong>{{ label }}:</strong>
+                <span class="ml-2">{{ maskNRIC(selectedVisitorObject[key]) }}</span>
+              </span>
               <span v-else-if="key === 'attachments' && selectedVisitorObject?.[key]?.length > 0"
                 class="d-flex flex-column">
                 <strong class="w-full">{{ label }}:</strong>
@@ -349,7 +354,7 @@
                 </div>
               </span>
 
-              <span v-else-if="selectedVisitorObject[key]" class="d-flex ga-3 align-center"><strong>{{ label
+              <span v-else-if="selectedVisitorObject[key]" class="d-flex ga-3 align-start"><strong>{{ label
                   }}:</strong>
                 {{ formatValues(key, selectedVisitorObject[key]) }}
                 <TooltipInfo v-if="key === 'checkOut'" text="Manual Checkout" density="compact" size="x-small" />
@@ -602,6 +607,7 @@ const {
   formatDate,
   UTCToLocalTIme,
   standardFormatDate,
+  maskNRIC,
 } = useUtils();
 const { formatLocation } = useSecurityUtils();
 const { getFileUrlAnpr } = useFile();

package/composables/useANPRSettings.ts

@@ -0,0 +1,27 @@
+export default function () {
+  async function getANPRSettingBySite(data: any) {
+    return await useNuxtApp().$api<Record<string, any>>(
+      `/api/anpr-settings/get/v1`,
+      {
+        method: "POST",
+        body: data,
+      }
+    );
+  }
+  async function createUpdateANPRSettings(
+    data: any
+  ) {
+    return await useNuxtApp().$api<Record<string, any>>(
+      `/api/anpr-settings/v1`,
+      {
+        method: "POST",
+        body: data,
+      }
+    );
+  }
+
+  return {
+    getANPRSettingBySite,
+    createUpdateANPRSettings,
+  };
+}

package/composables/useAccessManagement.ts

@@ -306,8 +306,16 @@ export default function useAccessManagement() {
     );
   }
 
+  function assignUser(payload: { assignees: string[]; unit: string; type: string; acm_url: string }) {
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/access-management/assign-user`,
+      { method: "POST", body: payload }
+    );
+  }
+
   return {
     getResidents,
+    assignUser,
     getDoorAccessLevels,
     getLiftAccessLevels,
     getAccessGroups,

package/composables/useDocument.ts

@@ -3,18 +3,28 @@ export default function useDocument() {
     page = 1,
     search = "",
     limit = 10,
-    status = "active",
+    type = "all",
     site = "",
+    parentId = "",
+  }: {
+    page?: number;
+    search?: string;
+    limit?: number;
+    type?: string;
+    site?: string;
+    parentId?: string;
   } = {}) {
+    const query: Record<string, any> = {
+      page,
+      search,
+      limit,
+      site,
+      parentId,
+    };
+
     return useNuxtApp().$api<Record<string, any>>(`/api/documents`, {
       method: "GET",
-      query: {
-        page,
-        search,
-        limit,
-        status,
-        site,
-      },
+      query,
     });
   }
 
@@ -26,10 +36,13 @@ export default function useDocument() {
   }
 
   function deleteById(id: string) {
-    return useNuxtApp().$api<Record<string, any>>(`/api/documents/deleted/document`, {
-      method: "PUT",
-      query: { id },
-    });
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/documents/deleted/document`,
+      {
+        method: "PUT",
+        query: { id },
+      }
+    );
   }
 
   function updateById(id: string, value: any) {
@@ -39,6 +52,12 @@ export default function useDocument() {
     });
   }
 
+  function getById(id: string) {
+    return useNuxtApp().$api<Record<string, any>>(`/api/documents/${id}`, {
+      method: "GET",
+    });
+  }
+
   function getDocumentsBySiteId(siteId: string, type?: string) {
     return useNuxtApp().$api<Record<string, any>>(
       `/api/documents/site/${siteId}/type/${type}`,
@@ -48,11 +67,22 @@ export default function useDocument() {
     );
   }
 
+  function create(value: any) {
+    return add(value);
+  }
+
+  function createFolder(value: any) {
+    return add({ ...value, type: "folder" });
+  }
+
   return {
     getAll,
+    getById,
     add,
     deleteById,
     updateById,
     getDocumentsBySiteId,
+    create,
+    createFolder,
   };
 }

package/composables/useLocal.ts

@@ -50,6 +50,23 @@ export default function useLocal() {
     { title: "Pool Maintenance Services", value: "pool_maintenance_services" },
   ];
 
+  const natureOfBusinessV2 = [
+    {
+      title: "Property Management Services",
+      value: "property_management_agency",
+    },
+    { title: "Security Agency", value: "security_agency" },
+    { title: "Cleaning Services", value: "cleaning_services" },
+    {
+      title: "M&E Services",
+      value: "mechanical_electrical_services",
+    },
+    { title: "Landscaping Services", value: "landscaping_services" },
+    { title: "Pest Control Services", value: "pest_control_services" },
+    { title: "Pool Maintenance Services", value: "pool_maintenance_services" },
+  ];
+
+
   const landingPage = useCookie("landing-page", cookieConfig);
 
   const subjects = [
@@ -125,6 +142,7 @@ export default function useLocal() {
     apps,
     headerSearch,
     natureOfBusiness,
+    natureOfBusinessV2,
     landingPage,
     subjects,
   };

package/composables/useOrg.ts

@@ -107,31 +107,6 @@ export default function useOrg() {
     });
   }
 
-  /** Super Admin client list, etc.: filter by `organizations.status` (v1 API ignores status). */
-  function getAllV2({
-    page = 1,
-    search = "",
-    limit = 20,
-    nature = "",
-    status = "active",
-  }: {
-    page?: number;
-    search?: string;
-    limit?: number;
-    nature?: string;
-    status?: "active" | "suspended" | "deleted";
-  } = {}) {
-    return useNuxtApp().$api<Record<string, any>>("/api/organizations/v2", {
-      method: "GET",
-      query: {
-        page,
-        search,
-        limit,
-        nature,
-        status,
-      },
-    });
-  }
 
   function add(
     value: Partial<Pick<TOrg, "name" | "email" | "nature" | "contact">>
@@ -179,6 +154,64 @@ export default function useOrg() {
       }
     );
   }
+  function getAllV2({
+    page = 1,
+    search = "",
+    limit = 20,
+    nature = "",
+    status = "active",
+
+  }: {
+    page?: number;
+    search?: string;
+    limit?: number;
+    nature?: string;
+    status?: "active" | "suspended" | "deleted";
+  } = {}) {
+    return useNuxtApp().$api<Record<string, any>>("/api/organizations/v2", {
+      method: "GET",
+      query: {
+        page,
+        search,
+        limit,
+        nature,
+        status,
+      },
+    });
+  }
+
+  function getOrganizationsWithSubscription({
+    page = 1,
+    search = "",
+    limit = 20,
+    status = "active",
+    type = "",
+    billingCycle = "",
+  }: {
+    page?: number
+    search?: string
+    limit?: number
+    status?: "active" | "suspended" | "deleted"
+    type?: string
+    billingCycle?: string
+  } = {}) {
+    return useNuxtApp().$api<Record<string, any>>(
+      "/api/organizations/v2/orgs/subscriptions",
+      {
+        method: "GET",
+
+        query: {
+          page,
+          search,
+          limit,
+          status,
+          type,
+          billingCycle,
+        },
+      }
+    )
+  }
+
 
   return {
     org,
@@ -196,6 +229,7 @@ export default function useOrg() {
     add,
     addOnboardingOrg,
     updateOrg,
-    getOrgsByEmail
+    getOrgsByEmail,
+    getOrganizationsWithSubscription
   };
 }

package/composables/useUtils.ts

@@ -506,6 +506,19 @@ export default function useUtils() {
     return word[0].toUpperCase() + word.substring(1);
   }
 
+  
+function maskNRIC(value?: string) {
+  if(!value) return "";
+  if (value.length <= 4) {
+    return value;
+  }
+
+  const visiblePart = value.slice(-4);
+  const maskedPart = "*".repeat(value.length - 4);
+
+  return `${maskedPart}${visiblePart}`;
+}
+
   return {
     requiredRule,
     emailRule,
@@ -552,5 +565,6 @@ export default function useUtils() {
     getImage,
     standardFormatDate,
     getCapitalized,
+    maskNRIC
   };
 }

package/package.json

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

package/types/customer.d.ts

@@ -35,4 +35,10 @@ declare type TCustomerSite = {
   }
 };
 
-declare type TSiteCategory = "residential" | "commercial" | "industrial" | "institutional" | "mixed_development" | "infrastructure" | "hospitality"
+type TSiteCategory =
+  | "residential"
+  | "commercial"
+  | "shopping_mall"
+  | "mix_development"
+  | "industrial"
+  | "co_working_co_living";