|
@@ -39,7 +39,7 @@
|
|
<td>
|
|
<td>
|
|
@if($supplyOrder->is_signed_by_pro)
|
|
@if($supplyOrder->is_signed_by_pro)
|
|
<b>Signed</b>
|
|
<b>Signed</b>
|
|
- <div class="text-secondary text-sm">
|
|
|
|
|
|
+ <div class="text-secondary text-sm mt-1">
|
|
By {{$supplyOrder->signedPro->displayName()}}<br>
|
|
By {{$supplyOrder->signedPro->displayName()}}<br>
|
|
{{friendlier_date_time($supplyOrder->pro_signed_at)}}
|
|
{{friendlier_date_time($supplyOrder->pro_signed_at)}}
|
|
</div>
|
|
</div>
|
|
@@ -50,13 +50,13 @@
|
|
<td>
|
|
<td>
|
|
@if($supplyOrder->is_signed_by_client)
|
|
@if($supplyOrder->is_signed_by_client)
|
|
<b>Signed</b>
|
|
<b>Signed</b>
|
|
- <div class="text-secondary text-sm">
|
|
|
|
|
|
+ <div class="text-secondary text-sm mt-1">
|
|
By {{$patient->displayName()}}<br>
|
|
By {{$patient->displayName()}}<br>
|
|
On {{friendlier_date_time($supplyOrder->client_signed_at)}}
|
|
On {{friendlier_date_time($supplyOrder->client_signed_at)}}
|
|
</div>
|
|
</div>
|
|
@elseif($supplyOrder->is_client_signature_waived)
|
|
@elseif($supplyOrder->is_client_signature_waived)
|
|
<b>Waived</b>
|
|
<b>Waived</b>
|
|
- <div class="text-secondary text-sm">
|
|
|
|
|
|
+ <div class="text-secondary text-sm mt-1">
|
|
By {{$supplyOrder->waiverPro->displayName()}}<br>
|
|
By {{$supplyOrder->waiverPro->displayName()}}<br>
|
|
on {{friendlier_date_time($supplyOrder->client_signature_waived_at)}}
|
|
on {{friendlier_date_time($supplyOrder->client_signature_waived_at)}}
|
|
</div>
|
|
</div>
|
|
@@ -69,14 +69,14 @@
|
|
<i class="fa fa-building"></i>
|
|
<i class="fa fa-building"></i>
|
|
{{$supplyOrder->shipment->status ? $supplyOrder->shipment->status : 'CREATED'}}
|
|
{{$supplyOrder->shipment->status ? $supplyOrder->shipment->status : 'CREATED'}}
|
|
@if($supplyOrder->shipment && $supplyOrder->shipment->status === 'DELIVERED' && $supplyOrder->shipment->delivered_date)
|
|
@if($supplyOrder->shipment && $supplyOrder->shipment->status === 'DELIVERED' && $supplyOrder->shipment->delivered_date)
|
|
- <div class="text-secondary text-sm">
|
|
|
|
|
|
+ <div class="text-secondary text-sm mt-1">
|
|
on {{friendlier_date_time($supplyOrder->shipment->delivered_date)}}
|
|
on {{friendlier_date_time($supplyOrder->shipment->delivered_date)}}
|
|
</div>
|
|
</div>
|
|
@endif
|
|
@endif
|
|
@elseif($supplyOrder->is_cleared_for_shipment)
|
|
@elseif($supplyOrder->is_cleared_for_shipment)
|
|
<i class="fa fa-user-nurse"></i>
|
|
<i class="fa fa-user-nurse"></i>
|
|
Cleared for shipment
|
|
Cleared for shipment
|
|
- <div class="text-secondary text-sm">
|
|
|
|
|
|
+ <div class="text-secondary text-sm mt-1">
|
|
By {{$supplyOrder->clearedForShipmentPro->displayName()}}<br>
|
|
By {{$supplyOrder->clearedForShipmentPro->displayName()}}<br>
|
|
on {{friendlier_date_time($supplyOrder->cleared_for_shipment_at)}}
|
|
on {{friendlier_date_time($supplyOrder->cleared_for_shipment_at)}}
|
|
</div>
|
|
</div>
|
|
@@ -87,7 +87,12 @@
|
|
</td>
|
|
</td>
|
|
<td>{{$supplyOrder->lot_number}}</td>
|
|
<td>{{$supplyOrder->lot_number}}</td>
|
|
<td>{{$supplyOrder->imei}}</td>
|
|
<td>{{$supplyOrder->imei}}</td>
|
|
- <td>{{friendlier_date_time($supplyOrder->created_at)}}</td>
|
|
|
|
|
|
+ <td>
|
|
|
|
+ {{friendlier_date_time($supplyOrder->created_at)}}
|
|
|
|
+ <div class="text-secondary text-sm mt-1">
|
|
|
|
+ By {{$supplyOrder->createdSession->pro->displayName()}}
|
|
|
|
+ </div>
|
|
|
|
+ </td>
|
|
<td>{{$supplyOrder->is_cancelled ? 'Yes' : 'No'}}</td>
|
|
<td>{{$supplyOrder->is_cancelled ? 'Yes' : 'No'}}</td>
|
|
</tr>
|
|
</tr>
|
|
@endforeach
|
|
@endforeach
|