diff --git a/resources/js/admin/mobile/lib/packageSummary.test.ts b/resources/js/admin/mobile/lib/packageSummary.test.ts index a2d687c..e5c2525 100644 --- a/resources/js/admin/mobile/lib/packageSummary.test.ts +++ b/resources/js/admin/mobile/lib/packageSummary.test.ts @@ -15,7 +15,8 @@ const t = (key: string, options?: Record | string) => { return template .replace('{{used}}', String(options?.used ?? '{{used}}')) .replace('{{limit}}', String(options?.limit ?? '{{limit}}')) - .replace('{{remaining}}', String(options?.remaining ?? '{{remaining}}')); + .replace('{{remaining}}', String(options?.remaining ?? '{{remaining}}')) + .replace('{{count}}', String(options?.count ?? '{{count}}')); }; describe('packageSummary helpers', () => { @@ -53,6 +54,12 @@ describe('packageSummary helpers', () => { expect(result[0].value).toBe('30 of 120 remaining'); }); + it('falls back to remaining count when remaining exceeds limit', () => { + const result = getPackageLimitEntries({ max_photos: 120, remaining_photos: 180 }, t); + + expect(result[0].value).toBe('Remaining 180'); + }); + it('formats event usage copy', () => { const result = formatEventUsage(3, 10, t); diff --git a/resources/js/admin/mobile/lib/packageSummary.ts b/resources/js/admin/mobile/lib/packageSummary.ts index 75c0a03..8091fbc 100644 --- a/resources/js/admin/mobile/lib/packageSummary.ts +++ b/resources/js/admin/mobile/lib/packageSummary.ts @@ -138,6 +138,12 @@ const formatLimitWithRemaining = (limit: number | null, remaining: number | null if (remaining !== null && remaining >= 0) { const normalizedRemaining = Number.isFinite(remaining) ? Math.max(0, Math.round(remaining)) : remaining; + if (normalizedRemaining > limit) { + return t('mobileBilling.usage.remaining', { + count: normalizedRemaining, + defaultValue: 'Remaining {{count}}', + }); + } return t('mobileBilling.usage.remainingOf', { remaining: normalizedRemaining, limit,