From c13d46cebdf3c63a1b61049cbc2af7169ed7b46d Mon Sep 17 00:00:00 2001 From: Tomasz Boruc Date: Sun, 30 Aug 2026 20:43:55 +0200 Subject: [PATCH] Zmiany w zaliczkach MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Dodanie edycji rodzajó zaliczek --- app/Http/Controllers/SettingsController.php | 60 ++++++++++ resources/views/layouts/navigation.blade.php | 21 ++++ resources/views/settings/index.blade.php | 113 +++++++++++++++++++ routes/web.php | 6 + tests/Feature/AdvanceTest.php | 59 ++++++++++ 5 files changed, 259 insertions(+) create mode 100644 app/Http/Controllers/SettingsController.php create mode 100644 resources/views/settings/index.blade.php diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php new file mode 100644 index 0000000..bb9d933 --- /dev/null +++ b/app/Http/Controllers/SettingsController.php @@ -0,0 +1,60 @@ +get(); + + return view('settings.index', compact('advanceTypes')); + } + + public function storeAdvanceType(Request $request) + { + $validated = $request->validate([ + 'name' => ['required', 'string', 'max:255', 'unique:advance_types,name'], + ], [ + 'name.required' => 'Nazwa rodzaju zaliczki jest wymagana.', + 'name.unique' => 'Taki rodzaj zaliczki już istnieje.', + ]); + + AdvanceType::create([ + 'name' => trim($validated['name']), + ]); + + return redirect()->route('settings.index')->with('status', 'Nowy rodzaj zaliczki został dodany.'); + } + + public function updateAdvanceType(Request $request, AdvanceType $advanceType) + { + $validated = $request->validate([ + 'name' => ['required', 'string', 'max:255', 'unique:advance_types,name,' . $advanceType->id], + ], [ + 'name.required' => 'Nazwa rodzaju zaliczki jest wymagana.', + 'name.unique' => 'Taki rodzaj zaliczki już istnieje.', + ]); + + $advanceType->update([ + 'name' => trim($validated['name']), + ]); + + return redirect()->route('settings.index')->with('status', 'Rodzaj zaliczki został zaktualizowany.'); + } + + public function destroyAdvanceType(AdvanceType $advanceType) + { + if ($advanceType->advances()->exists()) { + return redirect()->route('settings.index')->with('error', 'Nie można usunąć rodzaju zaliczki, który jest już przypisany do istniejących zaliczek.'); + } + + $advanceType->delete(); + + return redirect()->route('settings.index')->with('status', 'Rodzaj zaliczki został usunięty.'); + } +} diff --git a/resources/views/layouts/navigation.blade.php b/resources/views/layouts/navigation.blade.php index e78f2e2..d18aaf3 100644 --- a/resources/views/layouts/navigation.blade.php +++ b/resources/views/layouts/navigation.blade.php @@ -69,6 +69,15 @@ + @can('users_access') + + + + + + + @endcan + @@ -88,6 +97,12 @@ {{ __('Profile') }} + @can('users_access') + + {{ __('Ustawienia') }} + + @endcan +
@csrf @@ -170,6 +185,12 @@ {{ __('Profile') }} + @can('users_access') + + {{ __('Ustawienia') }} + + @endcan + @csrf diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php new file mode 100644 index 0000000..6169a01 --- /dev/null +++ b/resources/views/settings/index.blade.php @@ -0,0 +1,113 @@ + + +

+ Ustawienia systemu +

