TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-28 04:01:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rec-invoice' into 'master'

Browse Source 
fix recurring invoice view page table

See merge request mohit.panjvani/crater-web!1321
This commit is contained in:
Mohit Panjwani
2021-12-06 12:05:21 +00:00
parent 74830e49f1 2b0477d576
commit 7cf099f00e
5 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/scripts/components/dropdowns/InvoiceIndexDropdown.vue
View File

@ -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

5
resources/scripts/stores/recurring-invoice.js
View File

@ -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() {

10
resources/scripts/views/recurring-invoices/create/RecurringInvoiceCreateBasicFields.vue
View File

@ -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
}
}
}
)

2
resources/scripts/views/recurring-invoices/partials/Invoices.vue
View File

@ -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()

2
resources/scripts/views/recurring-invoices/partials/RecurringInvoiceInfo.vue
View File

@ -81,7 +81,7 @@ let isLoading = computed(() => {
watch(
route,
() => {
if (route.params.id) {
if (route.params.id && route.name === 'recurring-invoices.view') {
loadRecurringInvoice()
}
},