@apptimate/ui 7.0.0 → 7.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apptimate/ui",
-  "version": "7.0.0",
+  "version": "7.1.0",
   "main": "src/index.tsx",
   "types": "src/index.tsx",
   "dependencies": {

package/src/common-components/attendance-shifts/BulkAttendanceModal.tsx

@@ -14,11 +14,12 @@ interface BulkAttendanceModalProps {
   onClose: () => void;
   onSuccess: () => void;
   fetchProjects?: () => Promise<any>;
+  fetchAccounts?: (type?: string) => Promise<any>;
   initialProjectId?: string;
   isFixedProject?: boolean;
 }
 
-export function BulkAttendanceModal({ isOpen, onClose, onSuccess, fetchProjects, initialProjectId, isFixedProject }: BulkAttendanceModalProps) {
+export function BulkAttendanceModal({ isOpen, onClose, onSuccess, fetchProjects, fetchAccounts, initialProjectId, isFixedProject }: BulkAttendanceModalProps) {
   const [projects, setProjects] = useState<any[]>([]);
   const [projectId, setProjectId] = useState<string>(initialProjectId || "");
   const [attendanceDate, setAttendanceDate] = useState<string>(new Date().toISOString().split("T")[0]);
@@ -26,6 +27,8 @@ export function BulkAttendanceModal({ isOpen, onClose, onSuccess, fetchProjects,
   const [globalEmployees, setGlobalEmployees] = useState<any[]>([]);
   const [isLoadingEmployees, setIsLoadingEmployees] = useState(false);
   const [isSubmitting, setIsSubmitting] = useState(false);
+  const [accounts, setAccounts] = useState<any[]>([]);
+  const [paymentAccountId, setPaymentAccountId] = useState<string>("");
 
   // Time entries state: Record<employee_id, { in: string, out: string, break: number, isPresent: boolean, salaryAdvance: number }>
   const [timeEntries, setTimeEntries] = useState<Record<string, { in: string, out: string, break: number, isPresent: boolean, salaryAdvance: number }>>({});
@@ -34,8 +37,16 @@ export function BulkAttendanceModal({ isOpen, onClose, onSuccess, fetchProjects,
     if (isOpen) {
       loadProjects();
       loadGlobalEmployees();
+      if (fetchAccounts) {
+        fetchAccounts("asset").then((res) => {
+          if (res.is_success && res.result) {
+            setAccounts(res.result);
+          }
+        });
+      }
       setAttendanceDate(new Date().toISOString().split("T")[0]);
       setProjectId(initialProjectId || "");
+      setPaymentAccountId("");
       setTimeEntries({});
       
       // If initialProjectId is already set, the second useEffect won't trigger because projectId hasn't changed.
@@ -178,7 +189,7 @@ export function BulkAttendanceModal({ isOpen, onClose, onSuccess, fetchProjects,
       employees.forEach(emp => {
         const entry = timeEntries[emp.id];
         
-        if (!entry || !entry.isPresent) return;
+        if (!entry) return;
         
         if (String(emp.id).startsWith('wf-')) {
             // It's a workforce gang worker
@@ -186,29 +197,45 @@ export function BulkAttendanceModal({ isOpen, onClose, onSuccess, fetchProjects,
             const workforceId = parts[1];
             const memberIdentifier = parts[2] || null;
 
-            if (entry.in || entry.out) {
+            if (entry.isPresent) {
+                if (entry.in || entry.out) {
+                    workforcePunches.push({
+                        workforce_id: Number(workforceId),
+                        project_id: Number(projectId),
+                        date: attendanceDate,
+                        member_identifier: memberIdentifier,
+                        punch_in_time: entry.in || null,
+                        punch_out_time: entry.out || null,
+                        break_hours: entry.break || 0,
+                        salary_advance: entry.salaryAdvance || 0,
+                    });
+                } else if (entry.salaryAdvance > 0) {
+                    // If they only have a salary advance but no punch
+                    workforcePunches.push({
+                        workforce_id: Number(workforceId),
+                        project_id: Number(projectId),
+                        date: attendanceDate,
+                        member_identifier: memberIdentifier,
+                        salary_advance: entry.salaryAdvance,
+                    });
+                }
+            } else {
+                // ABSENT
                 workforcePunches.push({
                     workforce_id: Number(workforceId),
                     project_id: Number(projectId),
                     date: attendanceDate,
                     member_identifier: memberIdentifier,
-                    punch_in_time: entry.in || null,
-                    punch_out_time: entry.out || null,
-                    break_hours: entry.break || 0,
+                    punch_in_time: null,
+                    punch_out_time: null,
+                    break_hours: 0,
                     salary_advance: entry.salaryAdvance || 0,
                 });
-            } else if (entry.salaryAdvance > 0) {
-                // If they only have a salary advance but no punch
-                workforcePunches.push({
-                    workforce_id: Number(workforceId),
-                    project_id: Number(projectId),
-                    date: attendanceDate,
-                    member_identifier: memberIdentifier,
-                    salary_advance: entry.salaryAdvance,
-                });
             }
         } else {
             // It's a standard HR employee
+            if (!entry.isPresent) return; // Skip absent for HR for now
+
             if (entry.in) {
             hrPunches.push({
                 employee_id: emp.id,
@@ -251,7 +278,10 @@ export function BulkAttendanceModal({ isOpen, onClose, onSuccess, fetchProjects,
 
       // Log HR punches
       if (hrPunches.length > 0) {
-        const hrRes = await bulkPunchAttendance({ punches: hrPunches });
+        const hrRes = await bulkPunchAttendance({ 
+          punches: hrPunches,
+          payment_account_id: paymentAccountId ? Number(paymentAccountId) : undefined
+        });
         if (!hrRes.is_success) {
             toast.error(hrRes.message || "Failed to log HR attendance");
             hasError = true;
@@ -262,7 +292,14 @@ export function BulkAttendanceModal({ isOpen, onClose, onSuccess, fetchProjects,
       if (workforcePunches.length > 0) {
         // use sendRequest from core-lib which is imported at the top of this file
         const { sendRequest } = require("@apptimate/core-lib");
-        const wfRes = await sendRequest({ url: "/api/construction/workforce-attendance/bulk-punch", method: "POST", data: { punches: workforcePunches } });
+        const wfRes = await sendRequest({ 
+            url: "/api/construction/workforce-attendance/bulk-punch", 
+            method: "POST", 
+            data: { 
+                punches: workforcePunches,
+                payment_account_id: paymentAccountId ? Number(paymentAccountId) : undefined
+            } 
+        });
         if (!wfRes.responseData?.is_success) {
             toast.error(wfRes.responseData?.message || "Failed to log Workforce attendance");
             hasError = true;
@@ -286,7 +323,7 @@ export function BulkAttendanceModal({ isOpen, onClose, onSuccess, fetchProjects,
   return (
     <Modal isOpen={isOpen} onClose={onClose} title="Bulk Attendance Log" size="2xl">
       <div className="space-y-4 py-2">
-        <div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
+        <div className="grid grid-cols-1 sm:grid-cols-3 gap-4">
           <div>
             <label className="block text-sm font-medium text-gray-700 mb-1">Date <span className="text-danger-500">*</span></label>
             <Input
@@ -298,20 +335,28 @@ export function BulkAttendanceModal({ isOpen, onClose, onSuccess, fetchProjects,
           <div>
             <label className="block text-sm font-medium text-gray-700 mb-1">Project <span className="text-danger-500">*</span></label>
             <Select
+              options={projects.map((p) => ({ value: String(p.id), label: p.name }))}
               value={projectId}
               onChange={(e) => setProjectId(e.target.value)}
               disabled={isFixedProject}
-              options={[
-                { value: "", label: "Select Project..." },
-                ...projects.map((p) => ({
-                  value: String(p.id),
-                  label: p.name
-                }))
-              ]}
             />
           </div>
+          {fetchAccounts && (
+            <div>
+              <label className="block text-sm font-medium text-gray-700 mb-1">Payment Account <span className="text-gray-400 font-normal text-xs">(Salary Advances)</span></label>
+              <Select
+                options={[
+                  { value: "", label: "Default mapping" },
+                  ...accounts.map((a) => ({ value: String(a.id), label: `${a.code} - ${a.name}` }))
+                ]}
+                value={paymentAccountId}
+                onChange={(e) => setPaymentAccountId(e.target.value)}
+              />
+            </div>
+          )}
         </div>
 
+
         {projectId && attendanceDate && (
           <div className="mt-6 border border-gray-100 rounded-xl overflow-hidden bg-white shadow-sm">
             <Table>

package/src/finance-components/DirectExpenseModal.tsx

@@ -0,0 +1,248 @@
+"use client";
+
+import React, { useState } from "react";
+import { Button, Input, ModalFooter, ChartOfAccountPicker, Modal } from "../index";
+import { PaymentSection, PaymentEntry } from "../index";
+import toast from "react-hot-toast";
+import { Upload, X } from "lucide-react";
+import { recordDirectExpenseShared, getPaymentModesShared, getBankAccountsLookupShared, getChartOfAccountsLookupShared } from "@apptimate/core-lib";
+
+interface DirectExpenseModalProps {
+  isOpen: boolean;
+  onClose: () => void;
+  onSuccess: () => void;
+}
+
+export default function DirectExpenseModal({ isOpen, onClose, onSuccess }: DirectExpenseModalProps) {
+  const [isSubmitting, setIsSubmitting] = useState(false);
+
+  const [transactionDate, setTransactionDate] = useState(new Date().toISOString().split("T")[0]);
+  const [expenseAccountId, setExpenseAccountId] = useState<number | string>("");
+  const [totalAmount, setTotalAmount] = useState<string>("");
+  const [reference, setReference] = useState("");
+  const [description, setDescription] = useState("");
+  const [payments, setPayments] = useState<PaymentEntry[]>([]);
+  const [selectedFiles, setSelectedFiles] = useState<File[]>([]);
+  const fileInputRef = React.useRef<HTMLInputElement>(null);
+
+  React.useEffect(() => {
+    if (!isOpen) {
+      setTransactionDate(new Date().toISOString().split("T")[0]);
+      setExpenseAccountId("");
+      setTotalAmount("");
+      setReference("");
+      setDescription("");
+      setPayments([]);
+      setSelectedFiles([]);
+    }
+  }, [isOpen]);
+
+  const handleSubmit = async (e: React.FormEvent) => {
+    e.preventDefault();
+
+    if (!expenseAccountId) {
+      toast.error("Please select an Expense Account");
+      return;
+    }
+
+    const amountNum = parseFloat(totalAmount);
+    if (isNaN(amountNum) || amountNum <= 0) {
+      toast.error("Please enter a valid total amount");
+      return;
+    }
+
+    if (payments.length === 0) {
+      toast.error("Please add at least one payment method");
+      return;
+    }
+
+    const totalToPay = payments.reduce((sum, p) => sum + (Number(p.amount) || 0), 0);
+    if (Math.abs(totalToPay - amountNum) > 0.01) {
+      toast.error(`Payment split (${totalToPay.toFixed(2)}) must exactly match the total amount (${amountNum.toFixed(2)})`);
+      return;
+    }
+
+    setIsSubmitting(true);
+
+    try {
+      const formattedPayments = payments.map(p => {
+        const payload: any = {
+          payment_method: p.mode_code,
+          payment_amount: p.amount,
+        };
+
+        if (p.metadata) {
+          if (p.metadata.bank_account_id) payload.bank_account_id = p.metadata.bank_account_id;
+        }
+        return payload;
+      });
+
+      const res = await recordDirectExpenseShared({
+        expense_account_id: expenseAccountId,
+        transaction_date: transactionDate,
+        description: description || null,
+        reference: reference || null,
+        payments: formattedPayments,
+        attachments: selectedFiles,
+      });
+
+      if (res.is_success) {
+        toast.success("Direct expense recorded successfully");
+        onSuccess();
+        handleClose();
+      } else {
+        toast.error(res.message || "Failed to record expense");
+      }
+    } catch (e: any) {
+      toast.error(e.message || "An error occurred");
+    } finally {
+      setIsSubmitting(false);
+    }
+  };
+
+  const handleClose = () => {
+    setTransactionDate(new Date().toISOString().split("T")[0]);
+    setExpenseAccountId("");
+    setTotalAmount("");
+    setReference("");
+    setDescription("");
+    setPayments([]);
+    setSelectedFiles([]);
+    onClose();
+  };
+
+  if (!isOpen) return null;
+
+  return (
+    <Modal
+      isOpen={isOpen}
+      onClose={handleClose}
+      title="Record Direct Expense"
+      size="md"
+    >
+      <form onSubmit={handleSubmit} className="space-y-5">
+        <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+          <div className="flex flex-col gap-1.5">
+            <label className="text-[11px] font-bold text-gray-500 uppercase tracking-wider">Date *</label>
+            <Input
+              type="date"
+              value={transactionDate}
+              onChange={(e) => setTransactionDate(e.target.value)}
+              required
+            />
+          </div>
+          <div className="flex flex-col gap-1.5">
+            <label className="text-[11px] font-bold text-gray-500 uppercase tracking-wider">Expense Account *</label>
+            <ChartOfAccountPicker
+              value={expenseAccountId}
+              onChange={(val) => setExpenseAccountId(val)}
+              fetchAccounts={getChartOfAccountsLookupShared}
+              filterType="expense"
+              label=""
+            />
+          </div>
+        </div>
+
+        <div className="flex flex-col gap-1.5">
+          <label className="text-[11px] font-bold text-gray-500 uppercase tracking-wider">Total Amount *</label>
+          <Input
+            type="number"
+            step="0.01"
+            min="0"
+            value={totalAmount}
+            onChange={(e) => setTotalAmount(e.target.value)}
+            placeholder="0.00"
+            required
+          />
+        </div>
+
+        {parseFloat(totalAmount) > 0 && (
+          <div className="border border-border-subtle rounded-xl p-4 bg-gray-50/50">
+            <PaymentSection
+              totalAmount={parseFloat(totalAmount) || 0}
+              payments={payments}
+              onPaymentsChange={setPayments}
+              fetchPaymentModes={async () => {
+                const res = await getPaymentModesShared();
+                if (res.is_success && Array.isArray(res.result)) {
+                  res.result = res.result.filter((m: any) => {
+                    const code = m.code?.toLowerCase();
+                    return code !== "credit" && code !== "credit-metal" && code !== "credit-gold" && code !== "cheque";
+                  });
+                }
+                return res;
+              }}
+              fetchBankAccounts={getBankAccountsLookupShared}
+            />
+          </div>
+        )}
+
+        <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+          <div className="flex flex-col gap-1.5">
+            <label className="text-[11px] font-bold text-gray-500 uppercase tracking-wider">Reference No</label>
+            <Input
+              value={reference}
+              onChange={(e) => setReference(e.target.value)}
+              placeholder="e.g. Receipt #1234"
+            />
+          </div>
+          <div className="flex flex-col gap-1.5">
+            <label className="text-[11px] font-bold text-gray-500 uppercase tracking-wider">Description</label>
+            <Input
+              value={description}
+              onChange={(e) => setDescription(e.target.value)}
+              placeholder="What was this for?"
+            />
+          </div>
+        </div>
+
+        {/* Attachments */}
+        <div className="flex flex-col gap-1.5">
+            <label className="text-[11px] font-bold text-gray-500 uppercase tracking-wider">Attachments</label>
+            <div 
+                className="border-2 border-dashed border-gray-200 rounded-xl p-4 flex flex-col items-center justify-center bg-gray-50/50 hover:bg-gray-100 transition-colors cursor-pointer group"
+                onClick={() => fileInputRef.current?.click()}
+            >
+                <input 
+                    type="file" 
+                    multiple 
+                    className="hidden" 
+                    ref={fileInputRef}
+                    onChange={(e) => {
+                        if (e.target.files) {
+                            setSelectedFiles(prev => [...prev, ...Array.from(e.target.files!)]);
+                        }
+                    }}
+                />
+                <div className="w-8 h-8 bg-white rounded-full shadow-sm flex items-center justify-center text-gray-500 mb-2 group-hover:scale-110 transition-transform">
+                    <Upload size={14} />
+                </div>
+                <p className="text-xs font-bold text-gray-700">Upload receipts or documents</p>
+            </div>
+            
+            {selectedFiles.length > 0 && (
+                <div className="flex flex-wrap gap-2 mt-2">
+                    {selectedFiles.map((file, index) => (
+                        <div key={`new-${index}`} className="relative bg-gray-100 rounded-md px-2 py-1 flex items-center gap-2 border border-gray-200 text-xs">
+                            <span className="truncate max-w-[120px]" title={file.name}>{file.name}</span>
+                            <button 
+                                type="button"
+                                onClick={() => setSelectedFiles(prev => prev.filter((_, i) => i !== index))} 
+                                className="text-red-500 hover:text-red-700"
+                            >
+                                <X size={12} />
+                            </button>
+                        </div>
+                    ))}
+                </div>
+            )}
+        </div>
+
+        <ModalFooter>
+          <Button type="button" variant="flat" color="default" onClick={handleClose}>Cancel</Button>
+          <Button type="submit" color="primary" isLoading={isSubmitting}>Record Expense</Button>
+        </ModalFooter>
+      </form>
+    </Modal>
+  );
+}

package/src/index.tsx

@@ -79,3 +79,4 @@ export * from './common-components/attendance-shifts/AttendanceTimesheets';
 export * from "./base-components/ChartOfAccountPicker";
 export * from './common-components/print/TemplateRenderer';
 export { default as TransactionPrintSelector } from './common-components/print/TransactionPrintSelector';
+export { default as DirectExpenseModal } from "./finance-components/DirectExpenseModal";