From a0531e344cfb202bddd7d16a8ffc0bed7b7651ad Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Sat, 25 Sep 2021 16:13:31 +0800
Subject: [PATCH] add 'ADD Container' button update add container form

---
 .../Containers/CreateLoadContainerLogic.php   | 12 +--
 .../elements/ContainerComponent.vue           | 10 +--
 .../CreateLoadContainerFormComponent.vue      | 89 +++++++++++++------
 .../createContainerFormValidation.js          |  7 +-
 resources/views/layouts/base_portal.blade.php |  6 --
 resources/views/pages/containers.blade.php    | 13 ++-
 6 files changed, 80 insertions(+), 57 deletions(-)

diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/Containers/CreateLoadContainerLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/Containers/CreateLoadContainerLogic.php
index d388a10d..30fec0d4 100644
--- a/app/Classes/Modules/PackingLists/ControllersLogic/Containers/CreateLoadContainerLogic.php
+++ b/app/Classes/Modules/PackingLists/ControllersLogic/Containers/CreateLoadContainerLogic.php
@@ -94,15 +94,15 @@ class CreateLoadContainerLogic extends AbstractControllerLogic
         $transportObject = new TransportObject(
             TransportType::LAND, null, 
             $request->input('tracking'), 
-            Carbon::parse($request->input('eta')), 
             Carbon::parse($request->input('etd')), 
+            Carbon::parse($request->input('eta')), 
             ApprovalStatus::APPROVED
         );
         $transport = $this->createsTransport->execute($transportObject, $container);
 
         $scheduleObject = new ScheduleObject(
-            Carbon::parse($request->input('eta')),
             Carbon::parse($request->input('etd')), 
+            Carbon::parse($request->input('eta')),
             ApprovalStatus::APPROVED
          );
         $schedule = $this->createsSchedule->execute($transport, $scheduleObject);
@@ -110,12 +110,4 @@ class CreateLoadContainerLogic extends AbstractControllerLogic
         return $this->resourceResponse(new ContainerResource($container));
     }
 
-}
-
-{
-    "container_reference": "",
-    "container_number": "",
-    "seal_reference": "",
-    "container_type": "",
-
 }
\ No newline at end of file
diff --git a/resources/assets/vue/components/containers/elements/ContainerComponent.vue b/resources/assets/vue/components/containers/elements/ContainerComponent.vue
index 66bbfb5b..bd253565 100644
--- a/resources/assets/vue/components/containers/elements/ContainerComponent.vue
+++ b/resources/assets/vue/components/containers/elements/ContainerComponent.vue
@@ -1,14 +1,14 @@
 <template>
-    <div class="row m-b-15">
+    <div class="row m-b-15 m-l-5 m-r-5">
         <div class="col b-a b-grey rounded">
             <div class="row">
                 <div class="col padding-15">
                     <div class="row align-items-center">
                         <div class="col-auto p-r-0">
                             <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                 width="40" height="40"
