Merge branch 'dev' of rav.triplestart.com:jmudaka/stagfe2 into dev

resources/views/app/patient/prescriptions/pdf/DRUG.blade.php

@@ -77,10 +77,10 @@ if($coverage) {
                             @if(@$item->instructions)
                                 <p style="margin: 0.5rem 0;">Instructions: {{ $item->instructions }}</p>
                             @endif
-                            @if(@$item->dispense)
+                            @if(isset($item->dispense))
                                 <p style="margin: 0.5rem 0;">Dispense: {{ $item->dispense }}</p>
                             @endif
-                            @if(@$item->refills)
+                            @if(isset($item->refills))
                                 <p style="margin: 0.5rem 0;">Refills: {{ $item->refills }}</p>
                             @endif
                         </div>

resources/views/app/patient/prescriptions/pdf/pdf-preview.blade.php

@@ -34,7 +34,7 @@
 <div style="margin: 0; padding: .3rem; font-family: sans-serif">
     <header style="padding: 0; border: 0; margin: 0">
         <div style="text-align: center">
-            <h3 style="margin-bottom:1px;line-height:5px;">{{ $prescription->hcpPro->displayName() }}</h3>
+            <h3 style="margin-bottom:1px;line-height:5px;">{{ $prescription->hcpPro->displayName(true) }}</h3>
             <h4 style="margin-bottom:1px;line-height:5px;">{{$companyName}}</h4>
             <h4 style="margin-bottom:1px;line-height:3px;font-weight:400;">{{$addressLine1}}, {{$addressLine2}}</h4>
             <h4 style="margin-bottom:1rem;line-height:3px;font-weight:400;">{{$city}}, {{$state}} {{$zip}}</h4>