diff --git a/app/javascript/dashboard/i18n/locale/en/settings.json b/app/javascript/dashboard/i18n/locale/en/settings.json index 7d1762b71..9b589328a 100644 --- a/app/javascript/dashboard/i18n/locale/en/settings.json +++ b/app/javascript/dashboard/i18n/locale/en/settings.json @@ -411,7 +411,6 @@ "TITLE": "Credits Balance", "DESCRIPTION": "Your current credit balance and recent transactions.", "CREDITS": "credits", - "CREDITS_SHORT": "cr", "REFRESH": "Refresh", "BUY_CREDITS": "Buy Credits", "VIEW_HISTORY": "View History", @@ -419,9 +418,7 @@ "TOPUP_CREDITS": "Top-up Credits", "USED_THIS_MONTH": "Used This Month", "TOTAL_USED": "Total Used", - "USAGE_BASED_INFO": "Usage-based pricing: Credits are consumed as you use Chatwoot features.", - "LEDGER_TITLE": "Recent Transactions", - "NO_TRANSACTIONS": "No transactions yet. Start by topping up or subscribing to a plan." + "USAGE_BASED_INFO": "Usage-based pricing: Credits are consumed as you use Chatwoot features." }, "PLAN_SUMMARY": { "TITLE": "Plan Summary", @@ -438,7 +435,6 @@ "TITLE": "Pricing Plans", "DESCRIPTION": "Choose a plan that fits your team. All plans include credits that reset monthly.", "CURRENT_PLAN": "Current Subscription", - "CURRENT": "Current Plan", "RECOMMENDED": "Recommended", "MONTH": "month", "SEATS": "seats", @@ -464,7 +460,6 @@ }, "TOPUP_OPTIONS": { "TITLE": "Top-up Credits", - "DESCRIPTION": "Need more credits? Purchase additional credits anytime to keep your team running.", "CREDITS": "credits", "BUY_NOW": "Buy Now", "NO_OPTIONS": "No top-up options available.", @@ -475,7 +470,6 @@ }, "CREDIT_GRANTS": { "TITLE": "Credit History", - "DESCRIPTION": "View all your credit grants including topups and monthly credits.", "CREDITS": "credits", "EXPIRES": "Expires", "NO_EXPIRY": "Never expires", @@ -495,14 +489,11 @@ "INCLUDED_CREDITS": "Included credits", "CREDITS": "credits", "MONTHLY_TOTAL": "Monthly Total", - "OVERAGE_RATE": "Overage rate", - "CREDIT": "credit", "CANCEL": "Cancel", "CONFIRM": "Confirm Subscription" }, "TOPUP_MODAL": { "TITLE": "Confirm Top-up", - "SELECTED_OPTION": "Selected Option", "CREDITS": "credits", "PRICE": "Price", "INFO": "Credits will be added to your account immediately and never expire.", diff --git a/app/javascript/dashboard/routes/dashboard/settings/billing-v2/billing-v2.routes.js b/app/javascript/dashboard/routes/dashboard/settings/billing-v2/billing-v2.routes.js deleted file mode 100644 index 5d34efb3a..000000000 --- a/app/javascript/dashboard/routes/dashboard/settings/billing-v2/billing-v2.routes.js +++ /dev/null @@ -1,33 +0,0 @@ -import { frontendURL } from '../../../../helper/URLHelper'; -import { INSTALLATION_TYPES } from 'dashboard/constants/installationTypes'; -import SettingsWrapper from '../SettingsWrapper.vue'; -import IndexV2 from './IndexV2.vue'; - -export default { - routes: [ - { - path: frontendURL('accounts/:accountId/settings/billing-v2'), - meta: { - permissions: ['administrator'], - installationTypes: [INSTALLATION_TYPES.CLOUD], - }, - component: SettingsWrapper, - props: { - headerTitle: 'BILLING_SETTINGS_V2.TITLE', - icon: 'credit-card-person', - showNewButton: false, - }, - children: [ - { - path: '', - name: 'billing_settings_v2_index', - component: IndexV2, - meta: { - installationTypes: [INSTALLATION_TYPES.CLOUD], - permissions: ['administrator'], - }, - }, - ], - }, - ], -}; diff --git a/app/javascript/dashboard/routes/dashboard/settings/billing-v2/components/CreditGrants.vue b/app/javascript/dashboard/routes/dashboard/settings/billing-v2/components/CreditGrants.vue index ffc943684..7ae71f99d 100644 --- a/app/javascript/dashboard/routes/dashboard/settings/billing-v2/components/CreditGrants.vue +++ b/app/javascript/dashboard/routes/dashboard/settings/billing-v2/components/CreditGrants.vue @@ -59,7 +59,7 @@ const getCategoryConfig = category =>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/billing-v2/components/CreditsBalance.vue b/app/javascript/dashboard/routes/dashboard/settings/billing-v2/components/CreditsBalance.vue index 0b771b863..fdda5f92a 100644 --- a/app/javascript/dashboard/routes/dashboard/settings/billing-v2/components/CreditsBalance.vue +++ b/app/javascript/dashboard/routes/dashboard/settings/billing-v2/components/CreditsBalance.vue @@ -50,9 +50,6 @@ const formatAmount = amount => { class="p-5 rounded-xl outline outline-1 outline-n-weak bg-n-solid-1 mx-5 mt-5" >
-

- {{ t('BILLING_SETTINGS_V2.CREDITS_BALANCE.CREDITS') }} -

{{ formatAmount(currentBalance) }} diff --git a/app/javascript/dashboard/routes/dashboard/settings/billing-v2/components/PlanSummary.vue b/app/javascript/dashboard/routes/dashboard/settings/billing-v2/components/PlanSummary.vue index c948ffa2d..85e1a9388 100644 --- a/app/javascript/dashboard/routes/dashboard/settings/billing-v2/components/PlanSummary.vue +++ b/app/javascript/dashboard/routes/dashboard/settings/billing-v2/components/PlanSummary.vue @@ -44,11 +44,11 @@ const props = defineProps({ }, updatingDirection: { type: String, - default: null, // 'increase' or 'decrease' + default: null, }, }); -const emit = defineEmits(['view-all-plans', 'cancel-plan', 'updateSeats']); +const emit = defineEmits(['viewAllPlans', 'cancelPlan', 'updateSeats']); const { t } = useI18n(); @@ -203,7 +203,7 @@ const handleIncreaseSeats = () => { variant="faded" color="slate" size="sm" - @click="emit('view-all-plans')" + @click="emit('viewAllPlans')" > {{ t('BILLING_SETTINGS_V2.PLAN_SUMMARY.VIEW_ALL_PLANS') }} @@ -212,7 +212,7 @@ const handleIncreaseSeats = () => { variant="faded" color="ruby" size="sm" - @click="emit('cancel-plan')" + @click="emit('cancelPlan')" > {{ t('BILLING_SETTINGS_V2.PLAN_SUMMARY.CANCEL_PLAN') }} diff --git a/app/javascript/dashboard/routes/dashboard/settings/billing-v2/components/PlansGrid.vue b/app/javascript/dashboard/routes/dashboard/settings/billing-v2/components/PlansGrid.vue index c2ff45d2b..aad8d839b 100644 --- a/app/javascript/dashboard/routes/dashboard/settings/billing-v2/components/PlansGrid.vue +++ b/app/javascript/dashboard/routes/dashboard/settings/billing-v2/components/PlansGrid.vue @@ -55,16 +55,16 @@ const formatNumber = num => {
{{ t('BILLING_SETTINGS_V2.PRICING_PLANS.RECOMMENDED') }}
diff --git a/app/javascript/dashboard/routes/dashboard/settings/billing-v2/components/SubscribeDialog.vue b/app/javascript/dashboard/routes/dashboard/settings/billing-v2/components/SubscribeDialog.vue index 15def1235..6686e9c2e 100644 --- a/app/javascript/dashboard/routes/dashboard/settings/billing-v2/components/SubscribeDialog.vue +++ b/app/javascript/dashboard/routes/dashboard/settings/billing-v2/components/SubscribeDialog.vue @@ -153,9 +153,7 @@ defineExpose({ {{ t('BILLING_SETTINGS_V2.SUBSCRIBE_MODAL.CREDITS') }}
-
+
{{ t('BILLING_SETTINGS_V2.SUBSCRIBE_MODAL.MONTHLY_TOTAL') }} diff --git a/app/javascript/dashboard/routes/dashboard/settings/billing-v2/components/TopupOptions.vue b/app/javascript/dashboard/routes/dashboard/settings/billing-v2/components/TopupOptions.vue index 3d145b654..0ec8c51ae 100644 --- a/app/javascript/dashboard/routes/dashboard/settings/billing-v2/components/TopupOptions.vue +++ b/app/javascript/dashboard/routes/dashboard/settings/billing-v2/components/TopupOptions.vue @@ -72,7 +72,7 @@ const handleTopup = async data => {