From 98966189446412db0cefd99f500a4afadc83ba74 Mon Sep 17 00:00:00 2001 From: HolgerHatGarKeineNode Date: Mon, 27 Feb 2023 16:35:56 +0100 Subject: [PATCH] recurring fixed --- .../Livewire/Meetup/Form/MeetupEventForm.php | 30 +++++++++---------- .../meetup/form/meetup-event-form.blade.php | 20 ++++++------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/app/Http/Livewire/Meetup/Form/MeetupEventForm.php b/app/Http/Livewire/Meetup/Form/MeetupEventForm.php index 146d8dce..a67d7704 100644 --- a/app/Http/Livewire/Meetup/Form/MeetupEventForm.php +++ b/app/Http/Livewire/Meetup/Form/MeetupEventForm.php @@ -24,22 +24,22 @@ class MeetupEventForm extends Component public function rules() { return [ - 'meetupEvent.meetup_id' => 'required', - 'meetupEvent.start' => 'required', - 'meetupEvent.location' => 'string|nullable', + 'meetupEvent.meetup_id' => 'required', + 'meetupEvent.start' => 'required', + 'meetupEvent.location' => 'string|nullable', 'meetupEvent.description' => 'string|nullable', - 'meetupEvent.link' => 'url|nullable', + 'meetupEvent.link' => 'url|nullable', 'series.*.start' => 'required', - 'recurring' => 'bool', + 'recurring' => 'bool', 'repetitions' => 'numeric|min:1', ]; } public function mount() { - if (! $this->meetupEvent) { + if (!$this->meetupEvent) { $this->meetupEvent = new MeetupEvent( [ 'start' => now() @@ -47,7 +47,7 @@ class MeetupEventForm extends Component ->addHours(17), ] ); - } elseif (! auth() + } elseif (!auth() ->user() ->can('update', $this->meetupEvent)) { abort(403); @@ -89,15 +89,15 @@ class MeetupEventForm extends Component $this->dialog() ->confirm( [ - 'title' => __('Delete event'), + 'title' => __('Delete event'), 'description' => __('Are you sure you want to delete this event? This action cannot be undone.'), - 'icon' => 'warning', - 'accept' => [ - 'label' => __('Yes, delete'), + 'icon' => 'warning', + 'accept' => [ + 'label' => __('Yes, delete'), 'method' => 'deleteEvent', ], - 'reject' => [ - 'label' => __('No, cancel'), + 'reject' => [ + 'label' => __('No, cancel'), 'method' => 'cancel', ], ] @@ -114,7 +114,7 @@ class MeetupEventForm extends Component public function submit() { $this->validate(); - if (! $this->meetupEvent->id) { + if (!$this->meetupEvent->id) { $hasAppointmentsOnThisDate = MeetupEvent::query() ->where('meetup_id', $this->meetupEvent->meetup_id) ->where('start', '>', Carbon::parse($this->meetupEvent->start) @@ -132,7 +132,7 @@ class MeetupEventForm extends Component $this->meetupEvent->save(); - if (! $this->meetupEvent->id && $this->recurring) { + if ($this->recurring) { foreach ($this->series as $event) { $hasAppointmentsOnThisDate = MeetupEvent::query() ->where('meetup_id', $this->meetupEvent->meetup_id) diff --git a/resources/views/livewire/meetup/form/meetup-event-form.blade.php b/resources/views/livewire/meetup/form/meetup-event-form.blade.php index 3487de2e..784ab6ca 100644 --- a/resources/views/livewire/meetup/form/meetup-event-form.blade.php +++ b/resources/views/livewire/meetup/form/meetup-event-form.blade.php @@ -94,16 +94,16 @@ @if($meetupEvent->start && $recurring)
@for($i = 0; $i < $repetitions; $i++) - + @endfor
@endif