Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into delivery-complete-button-ui

resources/assets/vue/components/orders/elements/OrderComponent.vue

@@ -62,15 +62,15 @@
                     <div class="row text-center">
                         <div class="col b-r b-grey text-info p-t-5 p-b-10">
                             <small class="fs-10 all-caps bold">Received</small>
-                            <h6 class="bold no-margin text-info">{{item.parcels.received_packages.flatMap(packing_list => packing_list.packages).reduce((total, obj) => obj.quantity + total, 0)}}</h6>
+                            <h6 class="bold no-margin text-info">{{ receivedPackages }}</h6>
                         </div>
                         <div class="col b-r b-grey text-primary p-t-5 p-b-10">
                             <small class="fs-10 all-caps bold">In Transit</small>
-                            <h6 class="bold no-margin text-primary">{{item.parcels.in_transit_packages.flatMap(packing_list => packing_list.packages).concat(item.parcels.destination_warehouse_packages.flatMap(packing_list => packing_list.packages)).reduce((total, obj) => obj.quantity + total, 0)}}</h6>
+                            <h6 class="bold no-margin text-primary">{{ inTransitPackages }}</h6>
                         </div>
                         <div class="col text-success p-t-5 p-b-10">
                             <small class="fs-10 all-caps bold">Delivered</small>
-                            <h6 class="bold no-margin text-success">{{item.parcels.delivered_packages.flatMap(packing_list => packing_list.packages).reduce((total, obj) => obj.quantity + total, 0)}}</h6>
+                            <h6 class="bold no-margin text-success">{{ deliveredPackages }}</h6>
                         </div>
                     </div>
                 </div>
@@ -121,6 +121,8 @@
                         <div class="col bg-master-lightest b-a b-grey">
                             <div class="row p-t-15 p-b-15 b-b b-grey pointer requestModal" v-if="item.status !== 5" data-type="cancelOrder">
                                 <div class="col">
+                                    <h6>receivedPackages: {{receivedPackages}}</h6>
+                                    <h6>deliveredPackages: {{deliveredPackages}}</h6>
                                     <h6 class="light no-margin fs-13 text-danger"><i class="fa fa-times m-r-10"></i>Cancel Order</h6>
                                 </div>
                             </div>
@@ -129,6 +131,11 @@
                                     <h6 class="light no-margin fs-13 text-success"><i class="fa fa-history m-r-10"></i>Restore Order</h6>
                                 </div>
                             </div>
+                            <div class="row p-t-15 p-b-15 b-b b-grey pointer requestModal" v-if="receivedPackages > 0 && (receivedPackages === deliveredPackages)" data-type="completeOrder">
+                                <div class="col">
+                                    <h6 class="light no-margin fs-13 text-success"><i class="fa fa-check-circle m-r-10"></i>Complete Order</h6>
+                                </div>
+                            </div>
                             <a :href="route('order.qr.download', item.id)" target="_blank">
                                 <div class="row p-t-15 p-b-15 b-b b-grey pointer">
                                     <div class="col">
@@ -160,6 +167,17 @@
                 expanded: false
             }
         },
+        computed: {
+            receivedPackages () {
+                return this.item.parcels.received_packages.flatMap(packing_list => packing_list.packages).reduce((total, obj) => obj.quantity + total, 0)
+            },
+            inTransitPackages () {
+                return this.item.parcels.in_transit_packages.flatMap(packing_list => packing_list.packages).concat(this.item.parcels.destination_warehouse_packages.flatMap(packing_list => packing_list.packages)).reduce((total, obj) => obj.quantity + total, 0)
+            },
+            deliveredPackages () {
+                return this.item.parcels.delivered_packages.flatMap(packing_list => packing_list.packages).reduce((total, obj) => obj.quantity + total, 0)
+            }
+        },
         mixins: [componentHandler]
     }
 </script>

resources/assets/vue/components/orders/elements/PackageComponent.vue

@@ -144,6 +144,15 @@
                                     </div>
                                 </div>
                             </div>
+                            <div class="row p-t-10 p-b-10">
+                                <div class="col">
+                                    <div class="row">
+                                        <div class="col text-center">
+                                            <button class="btn btn-block btn-success b-rad-none all-caps">Complete Order</button>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
                         </div>
                     </div>
                     <div class="row m-t-25" v-if="item.container">