Merge branch 'master' of https://gitlab.com/mohit.panjvani/crater-web into fix-view-status

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'))
+          }
+        }
+      })
     }
 
   }

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'))
           }
         }
       })
@@ -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'))
           }
         }
       })

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,11 +233,11 @@ 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'))
+            window.toastr['success'](this.$tc('estimates.mark_as_sent_successfully'))
           }
         }
       })

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'))
           }
         }
       })