Improve upgrade modal for non-billing manager (#10180)

ArtyomSavchenko · web-flow · commit 7515b5655158 · 2025-10-31T16:10:43.000+07:00
Signed-off-by: Artem Savchenko &lt;armisav@gmail.com&gt;
diff --git a/plugins/billing-assets/lang/cs.json b/plugins/billing-assets/lang/cs.json
@@ -56,6 +56,6 @@
     "Of": "z",
     "UpgradePlan": "Upgradovat plán",
     "LimitReached": "Dosažen limit pracovního prostoru, některé funkce mohou být zakázány. Upgradujte pro obnovení plného přístupu.",
-    "AskBillingAdmin": "Kontaktujte prosím svého správce fakturace pro upgrade plánu."
+    "RestrictedPlans": "Pouze vlastník pracovního prostoru nebo správce fakturace může změnit plán předplatného."
   }
 }
diff --git a/plugins/billing-assets/lang/de.json b/plugins/billing-assets/lang/de.json
@@ -56,6 +56,6 @@
     "Of": "von",
     "UpgradePlan": "Plan upgraden",
     "LimitReached": "Arbeitsbereich-Limit erreicht, einige Funktionen könnten deaktiviert sein. Upgraden Sie für vollen Zugriff.",
-    "AskBillingAdmin": "Bitte kontaktieren Sie Ihren Abrechnungsadministrator, um den Plan zu upgraden."
+    "RestrictedPlans": "Nur der Arbeitsbereichsbesitzer oder Abrechnungsmanager kann den Abonnementplan ändern."
   }
 }
diff --git a/plugins/billing-assets/lang/en.json b/plugins/billing-assets/lang/en.json
@@ -56,6 +56,6 @@
     "Of": "of",
     "UpgradePlan": "Upgrade Plan",
     "LimitReached": "Workspace limit reached, some functionality may be disabled. Upgrade to restore full access.",
-    "AskBillingAdmin": "Please contact your billing administrator to upgrade the plan."
+    "RestrictedPlans": "Only the workspace owner or billing manager can change the subscription plan"
   }
 }
diff --git a/plugins/billing-assets/lang/es.json b/plugins/billing-assets/lang/es.json
@@ -56,6 +56,6 @@
     "Of": "de",
     "UpgradePlan": "Actualizar Plan",
     "LimitReached": "Límite del espacio de trabajo alcanzado, algunas funciones pueden estar deshabilitadas. Actualiza para restaurar acceso completo.",
-    "AskBillingAdmin": "Por favor, contacta a tu administrador de facturación para actualizar el plan."
+    "RestrictedPlans": "Solo el propietario del espacio de trabajo o el administrador de facturación pueden cambiar el plan de suscripción."
   }
 }
diff --git a/plugins/billing-assets/lang/fr.json b/plugins/billing-assets/lang/fr.json
@@ -56,6 +56,6 @@
     "Of": "de",
     "UpgradePlan": "Mettre à niveau le plan",
     "LimitReached": "Limite de l'espace de travail atteinte, certaines fonctionnalités peuvent être désactivées. Mettez à niveau pour restaurer l'accès complet.",
-    "AskBillingAdmin": "Veuillez contacter votre administrateur de facturation pour mettre à niveau le plan."
+    "RestrictedPlans": "Seul le propriétaire de l'espace de travail ou le gestionnaire de facturation peut modifier le plan d'abonnement."
   }
 }
diff --git a/plugins/billing-assets/lang/it.json b/plugins/billing-assets/lang/it.json
@@ -56,6 +56,6 @@
     "Of": "di",
     "UpgradePlan": "Aggiorna Piano",
     "LimitReached": "Limite workspace raggiunto, alcune funzionalità potrebbero essere disabilitate. Aggiorna per ripristinare l'accesso completo.",
-    "AskBillingAdmin": "Contatta il tuo amministratore di fatturazione per aggiornare il piano."
+    "RestrictedPlans": "Solo il proprietario del workspace o il responsabile della fatturazione può modificare il piano di abbonamento."
   }
 }
