From 2b0477d57669acde2e38ac0a6510302fa3d9cdab Mon Sep 17 00:00:00 2001
From: yogesh_gohil <yogeshgohil1611@gmail.com>
Date: Mon, 6 Dec 2021 16:11:24 +0530
Subject: [PATCH] fix recurring invoice view page table

---
 .../components/dropdowns/InvoiceIndexDropdown.vue      |  2 +-
 resources/scripts/stores/recurring-invoice.js          |  5 ++++-
 .../create/RecurringInvoiceCreateBasicFields.vue       | 10 ++++++----
 .../views/recurring-invoices/partials/Invoices.vue     |  2 ++
 .../partials/RecurringInvoiceInfo.vue                  |  2 +-
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/resources/scripts/components/dropdowns/InvoiceIndexDropdown.vue b/resources/scripts/components/dropdowns/InvoiceIndexDropdown.vue
index 9d6d7fd8..28744cbe 100644
--- a/resources/scripts/components/dropdowns/InvoiceIndexDropdown.vue
+++ b/resources/scripts/components/dropdowns/InvoiceIndexDropdown.vue
@@ -36,7 +36,7 @@
         route.name !== 'invoices.view' &&
         userStore.hasAbilities(abilities.VIEW_INVOICE)
       "
-      :to="`invoices/${row.id}/view`"
+      :to="`/admin/invoices/${row.id}/view`"
     >
       <BaseDropdownItem>
         <BaseIcon
diff --git a/resources/scripts/stores/recurring-invoice.js b/resources/scripts/stores/recurring-invoice.js
index 448e90d2..16cb9a7a 100644
--- a/resources/scripts/stores/recurring-invoice.js
+++ b/resources/scripts/stores/recurring-invoice.js
@@ -399,11 +399,14 @@ export const useRecurringInvoiceStore = (useWindow = false) => {
       },
 
       setSelectedFrequency() {
-        this.newRecurringInvoice.selectedFrequency = this.frequencies.find(
+        let data = this.frequencies.find(
           (frequency) => {
             return frequency.value === this.newRecurringInvoice.frequency
           }
         )
+        data ? this.newRecurringInvoice.selectedFrequency = data
+          : this.newRecurringInvoice.selectedFrequency = { label: 'Custom', value: 'CUSTOM' }
+
       },
 
       resetSelectedNote() {
diff --git a/resources/scripts/views/recurring-invoices/create/RecurringInvoiceCreateBasicFields.vue b/resources/scripts/views/recurring-invoices/create/RecurringInvoiceCreateBasicFields.vue
index f9fafc7e..2fe7bae8 100644
--- a/resources/scripts/views/recurring-invoices/create/RecurringInvoiceCreateBasicFields.vue
+++ b/resources/scripts/views/recurring-invoices/create/RecurringInvoiceCreateBasicFields.vue
@@ -235,10 +235,12 @@ const getStatusOptions = computed(() => {
 watch(
   () => recurringInvoiceStore.newRecurringInvoice.selectedFrequency,
   (newValue) => {
-    if (newValue && newValue.value !== 'CUSTOM') {
-      recurringInvoiceStore.newRecurringInvoice.frequency = newValue.value
-    } else {
-      recurringInvoiceStore.newRecurringInvoice.frequency = null
+    if (!recurringInvoiceStore.isFetchingInitialSettings) {
+      if (newValue && newValue.value !== 'CUSTOM') {
+        recurringInvoiceStore.newRecurringInvoice.frequency = newValue.value
+      } else {
+        recurringInvoiceStore.newRecurringInvoice.frequency = null
+      }
     }
   }
 )
diff --git a/resources/scripts/views/recurring-invoices/partials/Invoices.vue b/resources/scripts/views/recurring-invoices/partials/Invoices.vue
index 8b6004ef..4ab18b67 100644
--- a/resources/scripts/views/recurring-invoices/partials/Invoices.vue
+++ b/resources/scripts/views/recurring-invoices/partials/Invoices.vue
@@ -1,4 +1,5 @@
 <template>
+  <SendInvoiceModal />
   <div class="relative table-container">
     <BaseTable
       ref="table"
@@ -49,6 +50,7 @@ import { useUserStore } from '@/scripts/stores/user'
 import { useRecurringInvoiceStore } from '@/scripts/stores/recurring-invoice'
 import abilities from '@/scripts/stub/abilities'
 import InvoiceDropdown from '@/scripts/components/dropdowns/InvoiceIndexDropdown.vue'
+import SendInvoiceModal from '@/scripts/components/modal-components/SendInvoiceModal.vue'
 
 const recurringInvoiceStore = useRecurringInvoiceStore()
 
diff --git a/resources/scripts/views/recurring-invoices/partials/RecurringInvoiceInfo.vue b/resources/scripts/views/recurring-invoices/partials/RecurringInvoiceInfo.vue
index 4170995a..29862f78 100644
--- a/resources/scripts/views/recurring-invoices/partials/RecurringInvoiceInfo.vue
+++ b/resources/scripts/views/recurring-invoices/partials/RecurringInvoiceInfo.vue
@@ -81,7 +81,7 @@ let isLoading = computed(() => {
 watch(
   route,
   () => {
-    if (route.params.id) {
+    if (route.params.id && route.name === 'recurring-invoices.view') {
       loadRecurringInvoice()
     }
   },