@goweekdays/layer-common 1.0.0 → 1.0.2

package/composables/useUser.ts

@@ -1,48 +1,55 @@
 export default function useUser() {
-  function inviteUser({ email = "", app = "", role = "", name = "" } = {}) {
-    return useNuxtApp().$api<TKeyValuePair>("/api/auth/invite", {
+  function inviteUser({
+    email = "",
+    app = "",
+    role = "",
+    roleName = "",
+    org = "",
+    orgName = "",
+  } = {}) {
+    return useNuxtApp().$api<Record<string, any>>("/api/auth/invite", {
       method: "POST",
-      body: { email, app, role, name },
+      body: { email, app, role, roleName, org, orgName },
     });
   }
 
   function updateName({ firstName = "", lastName = "" } = {}) {
-    return useNuxtApp().$api<TKeyValuePair>("/api/users/name", {
+    return useNuxtApp().$api<Record<string, any>>("/api/users/name", {
       method: "PUT",
       body: { firstName, lastName },
     });
   }
 
   function updateBirthday({ month = "", day = 0, year = 0 } = {}) {
-    return useNuxtApp().$api<TKeyValuePair>("/api/users/birthday", {
+    return useNuxtApp().$api<Record<string, any>>("/api/users/birthday", {
       method: "PUT",
       body: { month, day, year },
     });
   }
 
   function updateGender(gender = "") {
-    return useNuxtApp().$api<TKeyValuePair>("/api/users/gender", {
+    return useNuxtApp().$api<Record<string, any>>("/api/users/gender", {
       method: "PUT",
       body: { gender },
     });
   }
 
   function updateEmail(email = "") {
-    return useNuxtApp().$api<TKeyValuePair>("/api/users/email", {
+    return useNuxtApp().$api<Record<string, any>>("/api/users/email", {
       method: "PUT",
       body: { email },
     });
   }
 
   function updateContact(contact = "") {
-    return useNuxtApp().$api<TKeyValuePair>("/api/users/contact", {
+    return useNuxtApp().$api<Record<string, any>>("/api/users/contact", {
       method: "PUT",
       body: { contact },
     });
   }
 
   function updateUserFieldById(id = "", field = "", value = "") {
-    return useNuxtApp().$api<TKeyValuePair>(`/api/users/field/${id}`, {
+    return useNuxtApp().$api<Record<string, any>>(`/api/users/field/${id}`, {
       method: "PATCH",
       body: { field, value },
     });
@@ -54,14 +61,14 @@ export default function useUser() {
     search = "",
     page = 1,
   } = {}) {
-    return useNuxtApp().$api<TKeyValuePair>("/api/users", {
+    return useNuxtApp().$api<Record<string, any>>("/api/users", {
       method: "GET",
       query: { status, search, page, type },
     });
   }
 
   function getById(id = "") {
-    return useNuxtApp().$api<TKeyValuePair>(`/api/users/id/${id}`, {
+    return useNuxtApp().$api<Record<string, any>>(`/api/users/id/${id}`, {
       method: "GET",
     });
   }
@@ -74,7 +81,7 @@ export default function useUser() {
     referralCode = "",
     type = "",
   } = {}) {
-    return useNuxtApp().$api<TKeyValuePair>(`/api/users/invite/${id}`, {
+    return useNuxtApp().$api<Record<string, any>>(`/api/users/invite/${id}`, {
       method: "POST",
       body: { firstName, lastName, password, referralCode, type },
     });

package/composables/useUtils.ts

@@ -199,23 +199,32 @@ export default function useUtils() {
   // console.log(formatNumber(1234.56, { useSymbol: true, currency: "EUR", locale: "de-DE" })); // "1.234,56 €"
   // console.log(formatNumber(1234.56, { useSymbol: true, currency: "EUR", locale: "de-DE", decimalPlaces: 0 })); // "1.234 €"
 
-  function computeTieredCost(seats: number, tiers: TPromoTier[]) {
+  function computeTieredCost(
+    seats: number,
+    tiers: { min: number; max: number; price: number }[],
+    remainingDays?: number,
+    totalDaysInMonth?: number
+  ) {
     let totalCost = 0;
 
-    for (let i = 0; i < tiers.length; i++) {
-      let { min, max, price } = tiers[i];
+    for (let i = 1; i <= seats; i++) {
+      for (const { min, max, price } of tiers) {
+        const effectiveMax = max === 0 ? Infinity : max;
 
-      if (max === 0) max = Infinity; // Handle unlimited tier
+        if (i >= min && i <= effectiveMax) {
+          // Prorate the cost for this seat based on its tier price
+          if (remainingDays && totalDaysInMonth) {
+            totalCost += price * (remainingDays / totalDaysInMonth);
+            break;
+          }
 
-      if (seats >= min) {
-        let seatsInTier = Math.min(seats, max) - min + 1;
-        totalCost += seatsInTier * price;
+          totalCost += price;
+          break; // Stop checking once we apply the correct tier pricing
+        }
       }
-
-      if (seats <= max) break; // Stop when all seats are counted
     }
 
-    return totalCost;
+    return totalCost; // This now returns the total prorated cost
   }
 
   function convertPermissionsToArray(permissions: TPermissions) {
@@ -232,6 +241,30 @@ export default function useUtils() {
     };
   }
 
+  function getRouteParam(field = "") {
+    if (!field) return "";
+
+    return (useRoute().params[field] as string) ?? "";
+  }
+
+  function replaceMatch(str: string, match: string, replace: string) {
+    return str.replace(new RegExp(match, "g"), replace);
+  }
+
+  function setRouteParams(...args: Array<Record<string, string>>) {
+    const params: Record<string, string> = {};
+
+    args.forEach((arg) => {
+      Object.entries(arg).forEach(([key, value]) => {
+        if (value !== undefined && value !== null && value !== "") {
+          params[key] = value;
+        }
+      });
+    });
+
+    return params;
+  }
+
   return {
     requiredRule,
     emailRule,
@@ -254,5 +287,8 @@ export default function useUtils() {
     requireListRule,
     convertPermissionsToArray,
     extractMonthYear,
+    getRouteParam,
+    replaceMatch,
+    setRouteParams,
   };
 }

package/composables/useVerification.ts

@@ -5,10 +5,11 @@ export default function useUser() {
     search = "",
     page = 1,
     email = "",
+    app = "",
   } = {}) {
-    return useNuxtApp().$api<TKeyValuePair>("/api/verifications", {
+    return useNuxtApp().$api<Record<string, any>>("/api/verifications", {
       method: "GET",
-      query: { status, search, page, type, email },
+      query: { status, search, page, type, email, app },
     });
   }
 

package/nuxt.config.ts

@@ -25,9 +25,7 @@ export default defineNuxtConfig({
       APP_AFFILIATE: (process.env.APP_AFFILIATE as string) ?? "",
       APP_INVENTORY: (process.env.APP_INVENTORY as string) ?? "",
       APP_ASSET: (process.env.APP_ASSET as string) ?? "",
-      APP_ACCOUNTING: (process.env.APP_ACCOUNTING as string) ?? "",
-      APP_BOOK_KEEPING: (process.env.APP_BOOK_KEEPING as string) ?? "",
-      APP_ZONAL: (process.env.APP_ZONAL as string) ?? "",
+      APP_FINANCE: (process.env.APP_FINANCE as string) ?? "",
     },
   },
 

package/package.json

@@ -2,7 +2,7 @@
   "name": "@goweekdays/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "main": "./nuxt.config.ts",
   "publishConfig": {
     "access": "public"

package/types/org.d.ts

@@ -5,6 +5,7 @@ declare type TOrg = {
   contact: string;
   busInst: string;
   type: string;
+  apps?: Array<string>;
   createdAt?: string;
   updatedAt?: string;
   status?: string;

package/types/role.d.ts

@@ -3,6 +3,7 @@ declare type TRole = {
   name?: string;
   permissions?: Array<string>;
   type?: string;
+  org?: string;
   status?: string;
   default?: boolean;
   createdBy?: string;

package/types/user.d.ts

@@ -7,8 +7,10 @@ declare type TUser = {
   lastName: string;
   suffix?: string;
   birthMonth?: string;
-  birthDate?: string;
+  birthDay?: string;
   birthYear?: string;
+  gender?: string;
+  contact?: string;
   profile?: string;
   defaultOrg?: string;
   createdAt: string;

package/composables/useAdminPermission.ts

@@ -1,127 +0,0 @@
-export default function useAdminPermission() {
-  const permissions: TPermissions = {
-    organizations: {
-      "see-all-organizations": {
-        check: true,
-        description: "Allows the user to view the list of all organizations.",
-      },
-      "see-organization-details": {
-        check: true,
-        description:
-          "Allows the user to view the details of a specific organization.",
-      },
-    },
-    "promo-codes": {
-      "create-promo-code": {
-        check: true,
-        description: "Allows the user to add new promo codes to the system.",
-      },
-      "see-promo-code-details": {
-        check: true,
-        description:
-          "Allows the user to view the details of a specific promo code.",
-      },
-      "edit-promo-code-details": {
-        check: true,
-        description:
-          "Allows the user to update the promo code’s name, discount value, and other settings.",
-      },
-      "change-promo-code-status": {
-        check: true,
-        description:
-          "Allows the user to activate, deactivate, or expire a promo code.",
-      },
-      "delete-promo-code": {
-        check: true,
-        description:
-          "Allows the user to remove a promo code from the system permanently.",
-      },
-    },
-    users: {
-      "see-all-users": {
-        check: true,
-        description: "Allows the user to view the list of all users.",
-      },
-      "see-user-details": {
-        check: true,
-        description: "Allows the user to view the details of a specific user.",
-      },
-    },
-    invitations: {
-      "see-all-invitations": {
-        check: true,
-        description: "Allows the user to view the list of all invitations.",
-      },
-      "see-invitation-details": {
-        check: true,
-        description:
-          "Allows the user to view the details of a specific invitation.",
-      },
-      "edit-invitation-details": {
-        check: true,
-        description:
-          "Allows the user to update the details of a specific invitation.",
-      },
-      "change-invitation-status": {
-        check: true,
-        description: "Allows the user to update the status of an invitation.",
-      },
-      "delete-invitation": {
-        check: true,
-        description:
-          "Allows the user to remove an invitation from the system permanently.",
-      },
-    },
-    members: {
-      "see-all-members": {
-        check: true,
-        description: "Allows the user to view the list of all members.",
-      },
-      "see-member-details": {
-        check: true,
-        description:
-          "Allows the user to view the details of a specific member.",
-      },
-      "change-member-status": {
-        check: true,
-        description: "Allows the user to update the status of a member.",
-      },
-      "remove-member": {
-        check: true,
-        description: "Allows the user to remove a member from the system.",
-      },
-    },
-    "roles-and-permissions": {
-      "view-all-roles": {
-        check: true,
-        description: "Allows the user to view the list of all roles.",
-      },
-      "view-role-details": {
-        check: true,
-        description: "Allows the user to view the details of a specific role.",
-      },
-      "update-role-name": {
-        check: true,
-        description: "Allows the user to edit the name of an existing role.",
-      },
-      "update-role-permissions": {
-        check: true,
-        description:
-          "Allows the user to modify permissions assigned to a role.",
-      },
-      "update-role-status": {
-        check: true,
-        description: "Allows the user to activate or deactivate a role.",
-      },
-      "delete-role": {
-        check: true,
-        description:
-          "Allows the user to remove a role from the system permanently.",
-      },
-    },
-  };
-
-  return {
-    permissions,
-  };
-}