diff --git a/plugins/billing-assets/lang/ja.json b/plugins/billing-assets/lang/ja.json
@@ -56,6 +56,6 @@
     "Of": "/",
     "UpgradePlan": "プランをアップグレード",
     "LimitReached": "ワークスペースの制限に達しました。一部の機能が無効になる場合があります。アップグレードして完全アクセスを復元してください。",
-    "AskBillingAdmin": "プランをアップグレードするには、請求管理者にお問い合わせください。"
+    "RestrictedPlans": "ワークスペースの所有者または請求管理者のみがサブスクリプションプランを変更できます。"
   }
 }
diff --git a/plugins/billing-assets/lang/pt.json b/plugins/billing-assets/lang/pt.json
@@ -56,6 +56,6 @@
     "Of": "de",
     "UpgradePlan": "Atualizar Plano",
     "LimitReached": "Limite do workspace atingido, algumas funcionalidades podem estar desabilitadas. Atualize para restaurar acesso completo.",
-    "AskBillingAdmin": "Por favor, contate seu administrador de faturamento para atualizar o plano."
+    "RestrictedPlans": "Apenas o proprietário do workspace ou o administrador de faturamento podem alterar o plano de assinatura."
   }
 }
diff --git a/plugins/billing-assets/lang/ru.json b/plugins/billing-assets/lang/ru.json
@@ -56,6 +56,6 @@
     "Of": "из",
     "UpgradePlan": "Обновить план",
     "LimitReached": "Достигнут лимит рабочего пространства, некоторые функции могут быть отключены. Обновите план для восстановления полного доступа.",
-    "AskBillingAdmin": "Пожалуйста, свяжитесь с вашим администратором биллинга для обновления плана."
+    "RestrictedPlans": "Только владелец рабочего пространства или администратор биллинга может изменить план подписки."
   }
 }
diff --git a/plugins/billing-assets/lang/tr.json b/plugins/billing-assets/lang/tr.json
@@ -56,6 +56,6 @@
     "Of": "/",
     "UpgradePlan": "Planı Yükselt",
     "LimitReached": "Çalışma alanı limiti aşıldı, bazı işlevler devre dışı bırakılabilir. Tam erişimi geri yüklemek için yükseltin.",
-    "AskBillingAdmin": "Lütfen planı yükseltmek için faturalama yöneticinizle iletişime geçin."
+    "RestrictedPlans": "Abonelik planını yalnızca çalışma alanı sahibi veya faturalama yöneticisi değiştirebilir."
   }
 }
diff --git a/plugins/billing-assets/lang/zh.json b/plugins/billing-assets/lang/zh.json
@@ -56,6 +56,6 @@
     "Of": "/",
     "UpgradePlan": "升级计划",
     "LimitReached": "已达到工作空间限制，某些功能可能被禁用。请升级以恢复完全访问权限。",
-    "AskBillingAdmin": "请联系您的计费管理员以升级计划。"
+    "RestrictedPlans": "只有工作空间所有者或计费管理员才能更改订阅计划。"
   }
 }
diff --git a/plugins/billing-resources/src/components/Subscriptions.svelte b/plugins/billing-resources/src/components/Subscriptions.svelte
@@ -48,6 +48,8 @@
     return acc
   }, {})
 
+  export let isReadOnly: boolean = false
+
   let currentSubscription: SubscriptionData | undefined = undefined
   $: currentTier = currentSubscription != null ? tierByPlan[currentSubscription.plan] : undefined
   let loading = true
@@ -479,7 +481,9 @@
       </div>
 
       <div class="flex-col flex-gap-4">
