From f36015e762ac8bfc0b9e7fa0790b9ce1674cf64f Mon Sep 17 00:00:00 2001
From: Kawlll Maxso <muhdazreen12@gmail.com>
Date: Mon, 15 Apr 2019 18:44:53 +0800
Subject: [PATCH 1/3] Fix for list order history api

---
 .../Orders/Services/ListsOrderHistory.php     | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/app/Classes/Modules/Orders/Services/ListsOrderHistory.php b/app/Classes/Modules/Orders/Services/ListsOrderHistory.php
index bf653f2..b8d2283 100644
--- a/app/Classes/Modules/Orders/Services/ListsOrderHistory.php
+++ b/app/Classes/Modules/Orders/Services/ListsOrderHistory.php
@@ -72,26 +72,25 @@ class ListsOrderHistory
                     $history->push(['date' => $step->updated_at->format('d-m-Y H:i'), 'description' => 'Out for delivery']);
                     break;
             }
-        }
-
-        if($order->current_step === Constants::ORDER_SHIPPING_STEP){
-            $shippingArrangment = $order->shippingArrangement()->first();
-            if($shippingArrangment){
-                $shippingSchedules = $shippingArrangment->shippingSchedule()->get();
-                foreach ($shippingSchedules as $schedule){
-                    if($schedule->status === 2){
-                        $customeIssue = CustomIssues::where('schedule_id', $schedule->id)->first();
-                        if($customeIssue !== null){
-                            $history->push(['date' => $step->updated_at->format('d-m-Y H:i'), 'description' => '[ETD: '.$schedule->ETD.', ETA: '.$schedule->ETA.'] Shipping Schedule failed due to: '.$customeIssue->remark]);
+            if($order->current_step === Constants::ORDER_SHIPPING_STEP){
+                $shippingArrangment = $order->shippingArrangement()->first();
+                if($shippingArrangment){
+                    $shippingSchedules = $shippingArrangment->shippingSchedule()->get();
+                    foreach ($shippingSchedules as $schedule){
+                        if($schedule->status === 2){
+                            $customeIssue = CustomIssues::where('schedule_id', $schedule->id)->first();
+                            if($customeIssue !== null){
+                                $history->push(['date' => $step->updated_at->format('d-m-Y H:i'), 'description' => '[ETD: '.$schedule->ETD.', ETA: '.$schedule->ETA.'] Shipping Schedule failed due to: '.$customeIssue->remark]);
+                            } else {
+                                $history->push(['date' => $step->updated_at->format('d-m-Y H:i'), 'description' => '[ETD: '.$schedule->ETD.', ETA: '.$schedule->ETA.'] Shipping Schedule failed']);
+                            }
                         } else {
-                            $history->push(['date' => $step->updated_at->format('d-m-Y H:i'), 'description' => '[ETD: '.$schedule->ETD.', ETA: '.$schedule->ETA.'] Shipping Schedule failed']);
+                            $history->push(['date' => $step->updated_at->format('d-m-Y H:i'), 'description' => '[ETD: '.$schedule->ETD.', ETA: '.$schedule->ETA.'] Your Order has been scheduled for shipping ']);
                         }
-                    } else {
-                        $history->push(['date' => $step->updated_at->format('d-m-Y H:i'), 'description' => '[ETD: '.$schedule->ETD.', ETA: '.$schedule->ETA.'] Your Order has been scheduled for shipping ']);
                     }
                 }
-            }
 
+            }
         }
 
         if($complete){

From 6686451d73b5512db8f23c1e629b4dd279b3e797 Mon Sep 17 00:00:00 2001
From: Kawlll Maxso <muhdazreen12@gmail.com>
Date: Mon, 22 Apr 2019 10:22:07 +0800
Subject: [PATCH 2/3] Notification

---
 .../common/NotificationComponent.vue          | 18 ++--
 .../forms/AddressBookFormComponent.vue        | 13 ++-
 .../company/forms/CompanyFormComponent.vue    | 16 ++--
 .../contact/forms/ContactFormComponent.vue    | 11 ++-
 .../order/elements/ArrivalStepComponenet.vue  | 10 ++
 .../order/elements/ConfirmOrderComponent.vue  | 10 ++
 .../order/elements/DeliveryStepComponenet.vue |  9 ++
 .../order/elements/PackingStepComponenet.vue  | 17 ++++
 .../order/elements/ReceiveStepComponenet.vue  |  9 ++
 .../order/elements/ShippingStepComponenet.vue | 27 +++++-
 .../SupplierPackingStepComponenet.vue         | 10 ++
 .../elements/UnpackingStepComponenet.vue      |  9 ++
 .../order/forms/OrderFormComponent.vue        |  8 ++
 .../forms/WarehouseFormComponent.vue          | 11 +++
 resources/assets/vue/constant/notification.js | 92 +++++++++++++++++++
 15 files changed, 252 insertions(+), 18 deletions(-)
 create mode 100644 resources/assets/vue/constant/notification.js

diff --git a/resources/assets/vue/components/common/NotificationComponent.vue b/resources/assets/vue/components/common/NotificationComponent.vue
index 0f34dae..0a25cf6 100644
--- a/resources/assets/vue/components/common/NotificationComponent.vue
+++ b/resources/assets/vue/components/common/NotificationComponent.vue
@@ -1,11 +1,13 @@
 <template>
-    <div class="row" ref="content">
-        <div class="col no-padding">
-            <div class="row">
-                <div class="col all-caps fs-13 bold" ref="title"></div>
-            </div>
-            <div class="row fs-12 m-t-5">
-                <div class="col" ref="message"></div>
+    <div class="hide">
+        <div class="row" ref="content">
+            <div class="col no-padding">
+                <div class="row">
+                    <div class="col all-caps fs-13 bold" ref="title"></div>
+                </div>
+                <div class="row fs-12 m-t-5">
+                    <div class="col" ref="message"></div>
+                </div>
             </div>
         </div>
     </div>
@@ -26,7 +28,7 @@
                 let content = this.$refs.content;
 
                 new Noty({
-                    type: 'error',
+                    type: 'success',
                     text: content.innerHTML.toString(),
                     timeout: 5000,
                     closeWith: ['button'],
diff --git a/resources/assets/vue/components/company/forms/AddressBookFormComponent.vue b/resources/assets/vue/components/company/forms/AddressBookFormComponent.vue
index fbf6a00..72d7434 100644
--- a/resources/assets/vue/components/company/forms/AddressBookFormComponent.vue
+++ b/resources/assets/vue/components/company/forms/AddressBookFormComponent.vue
@@ -1,6 +1,7 @@
 <template>
     <div class="card card-default no-border no-margin">
-		<loading-component  v-show="isLoading"></loading-component>
+        <notification-component ref="notification"></notification-component>
+        <loading-component  v-show="isLoading"></loading-component>
         <div class="card-block">
             <div class="row" v-show="!this.isEdit">
                 <div class="col">
@@ -47,6 +48,7 @@
     </div>
 </template>
 <script>
+    import notificationConstant from '../../../constant/notification'
     export default {
         props: {
             'id': {
@@ -101,10 +103,19 @@
                         'content-type': 'application/json'
                     }
                 }).then((response) => {
+                    let notification = this.$refs.notification;
                     if(!this.isEdit){
                         Event.$emit('updateAddressBookList');
                         this.clearForm();
+                        notification.title = notificationConstant.IMPORTER.ADDRESS_BOOK.TITLE;
+                        notification.message = notificationConstant.IMPORTER.ADDRESS_BOOK.MESSAGE;
                     }
+                    else {
+                        notification.title = notificationConstant.IMPORTER.ADDRESS_BOOK.UPDATED.TITLE;
+                        notification.message = notificationConstant.IMPORTER.ADDRESS_BOOK.UPDATED.MESSAGE;
+                    }
+
+                    notification.execute();
 
                     //turn off loading animation
                     this.isLoading = false;
diff --git a/resources/assets/vue/components/company/forms/CompanyFormComponent.vue b/resources/assets/vue/components/company/forms/CompanyFormComponent.vue
index 73056fb..666c5c8 100644
--- a/resources/assets/vue/components/company/forms/CompanyFormComponent.vue
+++ b/resources/assets/vue/components/company/forms/CompanyFormComponent.vue
@@ -1,7 +1,7 @@
 <template>
     <div>
         <notification-component ref="notification"></notification-component>
-		<loading-component  v-show="isLoading"></loading-component>
+        <loading-component  v-show="isLoading"></loading-component>
         <div class="row m-t-20" v-show="!isEdit">
             <div class="col">
                 <div class="b-l b-success p-l-15 m-b-15" style="border-left-width: 3px;">
@@ -61,6 +61,7 @@
     </div>
 </template>
 <script>
+    import notificationConstant from '../../../constant/notification';
     export default {
         props: {
             'data': {
@@ -153,16 +154,17 @@
                             'content-type': 'application/json'
                         }
                     }).then((response) => {
+                        let notification = this.$refs.notification;
                         if(!this.isEdit){
                             Event.$emit('updateCompanyList');
                             this.clearForm();
+                            notification.title = notificationConstant.IMPORTER.DETAILS.CREATED.TITLE;
+                            notification.message = notificationConstant.IMPORTER.DETAILS.CREATED.MESSAGE;
+                        }
+                        else {
+                            notification.title = notificationConstant.IMPORTER.DETAILS.UPDATED.MESSAGE;
+                            notification.message = notificationConstant.IMPORTER.DETAILS.UPDATED.MESSAGE;
                         }
-
-                        let notification = this.$refs.notification;
-
-                        notification.title = 'Created Successfully';
-                        notification.message = 'Importer details have been updated successfully';
-
                         notification.execute();
 
                         //turn off loading animation
diff --git a/resources/assets/vue/components/contact/forms/ContactFormComponent.vue b/resources/assets/vue/components/contact/forms/ContactFormComponent.vue
index 3d5ca47..c80774c 100644
--- a/resources/assets/vue/components/contact/forms/ContactFormComponent.vue
+++ b/resources/assets/vue/components/contact/forms/ContactFormComponent.vue
@@ -1,5 +1,6 @@
 <template>
     <div class="card card-default no-border no-margin">
+        <notification-component ref="notification"></notification-component>
 		<loading-component  v-show="isLoading"></loading-component>
         <div class="card-block">
             <div class="row" v-show="!this.isEdit">
@@ -60,6 +61,7 @@
     </div>
 </template>
 <script>
+    import notificationConstant from '../../../constant/notification';
     export default {
         props: {
             'type': {
@@ -110,11 +112,18 @@
                         'content-type': 'application/json'
                     }
                 }).then((response) => {
+                    let notification = this.$refs.notification;
                     if(!this.isEdit){
                         Event.$emit('updateContactsList');
                         this.clearForm();
+                        notification.title = notificationConstant.WAREHOUSE.CONTACT.UPDATED.TITLE;
+                        notification.title = notificationConstant.WAREHOUSE.CONTACT.UPDATED.MESSAGE;
                     }
-
+                    else {
+                        notification.title = notificationConstant.WAREHOUSE.CONTACT.CREATED.TITLE;
+                        notification.title = notificationConstant.WAREHOUSE.CONTACT.CREATED.MESSAGE;
+                    }
+                    notification.execute();
                     //turn off loading animation
                     this.isLoading = false;
 
diff --git a/resources/assets/vue/components/order/elements/ArrivalStepComponenet.vue b/resources/assets/vue/components/order/elements/ArrivalStepComponenet.vue
index c0bb9fe..d8f3459 100644
--- a/resources/assets/vue/components/order/elements/ArrivalStepComponenet.vue
+++ b/resources/assets/vue/components/order/elements/ArrivalStepComponenet.vue
@@ -1,5 +1,6 @@
 <template>
     <div class="inline">
+        <notification-component ref="notification"></notification-component>
         <div class="btn btn-sm btn-success b-rad-none requestModal"  data-type="arrival">Order Arrived</div>
         <confirm-modal-component
                 title="Order Arrival"
@@ -11,6 +12,7 @@
 </template>
 
 <script>
+    import notificationConstant from '../../../constant/notification';
     export default {
         props: {
             'data': {
@@ -36,6 +38,14 @@
                     //turn off loading animation
                     this.isLoading = false;
 
+                    let notification = this.$refs.notification;
+
+                    notification.title = notificationConstant.ORDER.WAREHOUSE_ARRIVAL.TITLE;
+                    notification.message = notificationConstant.ORDER.WAREHOUSE_ARRIVAL.MESSAGE;
+
+
+                    notification.execute();
+
                     Event.$emit('updateOrdersList', true);
 
 
diff --git a/resources/assets/vue/components/order/elements/ConfirmOrderComponent.vue b/resources/assets/vue/components/order/elements/ConfirmOrderComponent.vue
index 1013c10..4b6c756 100644
--- a/resources/assets/vue/components/order/elements/ConfirmOrderComponent.vue
+++ b/resources/assets/vue/components/order/elements/ConfirmOrderComponent.vue
@@ -2,6 +2,7 @@
     <div class="inline">
         <div class="btn btn-sm btn-success b-rad-none requestModal"  data-type="receiveNote">Confirm Warehouse</div>
         <modal-component type="receiveNote">
+            <notification-component ref="notification"></notification-component>
             <loading-component style="left: 0;" v-show="isLoading"></loading-component>
             <div class="card card-default no-border">
                 <div class="card-block no-padding">
@@ -55,6 +56,7 @@
     </div>
 </template>
 <script>
+    import notificationConstant from '../../../constant/notification';
     export default {
         props: {
             'data': {
@@ -108,6 +110,14 @@
                     //turn off loading animation
                     this.isLoading = false;
 
+                    let notification = this.$refs.notification;
+
+                    notification.title = notificationConstant.ORDER.ORDER_WAREHOUSE_CONFIRMED.TITLE;
+                    notification.message = notificationConstant.ORDER.ORDER_WAREHOUSE_CONFIRMED.MESSAGE;
+
+
+                    notification.execute();
+
                     Event.$emit('updateOrdersList');
 
                 })
diff --git a/resources/assets/vue/components/order/elements/DeliveryStepComponenet.vue b/resources/assets/vue/components/order/elements/DeliveryStepComponenet.vue
index 90c3a99..949672c 100644
--- a/resources/assets/vue/components/order/elements/DeliveryStepComponenet.vue
+++ b/resources/assets/vue/components/order/elements/DeliveryStepComponenet.vue
@@ -1,5 +1,6 @@
 <template>
     <div class="inline">
+        <notification-component ref="notification"></notification-component>
         <div class="btn btn-sm btn-success b-rad-none requestModal"  data-type="delivery">Out for Delivery</div>
         <confirm-modal-component
                 title="Order Packed"
@@ -11,6 +12,7 @@
 </template>
 
 <script>
+    import notificationConstant from '../../../constant/notification';
     export default {
         props: {
             'data': {
@@ -36,6 +38,13 @@
                     //turn off loading animation
                     this.isLoading = false;
 
+                    let notification = this.$refs.notification;
+
+                    notification.title = notificationConstant.ORDER.OUT_FOR_DELIVERY.TITLE;
+                    notification.message = notificationConstant.ORDER.OUT_FOR_DELIVERY.MESSAGE;
+
+                    notification.execute();
+
                     Event.$emit('updateOrdersList', true);
 
 
diff --git a/resources/assets/vue/components/order/elements/PackingStepComponenet.vue b/resources/assets/vue/components/order/elements/PackingStepComponenet.vue
index ca728a0..e8ccf8a 100644
--- a/resources/assets/vue/components/order/elements/PackingStepComponenet.vue
+++ b/resources/assets/vue/components/order/elements/PackingStepComponenet.vue
@@ -1,5 +1,6 @@
 <template>
     <div class="inline">
+        <notification-component ref="notification"></notification-component>
         <div class="btn btn-sm btn-success b-rad-none requestModal" v-if="this.packingList.confirmed"  data-type="packed">Order Packed</div>
         <div class="btn btn-sm btn-complete b-rad-none requestModal" data-type="packingList">Packing List</div>
         <modal-component type="packingList" large>
@@ -196,6 +197,7 @@
 </template>
 
 <script>
+    import notificationConstant from '../../../constant/notification';
     export default {
         props: {
             'data': {
@@ -245,6 +247,14 @@
                     //turn off loading animation
                     this.isLoading = false;
 
+                    let notification = this.$refs.notification;
+
+                    notification.title = notificationConstant.ORDER.PACKING_LIST_NOTIFICATION.TITLE;
+                    notification.message = notificationConstant.ORDER.PACKING_LIST_NOTIFICATION.MESSAGE;
+
+
+                    notification.execute();
+
                     Event.$emit('updateOrdersList');
 
                 });
@@ -262,6 +272,13 @@
                     //turn off loading animation
                     this.isLoading = false;
 
+                    let notification = this.$refs.notification;
+
+                    notification.title = notificationConstant.ORDER.ORDER_PACKED.TITLE;
+                    notification.message = notificationConstant.ORDER.ORDER_PACKED.MESSAGE;
+
+                    notification.execute();
+
                     Event.$emit('updateOrdersList', true);
 
 
diff --git a/resources/assets/vue/components/order/elements/ReceiveStepComponenet.vue b/resources/assets/vue/components/order/elements/ReceiveStepComponenet.vue
index 0c92722..730ab87 100644
--- a/resources/assets/vue/components/order/elements/ReceiveStepComponenet.vue
+++ b/resources/assets/vue/components/order/elements/ReceiveStepComponenet.vue
@@ -2,6 +2,7 @@
     <div class="inline">
         <div class="btn btn-sm btn-success b-rad-none requestModal"  data-type="receiveNote">Warehouse Received</div>
         <modal-component type="receiveNote">
+            <notification-component ref="notification"></notification-component>
             <loading-component style="left: 0;" v-show="isLoading"></loading-component>
             <div class="card card-default no-border">
                 <div class="card-block no-padding">
@@ -51,6 +52,7 @@
 </template>
 
 <script>
+    import notificationConstant from '../../../constant/notification';
     export default {
         props: {
             'data': {
@@ -113,6 +115,13 @@
                         //turn off loading animation
                         this.isLoading = false;
 
+                        let notification = this.$refs.notification;
+
+                        notification.title = notificationConstant.ORDER.WAREHOUSE_RECEIVE.TITLE;
+                        notification.message = notificationConstant.ORDER.WAREHOUSE_RECEIVE.MESSAGE;
+
+                        notification.execute();
+
                         $(this.$el).find('.receiveForm').parents('.modal').modal('hide')
 
                         Event.$emit('updateOrdersList');
diff --git a/resources/assets/vue/components/order/elements/ShippingStepComponenet.vue b/resources/assets/vue/components/order/elements/ShippingStepComponenet.vue
index d415d32..47f27b1 100644
--- a/resources/assets/vue/components/order/elements/ShippingStepComponenet.vue
+++ b/resources/assets/vue/components/order/elements/ShippingStepComponenet.vue
@@ -4,6 +4,7 @@
         <div class="btn btn-sm btn-success b-rad-none requestModal" v-if="arrangementExist" data-type="shippingComplete">Port Arrival</div>
         <div class="btn btn-sm btn-warning text-black b-rad-none requestModal" v-if="arrangementExist" data-type="rescheduleShipping">Reschedule Shipping</div>
         <modal-component type="shippingArrangement" v-if="!arrangementExist">
+            <notification-component ref="notification"></notification-component>
             <loading-component style="left: 0;" v-show="isLoading"></loading-component>
             <div class="card card-default no-border">
                 <div class="card-block no-padding">
@@ -79,6 +80,7 @@
             </div>
         </modal-component>
         <modal-component type="rescheduleShipping" v-if="arrangementExist">
+            <notification-component ref="notification"></notification-component>
             <loading-component style="left: 0;" v-show="isLoading"></loading-component>
             <div class="card card-default no-border">
                 <div class="card-block no-padding">
@@ -149,7 +151,8 @@
 </template>
 
 <script>
-    import moment from 'moment'
+    import moment from 'moment';
+    import notificationConstant from '../../../constant/notification';
     export default {
         props: {
             'data': {
@@ -300,6 +303,12 @@
                         //turn off loading animation
                         this.isLoading = false;
 
+                        let notification = this.$refs.notification;
+
+                        notification.title = notificationConstant.ORDER.SHIPPING_ARRANGEMENT.TITLE;
+                        notification.message = notificationConstant.ORDER.SHIPPING_ARRANGEMENT.MESSAGE;
+
+                        notification.execute();
 
                         $(this.$el).find('.shippingForm').parents('.modal').modal('hide')
 
@@ -323,6 +332,14 @@
                         //turn off loading animation
                         this.isLoading = false;
 
+                        let notification = this.$refs.notification;
+
+                        notification.title = notificationConstant.ORDER.SHIPPING_ARRANGEMENT.RESCHEDULE.TITLE;
+                        notification.message = notificationConstant.ORDER.SHIPPING_ARRANGEMENT.RESCHEDULE.MESSAGE;
+
+
+                        notification.execute();
+
                         $(this.$el).find('.rescheduleShipping').parents('.modal').modal('hide')
 
                         Event.$emit('updateOrdersList', true);
@@ -344,6 +361,14 @@
                     //turn off loading animation
                     this.isLoading = false;
 
+                    let notification = this.$refs.notification;
+
+                    notification.title = notificationConstant.ORDER.PORT_ARRIVAL.TITLE;
+                    notification.message = notificationConstant.ORDER.PORT_ARRIVAL.MESSAGE;
+
+
+                    notification.execute();
+
                     Event.$emit('updateOrdersList', true);
 
 
diff --git a/resources/assets/vue/components/order/elements/SupplierPackingStepComponenet.vue b/resources/assets/vue/components/order/elements/SupplierPackingStepComponenet.vue
index 26f80ae..5b63921 100644
--- a/resources/assets/vue/components/order/elements/SupplierPackingStepComponenet.vue
+++ b/resources/assets/vue/components/order/elements/SupplierPackingStepComponenet.vue
@@ -1,5 +1,6 @@
 <template>
     <div class="inline">
+        <notification-component ref="notification"></notification-component>
         <div class="btn btn-sm btn-success b-rad-none requestModal"  data-type="packed">Order Packed</div>
         <confirm-modal-component
                 title="Order Packed"
@@ -11,6 +12,7 @@
 </template>
 
 <script>
+    import notificationConstant from '../../../constant/notification';
     export default {
         props: {
             'data': {
@@ -36,6 +38,14 @@
                     //turn off loading animation
                     this.isLoading = false;
 
+                    let notification = this.$refs.notification;
+
+                    notification.title = notificationConstant.ORDER.ORDER_PACKED.TITLE;
+                    notification.message = notificationConstant.ORDER.ORDER_PACKED.MESSAGE;
+
+
+                    notification.execute();
+
                     Event.$emit('updateOrdersList', true);
 
 
diff --git a/resources/assets/vue/components/order/elements/UnpackingStepComponenet.vue b/resources/assets/vue/components/order/elements/UnpackingStepComponenet.vue
index acd7454..afbbc56 100644
--- a/resources/assets/vue/components/order/elements/UnpackingStepComponenet.vue
+++ b/resources/assets/vue/components/order/elements/UnpackingStepComponenet.vue
@@ -1,5 +1,6 @@
 <template>
     <div class="inline">
+        <notification-component ref="notification"></notification-component>
         <div class="btn btn-sm btn-success b-rad-none requestModal"  data-type="unpacked">Order Unpacked</div>
         <confirm-modal-component
                 title="Order UnPacked"
@@ -11,6 +12,7 @@
 </template>
 
 <script>
+    import notificationConstant from '../../../constant/notification';
     export default {
         props: {
             'data': {
@@ -36,6 +38,13 @@
                     //turn off loading animation
                     this.isLoading = false;
 
+                    let notification = this.$refs.notification;
+
+                    notification.title = notificationConstant.ORDER.ORDER_UNPACKED.TITLE;
+                    notification.message = notificationConstant.ORDER.ORDER_UNPACKED.MESSAGE;
+
+                    notification.execute();
+
                     Event.$emit('updateOrdersList', true);
 
                 })
diff --git a/resources/assets/vue/components/order/forms/OrderFormComponent.vue b/resources/assets/vue/components/order/forms/OrderFormComponent.vue
index 901dbc6..a8d770e 100644
--- a/resources/assets/vue/components/order/forms/OrderFormComponent.vue
+++ b/resources/assets/vue/components/order/forms/OrderFormComponent.vue
@@ -1,5 +1,6 @@
 <template>
     <div class="card card-default no-border">
+        <notification-component ref="notification"></notification-component>
         <loading-component  v-show="isLoading"></loading-component>
         <div class="card-block no-padding">
             <div class="row p-t-30">
@@ -47,6 +48,7 @@
     </div>
 </template>
 <script>
+    import notificationConstant from '../../../constant/notification';
     export default {
         props: {
             'data': {
@@ -105,6 +107,12 @@
                         //turn off loading animation
                         this.isLoading = false;
 
+                        let notification = this.$refs.notification;
+                        notification.title = notificationConstant.ORDER.ORDER_CREATED.TITLE;
+                        notification.message = notificationConstant.ORDER.ORDER_CREATED.MESSAGE;
+
+                        notification.execute();
+
                         $(this.$el).parents('.modal').modal('hide')
 
                         Event.$emit('updateOrdersList');
diff --git a/resources/assets/vue/components/warehouse/forms/WarehouseFormComponent.vue b/resources/assets/vue/components/warehouse/forms/WarehouseFormComponent.vue
index 4601f1d..09a7749 100644
--- a/resources/assets/vue/components/warehouse/forms/WarehouseFormComponent.vue
+++ b/resources/assets/vue/components/warehouse/forms/WarehouseFormComponent.vue
@@ -1,5 +1,6 @@
 <template>
     <div>
+        <notification-component ref="notification"></notification-component>
 		<loading-component  v-show="isLoading"></loading-component>
         <div class="row m-t-20" v-show="!isEdit">
             <div class="col">
@@ -38,6 +39,7 @@
     </div>
 </template>
 <script>
+    import notificationConstant from '../../../constant/notification';
     export default {
         props: {
             'data': {
@@ -84,10 +86,19 @@
                         'content-type': 'application/json'
                     }
                 }).then((response) => {
+                    let notification = this.$refs.notification;
                     if(!this.isEdit){
                         Event.$emit('updateWarehouseList');
                         this.clearForm();
+                        notification.title = notificationConstant.WAREHOUSE.DETAILS_CREATED.TITLE;
+                        notification.message = notificationConstant.WAREHOUSE.DETAILS_CREATED.MESSAGE;
                     }
+                    else {
+                        notification.title = notificationConstant.WAREHOUSE.DETAILS_CREATED.UPDATED.TITLE;
+                        notification.message = notificationConstant.WAREHOUSE.DETAILS_CREATED.UPDATED.MESSAGE;
+                    }
+
+                    notification.execute();
 
                     //turn off loading animation
                     this.isLoading = false;
diff --git a/resources/assets/vue/constant/notification.js b/resources/assets/vue/constant/notification.js
new file mode 100644
index 0000000..47d2be7
--- /dev/null
+++ b/resources/assets/vue/constant/notification.js
@@ -0,0 +1,92 @@
+export default Object.freeze({
+    ORDER: Object.freeze({
+        ORDER_CREATED: Object.freeze({
+            TITLE: 'Orders Created Successfully',
+            MESSAGE: 'Orders have been created successfully'
+        }),
+        ORDER_WAREHOUSE_CONFIRMED: Object.freeze({
+            TITLE: 'Warehouse Successfully confirmed',
+            MESSAGE: 'Warehouse have been confirmed successfully'
+        }),
+        PACKING_LIST_NOTIFICATION: Object.freeze({
+            TITLE: 'Packing list Successfully created',
+            MESSAGE: 'Packing list have been created',
+            UPDATE: Object.freeze({
+                TITLE: 'Packing list Successfully Updated',
+                MESSAGE: 'Packing list have been updated'
+            })
+        }),
+        ORDER_PACKED: Object.freeze({
+            TITLE: 'Order Successfully Packed',
+            MESSAGE: 'Order have been packed successfully'
+        }),
+        SHIPPING_ARRANGEMENT: Object.freeze({
+            TITLE: 'Shipping Arrangement Successfully Created',
+            MESSAGE: 'Shipping Arrangement have been created successfully',
+            RESCHEDULE: Object.freeze({
+                TITLE: 'Shipping Arrangement Successfully Rescheduled',
+                MESSAGE: 'Shipping Arrangement have been rescheduled successfully'
+            })
+        }),
+        PORT_ARRIVAL: Object.freeze({
+            TITLE: 'Port Arrival Successfully Confirmed',
+            MESSAGE: 'Port Arrival have been confirmed successfully'
+        }),
+        WAREHOUSE_ARRIVAL: Object.freeze({
+            TITLE: 'Warehouse Arrival Successfully Confirmed',
+            MESSAGE: 'Warehouse Arrival have been confirmed successfully'
+        }),
+        WAREHOUSE_RECEIVE: Object.freeze({
+            TITLE: 'Warehouse Received Confirmed',
+            MESSAGE: 'Warehouse Received have been confirmed'
+        }),
+        ORDER_UNPACKED: Object.freeze({
+            TITLE: 'Order Successfully Unpacked',
+            MESSAGE: 'Order have been unpacked successfully'
+        }),
+        OUT_FOR_DELIVERY: Object.freeze({
+            TITLE: 'Out For Delivery Successfully Confirmed',
+            MESSAGE: 'Out For Delivery have been confirmed successfully'
+        })
+    }),
+    IMPORTER: Object.freeze({
+        DETAILS: {
+            CREATED: {
+                TITLE: 'Created Successfully',
+                MESSAGE: null
+            },
+            DETAILS_UPDATED: {
+                TITLE: null,
+                MESSAGE: null
+            }
+        },
+        ADDRESS_BOOK: {
+            TITLE: null,
+            MESSAGE: null,
+            UPDATED: {
+                TITLE: null,
+                MESSAGE: null
+            }
+        },
+    }),
+    WAREHOUSE: Object.freeze({
+        DETAILS_CREATED: {
+            TITLE: 'Warehouse created',
+            MESSAGE: 'warehouse created',
+            UPDATED: Object.freeze({
+                TITLE: 'warehouse updated',
+                MESSAGE: 'warehouse updated'
+            })
+        },
+        CONTACT: {
+            CREATED: {
+                TITLE: 'new contact created',
+                MESSAGE: 'new contact created'
+            },
+            UPDATED: {
+                TITLE: 'Contact updated',
+                MESSAGE: 'Contact updated'
+            }
+        }
+    })
+});
\ No newline at end of file

From 38d67d413943801c70122f47d6637dfbfea2efc3 Mon Sep 17 00:00:00 2001
From: Kawlll Maxso <muhdazreen12@gmail.com>
Date: Mon, 22 Apr 2019 15:36:55 +0800
Subject: [PATCH 3/3] fix for modal not close

---
 .../vue/components/company/forms/CompanyFormComponent.vue   | 2 +-
 .../components/warehouse/forms/WarehouseFormComponent.vue   | 4 ++--
 resources/assets/vue/constant/notification.js               | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/resources/assets/vue/components/company/forms/CompanyFormComponent.vue b/resources/assets/vue/components/company/forms/CompanyFormComponent.vue
index 666c5c8..0089155 100644
--- a/resources/assets/vue/components/company/forms/CompanyFormComponent.vue
+++ b/resources/assets/vue/components/company/forms/CompanyFormComponent.vue
@@ -169,7 +169,7 @@
 
                         //turn off loading animation
                         this.isLoading = false;
-
+                        $('.modal').modal('hide');
                         this.collapseEdit();
                     })
                 }
diff --git a/resources/assets/vue/components/warehouse/forms/WarehouseFormComponent.vue b/resources/assets/vue/components/warehouse/forms/WarehouseFormComponent.vue
index 09a7749..c760a34 100644
--- a/resources/assets/vue/components/warehouse/forms/WarehouseFormComponent.vue
+++ b/resources/assets/vue/components/warehouse/forms/WarehouseFormComponent.vue
@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div class="warehouseForm">
         <notification-component ref="notification"></notification-component>
 		<loading-component  v-show="isLoading"></loading-component>
         <div class="row m-t-20" v-show="!isEdit">
@@ -102,7 +102,7 @@
 
                     //turn off loading animation
                     this.isLoading = false;
-
+                    $('.modal').modal('hide');
                     this.collapseEdit();
                 })
             },
diff --git a/resources/assets/vue/constant/notification.js b/resources/assets/vue/constant/notification.js
index 47d2be7..4c63be0 100644
--- a/resources/assets/vue/constant/notification.js
+++ b/resources/assets/vue/constant/notification.js
@@ -53,11 +53,11 @@ export default Object.freeze({
         DETAILS: {
             CREATED: {
                 TITLE: 'Created Successfully',
-                MESSAGE: null
+                MESSAGE: "created successfully"
             },
             DETAILS_UPDATED: {
-                TITLE: null,
-                MESSAGE: null
+                TITLE: "updated",
+                MESSAGE: "updated"
             }
         },
         ADDRESS_BOOK: {