From 6646c1a133c0dfccf29cd68cc438a02b4df8c78a Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Mon, 18 Feb 2019 16:50:16 +0800
Subject: [PATCH] Major incomplete Change

---
 package.json                                  |  3 +-
 resources/assets/js/scripts.js                |  2 ++
 .../elements/CompanySummaryComponenet.vue     |  2 +-
 .../order/elements/ReceiveStepComponenet.vue  | 10 +++---
 resources/views/pages/dashboard.blade.php     | 36 ++++++++++++++++++-
 5 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 09415cd..efd4ca3 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,8 @@
         "typeahead.js": "^0.11.1",
         "vue-avatar": "^2.1.7",
         "vue-select": "^2.5.1",
-        "vue-slide-up-down": "^1.4.1"
+        "vue-slide-up-down": "^1.4.1",
+        "vuejs-datepicker": "^1.5.4"
     },
     "devDependencies": {
         "axios": "^0.18",
diff --git a/resources/assets/js/scripts.js b/resources/assets/js/scripts.js
index d000e65..2a3dfb7 100644
--- a/resources/assets/js/scripts.js
+++ b/resources/assets/js/scripts.js
@@ -28,4 +28,6 @@ $(function() {
     $('.singleLightBox').magnificPopup({
         type: 'image'
     });
+
+    $('.datepicker').datepicker();
 });
\ No newline at end of file
diff --git a/resources/assets/vue/components/company/elements/CompanySummaryComponenet.vue b/resources/assets/vue/components/company/elements/CompanySummaryComponenet.vue
index 8869867..d3eeb9b 100644
--- a/resources/assets/vue/components/company/elements/CompanySummaryComponenet.vue
+++ b/resources/assets/vue/components/company/elements/CompanySummaryComponenet.vue
@@ -9,7 +9,7 @@
             </div>
             <div class="row">
                 <div class="col text-justify">
-                    <small class="muted">{{this.company.street_one}} {{this.company.street_two}}, {{this.company.city}}, {{this.company.state}}, {{this.company.post_code}}, {{this.company.country}}</small>
+                    <small class="muted">{{this.company.street_one || ''}} {{ this.company.street_two || '' }} {{this.company.city || '' }} {{this.company.post_code || ''}} {{this.company.state || ''}} {{this.company.country || ''}}</small>
                 </div>
             </div>
             <div class="row no-margin">
diff --git a/resources/assets/vue/components/order/elements/ReceiveStepComponenet.vue b/resources/assets/vue/components/order/elements/ReceiveStepComponenet.vue
index d81cbec..2744829 100644
--- a/resources/assets/vue/components/order/elements/ReceiveStepComponenet.vue
+++ b/resources/assets/vue/components/order/elements/ReceiveStepComponenet.vue
@@ -24,12 +24,10 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="form-group form-group-default input-group">
-                                    <div class="row w-100">
-                                        <div class="col no-padding">
-                                            <label class="muted block">Date Received</label>
-                                            <input class="form-control block" v-model="receiveNote.receive_date">
-                                        </div>
+                                <div class="form-group form-group-default input-group" style=" overflow: visible; ">
+                                    <div class="form-input-group">
+                                        <label>Date Received</label>
+                                        <datepicker class="form-control block" v-model="receiveNote.receive_date"></datepicker>
                                     </div>
                                 </div>
                                 <div class="row">
diff --git a/resources/views/pages/dashboard.blade.php b/resources/views/pages/dashboard.blade.php
index a47f673..c4f7f33 100644
--- a/resources/views/pages/dashboard.blade.php
+++ b/resources/views/pages/dashboard.blade.php
@@ -1,6 +1,40 @@
 @extends('layouts.base_portal')
 
 @section('inner_content')
-
+<div class="row p-t-50 p-b-50">
+    <div class="col">
+        <div class="row">
+            <div class="col">
+                <h4 class="all-caps">Welcome {{auth()->user()->first_name}}</h4>
+            </div>
+        </div>
+        <div class="row m-t-20">
+            <div class="col-5">
+                <div class="row bg-white">
+                    <div class="col">
+                        <div class="row b-b b-grey">
+                            <div class="col p-t-5 p-b-5">
+                                <small class="fs-11 bold">Getting Started</small>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col">
+                                <div class="row align-items-center justify-content-center">
+                                    <div class="col">
+                                        <div class="row">
+                                            <div class="col">
+                                                Manage Importers
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
 @endsection