Note > Supply Orders - show note's SO's first, and then others

app/Http/Controllers/NoteController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Models\Pro;
+use App\Models\SupplyOrder;
 use App\Models\Ticket;
 use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
@@ -35,20 +36,35 @@ class NoteController extends Controller
         $allyPros = Pro::all(); //TODO: paginate, use select2
 
         // load tickets created on note->effective_date for patient
-        $ticketsOnNoteEffectiveDate = Ticket::where('client_id', $patient->id)
+        $ticketsOnNote = Ticket::where('client_id', $patient->id)
             ->where('is_entry_error', false)
-            ->whereRaw('DATE(created_at) = DATE(?)', [$note->effective_dateest])
+            ->where('note_id', $note->id)
             ->get();
 
         // other open tickets as of today
         $otherOpenTickets = Ticket::where('client_id', $patient->id)
             ->where('is_entry_error', false)
             ->where('is_open', true)
-            ->whereRaw('DATE(created_at) <> DATE(?)', [$note->effective_dateest])
+            ->where(function ($query) use ($note) {
+                $query->where('note_id', '<>', $note->id)->orWhereNull('note_id'); // weird, but just the <> isn't working!
+            })
+            ->get();
+
+        // load supplyOrders created on note->effective_date for patient
+        $supplyOrdersOnNote = SupplyOrder::where('client_id', $patient->id)
+            ->where('is_cancelled', false)
+            ->where('note_id', $note->id)
+            ->get();
+
+        // other open supplyOrders as of today
+        $otherOpenSupplyOrders = SupplyOrder::where('client_id', $patient->id)
+            ->where('is_cancelled', false)
             ->get();
 
         return view('app.patient.note.dashboard', compact('patient', 'note',
-            'allyPros', 'allSections', 'ticketsOnNoteEffectiveDate', 'otherOpenTickets'));
+            'allyPros', 'allSections',
+            'ticketsOnNote', 'otherOpenTickets',
+            'supplyOrdersOnNote', 'otherOpenSupplyOrders'));
     }
 
     public function renderNote($noteUid, Request $request)

resources/views/app/patient/note/dashboard.blade.php

@@ -377,153 +377,28 @@
                                class="ticket-popup-trigger note-dashboard-action d-block text-nowrap">
                                 + Imaging
                             </a>
-                            <span class="mx-2 text-secondary">|</span>
-                            <a native target="_blank"
-                               open-in-stag-popup
-                               update-parent
-                               mc-initer="patient-supply-orders"
-                               title="{{$patient->displayName()}} - Supply Orders"
-                               href="/patients/view/{{$patient->uid}}/supply-orders?popupmode=1&note-uid={{$note->uid}}&filter=active">
-                                Supply Orders
-                            </a>
                         </div>
 
-                        <hr class="my-2">
+                        <div class="p-3 border">
 
