Merge branch 'master' into dev-vj

app/Models/Pro.php

@@ -57,8 +57,7 @@ class Pro extends Model
 
     public function isDefaultNA()
     {
-        // TODO are we using this?
-        return true; // $this->is_considered_for_dna;
+       return $this->is_considered_for_dna;
     }
 
     public function lastPayment() {

resources/views/app/patient/notes.blade.php

@@ -228,7 +228,9 @@
                         <i class="fa fa-info-circle"></i>
                         <div class="position-absolute bg-white border rounded p-2 stag-tooltip-content">
                             <div class="text-nowrap small text-left pb-1">Created on <b>{{ friendly_date_time($note->created_at, true) }}</b></div>
+                            @if($note->createdSession && $note->createdSession->pro)
                             <div class="text-nowrap small text-left">Created by <b>{{ $note->createdSession->pro->displayName() }}</b></div>
+                            @endif
                         </div>
                     </div>
                 </td>