-                                 viewBox="0 0 172 172"
-                                 style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g fill="#000000"><path d="M85.96641,12.86641c-1.18418,0.0252 -2.1332,0.99941 -2.11641,2.18359v10.75h-23.65v15.05h-25.8v38.24649l-22.38184,5.42539l11.71582,25.7748l6.12246,32.63633c-1.00781,0.41992 -1.96524,0.89023 -2.87227,1.34375c-2.15,1.075 -4.04805,1.92324 -5.48418,1.92324c-0.77266,-0.0084 -1.49492,0.39473 -1.88965,1.0666c-0.38633,0.67188 -0.38633,1.49492 0,2.1668c0.39473,0.67188 1.11699,1.075 1.88965,1.0666c2.86387,0 5.26582,-1.30176 7.41582,-2.37676c2.15,-1.075 4.04805,-1.92324 5.48418,-1.92324c1.43613,0 3.33418,0.84824 5.48418,1.92324c2.15,1.075 4.55195,2.37676 7.41582,2.37676c2.86387,0 5.26582,-1.30176 7.41582,-2.37676c2.15,-1.075 4.04805,-1.92324 5.48418,-1.92324c1.43613,0 3.33418,0.84824 5.48418,1.92324c2.15,1.075 4.55195,2.37676 7.41582,2.37676c2.86387,0 5.26582,-1.30176 7.41582,-2.37676c2.15,-1.075 4.04805,-1.92324 5.48418,-1.92324c1.43613,0 3.33418,0.84824 5.48418,1.92324c2.15,1.075 4.55195,2.37676 7.41582,2.37676c2.86387,0 5.26582,-1.30176 7.41582,-2.37676c2.15,-1.075 4.04805,-1.92324 5.48418,-1.92324c1.43613,0 3.33418,0.84824 5.48418,1.92324c2.15,1.075 4.55195,2.37676 7.41582,2.37676c2.86387,0 5.26582,-1.30176 7.41582,-2.37676c2.15,-1.075 4.04805,-1.92324 5.48418,-1.92324c1.43613,0 3.33418,0.84824 5.48418,1.92324c2.15,1.075 4.55195,2.37676 7.41582,2.37676c0.77266,0.0084 1.49492,-0.39473 1.88965,-1.0666c0.38633,-0.67187 0.38633,-1.49492 0,-2.1668c-0.39472,-0.67187 -1.11699,-1.075 -1.88965,-1.0666c-1.43613,0 -3.33418,-0.84824 -5.48418,-1.92324c-0.90703,-0.45352 -1.86445,-0.92383 -2.87227,-1.34375l6.12246,-32.63633l11.71582,-25.7748l-22.38184,-5.42539v-38.24649h-25.8v-15.05h-23.65v-10.75c0.0084,-0.57949 -0.21836,-1.14219 -0.62988,-1.55371c-0.41152,-0.41152 -0.97422,-0.63828 -1.55371,-0.62988zM64.5,30.1h21.13887c0.23516,0.04199 0.47031,0.04199 0.69707,0h21.16406v10.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15h25.8v32.90508l-47.3,-11.47227l-47.3,11.47227v-32.90508h25.8c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM73.1,40.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM81.7,40.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM90.3,40.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM98.9,40.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM47.3,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM55.9,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM64.5,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM73.1,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM81.7,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM90.3,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM98.9,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM107.5,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM116.1,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM124.7,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,71.01719l67.91816,16.46094l-9.78418,21.5252l-6.17285,32.92188c-0.11758,-0.0084 -0.23516,-0.0252 -0.36113,-0.0252c-2.86387,0 -5.26582,1.30176 -7.41582,2.37676c-2.15,1.075 -4.04805,1.92324 -5.48418,1.92324c-1.43613,0 -3.33418,-0.84824 -5.48418,-1.92324c-2.15,-1.075 -4.55195,-2.37676 -7.41582,-2.37676c-2.86387,0 -5.26582,1.30176 -7.41582,2.37676c-2.15,1.075 -4.04805,1.92324 -5.48418,1.92324c-1.43613,0 -3.33418,-0.84824 -5.48418,-1.92324c-2.15,-1.075 -4.55195,-2.37676 -7.41582,-2.37676c-2.86387,0 -5.26582,1.30176 -7.41582,2.37676c-2.15,1.075 -4.04805,1.92324 -5.48418,1.92324c-1.43613,0 -3.33418,-0.84824 -5.48418,-1.92324c-2.15,-1.075 -4.55195,-2.37676 -7.41582,-2.37676c-2.86387,0 -5.26582,1.30176 -7.41582,2.37676c-2.15,1.075 -4.04805,1.92324 -5.48418,1.92324c-1.43613,0 -3.33418,-0.84824 -5.48418,-1.92324c-2.15,-1.075 -4.55195,-2.37676 -7.41582,-2.37676c-0.12598,0 -0.24355,0.0168 -0.36113,0.0252l-6.17285,-32.92187l-9.78418,-21.5252zM86,75.25c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,83.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM51.54961,90.90469c-0.32754,0.0084 -0.66348,0.05039 -0.99102,0.13438l-4.3,1.075c-1.90645,0.47031 -3.25859,2.20879 -3.25859,4.16562v4.77031c-0.0084,0.77266 0.39473,1.49492 1.0666,1.88965c0.67188,0.38633 1.49492,0.38633 2.1668,0c0.67188,-0.39472 1.075,-1.11699 1.0666,-1.88965v-4.77031l4.3,-1.075v3.69531c-0.0084,0.77266 0.39473,1.49492 1.0666,1.88965c0.67188,0.38633 1.49492,0.38633 2.1668,0c0.67188,-0.39472 1.075,-1.11699 1.0666,-1.88965v-3.69531c0,-2.40195 -2.04922,-4.3 -4.35039,-4.3zM120.45039,90.90469c-2.30117,0 -4.35039,1.89805 -4.35039,4.3v3.69531c-0.0084,0.77266 0.39473,1.49492 1.0666,1.88965c0.67188,0.38633 1.49492,0.38633 2.1668,0c0.67188,-0.39472 1.075,-1.11699 1.0666,-1.88965v-3.69531l4.3,1.075v4.77031c-0.0084,0.77266 0.39473,1.49492 1.0666,1.88965c0.67188,0.38633 1.49492,0.38633 2.1668,0c0.67187,-0.39472 1.075,-1.11699 1.0666,-1.88965v-4.77031c0,-1.95684 -1.35215,-3.69531 -3.25859,-4.16562l-4.3,-1.075c-0.32754,-0.08398 -0.66348,-0.12598 -0.99101,-0.13438zM86,92.45c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,101.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,109.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,118.25c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,126.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,135.45c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM12.9,146.2c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM159.1,146.2c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15z"></path></g></g></svg>
+                                width="40" height="40"
+                                viewBox="0 0 172 172"
+                                style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g fill="#000000"><path d="M85.96641,12.86641c-1.18418,0.0252 -2.1332,0.99941 -2.11641,2.18359v10.75h-23.65v15.05h-25.8v38.24649l-22.38184,5.42539l11.71582,25.7748l6.12246,32.63633c-1.00781,0.41992 -1.96524,0.89023 -2.87227,1.34375c-2.15,1.075 -4.04805,1.92324 -5.48418,1.92324c-0.77266,-0.0084 -1.49492,0.39473 -1.88965,1.0666c-0.38633,0.67188 -0.38633,1.49492 0,2.1668c0.39473,0.67188 1.11699,1.075 1.88965,1.0666c2.86387,0 5.26582,-1.30176 7.41582,-2.37676c2.15,-1.075 4.04805,-1.92324 5.48418,-1.92324c1.43613,0 3.33418,0.84824 5.48418,1.92324c2.15,1.075 4.55195,2.37676 7.41582,2.37676c2.86387,0 5.26582,-1.30176 7.41582,-2.37676c2.15,-1.075 4.04805,-1.92324 5.48418,-1.92324c1.43613,0 3.33418,0.84824 5.48418,1.92324c2.15,1.075 4.55195,2.37676 7.41582,2.37676c2.86387,0 5.26582,-1.30176 7.41582,-2.37676c2.15,-1.075 4.04805,-1.92324 5.48418,-1.92324c1.43613,0 3.33418,0.84824 5.48418,1.92324c2.15,1.075 4.55195,2.37676 7.41582,2.37676c2.86387,0 5.26582,-1.30176 7.41582,-2.37676c2.15,-1.075 4.04805,-1.92324 5.48418,-1.92324c1.43613,0 3.33418,0.84824 5.48418,1.92324c2.15,1.075 4.55195,2.37676 7.41582,2.37676c2.86387,0 5.26582,-1.30176 7.41582,-2.37676c2.15,-1.075 4.04805,-1.92324 5.48418,-1.92324c1.43613,0 3.33418,0.84824 5.48418,1.92324c2.15,1.075 4.55195,2.37676 7.41582,2.37676c0.77266,0.0084 1.49492,-0.39473 1.88965,-1.0666c0.38633,-0.67187 0.38633,-1.49492 0,-2.1668c-0.39472,-0.67187 -1.11699,-1.075 -1.88965,-1.0666c-1.43613,0 -3.33418,-0.84824 -5.48418,-1.92324c-0.90703,-0.45352 -1.86445,-0.92383 -2.87227,-1.34375l6.12246,-32.63633l11.71582,-25.7748l-22.38184,-5.42539v-38.24649h-25.8v-15.05h-23.65v-10.75c0.0084,-0.57949 -0.21836,-1.14219 -0.62988,-1.55371c-0.41152,-0.41152 -0.97422,-0.63828 -1.55371,-0.62988zM64.5,30.1h21.13887c0.23516,0.04199 0.47031,0.04199 0.69707,0h21.16406v10.75c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15h25.8v32.90508l-47.3,-11.47227l-47.3,11.47227v-32.90508h25.8c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM73.1,40.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM81.7,40.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM90.3,40.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM98.9,40.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM47.3,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM55.9,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM64.5,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM73.1,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM81.7,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM90.3,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM98.9,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM107.5,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM116.1,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM124.7,55.9c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,71.01719l67.91816,16.46094l-9.78418,21.5252l-6.17285,32.92188c-0.11758,-0.0084 -0.23516,-0.0252 -0.36113,-0.0252c-2.86387,0 -5.26582,1.30176 -7.41582,2.37676c-2.15,1.075 -4.04805,1.92324 -5.48418,1.92324c-1.43613,0 -3.33418,-0.84824 -5.48418,-1.92324c-2.15,-1.075 -4.55195,-2.37676 -7.41582,-2.37676c-2.86387,0 -5.26582,1.30176 -7.41582,2.37676c-2.15,1.075 -4.04805,1.92324 -5.48418,1.92324c-1.43613,0 -3.33418,-0.84824 -5.48418,-1.92324c-2.15,-1.075 -4.55195,-2.37676 -7.41582,-2.37676c-2.86387,0 -5.26582,1.30176 -7.41582,2.37676c-2.15,1.075 -4.04805,1.92324 -5.48418,1.92324c-1.43613,0 -3.33418,-0.84824 -5.48418,-1.92324c-2.15,-1.075 -4.55195,-2.37676 -7.41582,-2.37676c-2.86387,0 -5.26582,1.30176 -7.41582,2.37676c-2.15,1.075 -4.04805,1.92324 -5.48418,1.92324c-1.43613,0 -3.33418,-0.84824 -5.48418,-1.92324c-2.15,-1.075 -4.55195,-2.37676 -7.41582,-2.37676c-0.12598,0 -0.24355,0.0168 -0.36113,0.0252l-6.17285,-32.92187l-9.78418,-21.5252zM86,75.25c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,83.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM51.54961,90.90469c-0.32754,0.0084 -0.66348,0.05039 -0.99102,0.13438l-4.3,1.075c-1.90645,0.47031 -3.25859,2.20879 -3.25859,4.16562v4.77031c-0.0084,0.77266 0.39473,1.49492 1.0666,1.88965c0.67188,0.38633 1.49492,0.38633 2.1668,0c0.67188,-0.39472 1.075,-1.11699 1.0666,-1.88965v-4.77031l4.3,-1.075v3.69531c-0.0084,0.77266 0.39473,1.49492 1.0666,1.88965c0.67188,0.38633 1.49492,0.38633 2.1668,0c0.67188,-0.39472 1.075,-1.11699 1.0666,-1.88965v-3.69531c0,-2.40195 -2.04922,-4.3 -4.35039,-4.3zM120.45039,90.90469c-2.30117,0 -4.35039,1.89805 -4.35039,4.3v3.69531c-0.0084,0.77266 0.39473,1.49492 1.0666,1.88965c0.67188,0.38633 1.49492,0.38633 2.1668,0c0.67188,-0.39472 1.075,-1.11699 1.0666,-1.88965v-3.69531l4.3,1.075v4.77031c-0.0084,0.77266 0.39473,1.49492 1.0666,1.88965c0.67188,0.38633 1.49492,0.38633 2.1668,0c0.67187,-0.39472 1.075,-1.11699 1.0666,-1.88965v-4.77031c0,-1.95684 -1.35215,-3.69531 -3.25859,-4.16562l-4.3,-1.075c-0.32754,-0.08398 -0.66348,-0.12598 -0.99101,-0.13438zM86,92.45c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,101.05c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,109.65c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,118.25c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,126.85c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM86,135.45c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM12.9,146.2c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15zM159.1,146.2c-1.18418,0 -2.15,0.96582 -2.15,2.15c0,1.18418 0.96582,2.15 2.15,2.15c1.18418,0 2.15,-0.96582 2.15,-2.15c0,-1.18418 -0.96582,-2.15 -2.15,-2.15z"></path></g></g></svg>
                         </div>
                         <div class="col">
                             <h6 class="no-margin bold">{{item.container_reference}}</h6>
