From 929ae6bdc702fed4f27e59a83401858433d9853b Mon Sep 17 00:00:00 2001
From: bansarishukla <bansari.shukla1996@gmail.com>
Date: Thu, 14 Nov 2019 19:02:34 +0530
Subject: [PATCH 1/2] mark-as-sent in vue action

---
 resources/assets/js/components/base/modal/BaseModal.vue | 2 +-
 resources/assets/js/views/estimates/Index.vue           | 2 +-
 resources/assets/js/views/estimates/View.vue            | 9 ++++++---
 resources/assets/sass/components/vue-multi-select.scss  | 1 +
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/resources/assets/js/components/base/modal/BaseModal.vue b/resources/assets/js/components/base/modal/BaseModal.vue
index 9d6c2d0a..8847942d 100644
--- a/resources/assets/js/components/base/modal/BaseModal.vue
+++ b/resources/assets/js/components/base/modal/BaseModal.vue
@@ -1,6 +1,6 @@
 <template>
   <transition name="fade">
-    <div v-if="modalActive" class="base-modal" :class="'size-' + modalSize">
+    <div v-if="modalActive" :class="'size-' + modalSize" class="base-modal">
       <div class="modal-body">
         <div class="close-icon">
           <font-awesome-icon class="mr-2" icon="times" @click="closeModal"/>
diff --git a/resources/assets/js/views/estimates/Index.vue b/resources/assets/js/views/estimates/Index.vue
index 29cb5574..be75f72b 100644
--- a/resources/assets/js/views/estimates/Index.vue
+++ b/resources/assets/js/views/estimates/Index.vue
@@ -425,7 +425,7 @@ export default {
           if (response.data) {
             this.filters.status = 'ACCEPTED'
             this.$refs.table.refresh()
-            window.toastr['success'](this.$tc('estimates.marked_as_rejected_message'))
+            window.toastr['success'](this.$tc('estimates.confirm_mark_as_accepted'))
           }
         }
       })
diff --git a/resources/assets/js/views/estimates/View.vue b/resources/assets/js/views/estimates/View.vue
index 69f7817e..f6370e37 100644
--- a/resources/assets/js/views/estimates/View.vue
+++ b/resources/assets/js/views/estimates/View.vue
@@ -5,6 +5,7 @@
       <div class="page-actions row">
         <div class="col-xs-2">
           <base-button
+            v-if="estimate.status !== 'SENT'"
             :loading="isRequestOnGoing"
             :disabled="isRequestOnGoing"
             :outline="true"
@@ -33,7 +34,7 @@
         </v-dropdown>
       </div>
     </div>
-    <div class="estimate-sidebar">
+    <div class="estimate-si debar">
       <base-loader v-if="isSearching" />
       <div v-else class="side-header">
         <base-input
@@ -144,6 +145,8 @@ export default {
         orderByField: null,
         searchText: null
       },
+      status: ['DRAFT', 'SENT', 'VIEWED', 'EXPIRED', 'ACCEPTED', 'REJECTED'],
+      isMarkAsSent: false,
       isRequestOnGoing: false,
       isSearching: false
     }
