Merge branch 'fix-send-invoice-issue' into 'master'

fix send invoices and payments issues See merge request mohit.panjvani/crater-web!1443
crater-invoice-inc · Feb 17, 2022 · 6529fa1 · 6529fa1
2 parents eef74fd + 7170fb0
commit 6529fa1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/resources/scripts/admin/components/modal-components/SendInvoiceModal.vue b/resources/scripts/admin/components/modal-components/SendInvoiceModal.vue
@@ -260,6 +260,8 @@ async function submitForm() {
 
     const response = await invoiceStore.sendInvoice(invoiceMailForm)
 
+    isLoading.value = false
+
     if (response.data.success) {
       closeSendInvoiceModal()
       return true

diff --git a/resources/scripts/admin/components/modal-components/SendPaymentModal.vue b/resources/scripts/admin/components/modal-components/SendPaymentModal.vue
@@ -257,6 +257,8 @@ async function sendPaymentData() {
 
     const response = await paymentStore.sendEmail(paymentMailForm)
 
+    isLoading.value = false
+
     if (response.data.success) {
       closeSendPaymentModal()
       return true

diff --git a/resources/scripts/admin/stores/payment.js b/resources/scripts/admin/stores/payment.js
@@ -93,7 +93,6 @@ export const usePaymentStore = (useWindow = false) => {
           })
       },
 
-
       fetchPayments(params) {
         return new Promise((resolve, reject) => {
           axios
@@ -289,6 +288,11 @@ export const usePaymentStore = (useWindow = false) => {
           axios
             .post(`/api/v1/payments/${data.id}/send`, data)
             .then((response) => {
+              const notificationStore = useNotificationStore()
+              notificationStore.showNotification({
+                type: 'success',
+                message: global.t('payments.send_payment_successfully'),
+              })
               resolve(response)
             })
             .catch((err) => {