LeadMagnet/leadchat
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

fix: Show billing upgrade page if there is a mismatch in the user count (#11886)

Browse Source 
Disable features/show billing upgrade for accounts with more users than
the one in the license.

---------

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
This commit is contained in:
Pranav
2025-07-06 19:30:27 -07:00
committed by GitHub
parent b8814a8bd5
commit b72848513f
5 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/dashboard/i18n/locale/en/generalSettings.json
View File

@@ -3,7 +3,7 @@
"LIMIT_MESSAGES": {
"CONVERSATION": "You have exceeded the conversation limit. Hacker plan allows only 500 conversations.",
"INBOXES": "You have exceeded the inbox limit. Hacker plan only supports website live-chat. Additional inboxes like email, WhatsApp etc. require a paid plan.",
"AGENTS": "You have exceeded the agent limit. Hacker plan allows only 2 agents.",
"AGENTS": "You have exceeded the agent limit. Your plan only allows {allowedAgents} agents.",
"NON_ADMIN": "Please contact your administrator to upgrade the plan and continue using all features."
},
"TITLE": "Account settings",

2
app/javascript/dashboard/i18n/locale/ru/generalSettings.json
View File

@@ -3,7 +3,7 @@
"LIMIT_MESSAGES": {
"CONVERSATION": "You have exceeded the conversation limit. Hacker plan allows only 500 conversations.",
"INBOXES": "You have exceeded the inbox limit. Hacker plan only supports website live-chat. Additional inboxes like email, WhatsApp etc. require a paid plan.",
"AGENTS": "You have exceeded the agent limit. Hacker plan allows only 2 agents.",
"AGENTS": "You have exceeded the agent limit. Your plan only allows {allowedAgents} agents.",
"NON_ADMIN": "Please contact your administrator to upgrade the plan and continue using all features."
},
"TITLE": "Настройки аккаунта",

4
app/javascript/dashboard/routes/dashboard/upgrade/UpgradePage.vue
View File

@@ -58,7 +58,9 @@ const limitExceededMessage = computed(() => {
} else if (testLimit(nonWebInboxes)) {
message = t('GENERAL_SETTINGS.LIMIT_MESSAGES.INBOXES');
} else if (testLimit(agents)) {
message = t('GENERAL_SETTINGS.LIMIT_MESSAGES.AGENTS');
message = t('GENERAL_SETTINGS.LIMIT_MESSAGES.AGENTS', {
allowedAgents: agents.allowed,
});
}
return message;

5
enterprise/app/controllers/enterprise/api/v1/accounts_controller.rb
View File

@@ -65,7 +65,10 @@ class Enterprise::Api::V1::AccountsController < Api::BaseController
{
'conversation' => {},
'non_web_inboxes' => {},
'agents' => {},
'agents' => {
'allowed' => @account.usage_limits[:agents],
'consumed' => agents(@account)
},
'captain' => @account.usage_limits[:captain]
}
end

5
spec/enterprise/controllers/enterprise/api/v1/accounts_controller_spec.rb
View File

@@ -199,7 +199,10 @@ RSpec.describe 'Enterprise Billing APIs', type: :request do
expected_response = {
'id' => account.id,
'limits' => {
'agents' => {},
'agents' => {
'allowed' => account.usage_limits[:agents],
'consumed' => account.users.count
},
'conversation' => {},
'captain' => {
'documents' => { 'consumed' => 0, 'current_available' => ChatwootApp.max_limit, 'total_count' => ChatwootApp.max_limit },