@@ -230,9 +233,9 @@ export default {
         dangerMode: true
       }).then(async (willMarkAsSent) => {
         if (willMarkAsSent) {
-          this.isRequestOnGoing = true
+          this.isMarkAsSent = true
           let response = await this.markAsSent({id: this.estimate.id})
-          this.isRequestOnGoing = false
+          this.isMarkAsSent = false
           if (response.data) {
             window.toastr['success'](this.$tc('estimates.mark_as_sent'))
           }
diff --git a/resources/assets/sass/components/vue-multi-select.scss b/resources/assets/sass/components/vue-multi-select.scss
index 034ce42f..15a4a0b7 100644
--- a/resources/assets/sass/components/vue-multi-select.scss
+++ b/resources/assets/sass/components/vue-multi-select.scss
@@ -274,6 +274,7 @@ fieldset[disabled] .multiselect {
     margin: 0;
     min-width: 100%;
     vertical-align: top;
+    padding-bottom: 70px;
 }
 .multiselect--above .multiselect__content-wrapper {
     bottom: 100%;

From a76286c402c74d8a1847e2ac34d2eb643d7c02ca Mon Sep 17 00:00:00 2001
From: bansarishukla <bansari.shukla1996@gmail.com>
Date: Fri, 15 Nov 2019 11:31:33 +0530
Subject: [PATCH 2/2] made some changes and removed changes of vue-multi-select

---
 resources/assets/js/plugins/en.js             |  4 +
 resources/assets/js/plugins/es.js             |  4 +
 resources/assets/js/plugins/fr.js             |  4 +
 .../assets/js/views/dashboard/Dashboard.vue   | 84 +++++++++++++------
 resources/assets/js/views/estimates/Index.vue |  4 +-
 resources/assets/js/views/estimates/View.vue  |  2 +-
 resources/assets/js/views/invoices/Index.vue  | 12 +--
 .../sass/components/vue-multi-select.scss     |  1 -
 8 files changed, 78 insertions(+), 37 deletions(-)

diff --git a/resources/assets/js/plugins/en.js b/resources/assets/js/plugins/en.js
index e82216ff..64b09749 100644
--- a/resources/assets/js/plugins/en.js
+++ b/resources/assets/js/plugins/en.js
@@ -233,6 +233,8 @@ export default {
     confirm_mark_as_accepted: 'This estimate will be marked as Accepted',
     confirm_mark_as_rejected: 'This estimate will be marked as Rejected',
     no_matching_estimates: 'There are no matching estimates!',
+    mark_as_sent_successfully: 'Estimate marked as sent successfully',
+    send_estimate_successfully: 'Estimate sent successfully',
     errors: {
       required: 'Field is required'
     },
@@ -323,6 +325,8 @@ export default {
     list_of_invoices: 'This section will contain the list of invoices.',
     select_invoice: 'Select Invoice',
     no_matching_invoices: 'There are no matching invoices!',
+    mark_as_sent_successfully: 'Invoice marked as sent successfully',
+    send_invoice_successfully: 'Invoice sent successfully',
     item: {
       title: 'Item Title',
       description: 'Description',
diff --git a/resources/assets/js/plugins/es.js b/resources/assets/js/plugins/es.js
index 69ca6255..84f539c7 100644
--- a/resources/assets/js/plugins/es.js
+++ b/resources/assets/js/plugins/es.js
@@ -237,6 +237,8 @@ export default {
     confirm_mark_as_sent: 'Esta estimación se marcará como enviada',
     confirm_mark_as_accepted: 'Esta estimación se marcará como Aceptada',
     confirm_mark_as_rejected: 'Esta estimación se marcará como Rechazada',
+    mark_as_sent_successfully: 'Estimación marcada como enviada correctamente',
+    send_estimate_successfully: 'Estimación enviada con éxito',
     errors: {
       required: 'Se requiere campo'
     },
@@ -326,6 +328,8 @@ export default {
     no_invoices: '¡Aún no hay facturas!',
     list_of_invoices: 'Esta sección contendrá la lista de facturas.',
     select_invoice: 'Seleccionar factura',
+    mark_as_sent_successfully: 'Factura marcada como enviada con éxito',
+    send_invoice_successfully: 'Factura enviada exitosamente',
     item: {
       title: 'Título del artículo',
       description: 'Descripción',
diff --git a/resources/assets/js/plugins/fr.js b/resources/assets/js/plugins/fr.js
index e55cc8fd..02b05495 100644
--- a/resources/assets/js/plugins/fr.js
+++ b/resources/assets/js/plugins/fr.js
@@ -237,6 +237,8 @@ export default {
     confirm_mark_as_sent: 'Cette estimation sera marquée comme envoyé',
     confirm_mark_as_accepted: 'Cette estimation sera marquée comme acceptée',
     confirm_mark_as_rejected: 'Cette estimation sera marquée comme Rejetée',
+    mark_as_sent_successfully: 'Estimation marquée comme envoyée avec succès',
+    send_estimate_successfully: 'Estimation envoyée avec succès',
     errors: {
       required: 'Champ requis'
     },
@@ -326,6 +328,8 @@ export default {
     no_invoices: 'Aucune facture pour le moment!',
     list_of_invoices: 'Cette section contiendra la liste des factures.',
     select_invoice: 'Sélectionnez facture',
+    mark_as_sent_successfully: 'Facture marquée comme envoyée avec succès',
+    send_invoice_successfully: 'Facture envoyée avec succès',
     item: {
       title: 'Titre de larticle',
       description: 'La description',
diff --git a/resources/assets/js/views/dashboard/Dashboard.vue b/resources/assets/js/views/dashboard/Dashboard.vue
index 59c1798b..568a62bf 100644
--- a/resources/assets/js/views/dashboard/Dashboard.vue
+++ b/resources/assets/js/views/dashboard/Dashboard.vue
@@ -396,7 +396,7 @@ export default {
       swal({
         title: this.$t('general.are_you_sure'),
         text: this.$tc('estimates.confirm_delete', 1),
-        icon: 'error',
+        icon: '/assets/icon/trash-solid.svg',
         buttons: true,
         dangerMode: true
       }).then(async (willDelete) => {
@@ -416,7 +416,7 @@ export default {
       swal({
         title: this.$t('general.are_you_sure'),
         text: this.$t('estimates.confirm_conversion'),
-        icon: 'error',
+        icon: '/assets/icon/envelope-solid.svg',
         buttons: true,
         dangerMode: true
       }).then(async (willDelete) => {
@@ -433,14 +433,24 @@ export default {
       })
     },
     async onMarkAsSent (id) {
-      const data = {
-        id: id
-      }
-      let response = await this.markAsSent(data)
-      this.$refs.table.refresh()
-      if (response.data) {
-        window.toastr['success'](this.$tc('estimates.mark_as_sent'))
-      }
+      swal({
+        title: this.$t('general.are_you_sure'),
+        text: this.$t('estimates.confirm_mark_as_sent'),
+        icon: '/assets/icon/check-circle-solid.svg',
+        buttons: true,
+        dangerMode: true
+      }).then(async (willMarkAsSent) => {
+        if (willMarkAsSent) {
+          const data = {
+            id: id
+          }
+          let response = await this.markAsSent(data)
+          this.$refs.table.refresh()
+          if (response.data) {
+            window.toastr['success'](this.$tc('estimates.mark_as_sent_successfully'))
+          }
+        }
+      })
     },
 
     async removeInvoice (id) {
@@ -448,7 +458,7 @@ export default {
       swal({
         title: this.$t('general.are_you_sure'),
         text: this.$tc('invoices.confirm_delete'),
-        icon: 'error',
+        icon: '/assets/icon/trash-solid.svg',
         buttons: true,
         dangerMode: true
       }).then(async (willDelete) => {
@@ -465,24 +475,44 @@ export default {
     },
 
     async sendInvoice (id) {
-      const data = {
-        id: id
-      }
-      let response = await this.sendEmail(data)
-      this.$refs.table.refresh()
-      if (response.data) {
-        window.toastr['success'](this.$tc('invoices.send_invoice'))
-      }
+      swal({
+        title: this.$t('general.are_you_sure'),
+        text: this.$t('invoices.confirm_send'),
+        icon: '/assets/icon/paper-plane-solid.svg',
+        buttons: true,
+        dangerMode: true
+      }).then(async (willSendInvoice) => {
+        if (willSendInvoice) {
+          const data = {
+            id: id
+          }
+          let response = await this.sendEmail(data)
+          this.$refs.table.refresh()
+          if (response.data) {
+            window.toastr['success'](this.$tc('invoices.send_invoice_successfully'))
+          }
+        }
+      })
     },
     async sentInvoice (id) {
-      const data = {
-        id: id
-      }
-      let response = await this.markAsSent(data)
-      this.$refs.table.refresh()
-      if (response.data) {
-        window.toastr['success'](this.$tc('invoices.mark_as_sent'))
-      }
+      swal({
+        title: this.$t('general.are_you_sure'),
+        text: this.$t('invoices.invoice_mark_as_sent'),
+        icon: '/assets/icon/check-circle-solid.svg',
+        buttons: true,
+        dangerMode: true
+      }).then(async (willMarkAsSend) => {
+        if (willMarkAsSend) {
+          const data = {
+            id: id
+          }
+          let response = await this.markAsSent(data)
+          this.$refs.table.refresh()
+          if (response.data) {
+            window.toastr['success'](this.$tc('invoices.mark_as_sent_successfully'))
+          }
+        }
+      })
     }
 
   }
diff --git a/resources/assets/js/views/estimates/Index.vue b/resources/assets/js/views/estimates/Index.vue
index be75f72b..6b3dfc52 100644
--- a/resources/assets/js/views/estimates/Index.vue
+++ b/resources/assets/js/views/estimates/Index.vue
@@ -570,7 +570,7 @@ export default {
           let response = await this.markAsSent(data)
           this.refreshTable()
           if (response.data) {
-            window.toastr['success'](this.$tc('estimates.mark_as_sent'))
+            window.toastr['success'](this.$tc('estimates.mark_as_sent_successfully'))
           }
         }
       })
@@ -590,7 +590,7 @@ export default {
           let response = await this.sendEmail(data)
           this.refreshTable()
           if (response.data) {
-            window.toastr['success'](this.$tc('estimates.mark_as_sent'))
+            window.toastr['success'](this.$tc('estimates.send_estimate_successfully'))
           }
         }
       })
diff --git a/resources/assets/js/views/estimates/View.vue b/resources/assets/js/views/estimates/View.vue
index f6370e37..1ab60302 100644
--- a/resources/assets/js/views/estimates/View.vue
+++ b/resources/assets/js/views/estimates/View.vue
@@ -237,7 +237,7 @@ export default {
           let response = await this.markAsSent({id: this.estimate.id})
           this.isMarkAsSent = false
           if (response.data) {
-            window.toastr['success'](this.$tc('estimates.mark_as_sent'))
+            window.toastr['success'](this.$tc('estimates.mark_as_sent_successfully'))
           }
         }
       })
diff --git a/resources/assets/js/views/invoices/Index.vue b/resources/assets/js/views/invoices/Index.vue
index 86504224..3466b470 100644
--- a/resources/assets/js/views/invoices/Index.vue
+++ b/resources/assets/js/views/invoices/Index.vue
@@ -390,15 +390,15 @@ export default {
         icon: '/assets/icon/paper-plane-solid.svg',
         buttons: true,
         dangerMode: true
-      }).then(async (Send_Invoice) => {
-        if (Send_Invoice) {
+      }).then(async (willSendInvoice) => {
+        if (willSendInvoice) {
           const data = {
             id: id
           }
           let response = await this.sendEmail(data)
           this.refreshTable()
           if (response.data) {
-            window.toastr['success'](this.$tc('invoices.send_invoice'))
+            window.toastr['success'](this.$tc('invoices.send_invoice_successfully'))
           }
         }
       })
@@ -410,15 +410,15 @@ export default {
         icon: '/assets/icon/check-circle-solid.svg',
         buttons: true,
         dangerMode: true
-      }).then(async (MarkAsSend_Invoice) => {
-        if (MarkAsSend_Invoice) {
+      }).then(async (willMarkAsSend) => {
+        if (willMarkAsSend) {
           const data = {
             id: id
           }
           let response = await this.markAsSent(data)
           this.refreshTable()
           if (response.data) {
-            window.toastr['success'](this.$tc('invoices.mark_as_sent'))
+            window.toastr['success'](this.$tc('invoices.mark_as_sent_successfully'))
           }
         }
       })
diff --git a/resources/assets/sass/components/vue-multi-select.scss b/resources/assets/sass/components/vue-multi-select.scss
index 15a4a0b7..034ce42f 100644
--- a/resources/assets/sass/components/vue-multi-select.scss
+++ b/resources/assets/sass/components/vue-multi-select.scss
@@ -274,7 +274,6 @@ fieldset[disabled] .multiselect {
     margin: 0;
     min-width: 100%;
     vertical-align: top;
-    padding-bottom: 70px;
 }
 .multiselect--above .multiselect__content-wrapper {
     bottom: 100%;