From f08ba25686eed65dc5847747488100352484701e Mon Sep 17 00:00:00 2001
From: Yoga Pangestu <ypangestu976@gmail.com>
Date: Sun, 21 Jun 2026 00:24:21 +0700
Subject: [PATCH] refactor: remove unused expense components and streamline
 expense deletion logic for improved code clarity

---
 app/Services/Finance/ExpenseService.php                       | 3 ---
 resources/js/pages/admin/finance/expenses/Index.vue           | 4 ++--
 .../admin/finance/expenses/form}/ExpenseFormModal.vue         | 2 +-
 .../admin/finance/expenses/table}/columns.ts                  | 2 +-
 .../admin/finance/expenses/table}/data-table-actions.vue      | 0
 5 files changed, 4 insertions(+), 7 deletions(-)
 rename resources/js/{components/admin/finance/expenses => pages/admin/finance/expenses/form}/ExpenseFormModal.vue (97%)
 rename resources/js/{components/admin/finance/expenses => pages/admin/finance/expenses/table}/columns.ts (94%)
 rename resources/js/{components/admin/finance/expenses => pages/admin/finance/expenses/table}/data-table-actions.vue (100%)

diff --git a/app/Services/Finance/ExpenseService.php b/app/Services/Finance/ExpenseService.php
index 0e95c80..369adfe 100644
--- a/app/Services/Finance/ExpenseService.php
+++ b/app/Services/Finance/ExpenseService.php
@@ -122,9 +122,6 @@ public function update(Expense $expense, array $validated): void
 
     public function delete(Expense $expense): void
     {
-        $amount = $expense->amount;
-        $description = $expense->description;
-
         DB::transaction(function () use ($expense): void {
             if ($expense->cashTransaction) {
                 $this->cashService->deleteReferencedTransaction($expense->cashTransaction);
diff --git a/resources/js/pages/admin/finance/expenses/Index.vue b/resources/js/pages/admin/finance/expenses/Index.vue
index 56ce98b..f2c492b 100644
--- a/resources/js/pages/admin/finance/expenses/Index.vue
+++ b/resources/js/pages/admin/finance/expenses/Index.vue
@@ -2,8 +2,6 @@
 import { Head } from '@inertiajs/vue3';
 import { Plus } from '@lucide/vue';
 import { computed, ref, watch } from 'vue';
-import { createColumns } from '@/components/admin/finance/expenses/columns';
-import ExpenseFormModal from '@/components/admin/finance/expenses/ExpenseFormModal.vue';
 import { DataTable } from '@/components/data-table';
 import { Button } from '@/components/ui/button';
 import { Card, CardContent } from '@/components/ui/card';
@@ -12,6 +10,8 @@ import { useDataTableQuery, useDataTableQuerySync } from '@/composables/useDataT
 import AdminLayout from '@/layouts/AdminLayout.vue';
 import type { DataTableSort } from '@/types/data-table';
 import type { ExpenseListItem, PaginatedExpenses } from '@/types/expense';
+import ExpenseFormModal from './form/ExpenseFormModal.vue';
+import { createColumns } from './table/columns';
 
 const props = defineProps<{
     expenses: PaginatedExpenses;
diff --git a/resources/js/components/admin/finance/expenses/ExpenseFormModal.vue b/resources/js/pages/admin/finance/expenses/form/ExpenseFormModal.vue
similarity index 97%
rename from resources/js/components/admin/finance/expenses/ExpenseFormModal.vue
rename to resources/js/pages/admin/finance/expenses/form/ExpenseFormModal.vue
index a3c6066..b8c9d6a 100644
--- a/resources/js/components/admin/finance/expenses/ExpenseFormModal.vue
+++ b/resources/js/pages/admin/finance/expenses/form/ExpenseFormModal.vue
@@ -142,7 +142,7 @@ function submit() {
                             <FieldError :errors="formErrors(form, 'amount')" />
                         </Field>
                         <Field>
-                            <FieldLabel for="expense-description" required>Keterangan</FieldLabel>
+                            <!-- <FieldLabel for="expense-description" required>Keterangan</FieldLabel> -->
                             <Textarea id="expense-description" v-model="form.description"
                                 placeholder="Contoh: Pembelian perlengkapan toko" rows="3"
                                 :maxlength="FIELD_LIMITS.description" />
diff --git a/resources/js/components/admin/finance/expenses/columns.ts b/resources/js/pages/admin/finance/expenses/table/columns.ts
similarity index 94%
rename from resources/js/components/admin/finance/expenses/columns.ts
rename to resources/js/pages/admin/finance/expenses/table/columns.ts
index 6963bd0..cf3880f 100644
--- a/resources/js/components/admin/finance/expenses/columns.ts
+++ b/resources/js/pages/admin/finance/expenses/table/columns.ts
@@ -1,9 +1,9 @@
 import type { ColumnDef } from '@tanstack/vue-table';
 import { h } from 'vue';
-import DataTableActions from '@/components/admin/finance/expenses/data-table-actions.vue';
 import { DataTableColumnHeader } from '@/components/data-table';
 import MediaThumbnailCell from '@/components/media/MediaThumbnailCell.vue';
 import type { ExpenseListItem } from '@/types/expense';
+import DataTableActions from './data-table-actions.vue';
 
 export function createColumns(onEdit: (expense: ExpenseListItem) => void): ColumnDef<ExpenseListItem>[] {
     return [
diff --git a/resources/js/components/admin/finance/expenses/data-table-actions.vue b/resources/js/pages/admin/finance/expenses/table/data-table-actions.vue
similarity index 100%
rename from resources/js/components/admin/finance/expenses/data-table-actions.vue
rename to resources/js/pages/admin/finance/expenses/table/data-table-actions.vue