Merge branch 'dev-josh' into dev-vj

app/Models/Note.php

@@ -18,6 +18,11 @@ class Note extends Model
         return $this->hasOne(Pro::class, 'id', 'hcp_pro_id');
     }
 
+    public function noteTemplate()
+    {
+        return $this->hasOne(NoteTemplate::class, 'id', 'note_template_id');
+    }
+
     public function createdSession()
     {
         return $this->hasOne(AppSession::class, 'id', 'created_by_session_id');

resources/views/app/practice-management/financial-transactions.blade.php

@@ -53,8 +53,10 @@
                                 </td>
                                 <td>
                                     @if($transaction->bill && $transaction->bill->note)
-                                    {!! $transaction->bill->note->summary() !!}
-                                    <a href="{{route('patients.view.notes.view.dashboard', ['patient'=>$transaction->client, 'note'=>$transaction->bill->note])}}">Go to note</a>
+                                        @if($transaction->bill->note->noteTemplate)
+                                            {{ $transaction->bill->note->noteTemplate->title }}
+                                        @endif
+                                        <a href="{{route('patients.view.notes.view.dashboard', ['patient'=>$transaction->client, 'note'=>$transaction->bill->note])}}">Go to note</a>
                                     @endif
                                 </td>
                                 {{--<td>