diff --git a/app/Http/Controllers/Admin/Finance/ExpenseController.php b/app/Http/Controllers/Admin/Finance/ExpenseController.php index 1de4140..869992a 100644 --- a/app/Http/Controllers/Admin/Finance/ExpenseController.php +++ b/app/Http/Controllers/Admin/Finance/ExpenseController.php @@ -20,7 +20,7 @@ public function index(): View { return view('pages.admin.finance.expenses', [ 'pageTitle' => 'Pengeluaran', - 'expenses' => Expense::latest()->get(), + 'expenses' => Expense::with(['user', 'user.biography'])->barbershop()->latest()->get(), ]); } diff --git a/app/Http/Controllers/Admin/Manage/AttendanceController.php b/app/Http/Controllers/Admin/Manage/AttendanceController.php index 1395e97..f9abbc3 100644 --- a/app/Http/Controllers/Admin/Manage/AttendanceController.php +++ b/app/Http/Controllers/Admin/Manage/AttendanceController.php @@ -26,7 +26,7 @@ public function index(Request $request): View|JsonResponse return DataTables::eloquent($attendances) ->addIndexColumn() - ->editColumn('date', function ($item) { + ->editColumn('created_at', function ($item) { return formatDateIndo($item->created_at); }) ->addColumn('working_time', function ($item) { diff --git a/app/Http/Controllers/Admin/Manage/InventoryController.php b/app/Http/Controllers/Admin/Manage/InventoryController.php index 1adaf4d..c1e547f 100644 --- a/app/Http/Controllers/Admin/Manage/InventoryController.php +++ b/app/Http/Controllers/Admin/Manage/InventoryController.php @@ -20,7 +20,7 @@ public function index(): View { return view('pages.admin.manage.inventory', [ 'pageTitle' => 'Barang', - 'inventory' => Inventory::latest()->get(), + 'inventory' => Inventory::with(['user', 'user.biography'])->barbershop()->latest()->get(), ]); } diff --git a/app/Http/Controllers/Admin/Manage/TransactionController.php b/app/Http/Controllers/Admin/Manage/TransactionController.php index 086532a..43550ca 100644 --- a/app/Http/Controllers/Admin/Manage/TransactionController.php +++ b/app/Http/Controllers/Admin/Manage/TransactionController.php @@ -23,7 +23,7 @@ public function index(): View { return view('pages.admin.manage.transaction.index', [ 'pageTitle' => 'Transaksi', - 'transactions' => Transaction::latest()->get(), + 'transactions' => Transaction::with(['user', 'user.biography'])->barbershop()->latest()->get(), ]); } diff --git a/app/Http/Controllers/Admin/Master/CustomerController.php b/app/Http/Controllers/Admin/Master/CustomerController.php index 614396e..90c9f6c 100644 --- a/app/Http/Controllers/Admin/Master/CustomerController.php +++ b/app/Http/Controllers/Admin/Master/CustomerController.php @@ -18,7 +18,7 @@ public function index(): View { return view('pages.admin.master.customers', [ 'pageTitle' => 'Pelanggan', - 'customers' => Customer::latest()->get(), + 'customers' => Customer::with(['user', 'user.biography'])->barbershop()->latest()->get(), ]); } diff --git a/public/assets/admin/js/datatable/custom-table/attendance.js b/public/assets/admin/js/datatable/custom-table/attendance.js index c2de342..015ce02 100644 --- a/public/assets/admin/js/datatable/custom-table/attendance.js +++ b/public/assets/admin/js/datatable/custom-table/attendance.js @@ -4,7 +4,7 @@ window.columns = [ orderable: false, searchable: false }, - { data: 'date' }, + { data: 'created_at' }, { data: 'check_in' }, { data: 'check_in_image' }, { data: 'check_out' }, @@ -15,7 +15,7 @@ window.columns = [ function updateWorkingTime() { const today = moment().format('YYYY-MM-DD'); - $('table tbody tr').each(function() { + $('table tbody tr').each(function () { const dateCell = $(this).find('td:nth-child(2)'); const checkOutCell = $(this).find('td:nth-child(5)'); const workingTimeCell = $(this).find('td:nth-child(7)'); @@ -23,7 +23,6 @@ function updateWorkingTime() { const rowDate = moment(dateCell.text(), 'ddd, DD MMM YYYY').format('YYYY-MM-DD'); const checkOutText = checkOutCell.text().trim(); - // Cek apakah baris adalah hari ini dan check_out masih '-' if (rowDate === today && checkOutText === '-') { const checkInCell = $(this).find('td:nth-child(3)'); const checkInTime = checkInCell.text().trim(); @@ -53,17 +52,12 @@ function updateWorkingTime() { }); } -// Panggil fungsi updateWorkingTime setiap detik -$(document).ready(function() { - // Pastikan moment.js sudah diinclude +$(document).ready(function () { if (typeof moment !== 'undefined') { - // Set moment locale ke Indonesia moment.locale('id'); - // Update pertama kali saat halaman dimuat updateWorkingTime(); - // Set interval untuk update setiap detik setInterval(updateWorkingTime, 1000); } else { console.error('moment.js library tidak ditemukan'); diff --git a/public/assets/admin/js/datatable/server-side.js b/public/assets/admin/js/datatable/server-side.js index 51f47eb..3359ca8 100644 --- a/public/assets/admin/js/datatable/server-side.js +++ b/public/assets/admin/js/datatable/server-side.js @@ -1,4 +1,9 @@ (function ($) { + function getColumnIndex(columns, columnName) { + return columns.findIndex(column => column.data === columnName); + } + + const createdAtIndex = getColumnIndex(columns, 'created_at'); $('#datatable').DataTable({ serverSide: true, processing: true, @@ -20,5 +25,6 @@ [10, 25, 50, 100], [10, 25, 50, 100] ], + order: createdAtIndex !== -1 ? [[createdAtIndex, "desc"]] : [], }); })(jQuery); diff --git a/resources/views/pages/admin/finance/cashes.blade.php b/resources/views/pages/admin/finance/cashes.blade.php index 38f972d..cd48c29 100644 --- a/resources/views/pages/admin/finance/cashes.blade.php +++ b/resources/views/pages/admin/finance/cashes.blade.php @@ -22,6 +22,7 @@ class="btn btn-primary"> No + Penginput Nama Jumlah Tanggal @@ -32,6 +33,7 @@ class="btn btn-primary"> @foreach ($cashes as $cash) {{ $loop->iteration }} + {{ $cash->user->biography->full_name ?? '-deleted-' }} {{ $cash->name }} {{ formatToRupiah($cash->amount) ?? '-' }} {{ formatDateIndo($cash->created_at) }} diff --git a/resources/views/pages/admin/finance/expenses.blade.php b/resources/views/pages/admin/finance/expenses.blade.php index b669259..4e8570e 100644 --- a/resources/views/pages/admin/finance/expenses.blade.php +++ b/resources/views/pages/admin/finance/expenses.blade.php @@ -22,6 +22,7 @@ No + Penginput Nama Jumlah Bukti @@ -33,6 +34,7 @@ @foreach ($expenses as $expense) {{ $loop->iteration }} + {{ $expense->user->biography->full_name ?? '-deleted-' }} {{ $expense->name }} {{ formatToRupiah($expense->amount) ?? '-' }} diff --git a/resources/views/pages/admin/finance/payroll/create.blade.php b/resources/views/pages/admin/finance/payroll/create.blade.php index 9887855..ed9b7f0 100644 --- a/resources/views/pages/admin/finance/payroll/create.blade.php +++ b/resources/views/pages/admin/finance/payroll/create.blade.php @@ -67,7 +67,7 @@
@error('shaving_result')
diff --git a/resources/views/pages/admin/finance/payroll/edit.blade.php b/resources/views/pages/admin/finance/payroll/edit.blade.php index 0c1db45..b12e1b6 100644 --- a/resources/views/pages/admin/finance/payroll/edit.blade.php +++ b/resources/views/pages/admin/finance/payroll/edit.blade.php @@ -63,7 +63,7 @@
@error('shaving_result')
diff --git a/resources/views/pages/admin/manage/inventory.blade.php b/resources/views/pages/admin/manage/inventory.blade.php index e939c57..d05d4d0 100644 --- a/resources/views/pages/admin/manage/inventory.blade.php +++ b/resources/views/pages/admin/manage/inventory.blade.php @@ -22,6 +22,7 @@ No + Penginput Nama Kuantitas Harga @@ -36,6 +37,7 @@ @foreach ($inventory as $item) {{ $loop->iteration }} + {{ $item->user->biography->full_name ?? '-deleted-' }} {{ $item->name }} {{ $item->quantity }} {{ formatToRupiah($item->price) }} diff --git a/resources/views/pages/admin/manage/transaction/index.blade.php b/resources/views/pages/admin/manage/transaction/index.blade.php index 2f21279..2ad4932 100644 --- a/resources/views/pages/admin/manage/transaction/index.blade.php +++ b/resources/views/pages/admin/manage/transaction/index.blade.php @@ -18,6 +18,7 @@ No + Penginput Pelanggan Layanan Harga @@ -33,6 +34,7 @@ @foreach ($transactions as $transaction) {{ $loop->iteration }} + {{ $transaction->user->biography->full_name ?? '-deleted-' }} {{ $transaction->customer->name }} {{ $transaction->service->name }} {{ formatToRupiah($transaction->price) }} diff --git a/resources/views/pages/admin/master/customers.blade.php b/resources/views/pages/admin/master/customers.blade.php index 963286b..60e58ad 100644 --- a/resources/views/pages/admin/master/customers.blade.php +++ b/resources/views/pages/admin/master/customers.blade.php @@ -22,6 +22,7 @@ No + Penginput Nama Kontak Tanggal @@ -32,6 +33,7 @@ @foreach ($customers as $customer) {{ $loop->iteration }} + {{ $customer->user->biography->full_name ?? 'deleted-' }} {{ $customer->name }} {{ $customer->contact_number ?? '-' }} {{ formatDateIndo($customer->created_at) }} diff --git a/resources/views/pages/admin/master/service/index.blade.php b/resources/views/pages/admin/master/service/index.blade.php index 53e63ac..2f4ecc4 100644 --- a/resources/views/pages/admin/master/service/index.blade.php +++ b/resources/views/pages/admin/master/service/index.blade.php @@ -18,6 +18,7 @@ No + Penginput Nama Harga Deskripsi @@ -29,6 +30,7 @@ @foreach ($services as $service) {{ $loop->iteration }} + {{ $service->user->biography->full_name ?? '-deleted-' }} {{ $service->name }} {{ formatToRupiah($service->price) }} {{ $service->description }}