|
@@ -2,7 +2,7 @@
|
|
@section('inner-content')
|
|
@section('inner-content')
|
|
<div class="">
|
|
<div class="">
|
|
<div class="d-flex align-items-center mb-3">
|
|
<div class="d-flex align-items-center mb-3">
|
|
- <h4 class="font-weight-bold m-0">Shipments</h4>
|
|
|
|
|
|
+ <h4 class="font-weight-bold m-0 font-size-16">Shipments</h4>
|
|
<span class="mx-2 text-secondary">|</span>
|
|
<span class="mx-2 text-secondary">|</span>
|
|
<div moe>
|
|
<div moe>
|
|
<a start show href="#">Add</a>
|
|
<a start show href="#">Add</a>
|
|
@@ -28,34 +28,34 @@
|
|
@if($patient->readyToShipSupplyOrders && count($patient->readyToShipSupplyOrders))
|
|
@if($patient->readyToShipSupplyOrders && count($patient->readyToShipSupplyOrders))
|
|
{{--<div class="mb-3 p-2 border bg-aliceblue">
|
|
{{--<div class="mb-3 p-2 border bg-aliceblue">
|
|
<div class="font-weight-bold mb-2 text-info">Ready to Ship Supply Orders</div>
|
|
<div class="font-weight-bold mb-2 text-info">Ready to Ship Supply Orders</div>
|
|
- <table class="table table-sm table-bordered mb-0 bg-white">
|
|
|
|
|
|
+ <table class="table table-sm table-striped table-bordered mb-0 bg-white">
|
|
@if($patient->readyToShipSupplyOrders && count($patient->readyToShipSupplyOrders))
|
|
@if($patient->readyToShipSupplyOrders && count($patient->readyToShipSupplyOrders))
|
|
- <thead>
|
|
|
|
|
|
+ <thead class="bg-light">
|
|
<tr class="">
|
|
<tr class="">
|
|
- <th class="px-2 text-nowrap text-secondary border-bottom-0">Title</th>
|
|
|
|
- <th class="px-2 text-nowrap text-secondary border-bottom-0">Reason</th>
|
|
|
|
|
|
+ <th class="border-0 text-nowrap text-secondary">Title</th>
|
|
|
|
+ <th class="border-0 text-nowrap text-secondary">Reason</th>
|
|
@if(!$shipment)
|
|
@if(!$shipment)
|
|
- <th class="px-2 text-nowrap text-secondary border-bottom-0">Created At</th>
|
|
|
|
- <th class="px-2 text-nowrap text-secondary border-bottom-0">Pro Signed?</th>
|
|
|
|
- <th class="px-2 text-nowrap text-secondary border-bottom-0">Cancelled?</th>
|
|
|
|
- <th class="px-2 text-nowrap text-secondary border-bottom-0">Shipment</th>
|
|
|
|
|
|
+ <th class="border-0 text-nowrap text-secondary">Created At</th>
|
|
|
|
+ <th class="border-0 text-nowrap text-secondary">Pro Signed?</th>
|
|
|
|
+ <th class="border-0 text-nowrap text-secondary">Cancelled?</th>
|
|
|
|
+ <th class="border-0 text-nowrap text-secondary">Shipment</th>
|
|
@endif
|
|
@endif
|
|
</tr>
|
|
</tr>
|
|
</thead>
|
|
</thead>
|
|
<tbody>
|
|
<tbody>
|
|
@foreach($patient->readyToShipSupplyOrders as $iSupplyOrder)
|
|
@foreach($patient->readyToShipSupplyOrders as $iSupplyOrder)
|
|
<tr class="">
|
|
<tr class="">
|
|
- <td class="px-2">
|
|
|
|
|
|
+ <td>
|
|
<a href="{{route('patients.view.supply-orders', ['patient' => $patient, 'supplyOrder' => $iSupplyOrder])}}">
|
|
<a href="{{route('patients.view.supply-orders', ['patient' => $patient, 'supplyOrder' => $iSupplyOrder])}}">
|
|
{{ $iSupplyOrder->product->title }}
|
|
{{ $iSupplyOrder->product->title }}
|
|
</a>
|
|
</a>
|
|
</td>
|
|
</td>
|
|
- <td class="px-2">{{ $iSupplyOrder->reason }}</td>
|
|
|
|
|
|
+ <td>{{ $iSupplyOrder->reason }}</td>
|
|
@if(!$shipment)
|
|
@if(!$shipment)
|
|
- <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">{{ $iSupplyOrder->shipment_id ? $iSupplyOrder->shipment->status : '-' }}</td>
|
|
|
|
|
|
+ <td>{{ friendlier_date_time($iSupplyOrder->created_at) }}</td>
|
|
|
|
+ <td>{{ $iSupplyOrder->is_signed_by_pro ? $iSupplyOrder->signedPro->displayName() : '-' }}</td>
|
|
|
|
+ <td>{{ $iSupplyOrder->is_cancelled ? 'Yes' : 'No' }}</td>
|
|
|
|
+ <td>{{ $iSupplyOrder->shipment_id ? $iSupplyOrder->shipment->status : '-' }}</td>
|
|
@endif
|
|
@endif
|
|
</tr>
|
|
</tr>
|
|
@endforeach
|
|
@endforeach
|
|
@@ -76,25 +76,25 @@
|
|
cleared for shipment
|
|
cleared for shipment
|
|
</div>
|
|
</div>
|
|
@endif
|
|
@endif
|
|
- <table class="table table-sm table-bordered mb-0" style="table-layout: fixed">
|
|
|
|
|
|
+ <table class="table table-sm table-striped table-bordered mb-0" style="table-layout: fixed">
|
|
@if($patient->shipments && count($patient->shipments))
|
|
@if($patient->shipments && count($patient->shipments))
|
|
<thead>
|
|
<thead>
|
|
<tr class="bg-light">
|
|
<tr class="bg-light">
|
|
- <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">Supply Orders</div></th>
|
|
|
|
- <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Status</div></th>
|
|
|
|
|
|
+ <th class="text-nowrap text-secondary border-0"><div class="text-ellipsis">Created At</div></th>
|
|
|
|
+ <th class="text-nowrap text-secondary border-0"><div class="text-ellipsis">Supply Orders</div></th>
|
|
|
|
+ <th class="text-nowrap text-secondary border-0"><div class="text-ellipsis">Status</div></th>
|
|
</tr>
|
|
</tr>
|
|
</thead>
|
|
</thead>
|
|
<tbody>
|
|
<tbody>
|
|
@foreach($patient->shipments as $iShipment)
|
|
@foreach($patient->shipments as $iShipment)
|
|
<tr class="{{@$shipment && @$shipment->uid === $iShipment->uid ? 'bg-aliceblue' : ''}}">
|
|
<tr class="{{@$shipment && @$shipment->uid === $iShipment->uid ? 'bg-aliceblue' : ''}}">
|
|
- <td class="px-2">
|
|
|
|
|
|
+ <td>
|
|
<a href="{{route('patients.view.shipments', ['patient' => $patient, 'shipment' => $iShipment])}}">
|
|
<a href="{{route('patients.view.shipments', ['patient' => $patient, 'shipment' => $iShipment])}}">
|
|
{{ friendlier_date_time($iShipment->created_at) }}
|
|
{{ friendlier_date_time($iShipment->created_at) }}
|
|
</a>
|
|
</a>
|
|
</td>
|
|
</td>
|
|
- <td class="px-2">{{count($iShipment->supplyOrders)}}</td>
|
|
|
|
-<!-- <td class="px-2">
|
|
|
|
|
|
+ <td>{{count($iShipment->supplyOrders)}}</td>
|
|
|
|
+<!-- <td>
|
|
@if($iShipment->label_system_file_id)
|
|
@if($iShipment->label_system_file_id)
|
|
<a class="pdf-viewer-trigger" native="" target="_blank"
|
|
<a class="pdf-viewer-trigger" native="" target="_blank"
|
|
href="/api/shipment/downloadLabel/{{$iShipment->uid}}" title="View">
|
|
href="/api/shipment/downloadLabel/{{$iShipment->uid}}" title="View">
|
|
@@ -103,9 +103,9 @@
|
|
</a>
|
|
</a>
|
|
@endif
|
|
@endif
|
|
</td>
|
|
</td>
|
|
- <td class="px-2">{{ $iShipment->courier }}</td>
|
|
|
|
- <td class="px-2">{{ $iShipment->tracking_number }}</td>-->
|
|
|
|
- <td class="px-2">{{ $iShipment->status }}</td>
|
|
|
|
|
|
+ <td>{{ $iShipment->courier }}</td>
|
|
|
|
+ <td>{{ $iShipment->tracking_number }}</td>-->
|
|
|
|
+ <td>{{ $iShipment->status }}</td>
|
|
</tr>
|
|
</tr>
|
|
@endforeach
|
|
@endforeach
|
|
</tbody>
|
|
</tbody>
|