Merge branch 'master'

crater-invoice-inc · Dec 1, 2021 · deaab66 · deaab66
2 parents 4d14b15 + aa65532
commit deaab66
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/resources/scripts/components/dropdowns/RecurringInvoiceIndexDropdown.vue b/resources/scripts/components/dropdowns/RecurringInvoiceIndexDropdown.vue
@@ -109,7 +109,7 @@ async function removeMultipleRecurringInvoices(id = null) {
           .deleteMultipleRecurringInvoices(id)
           .then((res) => {
             if (res.data.success) {
-              // refreshTable()
+              props.table && props.table.refresh()
               recurringInvoiceStore.$patch((state) => {
                 state.selectedRecurringInvoices = []
                 state.selectAllField = false

diff --git a/resources/scripts/stores/estimate.js b/resources/scripts/stores/estimate.js
@@ -278,12 +278,19 @@ export const useEstimateStore = (useWindow = false) => {
           axios
             .post(`/api/v1/estimates/${data.id}/status`, data)
             .then((response) => {
-              const notificationStore = useNotificationStore()
+              let pos = this.estimates.findIndex(
+                (estimate) => estimate.id === data.id
+              )
+              if (this.estimates[pos]) {
+                this.estimates[pos].status = 'ACCEPTED'
 
-              notificationStore.showNotification({
-                type: 'success',
-                message: global.t('estimates.marked_as_accepted_message'),
-              })
+                const notificationStore = useNotificationStore()
+
+                notificationStore.showNotification({
+                  type: 'success',
+                  message: global.t('estimates.marked_as_accepted_message'),
+                })
+              }
               resolve(response)
             })
             .catch((err) => {