@kernhq/module-billing 0.5.11 → 0.5.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kernhq/module-billing",
-  "version": "0.5.11",
+  "version": "0.5.12",
   "description": "Kern billing module: plans, entitlements, subscriptions and Stripe — the mechanism that lets any Kern instance sell seats on itself",
   "homepage": "https://github.com/KernAIO/module-billing#readme",
   "license": "AGPL-3.0-only",

package/src/client/admin/SubscriptionsAdmin.svelte

@@ -204,15 +204,17 @@ const planOptions = $derived([
   {:else}
     <!-- the table scrolls inside itself; the page body must never scroll sideways -->
     <div class="overflow-x-auto">
+      <!-- Seven columns, sized to fit the admin pane at a laptop width: this sat at eight and was
+           wider than the pane behind the second sidebar, so the revenue column and the row menu
+           lived off-screen with nothing to say so. Seats and storage share a cell. -->
       <Table
-        columns="minmax(150px,2fr) minmax(110px,1fr) minmax(104px,auto) minmax(68px,auto) minmax(84px,auto) minmax(96px,auto) minmax(84px,auto) 40px"
+        columns="minmax(100px,2fr) minmax(90px,1.2fr) minmax(104px,auto) minmax(112px,auto) minmax(80px,auto) minmax(72px,auto) 36px"
       >
         <TableHeader>
           <TableCell header>{t('admin_col_workspace')}</TableCell>
           <TableCell header>{t('admin_col_plan')}</TableCell>
           <TableCell header>{t('admin_col_status')}</TableCell>
-          <TableCell header end>{t('admin_col_seats')}</TableCell>
-          <TableCell header end>{t('admin_col_storage')}</TableCell>
+          <TableCell header end>{t('admin_col_usage')}</TableCell>
           <TableCell header>{t('admin_col_renews')}</TableCell>
           <TableCell header end>{t('admin_col_revenue')}</TableCell>
           <TableCell header end></TableCell>
@@ -227,14 +229,15 @@ const planOptions = $derived([
                 </span>
               </div>
             </TableCell>
-            <TableCell>
-              <div class="flex items-center gap-1.5">
+            <!-- The badge sits under the name, never beside it: side by side, one of the two was
+                 always the thing that got clipped ("Overrid", then "B…") in a column this narrow. -->
+            <TableCell class="min-w-0">
+              <div class="grid">
                 <span class="truncate">{row.planName ?? t('no_plan')}</span>
                 {#if row.overridden}
-                  <!-- shrink-0: the badge was the thing that gave way, and "Overrid" is not a word -->
-                  <Badge tone="purple" class="shrink-0" title={t('admin_overridden_hint')}>
-                    {t('admin_overridden')}
-                  </Badge>
+                  <span class="mt-0.5">
+                    <Badge tone="purple" title={t('admin_overridden_hint')}>{t('admin_overridden')}</Badge>
+                  </span>
                 {/if}
               </div>
             </TableCell>
@@ -250,9 +253,8 @@ const planOptions = $derived([
             <TableCell end>
               {row.seatsPurchased > 0
                 ? `${nf.format(row.seatsUsed)}/${nf.format(row.seatsPurchased)}`
-                : nf.format(row.seatsUsed)}
+                : nf.format(row.seatsUsed)} · {formatBytes(row.storageBytes, locale)}
             </TableCell>
-            <TableCell end>{formatBytes(row.storageBytes, locale)}</TableCell>
             <TableCell>{day(row.currentPeriodEnd ?? row.trialEndsAt)}</TableCell>
             <TableCell end>
               {row.monthlyMinor > 0 ? formatMoney(row.monthlyMinor, row.currency, locale) : '—'}

package/src/client/i18n.ts

@@ -27,6 +27,7 @@ export const en: Record<string, Message> = {
   'billing.admin_col_renews': 'Renews',
   'billing.admin_col_revenue': 'Per month',
   'billing.admin_col_seats': 'Seats',
+  'billing.admin_col_usage': 'Seats · storage',
   'billing.admin_col_status': 'Status',
   'billing.admin_col_storage': 'Storage',
   'billing.admin_col_workspace': 'Workspace',
@@ -197,6 +198,7 @@ const ar: Record<string, Message> = {
   'billing.admin_col_renews': 'التجديد',
   'billing.admin_col_revenue': 'شهرياً',
   'billing.admin_col_seats': 'المقاعد',
+  'billing.admin_col_usage': 'المقاعد · التخزين',
   'billing.admin_col_status': 'الحالة',
   'billing.admin_col_storage': 'التخزين',
   'billing.admin_col_workspace': 'مساحة العمل',
@@ -362,6 +364,7 @@ const de: Record<string, Message> = {
   'billing.admin_col_renews': 'Verlängert am',
   'billing.admin_col_revenue': 'Pro Monat',
   'billing.admin_col_seats': 'Plätze',
+  'billing.admin_col_usage': 'Plätze · Speicher',
   'billing.admin_col_status': 'Status',
   'billing.admin_col_storage': 'Speicher',
   'billing.admin_col_workspace': 'Arbeitsbereich',
@@ -534,6 +537,7 @@ const fa: Record<string, Message> = {
   'billing.admin_col_renews': 'تمدید',
   'billing.admin_col_revenue': 'ماهانه',
   'billing.admin_col_seats': 'کاربران',
+  'billing.admin_col_usage': 'کاربران · فضا',
   'billing.admin_col_status': 'وضعیت',
   'billing.admin_col_storage': 'فضای ذخیره‌سازی',
   'billing.admin_col_workspace': 'فضای کاری',
@@ -697,6 +701,7 @@ const tr: Record<string, Message> = {
   'billing.admin_col_renews': 'Yenilenme',
   'billing.admin_col_revenue': 'Aylık',
   'billing.admin_col_seats': 'Kullanıcı',
+  'billing.admin_col_usage': 'Kullanıcı · depolama',
   'billing.admin_col_status': 'Durum',
   'billing.admin_col_storage': 'Depolama',
   'billing.admin_col_workspace': 'Çalışma alanı',