Changed blade and request to create private or public messages

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)
+            ]
         ];
     }
 }

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,
     ],
 
 ];

resources/views/ticket/show.blade.php

@@ -126,6 +126,16 @@
                                     </div>
                                 </div>
                             </div>
+                            @if(Auth::check() and !Auth::user()->role->equals(Role::client()))
+                            <div class="row mt-4">
+                                <div class="col">
+                                    <div class="form-check">
+                                        <input name="type" type="checkbox" class="form-check-input" id="setPrivate" autocomplete="off" value="{{MessageTypeEnum::private()}}">
+                                        <label class="form-check-label" for="setPrivate">{{ __('Rendre le message privé') }}</label>
+                                    </div>
+                                </div>
+                            </div>
+                            @endif
                         </div>
                         <div class="modal-footer">
                             <button type="reset" class="btn btn-sm btn-danger" data-bs-dismiss="modal">{{ __('Fermer') }}</button>
@@ -147,6 +157,10 @@
         <small class="fw-bold">({{ __('Message système') }})</small>
     </div>
     @else
+        @if (
+            $message->type->equals(MessageTypeEnum::public()) ||
+            ($message->type->equals(MessageTypeEnum::private()) && !Auth::user()->role->equals(Role::client()))
+        )
     <div class="@if($message->user_id === Auth::user()->id)offset-md-4 alert-dark @else alert-light @endif col-md-8 alert">
         {!! ToolboxHelper::plainToHtml($message->message) !!}
         @if ($message->file !== null)
@@ -194,6 +208,7 @@
         @endcan
         @endif
     </div>
+        @endif
     @endif
     @endforeach
 </div>