Zmiany w zaliczkach
Dodanie edycji rodzajó zaliczek
This commit is contained in:
parent
37da0cacd4
commit
c13d46cebd
60
app/Http/Controllers/SettingsController.php
Normal file
60
app/Http/Controllers/SettingsController.php
Normal file
@ -0,0 +1,60 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\AdvanceType;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\View\View;
|
||||
|
||||
class SettingsController extends Controller
|
||||
{
|
||||
public function index(): View
|
||||
{
|
||||
$advanceTypes = AdvanceType::orderBy('name')->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.');
|
||||
}
|
||||
}
|
||||
@ -69,6 +69,15 @@
|
||||
</svg>
|
||||
</button>
|
||||
|
||||
@can('users_access')
|
||||
<a href="{{ route('settings.index') }}" class="p-2 text-gray-500 dark:text-gray-400 hover:bg-gray-100 dark:hover:bg-gray-700 rounded-lg focus:outline-none transition duration-150 ease-in-out" title="Ustawienia systemu" aria-label="Ustawienia systemu">
|
||||
<svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="1.8" d="M10.325 4.317c.426-1.756 2.924-1.756 3.35 0a1.724 1.724 0 002.573 1.066c1.543-.94 3.31.826 2.37 2.37a1.724 1.724 0 001.065 2.572c1.756.426 1.756 2.924 0 3.35a1.724 1.724 0 00-1.066 2.573c.94 1.543-.826 3.31-2.37 2.37a1.724 1.724 0 00-2.572 1.065c-.426 1.756-2.924 1.756-3.35 0a1.724 1.724 0 00-2.573-1.066c-1.543.94-3.31-.826-2.37-2.37a1.724 1.724 0 00-1.065-2.572c-1.756-.426-1.756-2.924 0-3.35a1.724 1.724 0 001.066-2.573c-.94-1.543.826-3.31 2.37-2.37.996.608 2.296.07 2.572-1.065z"/>
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="1.8" d="M12 9.5A2.5 2.5 0 1012 14.5A2.5 2.5 0 0012 9.5z"/>
|
||||
</svg>
|
||||
</a>
|
||||
@endcan
|
||||
|
||||
<!-- Settings Dropdown -->
|
||||
<x-dropdown align="right" width="48">
|
||||
<x-slot name="trigger">
|
||||
@ -88,6 +97,12 @@
|
||||
{{ __('Profile') }}
|
||||
</x-dropdown-link>
|
||||
|
||||
@can('users_access')
|
||||
<x-dropdown-link :href="route('settings.index')">
|
||||
{{ __('Ustawienia') }}
|
||||
</x-dropdown-link>
|
||||
@endcan
|
||||
|
||||
<!-- Authentication -->
|
||||
<form method="POST" action="{{ route('logout') }}">
|
||||
@csrf
|
||||
@ -170,6 +185,12 @@
|
||||
{{ __('Profile') }}
|
||||
</x-responsive-nav-link>
|
||||
|
||||
@can('users_access')
|
||||
<x-responsive-nav-link :href="route('settings.index')" :active="request()->routeIs('settings.*')">
|
||||
{{ __('Ustawienia') }}
|
||||
</x-responsive-nav-link>
|
||||
@endcan
|
||||
|
||||
<!-- Authentication -->
|
||||
<form method="POST" action="{{ route('logout') }}">
|
||||
@csrf
|
||||
|
||||
113
resources/views/settings/index.blade.php
Normal file
113
resources/views/settings/index.blade.php
Normal file
@ -0,0 +1,113 @@
|
||||
<x-app-layout>
|
||||
<x-slot name="header">
|
||||
<h2 class="font-semibold text-xl text-gray-800 dark:text-white leading-tight">
|
||||
Ustawienia systemu
|
||||
</h2>
|
||||
</x-slot>
|
||||
|
||||
<div class="py-12">
|
||||
<div class="max-w-5xl mx-auto sm:px-6 lg:px-8 space-y-6">
|
||||
@if (session('status'))
|
||||
<div class="rounded-md bg-green-50 dark:bg-green-900/30 border border-green-200 dark:border-green-700/60 p-4 text-sm text-green-800 dark:text-green-200">
|
||||
{{ session('status') }}
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@if (session('error'))
|
||||
<div class="rounded-md bg-red-50 dark:bg-red-900/30 border border-red-200 dark:border-red-700/60 p-4 text-sm text-red-800 dark:text-red-200">
|
||||
{{ session('error') }}
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<div class="space-y-4">
|
||||
<div class="bg-white dark:bg-gray-800 shadow-sm rounded-lg border border-gray-200 dark:border-gray-700/50 overflow-hidden">
|
||||
<button type="button" class="w-full flex items-center justify-between px-5 py-4 text-left font-semibold text-gray-900 dark:text-white bg-gray-50 dark:bg-gray-800/80 hover:bg-gray-100 dark:hover:bg-gray-700/80 transition" onclick="const panel=this.nextElementSibling; panel.classList.toggle('hidden'); this.querySelector('svg').classList.toggle('rotate-180');">
|
||||
<span>Rodzaje zaliczek</span>
|
||||
<svg class="w-5 h-5 transition-transform duration-200" viewBox="0 0 20 20" fill="currentColor">
|
||||
<path fill-rule="evenodd" d="M5.23 7.21a.75.75 0 011.06.02L10 11.17l3.71-3.94a.75.75 0 111.08 1.04l-4.25 4.5a.75.75 0 01-1.08 0l-4.25-4.5a.75.75 0 01.02-1.06z" clip-rule="evenodd" />
|
||||
</svg>
|
||||
</button>
|
||||
|
||||
<div class="hidden p-5">
|
||||
<form method="POST" action="{{ route('settings.advance-types.store') }}" class="mb-8">
|
||||
@csrf
|
||||
<div class="flex flex-col sm:flex-row gap-3">
|
||||
<div class="flex-1">
|
||||
<label for="name" class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">Nazwa nowego rodzaju</label>
|
||||
<input id="name" name="name" type="text" value="{{ old('name') }}" placeholder="np. Paliwo, Hotel, Wpłata" class="w-full rounded-md border-gray-300 dark:border-gray-600 dark:bg-gray-700 dark:text-white shadow-sm focus:border-indigo-500 focus:ring-indigo-500">
|
||||
@error('name')
|
||||
<p class="mt-1 text-sm text-red-600 dark:text-red-400">{{ $message }}</p>
|
||||
@enderror
|
||||
</div>
|
||||
|
||||
<div class="flex items-end">
|
||||
<button type="submit" class="inline-flex items-center justify-center px-4 py-2 bg-indigo-600 hover:bg-indigo-500 text-white text-sm font-medium rounded-md shadow-sm transition">
|
||||
Dodaj rodzaj
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<div class="overflow-x-auto">
|
||||
<table class="min-w-full divide-y divide-gray-200 dark:divide-gray-700">
|
||||
<thead>
|
||||
<tr class="text-left text-xs font-semibold uppercase tracking-wider text-gray-500 dark:text-gray-400">
|
||||
<th class="py-3 px-4">Nazwa</th>
|
||||
<th class="py-3 px-4 text-right">Data dodania</th>
|
||||
<th class="py-3 px-4 text-right">Akcje</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody class="divide-y divide-gray-200 dark:divide-gray-700/60">
|
||||
@forelse($advanceTypes as $type)
|
||||
<tr>
|
||||
<td class="py-3 px-4 text-gray-900 dark:text-white">{{ $type->name }}</td>
|
||||
<td class="py-3 px-4 text-right text-sm text-gray-500 dark:text-gray-400">
|
||||
{{ $type->created_at ? $type->created_at->format('d.m.Y') : '-' }}
|
||||
</td>
|
||||
<td class="py-3 px-4">
|
||||
<div class="flex items-center justify-end gap-2">
|
||||
<button type="button" onclick="document.getElementById('edit-type-{{ $type->id }}').classList.toggle('hidden')" class="inline-flex items-center px-3 py-1.5 text-sm font-medium rounded-md bg-amber-100 text-amber-800 hover:bg-amber-200 dark:bg-amber-900/40 dark:text-amber-200 dark:hover:bg-amber-900/60">
|
||||
Edytuj
|
||||
</button>
|
||||
<form method="POST" action="{{ route('settings.advance-types.destroy', $type) }}" onsubmit="return confirm('Czy na pewno chcesz usunąć ten rodzaj zaliczki?');">
|
||||
@csrf
|
||||
@method('DELETE')
|
||||
<button type="submit" class="inline-flex items-center px-3 py-1.5 text-sm font-medium rounded-md bg-red-100 text-red-700 hover:bg-red-200 dark:bg-red-900/40 dark:text-red-200 dark:hover:bg-red-900/60">
|
||||
Usuń
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<div id="edit-type-{{ $type->id }}" class="hidden mt-3 rounded-md border border-gray-200 dark:border-gray-700 bg-gray-50 dark:bg-gray-900/40 p-3">
|
||||
<form method="POST" action="{{ route('settings.advance-types.update', $type) }}">
|
||||
@csrf
|
||||
@method('PUT')
|
||||
<div class="flex flex-col sm:flex-row gap-2">
|
||||
<input type="text" name="name" value="{{ old('name', $type->name) }}" class="flex-1 rounded-md border-gray-300 dark:border-gray-600 dark:bg-gray-700 dark:text-white shadow-sm focus:border-indigo-500 focus:ring-indigo-500">
|
||||
<button type="submit" class="inline-flex items-center justify-center px-3 py-2 bg-indigo-600 hover:bg-indigo-500 text-white text-sm rounded-md shadow-sm">
|
||||
Zapisz
|
||||
</button>
|
||||
</div>
|
||||
@error('name')
|
||||
<p class="mt-2 text-xs text-red-600 dark:text-red-400">{{ $message }}</p>
|
||||
@enderror
|
||||
</form>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
@empty
|
||||
<tr>
|
||||
<td colspan="3" class="py-6 px-4 text-center text-sm text-gray-500 dark:text-gray-400">
|
||||
Brak zdefiniowanych rodzajów zaliczek.
|
||||
</td>
|
||||
</tr>
|
||||
@endforelse
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</x-app-layout>
|
||||
@ -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
|
||||
|
||||
@ -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();
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user