@7365admin1/layer-common 1.11.9 → 1.11.11

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/layer-common
 
+## 1.11.11
+
+### Patch Changes
+
+- 9ee7b8c: Update Vehicle Form
+
+## 1.11.10
+
+### Patch Changes
+
+- f24ef5d: Update Version Avatar
+
 ## 1.11.9
 
 ### Patch Changes

package/components/Avatar/Main.vue

@@ -34,7 +34,7 @@ const props = defineProps({
 })
 
 
-const { getNameInitials } = useUtils();
+const { getNameInitials } = useUtils(); 
 const { getFileUrl } = useFile();
 
 const initials = computed(() => {

package/components/VehicleForm.vue

@@ -54,7 +54,7 @@
 
           <v-col v-if="shouldShowField('nric')" cols="12">
             <InputLabel class="text-capitalize" title="NRIC" required />
-            <InputNRICNumber v-model="vehicle.nric" density="comfortable" :rules="[requiredRule]"  :disabled="disablePrefilledInputs" />
+            <InputNRICNumber v-model="vehicle.nric" density="comfortable" :rules="[requiredRule]" :disabled="disablePrefilledInputs" />
           </v-col>
 
           <v-col v-if="shouldShowField('name')" cols="12">
@@ -62,7 +62,7 @@
               <v-col cols="12">
                 <InputLabel class="text-capitalize" title="Full Name" required />
                 <v-text-field v-model.trim="vehicle.name" density="comfortable" :rules="[requiredRule]"
-                  :disabled="disablePrefilledInputs" />
+                  />
               </v-col>
             </v-row>
           </v-col>
@@ -290,6 +290,7 @@ const vehicle = reactive<Omit<ExceptPartial<TVehicle>, 'type'> & { type: TVehicl
   site: prop.site,
   org: prop.org,
   _id: '',
+  peopleId: '',
 });
 
 const newPlateNumbers = ref<string[]>(['']);
@@ -516,14 +517,15 @@ async function submit() {
     }
 
 
-    const { plateNumber, type, category, name, phoneNumber, block, level, unit, nric, remarks, seasonPassType, start, end, site, org } = vehicle
+    const { plateNumber, type, category, name, phoneNumber, block, level, unit, nric, remarks, seasonPassType, start, end, site, org, peopleId } = vehicle
 
     let payload: Partial<TVehiclePayload> = {
       plateNumber: newPlateNumbers.value,
       name,
       phoneNumber,
       type: type === 'seasonpass' ? 'whitelist' : type, // season pass will be created as whitelist type in backend with additional seasonPassType field,
-      nric
+      nric,
+      peopleId
     };
 
     if (prop.mode === 'add') {
@@ -652,6 +654,7 @@ function selectPeopleRecord(record: TPeople) {
   vehicle.plates = record.plates || [];
   disablePrefilledInputs.value = true;
   showMatchingPeopleDialog.value = false;
+  vehicle.peopleId = record._id || '';
 }
 
 
@@ -696,7 +699,7 @@ async function checkPeopleById() {
   // Lock editable fields while we verify if this NRIC has existing records.
   disablePrefilledInputs.value = true;
   try {
-    const res = await getPeopleByUnit(vehicle.unit) as TPeople[]| null;
+    const res = await getPeopleByUnit(vehicle.unit, { status: 'active', type: 'resident,tenant' }) as TPeople[]| null;
 
     if (Array.isArray(res) && res.length > 0) {
       matchingPeople.value = res || []
@@ -736,7 +739,7 @@ const resetVehicleDetails = () => {
   vehicle.phoneNumber = '';
   vehicle.plates = [];
   vehicle.nric = '';
-  disablePrefilledInputs.value = false;
+  vehicle.peopleId = '';
 }
 
 

package/composables/useFacilityBookings.ts

@@ -254,17 +254,19 @@ export default function useFacilityBookings() {
     remarks = "",
     status = "",
     site = "",
+    userType,
     updatedBy,
   }: {
     _ids?: string[];
     remarks?: string;
     status?: string;
     site?: string;
+    userType?: string;
     updatedBy?: string;
   }) {
     return useNuxtApp().$api("/api/facilities-booking/update-booking/v1", {
       method: "POST",
-      body: { _ids, remarks, status, site, updatedBy },
+      body: { _ids, remarks, status, site, userType, updatedBy },
     });
   }
 

package/composables/useKey.ts

@@ -331,16 +331,20 @@ export default function useKey() {
   }
 
   async function getKeyWithSequence(
-    { site, _id } = {} as {
+    { site, _id, userType, updatedBy } = {} as {
       site?: string;
       _id?: string;
+      userType?: string;
+      updatedBy?: string;
     }
   ) {
     const response = useNuxtApp().$api<TKeyLog[]>(keyLogApiUrl, {
       method: "PUT",
-      query: {
+      body: {
         site,
         _id,
+        userType,
+        updatedBy,
       },
     });
     keyList.value = response;

package/composables/usePassKey.ts

@@ -228,12 +228,16 @@ export default function usePassKey() {
       site = "",
       quantity = 0,
       nextNumber = 0,
+      userType,
+      updatedBy,
     } = {} as {
       template?: any | null;
       passType?: any | null;
       site?: any;
       quantity?: number | null;
       nextNumber: number;
+      userType?: string;
+      updatedBy?: string;
     }
   ) {
     return useNuxtApp().$api("/api/keys/generate/v1", {
@@ -244,6 +248,8 @@ export default function usePassKey() {
         site,
         quantity,
         nextNumber,
+        userType,
+        updatedBy,
       },
     });
   }

package/composables/usePayment.ts

@@ -168,9 +168,25 @@ export default function useRedDot() {
     );
   }
 
-  /**
-   * COMPLEX BUSINESS LOGIC FROM BE IS HERE:
-   * **/
+  function createRDPAccount(payload: TReddotCreateAccount) {
+    return useNuxtApp().$api("/api/payment-gateways/v1", {
+      method: "POST",
+      body: payload,
+    });
+  }
+
+  function getBySiteTypeMethod(
+    site: string,
+    paymentType: string,
+    paymentMethod: string,
+    userType: string
+  ) {
+    const payload = { site, paymentType, paymentMethod, userType };
+    return useNuxtApp().$api("/api/payment-gateways/get/v1", {
+      method: "POST",
+      body: payload,
+    });
+  }
 
   return {
     item,
@@ -187,5 +203,7 @@ export default function useRedDot() {
     getMerchantDetailsById,
     getCartById,
     cancelCart,
+    createRDPAccount,
+    getBySiteTypeMethod,
   };
 }

package/composables/usePeople.ts

@@ -94,7 +94,7 @@ export default function () {
       `/api/people/unit/${_id}`,
       {
         method: "GET",
-        query: { status },
+        query: { status, type },
       }
     );
   }

package/composables/useTemplateReusable.ts

@@ -7,6 +7,7 @@ export default function useTemplateReusable() {
     updatedBy?: string;
     site: string;
     status?: string;
+    userType?: string;
     A4Enabled?: boolean;
     A4Orientation?: string;
     A4FrontWysiwyg?: string;
@@ -55,6 +56,7 @@ export default function useTemplateReusable() {
         updatedBy,
         site,
         status = "",
+        userType,
         A4Enabled = false,
         A4Orientation = "portrait",
         A4FrontWysiwyg = "",
@@ -93,7 +95,7 @@ export default function useTemplateReusable() {
         CCBackQREnabled = false,
         CCFrontQREnabled = false,
         // prefixKey = "",
-      } = {} as TQrCodeTemplate,
+      } = {} as TQrCodeTemplate
     ) {
       this._id = _id;
       this.name = name;
@@ -102,6 +104,7 @@ export default function useTemplateReusable() {
       this.updatedBy = updatedBy;
       this.site = site;
       this.status = status;
+      this.userType = userType;
       this.A4Enabled = A4Enabled;
       this.A4Orientation = A4Orientation;
       this.A4FrontWysiwyg = A4FrontWysiwyg;
@@ -145,11 +148,11 @@ export default function useTemplateReusable() {
   const tab = useState("templatesTab", () => "active");
   const templateQrCode = useState(
     "templateQrCode",
-    () => new MQrCodeTemplate(),
+    () => new MQrCodeTemplate()
   );
   const templateQrCodes = useState(
     "templateQrCodes",
-    (): TQrCodeTemplate[] => [],
+    (): TQrCodeTemplate[] => []
   );
   const page = useState("templatesPage", () => 1);
   const pages = useState("templatesPages", () => 0);
@@ -166,7 +169,7 @@ export default function useTemplateReusable() {
     templateQrCode.value = data || new MQrCodeTemplate();
   }
 
-   function setTemplates(
+  function setTemplates(
     {
       _id,
       sites,
@@ -181,11 +184,11 @@ export default function useTemplateReusable() {
       name?: string;
       statuses?: string[];
       //date?: any;
-    },
+    }
   ) {
     try {
       isTemplatesLoading.value = true;
-      const _templateQrCodes: any =  getTemplatesByPageSearch({
+      const _templateQrCodes: any = getTemplatesByPageSearch({
         _id,
         page: page.value,
         search: search,
@@ -207,7 +210,7 @@ export default function useTemplateReusable() {
     }
   }
 
-   function getTemplatesByPageSearch({
+  function getTemplatesByPageSearch({
     _id = "",
     page = 1,
     search = "",
@@ -215,8 +218,8 @@ export default function useTemplateReusable() {
     limit = 10,
     sites = [],
     statuses = [],
-    //date = "",
-  }: {
+  }: //date = "",
+  {
     _id?: string;
     page?: number;
     search?: string;
@@ -226,44 +229,43 @@ export default function useTemplateReusable() {
     statuses?: string[];
     //date?: any;
   }) {
-      return useNuxtApp().$api("/api/qr-code-templates/v1", {
-        method: "PATCH",
-        body: {
-          _id,
-          page,
-          search,
-          name,
-          limit,
-          sites,
-          statuses,
-        },
-      });
+    return useNuxtApp().$api("/api/qr-code-templates/v1", {
+      method: "PATCH",
+      body: {
+        _id,
+        page,
+        search,
+        name,
+        limit,
+        sites,
+        statuses,
+      },
+    });
   }
 
   type HttpMethod = "GET" | "POST" | "PUT" | "DELETE" | "PATCH";
 
-   function getTemplatesByPageSearchReusable({
+  function getTemplatesByPageSearchReusable({
     dataArgument,
     method = "GET",
   }: {
     dataArgument: any;
     method?: HttpMethod;
   }) {
-      return  useNuxtApp().$api("/api/qr-code-templates/v1", {
-        method,
-        body: dataArgument,
-      });
+    return useNuxtApp().$api("/api/qr-code-templates/v1", {
+      method,
+      body: dataArgument,
+    });
   }
 
-   function addQrCodeTemplate(templateQrCode: TQrCodeTemplate) {
-      return  useNuxtApp().$api("/api/qr-code-templates/v1", {
-        method: "POST",
-        body: new MQrCodeTemplate(templateQrCode),
-      });
-   
+  function addQrCodeTemplate(templateQrCode: TQrCodeTemplate) {
+    return useNuxtApp().$api("/api/qr-code-templates/v1", {
+      method: "POST",
+      body: JSON.stringify(new MQrCodeTemplate(templateQrCode)),
+    });
   }
 
-   function updateTemplateStatus({
+  function updateTemplateStatus({
     _id,
     site,
     status,
@@ -272,10 +274,10 @@ export default function useTemplateReusable() {
     site?: string;
     status?: string;
   }) {
-      return useNuxtApp().$api("/api/qr-code-templates/v1", {
-        method: "PUT",
-        body: { _id, site, status },
-      });
+    return useNuxtApp().$api("/api/qr-code-templates/v1", {
+      method: "PUT",
+      body: { _id, site, status },
+    });
   }
 
   function nextPage(
@@ -289,7 +291,7 @@ export default function useTemplateReusable() {
       search?: string;
 
       statuses?: string[];
-    },
+    }
   ) {
     page.value++;
     setTemplates({
@@ -311,7 +313,7 @@ export default function useTemplateReusable() {
       search?: string;
 
       statuses?: string[];
-    },
+    }
   ) {
     page.value--;
     setTemplates({

package/package.json

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

package/types/payment.d.ts

@@ -0,0 +1,51 @@
+declare interface TPayment extends IBaseModel {
+  orderId: string;
+  amount: number;
+  googlePayToken: any;
+}
+
+declare type TStripeCreateAccount = {
+  country: string;
+  email: string;
+};
+
+declare type TStripeCreateAccountResponse = {
+  accountLink: any;
+  accountId: string;
+};
+
+declare interface TPaymentRequest {
+  apiVersion: number;
+  apiVersionMinor: number;
+  allowedPaymentMethods: [
+    {
+      type: string;
+      parameters: {
+        allowedAuthMethods: string[];
+        allowedCardNetworks: string[];
+      };
+      tokenizationSpecification: {
+        type: string;
+        parameters: {
+          gateway: string;
+          gatewayMerchantId: string;
+        };
+      };
+    },
+  ];
+  merchantInfo: {
+    merchantId: string;
+    merchantName: string;
+  };
+  transactionInfo: {
+    totalPriceStatus: string;
+    totalPrice: number;
+    currencyCode: string;
+    countryCode: string;
+  };
+}
+
+declare type TReddotCreateAccount = {
+  merchant_id: string;
+  secret_key: string;
+};

package/types/qr-code-template.d.ts

@@ -6,6 +6,7 @@ declare type TQrCodeTemplate = {
   updatedBy?: string;
   site: string;
   status?: string;
+  userType?: string;
   A4Enabled?: boolean;
   A4Orientation?: string;
   A4FrontWysiwyg?: string;

package/types/vehicle.d.ts

@@ -19,6 +19,7 @@ declare type TVehicle = {
   _id?: string;
   recNo?: string;
   status?: TVehicleStatus;
+  peopleId?: string; // For linking to a people record, if applicable
 };
 
 declare type TVehicleType = "whitelist" | "blocklist";
@@ -41,4 +42,5 @@ declare type TVehiclePayload = Pick<
   | "end"
   | "site"
   | "org"
+  | "peopleId"
 > & { plateNumber: string[] };