@@ -34,7 +34,7 @@
                             <div class="btn btn-default no-border" @click="expanded = !expanded">
                                 <i class="fa" :class="{'fa-angle-down': !expanded, 'fa-angle-up': expanded}" ></i>
                             </div>
-                             <a class="btn btn-default no-border" :href="route('container.show', item.container_reference)">
+                            <a class="btn btn-default no-border" :href="route('container.show', item.container_reference)">
                                 <i class="fa fa-angle-right fa-fw"></i>
                             </a>
                         </div>
diff --git a/resources/assets/vue/components/containers/forms/CreateLoadContainerFormComponent.vue b/resources/assets/vue/components/containers/forms/CreateLoadContainerFormComponent.vue
index 81c4147b..cf8e4aaa 100644
--- a/resources/assets/vue/components/containers/forms/CreateLoadContainerFormComponent.vue
+++ b/resources/assets/vue/components/containers/forms/CreateLoadContainerFormComponent.vue
@@ -9,45 +9,77 @@
             <error-message-component class="m-b-20" :error="error"></error-message-component>
             <div class="row">
                 <div class="col">
-                    <validation-wrapper-component class="m-b-15" :validator="$v.parameters.receive_date">
-                        <label class="text-primary">Receive Date</label>
-                        <date-picker-component :parameters="parameters" :value="'receive_date'"></date-picker-component>
-                    </validation-wrapper-component>
-                     <validation-wrapper-component class="m-b-15" :validator="$v.parameters.tracking">
-                        <label class="text-primary">Tracking</label>
-                        <input type="text" class="form-control fs-12" v-model.trim="parameters.tracking">
-                    </validation-wrapper-component>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <div class="row m-b-0 text-primary">
+                                <div class="col">
+                                    <label class="text-primary fs-11 all-caps">Select the warehouse</label>
+                                </div>
+                            </div>
+                            <div class="row text-center justify-content-center">
+                                <div class="col p-r-5">
+                                    <div class="b-a b-thick p-t-15 p-b-15 p-l-35 p-r-35 pointer" :class="{ 'b-primary': parameters.company_module_id === 3, 'b-grey': parameters.company_module_id !== 3 }"  @click="parameters.company_module_id = 3">
+                                        <div class="row m-b-15 justify-content-center">
+                                            <div class="col-8">
+                                                <img src="/images/guangzhou-map.png" class="w-100">
+                                            </div>
+                                        </div>
+                                        <div class="row">
+                                            <div class="col">
+                                                <h5 class="no-margin" :class="{ 'text-primary': parameters.company_module_id === 3, 'semi-bold': parameters.company_module_id === 3 }">Guangzhou</h5>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col p-l-5">
+                                    <div class="b-a b-thick p-t-15 p-b-15 p-l-35 p-r-35 pointer" :class="{ 'b-primary': parameters.company_module_id === 4, 'b-grey': parameters.company_module_id !== 4 }"  @click="parameters.company_module_id = 4">
+                                        <div class="row m-b-15 justify-content-center">
+                                            <div class="col-8">
+                                                <img src="/images/yiwu-map.png" class="w-100">
+                                            </div>
+                                        </div>
+                                        <div class="row">
+                                            <div class="col">
+                                                <h5 class="no-margin" :class="{ 'text-primary': parameters.company_module_id === 4, 'semi-bold': parameters.company_module_id === 4}">Yiwu</h5>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
 
