Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into container-page-ui

app/Console/Kernel.php

@@ -31,7 +31,7 @@ class Kernel extends ConsoleKernel
     {
 
         $schedule->call(function(){
-            FetchWarehouseReceiveListFromVTPortalJob::withChain([
+            return FetchWarehouseReceiveListFromVTPortalJob::withChain([
                 new FetchLoadedContainersFromVTPortalJob,
                 new FetchPackingListFromVTPortalJob,
                 new FetchContainersStatusUpdateFromVTPortalJob,
@@ -40,7 +40,7 @@ class Kernel extends ConsoleKernel
         })->dailyAt('15:00');
 
         $schedule->call(function(){
-            FetchWarehouseReceiveListFromVTPortalJob::withChain([
+            return FetchWarehouseReceiveListFromVTPortalJob::withChain([
                 new FetchLoadedContainersFromVTPortalJob,
                 new FetchPackingListFromVTPortalJob,
                 new FetchContainersStatusUpdateFromVTPortalJob,

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

@@ -38,7 +38,15 @@
             </div>
             <div class="row" v-if="expanded" >
                 <div class="col bg-white p-t-15 p-b-15">
-                    <div class="row m-b-5">
+                    <div class="row m-b-5" v-if="$store.getters.isAdmin">
+                        <div class="col-auto p-r-5">
+                            <p class="no-margin all-caps fs-10 light">Marking</p>
+                        </div>
+                        <div class="col p-l-5">
+                            <p class="no-margin bold text-info fs-12">{{item.order.company_module.marking}}</p>
+                        </div>
+                    </div>
+                    <div class="row m-b-5" v-if="$store.getters.isAdmin">
                         <div class="col-auto p-r-5">
                             <p class="no-margin all-caps fs-10 light">Order Number</p>
                         </div>

resources/assets/vue/components/orders/sections/WarehouseListSectionComponent.vue

@@ -1,12 +0,0 @@
-<template>
-    <div class="row">
-        <div class="col-5">
-            <list-component  section="warehouseListSection" :endpoint="route('api.packing_list.list')" :options="{type: 1, status: 2, per_page: 20, order_by: {column: 'created_at', DESC: false}}">
-                <template slot="list" slot-scope="{data}">
-
-                    <parcel-component v-for="packages in data.packages" :data="packages" :key="packages.id"></parcel-component>
-                </template>
-            </list-component>
-        </div>
-    </div>
-</template>

resources/views/pages/warehouse_list.blade.php

@@ -1,4 +1,12 @@
 @extends('layouts.base_portal')
 @section('inner_content')
-   <warehouse-list-section-component></warehouse-list-section-component>
+    <div class="row">
+        <div class="col-5">
+            <list-component  section="warehouseListSection" :endpoint="route('api.packing_list.list')" :options="{type: 1, status: 2, per_page: 20, order_by: {column: 'created_at', DESC: false}}">
+                <template slot="list" slot-scope="{data}">
+                    <parcel-component v-for="packages in data.packages" :data="packages" :key="packages.id"></parcel-component>
+                </template>
+            </list-component>
+        </div>
+    </div>
 @endsection