QT/InvoiceShelf
1
0
Fork 0
mirror of https://github.com/InvoiceShelf/InvoiceShelf.git synced 2026-04-17 10:14:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix default template not pre-selected on document create

Browse Source 
Read default_invoice_template and default_estimate_template from
useUserStore().currentUserSettings instead of relying on a parameter
that was never passed from the create views.
This commit is contained in:
Darko Gjorgjijoski
2026-04-06 22:56:24 +02:00
parent b0b7d40c73
commit b07a252523
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
resources/scripts-v2/features/company/estimates/store.ts
View File

@@ -1,6 +1,7 @@
import { defineStore } from 'pinia'
import { useNotificationStore } from '../../../stores/notification.store'
import { useCompanyStore } from '../../../stores/company.store'
import { useUserStore } from '../../../stores/user.store'
import { estimateService } from '../../../api/services/estimate.service'
import type {
EstimateListParams,
@@ -545,9 +546,10 @@ export const useEstimateStore = defineStore('estimate', {
if (this.templates.length) {
this.setTemplate(this.templates[0].name)
if (userSettings?.default_estimate_template) {
const { currentUserSettings } = useUserStore()
if (currentUserSettings.default_estimate_template) {
this.newEstimate.template_name =
userSettings.default_estimate_template
currentUserSettings.default_estimate_template
}
}
}

11
resources/scripts-v2/features/company/invoices/store.ts
View File

@@ -1,6 +1,7 @@
import { defineStore } from 'pinia'
import { useNotificationStore } from '../../../stores/notification.store'
import { useCompanyStore } from '../../../stores/company.store'
import { useUserStore } from '../../../stores/user.store'
import { invoiceService } from '../../../api/services/invoice.service'
import type {
InvoiceListParams,
@@ -361,6 +362,11 @@ export const useInvoiceStore = defineStore('invoice', {
return { data: response }
},
async convertToEstimate(data: { id: number }): Promise<{ data: { data: Record<string, unknown> } }> {
const response = await invoiceService.convertToEstimate(data.id)
return { data: response }
},
async markAsSent(data: InvoiceStatusPayload): Promise<unknown> {
const response = await invoiceService.changeStatus(data)
const pos = this.invoices.findIndex((inv) => inv.id === data.id)
@@ -528,9 +534,10 @@ export const useInvoiceStore = defineStore('invoice', {
if (templatesRes?.data?.invoiceTemplates?.length) {
this.setTemplate(this.templates[0].name)
if (userSettings?.default_invoice_template) {
const { currentUserSettings } = useUserStore()
if (currentUserSettings.default_invoice_template) {
this.newInvoice.template_name =
userSettings.default_invoice_template
currentUserSettings.default_invoice_template
}
}
}