-                    <validation-wrapper-component class="m-b-15" :validator="$v.parameters.company_module_id">
-                        <label class="text-primary">Company Module</label>
-                        <input type="text" class="form-control fs-12" v-model.trim="parameters.company_module_id">
-                    </validation-wrapper-component>
+                    <div class="row">
+                        <div class="col">
+                            <validation-wrapper-component class="m-b-10" :validator="$v.parameters.etd">
+                                <label class="text-primary">ETD</label>
+                                <date-picker-component :parameters="parameters" :value="'etd'"></date-picker-component>
+                            </validation-wrapper-component>
+                        </div>
+
+                        <div class="col">
+                            <validation-wrapper-component class="m-b-10" :validator="$v.parameters.eta">
+                                <label class="text-primary">ETA</label>
+                                <date-picker-component :parameters="parameters" :value="'eta'"></date-picker-component>
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
 
                     <validation-wrapper-component class="m-b-15" :validator="$v.parameters.container_reference">
                         <label class="text-primary">Container Reference</label>
                         <input type="text" class="form-control fs-12" v-model.trim="parameters.container_reference">
                     </validation-wrapper-component>
 
-                    <validation-wrapper-component class="m-b-15" :validator="$v.parameters.container_number">
+                     <validation-wrapper-component class="m-b-15" :validator="$v.parameters.container_number">
                         <label class="text-primary">Container Number</label>
                         <input type="text" class="form-control fs-12" v-model.trim="parameters.container_number">
                     </validation-wrapper-component>
 
