Merge branch 'master' into Development

This commit is contained in:
Simon Pocrnjič
2025-11-20 18:53:49 +01:00
113 changed files with 2370 additions and 547 deletions
+1 -1
View File
@@ -106,4 +106,4 @@
Breadcrumbs::for('fieldjobs.index', function (BreadcrumbTrail $trail) {
$trail->parent('dashboard');
$trail->push('Terenska dela', route('fieldjobs.index'));
});
});
+2 -3
View File
@@ -9,13 +9,12 @@
Artisan::command('question', function () {
$name = $this->ask('What is your name?');
$language = $this->choice('Which language do you prefer?', [
'PHP',
'Ruby',
'Python',
]);
$this->line('Your name is '.$name.' and you prefer '.$language.'.');
});
+11 -2
View File
@@ -64,6 +64,7 @@
config('jetstream.auth_session'),
'verified',
])->group(function () {
Route::get('/dashboard', \App\Http\Controllers\DashboardController::class)->name('dashboard');
Route::get('testing', function () {
@@ -79,7 +80,9 @@
return Inertia::render('Admin/Index');
})->name('index');
Route::get('users', [\App\Http\Controllers\Admin\UserRoleController::class, 'index'])->name('users.index');
Route::post('users', [\App\Http\Controllers\Admin\UserRoleController::class, 'store'])->name('users.store');
Route::put('users/{user}', [\App\Http\Controllers\Admin\UserRoleController::class, 'update'])->name('users.update');
Route::patch('users/{user}/toggle-active', [\App\Http\Controllers\Admin\UserRoleController::class, 'toggleActive'])->name('users.toggle-active');
// Permissions management
Route::get('permissions', [\App\Http\Controllers\Admin\PermissionController::class, 'index'])->name('permissions.index');
@@ -164,11 +167,16 @@
// Packages - contract-based helpers
Route::get('packages-contracts', [\App\Http\Controllers\Admin\PackageController::class, 'contracts'])->name('packages.contracts');
Route::post('packages-from-contracts', [\App\Http\Controllers\Admin\PackageController::class, 'storeFromContracts'])->name('packages.store-from-contracts');
});
// Contract document generation (JSON) - protected by auth+verified; permission enforced inside controller service
Route::post('contracts/{contract:uuid}/generate-document', \App\Http\Controllers\ContractDocumentGenerationController::class)->name('contracts.generate-document')->middleware('permission:create-docs');
// Contracts actions
Route::patch('/contracts/segment', [\App\Http\Controllers\ContractController::class, 'segment'])
->name('contracts.segment');
// Phone page
Route::get('phone', [PhoneViewController::class, 'index'])->name('phone.index');
Route::get('phone/completed', [PhoneViewController::class, 'completedToday'])->name('phone.completed');
@@ -324,6 +332,7 @@
Route::middleware('permission:contract-edit')->group(function () {
Route::post('client-cases/{client_case:uuid}/contract', [ClientCaseContoller::class, 'storeContract'])->name('clientCase.contract.store');
Route::put('client-cases/{client_case:uuid}/contract/{uuid}', [ClientCaseContoller::class, 'updateContract'])->name('clientCase.contract.update');
Route::patch('client-cases/{client_case:uuid}/contract/{uuid}/meta', [ClientCaseContoller::class, 'patchContractMeta'])->name('clientCase.contract.patchMeta');
Route::delete('client-cases/{client_case:uuid}/contract/{uuid}', [ClientCaseContoller::class, 'deleteContract'])->name('clientCase.contract.delete');
});
@@ -359,7 +368,7 @@
// Notifications: unread list and mark one activity as read (today)
Route::get('notifications/unread', [NotificationController::class, 'unread'])->name('notifications.unread');
Route::post('notifications/activity/read', ActivityNotificationController::class)->name('notifications.activity.read');
Route::patch('notifications/activity/read', ActivityNotificationController::class)->name('notifications.activity.read');
Route::delete('contracts/{contract:uuid}/documents/{document:uuid}', [ClientCaseContoller::class, 'deleteContractDocument'])->name('contract.document.delete');
// settings
Route::get('settings', [SettingController::class, 'index'])->name('settings');