Merge branch 'dashboard-refactor' into 'master'

add separate actions for dashboard tables

See merge request mohit.panjvani/crater-web!45

resources/assets/js/views/dashboard/Dashboard.vue

@@ -168,12 +168,12 @@
           >
             <table-column :label="$t('dashboard.recent_invoices_card.due_on')" show="formattedDueDate" />
             <table-column :label="$t('dashboard.recent_invoices_card.customer')" show="user.name" />
-                 <table-column
+            <table-column
               :label="$t('invoices.status')"
               sort-as="status"
             >
               <template slot-scope="row" >
-                <span> {{ $t('invoices.status') }}</span> 
+                <span> {{ $t('invoices.status') }}</span>
                 <span :class="'inv-status-'+row.status.toLowerCase()">{{ (row.status != 'PARTIALLY_PAID')? row.status : row.status.replace('_', ' ') }}</span>
               </template>
             </table-column>
@@ -190,7 +190,7 @@
             >
               <template slot-scope="row">
                 <v-dropdown>
-                  <a slot="activator" href="#">
+                  <a slot="activator" href="#/">
                     <dot-icon />
                   </a>
                   <v-dropdown-item>
@@ -203,14 +203,14 @@
                       {{ $t('invoices.view') }}
                     </router-link>
                   </v-dropdown-item>
-                  <v-dropdown-item>
-                    <a class="dropdown-item" href="#" @click="sendInvoice(row.id)" >
+                  <v-dropdown-item v-if="row.status == 'DRAFT'">
+                    <a class="dropdown-item" href="#/" @click="sendInvoice(row.id)" >
                       <font-awesome-icon icon="envelope" class="dropdown-item-icon" />
                       {{ $t('invoices.send_invoice') }}
                     </a>
                   </v-dropdown-item>
                   <v-dropdown-item v-if="row.status === 'DRAFT'">
-                    <a class="dropdown-item" href="#" @click="sentInvoice(row.id)">
+                    <a class="dropdown-item" href="#/" @click="sentInvoice(row.id)">
                       <font-awesome-icon icon="check-circle" class="dropdown-item-icon" />
                       {{ $t('invoices.mark_as_sent') }}
                     </a>
@@ -272,7 +272,7 @@
             >
               <template slot-scope="row">
                 <v-dropdown>
-                  <a slot="activator" href="#">
+                  <a slot="activator" href="#/">
                     <dot-icon />
                   </a>
                   <v-dropdown-item>
@@ -294,35 +294,35 @@
                     </router-link>
                   </v-dropdown-item>
                   <v-dropdown-item>
-                    <a class="dropdown-item" href="#" @click="convertInToinvoice(row.id)">
-                      <font-awesome-icon icon="envelope" class="dropdown-item-icon" />
+                    <a class="dropdown-item" href="#/" @click="convertInToinvoice(row.id)">
+                      <font-awesome-icon icon="file-alt" class="dropdown-item-icon" />
                       {{ $t('estimates.convert_to_invoice') }}
                     </a>
                   </v-dropdown-item>
                   <v-dropdown-item v-if="row.status === 'DRAFT'">
-                    <a class="dropdown-item" href="#" @click.self="onMarkAsSent(row.id)">
+                    <a class="dropdown-item" href="#/" @click.self="onMarkAsSent(row.id)">
                       <font-awesome-icon icon="check-circle" class="dropdown-item-icon" />
                       {{ $t('estimates.mark_as_sent') }}
                     </a>
                   </v-dropdown-item>
                   <v-dropdown-item v-if="row.status !== 'SENT'">
-                    <a class="dropdown-item" href="#" @click.self="sendEstimate(row.id)">
+                    <a class="dropdown-item" href="#/" @click.self="sendEstimate(row.id)">
                       <font-awesome-icon icon="paper-plane" class="dropdown-item-icon" />
                       {{ $t('estimates.send_estimate') }}
                     </a>
                   </v-dropdown-item>
                   <v-dropdown-item v-if="row.status !== 'ACCEPTED'">
-                    <a class="dropdown-item" href="#" @click.self="onMarkAsAccepted(row.id)">
+                    <a class="dropdown-item" href="#/" @click.self="onMarkAsAccepted(row.id)">
                       <font-awesome-icon icon="check-circle" class="dropdown-item-icon" />
                       {{ $t('estimates.mark_as_accepted') }}
                     </a>
                   </v-dropdown-item>
-              <v-dropdown-item v-if="row.status !== 'REJECTED'">
-                <a class="dropdown-item" href="#" @click.self="onMarkAsRejected(row.id)">
-                  <font-awesome-icon icon="times-circle" class="dropdown-item-icon" />
-                  {{ $t('estimates.mark_as_rejected') }}
-                </a>
-              </v-dropdown-item>
+                  <v-dropdown-item v-if="row.status !== 'REJECTED'">
+                    <a class="dropdown-item" href="#/" @click.self="onMarkAsRejected(row.id)">
+                      <font-awesome-icon icon="times-circle" class="dropdown-item-icon" />
+                      {{ $t('estimates.mark_as_rejected') }}
+                    </a>
+                  </v-dropdown-item>
                 </v-dropdown>
               </template>
             </table-column>