-                    <validation-wrapper-component class="m-b-15" :validator="$v.parameters.seal_reference">
+                     <validation-wrapper-component class="m-b-15" :validator="$v.parameters.seal_reference">
                         <label class="text-primary">Seal Reference</label>
                         <input type="text" class="form-control fs-12" v-model.trim="parameters.seal_reference">
                     </validation-wrapper-component>
 
-                    <validation-wrapper-component class="m-b-15" :validator="$v.parameters.container_type">
-                        <label class="text-primary">Container Type</label>
-                        <input type="text" class="form-control fs-12" v-model.trim="parameters.container_type">
-                    </validation-wrapper-component>
-
-                    <validation-wrapper-component class="m-b-15" :validator="$v.parameters.status">
-                        <label class="text-primary">Status</label>
-                        <input type="text" class="form-control fs-12" v-model.trim="parameters.status">
-                    </validation-wrapper-component>
-
                     <div class="row m-t-15 align-items-center justify-content-center">
                         <div class="col">
                             <div class="btn btn-block btn-lg btn-primary b-rad-none no-border" @click="submitForm">Submit</div>
@@ -68,14 +100,13 @@
             return {
                 error: '',
                 parameters: {
-                    tracking: this.tracking,
-                    receive_date: this.receive_date,
-                    company_module_id: this.company_module_id,
                     container_reference: this.container_reference,
                     container_number: this.container_number,
                     seal_reference: this.seal_reference,
-                    container_type: this.container_type,
-                    status: this.status,
+                    container_type: 1,
+                    company_module_id: this.company_module_id,
+                    etd: this.etd, 
+                    eta: this.eta, 
                 }
             };
         },
