Incoming reports list updates

app/Http/Controllers/PatientController.php

@@ -10,6 +10,7 @@ use App\Models\ClientBDTDevice;
 use App\Models\ClientInfoLine;
 use App\Models\Facility;
 use App\Models\Handout;
+use App\Models\IncomingReport;
 use App\Models\MBPayer;
 use App\Models\NoteTemplate;
 use App\Models\Pro;
@@ -273,9 +274,9 @@ class PatientController extends Controller
         return view('app.patient.documents', compact('patient'));
     }
 
-    public function incomingReports(Request $request, Client $patient )
+    public function incomingReports(Request $request, Client $patient, IncomingReport $currentReport = null)
     {
-        return view('app.patient.incoming-reports', compact('patient'));
+        return view('app.patient.incoming-reports', compact('patient', 'currentReport'));
     }
 
     public function education(Request $request, Client $patient )

public/css/style.css

@@ -298,6 +298,15 @@ body>nav.navbar {
 .mcp-theme-1 .min-width-500px {
     min-width: 500px !important;
 }
+.mcp-theme-1 .max-width-500px {
+    max-width: 500px !important;
+}
+.mcp-theme-1 .min-width-700px {
+    min-width: 700px !important;
+}
+.mcp-theme-1 .max-width-700px {
+    max-width: 700px !important;
+}
 .mcp-theme-1 .width-100px {
     width: 100px;
     min-width: unset !important;
@@ -1538,4 +1547,8 @@ th.only-screen, td.only-screen {
 .suggest-item.patient-suggest>img.claimed {
     filter: grayscale(100%);
     opacity: 0.5;
+}
+.pdf-viewer-auto {
+    max-height: 600px;
+    overflow: auto;
 }

resources/views/app/patient/incoming-reports.blade.php

@@ -54,41 +54,74 @@
                 </form>
             </div>
         </div>
-        <table class="table table-striped table-sm table-bordered mb-0">
-            <thead>
-            <tr>
-                <th class="px-2 text-secondary">Created</th>
-                <th class="px-2 text-secondary">Report</th>
-                <th class="px-2 text-secondary">Sign</th>
-                <th class="px-2 text-secondary">Title</th>
-                <th class="px-2 text-secondary">Category</th>
-                <th class="px-2 text-secondary">Memo</th>
-                <th class="px-2"></th>
-            </tr>
-            </thead>
-            <tbody>
-            @foreach($patient->incomingReports as $document)
-                <tr class="{{$document->is_entry_error ? 'entry-error' : ''}}">
-                    <td class="px-2">{{ friendly_date_time($document->created_at) }}</td>
-                    <td class="px-2">
-                        <div class="d-flex align-items-center">
-                            <a class="pdf-viewer-trigger" native target="_blank"
-                               href="/api/incomingReport/download/{{ $document->uid }}"
-                               title="View">View</a>
-                            @if($document->is_entry_error)
-                                <span class="ml-auto text-danger on-hover-opaque" title="Entry Error">
-                                    <i class="fa fa-exclamation-triangle"></i>
-                                </span>
-                            @endif
-                        </div>
-                    </td>
-                    <td class="px-2">
-                        @if(!$document->has_hcp_pro_signed)
-                            @if($document->hcp_pro_id === $pro->id)
-                                <div moe relative class="mr-2">
-                                    <a start show class="">Sign</a>
+        <div class="d-flex align-items-start h-100">
+            <div class="flex-grow-1">
+                <table class="table table-striped table-sm table-bordered mb-0">
+                    <thead>
+                    <tr>
+                        <th class="px-2 text-secondary">Created</th>
+                        <th class="px-2 text-secondary">Title</th>
+<!--                        <th class="px-2 text-secondary">Report</th>-->
+                        <th class="px-2 text-secondary">Sign</th>
+                        <th class="px-2 text-secondary">Category</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    @foreach($patient->incomingReports as $document)
+                        <tr class="{{$document->is_entry_error ? 'entry-error' : ''}} {{@$currentReport->uid === $document->uid ? 'bg-aliceblue' : ''}}">
+                            <td class="px-2">{{ friendly_date_time($document->created_at, false) }}</td>
+                            <td class="px-2">
+                                <a href="{{route('patients.view.incoming-reports', ['patient' => $patient, 'currentReport' => $document])}}">
+                                    {{ $document->title ? $document->title : '(not set)' }}
+                                </a>
+                            </td>
+{{--                            <td class="px-2">--}}
+{{--                                <div class="d-flex align-items-center">--}}
+{{--                                    <a class="pdf-viewer-trigger" native target="_blank"--}}
+{{--                                       href="/api/incomingReport/download/{{ $document->uid }}"--}}
+{{--                                       title="View">View</a>--}}
+{{--                                    @if($document->is_entry_error)--}}
+{{--                                        <span class="ml-auto text-danger on-hover-opaque" title="Entry Error">--}}
+{{--                                    <i class="fa fa-exclamation-triangle"></i>--}}
+{{--                                </span>--}}
+{{--                                    @endif--}}
+{{--                                </div>--}}
+{{--                            </td>--}}
+                            <td class="px-2">
+                                @if(!$document->has_hcp_pro_signed)
+                                    -
+                                @else
+                                    <div class="text-success mb-1">
+                                        <i class="fa fa-check"></i>
+                                        Signed
+                                    </div>
+                                    @if($document->hcp)
+                                        <div class="text-secondary">
+                                            <div class="text-sm font-weight-bold">{{$document->hcp->displayName()}}</div>
+                                            <div class="text-sm">{{friendlier_date_time($document->hcp_pro_signed_at)}}</div>
+                                        </div>
+                                    @endif
+                                @endif
+                            </td>
+                            <td class="px-2">{{ $document->category }}{{ $document->subcategory ? ' / ' . $document->subcategory : '' }}</td>
+                        </tr>
+                    @endforeach
+                    </tbody>
+                </table>
+            </div>
+            @if(@$currentReport)
+                <div class="min-width-700px max-width-700px ml-2 border align-self-stretch p-3">
+                    <div class="d-flex align-items-center">
+                        <h3 class="font-size-16 m-0 flex-grow-1 text-ellipsis">{{$currentReport->title ? $currentReport->title : '(not set)'}}</h3>
+                        <div class="d-inline-flex align-items-center ml-auto flex-nowrap mr-2 border-right">
+                            <a class="on-hover-opaque mr-2 pr-1 d-inline-block" native target="_blank"
+                               href="/api/incomingReport/download/{{ $currentReport->uid }}"
+                               title="Download"><i class="fa fa-download"></i></a>
+                            @if(!$currentReport->has_hcp_pro_signed && $currentReport->hcp_pro_id === $pro->id)
+                                <div moe relative class="mr-2 pr-1">
+                                    <a href="#" start show class="" title="Sign"><i class="fa fa-signature text-success"></i></a>
                                     <form url="/api/incomingReport/signAsHcp" right>
-                                        <input type="hidden" name="uid" value="{{ $document->uid }}">
+                                        <input type="hidden" name="uid" value="{{ $currentReport->uid }}">
                                         <p class="small">Are you sure you want to sign this report as HCP?</p>
                                         <div class="d-flex align-items-center">
                                             <button class="btn btn-sm btn-success mr-2" submit>Sign</button>
@@ -96,59 +129,36 @@
                                         </div>
                                     </form>
                                 </div>
-                            @else
-                                -
                             @endif
-                        @else
-                            <div class="text-success mb-1">
-                                <i class="fa fa-check"></i>
-                                Signed
-                            </div>
-                            @if($document->hcp)
-                                <div class="text-secondary">
-                                    <div class="text-sm font-weight-bold">{{$document->hcp->displayName()}}</div>
-                                    <div class="text-sm">{{friendlier_date_time($document->hcp_pro_signed_at)}}</div>
-                                </div>
-                            @endif
-                        @endif
-                    </td>
-                    <td class="px-2">{{ $document->title }}</td>
-                    <td class="px-2">{{ $document->category }}{{ $document->subcategory ? ' / ' . $document->subcategory : '' }}</td>
-                    <td class="px-2">{{ $document->memo }}</td>
-                    <td class="px-2">
-                        <div class="d-flex align-items-center">
-                            <a class="on-hover-opaque mr-3" native target="_blank"
-                               href="/api/incomingReport/download/{{ $document->uid }}"
-                               title="Download"><i class="fa fa-download"></i></a>
-                            @if(!$document->has_hcp_pro_signed)
-                                <div moe relative class="mr-3">
+                            @if(!$currentReport->has_hcp_pro_signed)
+                                <div moe relative class="mr-2 pr-1">
                                     <a href="#" start show class="on-hover-opaque" title="Edit"><i class="fa fa-edit text-primary"></i></a>
                                     <form url="dummy" action="/api/incomingReport/updateBasic"
                                           right
                                           method="post"
                                           onsubmit="return submitIncomingReport(this)"
                                           enctype="multipart/form-data">
-                                        <input type="hidden" name="uid" value="{{ $document->uid }}">
+                                        <input type="hidden" name="uid" value="{{ $currentReport->uid }}">
 
                                         <div class="mb-2">
                                             <label for="" class="text-sm text-secondary mb-1">Category</label>
                                             <input type="text" class="form-control form-control-sm" name="category"
-                                                   value="{{$document->category}}" placeholder="Category">
+                                                   value="{{$currentReport->category}}" placeholder="Category">
                                         </div>
                                         <div class="mb-2">
                                             <label for="" class="text-sm text-secondary mb-1">Sub-category</label>
                                             <input type="text" class="form-control form-control-sm" name="subcategory"
-                                                   value="{{$document->subcategory}}" placeholder="Sub-category">
+                                                   value="{{$currentReport->subcategory}}" placeholder="Sub-category">
                                         </div>
                                         <div class="mb-2">
                                             <label for="" class="text-sm text-secondary mb-1">Report Date</label>
                                             <input type="date" class="form-control form-control-sm" name="reportDate"
-                                                   value="{{$document->reportDate}}" placeholder="Report Date">
+                                                   value="{{$currentReport->reportDate}}" placeholder="Report Date">
                                         </div>
                                         <div class="mb-2">
                                             <label for="" class="text-sm text-secondary mb-1">Title *</label>
                                             <input type="text" class="form-control form-control-sm" name="title"
-                                                   value="{{$document->title}}" placeholder="Title" required>
+                                                   value="{{$currentReport->title}}" placeholder="Title" required>
                                         </div>
                                         <div class="mb-2">
                                             <label for="" class="text-sm text-secondary mb-1">File *</label>
@@ -159,14 +169,14 @@
                                         <div class="mb-2">
                                             <label for="" class="text-sm text-secondary mb-1">HCP Pro</label>
                                             <select name="hcpProUid" provider-search
-                                                    data-pro-name="{{$document->hcp ? $document->hcp->displayName() : ''}}"
+                                                    data-pro-name="{{$currentReport->hcp ? $currentReport->hcp->displayName() : ''}}"
                                                     class="form-control form-control-sm">
                                             </select>
                                         </div>
                                         <div class="mb-2">
                                             <label for="" class="text-sm text-secondary mb-1">Memo</label>
                                             <input type="text" class="form-control form-control-sm" name="memo"
-                                                   value="{{$document->memo}}" placeholder="Memo">
+                                                   value="{{$currentReport->memo}}" placeholder="Memo">
                                         </div>
 
                                         <div class="d-flex align-items-center">
@@ -175,11 +185,11 @@
                                         </div>
                                     </form>
                                 </div>
-                                @if(!$document->is_entry_error)
-                                    <div moe relative class="mr-3">
+                                @if(!$currentReport->is_entry_error)
+                                    <div moe relative class="mr-2 pr-1">
                                         <a start show class="on-hover-opaque" title="Mark as entry-error"><i class="fa fa-ban text-danger"></i></a>
                                         <form url="/api/incomingReport/setIsEntryErrorToTrue" right>
-                                            <input type="hidden" name="uid" value="{{ $document->uid }}">
+                                            <input type="hidden" name="uid" value="{{ $currentReport->uid }}">
                                             <p class="small">Are you sure you want to set this report as entry error?</p>
                                             <div class="d-flex align-items-center">
                                                 <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
@@ -188,10 +198,10 @@
                                         </form>
                                     </div>
                                 @else
-                                    <div moe relative class="mr-3">
+                                    <div moe relative class="mr-2">
                                         <a start show class="on-hover-opaque" title="Undo mark as entry-error"><i class="fa fa-undo"></i></a>
                                         <form url="/api/incomingReport/setIsEntryErrorToFalse" right>
-                                            <input type="hidden" name="uid" value="{{ $document->uid }}">
+                                            <input type="hidden" name="uid" value="{{ $currentReport->uid }}">
                                             <p class="small">Are you sure you want to set unset this report as entry error?</p>
                                             <div class="d-flex align-items-center">
                                                 <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
@@ -202,11 +212,267 @@
                                 @endif
                             @endif
                         </div>
-                    </td>
-                </tr>
-            @endforeach
-            </tbody>
-        </table>
+                        <a class="ml-auto" href="{{route('patients.view.incoming-reports', ['patient' => $patient, 'currentReport' => null])}}">
+                            <i class="fa fa-times-circle on-hover-opaque"></i>
+                        </a>
+                    </div>
+                    <hr class="my-3">
+                    <?php /*
+                    <div class="mb-3">
+                        <label class="text-secondary text-sm mb-1">Reason</label>
+                        <div moe class="d-block">
+                            <a start show>{{$supplyOrder->reason ? $supplyOrder->reason : '(not set)'}}</a>
+                            <form url="/api/supplyOrder/updateReason">
+                                <input type="hidden" name="uid" value="{{ $supplyOrder->uid }}">
+                                <div class="mb-2">
+                                    <label class="text-secondary mb-1 text-sm">Reason *</label>
+                                    <input type="text" class="form-control form-control-sm" required
+                                           name="reason" value="{{$supplyOrder->reason}}">
+                                </div>
+                                <div class="d-flex align-items-center">
+                                    <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
+                                    <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                </div>
+                            </form>
+                        </div>
+                    </div>
+                    <div class="mb-3">
+                        <label class="text-secondary text-sm mb-1">Address</label>
+                        <div moe class="d-block">
+                            <a start show>
+                                {{$supplyOrder->mailing_address_full ? implode(" ", [$supplyOrder->mailing_address_line1, $supplyOrder->mailing_address_line2, $supplyOrder->mailing_address_city, $supplyOrder->mailing_address_state, $supplyOrder->mailing_address_zip]) : '(not set)'}}
+                            </a>
+                            <form url="/api/supplyOrder/updateMailingAddress">
+                                <input type="hidden" name="uid" value="{{ $supplyOrder->uid }}">
+                                <div class="mb-2">
+                                    <label class="text-secondary text-sm">Address Line1</label>
+                                    <input type="text" class="form-control form-control-sm" name="mailingAddressLine1" value="{{$supplyOrder->mailing_address_line1}}">
+                                </div>
+                                <div class="mb-2">
+                                    <label class="text-secondary text-sm">Address Line2</label>
+                                    <input type="text" class="form-control form-control-sm" name="mailingAddressLine2" value="{{$supplyOrder->mailing_address_line2}}">
+                                </div>
+                                <div class="mb-2">
+                                    <label class="text-secondary text-sm">Address City</label>
+                                    <input type="text" class="form-control form-control-sm" name="mailingAddressCity" value="{{$supplyOrder->mailing_address_city}}">
+                                </div>
+                                <div class="mb-2">
+                                    <label class="text-secondary text-sm">Address State</label>
+                                    <input type="text" class="form-control form-control-sm" name="mailingAddressState" value="{{$supplyOrder->mailing_address_state}}">
+                                </div>
+                                <div class="mb-2">
+                                    <label class="text-secondary text-sm">Address Zip</label>
+                                    <input type="text" class="form-control form-control-sm" name="mailingAddressZip" value="{{$supplyOrder->mailing_address_zip}}">
+                                </div>
+                                <div class="d-flex align-items-center">
+                                    <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
+                                    <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                </div>
+                            </form>
+                        </div>
+                    </div>
+                    <div class="mb-3 d-none">
+                        <label class="text-secondary text-sm mb-1">Requested Ship Date</label>
+                        <div moe class="d-block">
+                            <a start show>{{$supplyOrder->requested_date ? friendlier_date_time($supplyOrder->requested_date) : '(not set)'}}</a>
+                            <form url="/api/supplyOrder/updateRequestedDate">
+                                <input type="hidden" name="uid" value="{{ $supplyOrder->uid }}">
+                                <div class="mb-2">
+                                    <label class="text-secondary mb-1 text-sm">Requested Ship Date</label>
+                                    <input type="date" class="form-control form-control-sm"
+                                           name="requestedDate" value="">
+                                </div>
+                                <div class="d-flex align-items-center">
+                                    <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
+                                    <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                </div>
+                            </form>
+                        </div>
+                    </div>
+                    <div class="mb-3">
+                        <label class="text-secondary text-sm mb-1">Client Understanding Memo</label>
+                        <div moe class="d-block">
+                            @if($supplyOrder->client_understanding_memo)
+                                <a start show>{{$supplyOrder->client_understanding_memo}}</a>
+                            @else
+                                <a start show>(not set)</a>
+                            @endif
+                            <form url="/api/supplyOrder/updateClientUnderstandingMemo">
+                                <input type="hidden" name="uid" value="{{ $supplyOrder->uid }}">
+                                <div class="mb-2">
+                                    <label class="text-secondary mb-1 text-sm">Client Understanding Memo</label>
+                                    <input type="text" class="form-control form-control-sm"
+                                           name="clientUnderstandingMemo" value="{{$supplyOrder->client_understanding_memo}}">
+                                </div>
+                                <div class="d-flex align-items-center">
+                                    <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
+                                    <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                </div>
+                            </form>
+                        </div>
+
+                    </div>
+                    <div class="mb-3">
+                        <label class="text-secondary text-sm mb-1">Pro Signature</label>
+                        <div class="d-flex align-items-center">
+                            @if($supplyOrder->is_signed_by_pro)
+                                <div class="text-info">
+                                    Signed by <b>{{$supplyOrder->signedPro->displayName()}}</b>
+                                    on {{friendlier_date_time($supplyOrder->pro_signed_at)}}
+                                </div>
+                            @else
+                                <div class="text-warning-mellow font-weight-bold">Not Signed</div>
+                                <div class="ml-3">
+                                    <div moe>
+                                        <a start show class="py-0">Sign</a>
+                                        <form url="/api/supplyOrder/signAsPro">
+                                            <input type="hidden" name="uid" value="{{ $supplyOrder->uid }}">
+                                            <p class="small">Sign this supply order?</p>
+                                            <div class="d-flex align-items-center">
+                                                <button class="btn btn-sm btn-success mr-2" submit>Sign</button>
+                                                <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                            </div>
+                                        </form>
+                                    </div>
+                                </div>
+                            @endif
+                        </div>
+                    </div>
+                    <div class="mb-3">
+                        <label class="text-secondary text-sm mb-1">Patient Signature</label>
+                        <div class="d-flex align-items-center">
+                            @if($supplyOrder->is_signed_by_client)
+                                <div class="text-info">
+                                    Signed by <b>{{$patient->displayName()}}</b>
+                                    on {{friendlier_date_time($supplyOrder->client_signed_at)}}
+                                </div>
+                            @elseif($supplyOrder->is_client_signature_waived)
+                                <div class="text-info">
+                                    Waived by <b>{{$supplyOrder->waiverPro->displayName()}}</b>
+                                    on {{friendlier_date_time($supplyOrder->client_signature_waived_at)}}
+                                </div>
+                                <div class="ml-3">
+                                    <div moe bottom relative="">
+                                        <a start show class="py-0">Undo</a>
+                                        <form url="/api/supplyOrder/undoWaiveClientSignature" right>
+                                            <input type="hidden" name="uid" value="{{ $supplyOrder->uid }}">
+                                            <p class="small">Undo waiving patient signature?</p>
+                                            <div class="d-flex align-items-center">
+                                                <button class="btn btn-sm btn-primary mr-2" submit>Yes</button>
+                                                <button class="btn btn-sm btn-default mr-2 border" cancel>No</button>
+                                            </div>
+                                        </form>
+                                    </div>
+                                </div>
+                            @else
+                                <div class="text-warning-mellow font-weight-bold">Not Signed</div>
+                                <div class="ml-3">
+                                    <div moe bottom relative="">
+                                        <a start show class="py-0">Email</a>
+                                        <form url="/api/supplyOrder/sendClientSignatureRequestByEmail">
+                                            <input type="hidden" name="uid" value="{{ $supplyOrder->uid }}">
+                                            <p class="small">Request patient signature via email?</p>
+                                            <div class="d-flex align-items-center">
+                                                <button class="btn btn-sm btn-primary mr-2" submit>Submit</button>
+                                                <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                            </div>
+                                        </form>
+                                    </div>
+                                </div>
+                                <span class="mx-2 text-secondary">|</span>
+                                <div class="">
+                                    <div moe bottom relative="">
+                                        <a start show class="py-0">SMS</a>
+                                        <form url="/api/supplyOrder/sendClientSignatureRequestBySms">
+                                            <input type="hidden" name="uid" value="{{ $supplyOrder->uid }}">
+                                            <p class="small">Request patient signature via SMS?</p>
+                                            <div class="d-flex align-items-center">
+                                                <button class="btn btn-sm btn-primary mr-2" submit>Submit</button>
+                                                <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                            </div>
+                                        </form>
+                                    </div>
+                                </div>
+                                <span class="mx-2 text-secondary">|</span>
+                                <div class="">
+                                    <a href="#" class="text-secondary on-hover-opaque">Problem Signing</a>
+                                </div>
+                                <span class="mx-2 text-secondary">|</span>
+                                <div class="">
+                                    <div moe bottom relative="">
+                                        <a start show class="py-0">Waive</a>
+                                        <form url="/api/supplyOrder/waiveClientSignature" right>
+                                            <input type="hidden" name="uid" value="{{ $supplyOrder->uid }}">
+                                            <p class="small mb-2">Waive patient signature?</p>
+                                            <div class="mb-2">
+                                                <label class="text-secondary mb-1 text-sm">Memo</label>
+                                                <input type="text" class="form-control form-control-sm"
+                                                       name="memo" value="{{$supplyOrder->client_signature_waiver_memo}}">
+                                            </div>
+                                            <div class="d-flex align-items-center">
+                                                <button class="btn btn-sm btn-primary mr-2" submit>Submit</button>
+                                                <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                            </div>
+                                        </form>
+                                    </div>
+                                </div>
+                            @endif
+                        </div>
+                        @if($supplyOrder->client_signature_last_requested_at &&
+                            !$supplyOrder->is_signed_by_client &&
+                            !$supplyOrder->is_client_signature_waived)
+                            <div class="text-sm my-1 text-info">Client signature last requested on {{friendlier_date_time($iSupplyOrder->client_signature_last_requested_at)}}</div>
+                        @endif
+                        @if($supplyOrder->does_client_have_problem_signing &&
+                            !$supplyOrder->is_signed_by_client &&
+                            !$supplyOrder->is_client_signature_waived)
+                            <div class="text-sm my-1 text-warning-mellow">
+                                Client has problem signing
+                                @if($supplyOrder->client_problem_signing)
+                                    <i class="text-sm">{{$supplyOrder->client_problem_signing}}</i>
+                                @endif
+                            </div>
+                        @endif
+                    </div>
+                    <hr class="my-3">
+                    <div class="d-flex align-items-center">
+                        @if($supplyOrder->is_cleared_for_shipment)
+                            <div class="text-info mb-2">
+                                <i class="fa fa-check"></i> Cleared for shipment by <b>{{$supplyOrder->clearedForShipmentPro->displayName()}}</b>
+                                on {{friendlier_date_time($supplyOrder->cleared_for_shipment_at)}}
+                            </div>
+                        @elseif($supplyOrder->is_signed_by_pro && ($supplyOrder->is_signed_by_client || $supplyOrder->is_client_signature_waived))
+                            <div moe bottom relative="" class="mb-2">
+                                <a start show class="py-0 text-success font-weight-bold">Clear for Shipment</a>
+                                <form url="/api/supplyOrder/clearForShipment">
+                                    <input type="hidden" name="uid" value="{{ $supplyOrder->uid }}">
+                                    <p class="small mb-2">Clear this supply order for shipment?</p>
+                                    <div class="d-flex align-items-center">
+                                        <button class="btn btn-sm btn-primary mr-2" submit>Submit</button>
+                                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                    </div>
+                                </form>
+                            </div>
+                        @endif
+                    </div>
+                    <div class="d-flex align-items-center">
+                        <div moe bottom relative="">
+                            <a start show class="py-0 text-danger">Cancel Supply Order</a>
+                            <form url="/api/supplyOrder/cancel">
+                                <input type="hidden" name="uid" value="{{ $supplyOrder->uid }}">
+                                <p class="small text-nowrap mb-2">Cancel this supply order?</p>
+                                <div class="d-flex align-items-center">
+                                    <button class="btn btn-sm btn-primary mr-2" submit>Yes</button>
+                                    <button class="btn btn-sm btn-default mr-2 border" cancel>No</button>
+                                </div>
+                            </form>
+                        </div>
+                    </div>
+                    */ ?>
+                    <div class="pdf-viewer-auto row px-3" pdf-url="/api/incomingReport/download/{{ $currentReport->uid }}"></div>
+                </div>
+            @endif
+        </div>
     </div>
     <script>
         function submitIncomingReport(_form) {

resources/views/app/patient/supply-orders.blade.php

@@ -327,7 +327,7 @@
                             <div class="text-sm my-1 text-warning-mellow">
                                 Client has problem signing
                                 @if($supplyOrder->client_problem_signing)
-                                    <i class="text-sm">{{$supplyOrder->client_problem_signing}}</i></div>
+                                    <i class="text-sm">{{$supplyOrder->client_problem_signing}}</i>
                                 @endif
                             </div>
                         @endif

routes/web.php

@@ -168,7 +168,7 @@ Route::middleware('pro.auth')->group(function () {
         Route::get('account', 'PatientController@account')->name('account');
         Route::get('care-checklist', 'PatientController@careChecklist')->name('care-checklist');
         Route::get('documents', 'PatientController@documents')->name('documents');
-        Route::get('incoming-reports', 'PatientController@incomingReports')->name('incoming-reports');
+        Route::get('incoming-reports/{currentReport?}', 'PatientController@incomingReports')->name('incoming-reports');
         Route::get('education', 'PatientController@education')->name('education');
         Route::get('messaging', 'PatientController@messaging')->name('messaging');
         Route::get('duplicate', 'PatientController@duplicate')->name('duplicate');