+ + +
+
+ @if (session('status')) +
+ {{ session('status') }} +
+ @endif + + @if (session('error')) +
+ {{ session('error') }} +
+ @endif + +
+
+ + + +
+
+
+
+
diff --git a/routes/web.php b/routes/web.php index 5489501..dd7d867 100644 --- a/routes/web.php +++ b/routes/web.php @@ -3,6 +3,7 @@ use App\Http\Controllers\DashboardController; use App\Http\Controllers\AdvanceController; use App\Http\Controllers\ProfileController; +use App\Http\Controllers\SettingsController; use App\Http\Controllers\UserController; use Illuminate\Support\Facades\Route; @@ -34,6 +35,11 @@ Route::middleware(['auth', 'verified'])->group(function () { Route::put('/users/{user}', [UserController::class, 'update'])->name('users.update'); Route::delete('/users/{user}', [UserController::class, 'destroy'])->name('users.destroy'); Route::post('/users/{user}/restore', [UserController::class, 'restore'])->name('users.restore'); + + Route::get('/settings', [SettingsController::class, 'index'])->name('settings.index'); + Route::post('/settings/advance-types', [SettingsController::class, 'storeAdvanceType'])->name('settings.advance-types.store'); + Route::put('/settings/advance-types/{advanceType}', [SettingsController::class, 'updateAdvanceType'])->name('settings.advance-types.update'); + Route::delete('/settings/advance-types/{advanceType}', [SettingsController::class, 'destroyAdvanceType'])->name('settings.advance-types.destroy'); }); // Moduł Raporty diff --git a/tests/Feature/AdvanceTest.php b/tests/Feature/AdvanceTest.php index 10224c4..a6c9ad6 100644 --- a/tests/Feature/AdvanceTest.php +++ b/tests/Feature/AdvanceTest.php @@ -75,6 +75,65 @@ test('manager can create an advance for another user', function () { ]); }); +test('manager can access system settings and add an advance type', function () { + Permission::firstOrCreate(['name' => 'users_access']); + + $manager = User::factory()->create(); + $managerRole = Role::firstOrCreate(['name' => 'kierownik']); + $managerRole->givePermissionTo(['zaliczki_access', 'users_access']); + $manager->assignRole($managerRole); + + $indexResponse = $this->actingAs($manager)->get(route('settings.index')); + $indexResponse->assertOk(); + + $storeResponse = $this->actingAs($manager)->post(route('settings.advance-types.store'), [ + 'name' => 'Koncesja', + ]); + + $storeResponse->assertRedirect(route('settings.index')); + $this->assertDatabaseHas('advance_types', ['name' => 'Koncesja']); +}); + +test('manager can edit and delete an advance type from settings', function () { + Permission::firstOrCreate(['name' => 'users_access']); + + $manager = User::factory()->create(); + $managerRole = Role::firstOrCreate(['name' => 'kierownik']); + $managerRole->givePermissionTo(['zaliczki_access', 'users_access']); + $manager->assignRole($managerRole); + + $type = AdvanceType::create(['name' => 'Koncesja']); + + $editResponse = $this->actingAs($manager)->put(route('settings.advance-types.update', $type), [ + 'name' => 'Koncesja VIP', + ]); + $editResponse->assertRedirect(route('settings.index')); + $this->assertDatabaseHas('advance_types', ['id' => $type->id, 'name' => 'Koncesja VIP']); + + $deleteResponse = $this->actingAs($manager)->delete(route('settings.advance-types.destroy', $type)); + $deleteResponse->assertRedirect(route('settings.index')); + $this->assertDatabaseMissing('advance_types', ['id' => $type->id]); +}); + +test('manager cannot delete an advance type that is still used in advances', function () { + Permission::firstOrCreate(['name' => 'users_access']); + + $manager = User::factory()->create(); + $managerRole = Role::firstOrCreate(['name' => 'kierownik']); + $managerRole->givePermissionTo(['zaliczki_access', 'users_access']); + $manager->assignRole($managerRole); + + $type = AdvanceType::create(['name' => 'Paliwo']); + $employee = User::factory()->create(); + Advance::create(['date' => '2026-08-28', 'user_id' => $employee->id, 'amount' => 100, 'advance_type_id' => $type->id]); + + $response = $this->actingAs($manager)->from(route('settings.index'))->delete(route('settings.advance-types.destroy', $type)); + + $response->assertRedirect(route('settings.index')); + $response->assertSessionHas('error', 'Nie można usunąć rodzaju zaliczki, który jest już przypisany do istniejących zaliczek.'); + $this->assertDatabaseHas('advance_types', ['id' => $type->id, 'name' => 'Paliwo']); +}); + test('employee can edit own advance but cannot access another users advance', function () { $employee = userWithAdvanceAccess(); $otherUser = User::factory()->create();