diff --git a/src/locales/ar/main.json b/src/locales/ar/main.json
index db0e5a15470..8e0367bf1d9 100644
--- a/src/locales/ar/main.json
+++ b/src/locales/ar/main.json
@@ -5845,6 +5845,7 @@
"limit": "الحد الشهري: تم استخدام {spent} من {limit}",
"limitTooltip": "يحتسب عمليات تحصيل الشحن التلقائي فقط. يُعاد تعيينه في {date}.",
"limitTooltipNoDate": "يحتسب عمليات تحصيل الشحن التلقائي فقط.",
+ "member": "يمكن شحن الأرصدة تلقائيًا عندما تنخفض. تواصل مع مالك مساحة العمل لإدارة ذلك.",
"off": "يعيد شحن الأرصدة عندما ينخفض رصيدك",
"onHold": "لا توجد طريقة دفع افتراضية. عيّن واحدة لاستئناف الشحن التلقائي.",
"paused": "تم بلوغ الحد الشهري. يُستأنف في {date}.",
diff --git a/src/locales/de/main.json b/src/locales/de/main.json
index 09200187a2f..d0255c9712c 100644
--- a/src/locales/de/main.json
+++ b/src/locales/de/main.json
@@ -5845,6 +5845,7 @@
"limit": "Monatliches Limit: {spent} von {limit} verwendet",
"limitTooltip": "Berücksichtigt nur Abbuchungen für automatische Aufladungen. Wird am {date} zurückgesetzt.",
"limitTooltipNoDate": "Berücksichtigt nur Abbuchungen für automatische Aufladungen.",
+ "member": "Credits können automatisch aufgeladen werden, wenn sie zur Neige gehen. Wenden Sie sich an einen Workspace-Inhaber, um dies zu verwalten.",
"off": "Füllt Credits auf, wenn Ihr Guthaben zur Neige geht",
"onHold": "Keine Standardzahlungsmethode. Legen Sie eine fest, um die automatische Aufladung fortzusetzen.",
"paused": "Monatliches Limit erreicht. Wird am {date} fortgesetzt.",
diff --git a/src/locales/en/main.json b/src/locales/en/main.json
index 24bcfdbeba7..aed1914f984 100644
--- a/src/locales/en/main.json
+++ b/src/locales/en/main.json
@@ -3653,6 +3653,7 @@
"pausedByRemainderNoDate": "Next top-up would go over your monthly limit.",
"maximumReached": "Monthly maximum reached. Resets {date}.",
"maximumReachedNoDate": "Monthly maximum reached.",
+ "member": "Credits can top up automatically when they run low. Contact a workspace owner to manage this.",
"rule": "Tops up to {target} credits when below {threshold} credits.",
"status": {
"failed": "Failed",
diff --git a/src/locales/es/main.json b/src/locales/es/main.json
index 3f1c6a5a1dc..783160edfc3 100644
--- a/src/locales/es/main.json
+++ b/src/locales/es/main.json
@@ -5845,6 +5845,7 @@
"limit": "Límite mensual: se han usado {spent} de {limit}",
"limitTooltip": "Solo cuenta los cobros de recarga automática. Se restablece el {date}.",
"limitTooltipNoDate": "Solo cuenta los cobros de recarga automática.",
+ "member": "Los créditos se pueden recargar automáticamente cuando se agotan. Contacta con un propietario del espacio de trabajo para gestionarlo.",
"off": "Recarga créditos cuando tu saldo es bajo",
"onHold": "No hay un método de pago predeterminado. Configura uno para reanudar la recarga automática.",
"paused": "Se alcanzó el límite mensual. Se reanuda el {date}.",
diff --git a/src/locales/fa/main.json b/src/locales/fa/main.json
index e8e287ff0d0..4ecfaf5a716 100644
--- a/src/locales/fa/main.json
+++ b/src/locales/fa/main.json
@@ -5845,6 +5845,7 @@
"limit": "سقف ماهانه: {spent} از {limit} استفاده شده است",
"limitTooltip": "فقط پرداختهای افزایش اعتبار خودکار را محاسبه میکند. در {date} بازنشانی میشود.",
"limitTooltipNoDate": "فقط پرداختهای افزایش اعتبار خودکار را محاسبه میکند.",
+ "member": "اعتبارها میتوانند هنگام کم شدن بهطور خودکار افزایش یابند. برای مدیریت این مورد با مالک فضای کاری تماس بگیرید.",
"off": "وقتی موجودیتان کم میشود، اعتبارها را افزایش میدهد",
"onHold": "روش پرداخت پیشفرضی وجود ندارد. برای ازسرگیری افزایش اعتبار خودکار، یکی تنظیم کنید.",
"paused": "سقف ماهانه پر شده است. در {date} از سر گرفته میشود.",
diff --git a/src/locales/fr/main.json b/src/locales/fr/main.json
index d0503e1d42c..6354005d07c 100644
--- a/src/locales/fr/main.json
+++ b/src/locales/fr/main.json
@@ -5845,6 +5845,7 @@
"limit": "Limite mensuelle : {spent} sur {limit} utilisés",
"limitTooltip": "Ne compte que les paiements de rechargement automatique. Réinitialisation le {date}.",
"limitTooltipNoDate": "Ne compte que les paiements de rechargement automatique.",
+ "member": "Les crédits peuvent être rechargés automatiquement lorsqu'ils sont bas. Contactez un propriétaire de l'espace de travail pour gérer ce paramètre.",
"off": "Recharge les crédits lorsque votre solde est faible",
"onHold": "Aucun moyen de paiement par défaut. Définissez-en un pour reprendre le rechargement automatique.",
"paused": "Limite mensuelle atteinte. Reprend le {date}.",
diff --git a/src/locales/he/main.json b/src/locales/he/main.json
index 96acfd5e0d9..cdccb9a3185 100644
--- a/src/locales/he/main.json
+++ b/src/locales/he/main.json
@@ -5845,6 +5845,7 @@
"limit": "מגבלה חודשית: נעשה שימוש ב-{spent} מתוך {limit}",
"limitTooltip": "נספרים רק חיובים של טעינה אוטומטית. מתאפס ב-{date}.",
"limitTooltipNoDate": "נספרים רק חיובים של טעינה אוטומטית.",
+ "member": "ניתן לטעון קרדיטים אוטומטית כשהם עומדים להיגמר. פנו לבעלים של סביבת העבודה כדי לנהל זאת.",
"off": "ממלא קרדיטים מחדש כשהיתרה שלכם נמוכה",
"onHold": "אין אמצעי תשלום ברירת מחדל. הגדירו אמצעי כדי לחדש את הטעינה האוטומטית.",
"paused": "המגבלה החודשית הושגה. יתחדש ב-{date}.",
diff --git a/src/locales/it/main.json b/src/locales/it/main.json
index c27f0798775..4c26a9b7217 100644
--- a/src/locales/it/main.json
+++ b/src/locales/it/main.json
@@ -5845,6 +5845,7 @@
"limit": "Limite mensile: {spent} di {limit} utilizzati",
"limitTooltip": "Conteggia solo gli addebiti per la ricarica automatica. Si reimposta il {date}.",
"limitTooltipNoDate": "Conteggia solo gli addebiti per la ricarica automatica.",
+ "member": "I crediti possono essere ricaricati automaticamente quando stanno per esaurirsi. Contatta un proprietario dello spazio di lavoro per gestire questa opzione.",
"off": "Ricarica i crediti quando il saldo è basso",
"onHold": "Nessun metodo di pagamento predefinito. Impostane uno per riprendere la ricarica automatica.",
"paused": "Limite mensile raggiunto. Riprende il {date}.",
diff --git a/src/locales/ja/main.json b/src/locales/ja/main.json
index b85ee9af714..b465dd1963c 100644
--- a/src/locales/ja/main.json
+++ b/src/locales/ja/main.json
@@ -5845,6 +5845,7 @@
"limit": "月間上限: {limit} 中 {spent} を使用",
"limitTooltip": "自動チャージの請求のみをカウントします。{date} にリセットされます。",
"limitTooltipNoDate": "自動チャージの請求のみをカウントします。",
+ "member": "クレジットが少なくなると自動でチャージできます。管理するにはワークスペースのオーナーにお問い合わせください。",
"off": "残高が少なくなるとクレジットを補充します",
"onHold": "デフォルトの支払い方法がありません。設定して自動チャージを再開してください。",
"paused": "月間上限に達しました。{date} に再開します。",
diff --git a/src/locales/ko/main.json b/src/locales/ko/main.json
index fe62b7a15dd..ec3765a3929 100644
--- a/src/locales/ko/main.json
+++ b/src/locales/ko/main.json
@@ -5845,6 +5845,7 @@
"limit": "월간 한도: {limit} 중 {spent} 사용",
"limitTooltip": "자동 충전 청구만 집계합니다. {date}에 재설정됩니다.",
"limitTooltipNoDate": "자동 충전 청구만 집계합니다.",
+ "member": "크레딧이 부족해지면 자동으로 충전할 수 있습니다. 관리하려면 워크스페이스 소유자에게 문의하세요.",
"off": "잔액이 부족해지면 크레딧을 충전합니다.",
"onHold": "기본 결제 수단이 없습니다. 자동 충전을 재개하려면 설정하세요.",
"paused": "월간 한도에 도달했습니다. {date}에 재개됩니다.",
diff --git a/src/locales/pt-BR/main.json b/src/locales/pt-BR/main.json
index bc3f29b6e57..ea374a5619e 100644
--- a/src/locales/pt-BR/main.json
+++ b/src/locales/pt-BR/main.json
@@ -5845,6 +5845,7 @@
"limit": "Limite mensal: {spent} de {limit} usados",
"limitTooltip": "Conta apenas cobranças de recarga automática. Redefine em {date}.",
"limitTooltipNoDate": "Conta apenas cobranças de recarga automática.",
+ "member": "Os créditos podem ser recarregados automaticamente quando estiverem acabando. Fale com um proprietário do espaço de trabalho para gerenciar isso.",
"off": "Recarrega créditos quando seu saldo está baixo",
"onHold": "Nenhuma forma de pagamento padrão. Defina uma para retomar a recarga automática.",
"paused": "Limite mensal atingido. Retoma em {date}.",
diff --git a/src/locales/ru/main.json b/src/locales/ru/main.json
index f3f6f019d57..5ab053defdd 100644
--- a/src/locales/ru/main.json
+++ b/src/locales/ru/main.json
@@ -5845,6 +5845,7 @@
"limit": "Месячный лимит: использовано {spent} из {limit}",
"limitTooltip": "Учитываются только списания при автоматическом пополнении. Сброс {date}.",
"limitTooltipNoDate": "Учитываются только списания при автоматическом пополнении.",
+ "member": "Кредиты могут пополняться автоматически, когда их становится мало. Чтобы управлять этим, обратитесь к владельцу рабочего пространства.",
"off": "Пополняет кредиты, когда баланс становится низким",
"onHold": "Нет способа оплаты по умолчанию. Укажите его, чтобы возобновить автоматическое пополнение.",
"paused": "Достигнут месячный лимит. Возобновится {date}.",
diff --git a/src/locales/tr/main.json b/src/locales/tr/main.json
index 06e8e525769..9ec8daff1d4 100644
--- a/src/locales/tr/main.json
+++ b/src/locales/tr/main.json
@@ -5845,6 +5845,7 @@
"limit": "Aylık sınır: {limit} tutarın {spent} kadarı kullanıldı",
"limitTooltip": "Yalnızca otomatik kredi yükleme ücretlendirmeleri sayılır. {date} tarihinde sıfırlanır.",
"limitTooltipNoDate": "Yalnızca otomatik kredi yükleme ücretlendirmeleri sayılır.",
+ "member": "Krediler azaldığında otomatik olarak yüklenebilir. Bunu yönetmek için bir çalışma alanı sahibiyle iletişime geçin.",
"off": "Bakiyeniz azaldığında kredileri yeniden yükler",
"onHold": "Varsayılan ödeme yöntemi yok. Otomatik kredi yüklemeyi sürdürmek için bir tane ayarlayın.",
"paused": "Aylık sınıra ulaşıldı. {date} tarihinde devam eder.",
diff --git a/src/locales/zh-TW/main.json b/src/locales/zh-TW/main.json
index 458cfce6fde..ebb86c33c42 100644
--- a/src/locales/zh-TW/main.json
+++ b/src/locales/zh-TW/main.json
@@ -5845,6 +5845,7 @@
"limit": "每月上限:已使用 {spent}/{limit}",
"limitTooltip": "僅計入自動儲值扣款。將於 {date} 重設。",
"limitTooltipNoDate": "僅計入自動儲值扣款。",
+ "member": "點數不足時可自動儲值。如需管理,請聯絡工作區擁有者。",
"off": "當您的點數餘額不足時自動儲值",
"onHold": "沒有預設付款方式。請設定付款方式以恢復自動儲值。",
"paused": "已達每月上限。將於 {date} 恢復。",
diff --git a/src/locales/zh/main.json b/src/locales/zh/main.json
index accc21aac9f..0fc02304ab9 100644
--- a/src/locales/zh/main.json
+++ b/src/locales/zh/main.json
@@ -5845,6 +5845,7 @@
"limit": "每月限额:已使用 {spent} / {limit}",
"limitTooltip": "仅统计自动充值的扣费。将于 {date} 重置。",
"limitTooltipNoDate": "仅统计自动充值的扣费。",
+ "member": "积分不足时可自动充值。如需管理,请联系工作区所有者。",
"off": "当你的余额不足时自动补充积分",
"onHold": "没有默认付款方式。请设置一个以恢复自动充值。",
"paused": "已达到每月限额。将于 {date} 恢复。",
diff --git a/src/platform/account/components/dialogs/settings/BillingTab.test.ts b/src/platform/account/components/dialogs/settings/BillingTab.test.ts
index 28abbfcef97..03e1f9fdac5 100644
--- a/src/platform/account/components/dialogs/settings/BillingTab.test.ts
+++ b/src/platform/account/components/dialogs/settings/BillingTab.test.ts
@@ -94,6 +94,7 @@ interface Scenario {
balance?: BalanceInfo | null
autoTopUpEnabled?: boolean
canManageAutoTopUp?: boolean
+ manageAutoTopUpDenial?: string
canTopUp?: boolean
topUpDenial?: BillingTopUpDenial
isPaused?: boolean
@@ -210,6 +211,12 @@ function arrange(scenario: Scenario = {}) {
scenario.autoTopUpEnabled ?? true
)
),
+ manageAutoTopUpDenial: computed(() =>
+ receiveServerFact(
+ 'denied_reasons.can_manage_auto_top_up',
+ scenario.manageAutoTopUpDenial
+ )
+ ),
autoTopUpSetup: computed(() => null),
isReady: computed(() => scenario.capabilitiesReady ?? true),
hasResolvedCapabilities: computed(
@@ -1852,6 +1859,60 @@ describe('BillingTab', () => {
expect(billingApi.getBillingAutoReload).toHaveBeenCalledTimes(reads)
})
+ describe('member block', () => {
+ const member: Scenario = {
+ canManageAutoTopUp: false,
+ manageAutoTopUpDenial: 'not_workspace_owner',
+ canTopUp: false
+ }
+
+ it('tells a member who manages auto top-up, without status, action or a settings read', () => {
+ arrange(member)
+
+ const block = screen.getByTestId('billing-auto-top-up-member-card')
+ expect(
+ within(block).getByRole('heading', { name: 'Auto top-up' })
+ ).toBeInTheDocument()
+ expect(block).toHaveTextContent(
+ 'Credits can top up automatically when they run low. Contact a workspace owner to manage this.'
+ )
+ expect(within(block).queryByRole('button')).not.toBeInTheDocument()
+ expect(within(block).queryByRole('link')).not.toBeInTheDocument()
+ expect(
+ screen.queryByTestId('billing-auto-top-up-status')
+ ).not.toBeInTheDocument()
+ expect(
+ within(screen.getByTestId('billing-credits-section')).queryByRole(
+ 'button',
+ { name: 'Add credits' }
+ )
+ ).not.toBeInTheDocument()
+ expect(billingApi.getBillingAutoReload).not.toHaveBeenCalled()
+ })
+
+ it.for<{ case: string; scenario: Scenario }>([
+ {
+ case: 'the flag is off',
+ scenario: { ...member, autoTopUpEnabled: false }
+ },
+ {
+ case: 'the denial is not not_workspace_owner',
+ scenario: { ...member, manageAutoTopUpDenial: 'not_a_member' }
+ },
+ {
+ case: 'the server sends no denial',
+ scenario: { ...member, manageAutoTopUpDenial: undefined }
+ },
+ { case: 'the actor is an owner', scenario: {} }
+ ])('hides the member block when $case', ({ scenario }) => {
+ arrange(scenario)
+
+ expect(
+ screen.queryByTestId('billing-auto-top-up-member-card')
+ ).not.toBeInTheDocument()
+ })
+ })
+
it('reads the auto top-up settings once for the card and the banner', async () => {
arrange({})
await screen.findByTestId('billing-auto-top-up-status')
diff --git a/src/platform/account/components/dialogs/settings/BillingTab.vue b/src/platform/account/components/dialogs/settings/BillingTab.vue
index 5422f1a3eee..04307fa95c2 100644
--- a/src/platform/account/components/dialogs/settings/BillingTab.vue
+++ b/src/platform/account/components/dialogs/settings/BillingTab.vue
@@ -81,6 +81,7 @@
+
@@ -174,6 +175,7 @@ import BillingTopupCheckoutBanner from '@/platform/billing/components/billingTab
import BillingStatusBanner from '@/platform/billing/components/settings/BillingStatusBanner.vue'
import { usePlanCheckoutBanner } from '@/platform/billing/composables/usePlanCheckoutBanner'
import BillingAutoTopUpCard from '@/platform/billing/components/billingTab/BillingAutoTopUpCard.vue'
+import BillingAutoTopUpMemberCard from '@/platform/billing/components/billingTab/BillingAutoTopUpMemberCard.vue'
import BillingCreditsCard from '@/platform/billing/components/billingTab/BillingCreditsCard.vue'
import BillingPlanRow from '@/platform/billing/components/billingTab/BillingPlanRow.vue'
import { addCreditsEmphasis } from '@/platform/billing/components/billingTab/creditsCard'
diff --git a/src/platform/billing/components/billingTab/BillingAutoTopUpMemberCard.vue b/src/platform/billing/components/billingTab/BillingAutoTopUpMemberCard.vue
new file mode 100644
index 00000000000..3239913aa7f
--- /dev/null
+++ b/src/platform/billing/components/billingTab/BillingAutoTopUpMemberCard.vue
@@ -0,0 +1,20 @@
+
+