From 090c33f63cc1dd0769d7f8b8f0b362af8826c994 Mon Sep 17 00:00:00 2001
From: satyaprakash10 <satyaprakashvarma10@gmail.com>
Date: Thu, 14 Nov 2019 19:54:23 +0530
Subject: [PATCH 1/3] fix status action  in view invoice

---
 resources/assets/js/plugins/en.js             |  1 +
 .../js/store/modules/invoice/actions.js       |  1 +
 .../store/modules/invoice/mutation-types.js   |  1 +
 .../js/store/modules/invoice/mutations.js     |  6 +++
 resources/assets/js/views/invoices/View.vue   | 50 ++++++++++++++++---
 5 files changed, 51 insertions(+), 8 deletions(-)

diff --git a/resources/assets/js/plugins/en.js b/resources/assets/js/plugins/en.js
index 76e4f6eb..ea2900d4 100644
--- a/resources/assets/js/plugins/en.js
+++ b/resources/assets/js/plugins/en.js
@@ -308,6 +308,7 @@ export default {
     invoice_template: 'Invoice Template',
     template: 'Template',
     mark_as_sent: 'Mark as sent',
+    confirm_send_invoice: 'This invoice will be sent via email to the customer',
     invoice_mark_as_sent: 'This invoice will be marked as sent',
     confirm_send: 'This invoice will be sent via email to the customer',
     invoice_date: 'Invoice Date',
diff --git a/resources/assets/js/store/modules/invoice/actions.js b/resources/assets/js/store/modules/invoice/actions.js
index 64d167a0..4910fe63 100644
--- a/resources/assets/js/store/modules/invoice/actions.js
+++ b/resources/assets/js/store/modules/invoice/actions.js
@@ -47,6 +47,7 @@ export const fetchViewInvoice = ({ commit, dispatch, state }, id) => {
 export const sendEmail = ({ commit, dispatch, state }, data) => {
   return new Promise((resolve, reject) => {
     window.axios.post(`/api/invoices/send`, data).then((response) => {
+      commit(types.UPDATE_INVOICE_STATUS, {id: data.id, status: 'SENT'})
       resolve(response)
     }).catch((err) => {
       reject(err)
diff --git a/resources/assets/js/store/modules/invoice/mutation-types.js b/resources/assets/js/store/modules/invoice/mutation-types.js
index 9c7553dd..c92a4755 100644
--- a/resources/assets/js/store/modules/invoice/mutation-types.js
+++ b/resources/assets/js/store/modules/invoice/mutation-types.js
@@ -14,3 +14,4 @@ export const SELECT_CUSTOMER = 'SELECT_CUSTOMER'
 export const RESET_SELECTED_CUSTOMER = 'RESET_SELECTED_CUSTOMER'
 export const SET_SELECT_ALL_STATE = 'SET_SELECT_ALL_STATE'
 export const RESET_SELECTED_INVOICES = 'RESET_SELECTED_INVOICES'
+export const UPDATE_INVOICE_STATUS = 'UPDATE_INVOICE_STATUS'
diff --git a/resources/assets/js/store/modules/invoice/mutations.js b/resources/assets/js/store/modules/invoice/mutations.js
index b765f045..f8a5cad2 100644
--- a/resources/assets/js/store/modules/invoice/mutations.js
+++ b/resources/assets/js/store/modules/invoice/mutations.js
@@ -28,6 +28,12 @@ export default {
     state.invoices[pos] = data.invoice
   },
 
+  [types.UPDATE_INVOICE_STATUS] (state, data) {
+    let pos = state.invoices.findIndex(invoice => invoice.id === data.id)
+
+    state.invoices[pos].status = data.status
+  },
+
   [types.RESET_SELECTED_INVOICES] (state, data) {
     state.selectedInvoices = []
     state.selectAllField = false
diff --git a/resources/assets/js/views/invoices/View.vue b/resources/assets/js/views/invoices/View.vue
index fd1ce809..4a7359fd 100644
--- a/resources/assets/js/views/invoices/View.vue
+++ b/resources/assets/js/views/invoices/View.vue
@@ -5,16 +5,28 @@
       <div class="page-actions row">
         <div class="col-xs-2 mr-3">
           <base-button
-            :loading="isRequestOnGoing"
-            :disabled="isRequestOnGoing"
+            v-if="invoice.status === 'DRAFT'"
+            :loading="isMarkingAsSent"
+            :disabled="isMarkingAsSent"
             :outline="true"
             color="theme"
             @click="onMarkAsSent"
           >
             {{ $t('invoices.mark_as_sent') }}
           </base-button>
+      
         </div>
-        <router-link :to="`/admin/payments/${$route.params.id}/create`">
+        <base-button
+          v-if="invoice.status === 'DRAFT'"
+          :loading="isSendingEmail"
+          :disabled="isSendingEmail"
+          :outline="true"
+          color="theme"
+          @click="onSendInvoice"
+        >
+        {{ $t('invoices.send_invoice') }}
+      </base-button>
+        <router-link v-if="invoice.status === 'SENT'" :to="`/admin/payments/${$route.params.id}/create`">
           <base-button
             color="theme"
           >
@@ -152,7 +164,9 @@ export default {
         searchText: null
       },
       isRequestOnGoing: false,
-      isSearching: false
+      isSearching: false,
+      isSendingEmail: false,
+      isMarkingAsSent: false
     }
   },
   computed: {
@@ -179,6 +193,7 @@ export default {
       'getRecord',
       'searchInvoice',
       'markAsSent',
+      'sendEmail',
       'deleteInvoice',
       'selectInvoice'
     ]),
@@ -235,16 +250,35 @@ export default {
         icon: '/assets/icon/check-circle-solid.svg',
         buttons: true,
         dangerMode: true
-      }).then(async (MarkAsSend_Invoice) => {
-        if (MarkAsSend_Invoice) {
-          this.isRequestOnGoing = true
+      }).then(async (willMarkAsSent) => {
+        if (willMarkAsSent) {
+          this.isMarkingAsSent = true
           let response = await this.markAsSent({id: this.invoice.id})
-          this.isRequestOnGoing = false
+          this.isMarkingAsSent = false
           if (response.data) {
             window.toastr['success'](this.$tc('invoices.marked_as_sent_message'))
           }
         }
       })
+    },
+     async onSendInvoice () {
+       swal({
+        title: this.$tc('general.are_you_sure'),
+        text: this.$tc('invoices.confirm_send_invoice'),
+        icon: '/assets/icon/paper-plane-solid.svg',
+        buttons: true,
+        dangerMode: true
+      }).then(async (willSendInvoice) => {
+        if (willSendInvoice) {
+          this.isSendingEmail = true
+          let response = await this.sendEmail({id: this.invoice.id})
+          this.fetchInvoice()
+          this.isSendingEmail = false
+          if (response.data) {
+            window.toastr['success'](this.$tc('invoices.confirm_send_invoice'))
+          }
+        }
+      })
     },
     async removeInvoice (id) {
       this.selectInvoice([parseInt(id)])

From adbc04846c49a8ccf2e2500fdb4dd4b7c231b427 Mon Sep 17 00:00:00 2001
From: yogesh_gohil <yogeshgohil1611@gmail.com>
Date: Fri, 15 Nov 2019 12:55:35 +0530
Subject: [PATCH 2/3] fix invoice getter

---
 .../js/store/modules/invoice/actions.js       |  2 +-
 .../js/store/modules/invoice/getters.js       |  4 ++
 resources/assets/js/views/invoices/View.vue   | 37 +++++++------------
 3 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/resources/assets/js/store/modules/invoice/actions.js b/resources/assets/js/store/modules/invoice/actions.js
index 4910fe63..47d4dd77 100644
--- a/resources/assets/js/store/modules/invoice/actions.js
+++ b/resources/assets/js/store/modules/invoice/actions.js
@@ -122,7 +122,7 @@ export const updateInvoice = ({ commit, dispatch, state }, data) => {
 export const markAsSent = ({ commit, dispatch, state }, data) => {
   return new Promise((resolve, reject) => {
     window.axios.post(`/api/invoices/mark-as-sent`, data).then((response) => {
-      // commit(types.UPDATE_INVOICE, response.data)
+      commit(types.UPDATE_INVOICE_STATUS, {id: data.id, status: 'SENT'})
       resolve(response)
     }).catch((err) => {
       reject(err)
diff --git a/resources/assets/js/store/modules/invoice/getters.js b/resources/assets/js/store/modules/invoice/getters.js
index 2e57c1de..fa2b598e 100644
--- a/resources/assets/js/store/modules/invoice/getters.js
+++ b/resources/assets/js/store/modules/invoice/getters.js
@@ -4,3 +4,7 @@ export const getTemplateId = (state) => state.invoiceTemplateId
 export const selectedInvoices = (state) => state.selectedInvoices
 export const totalInvoices = (state) => state.totalInvoices
 export const selectedCustomer = (state) => state.selectedCustomer
+export const getInvoice = (state) => (id) => {
+  let invId = parseInt(id)
+  return state.invoices.find(invoice => invoice.id === invId)
+}
diff --git a/resources/assets/js/views/invoices/View.vue b/resources/assets/js/views/invoices/View.vue
index 4a7359fd..ee4db7b1 100644
--- a/resources/assets/js/views/invoices/View.vue
+++ b/resources/assets/js/views/invoices/View.vue
@@ -14,7 +14,6 @@
           >
             {{ $t('invoices.mark_as_sent') }}
           </base-button>
-      
         </div>
         <base-button
           v-if="invoice.status === 'DRAFT'"
@@ -24,8 +23,8 @@
           color="theme"
           @click="onSendInvoice"
         >
-        {{ $t('invoices.send_invoice') }}
-      </base-button>
+          {{ $t('invoices.send_invoice') }}
+        </base-button>
         <router-link v-if="invoice.status === 'SENT'" :to="`/admin/payments/${$route.params.id}/create`">
           <base-button
             color="theme"
@@ -147,7 +146,7 @@
   </div>
 </template>
 <script>
-import { mapActions } from 'vuex'
+import { mapActions, mapGetters } from 'vuex'
 const _ = require('lodash')
 export default {
   data () {
@@ -155,9 +154,7 @@ export default {
       id: null,
       count: null,
       invoices: [],
-      invoice: null,
       currency: null,
-      shareableLink: null,
       searchData: {
         orderBy: null,
         orderByField: null,
@@ -170,26 +167,31 @@ export default {
     }
   },
   computed: {
+    invoice () {
+      return this.$store.getters['invoice/getInvoice'](this.$route.params.id)
+    },
     getOrderBy () {
       if (this.searchData.orderBy === 'asc' || this.searchData.orderBy == null) {
         return true
       }
       return false
+    },
+    shareableLink () {
+      return `/invoices/pdf/${this.invoice.unique_hash}`
     }
   },
   watch: {
     '$route.params.id' (val) {
-      this.fetchInvoice()
+      this.invoice()
     }
   },
-  mounted () {
+  created () {
     this.loadInvoices()
     this.onSearched = _.debounce(this.onSearched, 500)
   },
   methods: {
     ...mapActions('invoice', [
       'fetchInvoices',
-      'fetchViewInvoice',
       'getRecord',
       'searchInvoice',
       'markAsSent',
@@ -202,7 +204,6 @@ export default {
       if (response.data) {
         this.invoices = response.data.invoices.data
       }
-      this.fetchInvoice()
     },
     async onSearched () {
       let data = ''
@@ -224,15 +225,6 @@ export default {
         this.invoices = response.data.invoices.data
       }
     },
-    async fetchInvoice () {
-      let invoice = await this.fetchViewInvoice(this.$route.params.id)
-
-      if (invoice.data) {
-        this.invoice = invoice.data.invoice
-        this.shareableLink = invoice.data.shareable_link
-        this.currency = invoice.data.invoice.user.currency
-      }
-    },
     sortData () {
       if (this.searchData.orderBy === 'asc') {
         this.searchData.orderBy = 'desc'
@@ -244,7 +236,7 @@ export default {
       return true
     },
     async onMarkAsSent () {
-       swal({
+      swal({
         title: this.$t('general.are_you_sure'),
         text: this.$t('invoices.invoice_mark_as_sent'),
         icon: '/assets/icon/check-circle-solid.svg',
@@ -261,8 +253,8 @@ export default {
         }
       })
     },
-     async onSendInvoice () {
-       swal({
+    async onSendInvoice () {
+      swal({
         title: this.$tc('general.are_you_sure'),
         text: this.$tc('invoices.confirm_send_invoice'),
         icon: '/assets/icon/paper-plane-solid.svg',
@@ -272,7 +264,6 @@ export default {
         if (willSendInvoice) {
           this.isSendingEmail = true
           let response = await this.sendEmail({id: this.invoice.id})
-          this.fetchInvoice()
           this.isSendingEmail = false
           if (response.data) {
             window.toastr['success'](this.$tc('invoices.confirm_send_invoice'))

From 09c03af9f8c2b3831ac76101a834521125597c7a Mon Sep 17 00:00:00 2001
From: yogesh_gohil <yogeshgohil1611@gmail.com>
Date: Sat, 16 Nov 2019 14:10:27 +0530
Subject: [PATCH 3/3] remove unwatnted code

---
 resources/assets/js/views/invoices/View.vue | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/resources/assets/js/views/invoices/View.vue b/resources/assets/js/views/invoices/View.vue
index ee4db7b1..64ac6284 100644
--- a/resources/assets/js/views/invoices/View.vue
+++ b/resources/assets/js/views/invoices/View.vue
@@ -180,11 +180,6 @@ export default {
       return `/invoices/pdf/${this.invoice.unique_hash}`
     }
   },
-  watch: {
-    '$route.params.id' (val) {
-      this.invoice()
-    }
-  },
   created () {
     this.loadInvoices()
     this.onSearched = _.debounce(this.onSearched, 500)