diff --git a/resources/js/pages/admin/finance/cash-account/transaction-columns.tsx b/resources/js/pages/admin/finance/cash-account/transaction-columns.tsx
index 3a0e893..28db428 100644
--- a/resources/js/pages/admin/finance/cash-account/transaction-columns.tsx
+++ b/resources/js/pages/admin/finance/cash-account/transaction-columns.tsx
@@ -120,7 +120,7 @@ export function createTransactionColumns(
accessorKey: 'description',
header: () => Keterangan,
cell: ({ row }) => (
-
+
{row.getValue('description') as string}
),
diff --git a/resources/js/pages/admin/finance/employee-advance/columns.tsx b/resources/js/pages/admin/finance/employee-advance/columns.tsx
index 0d4aa9d..fc2f30c 100644
--- a/resources/js/pages/admin/finance/employee-advance/columns.tsx
+++ b/resources/js/pages/admin/finance/employee-advance/columns.tsx
@@ -17,6 +17,7 @@ export type EmployeeAdvance = {
formatted_created_at: string;
employee: {
user: {
+ id: number;
user_profile: {
full_name: string;
};
@@ -63,12 +64,13 @@ type CreateColumnsParams = {
handleApprove: (employeeAdvance: EmployeeAdvance) => void;
handlePay: (employeeAdvance: EmployeeAdvance) => void;
can: (permission: string) => boolean;
+ authUserId: number;
};
export function createEmployeeAdvanceColumns(
params: CreateColumnsParams,
): ColumnDef[] {
- const { handleEdit, handleDeleteClick, handleApprove, handlePay, can } =
+ const { handleEdit, handleDeleteClick, handleApprove, handlePay, can, authUserId } =
params;
return [
@@ -162,7 +164,10 @@ export function createEmployeeAdvanceColumns(
{
label: 'Edit',
icon: ,
- show: can('employee_advances.update'),
+ show:
+ can('employee_advances.update') &&
+ employeeAdvance.status === 'pending' &&
+ employeeAdvance.employee?.user?.id === authUserId,
onClick: () => handleEdit(employeeAdvance),
},
{
@@ -170,7 +175,10 @@ export function createEmployeeAdvanceColumns(
icon: (
),
- show: can('employee_advances.delete'),
+ show:
+ can('employee_advances.delete') &&
+ employeeAdvance.status === 'pending' &&
+ employeeAdvance.employee?.user?.id === authUserId,
onClick: () =>
handleDeleteClick(employeeAdvance),
},
diff --git a/resources/js/pages/admin/finance/expense/columns.tsx b/resources/js/pages/admin/finance/expense/columns.tsx
index df49908..11b0b5c 100644
--- a/resources/js/pages/admin/finance/expense/columns.tsx
+++ b/resources/js/pages/admin/finance/expense/columns.tsx
@@ -42,7 +42,7 @@ export function createExpenseColumns(
accessorKey: 'description',
header: () => Keterangan,
cell: ({ row }) => (
-
+
{row.getValue('description') as string}
),
diff --git a/resources/js/pages/admin/finance/payroll-period/show-columns.tsx b/resources/js/pages/admin/finance/payroll-period/show-columns.tsx
index b0d46e1..99be5df 100644
--- a/resources/js/pages/admin/finance/payroll-period/show-columns.tsx
+++ b/resources/js/pages/admin/finance/payroll-period/show-columns.tsx
@@ -182,7 +182,7 @@ export function createPayrollColumns(
{adj.type === 'bonus' ? '+' : '-'}{' '}
{formatCurrency(adj.amount)}
-
+
{adj.description}
{payroll.status === 'unpaid' && (
diff --git a/resources/js/pages/admin/master/customer/columns.tsx b/resources/js/pages/admin/master/customer/columns.tsx
index cc40a3c..de9353a 100644
--- a/resources/js/pages/admin/master/customer/columns.tsx
+++ b/resources/js/pages/admin/master/customer/columns.tsx
@@ -41,7 +41,7 @@ export function createCustomerColumns(
accessorKey: 'address',
header: () => Alamat,
cell: ({ row }) => (
-
+
{(row.getValue('address') as string) ?? '-'}
),
diff --git a/resources/js/pages/admin/master/supplier/columns.tsx b/resources/js/pages/admin/master/supplier/columns.tsx
index 435ddfd..d4c2061 100644
--- a/resources/js/pages/admin/master/supplier/columns.tsx
+++ b/resources/js/pages/admin/master/supplier/columns.tsx
@@ -41,7 +41,7 @@ export function createSupplierColumns(
accessorKey: 'address',
header: () => Alamat,
cell: ({ row }) => (
-
+
{(row.getValue('address') as string) ?? '-'}
),