diff --git a/app/Activity.php b/app/Activity.php index f37853c1..b0dd3703 100644 --- a/app/Activity.php +++ b/app/Activity.php @@ -3,23 +3,24 @@ namespace App; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Builder; +use Illuminate\Database\Eloquent\Relations\BelongsToMany; class Activity extends Model { public $fillable = ['name', 'nami_id']; - public $timestamps = false; public $casts = [ 'nami_id' => 'integer' ]; - public function subactivities() { + public function subactivities(): BelongsToMany { return $this->belongsToMany(Subactivity::class); } - public static function nami($id) { + public static function nami(int $id): ?self { return static::firstWhere('nami_id', $id); } } diff --git a/app/Member/MemberController.php b/app/Member/MemberController.php index 8a683236..189a73fc 100644 --- a/app/Member/MemberController.php +++ b/app/Member/MemberController.php @@ -15,11 +15,12 @@ use App\Group; use App\Payment\Subscription; use App\Http\Views\MemberView; use App\Member\DeleteJob; +use Inertia\Response; class MemberController extends Controller { - public function index(Request $request) { + public function index(Request $request): Response { session()->put('menu', 'member'); session()->put('title', 'Mitglieder'); @@ -32,7 +33,7 @@ class MemberController extends Controller return \Inertia::render('member/Index', $payload); } - public function create() { + public function create(): Response { session()->put('menu', 'member'); session()->put('title', 'Mitglied erstellen'); @@ -40,7 +41,7 @@ class MemberController extends Controller return \Inertia::render('member/Form', [ 'activities' => $activities->pluck('name', 'id'), - 'subactivities' => $activities->map(function($activity) { + 'subactivities' => $activities->map(function(Activity $activity) { return ['subactivities' => $activity->subactivities->pluck('name', 'id'), 'id' => $activity->id]; })->pluck('subactivities', 'id'), 'billKinds' => BillKind::get()->pluck('name', 'id'), diff --git a/app/Member/MemberRequest.php b/app/Member/MemberRequest.php index ec3be693..15964c12 100644 --- a/app/Member/MemberRequest.php +++ b/app/Member/MemberRequest.php @@ -8,6 +8,7 @@ use App\Group; use Illuminate\Support\Str; use App\Activity; use Illuminate\Support\Arr; +use Illuminate\Support\Facades\Auth; class MemberRequest extends FormRequest { @@ -57,8 +58,8 @@ class MemberRequest extends FormRequest ]; } - public function persistCreate() { - $this->merge(['group_id' => Group::where('nami_id', auth()->user()->getNamiGroupId())->firstOrFail()->id]); + public function persistCreate(): void { + $this->merge(['group_id' => Group::where('nami_id', Auth::user()->getNamiGroupId())->firstOrFail()->id]); $member = Member::create($this->input()); if($this->input('has_nami')) { CreateJob::dispatch($member, auth()->user()); diff --git a/app/Payment/PaymentResource.php b/app/Payment/PaymentResource.php index 2a283678..617888bd 100644 --- a/app/Payment/PaymentResource.php +++ b/app/Payment/PaymentResource.php @@ -24,4 +24,5 @@ class PaymentResource extends JsonResource 'is_accepted' => $this->status->isAccepted(), ]; } + }