@@ -404,17 +404,23 @@ export default {
   methods: {
     ...mapActions('dashboard', [
       'getChart',
-      'loadData',
+      'loadData'
+    ]),
+    ...mapActions('invoice', [
       'deleteInvoice',
       'sendEmail',
-      'markAsSent',
-      'sendEstimateEmail',
+      'markAsSent'
+    ]),
+    ...mapActions('estimate', [
       'deleteEstimate',
       'markAsAccepted',
       'markAsRejected',
-      'markEstimateAsSent',
       'convertToInvoice'
     ]),
+    ...mapActions('estimate', {
+      'sendEstimateEmail': 'sendEmail',
+      'markEstimateAsSent': 'markAsSent'
+    }),
 
     async loadChart () {
       await this.$store.dispatch('dashboard/getChart')
@@ -459,7 +465,7 @@ export default {
       swal({
         title: this.$t('general.are_you_sure'),
         text: this.$t('estimates.confirm_conversion'),
-        icon: '/assets/icon/envelope-solid.svg',
+        icon: '/assets/icon/file-alt-solid.svg',
         buttons: true,
         dangerMode: true
       }).then(async (willDelete) => {
@@ -532,9 +538,15 @@ export default {
           }
           let response = await this.sendEmail(data)
           this.refreshInvTable()
-          if (response.data) {
+          if (response.data.success) {
             window.toastr['success'](this.$tc('invoices.send_invoice_successfully'))
+            return true
           }
+          if (response.data.error === 'user_email_does_not_exist') {
+            window.toastr['error'](this.$tc('invoices.user_email_does_not_exist'))
+            return false
+          }
+          window.toastr['error'](this.$tc('invoices.something_went_wrong'))
         }
       })
     },
@@ -603,7 +615,7 @@ export default {
         }
       })
     },
-    
+
     async sendEstimate (id) {
       swal({
         title: this.$t('general.are_you_sure'),
@@ -618,9 +630,15 @@ export default {
           }
           let response = await this.sendEstimateEmail(data)
           this.refreshEstTable()
-          if (response.data) {
+          if (response.data.success) {
             window.toastr['success'](this.$tc('estimates.send_estimate_successfully'))
+            return true
           }
+          if (response.data.error === 'user_email_does_not_exist') {
+            window.toastr['success'](this.$tc('estimates.user_email_does_not_exist'))
+            return true
+          }
+          window.toastr['error'](this.$tc('estimates.something_went_wrong'))
         }
       })
     }

resources/assets/js/views/estimates/Index.vue

@@ -245,31 +245,31 @@
                 </router-link>
               </v-dropdown-item>
               <v-dropdown-item>
-                <a class="dropdown-item" href="#" @click="convertInToinvoice(row.id)">
-                  <font-awesome-icon icon="envelope" class="dropdown-item-icon" />
+                <a class="dropdown-item" href="#/" @click="convertInToinvoice(row.id)">
+                  <font-awesome-icon icon="file-alt" class="dropdown-item-icon" />
                   {{ $t('estimates.convert_to_invoice') }}
                 </a>
               </v-dropdown-item>
               <v-dropdown-item v-if="row.status !== 'SENT'">
-                <a class="dropdown-item" href="#" @click.self="onMarkAsSent(row.id)">
+                <a class="dropdown-item" href="#/" @click.self="onMarkAsSent(row.id)">
                   <font-awesome-icon icon="check-circle" class="dropdown-item-icon" />
                   {{ $t('estimates.mark_as_sent') }}
                 </a>
               </v-dropdown-item>
               <v-dropdown-item v-if="row.status !== 'SENT'">
-                <a class="dropdown-item" href="#" @click.self="sendEstimate(row.id)">
+                <a class="dropdown-item" href="#/" @click.self="sendEstimate(row.id)">
                   <font-awesome-icon icon="paper-plane" class="dropdown-item-icon" />
                   {{ $t('estimates.send_estimate') }}
                 </a>
               </v-dropdown-item>
               <v-dropdown-item v-if="row.status !== 'ACCEPTED'">
-                <a class="dropdown-item" href="#" @click.self="onMarkAsAccepted(row.id)">
+                <a class="dropdown-item" href="#/" @click.self="onMarkAsAccepted(row.id)">
                   <font-awesome-icon icon="check-circle" class="dropdown-item-icon" />
                   {{ $t('estimates.mark_as_accepted') }}
                 </a>
               </v-dropdown-item>
               <v-dropdown-item v-if="row.status !== 'REJECTED'">
-                <a class="dropdown-item" href="#" @click.self="onMarkAsRejected(row.id)">
+                <a class="dropdown-item" href="#/" @click.self="onMarkAsRejected(row.id)">
                   <font-awesome-icon icon="times-circle" class="dropdown-item-icon" />
                   {{ $t('estimates.mark_as_rejected') }}
                 </a>
