mirror/textbee
1
0
Fork 0
mirror of https://github.com/vernu/textbee.git synced 2026-05-19 05:46:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix my-account page issues

Browse Source
This commit is contained in:
isra el
2025-02-24 00:59:36 +03:00
parent e262e23e2b
commit da6c18310b
2 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
api/src/billing/billing.service.ts
View File

@@ -51,15 +51,16 @@ export class BillingService {
})
.populate('plan')
let plan = null
if (!subscription) {
plan = await this.planModel.findOne({ name: 'free' })
} else {
plan = await this.planModel.findById(subscription.plan)
if (subscription) {
return subscription
}
return plan
const plan = await this.planModel.findOne({ name: 'free' })
return {
plan,
isActive: true,
}
}
async getCheckoutUrl({

20
web/app/(app)/dashboard/(components)/account-settings.tsx
View File

@@ -270,7 +270,7 @@ export default function AccountSettings() {
<div>
<p className='text-xs text-gray-500 dark:text-gray-400'>Quota</p>
<p className='text-sm font-medium text-gray-900 dark:text-white'>
{currentSubscription?.quota}
{currentSubscription?.plan?.quota}
</p>
</div>
</div>
@@ -282,10 +282,10 @@ export default function AccountSettings() {
Daily
</p>
<p className='text-sm font-medium text-gray-900 dark:text-white'>
{currentSubscription?.dailyLimit === -1
{currentSubscription?.plan?.dailyLimit === -1
? 'Unlimited'
: currentSubscription?.dailyLimit}
{currentSubscription?.dailyLimit === -1 && (
: currentSubscription?.plan?.dailyLimit}
{currentSubscription?.plan?.dailyLimit === -1 && (
<TooltipProvider>
<Tooltip>
<TooltipTrigger asChild>
@@ -306,10 +306,10 @@ export default function AccountSettings() {
Monthly
</p>
<p className='text-sm font-medium text-gray-900 dark:text-white'>
{currentSubscription?.monthlyLimit === -1
{currentSubscription?.plan?.monthlyLimit === -1
? 'Unlimited'
: currentSubscription?.monthlyLimit.toLocaleString()}
{currentSubscription?.monthlyLimit === -1 && (
: currentSubscription?.plan?.monthlyLimit?.toLocaleString()}
{currentSubscription?.plan?.monthlyLimit === -1 && (
<TooltipProvider>
<Tooltip>
<TooltipTrigger asChild>
@@ -328,10 +328,10 @@ export default function AccountSettings() {
<div>
<p className='text-xs text-gray-500 dark:text-gray-400'>Bulk</p>
<p className='text-sm font-medium text-gray-900 dark:text-white'>
{currentSubscription?.bulkSendLimit === -1
{currentSubscription?.plan?.bulkSendLimit === -1
? 'Unlimited'
: currentSubscription?.bulkSendLimit}
{currentSubscription?.bulkSendLimit === -1 && (
: currentSubscription?.plan?.bulkSendLimit}
{currentSubscription?.plan?.bulkSendLimit === -1 && (
<TooltipProvider>
<Tooltip>
<TooltipTrigger asChild>