From 06ac4c4e62a552b4db346d015618b3bef1e7b803 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 10 Sep 2021 13:12:02 +0800
Subject: [PATCH] merge marking and order number in the container list

---
 .../components/containers/elements/ContainerComponent.vue   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/resources/assets/vue/components/containers/elements/ContainerComponent.vue b/resources/assets/vue/components/containers/elements/ContainerComponent.vue
index d66b5517..be480278 100644
--- a/resources/assets/vue/components/containers/elements/ContainerComponent.vue
+++ b/resources/assets/vue/components/containers/elements/ContainerComponent.vue
@@ -39,8 +39,7 @@
                     <div class="row">
                         <div class="col">
                             <div class="row align-items-center p-t-10 p-b-10 b-t b-grey muted all-caps fs-10">
-                                <div class="col-2">Order Number</div>
-                                <div class="col-2">Customer Marking</div>
+                                <div class="col-2">Marking</div>
                                 <div class="col-1 text-center">Quantity</div>
                                 <div class="col-1">CBM</div>
                                 <div class="col-1 text-center">status</div>
@@ -53,8 +52,7 @@
                             <div class="row">
                                 <div class="col">
                                     <div class="row align-items-center p-t-10 p-b-10 b-t b-grey" v-for="packingList in item.packing_lists">
-                                        <div class="col-2"><a :href="route('order.show', packingList.order.reference)">{{packingList.order.reference}}</a></div>
-                                        <div class="col-2"><a :href="route('customer.profile', packingList.order.company_module.marking)">{{packingList.order.company_module.marking}}</a></div>
+                                        <div class="col-2"><a :href="route('customer.profile', packingList.order.company_module.marking)">{{packingList.order.company_module.marking}}</a>/<a :href="route('order.show', packingList.order.reference)">{{packingList.order.reference}}</a></div>
                                         <div class="col-1 text-center">{{packingList.packages.reduce((total, obj) => obj.quantity + total, 0)}}</div>
                                         <div class="col-1">{{(Math.round((packingList.packages.reduce((total, obj) => obj.cbm + total, 0)) * 10000) / 10000).toFixed(3)}}</div>
                                         <div class="col-1 bold text-center" :class="{'text-danger': packingList.status === 5, 'text-success': packingList.status !== 5}">{{packingList.status === 5 ? 'On Hold' : 'Release'}}</div>