PM > shipment - show packs

resources/views/app/patient/partials/packs.blade.php

@@ -41,8 +41,7 @@
             <th class="px-2 text-nowrap text-secondary border-bottom-0">#</th>
             <th class="px-2 text-nowrap text-secondary border-bottom-0">Items</th>
             <th class="px-2 text-nowrap text-secondary border-bottom-0">Label</th>
-            <th class="px-2 text-nowrap text-secondary border-bottom-0">Courier</th>
-            <th class="px-2 text-nowrap text-secondary border-bottom-0">Tracking #</th>
+            <th class="px-2 text-nowrap text-secondary border-bottom-0">Courier / Tracking #</th>
             <th class="px-2 text-nowrap text-secondary border-bottom-0">Status</th>
             <th class="px-2 text-nowrap text-secondary border-bottom-0">&nbsp;</th>
         </tr>
@@ -86,20 +85,63 @@
                         @endif
                     </td>
                     <td class="px-2">
-                        {{$pack->label_system_file_id}}
-                    </td>
-                    <td class="px-2">
-                        {{$pack->courier}}
+                        @if($pack->label_system_file_id)
+                            <a class="pdf-viewer-trigger" native target="_blank"
+                               href="/api/pack/downloadLabel/{{ $pack->uid }}"
+                               title="View">View</a>
+                        @else
+                            <span class="text-secondary">(not set)</span>
+                        @endif
+                        <a native target="_top" href="/api/pack/downloadLabel/{{ $pack->uid }}" class="ml-2">
+                            <i class="fa fa-download"></i>
+                        </a>
+                        <div moe relative class="ml-1">
+                            <a start show href="#"><i class="fa fa-edit"></i></a>
+                            <form url="/api/pack/updateLabel" right>
+                                <input type="hidden" name="uid" value="{{ $pack->uid }}">
+                                <div class="mb-2">
+                                    <label class="text-secondary mb-1 text-sm">Label File</label>
+                                    <input type="file" class="form-control form-control-sm"
+                                           name="label" value="">
+                                </div>
+                                <div class="d-flex align-items-center">
+                                    <button class="btn btn-sm btn-primary mr-2" submit>Submit</button>
+                                    <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                </div>
+                            </form>
+                        </div>
                     </td>
                     <td class="px-2">
-                        {{$pack->tracking_number}}
+                        {{$pack->courier ? $pack->courier : '(not set)'}}
+                        /
+                        {{$pack->tracking_number ? $pack->tracking_number : '(not set)'}}
+                        <div moe relative class="ml-2">
+                            <a start show href="#"><i class="fa fa-edit"></i></a>
+                            <form url="/api/pack/updateCourierInfo" right>
+                                <input type="hidden" name="uid" value="{{ $pack->uid }}">
+                                <div class="mb-2">
+                                    <label class="text-secondary mb-1 text-sm">Courier</label>
+                                    <input type="text" class="form-control form-control-sm"
+                                           name="courier" value="{{$pack->courier}}">
+                                </div>
+                                <div class="mb-2">
+                                    <label class="text-secondary mb-1 text-sm">Tracking Number</label>
+                                    <input type="text" class="form-control form-control-sm"
+                                           name="trackingNumber" value="{{$pack->tracking_number}}">
+                                </div>
+                                <div class="d-flex align-items-center">
+                                    <button class="btn btn-sm btn-primary mr-2" submit>Submit</button>
+                                    <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                </div>
+                            </form>
+                        </div>
                     </td>
                     <td class="px-2">
-                        {{$pack->status}}
+                        {{$pack->status ? $pack->status : '-'}}
                     </td>
                     <td class="px-2">
                         <div moe relative>
-                            <a start show class="py-0 text-danger"><i class="fa fa-times-circle text-danger"></i></a>
+                            <a start show class="py-0 text-danger">Remove</a>
                             <form url="/api/pack/updateStatus" right>
                                 <input type="hidden" name="uid" value="{{ $pack->uid }}">
                                 <input type="hidden" name="status" value="DELETED">

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

@@ -191,123 +191,7 @@
                     </table>
                 </div>
 
-                <div class="bg-light border px-2 pt-2">
-
-                    <div class="mb-2 d-flex align-items-baseline">
-                        <label class="text-secondary mb-0 width-90px mr-2">Ship Date</label>
-                        <div moe bottom relative class="d-block">
-                            <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">
-                                    <label class="text-secondary mb-1 text-sm">Ship Date *</label>
-                                    <input type="date" class="form-control form-control-sm" required
-                                           name="shipDate" value="{{$shipment->ship_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>
-
-                    <div class="mb-2 d-flex align-items-baseline">
-                        <label class="text-secondary 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">
-                                <input type="hidden" name="uid" value="{{ $shipment->uid }}">
-                                <div class="mb-2">
-                                    <label class="text-secondary mb-1 text-sm">Courier</label>
-                                    <input type="text" class="form-control form-control-sm"
-                                           name="courier" value="{{$shipment->courier}}">
-                                </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>
-
-                    <div class="mb-2 d-flex align-items-baseline">
-                        <label class="text-secondary mb-0 width-90px mr-2">Label File</label>
-                        @if($shipment->label_system_file_id)
-                            <a class="pdf-viewer-trigger" native target="_blank"
-                               href="/api/shipment/downloadLabel/{{ $shipment->uid }}"
-                               title="View">
-                                <i class="fa fa-file-pdf text-danger on-hover-opaque"></i>
-                                View
-                                {{--{{ $shipment->labelFile->file_name }}--}}
-                            </a>
-                            <span class="mx-2 text-secondary">|</span>
-                        @endif
-                        <div moe bottom relative class="d-block">
-                            <a start show>Upload</a>
-                            <form url="/api/shipment/setLabelSystemFile">
-                                <input type="hidden" name="uid" value="{{ $shipment->uid }}">
-                                <div class="mb-2">
-                                    <label class="text-secondary mb-1 text-sm">Label File</label>
-                                    <input type="file" class="form-control form-control-sm"
-                                           name="labelSystemFile">
-                                </div>
-                                <div class="d-flex align-items-center">
-                                    <button class="btn btn-sm btn-primary mr-2" submit>Upload</button>
-                                    <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                                </div>
-                            </form>
-                        </div>
-                    </div>
-
-                    <div class="mb-2 d-flex align-items-baseline">
-                        <label class="text-secondary 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">
-                                <input type="hidden" name="uid" value="{{ $shipment->uid }}">
-                                <div class="mb-2">
-                                    <label class="text-secondary mb-1 text-sm">Tracking #</label>
-                                    <input type="text" class="form-control form-control-sm"
-                                           name="trackingNumber" value="{{$shipment->tracking_number}}">
-                                </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>
-
-                    <div class="mb-2 d-flex align-items-baseline">
-                        <label class="text-secondary mb-0 width-90px mr-2">Status</label>
-                        <span>{{cleanStatus($shipment->status)}}</span>
-                    </div>
-
-                    @if($shipment->status === 'DELIVERED')
-                        <div class="mb-2 d-flex align-items-baseline">
-                            <label class="text-secondary 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>
+                @include('app.patient.partials.packs')
 
             </div>
         </div>