From daaca9c24e85cf9d146e9d4bddc1c6f8f8a5dde7 Mon Sep 17 00:00:00 2001 From: Flemming Petersen Date: Wed, 9 Aug 2023 19:39:09 +0200 Subject: [PATCH] fix: if clauses wich are dependant on transactions --- app/Http/Controllers/TransactionController.php | 10 +++------- app/Models/Transaction.php | 2 +- database/factories/TransactionFactory.php | 2 +- database/seeders/DatabaseSeeder.php | 2 +- .../views/partials/item/availability-badge.blade.php | 10 +++++----- resources/views/templates/item/show.blade.php | 4 ++-- resources/views/templates/item/transaction.blade.php | 8 ++++---- 7 files changed, 17 insertions(+), 21 deletions(-) diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php index 7de2920..aa4d756 100644 --- a/app/Http/Controllers/TransactionController.php +++ b/app/Http/Controllers/TransactionController.php @@ -33,12 +33,8 @@ public function create(Request $request): RedirectResponse ] ); - $item = Item::find($request->item_id); - $item->borrow_state = $request->transaction_type; - $item->save(); - - if ((int) $request->transaction_type === Transaction::BORROWED) { - Mail::to($request->email)->queue(new ItemBorrowed($item)); + if ((int) $request->transaction_type === Transaction::BORROW) { + Mail::to($request->email)->queue(new ItemBorrowed(Item::find($request->item_id))); } return redirect()->route('item.show', $request->item_id); @@ -52,7 +48,7 @@ public function extend(Request $request): RedirectResponse ]); $transaction = Transaction::where('item_id', $request->item_id) - ->where('transaction_type', Transaction::BORROWED) + ->where('transaction_type', Transaction::BORROW) ->orderBy('created_at', 'desc') ->first(); diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php index 6914254..cb36abb 100644 --- a/app/Models/Transaction.php +++ b/app/Models/Transaction.php @@ -12,7 +12,7 @@ class Transaction extends Model public const RETURN = 0; - public const BORROWED = 1; + public const BORROW = 1; protected $fillable = [ 'return_date', diff --git a/database/factories/TransactionFactory.php b/database/factories/TransactionFactory.php index 168f88d..29a95f1 100644 --- a/database/factories/TransactionFactory.php +++ b/database/factories/TransactionFactory.php @@ -20,7 +20,7 @@ public function definition(): array { return [ 'return_date' => $this->faker->dateTimeBetween('now', '+1 year'), - 'transaction_type' => $this->faker->randomElement([Transaction::RETURN, Transaction::BORROWED]), + 'transaction_type' => $this->faker->randomElement([Transaction::RETURN, Transaction::BORROW]), 'item_id' => Item::factory(), 'note' => $this->faker->text, 'email' => $this->faker->email, diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index 6f8f5a8..c116750 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -14,7 +14,7 @@ public function run(): void { $this->call([ ItemSeeder::class, - TransactionSeeder::class, + //TransactionSeeder::class, UserSeeder::class, ]); } diff --git a/resources/views/partials/item/availability-badge.blade.php b/resources/views/partials/item/availability-badge.blade.php index c2e4e66..ca01aa7 100644 --- a/resources/views/partials/item/availability-badge.blade.php +++ b/resources/views/partials/item/availability-badge.blade.php @@ -1,9 +1,9 @@ -@if ($item->transactions->last()->transaction_type === App\Models\Transaction::RETURN) - - Status: verfügbar - -@else +@if ($item->transactions->last()?->transaction_type === App\Models\Transaction::BORROW) Status: ausgeliehen bis {{ $item->transactions->last()->return_date->format('d.m.Y') }} + +@else + + Status: verfügbar @endif diff --git a/resources/views/templates/item/show.blade.php b/resources/views/templates/item/show.blade.php index 3dd3f03..24b59ca 100644 --- a/resources/views/templates/item/show.blade.php +++ b/resources/views/templates/item/show.blade.php @@ -18,8 +18,8 @@ Anleitung / Wiki-Eintrag @endif
- {{ $item->transactions->last()->transaction_type === App\Models\Transaction::RETURN ? 'Ausleihen' : 'Zurückgeben' }} - @if ($item->transactions->last()->transaction_type === App\Models\Transaction::BORROWED) + {{ $item->transactions->last()?->transaction_type === App\Models\Transaction::BORROW ? 'Zurückgeben' : 'Ausleihen' }} + @if ($item->transactions->last()?->transaction_type === App\Models\Transaction::BORROW) Verlängern @endif
diff --git a/resources/views/templates/item/transaction.blade.php b/resources/views/templates/item/transaction.blade.php index fb6f14c..75572fd 100644 --- a/resources/views/templates/item/transaction.blade.php +++ b/resources/views/templates/item/transaction.blade.php @@ -1,12 +1,12 @@
-

{{ $item->transactions->last()->transaction_type === App\Models\Transaction::RETURN ? 'Ausleihen' : 'Zurückgeben' }}: {{ $item->name }}

+

{{ $item->transactions->last()?->transaction_type === App\Models\Transaction::BORROW ? 'Zurückgeben' : 'Ausleihen' }}: {{ $item->name }}

@csrf @method('POST') - - @if ($item->borrow_state === 0) + + @if ($item->transactions->last()?->transaction_type === App\Models\Transaction::RETURN || $item->transactions->last()?->transaction_type === null)
@@ -27,7 +27,7 @@
- +