Merge branch 'main' into #62-vacation-request-list-for-approvers

# Conflicts:
#	app/Eloquent/Helpers/UserAvatarGenerator.php
#	composer.lock
#	database/factories/VacationRequestActivityFactory.php
#	database/seeders/DatabaseSeeder.php
#	database/seeders/DemoSeeder.php
This commit is contained in:
Adrian Hopek
2022-03-07 10:53:35 +01:00
25 changed files with 196 additions and 276 deletions

View File

@@ -50,9 +50,15 @@ Route::middleware("auth")->group(function (): void {
->name("vacation.requests.reject");
Route::post("/vacation-requests/{vacationRequest}/cancel", [VacationRequestController::class, "cancel"])
->name("vacation.requests.cancel");
Route::post("/vacation-requests/{vacationRequest}/accept-as-technical", [VacationRequestController::class, "acceptAsTechnical"])
Route::post(
"/vacation-requests/{vacationRequest}/accept-as-technical",
[VacationRequestController::class, "acceptAsTechnical"],
)
->name("vacation.requests.accept-as-technical");
Route::post("/vacation-requests/{vacationRequest}/accept-as-administrative", [VacationRequestController::class, "acceptAsAdministrative"])
Route::post(
"/vacation-requests/{vacationRequest}/accept-as-administrative",
[VacationRequestController::class, "acceptAsAdministrative"],
)
->name("vacation.requests.accept-as-administrative");
Route::post("year-periods/{yearPeriod}/select", SelectYearPeriodController::class)