@apptimate/core-lib 6.4.0 → 6.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apptimate/core-lib",
-  "version": "6.4.0",
+  "version": "6.6.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "publishConfig": {

package/src/api-services/finance-shared.client.ts

@@ -0,0 +1,55 @@
+import { sendRequest, IApiResponse } from "../index";
+
+const BASE = `${process.env.NEXT_PUBLIC_API_URL}/api/finance`;
+
+function preparePayload(payload: any) {
+  if (payload.attachments && payload.attachments.length > 0) {
+    const formData = new FormData();
+    Object.keys(payload).forEach((key) => {
+      if (key === "attachments") {
+        payload.attachments.forEach((file: File) => formData.append("attachments[]", file));
+      } else if (key === "payments" && Array.isArray(payload.payments)) {
+        payload.payments.forEach((p: any, index: number) => {
+          formData.append(`payments[${index}][payment_method]`, p.payment_method);
+          formData.append(`payments[${index}][payment_amount]`, String(p.payment_amount));
+          if (p.bank_account_id) {
+            formData.append(`payments[${index}][bank_account_id]`, String(p.bank_account_id));
+          }
+        });
+      } else {
+        if (payload[key] !== null && payload[key] !== undefined) {
+          formData.append(key, String(payload[key]));
+        }
+      }
+    });
+    return formData;
+  }
+  return payload;
+}
+
+export async function recordDirectExpenseShared(payload: any): Promise<IApiResponse> {
+  const url = `${BASE}/direct-transactions/expense`;
+  const response = await sendRequest({
+    url,
+    method: "POST",
+    data: preparePayload(payload),
+  });
+  return response.responseData as IApiResponse;
+}
+
+export async function getPaymentModesShared(): Promise<IApiResponse> {
+  const response = await sendRequest({ url: `${BASE}/payment-modes`, method: "GET" });
+  return response.responseData as IApiResponse;
+}
+
+export async function getBankAccountsLookupShared(): Promise<IApiResponse> {
+  const response = await sendRequest({ url: `${BASE}/bank-accounts/lookup`, method: "GET" });
+  return response.responseData as IApiResponse;
+}
+
+export async function getChartOfAccountsLookupShared(type?: string): Promise<IApiResponse> {
+  const params: any = {};
+  if (type) params.type = type;
+  const response = await sendRequest({ url: `${BASE}/chart-of-accounts/lookup`, method: "GET", params });
+  return response.responseData as IApiResponse;
+}

package/src/api-services/hr-attendance-shifts.client.ts

@@ -72,9 +72,14 @@ export const getAttendanceDays = async (employeeId: string | number, startDate:
   if (workforceId) params.workforce_id = workforceId;
   const queryParams = new URLSearchParams(params);
 
-  const url = employeeId === 'me'
-    ? `${BASE_URL}/ess/me/attendance/days?${queryParams.toString()}`
-    : `${BASE_URL}/attendance/days?${queryParams.toString()}`;
+  let url = '';
+  if (employeeId === 0 && (projectId || workforceId)) {
+    url = `${process.env.NEXT_PUBLIC_API_URL}/api/construction/workforce/attendance-days?${queryParams.toString()}`;
+  } else {
+    url = employeeId === 'me'
+      ? `${BASE_URL}/ess/me/attendance/days?${queryParams.toString()}`
+      : `${BASE_URL}/attendance/days?${queryParams.toString()}`;
+  }
 
   const response = await sendRequest({ url, method: "GET" });
   return response.responseData as IApiResponse;

package/src/api-services/hr-attendance.client.ts

@@ -8,7 +8,7 @@ export async function punchAttendance(data: any): Promise<IApiResponse> {
   return response.responseData as IApiResponse;
 }
 
-export async function bulkPunchAttendance(data: { punches: any[] }): Promise<IApiResponse> {
+export async function bulkPunchAttendance(data: { punches: any[], payment_account_id?: number }): Promise<IApiResponse> {
   const response = await sendRequest({ url: `${BASE_URL}/punches/bulk`, method: "POST", data });
   return response.responseData as IApiResponse;
 }

package/src/index.ts

@@ -17,3 +17,4 @@ export * from './api-services/hr-shift-templates.client';
 export * from './api-services/hr-employees.client';
 export * from './api-services/email-services.client';
 export * from './api-services/email-templates.client';
+export * from "./api-services/finance-shared.client";

package/src/utils/httpClient.ts

@@ -57,9 +57,18 @@ export function buildBrowserProxyUrl(rawUrl: string): string {
     }
 
     try {
+        // If rawUrl is undefined/api/... (due to missing process.env), fix it
+        if (rawUrl.startsWith('undefined/')) {
+            rawUrl = rawUrl.replace('undefined/', '/');
+        }
+
         const parsedUrl = new URL(rawUrl, window.location.origin);
 
         if (parsedUrl.origin === window.location.origin) {
+            if (parsedUrl.pathname.startsWith('/api/') && !parsedUrl.pathname.startsWith('/api/proxy') && !parsedUrl.pathname.startsWith('/api/session')) {
+                const proxyPath = parsedUrl.pathname.replace(/^\/+/, '');
+                return `/api/proxy/${proxyPath}${parsedUrl.search}`;
+            }
             return parsedUrl.toString();
         }