Merge beta into release #21

Merged
didirus merged 276 commits from beta into release 2025-11-01 13:04:25 +00:00
2 changed files with 26 additions and 2 deletions
Showing only changes of commit 12940fc207 - Show all commits
+15
View File
@@ -11,5 +11,20 @@
"source.fixAll.eslint": "explicit", "source.fixAll.eslint": "explicit",
"source.organizeImports": "always" "source.organizeImports": "always"
}, },
"editor.defaultFormatter": "esbenp.prettier-vscode",
"[vue]": {
"editor.defaultFormatter": "esbenp.prettier-vscode" "editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[typescript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[scss]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[css]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
}
} }
@@ -158,6 +158,15 @@ const currentPlanFromSubscription = computed<ServerPlan | undefined>(() => {
: undefined : undefined
}) })
const currentInterval = computed(() => {
const interval = subscription.value?.interval
if (interval === 'monthly' || interval === 'quarterly') {
return interval
}
return 'monthly'
})
async function initiatePayment(body: any): Promise<any> { async function initiatePayment(body: any): Promise<any> {
if (subscription.value) { if (subscription.value) {
const transformedBody = { const transformedBody = {
@@ -247,7 +256,7 @@ async function open(id?: string) {
subscription.value = null subscription.value = null
} }
purchaseModal.value?.show('quarterly') purchaseModal.value?.show(currentInterval.value)
} }
defineExpose({ defineExpose({