diff --git a/app/Http/Requests/CreateMessage.php b/app/Http/Requests/CreateMessage.php index ad93dfb..99c198f 100644 --- a/app/Http/Requests/CreateMessage.php +++ b/app/Http/Requests/CreateMessage.php @@ -2,7 +2,9 @@ namespace App\Http\Requests; +use App\Enums\MessageType; use Illuminate\Foundation\Http\FormRequest; +use Kwaadpepper\Enum\Rules\EnumIsValidRule; class CreateMessage extends FormRequest { @@ -33,7 +35,8 @@ class CreateMessage extends FormRequest protected function prepareForValidation() { $this->merge([ - 'subscribe' => $this->subscribe ? true : false + 'subscribe' => $this->subscribe ? true : false, + 'type' => $this->type == MessageType::private() ? MessageType::private()->value : MessageType::public()->value ]); } @@ -49,7 +52,11 @@ class CreateMessage extends FormRequest return [ 'subscribe' => 'required|boolean', 'message' => 'required|min:' . ($user->isAdmin() ? '5' : '20'), - 'file_message' => 'sometimes|mimes:jpeg,jpg,png,pdf|max:2048' + 'file_message' => 'sometimes|mimes:jpeg,jpg,png,pdf|max:2048', + 'type' => [ + 'required', + new EnumIsValidRule(MessageType::class) + ] ]; } } diff --git a/config/app.php b/config/app.php index b2c68ba..72f41ed 100644 --- a/config/app.php +++ b/config/app.php @@ -245,6 +245,7 @@ return [ 'TableRow' => App\Enums\Planning\TableRow::class, 'ActivityEnum' => App\Enums\MacroSchedule\Activity::class, 'ProjectStatus' => App\Enums\ProjectStatus::class, + 'MessageTypeEnum' => App\Enums\MessageType::class, ], ]; diff --git a/resources/views/ticket/show.blade.php b/resources/views/ticket/show.blade.php index aec2ebd..56eef21 100644 --- a/resources/views/ticket/show.blade.php +++ b/resources/views/ticket/show.blade.php @@ -126,6 +126,16 @@ + @if(Auth::check() and !Auth::user()->role->equals(Role::client())) +