Messages

app/Http/Controllers/MessageController.php

@@ -41,9 +41,15 @@ class MessageController extends Controller
 
     public function messages(Request $request, Client $patient){
         $defaultCompanyClient = $this->getDefaultCompanyClientFromSession($patient);
-        $defaultCompany = $defaultCompanyClient->company;
+        $defaultCompany = $defaultCompanyClient ? $defaultCompanyClient->company : null;
         $regardingClient = $patient;
-        $messages = InternalMessage::where('regarding_company_id', $defaultCompany->id)->where('regarding_client_id', $patient->id)->orderBy('created_at', 'ASC')->paginate(100);
+
+        $messages = InternalMessage::where('regarding_client_id', $patient->id);
+        if($defaultCompany){
+            $messages = InternalMessage::where('regarding_company_id', $defaultCompany->id);
+        }
+
+        $messages = $messages->orderBy('created_at', 'ASC')->paginate(100);
 
         return view('app.patient.company-client.messages', compact('patient', 'regardingClient', 'messages', 'defaultCompanyClient', 'defaultCompany'));
     }

resources/views/app/patient/company-client/messages.blade.php

@@ -175,7 +175,7 @@
                             </div>
                             <div class="im-input">
                                 <div class="p-1">
-                                    <label><input type="checkbox" name="toClientUid" value="{{ $defaultCompanyClient->client->uid }}"> Send to only patient</label>
+                                    <label><input type="checkbox" name="toClientUid" value="{{ $patient->uid }}"> Send to only patient</label>
                                 </div>
                                 <div class="d-flex align-items-end">
                                     <div class="msg-input">
@@ -252,11 +252,11 @@
                 var toClientUidCheckbox = $('input[name=toClientUid]');
                 if(toClientUidCheckbox.is(':checked')){
                     formData.set('toClientUid', toClientUidCheckbox.val());
-                    formData.set('regardingCompanyClientUid', "{{ $defaultCompanyClient->id }}");
+                    formData.set('regardingCompanyClientUid', "{{ @$defaultCompanyClient->id }}");
                 }
                 formData.set('fromProUid', '{{ $performer->pro->uid }}');
                 formData.set('regardingClientUid', '{{ $regardingClient->uid }}');
-                formData.set('regardingCompanyUid', '{{ $defaultCompany->uid }}');
+                formData.set('regardingCompanyUid', '{{ @$defaultCompany->uid }}');
                 formData.set('contentText', text);
 
                 let hasFiles = false;

routes/web.php

@@ -601,7 +601,8 @@ Route::middleware('pro.auth')->group(function () {
             Route::middleware([])->group(function () {
                 Route::get('customers', [CustomerController::class, 'customers'])->name('customers');
                 Route::get('customers/view/{slug}', [CustomerController::class, 'customer'])->name('customer');
-                Route::middleware(['client.has-default-company-client'])->group(function () {
+                //client.has-default-company-client
+                Route::middleware([])->group(function () {
                     Route::get('messages', [MessageController::class, 'messages'])->name('messages');
                     Route::get('messages/{message}/attachments', [MessageController::class, 'clientMessagesAttachments'])->name('messages-attachments');
                 });