diff --git a/src/app/Http/Controllers/Api/EventController.php b/src/app/Http/Controllers/Api/EventController.php index 32dd88e..bac1d95 100644 --- a/src/app/Http/Controllers/Api/EventController.php +++ b/src/app/Http/Controllers/Api/EventController.php @@ -46,14 +46,15 @@ class EventController extends Controller 'is_all_day' => 'boolean', 'notes' => 'nullable|string', 'color' => 'nullable|string|max:7', - 'reminders' => 'nullable|array', - 'reminders.*.type' => 'required|in:before,time_of_day,day_before', - 'reminders.*.minutes' => 'nullable|integer|min:1', - 'reminders.*.time' => 'nullable|date_format:H:i', - 'recurrence' => 'nullable|in:daily,weekly,monthly,yearly', - 'recurrence_end_date' => 'nullable|date', - 'attendee_ids' => 'nullable|array', - 'attendee_ids.*' => 'uuid|exists:contacts,id', + 'reminders' => 'nullable|array', + 'reminders.*.type' => 'required|in:before,time_of_day,day_before,specific', + 'reminders.*.minutes' => 'nullable|integer|min:1', + 'reminders.*.time' => 'nullable|date_format:H:i', + 'reminders.*.datetime' => 'nullable|date', + 'recurrence' => 'nullable|in:daily,weekly,monthly,yearly', + 'recurrence_end_date' => 'nullable|date', + 'attendee_ids' => 'nullable|array', + 'attendee_ids.*' => 'uuid|exists:contacts,id', ]); $event = $request->user()->events()->create($validated); @@ -79,14 +80,15 @@ class EventController extends Controller 'is_all_day' => 'boolean', 'notes' => 'nullable|string', 'color' => 'nullable|string|max:7', - 'reminders' => 'nullable|array', - 'reminders.*.type' => 'required|in:before,time_of_day,day_before', - 'reminders.*.minutes' => 'nullable|integer|min:1', - 'reminders.*.time' => 'nullable|date_format:H:i', - 'recurrence' => 'nullable|in:daily,weekly,monthly,yearly', - 'recurrence_end_date' => 'nullable|date', - 'attendee_ids' => 'nullable|array', - 'attendee_ids.*' => 'uuid|exists:contacts,id', + 'reminders' => 'nullable|array', + 'reminders.*.type' => 'required|in:before,time_of_day,day_before,specific', + 'reminders.*.minutes' => 'nullable|integer|min:1', + 'reminders.*.time' => 'nullable|date_format:H:i', + 'reminders.*.datetime' => 'nullable|date', + 'recurrence' => 'nullable|in:daily,weekly,monthly,yearly', + 'recurrence_end_date' => 'nullable|date', + 'attendee_ids' => 'nullable|array', + 'attendee_ids.*' => 'uuid|exists:contacts,id', ]); $event->update($validated); diff --git a/src/app/Services/EventPlannerService.php b/src/app/Services/EventPlannerService.php index 3262a91..5f6a941 100644 --- a/src/app/Services/EventPlannerService.php +++ b/src/app/Services/EventPlannerService.php @@ -134,11 +134,8 @@ class EventPlannerService $eventData['notes'] = $data['notes']; } - if (!empty($data['reminder_at'])) { - try { - $eventData['reminder_at'] = Carbon::parse($data['reminder_at'])->utc(); - $eventData['reminder_sent'] = false; - } catch (\Throwable) {} + if (!empty($data['color'])) { + $eventData['color'] = $data['color']; } $event = Event::create($eventData);