-        <div class="section-title"><Label label={plugin.string.AllPlans} /></div>
+        <div class="section-title">
+          <Label label={isReadOnly ? plugin.string.RestrictedPlans : plugin.string.AllPlans} />
+        </div>
         <Scroller contentDirection="horizontal" buttons={false} showOverflowArrows shrink={false} noFade={false}>
           <div class="flex-row-top flex-gap-4 flex-no-shrink mb-3">
             {#each tiers as tier}
@@ -528,7 +532,7 @@
                   </div>
                 </div>
                 <div class="tier-card-footer">
-                  {#if currentTier === undefined || currentTier._id !== tier._id}
+                  {#if !isReadOnly && (currentTier === undefined || currentTier._id !== tier._id)}
                     <Button
                       label={currentTier === undefined ? plugin.string.Subscribe : plugin.string.ChangePlan}
                       size={'large'}
diff --git a/plugins/billing-resources/src/components/SubscriptionsModal.svelte b/plugins/billing-resources/src/components/SubscriptionsModal.svelte
@@ -16,8 +16,10 @@
   import { ModernDialog } from '@hcengineering/ui'
   import billing from '../plugin'
   import Subscriptions from './Subscriptions.svelte'
+
+  export let isReadOnly: boolean = false
 </script>
 
 <ModernDialog width="100%" label={billing.string.UpgradePlan} withoutFooter={true} className="extendedHeight" on:close>
-  <Subscriptions />
+  <Subscriptions {isReadOnly} />
 </ModernDialog>
diff --git a/plugins/billing-resources/src/plugin.ts b/plugins/billing-resources/src/plugin.ts
@@ -51,6 +51,7 @@ export default mergeIds(billingId, billing, {
     StorageUsage: '' as IntlString,
     TrafficUsage: '' as IntlString,
     Usage: '' as IntlString,
-    Of: '' as IntlString
+    Of: '' as IntlString,
+    RestrictedPlans: '' as IntlString
   }
 })
diff --git a/plugins/billing-resources/src/utils.ts b/plugins/billing-resources/src/utils.ts
@@ -14,7 +14,7 @@
 //
 import login from '@hcengineering/login'
 import { getMetadata } from '@hcengineering/platform'
-import presentation, { MessageBox, getClient } from '@hcengineering/presentation'
+import presentation, { getClient } from '@hcengineering/presentation'
 import billing from '@hcengineering/billing'
 import {
   getClient as getAccountClientRaw,
@@ -140,15 +140,7 @@ export async function upgradePlan (): Promise<void> {
         ? workspaceInfo.billingAccount === currentAccount.uuid
         : hasAccountRole(currentAccount, AccountRole.Owner)
 
-    if (isBillingAccount) {
-      showPopup(SubscriptionsModal, {})
-    } else {
-      showPopup(MessageBox, {
-        label: billing.string.UpgradePlan,
-        message: billing.string.AskBillingAdmin,
-        params: { canSubmit: false }
-      })
-    }
+    showPopup(SubscriptionsModal, { isReadOnly: !isBillingAccount })
   } catch (error) {
     console.error('Failed to show upgrade plan modal:', error)
   }
diff --git a/plugins/billing/src/plugin.ts b/plugins/billing/src/plugin.ts
@@ -54,8 +54,7 @@ export const billingPlugin = plugin(billingId, {
     Legendary: '' as IntlString,
     LegendaryDescription: '' as IntlString,
     UpgradePlan: '' as IntlString,
-    LimitReached: '' as IntlString,
-    AskBillingAdmin: '' as IntlString
+    LimitReached: '' as IntlString
   },
   icon: {
     Billing: '' as Asset,

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,6 @@`
`56`	`56`	`"Of": "z",`
`57`	`57`	`"UpgradePlan": "Upgradovat plán",`
`58`	`58`	`"LimitReached": "Dosažen limit pracovního prostoru, některé funkce mohou být zakázány. Upgradujte pro obnovení plného přístupu.",`
`59`		`- "AskBillingAdmin": "Kontaktujte prosím svého správce fakturace pro upgrade plánu."`
	`59`	`+ "RestrictedPlans": "Pouze vlastník pracovního prostoru nebo správce fakturace může změnit plán předplatného."`
`60`	`60`	`}`
`61`	`61`	`}`