Supply-orders and shipments (wip)

app/Helpers/helpers.php

@@ -127,6 +127,20 @@ if(!function_exists('friendly_date')) {
     }
 }
 
+if(!function_exists('friendlier_date')) {
+    function friendlier_date($value) {
+        if(!$value || empty($value)) return '';
+        try {
+            $result = strtotime($value);
+            $result = date("j M", $result);
+            return $result;
+        }
+        catch (Exception $e) {
+            return $value;
+        }
+    }
+}
+
 if(!function_exists('unfriendly_date')) {
     function unfriendly_date($value) {
         if(!$value || empty($value)) return '';

public/css/style.css

@@ -280,6 +280,9 @@ body>nav.navbar {
 .mcp-theme-1 .width-70px {
     width: 70px !important;
 }
+.mcp-theme-1 .width-90px {
+    width: 90px !important;
+}
 .mcp-theme-1 .min-width-140px {
     min-width: 140px !important;
 }

resources/views/app/patient/shipments.blade.php

@@ -130,7 +130,7 @@
                     <div class="mb-4 d-flex align-items-baseline">
                         <label class="text-secondary mb-0 min-width-140px mr-2">Requested Ship Date</label>
                         <div moe bottom class="d-block">
-                            <a start show>{{$shipment->requested_ship_date}}</a>
+                            <a start show>{{friendlier_date($shipment->requested_ship_date)}}</a>
                             <form url="/api/supplyOrder/setRequestedShipDate">
                                 <input type="hidden" name="uid" value="{{ $shipment->uid }}">
                                 <div class="mb-2">
@@ -260,9 +260,9 @@
                     </div>
 
                     <div class="mb-2 d-flex align-items-baseline">
-                        <label class="text-secondary text-sm mb-0 width-70px mr-2">Ship Date</label>
+                        <label class="text-secondary text-sm mb-0 width-90px mr-2">Ship Date</label>
                         <div moe bottom relative class="d-block">
-                            <a start show>{{$shipment->ship_date ? $shipment->ship_date : '(not set)'}}</a>
+                            <a start show>{{$shipment->ship_date ? friendlier_date($shipment->ship_date) : '(not set)'}}</a>
                             <form url="/api/shipment/setShipDate">
                                 <input type="hidden" name="uid" value="{{ $shipment->uid }}">
                                 <div class="mb-2">
@@ -279,7 +279,7 @@
                     </div>
 
                     <div class="mb-2 d-flex align-items-baseline">
-                        <label class="text-secondary text-sm mb-0 width-70px mr-2">Courier</label>
+                        <label class="text-secondary text-sm mb-0 width-90px mr-2">Courier</label>
                         <div moe bottom relative class="d-block">
                             <a start show>{{$shipment->courier ? $shipment->courier : '(not set)'}}</a>
                             <form url="/api/shipment/setCourier">
@@ -298,7 +298,7 @@
                     </div>
 
                     <div class="mb-2 d-flex align-items-baseline">
-                        <label class="text-secondary text-sm mb-0 width-70px mr-2">Tracking #</label>
+                        <label class="text-secondary text-sm mb-0 width-90px mr-2">Tracking #</label>
                         <div moe bottom relative class="d-block">
                             <a start show>{{$shipment->tracking_number ? $shipment->tracking_number : '(not set)'}}</a>
                             <form url="/api/shipment/setTrackingNumber">
@@ -317,7 +317,7 @@
                     </div>
 
                     <div class="mb-2 d-flex align-items-baseline">
-                        <label class="text-secondary text-sm mb-0 width-70px mr-2">Status</label>
+                        <label class="text-secondary text-sm mb-0 width-90px mr-2">Status</label>
                         <div moe bottom relative class="d-block">
                             <a start show>{{$shipment->status ? $shipment->status : '(not set)'}}</a>
                             <form url="/api/shipment/setStatus">
@@ -327,11 +327,11 @@
                                     <select class="form-control form-control-sm"
                                            name="status">
                                         <option value=""> -- select -- </option>
-                                        <option value="CREATED">Created</option>
-                                        <option value="SHIPPED">Shipped</option>
-                                        <option value="DELIVERED">Delivered</option>
-                                        <option value="RETURNED_TO_SENDER">Returned to sender</option>
-                                        <option value="CANCELLED">Cancelled</option>
+                                        <option value="CREATED" {{$shipment->status === 'CREATED' ? 'selected' : '' }} >Created</option>
+                                        <option value="SHIPPED" {{$shipment->status === 'SHIPPED' ? 'selected' : '' }} >Shipped</option>
+                                        <option value="DELIVERED" {{$shipment->status === 'DELIVERED' ? 'selected' : '' }} >Delivered</option>
+                                        <option value="RETURNED_TO_SENDER" {{$shipment->status === 'RETURNED_TO_SENDER' ? 'selected' : '' }} >Returned to sender</option>
+                                        <option value="CANCELLED" {{$shipment->status === 'CANCELLED' ? 'selected' : '' }} >Cancelled</option>
                                     </select>
                                 </div>
                                 <div class="mb-2">
@@ -347,6 +347,27 @@
                         </div>
                     </div>
 
+                    @if($shipment->status === 'DELIVERED')
+                        <div class="mb-2 d-flex align-items-baseline">
+                            <label class="text-secondary text-sm mb-0 width-90px mr-2">Delivered Date</label>
+                            <div moe bottom relative class="d-block">
+                                <a start show>{{$shipment->delivered_date ? friendlier_date($shipment->delivered_date) : '(not set)'}}</a>
+                                <form url="/api/shipment/setDeliveredDate">
+                                    <input type="hidden" name="uid" value="{{ $shipment->uid }}">
+                                    <div class="mb-2">
+                                        <label class="text-secondary mb-1 text-sm">Delivered Date</label>
+                                        <input type="date" class="form-control form-control-sm"
+                                               name="deliveredDate" value="{{$shipment->delivered_date}}">
+                                    </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>
+                    @endif
+
                 </div>
             @endif