@@ -424,7 +424,7 @@ export default {
           let response = await this.markAsAccepted(data)
           this.refreshTable()
           if (response.data) {
-            this.filters.status = 'ACCEPTED'
+            this.filters.status = ''
             this.$refs.table.refresh()
             window.toastr['success'](this.$tc('estimates.marked_as_accepted_message'))
           }
@@ -446,7 +446,7 @@ export default {
           let response = await this.markAsRejected(data)
           this.refreshTable()
           if (response.data) {
-            this.filters.status = 'REJECTED'
+            this.filters.status = ''
             this.$refs.table.refresh()
             window.toastr['success'](this.$tc('estimates.marked_as_rejected_message'))
           }
@@ -512,7 +512,7 @@ export default {
       swal({
         title: this.$t('general.are_you_sure'),
         text: this.$t('estimates.confirm_conversion'),
-        icon: '/assets/icon/envelope-solid.svg',
+        icon: '/assets/icon/file-alt-solid.svg',
         buttons: true,
         dangerMode: true
       }).then(async (willConvertInToinvoice) => {
@@ -590,9 +590,15 @@ export default {
           }
           let response = await this.sendEmail(data)
           this.refreshTable()
-          if (response.data) {
+          if (response.data.success) {
             window.toastr['success'](this.$tc('estimates.send_estimate_successfully'))
+            return true
           }
+          if (response.data.error === 'user_email_does_not_exist') {
+            window.toastr['success'](this.$tc('estimates.user_email_does_not_exist'))
+            return true
+          }
+          window.toastr['error'](this.$tc('estimates.something_went_wrong'))
         }
       })
     }

resources/assets/js/views/estimates/View.vue

@@ -260,9 +260,15 @@ export default {
           this.isSendingEmail = true
           let response = await this.sendEmail({id: this.estimate.id})
           this.isSendingEmail = false
-          if (response.data) {
+          if (response.data.success) {
             window.toastr['success'](this.$tc('estimates.send_estimate_successfully'))
+            return true
           }
+          if (response.data.error === 'user_email_does_not_exist') {
+            window.toastr['success'](this.$tc('estimates.user_email_does_not_exist'))
+            return true
+          }
+          window.toastr['error'](this.$tc('estimates.something_went_wrong'))
         }
       })
     },

resources/assets/js/views/invoices/Index.vue

@@ -248,13 +248,13 @@
                 </router-link>
               </v-dropdown-item>
               <v-dropdown-item v-if="row.status == 'DRAFT'">
-                <a class="dropdown-item" href="#" @click="sendInvoice(row.id)" >
+                <a class="dropdown-item" href="#/" @click="sendInvoice(row.id)" >
                   <font-awesome-icon icon="paper-plane" class="dropdown-item-icon" />
                   {{ $t('invoices.send_invoice') }}
                 </a>
               </v-dropdown-item>
               <v-dropdown-item v-if="row.status == 'DRAFT'">
-                <a class="dropdown-item" href="#" @click="markInvoiceAsSent(row.id)">
+                <a class="dropdown-item" href="#/" @click="markInvoiceAsSent(row.id)">
                   <font-awesome-icon icon="check-circle" class="dropdown-item-icon" />
                   {{ $t('invoices.mark_as_sent') }}
                 </a>
@@ -397,9 +397,15 @@ export default {
           }
           let response = await this.sendEmail(data)
           this.refreshTable()
-          if (response.data) {
+          if (response.data.success) {
             window.toastr['success'](this.$tc('invoices.send_invoice_successfully'))
+            return true
           }
+          if (response.data.error === 'user_email_does_not_exist') {
+            window.toastr['error'](this.$tc('invoices.user_email_does_not_exist'))
+            return false
+          }
+          window.toastr['error'](this.$tc('invoices.something_went_wrong'))
         }
       })
     },
@@ -505,6 +511,7 @@ export default {
 
           if (res.data.success) {
             window.toastr['success'](this.$tc('invoices.deleted_message'))
+            this.$refs.table.refresh()
             return true
           }
 

resources/assets/js/views/invoices/View.vue

@@ -260,9 +260,15 @@ export default {
           this.isSendingEmail = true
           let response = await this.sendEmail({id: this.invoice.id})
           this.isSendingEmail = false
-          if (response.data) {
-            window.toastr['success'](this.$tc('invoices.confirm_send_invoice'))
+          if (response.data.success) {
+            window.toastr['success'](this.$tc('invoices.send_invoice_successfully'))
+            return true
           }
+          if (response.data.error === 'user_email_does_not_exist') {
+            window.toastr['error'](this.$tc('invoices.user_email_does_not_exist'))
+            return false
+          }
+          window.toastr['error'](this.$tc('invoices.something_went_wrong'))
         }
       })
     },

resources/assets/js/views/payments/Create.vue

@@ -166,7 +166,7 @@ export default {
         user_id: null,
         payment_number: null,
         payment_date: null,
-        amount: 100,
+        amount: 0,
         payment_mode: null,
         invoice_id: null,
         notes: null