diff --git a/resources/assets/vue/general/mixins/containers/validation/createContainerFormValidation.js b/resources/assets/vue/general/mixins/containers/validation/createContainerFormValidation.js
index 6b664c73..8f4ac5f7 100644
--- a/resources/assets/vue/general/mixins/containers/validation/createContainerFormValidation.js
+++ b/resources/assets/vue/general/mixins/containers/validation/createContainerFormValidation.js
@@ -3,10 +3,10 @@ import { required } from "vuelidate/lib/validators";
 export default {
     validations: {
         parameters: {
-            tracking: {
+            etd: {
                 required
             },
-            receive_date: {
+            eta: {
                 required
             },
             company_module_id: {
@@ -24,9 +24,6 @@ export default {
             container_type: {
                 required
             },
-            status: {
-                required
-            }
         }
     },
 }
\ No newline at end of file
diff --git a/resources/views/layouts/base_portal.blade.php b/resources/views/layouts/base_portal.blade.php
index eef21b0e..87144464 100644
--- a/resources/views/layouts/base_portal.blade.php
+++ b/resources/views/layouts/base_portal.blade.php
@@ -23,12 +23,6 @@
                                                 <div class="col"></div>
                                                 <div class="col-auto p-r-0">
                                                     <a href="{{route('orders.refresh')}}"><div class="btn btn-sm btn-warning all-caps b-rad-none pointer"><i class="fa fa-refresh m-r-10"></i>Refresh Orders</div></a>
-
-                                                    <div data-type="createContainer" class="btn btn-sm btn-block bg-white text-info b-rad-sm pointer requestModal">Add</div>
-                                                    <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="stick-up" type="createContainer" size="large">
-                                                        <create-load-container-form-component :section="'containerListSection'"></create-load-container-form-component>
-                                                    </modal-component>
-
                                                 </div>
                                             </div>
                                             @yield('inner_content')
diff --git a/resources/views/pages/containers.blade.php b/resources/views/pages/containers.blade.php
index 642d8c33..de556fa0 100644
--- a/resources/views/pages/containers.blade.php
+++ b/resources/views/pages/containers.blade.php
@@ -8,8 +8,17 @@
         <div class="row border p-1">Filter</div>
     </div>
 </div>
-<!-- <list-component  section="containerListSection" :endpoint="route('api.packing_list.container.list')"> -->
-<list-component  section="containerListSection" :endpoint="route('api.packing_list.container.list')" :options="{'per_page': 5, 'with_packing_lists': true, order_by: {column: 'created_at', DESC: true}}">
+
+<div class="row m-b-15">
+    <div class="col">
+        <div data-type="createContainer" class="btn btn-sm btn-primary all-caps b-rad-none pointer requestModal m-l-5 rounded btn-lg"><i class="fa fa-plus m-r-10"></i>Add Container</div>
+        <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="stick-up" type="createContainer" size="large">
+            <create-load-container-form-component :section="'containerListSection'"></create-load-container-form-component>
+        </modal-component>
+    </div>
+</div>
+
+<list-component section="containerListSection" :endpoint="route('api.packing_list.container.list')" :options="{'per_page': 5, 'with_packing_lists': true, order_by: {column: 'created_at', DESC: true}}">
     <template slot="list" slot-scope="{data}">
         <container-component :data="data"></container-component>
     </template>