Updates

app/Models/SupplyOrder.php

@@ -44,4 +44,9 @@ class SupplyOrder extends Model
     {
         return $this->hasOne(AppSession::class, 'id', 'created_by_session_id');
     }
+
+    public function createdByPro()
+    {
+        return $this->hasOne(Pro::class, 'id', 'created_by_pro_id');
+    }
 }

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

@@ -856,13 +856,16 @@ use App\Models\Handout;
                                                     {{ $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">{{ friendlier_date($iSupplyOrder->created_at) }} <i class="fas fa-info-circle text-primary" data-toggle="tooltip" data-placement="top" data-html="true" title="Created at: {{ friendlier_date_time($iSupplyOrder->created_at) }} By: {{ $iSupplyOrder->createdByPro->displayName() }}"></i> </td>
+                                                <td class="px-2">
+                                                    {{ $iSupplyOrder->is_signed_by_pro ? $iSupplyOrder->signedPro->displayName() : '-' }}
+                                                    <i class="fas fa-info-circle text-primary" data-toggle="tooltip" data-placement="top" data-html="true" title="Signed at: {{ friendlier_date_time($iSupplyOrder->pro_signed_at) }}"></i>
+                                                </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'}}
+                                                        {{ucwords(strtolower($iSupplyOrder->shipment->status ? $iSupplyOrder->shipment->status : 'CREATED'))}}
                                                     @elseif($iSupplyOrder->is_cleared_for_shipment)
                                                         <span class="text-info">
                                                         <i class="fa fa-user-nurse"></i>
@@ -912,7 +915,7 @@ use App\Models\Handout;
                                             <td class="px-2">
                                                 @if($iSupplyOrder->shipment_id)
                                                     <i class="fa fa-building"></i>
-                                                    {{$iSupplyOrder->shipment->status ? $iSupplyOrder->shipment->status : 'CREATED'}}
+                                                    {{ ucwords(strtolower($iSupplyOrder->shipment->status ? $iSupplyOrder->shipment->status : 'CREATED'))}}
                                                 @elseif($iSupplyOrder->is_cleared_for_shipment)
                                                     <span class="text-info">
                                                         <i class="fa fa-user-nurse"></i>
@@ -1029,6 +1032,11 @@ use App\Models\Handout;
                             }
 
                             function init() {
+                                $(function () {
+                                    $('[data-toggle="tooltip"]').tooltip({
+                                        html: true
+                                    })
+                                });
                                 $(document)
                                     .off('change input paste keyup',
                                         '#bmi-management-settings [name="currentHeightInInches"], #bmi-management-settings [name="usualWeightInPoundsMin"],  #bmi-management-settings [name="usualWeightInPoundsMax"]')

resources/views/app/practice-management/shipments.blade.php

@@ -125,7 +125,7 @@ function cleanStatus($_status)
                                 @endif
                             </td>
                             <td>
-                                {{$shipment->status}}
+                                {{ ucwords(strtolower($shipment->status)) }}
                                 @if($shipment->status === 'DELIVERED' && $shipment->delivered_date)
                                 <div class="text-secondary text-sm mt-1">
                                     on {{friendlier_date_time($shipment->delivered_date)}}