diff --git a/app/Http/Controllers/Admin/Finance/ExpenseController.php b/app/Http/Controllers/Admin/Finance/ExpenseController.php
index 805bf92..90ee3b1 100644
--- a/app/Http/Controllers/Admin/Finance/ExpenseController.php
+++ b/app/Http/Controllers/Admin/Finance/ExpenseController.php
@@ -88,7 +88,7 @@ public function update(ExpenseRequest $request, Expense $expense): RedirectRespo
}
if (isset($validatedData['proof'])) {
- $this->uploadAttachment($validatedData['proof'], 'expenses', Expense::class, $expense->id, 'expenses');k
+ $this->uploadAttachment($validatedData['proof'], 'expenses', Expense::class, $expense->id, 'expenses');
}
});
diff --git a/app/Http/Controllers/Admin/Finance/PayrollController.php b/app/Http/Controllers/Admin/Finance/PayrollController.php
index 1a9c0aa..ac7d3af 100644
--- a/app/Http/Controllers/Admin/Finance/PayrollController.php
+++ b/app/Http/Controllers/Admin/Finance/PayrollController.php
@@ -34,7 +34,7 @@ public function create(): View
{
return view('pages.admin.finance.payroll.create', [
'pageTitle' => 'Tambah Gaji',
- 'employees' => User::query()->barbershop()->latest()->get(),
+ 'employees' => User::with('biography')->barbershop()->latest()->get(),
]);
}
@@ -63,7 +63,7 @@ public function edit(Payroll $payroll): View
{
return view('pages.admin.finance.payroll.edit', [
'pageTitle' => 'Edit Gaji',
- 'employees' => User::query()->barbershop()->latest()->get(),
+ 'employees' => User::with('biography')->barbershop()->latest()->get(),
'payroll' => $payroll,
]);
}
diff --git a/app/Http/Controllers/Admin/Manage/AttendanceController.php b/app/Http/Controllers/Admin/Manage/AttendanceController.php
index 7c906b9..65cf5c9 100644
--- a/app/Http/Controllers/Admin/Manage/AttendanceController.php
+++ b/app/Http/Controllers/Admin/Manage/AttendanceController.php
@@ -63,7 +63,7 @@ public function index(Request $request): View|JsonResponse
if ($item->check_in) {
$imageUrl = Storage::url("attendances/{$item->attachments->first()->formatted_attachment}");
- return '
';
+ return '
';
}
return '-';
@@ -72,7 +72,7 @@ public function index(Request $request): View|JsonResponse
if ($item->check_out) {
$imageUrl = Storage::url("attendances/{$item->attachments()->latest()->first()->formatted_attachment}");
- return '
';
+ return '
';
}
return '-';
diff --git a/app/Models/User.php b/app/Models/User.php
index f3ff6a5..9f33fbf 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -99,6 +99,11 @@ public function cash(): HasMany
return $this->hasMany(Cash::class);
}
+ public function debts(): HasMany
+ {
+ return $this->hasMany(Debt::class);
+ }
+
public function attachments(): MorphMany
{
return $this->morphMany(Attachment::class, 'attachmentable');
diff --git a/app/Traits/UploadAttachment.php b/app/Traits/UploadAttachment.php
index 4638236..cab8243 100644
--- a/app/Traits/UploadAttachment.php
+++ b/app/Traits/UploadAttachment.php
@@ -18,10 +18,10 @@ public function uploadAttachment(UploadedFile|string $file, string $path, string
$image = base64_decode($imageData);
$extension = 'png';
$fileName = Str::uuid();
- $fullFileName = $fileName . '.' . $extension;
+ $fullFileName = $fileName.'.'.$extension;
$date = now()->format('Y-m-d');
- Storage::disk('public')->put($path . '/' . $date . '/' . $fullFileName, $image);
+ Storage::disk('public')->put($path.'/'.$date.'/'.$fullFileName, $image);
Attachment::updateOrCreate(
[
@@ -39,7 +39,7 @@ public function uploadAttachment(UploadedFile|string $file, string $path, string
$date = now()->format('Y-m-d');
$extension = $file->getClientOriginalExtension();
$fileName = Str::uuid();
- $file->storeAs($path . '/' . $date, $fileName . '.' . $extension, 'public');
+ $file->storeAs($path.'/'.$date, $fileName.'.'.$extension, 'public');
Attachment::updateOrCreate(
[