From 86efb6cd04b10d3296339b060a811fe1ed907f67 Mon Sep 17 00:00:00 2001
From: Yoga Pangestu <ypangestu976@gmail.com>
Date: Mon, 25 Nov 2024 23:17:35 +0700
Subject: [PATCH] feat(expense): menyesuaikan logika penghapusan data agar kas
 dari barbershopnya kembali jika pengeluran tersebut menggunakan kas
 ,memperbaiki route model binding dan viewsnya

---
 .../Admin/Finance/ExpenseController.php            | 10 +++++++++-
 app/Providers/RouteServiceProvider.php             | 14 +++++++-------
 .../views/pages/admin/finance/expenses.blade.php   |  3 ---
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/app/Http/Controllers/Admin/Finance/ExpenseController.php b/app/Http/Controllers/Admin/Finance/ExpenseController.php
index 5fc6a77..1de4140 100644
--- a/app/Http/Controllers/Admin/Finance/ExpenseController.php
+++ b/app/Http/Controllers/Admin/Finance/ExpenseController.php
@@ -93,7 +93,15 @@ public function update(ExpenseRequest $request, Expense $expense): RedirectRespo
 
     public function delete(Expense $expense): RedirectResponse
     {
-        $expense->delete();
+        $barbershop = Barbershop::findOrFail($expense->barbershop_id);
+
+        DB::transaction(function () use ($expense, $barbershop) {
+            if ($expense->use_cash === '1') {
+                $barbershop->increment('cash', $expense->amount);
+            }
+
+            $expense->delete();
+        });
 
         notify()->success('Data berhasil dihapus', 'Berhasil');
 
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index ba476fb..dd86367 100644
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -27,12 +27,12 @@ public function register(): void
      */
     public function boot(): void
     {
-        Route::bind('barbershop', fn(string $barbershop) => Barbershop::findOrFail(decryptId($barbershop)));
-        Route::bind('user', fn(string $user) => User::findOrFail(decryptId($user)));
-        Route::bind('customer', fn(string $customer) => Customer::findOrFail(decryptId($customer)));
-        Route::bind('service', fn(string $service) => Service::findOrFail(decryptId($service)));
-        Route::bind('expense', fn(string $expense) => Expense::findOrFail(decryptId($expense)));
-        Route::bind('payroll', fn(string $payroll) => Payroll::findOrFail(decryptId($payroll)));
-        Route::bind('cash', fn(string $cash) => Cash::findOrFail(decryptId($cash)));
+        Route::bind('barbershop', fn (string $barbershop) => Barbershop::findOrFail(decryptId($barbershop)));
+        Route::bind('user', fn (string $user) => User::findOrFail(decryptId($user)));
+        Route::bind('customer', fn (string $customer) => Customer::findOrFail(decryptId($customer)));
+        Route::bind('service', fn (string $service) => Service::findOrFail(decryptId($service)));
+        Route::bind('expense', fn (string $expense) => Expense::findOrFail(decryptId($expense)));
+        Route::bind('payroll', fn (string $payroll) => Payroll::findOrFail(decryptId($payroll)));
+        Route::bind('cash', fn (string $cash) => Cash::findOrFail(decryptId($cash)));
     }
 }
diff --git a/resources/views/pages/admin/finance/expenses.blade.php b/resources/views/pages/admin/finance/expenses.blade.php
index 8c5d9da..b669259 100644
--- a/resources/views/pages/admin/finance/expenses.blade.php
+++ b/resources/views/pages/admin/finance/expenses.blade.php
@@ -122,7 +122,6 @@ class="form-control rupiah-format @error('amount') is-invalid @enderror" id="amo
                                 @enderror
                             </div>
                             <div class="col-lg-12 position-relative">
-<<<<<<< HEAD
                                 <label class="form-label" for="use_cash">Gunakan Kas</label>
                                 <div class="form-check radio ps-0">
                                     <ul class="radio-wrapper">
@@ -149,8 +148,6 @@ class="form-control rupiah-format @error('amount') is-invalid @enderror" id="amo
                                 @enderror
                             </div>
                             <div class="col-lg-12 position-relative">
-=======
->>>>>>> 21e2ec04bd9458fd280d8f46f52746684c355e1c
                                 <label class="form-label" for="proof">Bukti
                                     <span class="form-span"><i>(.jpeg,.png,.jpg,.gif,.svg)</i></span>
                                 </label>