-                        <p class="font-weight-bold text-secondary mb-2 mr-2">Ordered on {{friendlier_date($note->effective_dateest)}} <span class="font-weight-normal">(note's effective date)</span></p>
-                        <div>
-                            @if($ticketsOnNoteEffectiveDate && count($ticketsOnNoteEffectiveDate))
-                                <table class="table table-sm table-bordered mb-0">
-                                <thead>
-                                <tr class="bg-light">
-                                    <th class="px-2 text-secondary border-bottom-0 width-30px">Created</th>
-                                    <th class="px-2 text-secondary border-bottom-0 width-30px">Type</th>
-                                    <th class="px-2 text-secondary border-bottom-0 width-30px">Pro</th>
-                                    <th class="px-2 text-secondary border-bottom-0 width-30px">View</th>
-                                    <th class="px-2 text-secondary border-bottom-0 width-30px">Status</th>
-                                    <th class="px-2 text-secondary border-bottom-0">Detail</th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                @foreach($ticketsOnNoteEffectiveDate as $ticket)
-                                    <?php $data = json_decode($ticket->data); ?>
-                                    @if($ticket->category === 'erx' || $ticket->category === 'lab' || $ticket->category === 'imaging')
-                                    <tr class="{{$ticket->is_open ? '' : 'bg-light on-hover-opaque'}}">
-                                        <td class="px-2 text-nowrap">
-                                            {{friendly_time($ticket->created_at)}}
-                                        </td>
-                                        <td class="px-2 text-nowrap">
-                                            {{$ticket->category}}
-                                        </td>
-                                        <td class="px-2 text-nowrap">
-                                            @if($ticket->orderingPro)
-                                                @if($ticket->orderingPro->id !== $pro->id)
-                                                    <b>{{$ticket->orderingPro->displayName()}}</b>
-                                                @else
-                                                    You
-                                                @endif
-                                            @else
-                                                -
-                                            @endif
-                                        </td>
-                                        <td class="px-2 text-nowrap">
-                                            <div class="d-flex align-items-center flex-nowrap">
-                                                <a href="/patients/view/{{$ticket->patient->uid}}/tickets/{{$ticket->category}}/{{$ticket->uid}}?popupmode=1"
-                                                   native target="_blank"
-                                                   class="ticket-popup-trigger note-dashboard-action d-block text-nowrap mr-3">
-                                                    View
-                                                </a>
-                                            </div>
-                                        </td>
-                                        <td class="px-2 text-nowrap">
-                                            {{$ticket->is_open ? 'Open' : 'Closed'}}
-                                        </td>
-                                        <td class="px-2">
-                                        @if($ticket->category === 'erx')
-                                            <div class="font-size-13 mb-1">{{$data->medication}}</div>
-                                            <div class="d-flex align-items-center flex-wrap text-secondary">
-                                                @if($data->strength)
-                                                    <span class="d-inline-flex align-items-center">
-                                                        <span class="mx-2 text-secondary">•</span>
-                                                        <span>{{$data->strength}}</span>
-                                                    </span>
-                                                @endif
-                                                @if($data->route)
-                                                    <span class="d-inline-flex align-items-center">
-                                                        <span class="mx-2 text-secondary">•</span>
-                                                        <span>{{$data->route}}</span>
-                                                    </span>
-                                                @endif
-                                                @if($data->frequency)
-                                                    <span class="d-inline-flex align-items-center">
-                                                        <span class="mx-2 text-secondary">•</span>
-                                                        <span>{{$data->frequency}}</span>
-                                                    </span>
-                                                @endif
-                                                @if($data->dispense)
-                                                    <span class="d-inline-flex align-items-center">
-                                                        <span class="mx-2 text-secondary">•</span>
-                                                        <span>Dispense:</span> {{$data->dispense}}
-                                                    </span>
-                                                @endif
-                                                @if($data->frequency)
-                                                    <span class="d-inline-flex align-items-center">
-                                                        <span class="mx-2 text-secondary">•</span>
-                                                        <span><span>Refills:</span> {{$data->refills}}</span>
-                                                    </span>
-                                                @endif
-                                                @if($data->dispense)
-                                                    <span class="d-inline-flex align-items-center">
-                                                        <span class="mx-2 text-secondary">•</span>
-                                                        <span><span>Purpose:</span> {{$data->purpose}}</span>
-                                                    </span>
-                                                @endif
-                                            </div>
-                                        @endif
-                                        @if($ticket->category === 'lab' || $ticket->category === 'imaging')
-                                            @if(@$data->tests && is_array($data->tests))
-                                                <div>
-                                                    <span class="text-secondary">Tests:</span>
-                                                    {{implode(", ", $data->tests)}}
-                                                </div>
-                                            @endif
-                                            @if(@$data->icds && is_array($data->icds))
-                                                <div>
-                                                    <span class="text-secondary">ICDs:</span>
-                                                    {{implode(", ", $data->icds)}}
-                                                </div>
-                                            @endif
-                                        @endif
-                                        </td>
+                            <p class="font-weight-bold text-secondary mb-2 mr-2">Associated with this note</p>
+                            <div>
+                                @if($ticketsOnNote && count($ticketsOnNote))
+                                    <table class="table table-sm table-bordered mb-0">
+                                    <thead>
+                                    <tr class="bg-light">
+                                        <th class="px-2 text-secondary border-bottom-0 width-30px">Created</th>
+                                        <th class="px-2 text-secondary border-bottom-0 width-30px">Type</th>
+                                        <th class="px-2 text-secondary border-bottom-0 width-30px">Pro</th>
+                                        <th class="px-2 text-secondary border-bottom-0 width-30px">View</th>
+                                        <th class="px-2 text-secondary border-bottom-0 width-30px">Status</th>
+                                        <th class="px-2 text-secondary border-bottom-0">Detail</th>
                                     </tr>
-                                    @endif
-                                @endforeach
-                                </tbody>
-                                </table>
-                            @else
-                                <div class="text-secondary">None</div>
-                            @endif
-                        </div>
-
-                        <hr class="my-2">
-
-                        <p class="font-weight-bold text-secondary mb-2 mr-2 mt-3">Others open as of {{friendlier_date(date('Y-m-d'))}}</p>
-                        @if($otherOpenTickets && count($otherOpenTickets))
-                            <table class="table table-sm table-bordered mb-0">
-                                <thead>
-                                <tr class="bg-light">
-                                    <th class="px-2 text-secondary border-bottom-0 width-30px">Created</th>
-                                    <th class="px-2 text-secondary border-bottom-0 width-30px">Type</th>
-                                    <th class="px-2 text-secondary border-bottom-0 width-30px">Pro</th>
-                                    <th class="px-2 text-secondary border-bottom-0 width-30px">View</th>
-                                    <th class="px-2 text-secondary border-bottom-0 width-30px">Status</th>
-                                    <th class="px-2 text-secondary border-bottom-0">Detail</th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                @foreach($otherOpenTickets as $ticket)
-                                    <?php $data = json_decode($ticket->data); ?>
-                                    @if($ticket->category === 'erx' || $ticket->category === 'lab' || $ticket->category === 'imaging')
+                                    </thead>
+                                    <tbody>
+                                    @foreach($ticketsOnNote as $ticket)
+                                        <?php $data = json_decode($ticket->data); ?>
+                                        @if($ticket->category === 'erx' || $ticket->category === 'lab' || $ticket->category === 'imaging')
                                         <tr class="{{$ticket->is_open ? '' : 'bg-light on-hover-opaque'}}">
                                             <td class="px-2 text-nowrap">
                                                 {{friendly_time($ticket->created_at)}}
@@ -555,70 +430,309 @@
                                                 {{$ticket->is_open ? 'Open' : 'Closed'}}
                                             </td>
                                             <td class="px-2">
-                                                @if($ticket->category === 'erx')
-                                                    <div class="font-size-13 mb-1">{{$data->medication}}</div>
-                                                    <div class="d-flex align-items-center flex-wrap text-secondary">
-                                                        @if($data->strength)
-                                                            <span class="d-inline-flex align-items-center">
-                                                    <span class="mx-2 text-secondary">•</span>
-                                                    <span>{{$data->strength}}</span>
-                                                </span>
-                                                        @endif
-                                                        @if($data->route)
-                                                            <span class="d-inline-flex align-items-center">
-                                                    <span class="mx-2 text-secondary">•</span>
-                                                    <span>{{$data->route}}</span>
-                                                </span>
-                                                        @endif
-                                                        @if($data->frequency)
-                                                            <span class="d-inline-flex align-items-center">
-                                                    <span class="mx-2 text-secondary">•</span>
-                                                    <span>{{$data->frequency}}</span>
-                                                </span>
-                                                        @endif
-                                                        @if($data->dispense)
-                                                            <span class="d-inline-flex align-items-center">
-                                                    <span class="mx-2 text-secondary">•</span>
-                                                    <span>Dispense:</span> {{$data->dispense}}
-                                                </span>
-                                                        @endif
-                                                        @if($data->frequency)
-                                                            <span class="d-inline-flex align-items-center">
-                                                    <span class="mx-2 text-secondary">•</span>
-                                                    <span><span>Refills:</span> {{$data->refills}}</span>
-                                                </span>
-                                                        @endif
-                                                        @if($data->dispense)
-                                                            <span class="d-inline-flex align-items-center">
-                                                    <span class="mx-2 text-secondary">•</span>
-                                                    <span><span>Purpose:</span> {{$data->purpose}}</span>
-                                                </span>
-                                                        @endif
+                                            @if($ticket->category === 'erx')
+                                                <div class="font-size-13 mb-1">{{$data->medication}}</div>
+                                                <div class="d-flex align-items-center flex-wrap text-secondary">
+                                                    @if($data->strength)
+                                                        <span class="d-inline-flex align-items-center">
+                                                            <span class="mx-2 text-secondary">•</span>
+                                                            <span>{{$data->strength}}</span>
+                                                        </span>
+                                                    @endif
+                                                    @if($data->route)
+                                                        <span class="d-inline-flex align-items-center">
+                                                            <span class="mx-2 text-secondary">•</span>
+                                                            <span>{{$data->route}}</span>
+                                                        </span>
+                                                    @endif
+                                                    @if($data->frequency)
+                                                        <span class="d-inline-flex align-items-center">
+                                                            <span class="mx-2 text-secondary">•</span>
+                                                            <span>{{$data->frequency}}</span>
+                                                        </span>
+                                                    @endif
+                                                    @if($data->dispense)
+                                                        <span class="d-inline-flex align-items-center">
+                                                            <span class="mx-2 text-secondary">•</span>
+                                                            <span>Dispense:</span> {{$data->dispense}}
+                                                        </span>
+                                                    @endif
+                                                    @if($data->frequency)
+                                                        <span class="d-inline-flex align-items-center">
+                                                            <span class="mx-2 text-secondary">•</span>
+                                                            <span><span>Refills:</span> {{$data->refills}}</span>
+                                                        </span>
+                                                    @endif
+                                                    @if($data->dispense)
+                                                        <span class="d-inline-flex align-items-center">
+                                                            <span class="mx-2 text-secondary">•</span>
+                                                            <span><span>Purpose:</span> {{$data->purpose}}</span>
+                                                        </span>
+                                                    @endif
+                                                </div>
+                                            @endif
+                                            @if($ticket->category === 'lab' || $ticket->category === 'imaging')
+                                                @if(@$data->tests && is_array($data->tests))
+                                                    <div>
+                                                        <span class="text-secondary">Tests:</span>
+                                                        {{implode(", ", $data->tests)}}
                                                     </div>
                                                 @endif
-                                                @if($ticket->category === 'lab' || $ticket->category === 'imaging')
-                                                    @if(@$data->tests && is_array($data->tests))
-                                                        <div>
-                                                            <span class="text-secondary">Tests:</span>
-                                                            {{implode(", ", $data->tests)}}
-                                                        </div>
+                                                @if(@$data->icds && is_array($data->icds))
+                                                    <div>
+                                                        <span class="text-secondary">ICDs:</span>
+                                                        {{implode(", ", $data->icds)}}
+                                                    </div>
+                                                @endif
+                                            @endif
+                                            </td>
+                                        </tr>
+                                        @endif
+                                    @endforeach
+                                    </tbody>
+                                    </table>
+                                @else
+                                    <div class="text-secondary">None</div>
+                                @endif
+                            </div>
+
+                            <hr class="my-2">
+
+                            <p class="font-weight-bold text-secondary mb-2 mr-2">Others open as of {{friendlier_date(date('Y-m-d'))}}</p>
+                            @if($otherOpenTickets && count($otherOpenTickets))
+                                <table class="table table-sm table-bordered mb-0">
+                                    <thead>
+                                    <tr class="bg-light">
+                                        <th class="px-2 text-secondary border-bottom-0 width-30px">Created</th>
+                                        <th class="px-2 text-secondary border-bottom-0 width-30px">Type</th>
+                                        <th class="px-2 text-secondary border-bottom-0 width-30px">Pro</th>
+                                        <th class="px-2 text-secondary border-bottom-0 width-30px">View</th>
+                                        <th class="px-2 text-secondary border-bottom-0 width-30px">Status</th>
+                                        <th class="px-2 text-secondary border-bottom-0">Detail</th>
+                                    </tr>
+                                    </thead>
+                                    <tbody>
+                                    @foreach($otherOpenTickets as $ticket)
+                                        <?php $data = json_decode($ticket->data); ?>
+                                        @if($ticket->category === 'erx' || $ticket->category === 'lab' || $ticket->category === 'imaging')
+                                            <tr class="{{$ticket->is_open ? '' : 'bg-light on-hover-opaque'}}">
+                                                <td class="px-2 text-nowrap">
+                                                    {{friendly_time($ticket->created_at)}}
+                                                </td>
+                                                <td class="px-2 text-nowrap">
+                                                    {{$ticket->category}}
+                                                </td>
+                                                <td class="px-2 text-nowrap">
+                                                    @if($ticket->orderingPro)
+                                                        @if($ticket->orderingPro->id !== $pro->id)
+                                                            <b>{{$ticket->orderingPro->displayName()}}</b>
+                                                        @else
+                                                            You
+                                                        @endif
+                                                    @else
+                                                        -
                                                     @endif
-                                                    @if(@$data->icds && is_array($data->icds))
-                                                        <div>
-                                                            <span class="text-secondary">ICDs:</span>
-                                                            {{implode(", ", $data->icds)}}
+                                                </td>
+                                                <td class="px-2 text-nowrap">
+                                                    <div class="d-flex align-items-center flex-nowrap">
+                                                        <a href="/patients/view/{{$ticket->patient->uid}}/tickets/{{$ticket->category}}/{{$ticket->uid}}?popupmode=1"
+                                                           native target="_blank"
+                                                           class="ticket-popup-trigger note-dashboard-action d-block text-nowrap mr-3">
+                                                            View
+                                                        </a>
+                                                    </div>
+                                                </td>
+                                                <td class="px-2 text-nowrap">
+                                                    {{$ticket->is_open ? 'Open' : 'Closed'}}
+                                                </td>
+                                                <td class="px-2">
+                                                    @if($ticket->category === 'erx')
+                                                        <div class="font-size-13 mb-1">{{$data->medication}}</div>
+                                                        <div class="d-flex align-items-center flex-wrap text-secondary">
+                                                            @if($data->strength)
+                                                                <span class="d-inline-flex align-items-center">
+                                                        <span class="mx-2 text-secondary">•</span>
+                                                        <span>{{$data->strength}}</span>
+                                                    </span>
+                                                            @endif
+                                                            @if($data->route)
+                                                                <span class="d-inline-flex align-items-center">
+                                                        <span class="mx-2 text-secondary">•</span>
+                                                        <span>{{$data->route}}</span>
+                                                    </span>
+                                                            @endif
+                                                            @if($data->frequency)
+                                                                <span class="d-inline-flex align-items-center">
+                                                        <span class="mx-2 text-secondary">•</span>
+                                                        <span>{{$data->frequency}}</span>
+                                                    </span>
+                                                            @endif
+                                                            @if($data->dispense)
+                                                                <span class="d-inline-flex align-items-center">
+                                                        <span class="mx-2 text-secondary">•</span>
+                                                        <span>Dispense:</span> {{$data->dispense}}
+                                                    </span>
+                                                            @endif
+                                                            @if($data->frequency)
+                                                                <span class="d-inline-flex align-items-center">
+                                                        <span class="mx-2 text-secondary">•</span>
+                                                        <span><span>Refills:</span> {{$data->refills}}</span>
+                                                    </span>
+                                                            @endif
+                                                            @if($data->dispense)
+                                                                <span class="d-inline-flex align-items-center">
+                                                        <span class="mx-2 text-secondary">•</span>
+                                                        <span><span>Purpose:</span> {{$data->purpose}}</span>
+                                                    </span>
+                                                            @endif
                                                         </div>
                                                     @endif
+                                                    @if($ticket->category === 'lab' || $ticket->category === 'imaging')
+                                                        @if(@$data->tests && is_array($data->tests))
+                                                            <div>
+                                                                <span class="text-secondary">Tests:</span>
+                                                                {{implode(", ", $data->tests)}}
+                                                            </div>
+                                                        @endif
+                                                        @if(@$data->icds && is_array($data->icds))
+                                                            <div>
+                                                                <span class="text-secondary">ICDs:</span>
+                                                                {{implode(", ", $data->icds)}}
+                                                            </div>
+                                                        @endif
+                                                    @endif
+                                                </td>
+                                            </tr>
+                                        @endif
+                                    @endforeach
+                                    </tbody>
+                                </table>
+                            @else
+                                <div class="text-secondary">None</div>
+                            @endif
+
+                        </div>
+
+                    </div>
+                </div>
+
+                <div class="p-3 border-bottom">
+                    <div class="">
+                        <div class="d-flex align-items-center mb-2">
+                            <p class="font-weight-bold text-secondary m-0 font-size-14">Supply Orders Summary</p>
+                            <span class="mx-2 text-secondary">|</span>
+                            <a native target="_blank"
+                               open-in-stag-popup
+                               update-parent
+                               mc-initer="patient-supply-orders"
+                               title="{{$patient->displayName()}} - Supply Orders"
+                               href="/patients/view/{{$patient->uid}}/supply-orders?popupmode=1&note-uid={{$note->uid}}&filter=active">
+                                Manage Supply Orders
+                            </a>
+                        </div>
+
+                        <div class="p-3 border">
+
+                            <p class="font-weight-bold text-secondary mb-2 mr-2">Associated with this note</p>
+                            <div>
+                                @if($supplyOrdersOnNote && count($supplyOrdersOnNote))
+                                    <table class="table table-sm table-bordered mb-0">
+                                        <thead>
+                                        <tr class="bg-light">
+                                            <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Title</div></th>
+                                            <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Reason</div></th>
+                                            <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Created At</div></th>
+                                            <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Pro Signed?</div></th>
+                                            <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Cancelled?</div></th>
+                                            <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Shipment</div></th>
+                                        </tr>
+                                        </thead>
+                                        <tbody>
+                                        @foreach($supplyOrdersOnNote as $iSupplyOrder)
+                                            <tr class="">
+                                                <td class="px-2">
+                                                    {{ $iSupplyOrder->product->title }}
+                                                </td>
+                                                <td class="px-2">{{ $iSupplyOrder->reason }}</td>
+                                                <td class="px-2">{{ friendlier_date_time($iSupplyOrder->created_at) }}</td>
+                                                <td class="px-2">{{ $iSupplyOrder->is_signed_by_pro ? $iSupplyOrder->signedPro->displayName() : '-' }}</td>
+                                                <td class="px-2">{{ $iSupplyOrder->is_cancelled ? 'Yes' : 'No' }}</td>
+                                                <td class="px-2">
+                                                    @if($iSupplyOrder->shipment_id)
+                                                        <i class="fa fa-building"></i>
+                                                        {{$iSupplyOrder->shipment->status ? $iSupplyOrder->shipment->status : 'CREATED'}}
+                                                    @elseif($iSupplyOrder->is_cleared_for_shipment)
+                                                        <span class="text-info">
+                                                            <i class="fa fa-user-nurse"></i>
+                                                            Cleared for shipment
+                                                        </span>
+                                                    @else
+                                                        <span class="text-warning-mellow">
+                                                            <i class="fa fa-user-nurse"></i>
+                                                            Not cleared for shipment
+                                                        </span>
+                                                    @endif
+                                                </td>
+                                            </tr>
+                                        @endforeach
+                                        </tbody>
+                                    </table>
+                                @else
+                                    <div class="text-secondary">None</div>
+                                @endif
+                            </div>
+
+                            <hr class="my-2">
+
+                            <p class="font-weight-bold text-secondary mb-2 mr-2">Others as of {{friendlier_date(date('Y-m-d'))}}</p>
+                            @if($otherOpenSupplyOrders && count($otherOpenSupplyOrders))
+                                <table class="table table-sm table-bordered mb-0">
+                                    <thead>
+                                    <tr class="bg-light">
+                                        <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Title</div></th>
+                                        <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Reason</div></th>
+                                        <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Created At</div></th>
+                                        <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Pro Signed?</div></th>
+                                        <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Cancelled?</div></th>
+                                        <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Shipment</div></th>
+                                    </tr>
+                                    </thead>
+                                    <tbody>
+                                    @foreach($otherOpenSupplyOrders as $iSupplyOrder)
+                                        <tr class="">
+                                            <td class="px-2">
+                                                {{ $iSupplyOrder->product->title }}
+                                            </td>
+                                            <td class="px-2">{{ $iSupplyOrder->reason }}</td>
+                                            <td class="px-2">{{ friendlier_date_time($iSupplyOrder->created_at) }}</td>
+                                            <td class="px-2">{{ $iSupplyOrder->is_signed_by_pro ? $iSupplyOrder->signedPro->displayName() : '-' }}</td>
+                                            <td class="px-2">{{ $iSupplyOrder->is_cancelled ? 'Yes' : 'No' }}</td>
+                                            <td class="px-2">
+                                                @if($iSupplyOrder->shipment_id)
+                                                    <i class="fa fa-building"></i>
+                                                    {{$iSupplyOrder->shipment->status ? $iSupplyOrder->shipment->status : 'CREATED'}}
+                                                @elseif($iSupplyOrder->is_cleared_for_shipment)
+                                                    <span class="text-info">
+                                                            <i class="fa fa-user-nurse"></i>
+                                                            Cleared for shipment
+                                                        </span>
+                                                @else
+                                                    <span class="text-warning-mellow">
+                                                            <i class="fa fa-user-nurse"></i>
+                                                            Not cleared for shipment
+                                                        </span>
                                                 @endif
                                             </td>
                                         </tr>
-                                    @endif
-                                @endforeach
-                                </tbody>
-                            </table>
-                        @else
-                            <div class="text-secondary">None</div>
-                        @endif
+                                    @endforeach
+                                    </tbody>
+                                </table>
+                            @else
+                                <div class="text-secondary">None</div>
+                            @endif
+
+                        </div>
+
                     </div>
                 </div>