diff --git a/.ai/rules/jobs-post-hog.md b/.ai/rules/jobs-post-hog.md
index e608e1b086..3c3a2a7229 100644
--- a/.ai/rules/jobs-post-hog.md
+++ b/.ai/rules/jobs-post-hog.md
@@ -7,7 +7,7 @@ paths:
 # Jobs Post Hog
 
 ## Sync PostHog billing state after Cashier
-Listen to Cashier's WebhookHandled event so local subscription state is persisted before PostHog jobs are dispatched. Account group properties are the current snapshot: subscription_status is canceled as soon as an ends_at exists (including grace period), while has_active_subscription remains true until access ends. Keep first_month_offer_ends_at event-derived and set it only on subscription creation so renewals cannot extend it.
+Listen to Cashier's WebhookHandled event so local subscription state is persisted before PostHog jobs are dispatched. Account group properties are the current snapshot: subscription_status is canceled as soon as an ends_at exists (including grace period), while has_active_subscription remains true until access ends. Keep the group's offer_slug event-derived and set it only on subscription creation so renewals cannot change it.
 
 ## Stripe webhooks without a Cashier handler go through StripeBillingSignalListener
 Cashier fires `WebhookHandled` only for types with a `handle*` method. `checkout.session.expired`, `invoice.payment_failed` and `invoice.upcoming` have none, so `StripeBillingSignalListener` listens to `WebhookReceived` for them.
diff --git a/.env.example b/.env.example
index 3112b931e4..0b8176bde7 100644
--- a/.env.example
+++ b/.env.example
@@ -261,25 +261,11 @@ AI_AUDIO_PROVIDER=elevenlabs
 STRIPE_KEY=
 STRIPE_SECRET=
 STRIPE_WEBHOOK_SECRET=
-# SaaS default (recipe A): 8-day Stripe trial with card, no coupon, no promo field.
+# Discounts, trials and the promotion code field are offers (offers table).
 # REQUIRE_CARD_FOR_TRIAL=true forces Checkout before app access (no generic trial).
 REQUIRE_CARD_FOR_TRIAL=true
-# Trial length in days. Card-required Checkout uses trialDays for first-time
-# subscribers when no first-month coupon is applied; re-subscribers skip trial.
-# No-card mode uses this for accounts.trial_ends_at. 0 = off.
+# No-card mode only: length of the signup trial on accounts.trial_ends_at. 0 = off.
 CASHIER_TRIAL_DAYS=8
-# Per-plan first-month coupons (amount_off, duration=once) so month one is $1.
-# Socials $19 − $18, Workspaces $99 − $88. When set for a qualifying first-time
-# monthly checkout of that plan, applies the coupon and SKIPS trialDays.
-# Empty for that plan = trial mode above. Never reuse one coupon on the other
-# plan. Yearly prices never get a coupon. XOR with CASHIER_ALLOW_PROMOTION_CODES
-# only when the coupon would apply — Stripe forbids both on one session
-# (ConfigureSubscriptionCheckout throws).
-STRIPE_SOCIALS_FIRST_MONTH_COUPON_ID=
-STRIPE_WORKSPACES_FIRST_MONTH_COUPON_ID=
-# Show Stripe Checkout promotion-code field when no coupon is applied.
-# Defaults to false (recipe A). Must be false when a first-month coupon applies.
-CASHIER_ALLOW_PROMOTION_CODES=false
 
 # Stripe Plan Price IDs (one per plan × interval). Used by PlanSeeder.
 STRIPE_WORKSPACE_MONTHLY=
diff --git a/AGENTS.md b/AGENTS.md
index 6f41460d08..5ee6ed3801 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -286,25 +286,21 @@ Every lang string is rendered in all 16 locales, and the longest one decides the
 - A rewrite of existing text (shorten, rephrase, tone) keeps the text's own language; only new text is written in `{{ $language }}`.
 - AI is web only: no REST API endpoint and no MCP tool calls an AI agent.
 
-## Stripe Checkout (env knobs)
+## Stripe Checkout (offers and env knobs)
 
-Checkout options are configured only via env — do not hardcode trial/coupon/promo behavior in controllers. All of it goes through `App\Support\Billing\ConfigureSubscriptionCheckout` (called from `StartSubscriptionCheckout`).
+Everything that is not the full price is an offer (owner decision October 2026): the discount, the trial and the promotion code field live on the `offers` row (see "Offers"), never in env or in controllers. All of it goes through `App\Support\Billing\ConfigureSubscriptionCheckout` (called from `StartSubscriptionCheckout`).
 
 | Env | Config | Default | Effect |
 | --- | --- | --- | --- |
 | `REQUIRE_CARD_FOR_TRIAL` | `trypost.billing.require_card_for_trial` | `true` | `true`: app access only after Stripe Checkout (no generic signup trial). `false`: generic `accounts.trial_ends_at` trial without a card |
-| `CASHIER_TRIAL_DAYS` | `cashier.trial_days` | `8` | Card-required Checkout: `trialDays(N)` for **first-time** subscribers when no first-month coupon is applied (`0` = off). Re-subscribers skip trial. No-card mode: length of the generic signup trial |
-| `STRIPE_SOCIALS_FIRST_MONTH_COUPON_ID` | `cashier.first_month_coupon_ids.socials` | empty | Optional. `$18` off Socials monthly (`$19` → `$1`). When set for a qualifying first-time **monthly** checkout of that plan, applies `withCoupon` and **skips** trial. Empty = trial mode |
-| `STRIPE_WORKSPACES_FIRST_MONTH_COUPON_ID` | `cashier.first_month_coupon_ids.workspaces` | empty | Optional. `$88` off Workspaces monthly (`$99` → `$1`). Same qualification as the Socials coupon. Never reuse one coupon on the other plan |
-| `CASHIER_ALLOW_PROMOTION_CODES` | `cashier.allow_promotion_codes` | `false` | When `true` and no coupon is applied, show the Checkout promo-code field |
+| `CASHIER_TRIAL_DAYS` | `cashier.trial_days` | `8` | No-card mode only: length of the generic signup trial (`0` = off). The Checkout trial is an offer's `trial_days` |
 
 Standing constraints:
-- Stripe rejects `discounts` (coupon) and `allow_promotion_codes` on the same session — if both would apply, `ConfigureSubscriptionCheckout` must throw (fail loud). Never “prefer one silently.” Envs may both be set when the account does **not** qualify for the coupon (no throw).
-- A set first-month coupon wins over trial (`trialDays` is skipped for that checkout).
-- Empty coupon + card required + first-time must use `trialDays` — do **not** reintroduce a required-coupon throw.
-- Coupon qualification stays: card required, no prior real subscription (`incomplete` / `incomplete_expired` still qualify), **and** the checkout price is that plan's **monthly** price. Workspace count is irrelevant — Socials is already capped at one, and a first-time Workspaces subscriber qualifies the same way.
-- First-month coupons are **per plan**. Socials is `$18` off, Workspaces is `$88` off. Never apply one plan's coupon to the other price, and never apply either coupon to a yearly price — `$190 − $18` is not `$1`.
-- Welcome checkout is the last Welcome step, the plan step (`app.welcome.plan.store`): it shows only **Socials**, monthly, with the first-month offer, and always opens Stripe Checkout on the **Socials monthly** price. Yearly and Workspaces stay on the billing change-plan picker for existing subscribers (they do not get a first-month coupon).
+- Without an offer the checkout charges the full price at once: no coupon, no trial, no promotion code field.
+- An offer applies what its row sets: `stripe_coupon_id` (the discount), `trial_days` (clamped to Stripe's 2-day minimum) and `allow_promotion_codes`. Stripe rejects a coupon and promotion codes on one session but accepts a trial with either, so a coupon wins and the field is left off; a trial goes with both.
+- There are no first-month coupon or promotion code envs any more (`STRIPE_*_FIRST_MONTH_COUPON_ID` and `CASHIER_ALLOW_PROMOTION_CODES` were removed in October 2026). Every offer reaches an account through its link: the 7-day trial (`free-trial-7-days`, `trial_days` 8 because Stripe Checkout counts the trial one day short and shows 8 as 7 days, `first_subscription_only`), the `$1` first month (`first-month`, `first_subscription_only`) and Black Friday (`bf26`). There is no default offer: a signup without a link pays the full price. Do not reintroduce a checkout env.
+- First-subscription offers skip an account with a prior real subscription (`incomplete` / `incomplete_expired` still qualify).
+- Welcome checkout is the last Welcome step, the plan step (`app.welcome.plan.store`): it shows only **Socials**, monthly, and always opens Stripe Checkout on the **Socials monthly** price. Offers apply only there. Yearly and Workspaces stay on the billing change-plan picker for existing subscribers (no offer).
 - Prefer documenting durable billing decisions here (and in `AGENTS.md`) — do **not** create a `.ai/` rules folder for this project.
 
 ## Plans and the workspace limit
@@ -338,12 +334,9 @@ used** — `syncWorkspaceQuantity()` was removed with the per-workspace model.
     `workspaces.limit_reached`. Without a subscription it still goes to billing.
   - POST at the cap is refused the same way (to the list, not 403'd, never to create),
     tracked once by `store` itself after its transaction.
-- First-month coupon qualification is card required + first-time subscriber +
-  that plan's monthly price. Workspace count is not part of it.
-  (`incomplete` / `incomplete_expired` still qualify; coupon +
-  `allow_promotion_codes` still throws.) Each plan has its own coupon.
-- Welcome checks out Socials monthly only so the `$1` first month can exist.
-  Billing keeps yearly and Workspaces for subscribers changing plan.
+- Welcome checks out Socials monthly only, so an offer's price is always about
+  Socials monthly. Billing keeps yearly and Workspaces for subscribers changing
+  plan.
 - The legacy plan is archived: it never appears in the picker, so nobody can move
   back to it. Its `workspace_limit` is 1 because it costs less than Socials.
 - Welcome's plan step (`app.welcome.plan`, after the current-tool step) shows
@@ -363,6 +356,74 @@ used** — `syncWorkspaceQuantity()` was removed with the per-workspace model.
   `AccountPolicy::useAi` checks app access and nothing else. Do not
   reintroduce per-call usage recording.
 
+## Offers (`?offer=` links)
+
+An offer is anything the Welcome checkout gives instead of the full price
+(owner decision October 2026): a Stripe coupon, a trial, the promotion code
+field, or a mix. The 7-day trial (`free-trial-7-days`), the `$1` first month
+(`first-month`) and campaigns such as Black Friday (`bf26`) are all offers. It
+lives in `offers` (`slug` and `starts_at` required; `stripe_coupon_id`,
+`trial_days`, `ends_at` and `max_redemptions` nullable: no coupon, no trial, no
+end, no limit; `allow_promotion_codes`, `first_subscription_only` and
+`show_banner` false by default) and reaches an account through the pivot
+`account_offer` (`claimed_at`, `redeemed_at`).
+
+- **Capture.** `CaptureOffer` (web middleware) reads `?offer=<slug>` on any page.
+  A signed-in owner claims it at once (`ClaimOffer`). A guest's slug waits in the
+  session, only when it names an available offer, and the first authenticated
+  request claims it, so email signup, Google, GitHub and login need no code of
+  their own; moving between register and login keeps it. Slugs match exactly on
+  both engines through `Offer::findAvailable()` (MySQL compares without case). Ads and landing pages link to `/register?offer=<slug>`, win-back emails to
+  `/login?offer=<slug>`. There is no offer page or route.
+- **Who gets it.** Only an account owner whose account has no active
+  subscription: new signups and former customers alike, unless the offer is
+  `first_subscription_only`, which skips an account that was ever billed
+  (`hasHadBillableSubscription()`). `Offer::scopeAvailableTo()` holds both rules
+  and drops offers the account redeemed. An unknown, not yet started, ended or
+  full offer is ignored silently and nothing is kept for later. A redeemed offer
+  is never offered to that account again.
+- **The `offers` row is the only source of truth for dates and places.** The
+  Stripe coupon has no `redeem_by` and no `max_redemptions`. Only redemptions use
+  up a place (`Offer::scopeAvailable`), never a claim; two checkouts racing for the
+  last place may both get it (accepted).
+- **Checkout.** `Account::currentOffer()` picks the latest claim the account may
+  still use, else none (full price).
+  `ConfigureSubscriptionCheckout::apply()` applies it. Validity is checked again
+  when checkout starts. The controller resolves the offer once (`offerFor()`) and
+  hands the same one to `StartSubscriptionCheckout` and `apply()`, so the coupon,
+  the metadata and the tracked events agree. The offer id and slug go in the
+  subscription metadata (`trypost_offer_id`, `trypost_offer_slug`) and the slug in
+  the session metadata; the `customer.subscription.created` / `updated` webhook
+  writes `redeemed_at` (`RedeemOffer`) only once the subscription is `active` or
+  `trialing`, so an incomplete checkout never uses up a place. Offers apply only
+  to the Welcome checkout (Socials monthly).
+- **Tracking.** PostHog names the offer by its slug, `offer_slug`, on
+  `checkout.started`, `checkout.completed`, `checkout.expired` and the account
+  group (set on subscription creation). The old `is_first_month_offer`,
+  `first_month_coupon_id` and `first_month_offer_ends_at` are gone.
+- **Copy.** Each offer's copy lives in `lang/<locale>/offers.php` under the
+  slug with dashes as underscores (`free-trial-7-days` → `free_trial_7_days`): `name` (the
+  banner's tag), `headline` (the banner's sentence), `price`, `period` and an
+  optional `unit` shown next to the price (`/month` for Black Friday; a trial or
+  the `$1` first month has none, so their copy decides it, never the code), in all
+  16 locales; the price is display text per locale, like
+  `billing.subscribe.prices.socials.monthly`. Nothing about the discount is
+  stored in the database, and the banner (`name`, `headline`) is optional: an
+  offer has both or neither, while `price` and `period` are required
+  (`OfferCopyTest`). Each trial length is its own offer with its own copy
+  (`free-trial-7-days`, `free-trial-14-days`), so several can run at once. The page has no fallback language, so `OfferResource`
+  checks each key in the current locale only. The Welcome plan step shows the
+  banner (a `bg-foreground` pill, the name in a `bg-background` uppercase tag) only when the row has `show_banner` and `name` and `headline` exist, and the offer price only when `price` and `period` exist; it never
+  prints a raw key. A trial-only offer's button says
+  `welcome.plan_start_trial`; without an offer the step shows the full price.
+  `tests/Feature/Offer/OfferCopyTest.php` fails when an offer misses its copy in
+  any locale.
+- **Adding an offer.** Create its coupon in Stripe when it has one (no dates, no
+  limit), add its
+  copy to all 16 locales and deploy, then insert the `offers` row in each
+  environment's database by hand (owner decision October 2026: no data
+  migration, since the coupon id differs between Stripe test and live).
+
 ## Multiple social accounts per network
 
 A workspace may connect as many accounts of the same network as it wants (two
@@ -778,6 +839,7 @@ view turns a forgotten variable into a runtime-only failure.
     - **Exception — the per-post table on the channel insights page** (owner decision 2026-10-05): it is page-based with numbered pages, 10 posts per page (`ListChannelPublicationPerformance::INSIGHTS_PAGE_SIZE`, through `insightsPage()`), and keeps `?page=` in the URL; a sort, period or filter change goes back to page 1. The API endpoint and the MCP tool for the same list keep the config page size through `handle()`.
     - **Exception — the ideas board columns** (owner decision 2026-10-06): each stage column (and Unassigned) is its own scroll prop, `columns.<stage id|unassigned>`, with its own page name, and loads 10 ideas per page (`ListIdeas::BOARD_PAGE_SIZE`) as the column scrolls. A label filter change resets every column to page 1. Column counts come from the database (`stages.*.ideas_count`, `unassigned_count`), never from the loaded cards. The web board moves a card with `after_idea_id` (`MoveIdea::after()`), since a partly loaded column cannot send the full order; the API and MCP keep the full `idea_ids` contract. The gallery keeps the config page size.
     - **Exception — the "What's New" modal** (owner decision 2026-10-14): it loads 5 entries per page, enough to fill the modal (capped at 640px) and the next one loads only when the user scrolls (`ListChangelogEntries::PAGE_SIZE`) under the page name `changelog_page`, as the shared optional scroll prop `changelogEntries` (built with the `changelog` card prop by `BuildChangelogProps`, which `HandleInertiaRequests` only spreads), requested by a partial reload when the modal opens.
+    - **Exception — the invoices tab on the billing page** (October 2026): invoices live in Stripe, which only pages by cursor, so `BillingController@index` sends `Inertia::scroll()` over Cashier's `cursorPaginateInvoices()` (paid invoices only, config page size). It is the one cursor paginator in the app; database lists keep `paginate()`.
     - **This includes the public REST API** (`app/Http/Controllers/Api`). It used to pin its own page size of 15 as a stable contract; that exception is gone, so a list endpoint reads the same config as everything else. Changing `app.pagination.default` therefore changes the API's page size too — deliberate, and the reason a list response always carries `meta.per_page` for clients to read rather than assume.
 
 ## Changelog ("What's New")
diff --git a/app/Actions/Billing/StartSubscriptionCheckout.php b/app/Actions/Billing/StartSubscriptionCheckout.php
index 95c484288c..1b0c99afb9 100644
--- a/app/Actions/Billing/StartSubscriptionCheckout.php
+++ b/app/Actions/Billing/StartSubscriptionCheckout.php
@@ -6,6 +6,7 @@
 
 use App\Enums\Billing\Interval;
 use App\Models\Account;
+use App\Models\Offer;
 use App\Models\Plan;
 use App\Support\Billing\ConfigureSubscriptionCheckout;
 use Inertia\Inertia;
@@ -13,7 +14,7 @@
 
 class StartSubscriptionCheckout
 {
-    public function redirect(Account $account, string $priceId, string $cancelUrl, ?Plan $plan = null): Response
+    public function redirect(Account $account, string $priceId, string $cancelUrl, ?Plan $plan = null, ?Offer $offer = null): Response
     {
         // A leftover Workspaces row (unpaid/canceled without `deleted`) would
         // let Processing treat auth.plan as checkout-complete and skip the wait.
@@ -26,10 +27,15 @@ public function redirect(Account $account, string $priceId, string $cancelUrl, ?
         $monthlyPlan = $this->monthlyPlan($plan, $priceId);
         $subscription = $account->newSubscription(Account::SUBSCRIPTION_NAME, $priceId);
 
-        ConfigureSubscriptionCheckout::apply($subscription, $account, $monthlyPlan);
-        $subscription->withMetadata(array_filter([
-            ConfigureSubscriptionCheckout::FIRST_MONTH_COUPON_METADATA_KEY => $subscription->couponId,
-        ], filled(...)));
+        $offer = filled($monthlyPlan) ? $offer : null;
+
+        $offerMetadata = array_filter([
+            ConfigureSubscriptionCheckout::OFFER_METADATA_KEY => $offer?->id,
+            ConfigureSubscriptionCheckout::OFFER_SLUG_METADATA_KEY => $offer?->slug,
+        ], filled(...));
+
+        ConfigureSubscriptionCheckout::apply($subscription, $offer);
+        $subscription->withMetadata($offerMetadata);
 
         $session = $subscription->checkout([
             'success_url' => route('app.billing.processing').'?session_id={CHECKOUT_SESSION_ID}',
@@ -37,7 +43,7 @@ public function redirect(Account $account, string $priceId, string $cancelUrl, ?
             'metadata' => array_filter([
                 ConfigureSubscriptionCheckout::PLAN_METADATA_KEY => $plan?->slug->value,
                 ConfigureSubscriptionCheckout::INTERVAL_METADATA_KEY => (filled($plan) ? Interval::forPrice($plan, $priceId) : Interval::Monthly)->value,
-                ConfigureSubscriptionCheckout::FIRST_MONTH_OFFER_METADATA_KEY => filled($subscription->couponId) ? 'true' : 'false',
+                ConfigureSubscriptionCheckout::OFFER_SLUG_METADATA_KEY => $offer?->slug,
             ], filled(...)),
         ]);
 
diff --git a/app/Actions/Offer/ClaimOffer.php b/app/Actions/Offer/ClaimOffer.php
new file mode 100644
index 0000000000..ebb7512de6
--- /dev/null
+++ b/app/Actions/Offer/ClaimOffer.php
@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Actions\Offer;
+
+use App\Models\Account;
+use App\Models\Offer;
+
+class ClaimOffer
+{
+    /**
+     * Ties an available offer to an account without an active subscription.
+     * An unknown, unavailable or already redeemed offer is ignored.
+     */
+    public static function execute(Account $account, string $slug): ?Offer
+    {
+        if ($account->hasActiveSubscription()) {
+            return null;
+        }
+
+        $offer = Offer::findAvailable($slug);
+
+        if (blank($offer)) {
+            return null;
+        }
+
+        if ($offer->redemptions()->whereKey($account->id)->exists()) {
+            return null;
+        }
+
+        $account->offers()->syncWithoutDetaching([$offer->id => ['claimed_at' => now()]]);
+
+        return $offer;
+    }
+}
diff --git a/app/Actions/Offer/RedeemOffer.php b/app/Actions/Offer/RedeemOffer.php
new file mode 100644
index 0000000000..5f9404c8d5
--- /dev/null
+++ b/app/Actions/Offer/RedeemOffer.php
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Actions\Offer;
+
+use App\Models\Account;
+use Illuminate\Support\Str;
+
+class RedeemOffer
+{
+    /**
+     * Records that the account's subscription was created with the offer's
+     * coupon. Only the first redemption counts; an offer the account never
+     * claimed is ignored.
+     */
+    public static function execute(Account $account, ?string $offerId): void
+    {
+        if (! Str::isUuid($offerId)) {
+            return;
+        }
+
+        $account->offers()
+            ->wherePivotNull('redeemed_at')
+            ->updateExistingPivot($offerId, ['redeemed_at' => now()]);
+    }
+}
diff --git a/app/Http/Controllers/App/BillingController.php b/app/Http/Controllers/App/BillingController.php
index 0aec8ad033..2cb742dcfa 100644
--- a/app/Http/Controllers/App/BillingController.php
+++ b/app/Http/Controllers/App/BillingController.php
@@ -6,9 +6,13 @@
 
 use App\Enums\Billing\Interval;
 use App\Http\Requests\App\Billing\ChangePlanRequest;
+use App\Http\Resources\App\InvoiceResource;
+use App\Http\Resources\App\PaymentMethodResource;
 use App\Http\Resources\App\PlanResource;
+use App\Http\Resources\App\SubscriptionDiscountResource;
 use App\Models\Account;
 use App\Models\Plan;
+use App\Models\Subscription;
 use App\Support\Billing\SubscriptionPlanSync;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
@@ -16,6 +20,7 @@
 use Inertia\Inertia;
 use Inertia\Response;
 use Laravel\Cashier\Exceptions\IncompletePayment;
+use Laravel\Cashier\PaymentMethod;
 use Symfony\Component\HttpFoundation\Response as SymfonyResponse;
 
 class BillingController extends Controller
@@ -60,18 +65,52 @@ public function index(Request $request): Response|RedirectResponse
             ]),
             'plan' => $account->plan ? PlanResource::make($account->plan)->resolve() : null,
             'workspaceCount' => $account->workspaces()->count(),
-            'workspaceLimit' => $account->workspaceLimit(),
-            'invoices' => $account->invoices()->map(fn ($invoice) => [
-                'id' => $invoice->id,
-                'date' => $invoice->date(),
-                'total' => $invoice->total(),
-                'status' => $invoice->status,
-                'invoice_pdf' => $invoice->invoice_pdf,
-            ]),
-            'defaultPaymentMethod' => $account->displayablePaymentMethod(),
+            'invoices' => Inertia::scroll(
+                fn () => InvoiceResource::collection($account->cursorPaginateInvoices((int) config('app.pagination.default'), ['status' => 'paid'])),
+            )->matchOn('data.id'),
+            'paymentMethods' => $this->paymentMethods($account),
+            'discount' => $this->discount($account, $subscription),
         ]);
     }
 
+    /**
+     * The customer's cards, the default one first. Stripe Checkout trials anchor
+     * the card to the subscription, not the customer, so without
+     * `invoice_settings.default_payment_method` the first card is the default.
+     *
+     * @return list<array{id: string, brand: string, last4: string, exp_month: int, exp_year: int, is_default: bool}>
+     */
+    private function paymentMethods(Account $account): array
+    {
+        $paymentMethods = $account->paymentMethods('card');
+
+        if ($paymentMethods->isEmpty()) {
+            return [];
+        }
+
+        $defaultId = $account->defaultPaymentMethod()?->id ?? $paymentMethods->first()->id;
+
+        return $paymentMethods
+            ->sortByDesc(fn (PaymentMethod $paymentMethod): bool => $paymentMethod->id === $defaultId)
+            ->map(fn (PaymentMethod $paymentMethod): array => PaymentMethodResource::make($paymentMethod, $paymentMethod->id === $defaultId)->resolve())
+            ->values()
+            ->all();
+    }
+
+    /**
+     * @return array{value: string, duration: string, ends_at: string|null}|null
+     */
+    private function discount(Account $account, ?Subscription $subscription): ?array
+    {
+        if (blank($subscription) || ! $account->hasStripeId()) {
+            return null;
+        }
+
+        $discount = $subscription->discount();
+
+        return filled($discount) ? SubscriptionDiscountResource::make($discount)->resolve() : null;
+    }
+
     public function changePlan(ChangePlanRequest $request): RedirectResponse
     {
         if (config('trypost.self_hosted')) {
diff --git a/app/Http/Controllers/App/WelcomeController.php b/app/Http/Controllers/App/WelcomeController.php
index aa06d57a3d..40cd55d17b 100644
--- a/app/Http/Controllers/App/WelcomeController.php
+++ b/app/Http/Controllers/App/WelcomeController.php
@@ -17,6 +17,7 @@
 use App\Http\Requests\App\Welcome\StoreWelcomeMcpConnectClickRequest;
 use App\Http\Requests\App\Welcome\StoreWelcomePersonaRequest;
 use App\Http\Requests\App\Welcome\StoreWelcomeSoftwareRequest;
+use App\Http\Resources\App\OfferResource;
 use App\Http\Resources\App\PlanResource;
 use App\Models\Plan;
 use App\Services\PostHogService;
@@ -154,10 +155,11 @@ public function plan(Request $request): InertiaResponse|RedirectResponse
         }
 
         $plan = Plan::active()->where('slug', Slug::Socials)->firstOrFail();
+        $offer = ConfigureSubscriptionCheckout::offerFor($request->user()->account, $plan);
 
         return Inertia::render('welcome/Plan', [
             'plan' => PlanResource::make($plan)->resolve(),
-            'firstMonthOffer' => ConfigureSubscriptionCheckout::offersFirstMonthCoupon($request->user()->account, $plan),
+            'offer' => filled($offer) ? OfferResource::make($offer)->resolve() : null,
         ]);
     }
 
@@ -176,8 +178,8 @@ public function storePlan(
 
         abort_if($priceId === null, Response::HTTP_INTERNAL_SERVER_ERROR, 'Price is not configured.');
 
-        $firstMonthOffer = ConfigureSubscriptionCheckout::offersFirstMonthCoupon($user->account, $plan);
-        $response = $checkout->redirect($user->account, $priceId, route('app.welcome.plan'), $plan);
+        $offer = ConfigureSubscriptionCheckout::offerFor($user->account, $plan);
+        $response = $checkout->redirect($user->account, $priceId, route('app.welcome.plan'), $plan, $offer);
 
         try {
             $postHog->capture(
@@ -186,7 +188,7 @@ public function storePlan(
                 [
                     'plan_name' => $plan->name,
                     'interval' => Interval::Monthly->value,
-                    'is_first_month_offer' => $firstMonthOffer,
+                    'offer_slug' => $offer?->slug,
                 ],
                 $user->account,
             );
diff --git a/app/Http/Middleware/App/CaptureOffer.php b/app/Http/Middleware/App/CaptureOffer.php
new file mode 100644
index 0000000000..46d62d6701
--- /dev/null
+++ b/app/Http/Middleware/App/CaptureOffer.php
@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Middleware\App;
+
+use App\Actions\Offer\ClaimOffer;
+use App\Models\Offer;
+use Closure;
+use Illuminate\Http\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+class CaptureOffer
+{
+    public const string SESSION_KEY = 'pending_offer';
+
+    /**
+     * Claims an `?offer=` for a signed-in owner at once. A guest's slug waits
+     * in the session until they sign in: signup (email, Google, GitHub) and
+     * login all land on an authenticated request, so none of them handles it.
+     *
+     * @param  Closure(Request): (Response)  $next
+     */
+    public function handle(Request $request, Closure $next): Response
+    {
+        $slug = $request->query('offer');
+        $slug = is_string($slug) && filled($slug) ? $slug : null;
+        $user = $request->user();
+
+        if (blank($user)) {
+            if (filled($slug) && filled(Offer::findAvailable($slug))) {
+                $request->session()->put(self::SESSION_KEY, $slug);
+            }
+
+            return $next($request);
+        }
+
+        $pendingSlug = $request->session()->pull(self::SESSION_KEY);
+        $slug ??= $pendingSlug;
+
+        if (filled($slug) && $user->isAccountOwner() && filled($user->account)) {
+            ClaimOffer::execute($user->account, $slug);
+        }
+
+        return $next($request);
+    }
+}
diff --git a/app/Http/Resources/App/InvoiceResource.php b/app/Http/Resources/App/InvoiceResource.php
new file mode 100644
index 0000000000..d7640325e5
--- /dev/null
+++ b/app/Http/Resources/App/InvoiceResource.php
@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Resources\App;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+use Laravel\Cashier\Invoice;
+
+/**
+ * A paid invoice on the billing page's invoices tab.
+ *
+ * @mixin Invoice
+ */
+class InvoiceResource extends JsonResource
+{
+    /**
+     * @return array{id: string, date: string, total: string, status: string, invoice_pdf: string|null}
+     */
+    public function toArray(Request $request): array
+    {
+        return [
+            'id' => $this->id,
+            'date' => $this->date()->toIso8601String(),
+            'total' => $this->total(),
+            'status' => $this->status,
+            'invoice_pdf' => $this->invoice_pdf,
+        ];
+    }
+}
diff --git a/app/Http/Resources/App/OfferResource.php b/app/Http/Resources/App/OfferResource.php
new file mode 100644
index 0000000000..72be385f19
--- /dev/null
+++ b/app/Http/Resources/App/OfferResource.php
@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Resources\App;
+
+use App\Models\Offer;
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+use Illuminate\Support\Facades\Lang;
+
+/**
+ * The offer's copy lives in lang/<locale>/offers.php. The page has no
+ * fallback language, so each key is checked in the current locale only and
+ * the page never prints a raw key.
+ *
+ * @mixin Offer
+ */
+class OfferResource extends JsonResource
+{
+    /**
+     * @return array{key: string, trial_days: int|null, has_coupon: bool, has_banner: bool, has_price: bool, has_unit: bool}
+     */
+    public function toArray(Request $request): array
+    {
+        $key = $this->langKey();
+
+        return [
+            'key' => $key,
+            'trial_days' => $this->trial_days,
+            'has_coupon' => filled($this->stripe_coupon_id),
+            'has_banner' => $this->show_banner && $this->hasCopy("offers.{$key}.name") && $this->hasCopy("offers.{$key}.headline"),
+            'has_price' => $this->hasCopy("offers.{$key}.price") && $this->hasCopy("offers.{$key}.period"),
+            'has_unit' => $this->hasCopy("offers.{$key}.unit"),
+        ];
+    }
+
+    private function hasCopy(string $key): bool
+    {
+        return Lang::has($key, null, false);
+    }
+}
diff --git a/app/Http/Resources/App/PaymentMethodResource.php b/app/Http/Resources/App/PaymentMethodResource.php
new file mode 100644
index 0000000000..9b8ca531c8
--- /dev/null
+++ b/app/Http/Resources/App/PaymentMethodResource.php
@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Resources\App;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+use Laravel\Cashier\PaymentMethod;
+
+/**
+ * A card saved on the Stripe customer, as the billing page lists it.
+ *
+ * @mixin PaymentMethod
+ */
+class PaymentMethodResource extends JsonResource
+{
+    public function __construct(PaymentMethod $resource, private bool $isDefault = false)
+    {
+        parent::__construct($resource);
+    }
+
+    /**
+     * @return array{id: string, brand: string, last4: string, exp_month: int, exp_year: int, is_default: bool}
+     */
+    public function toArray(Request $request): array
+    {
+        return [
+            'id' => $this->id,
+            'brand' => $this->card->brand,
+            'last4' => $this->card->last4,
+            'exp_month' => $this->card->exp_month,
+            'exp_year' => $this->card->exp_year,
+            'is_default' => $this->isDefault,
+        ];
+    }
+}
diff --git a/app/Http/Resources/App/SubscriptionDiscountResource.php b/app/Http/Resources/App/SubscriptionDiscountResource.php
new file mode 100644
index 0000000000..56b042a054
--- /dev/null
+++ b/app/Http/Resources/App/SubscriptionDiscountResource.php
@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Resources\App;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Number;
+use Laravel\Cashier\Discount;
+
+/**
+ * The coupon on the subscription, so the billing page can say why the
+ * invoice is lower than the plan price.
+ *
+ * @mixin Discount
+ */
+class SubscriptionDiscountResource extends JsonResource
+{
+    /**
+     * @return array{value: string, duration: string, ends_at: string|null}
+     */
+    public function toArray(Request $request): array
+    {
+        $coupon = $this->coupon();
+
+        return [
+            'value' => $coupon->isPercentage()
+                ? Number::percentage($coupon->percentOff(), maxPrecision: 2, locale: App::currentLocale())
+                : $coupon->amountOff(),
+            'duration' => $coupon->duration(),
+            'ends_at' => $this->end()?->toIso8601String(),
+        ];
+    }
+}
diff --git a/app/Jobs/PostHog/TrackBilling.php b/app/Jobs/PostHog/TrackBilling.php
index 9e9d638347..08a1c9ae0b 100644
--- a/app/Jobs/PostHog/TrackBilling.php
+++ b/app/Jobs/PostHog/TrackBilling.php
@@ -64,7 +64,7 @@ public function handle(PostHogService $postHog): void
             'subscription_status' => $account->subscriptionStatus(),
             'has_active_subscription' => $account->hasActiveSubscription(),
             ...$this->currentCancellationProperties($account),
-            ...$this->firstMonthOfferProperties(),
+            ...$this->offerProperties(),
         ]);
 
         SyncUser::dispatch((string) $account->owner_id);
@@ -113,14 +113,14 @@ private function cancelReasonProperties(): array
     /**
      * @return array<string, mixed>
      */
-    private function firstMonthOfferProperties(): array
+    private function offerProperties(): array
     {
         if ($this->event !== BillingEvent::Created) {
             return [];
         }
 
         return [
-            'first_month_offer_ends_at' => StripeSubscriptionConversion::firstMonthOfferEndsAt($this->payload),
+            'offer_slug' => StripeSubscriptionConversion::offerSlug($this->payload),
         ];
     }
 }
diff --git a/app/Jobs/PostHog/TrackCheckoutExpired.php b/app/Jobs/PostHog/TrackCheckoutExpired.php
index 16c0939223..d9f9c7446c 100644
--- a/app/Jobs/PostHog/TrackCheckoutExpired.php
+++ b/app/Jobs/PostHog/TrackCheckoutExpired.php
@@ -22,7 +22,7 @@ protected function event(): string
     }
 
     /**
-     * @return array{plan_name: string|null, interval: string|null, is_first_month_offer: bool, checkout_session_id: string|null}
+     * @return array{plan_name: string|null, interval: string|null, offer_slug: string|null, checkout_session_id: string|null}
      */
     protected function properties(Account $account): array
     {
@@ -32,7 +32,7 @@ protected function properties(Account $account): array
         return [
             'plan_name' => filled($planSlug) ? Plan::where('slug', $planSlug)->value('name') : null,
             'interval' => data_get($metadata, ConfigureSubscriptionCheckout::INTERVAL_METADATA_KEY),
-            'is_first_month_offer' => data_get($metadata, ConfigureSubscriptionCheckout::FIRST_MONTH_OFFER_METADATA_KEY) === 'true',
+            'offer_slug' => data_get($metadata, ConfigureSubscriptionCheckout::OFFER_SLUG_METADATA_KEY),
             'checkout_session_id' => data_get($this->payload, 'data.object.id'),
         ];
     }
diff --git a/app/Listeners/StripeEventListener.php b/app/Listeners/StripeEventListener.php
index fa3f754e92..b5373594dd 100644
--- a/app/Listeners/StripeEventListener.php
+++ b/app/Listeners/StripeEventListener.php
@@ -4,6 +4,7 @@
 
 namespace App\Listeners;
 
+use App\Actions\Offer\RedeemOffer;
 use App\Enums\PostHog\BillingEvent;
 use App\Jobs\PostHog\TrackBilling;
 use App\Jobs\PostHog\TrackCheckoutCompleted;
@@ -13,6 +14,7 @@
 use App\Models\Account;
 use App\Models\Plan;
 use App\Services\PostHogService;
+use App\Support\Billing\ConfigureSubscriptionCheckout;
 use App\Support\Billing\SubscriptionPlanSync;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Log;
@@ -61,7 +63,7 @@ public function handle(WebhookHandled $event): void
 
     /**
      * A subscription is born either `trialing` (card-required trial, no charge
-     * yet) or `active` (first-month coupon or no trial, charged at once): two
+     * yet) or `active` (an offer without a trial, or no offer, charged at once): two
      * business events, see App\Support\StripeSubscriptionConversion.
      *
      * @param  array<string, mixed>  $payload
@@ -70,6 +72,7 @@ protected function handleSubscriptionCreated(Account $account, array $payload):
     {
         $previousPlan = $account->plan?->name;
 
+        $this->redeemOffer($account, $payload);
         $this->syncPlanFromSubscription($account, $payload, clearGenericTrial: true);
         $this->recordFirstPayment($account, $payload);
 
@@ -85,6 +88,7 @@ protected function handleSubscriptionUpdated(Account $account, array $payload):
     {
         $previousPlan = $account->plan?->name;
 
+        $this->redeemOffer($account, $payload);
         $this->syncPlanFromSubscription($account, $payload);
         $this->recordFirstPayment($account, $payload);
 
@@ -218,6 +222,21 @@ private function resolvePlanFromSubscriptionItems(array $payload, Account $accou
         return $plan;
     }
 
+    /**
+     * An offer is used once its subscription is active or trialing: an
+     * incomplete one may never be paid, and would use up a place for nothing.
+     *
+     * @param  array<string, mixed>  $payload
+     */
+    private function redeemOffer(Account $account, array $payload): void
+    {
+        if (! SubscriptionPlanSync::allows($this->currentStatus($payload))) {
+            return;
+        }
+
+        RedeemOffer::execute($account, data_get($payload, ['data', 'object', 'metadata', ConfigureSubscriptionCheckout::OFFER_METADATA_KEY]));
+    }
+
     /**
      * @param  array<string, mixed>  $payload
      */
diff --git a/app/Models/Account.php b/app/Models/Account.php
index 0a683e7f39..4ed90e2170 100644
--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@@ -14,6 +14,7 @@
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 
@@ -72,6 +73,20 @@ public function invites(): HasMany
         return $this->hasMany(Invite::class);
     }
 
+    public function offers(): BelongsToMany
+    {
+        return $this->belongsToMany(Offer::class)->withPivot('claimed_at', 'redeemed_at');
+    }
+
+    /**
+     * The offer the Welcome checkout uses: the most recently claimed one the
+     * account may still use. Without one it pays the full price.
+     */
+    public function currentOffer(): ?Offer
+    {
+        return $this->offers()->availableTo($this)->orderByPivot('claimed_at', 'desc')->first();
+    }
+
     public function posts(): HasManyThrough
     {
         return $this->hasManyThrough(Post::class, Workspace::class);
@@ -208,28 +223,4 @@ public function activeTrialEndsAt(): ?CarbonInterface
 
         return $subscription->trial_ends_at;
     }
-
-    /**
-     * Returns the displayable card for the billing UI. Falls back to the first
-     * attached payment method when the customer has no `invoice_settings.default_payment_method`
-     * (Stripe Checkout trials anchor the card to the subscription, not the customer).
-     *
-     * @return array{brand: string, last4: string, exp_month: int, exp_year: int}|null
-     */
-    public function displayablePaymentMethod(): ?array
-    {
-        $paymentMethod = $this->defaultPaymentMethod() ?? $this->paymentMethods()->first();
-        $card = $paymentMethod?->card;
-
-        if (! $card) {
-            return null;
-        }
-
-        return [
-            'brand' => $card->brand,
-            'last4' => $card->last4,
-            'exp_month' => $card->exp_month,
-            'exp_year' => $card->exp_year,
-        ];
-    }
 }
diff --git a/app/Models/Offer.php b/app/Models/Offer.php
new file mode 100644
index 0000000000..ee9ee73f08
--- /dev/null
+++ b/app/Models/Offer.php
@@ -0,0 +1,99 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Models;
+
+use Database\Factories\OfferFactory;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Concerns\HasUuids;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Str;
+
+class Offer extends Model
+{
+    /** @use HasFactory<OfferFactory> */
+    use HasFactory, HasUuids;
+
+    protected $fillable = [
+        'slug',
+        'stripe_coupon_id',
+        'trial_days',
+        'allow_promotion_codes',
+        'starts_at',
+        'ends_at',
+        'max_redemptions',
+        'first_subscription_only',
+        'show_banner',
+    ];
+
+    protected function casts(): array
+    {
+        return [
+            'starts_at' => 'datetime',
+            'ends_at' => 'datetime',
+            'trial_days' => 'integer',
+            'allow_promotion_codes' => 'boolean',
+            'max_redemptions' => 'integer',
+            'first_subscription_only' => 'boolean',
+            'show_banner' => 'boolean',
+        ];
+    }
+
+    public function accounts(): BelongsToMany
+    {
+        return $this->belongsToMany(Account::class)->withPivot('claimed_at', 'redeemed_at');
+    }
+
+    /**
+     * The accounts that redeemed the offer. Each one uses up a place.
+     */
+    public function redemptions(): BelongsToMany
+    {
+        return $this->accounts()->wherePivotNotNull('redeemed_at');
+    }
+
+    /**
+     * Started, not ended, and with a place left. Only redemptions use up a
+     * place; a claim alone never does.
+     */
+    public function scopeAvailable(Builder $query): Builder
+    {
+        return $query
+            ->whereNowOrPast('offers.starts_at')
+            ->where(fn (Builder $query): Builder => $query->whereNull('offers.ends_at')->orWhereFuture('offers.ends_at'))
+            ->where(fn (Builder $query): Builder => $query->whereNull('offers.max_redemptions')->orHas('redemptions', '<', DB::raw('offers.max_redemptions')));
+    }
+
+    /**
+     * Available offers the account may still use: never one it redeemed, and
+     * a first-subscription offer only while it has never been billed.
+     */
+    public function scopeAvailableTo(Builder $query, Account $account): Builder
+    {
+        return $query
+            ->available()
+            ->whereDoesntHave('redemptions', fn (Builder $query): Builder => $query->whereKey($account->id))
+            ->when($account->hasHadBillableSubscription(), fn (Builder $query): Builder => $query->where('offers.first_subscription_only', false));
+    }
+
+    /**
+     * The available offer with exactly this slug. MySQL compares strings
+     * without case, so the match is confirmed here, where both engines agree.
+     */
+    public static function findAvailable(string $slug): ?self
+    {
+        return self::available()->where('slug', $slug)->get()->firstWhere('slug', $slug);
+    }
+
+    /**
+     * The key of the offer's copy in lang/<locale>/offers.php.
+     */
+    public function langKey(): string
+    {
+        return Str::replace('-', '_', $this->slug);
+    }
+}
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 64d6b0d569..c459d837c4 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -19,6 +19,7 @@
 use App\Models\Media;
 use App\Models\MediaSourceConnection;
 use App\Models\NotificationPreference;
+use App\Models\Offer;
 use App\Models\Plan;
 use App\Models\Post;
 use App\Models\PostNote;
@@ -117,6 +118,7 @@ protected function configureMorphMap(): void
             'media' => Media::class,
             'mediaSourceConnection' => MediaSourceConnection::class,
             'notificationPreference' => NotificationPreference::class,
+            'offer' => Offer::class,
             'plan' => Plan::class,
             'post' => Post::class,
             'repurpose' => Repurpose::class,
diff --git a/app/Support/Billing/ConfigureSubscriptionCheckout.php b/app/Support/Billing/ConfigureSubscriptionCheckout.php
index 4bf0b7336a..c7c472f02a 100644
--- a/app/Support/Billing/ConfigureSubscriptionCheckout.php
+++ b/app/Support/Billing/ConfigureSubscriptionCheckout.php
@@ -5,19 +5,19 @@
 namespace App\Support\Billing;
 
 use App\Models\Account;
+use App\Models\Offer;
 use App\Models\Plan;
 use Laravel\Cashier\SubscriptionBuilder;
-use RuntimeException;
 
 final class ConfigureSubscriptionCheckout
 {
-    public const FIRST_MONTH_COUPON_METADATA_KEY = 'trypost_first_month_coupon_id';
-
     public const PLAN_METADATA_KEY = 'trypost_plan_slug';
 
     public const INTERVAL_METADATA_KEY = 'trypost_interval';
 
-    public const FIRST_MONTH_OFFER_METADATA_KEY = 'trypost_first_month_offer';
+    public const OFFER_METADATA_KEY = 'trypost_offer_id';
+
+    public const OFFER_SLUG_METADATA_KEY = 'trypost_offer_slug';
 
     /**
      * Stripe Checkout rejects subscription trials shorter than 48 hours.
@@ -25,68 +25,35 @@ final class ConfigureSubscriptionCheckout
     public const MIN_CHECKOUT_TRIAL_DAYS = 2;
 
     /**
-     * @throws RuntimeException when a coupon would apply with allow_promotion_codes enabled
+     * The offer decides the discount, the trial and the promotion code field;
+     * without one the account pays the full price. A coupon wins over the
+     * field: Stripe rejects both on one session, never a trial with it.
+     * The caller resolves the offer once with offerFor(), so the coupon, the
+     * checkout metadata and the tracked events agree.
      */
-    public static function apply(SubscriptionBuilder $subscription, Account $account, ?Plan $plan = null): SubscriptionBuilder
+    public static function apply(SubscriptionBuilder $subscription, ?Offer $offer = null): SubscriptionBuilder
     {
-        $couponId = self::firstMonthCouponId($account, $plan);
-
-        if ($couponId !== null) {
-            if ((bool) config('cashier.allow_promotion_codes', false)) {
-                throw new RuntimeException(
-                    'Cannot apply a first-month coupon while CASHIER_ALLOW_PROMOTION_CODES is enabled: '
-                    .'Stripe Checkout rejects discounts and allow_promotion_codes on the same session.'
-                );
-            }
-
-            return $subscription->withCoupon($couponId);
+        if (filled($offer?->trial_days)) {
+            $subscription->trialDays(max(self::MIN_CHECKOUT_TRIAL_DAYS, $offer->trial_days));
         }
 
-        if (
-            (bool) config('trypost.billing.require_card_for_trial', true)
-            && self::isFirstTimeSubscriber($account)
-        ) {
-            $trialDays = (int) config('cashier.trial_days');
-
-            if ($trialDays > 0) {
-                $subscription->trialDays(max(self::MIN_CHECKOUT_TRIAL_DAYS, $trialDays));
-            }
+        if (filled($offer?->stripe_coupon_id)) {
+            return $subscription->withCoupon($offer->stripe_coupon_id);
         }
 
-        if ((bool) config('cashier.allow_promotion_codes', false)) {
+        if ($offer?->allow_promotion_codes === true) {
             $subscription->allowPromotionCodes();
         }
 
         return $subscription;
     }
 
-    public static function offersFirstMonthCoupon(Account $account, Plan $plan): bool
-    {
-        return self::firstMonthCouponId($account, $plan) !== null;
-    }
-
-    private static function firstMonthCouponId(Account $account, ?Plan $plan): ?string
-    {
-        if ($plan === null || ! (bool) config('trypost.billing.require_card_for_trial', true)) {
-            return null;
-        }
-
-        if (! self::isFirstTimeSubscriber($account)) {
-            return null;
-        }
-
-        $couponId = config("cashier.first_month_coupon_ids.{$plan->slug->value}");
-
-        if (! is_string($couponId) || $couponId === '') {
-            return null;
-        }
-
-        return $couponId;
-    }
-
-    /** Incomplete / incomplete_expired never became billable, so retries still count as first-time. */
-    private static function isFirstTimeSubscriber(Account $account): bool
+    /**
+     * The offer the Welcome checkout applies. It needs the monthly plan,
+     * which only the Welcome checkout passes.
+     */
+    public static function offerFor(Account $account, ?Plan $plan): ?Offer
     {
-        return ! $account->hasHadBillableSubscription();
+        return filled($plan) ? $account->currentOffer() : null;
     }
 }
diff --git a/app/Support/StripeSubscriptionConversion.php b/app/Support/StripeSubscriptionConversion.php
index 76c4f9c977..086bf2d1a9 100644
--- a/app/Support/StripeSubscriptionConversion.php
+++ b/app/Support/StripeSubscriptionConversion.php
@@ -8,7 +8,6 @@
 use App\Models\Account;
 use App\Support\Billing\ConfigureSubscriptionCheckout;
 use App\Support\Billing\StripeValue;
-use Illuminate\Support\Carbon;
 
 final class StripeSubscriptionConversion
 {
@@ -54,56 +53,26 @@ public static function propertiesFor(Account $account, array $payload): array
     }
 
     /**
+     * propertiesFor() plus the slug of the offer the checkout applied.
+     *
      * @param  array<string, mixed>  $payload
      * @return array<string, mixed>
      */
     public static function checkoutPropertiesFor(Account $account, array $payload): array
     {
-        $properties = self::propertiesFor($account, $payload);
-        $firstMonthCouponId = self::firstMonthCouponId($payload);
-
-        $properties['is_first_month_offer'] = $firstMonthCouponId !== null;
-
-        if ($firstMonthCouponId === null) {
-            return $properties;
-        }
-
-        $properties['first_month_coupon_id'] = $firstMonthCouponId;
-        $firstMonthOfferEndsAt = self::firstMonthOfferEndsAt($payload);
-
-        if ($firstMonthOfferEndsAt !== null) {
-            $properties['first_month_offer_ends_at'] = $firstMonthOfferEndsAt;
-        }
-
-        return $properties;
-    }
-
-    /**
-     * @param  array<string, mixed>  $payload
-     */
-    public static function firstMonthOfferEndsAt(array $payload): ?string
-    {
-        if (self::firstMonthCouponId($payload) === null) {
-            return null;
-        }
-
-        $currentPeriodEnd = data_get($payload, 'data.object.items.data.0.current_period_end');
-
-        return is_int($currentPeriodEnd)
-            ? Carbon::createFromTimestamp($currentPeriodEnd)->toIso8601String()
-            : null;
+        return [
+            ...self::propertiesFor($account, $payload),
+            'offer_slug' => self::offerSlug($payload),
+        ];
     }
 
     /**
      * @param  array<string, mixed>  $payload
      */
-    private static function firstMonthCouponId(array $payload): ?string
+    public static function offerSlug(array $payload): ?string
     {
-        $couponId = data_get(
-            $payload,
-            'data.object.metadata.'.ConfigureSubscriptionCheckout::FIRST_MONTH_COUPON_METADATA_KEY,
-        );
+        $slug = data_get($payload, ['data', 'object', 'metadata', ConfigureSubscriptionCheckout::OFFER_SLUG_METADATA_KEY]);
 
-        return is_string($couponId) && $couponId !== '' ? $couponId : null;
+        return is_string($slug) && filled($slug) ? $slug : null;
     }
 }
diff --git a/bootstrap/app.php b/bootstrap/app.php
index df4c31d6b7..e30eb12c11 100644
--- a/bootstrap/app.php
+++ b/bootstrap/app.php
@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use App\Http\Middleware\Api\LoadWorkspaceFromToken;
+use App\Http\Middleware\App\CaptureOffer;
 use App\Http\Middleware\App\EnsureRegistrationEnabled;
 use App\Http\Middleware\App\HandleInertiaRequests;
 use App\Http\Middleware\App\SetLocale;
@@ -28,6 +29,7 @@
 
         $middleware->web(append: [
             SetLocale::class,
+            CaptureOffer::class,
             HandleInertiaRequests::class,
             AddLinkHeadersForPreloadedAssets::class,
         ]);
diff --git a/config/cashier.php b/config/cashier.php
index 48020b1218..775e0c85b0 100644
--- a/config/cashier.php
+++ b/config/cashier.php
@@ -135,51 +135,13 @@
     | Trial Period
     |--------------------------------------------------------------------------
     |
-    | Days of trial. With REQUIRE_CARD_FOR_TRIAL=true and no first-month coupon
-    | applied, first-time checkouts get Stripe trialDays (status trialing).
-    | Re-subscribers (any prior real subscription) skip trial. With
-    | REQUIRE_CARD_FOR_TRIAL=false, it is the generic signup trial length on
-    | accounts.trial_ends_at. Set to 0 to disable trials. Stripe Checkout
-    | rejects trials shorter than 48 hours — values of 1 are clamped to 2.
+    | Length of the signup trial on accounts.trial_ends_at when
+    | REQUIRE_CARD_FOR_TRIAL=false (no card at signup). Set to 0 to disable
+    | it. The Checkout trial is not configured here: it is an offer's
+    | trial_days (offers table).
     |
     */
 
     'trial_days' => env('CASHIER_TRIAL_DAYS', 8),
 
-    /*
-    |--------------------------------------------------------------------------
-    | Paid First Month Coupons
-    |--------------------------------------------------------------------------
-    |
-    | Per-plan Stripe Coupon IDs (amount_off, duration=once) so the first
-    | monthly invoice is $1: Socials $19 − $18, Workspaces $99 − $88. When
-    | the matching coupon is set and the account qualifies (card required,
-    | first-time, monthly price), checkout applies withCoupon and skips
-    | trialDays. Empty for that plan = trial_days instead. Never reuse one
-    | coupon on the other plan — the amounts are different. Yearly prices
-    | never get a coupon. Cannot be combined with allow_promotion_codes on
-    | the same checkout.
-    |
-    */
-
-    'first_month_coupon_ids' => [
-        'socials' => env('STRIPE_SOCIALS_FIRST_MONTH_COUPON_ID'),
-        'workspaces' => env('STRIPE_WORKSPACES_FIRST_MONTH_COUPON_ID'),
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Allow Promotion Codes
-    |--------------------------------------------------------------------------
-    |
-    | When true and no first-month coupon is applied on the session, Stripe
-    | Checkout shows the redeemable promotion-code field. Defaults to false
-    | (SaaS recipe A). Stripe rejects a session that sets both discounts
-    | (coupon) and allow_promotion_codes — ConfigureSubscriptionCheckout
-    | throws if both would apply on the same checkout.
-    |
-    */
-
-    'allow_promotion_codes' => (bool) env('CASHIER_ALLOW_PROMOTION_CODES', false),
-
 ];
diff --git a/database/factories/OfferFactory.php b/database/factories/OfferFactory.php
new file mode 100644
index 0000000000..4d2ee74edd
--- /dev/null
+++ b/database/factories/OfferFactory.php
@@ -0,0 +1,85 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Database\Factories;
+
+use App\Models\Offer;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+/**
+ * @extends Factory<Offer>
+ */
+class OfferFactory extends Factory
+{
+    /**
+     * Define the model's default state.
+     *
+     * @return array<string, mixed>
+     */
+    public function definition(): array
+    {
+        return [
+            'slug' => fake()->unique()->slug(3),
+            'stripe_coupon_id' => fake()->unique()->bothify('coupon_????????'),
+            'starts_at' => now()->subDay(),
+            'ends_at' => null,
+            'max_redemptions' => null,
+            'trial_days' => null,
+            'allow_promotion_codes' => false,
+            'first_subscription_only' => false,
+            'show_banner' => false,
+        ];
+    }
+
+    public function upcoming(): static
+    {
+        return $this->state(fn (array $attributes): array => [
+            'starts_at' => now()->addDay(),
+        ]);
+    }
+
+    public function expired(): static
+    {
+        return $this->state(fn (array $attributes): array => [
+            'starts_at' => now()->subDays(10),
+            'ends_at' => now()->subDay(),
+        ]);
+    }
+
+    public function limitedTo(int $places): static
+    {
+        return $this->state(fn (array $attributes): array => [
+            'max_redemptions' => $places,
+        ]);
+    }
+
+    public function trial(int $days): static
+    {
+        return $this->state(fn (array $attributes): array => [
+            'stripe_coupon_id' => null,
+            'trial_days' => $days,
+        ]);
+    }
+
+    public function allowingPromotionCodes(): static
+    {
+        return $this->state(fn (array $attributes): array => [
+            'allow_promotion_codes' => true,
+        ]);
+    }
+
+    public function withBanner(): static
+    {
+        return $this->state(fn (array $attributes): array => [
+            'show_banner' => true,
+        ]);
+    }
+
+    public function firstSubscriptionOnly(): static
+    {
+        return $this->state(fn (array $attributes): array => [
+            'first_subscription_only' => true,
+        ]);
+    }
+}
diff --git a/database/migrations/2026_10_26_232641_create_offers_table.php b/database/migrations/2026_10_26_232641_create_offers_table.php
new file mode 100644
index 0000000000..9b6b14ccbc
--- /dev/null
+++ b/database/migrations/2026_10_26_232641_create_offers_table.php
@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::create('offers', function (Blueprint $table): void {
+            $table->uuid('id')->primary();
+            $table->string('slug')->unique();
+            $table->string('stripe_coupon_id')->nullable();
+            $table->unsignedSmallInteger('trial_days')->nullable();
+            $table->boolean('allow_promotion_codes')->default(false);
+            $table->timestamp('starts_at');
+            $table->timestamp('ends_at')->nullable();
+            $table->unsignedInteger('max_redemptions')->nullable();
+            $table->boolean('first_subscription_only')->default(false);
+            $table->boolean('show_banner')->default(false);
+            $table->timestamps();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::dropIfExists('offers');
+    }
+};
diff --git a/database/migrations/2026_10_26_232642_create_account_offer_table.php b/database/migrations/2026_10_26_232642_create_account_offer_table.php
new file mode 100644
index 0000000000..02a655cb07
--- /dev/null
+++ b/database/migrations/2026_10_26_232642_create_account_offer_table.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::create('account_offer', function (Blueprint $table): void {
+            $table->foreignUuid('account_id')->constrained()->cascadeOnDelete();
+            $table->foreignUuid('offer_id')->constrained()->cascadeOnDelete();
+            $table->timestamp('claimed_at');
+            $table->timestamp('redeemed_at')->nullable();
+
+            $table->primary(['account_id', 'offer_id']);
+            $table->index(['offer_id', 'redeemed_at']);
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::dropIfExists('account_offer');
+    }
+};
diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
index 5222ec9a88..a2f168c7de 100644
--- a/database/seeders/DatabaseSeeder.php
+++ b/database/seeders/DatabaseSeeder.php
@@ -16,6 +16,7 @@ public function run(): void
         $this->call([
             PassportSeeder::class,
             PlanSeeder::class,
+            OfferSeeder::class,
         ]);
     }
 }
diff --git a/database/seeders/OfferSeeder.php b/database/seeders/OfferSeeder.php
new file mode 100644
index 0000000000..fcf6afaa65
--- /dev/null
+++ b/database/seeders/OfferSeeder.php
@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Database\Seeders;
+
+use App\Models\Offer;
+use Illuminate\Database\Seeder;
+
+class OfferSeeder extends Seeder
+{
+    /**
+     * Local offers to try the Welcome checkout with. Their coupons live in
+     * Stripe test mode, so they are never seeded outside a local install;
+     * other environments add their offers by hand.
+     */
+    public function run(): void
+    {
+        if (! app()->isLocal()) {
+            return;
+        }
+
+        Offer::updateOrCreate(
+            ['slug' => 'free-trial-7-days'],
+            ['starts_at' => now(), 'trial_days' => 8, 'first_subscription_only' => true],
+        );
+
+        Offer::updateOrCreate(
+            ['slug' => 'bf26'],
+            ['starts_at' => now(), 'stripe_coupon_id' => 'TRYPOST_TEST_BF_50_3M', 'show_banner' => true],
+        );
+
+        Offer::updateOrCreate(
+            ['slug' => 'first-month'],
+            ['starts_at' => now(), 'stripe_coupon_id' => 'SOCIALS_18USD', 'first_subscription_only' => true],
+        );
+    }
+}
diff --git a/lang/ar/billing.php b/lang/ar/billing.php
index 431f07977b..1fd909cc1b 100644
--- a/lang/ar/billing.php
+++ b/lang/ar/billing.php
@@ -12,7 +12,6 @@
     'subscribe' => [
         'billed_monthly' => 'فوترة شهرية',
         'prices' => [
-            'first_month' => '$1',
             'socials' => ['monthly' => '$19', 'yearly_per_month' => '$15.83', 'yearly' => '$190'],
             'workspaces' => ['monthly' => '$99', 'yearly_per_month' => '$82.50', 'yearly' => '$990'],
         ],
@@ -24,6 +23,7 @@
         'yearly' => 'سنوي',
         'save_two_months' => 'شهران مجانًا',
         'per_month' => '/شهر',
+        'per_year' => '/سنة',
         'workspaces_one' => 'مساحة عمل واحدة',
         'workspaces_unlimited' => 'مساحات عمل غير محدودة',
         'workspaces_tooltip' => 'مساحة العمل هي علامة تجارية أو عميل واحد، منفصلة عن البقية: بحساباتها الاجتماعية وتوقيعاتها وتصنيفاتها وتحليلاتها وصلاحيات أعضائها واتصال MCP الخاص بها.',
@@ -61,26 +61,44 @@
     ],
 
     'current_plan' => [
+        'statuses' => [
+            'active' => 'نشطة',
+            'trial' => 'تجربة مجانية',
+            'cancelling' => 'ملغاة',
+            'past_due' => 'متأخرة',
+        ],
         'change' => 'تغيير الخطة',
         'price_monthly' => ':price/شهر',
         'price_yearly' => ':price/سنة',
         'trial_until' => 'فترة تجريبية حتى :date',
-        'renews' => 'يتجدد تلقائيًا',
         'cancelled' => 'تم الإلغاء، ينتهي في :date',
-        'workspaces_usage' => 'مساحات العمل: :count من :limit',
+        'discount_until' => 'خصم :discount حتى :date',
+        'discount_forever' => 'خصم :discount على كل دفعة',
+        'discount_once' => 'خصم :discount على دفعتك القادمة',
     ],
 
     'subscription' => [
-        'title' => 'طريقة الدفع',
+        'title' => 'طرق الدفع',
+        'default' => 'افتراضية',
         'description' => 'حدّث بطاقتك أو بيانات الفوترة على Stripe.',
         'no_payment_method' => 'لا توجد طريقة دفع مسجّلة بعد.',
         'expires_on' => 'تنتهي في :month/:year',
         'manage_stripe' => 'الإدارة عبر Stripe',
     ],
 
+    'tabs' => [
+        'plan' => 'الخطة',
+        'invoices' => 'الفواتير',
+    ],
+
     'invoices' => [
-        'title' => 'الفواتير',
-        'description' => 'نزّل فواتيرك السابقة.',
+        'columns' => [
+            'date' => 'التاريخ',
+            'amount' => 'المبلغ',
+            'status' => 'الحالة',
+        ],
+        'empty_title' => 'لا توجد فواتير بعد',
+        'empty_description' => 'ستظهر فواتيرك هنا بعد أول دفعة.',
         'paid' => 'مدفوعة',
         'download' => 'تنزيل الفاتورة',
     ],
diff --git a/lang/ar/offers.php b/lang/ar/offers.php
new file mode 100644
index 0000000000..aa7155a81f
--- /dev/null
+++ b/lang/ar/offers.php
@@ -0,0 +1,21 @@
+<?php
+
+return [
+    'bf26' => [
+        'name' => 'الجمعة السوداء',
+        'headline' => 'خصم 50% على أول 3 أشهر',
+        'price' => '$9.50',
+        'unit' => '/شهر',
+        'period' => 'لأول 3 أشهر',
+    ],
+    'first_month' => [
+        'name' => 'الشهر الأول',
+        'headline' => 'شهرك الأول مقابل $1',
+        'price' => '$1',
+        'period' => 'للشهر الأول',
+    ],
+    'free_trial_7_days' => [
+        'price' => 'مجانًا',
+        'period' => 'لمدة 7 أيام',
+    ],
+];
diff --git a/lang/ar/welcome.php b/lang/ar/welcome.php
index a9178e0a5c..1ebf895458 100644
--- a/lang/ar/welcome.php
+++ b/lang/ar/welcome.php
@@ -47,9 +47,8 @@
     ],
     'plan_title' => 'فعّل حسابك',
     'plan_description' => 'اربط حساباتك وجدول أول منشور لك اليوم.',
-    'plan_first_month' => 'للشهر الأول',
     'plan_terms' => 'ثم :price/شهر. ألغِ في أي وقت.',
-    'plan_per_month' => 'شهريًا',
+    'plan_start_trial' => 'جرّب مجانًا',
     'plan_cancel_anytime' => 'ألغِ في أي وقت.',
     'mcp' => [
         'title' => 'أدِر حساباتك الاجتماعية من الدردشة',
diff --git a/lang/de/billing.php b/lang/de/billing.php
index 36a9e3b8aa..2ab1df0fc5 100644
--- a/lang/de/billing.php
+++ b/lang/de/billing.php
@@ -14,7 +14,6 @@
     'subscribe' => [
         'billed_monthly' => 'Monatlich abgerechnet',
         'prices' => [
-            'first_month' => '$1',
             'socials' => ['monthly' => '$19', 'yearly_per_month' => '$15.83', 'yearly' => '$190'],
             'workspaces' => ['monthly' => '$99', 'yearly_per_month' => '$82.50', 'yearly' => '$990'],
         ],
@@ -26,6 +25,7 @@
         'yearly' => 'Jährlich',
         'save_two_months' => '2 Monate gratis',
         'per_month' => '/Monat',
+        'per_year' => '/Jahr',
         'workspaces_one' => 'Ein Workspace',
         'workspaces_unlimited' => 'Unbegrenzte Workspaces',
         'workspaces_tooltip' => 'Ein Workspace ist eine Marke oder ein Kunde, getrennt von allen anderen: mit eigenen Social-Media-Konten, Signaturen, Labels, Analytics, Mitgliederrechten und MCP-Verbindung.',
@@ -63,26 +63,44 @@
     ],
 
     'current_plan' => [
+        'statuses' => [
+            'active' => 'Aktiv',
+            'trial' => 'Kostenloser Test',
+            'cancelling' => 'Gekündigt',
+            'past_due' => 'Überfällig',
+        ],
         'change' => 'Tarif ändern',
         'price_monthly' => ':price/Monat',
         'price_yearly' => ':price/Jahr',
         'trial_until' => 'Testphase bis :date',
-        'renews' => 'Verlängert sich automatisch',
         'cancelled' => 'Gekündigt, endet am :date',
-        'workspaces_usage' => 'Workspaces: :count von :limit',
+        'discount_until' => ':discount Rabatt bis :date',
+        'discount_forever' => ':discount Rabatt auf jede Zahlung',
+        'discount_once' => ':discount Rabatt auf deine nächste Zahlung',
     ],
 
     'subscription' => [
-        'title' => 'Zahlungsmethode',
+        'title' => 'Zahlungsmethoden',
+        'default' => 'Standard',
         'description' => 'Aktualisiere deine Karte oder Rechnungsdaten bei Stripe.',
         'no_payment_method' => 'Noch keine Zahlungsmethode hinterlegt.',
         'expires_on' => 'Läuft ab :month/:year',
         'manage_stripe' => 'Bei Stripe verwalten',
     ],
 
+    'tabs' => [
+        'plan' => 'Tarif',
+        'invoices' => 'Rechnungen',
+    ],
+
     'invoices' => [
-        'title' => 'Rechnungen',
-        'description' => 'Lade deine bisherigen Rechnungen herunter.',
+        'columns' => [
+            'date' => 'Datum',
+            'amount' => 'Betrag',
+            'status' => 'Status',
+        ],
+        'empty_title' => 'Noch keine Rechnungen',
+        'empty_description' => 'Deine Rechnungen erscheinen hier nach deiner ersten Zahlung.',
         'paid' => 'Bezahlt',
         'download' => 'Rechnung herunterladen',
     ],
diff --git a/lang/de/offers.php b/lang/de/offers.php
new file mode 100644
index 0000000000..abab82eda1
--- /dev/null
+++ b/lang/de/offers.php
@@ -0,0 +1,21 @@
+<?php
+
+return [
+    'bf26' => [
+        'name' => 'Black Friday',
+        'headline' => '50 % Rabatt in den ersten 3 Monaten',
+        'price' => '$9.50',
+        'unit' => '/Monat',
+        'period' => 'in den ersten 3 Monaten',
+    ],
+    'first_month' => [
+        'name' => 'Erster Monat',
+        'headline' => 'Dein erster Monat für $1',
+        'price' => '$1',
+        'period' => 'im ersten Monat',
+    ],
+    'free_trial_7_days' => [
+        'price' => 'Kostenlos',
+        'period' => 'für 7 Tage',
+    ],
+];
diff --git a/lang/de/welcome.php b/lang/de/welcome.php
index 38c55cefaf..e3714df62d 100644
--- a/lang/de/welcome.php
+++ b/lang/de/welcome.php
@@ -47,9 +47,8 @@
     ],
     'plan_title' => 'Aktiviere dein Konto',
     'plan_description' => 'Verbinde deine Kanäle und plane noch heute deinen ersten Post.',
-    'plan_first_month' => 'im ersten Monat',
     'plan_terms' => 'Danach :price/Monat. Jederzeit kündbar.',
-    'plan_per_month' => 'pro Monat',
+    'plan_start_trial' => 'Kostenlos testen',
     'plan_cancel_anytime' => 'Jederzeit kündbar.',
     'mcp' => [
         'title' => 'Social Media per Chat steuern',
diff --git a/lang/el/billing.php b/lang/el/billing.php
index c6ecf655a3..6ad7811f68 100644
--- a/lang/el/billing.php
+++ b/lang/el/billing.php
@@ -12,7 +12,6 @@
     'subscribe' => [
         'billed_monthly' => 'Μηνιαία χρέωση',
         'prices' => [
-            'first_month' => '$1',
             'socials' => ['monthly' => '$19', 'yearly_per_month' => '$15.83', 'yearly' => '$190'],
             'workspaces' => ['monthly' => '$99', 'yearly_per_month' => '$82.50', 'yearly' => '$990'],
         ],
@@ -24,6 +23,7 @@
         'yearly' => 'Ετήσια',
         'save_two_months' => '2 μήνες δωρεάν',
         'per_month' => '/μήνα',
+        'per_year' => '/έτος',
         'workspaces_one' => 'Ένα workspace',
         'workspaces_unlimited' => 'Απεριόριστα workspaces',
         'workspaces_tooltip' => 'Ένα workspace είναι ένα brand ή ένας πελάτης, ξεχωριστά από τα υπόλοιπα: με δικούς του λογαριασμούς social, υπογραφές, ετικέτες, analytics, δικαιώματα μελών και σύνδεση MCP.',
@@ -61,26 +61,44 @@
     ],
 
     'current_plan' => [
+        'statuses' => [
+            'active' => 'Ενεργό',
+            'trial' => 'Δωρεάν δοκιμή',
+            'cancelling' => 'Ακυρώθηκε',
+            'past_due' => 'Ληξιπρόθεσμο',
+        ],
         'change' => 'Αλλαγή πλάνου',
         'price_monthly' => ':price/μήνα',
         'price_yearly' => ':price/έτος',
         'trial_until' => 'Δοκιμαστική περίοδος έως :date',
-        'renews' => 'Ανανεώνεται αυτόματα',
         'cancelled' => 'Ακυρώθηκε, λήγει στις :date',
-        'workspaces_usage' => 'Workspaces: :count από :limit',
+        'discount_until' => 'Έκπτωση :discount έως :date',
+        'discount_forever' => 'Έκπτωση :discount σε κάθε πληρωμή',
+        'discount_once' => 'Έκπτωση :discount στην επόμενη πληρωμή',
     ],
 
     'subscription' => [
-        'title' => 'Μέθοδος πληρωμής',
+        'title' => 'Μέθοδοι πληρωμής',
+        'default' => 'Προεπιλογή',
         'description' => 'Ενημερώστε την κάρτα ή τα στοιχεία χρέωσης στο Stripe.',
         'no_payment_method' => 'Δεν υπάρχει καταχωρημένη μέθοδος πληρωμής ακόμη.',
         'expires_on' => 'Λήγει :month/:year',
         'manage_stripe' => 'Διαχείριση στο Stripe',
     ],
 
+    'tabs' => [
+        'plan' => 'Πλάνο',
+        'invoices' => 'Τιμολόγια',
+    ],
+
     'invoices' => [
-        'title' => 'Τιμολόγια',
-        'description' => 'Κατεβάστε τα προηγούμενα τιμολόγιά σας.',
+        'columns' => [
+            'date' => 'Ημερομηνία',
+            'amount' => 'Ποσό',
+            'status' => 'Κατάσταση',
+        ],
+        'empty_title' => 'Δεν υπάρχουν ακόμη τιμολόγια',
+        'empty_description' => 'Τα τιμολόγιά σας θα εμφανίζονται εδώ μετά την πρώτη σας πληρωμή.',
         'paid' => 'Πληρωμένο',
         'download' => 'Λήψη τιμολογίου',
     ],
diff --git a/lang/el/offers.php b/lang/el/offers.php
new file mode 100644
index 0000000000..998fda24de
--- /dev/null
+++ b/lang/el/offers.php
@@ -0,0 +1,21 @@
+<?php
+
+return [
+    'bf26' => [
+        'name' => 'Black Friday',
+        'headline' => 'Έκπτωση 50% για τους πρώτους 3 μήνες',
+        'price' => '$9.50',
+        'unit' => '/μήνα',
+        'period' => 'για τους πρώτους 3 μήνες',
+    ],
+    'first_month' => [
+        'name' => 'Πρώτος μήνας',
+        'headline' => 'Ο πρώτος σας μήνας με $1',
+        'price' => '$1',
+        'period' => 'για τον πρώτο μήνα',
+    ],
+    'free_trial_7_days' => [
+        'price' => 'Δωρεάν',
+        'period' => 'για 7 ημέρες',
+    ],
+];
diff --git a/lang/el/welcome.php b/lang/el/welcome.php
index 515353d7d7..bd2aa17120 100644
--- a/lang/el/welcome.php
+++ b/lang/el/welcome.php
@@ -47,9 +47,8 @@
     ],
     'plan_title' => 'Ενεργοποιήστε τον λογαριασμό σας',
     'plan_description' => 'Συνδέστε τα κανάλια σας και προγραμματίστε την πρώτη σας ανάρτηση σήμερα.',
-    'plan_first_month' => 'για τον πρώτο μήνα',
     'plan_terms' => 'Μετά :price/μήνα. Ακύρωση οποτεδήποτε.',
-    'plan_per_month' => 'τον μήνα',
+    'plan_start_trial' => 'Δωρεάν δοκιμή',
     'plan_cancel_anytime' => 'Ακύρωση οποτεδήποτε.',
     'mcp' => [
         'title' => 'Διαχειριστείτε τα social μέσω chat',
diff --git a/lang/en/billing.php b/lang/en/billing.php
index 10fea5dda2..6e1e4a73fd 100644
--- a/lang/en/billing.php
+++ b/lang/en/billing.php
@@ -12,7 +12,6 @@
     'subscribe' => [
         'billed_monthly' => 'Billed monthly',
         'prices' => [
-            'first_month' => '$1',
             'socials' => ['monthly' => '$19', 'yearly_per_month' => '$15.83', 'yearly' => '$190'],
             'workspaces' => ['monthly' => '$99', 'yearly_per_month' => '$82.50', 'yearly' => '$990'],
         ],
@@ -24,6 +23,7 @@
         'yearly' => 'Yearly',
         'save_two_months' => '2 months free',
         'per_month' => '/month',
+        'per_year' => '/year',
         'workspaces_one' => 'One workspace',
         'workspaces_unlimited' => 'Unlimited workspaces',
         'workspaces_tooltip' => 'A workspace is one brand or client, kept separate from the rest: its own social accounts, signatures, labels, analytics, member permissions, and MCP connection.',
@@ -61,26 +61,44 @@
     ],
 
     'current_plan' => [
+        'statuses' => [
+            'active' => 'Active',
+            'trial' => 'Free trial',
+            'cancelling' => 'Cancelled',
+            'past_due' => 'Past due',
+        ],
         'change' => 'Change plan',
         'price_monthly' => ':price/month',
         'price_yearly' => ':price/year',
         'trial_until' => 'Trial until :date',
-        'renews' => 'Renews automatically',
         'cancelled' => 'Cancelled, ends on :date',
-        'workspaces_usage' => 'Workspaces: :count of :limit',
+        'discount_until' => ':discount off until :date',
+        'discount_forever' => ':discount off on every payment',
+        'discount_once' => ':discount off your next payment',
     ],
 
     'subscription' => [
-        'title' => 'Payment method',
+        'title' => 'Payment methods',
+        'default' => 'Default',
         'description' => 'Update your card or billing details on Stripe.',
         'no_payment_method' => 'No payment method on file yet.',
         'expires_on' => 'Expires :month/:year',
         'manage_stripe' => 'Manage on Stripe',
     ],
 
+    'tabs' => [
+        'plan' => 'Plan',
+        'invoices' => 'Invoices',
+    ],
+
     'invoices' => [
-        'title' => 'Invoices',
-        'description' => 'Download your past invoices.',
+        'columns' => [
+            'date' => 'Date',
+            'amount' => 'Amount',
+            'status' => 'Status',
+        ],
+        'empty_title' => 'No invoices yet',
+        'empty_description' => 'Your invoices show up here after your first payment.',
         'paid' => 'Paid',
         'download' => 'Download invoice',
     ],
diff --git a/lang/en/offers.php b/lang/en/offers.php
new file mode 100644
index 0000000000..d2efbc8825
--- /dev/null
+++ b/lang/en/offers.php
@@ -0,0 +1,21 @@
+<?php
+
+return [
+    'bf26' => [
+        'name' => 'Black Friday',
+        'headline' => '50% off your first 3 months',
+        'price' => '$9.50',
+        'unit' => '/month',
+        'period' => 'for your first 3 months',
+    ],
+    'first_month' => [
+        'name' => 'First month',
+        'headline' => 'Your first month for $1',
+        'price' => '$1',
+        'period' => 'for your first month',
+    ],
+    'free_trial_7_days' => [
+        'price' => 'Free',
+        'period' => 'for 7 days',
+    ],
+];
diff --git a/lang/en/welcome.php b/lang/en/welcome.php
index 3737cd2db4..cce41f39ca 100644
--- a/lang/en/welcome.php
+++ b/lang/en/welcome.php
@@ -47,9 +47,8 @@
     ],
     'plan_title' => 'Activate your account',
     'plan_description' => 'Connect your channels and schedule your first post today.',
-    'plan_first_month' => 'for your first month',
     'plan_terms' => 'Then :price/month. Cancel anytime.',
-    'plan_per_month' => 'per month',
+    'plan_start_trial' => 'Start free trial',
     'plan_cancel_anytime' => 'Cancel anytime.',
     'mcp' => [
         'title' => 'Run your social media from a chat',
diff --git a/lang/es/billing.php b/lang/es/billing.php
index 3ea50e8207..82dc377c21 100644
--- a/lang/es/billing.php
+++ b/lang/es/billing.php
@@ -12,7 +12,6 @@
     'subscribe' => [
         'billed_monthly' => 'Facturado mensualmente',
         'prices' => [
-            'first_month' => '$1',
             'socials' => ['monthly' => '$19', 'yearly_per_month' => '$15.83', 'yearly' => '$190'],
             'workspaces' => ['monthly' => '$99', 'yearly_per_month' => '$82.50', 'yearly' => '$990'],
         ],
@@ -24,6 +23,7 @@
         'yearly' => 'Anual',
         'save_two_months' => '2 meses gratis',
         'per_month' => '/mes',
+        'per_year' => '/año',
         'workspaces_one' => 'Un workspace',
         'workspaces_unlimited' => 'Workspaces ilimitados',
         'workspaces_tooltip' => 'Un workspace es una marca o cliente, separado del resto: con sus propias redes sociales, firmas, etiquetas, analíticas, permisos de miembros y conexión MCP.',
@@ -61,26 +61,44 @@
     ],
 
     'current_plan' => [
+        'statuses' => [
+            'active' => 'Activo',
+            'trial' => 'Prueba gratis',
+            'cancelling' => 'Cancelado',
+            'past_due' => 'Vencido',
+        ],
         'change' => 'Cambiar plan',
         'price_monthly' => ':price/mes',
         'price_yearly' => ':price/año',
         'trial_until' => 'Prueba hasta el :date',
-        'renews' => 'Se renueva automáticamente',
         'cancelled' => 'Cancelado, termina el :date',
-        'workspaces_usage' => 'Workspaces: :count de :limit',
+        'discount_until' => ':discount de descuento hasta el :date',
+        'discount_forever' => ':discount de descuento en todos los pagos',
+        'discount_once' => ':discount de descuento en tu próximo pago',
     ],
 
     'subscription' => [
-        'title' => 'Método de pago',
+        'title' => 'Métodos de pago',
+        'default' => 'Predeterminado',
         'description' => 'Actualiza tu tarjeta o datos de facturación en Stripe.',
         'no_payment_method' => 'Aún no hay método de pago registrado.',
         'expires_on' => 'Vence el :month/:year',
         'manage_stripe' => 'Gestionar en Stripe',
     ],
 
+    'tabs' => [
+        'plan' => 'Plan',
+        'invoices' => 'Facturas',
+    ],
+
     'invoices' => [
-        'title' => 'Facturas',
-        'description' => 'Descarga tus facturas anteriores.',
+        'columns' => [
+            'date' => 'Fecha',
+            'amount' => 'Importe',
+            'status' => 'Estado',
+        ],
+        'empty_title' => 'Aún no hay facturas',
+        'empty_description' => 'Tus facturas aparecerán aquí después de tu primer pago.',
         'paid' => 'Pagado',
         'download' => 'Descargar factura',
     ],
diff --git a/lang/es/offers.php b/lang/es/offers.php
new file mode 100644
index 0000000000..eec229aa31
--- /dev/null
+++ b/lang/es/offers.php
@@ -0,0 +1,21 @@
+<?php
+
+return [
+    'bf26' => [
+        'name' => 'Black Friday',
+        'headline' => '50% de descuento los primeros 3 meses',
+        'price' => '$9.50',
+        'unit' => '/mes',
+        'period' => 'los primeros 3 meses',
+    ],
+    'first_month' => [
+        'name' => 'Primer mes',
+        'headline' => 'Tu primer mes por $1',
+        'price' => '$1',
+        'period' => 'el primer mes',
+    ],
+    'free_trial_7_days' => [
+        'price' => 'Gratis',
+        'period' => 'durante 7 días',
+    ],
+];
diff --git a/lang/es/welcome.php b/lang/es/welcome.php
index 4193c24169..28eadb1cc0 100644
--- a/lang/es/welcome.php
+++ b/lang/es/welcome.php
@@ -47,9 +47,8 @@
     ],
     'plan_title' => 'Activa tu cuenta',
     'plan_description' => 'Conecta tus redes y programa tu primer post hoy.',
-    'plan_first_month' => 'el primer mes',
     'plan_terms' => 'Luego, :price/mes. Cancela cuando quieras.',
-    'plan_per_month' => 'al mes',
+    'plan_start_trial' => 'Probar gratis',
     'plan_cancel_anytime' => 'Cancela cuando quieras.',
     'mcp' => [
         'title' => 'Gestiona tus redes desde el chat',
diff --git a/lang/fr/billing.php b/lang/fr/billing.php
index 413571ee67..e5c05e0b76 100644
--- a/lang/fr/billing.php
+++ b/lang/fr/billing.php
@@ -12,7 +12,6 @@
     'subscribe' => [
         'billed_monthly' => 'Facturé mensuellement',
         'prices' => [
-            'first_month' => '1 $',
             'socials' => ['monthly' => '19 $', 'yearly_per_month' => '15,83 $', 'yearly' => '190 $'],
             'workspaces' => ['monthly' => '99 $', 'yearly_per_month' => '82,50 $', 'yearly' => '990 $'],
         ],
@@ -24,6 +23,7 @@
         'yearly' => 'Annuel',
         'save_two_months' => '2 mois offerts',
         'per_month' => '/mois',
+        'per_year' => '/an',
         'workspaces_one' => 'Un espace de travail',
         'workspaces_unlimited' => 'Espaces de travail illimités',
         'workspaces_tooltip' => 'Un espace de travail correspond à une marque ou un client, séparé des autres : ses propres réseaux sociaux, signatures, libellés, statistiques, permissions des membres et connexion MCP.',
@@ -61,26 +61,44 @@
     ],
 
     'current_plan' => [
+        'statuses' => [
+            'active' => 'Active',
+            'trial' => 'Essai gratuit',
+            'cancelling' => 'Annulée',
+            'past_due' => 'En retard',
+        ],
         'change' => 'Changer d\'offre',
         'price_monthly' => ':price/mois',
         'price_yearly' => ':price/an',
         'trial_until' => 'Essai jusqu\'au :date',
-        'renews' => 'Renouvellement automatique',
         'cancelled' => 'Annulé, se termine le :date',
-        'workspaces_usage' => 'Workspaces : :count sur :limit',
+        'discount_until' => ':discount de réduction jusqu\'au :date',
+        'discount_forever' => ':discount de réduction sur chaque paiement',
+        'discount_once' => ':discount de réduction sur votre prochain paiement',
     ],
 
     'subscription' => [
-        'title' => 'Moyen de paiement',
+        'title' => 'Moyens de paiement',
+        'default' => 'Par défaut',
         'description' => 'Mettez à jour votre carte ou vos informations de facturation sur Stripe.',
         'no_payment_method' => 'Aucun moyen de paiement enregistré pour le moment.',
         'expires_on' => 'Expire le :month/:year',
         'manage_stripe' => 'Gérer sur Stripe',
     ],
 
+    'tabs' => [
+        'plan' => 'Offre',
+        'invoices' => 'Factures',
+    ],
+
     'invoices' => [
-        'title' => 'Factures',
-        'description' => 'Téléchargez vos factures passées.',
+        'columns' => [
+            'date' => 'Date',
+            'amount' => 'Montant',
+            'status' => 'Statut',
+        ],
+        'empty_title' => 'Aucune facture pour l\'instant',
+        'empty_description' => 'Vos factures apparaîtront ici après votre premier paiement.',
         'paid' => 'Payée',
         'download' => 'Télécharger la facture',
     ],
diff --git a/lang/fr/offers.php b/lang/fr/offers.php
new file mode 100644
index 0000000000..2cadb49d1d
--- /dev/null
+++ b/lang/fr/offers.php
@@ -0,0 +1,21 @@
+<?php
+
+return [
+    'bf26' => [
+        'name' => 'Black Friday',
+        'headline' => '50 % de réduction les 3 premiers mois',
+        'price' => '9,50 $',
+        'unit' => '/mois',
+        'period' => 'pour les 3 premiers mois',
+    ],
+    'first_month' => [
+        'name' => 'Premier mois',
+        'headline' => 'Votre premier mois pour 1 $',
+        'price' => '1 $',
+        'period' => 'pour le premier mois',
+    ],
+    'free_trial_7_days' => [
+        'price' => 'Gratuit',
+        'period' => 'pendant 7 jours',
+    ],
+];
diff --git a/lang/fr/welcome.php b/lang/fr/welcome.php
index 9accff0430..dc464dc119 100644
--- a/lang/fr/welcome.php
+++ b/lang/fr/welcome.php
@@ -47,9 +47,8 @@
     ],
     'plan_title' => 'Activez votre compte',
     'plan_description' => 'Connectez vos réseaux et programmez votre premier post dès aujourd’hui.',
-    'plan_first_month' => 'pour le premier mois',
     'plan_terms' => 'Puis :price/mois. Annulez à tout moment.',
-    'plan_per_month' => 'par mois',
+    'plan_start_trial' => 'Essai gratuit',
     'plan_cancel_anytime' => 'Annulez à tout moment.',
     'mcp' => [
         'title' => 'Gérez vos réseaux par chat',
diff --git a/lang/it/billing.php b/lang/it/billing.php
index 61a74e56c3..091066b1c9 100644
--- a/lang/it/billing.php
+++ b/lang/it/billing.php
@@ -12,7 +12,6 @@
     'subscribe' => [
         'billed_monthly' => 'Fatturazione mensile',
         'prices' => [
-            'first_month' => '$1',
             'socials' => ['monthly' => '$19', 'yearly_per_month' => '$15.83', 'yearly' => '$190'],
             'workspaces' => ['monthly' => '$99', 'yearly_per_month' => '$82.50', 'yearly' => '$990'],
         ],
@@ -24,6 +23,7 @@
         'yearly' => 'Annuale',
         'save_two_months' => '2 mesi gratis',
         'per_month' => '/mese',
+        'per_year' => '/anno',
         'workspaces_one' => 'Un workspace',
         'workspaces_unlimited' => 'Workspace illimitati',
         'workspaces_tooltip' => 'Un workspace è un brand o un cliente, separato dagli altri: con i propri account social, firme, etichette, analytics, permessi dei membri e connessione MCP.',
@@ -61,26 +61,44 @@
     ],
 
     'current_plan' => [
+        'statuses' => [
+            'active' => 'Attivo',
+            'trial' => 'Prova gratuita',
+            'cancelling' => 'Annullato',
+            'past_due' => 'Scaduto',
+        ],
         'change' => 'Cambia piano',
         'price_monthly' => ':price/mese',
         'price_yearly' => ':price/anno',
         'trial_until' => 'Prova fino al :date',
-        'renews' => 'Si rinnova automaticamente',
         'cancelled' => 'Annullato, termina il :date',
-        'workspaces_usage' => 'Workspace: :count di :limit',
+        'discount_until' => ':discount di sconto fino al :date',
+        'discount_forever' => ':discount di sconto su ogni pagamento',
+        'discount_once' => ':discount di sconto sul prossimo pagamento',
     ],
 
     'subscription' => [
-        'title' => 'Metodo di pagamento',
+        'title' => 'Metodi di pagamento',
+        'default' => 'Predefinito',
         'description' => 'Aggiorna la carta o i dati di fatturazione su Stripe.',
         'no_payment_method' => 'Nessun metodo di pagamento ancora registrato.',
         'expires_on' => 'Scade il :month/:year',
         'manage_stripe' => 'Gestisci su Stripe',
     ],
 
+    'tabs' => [
+        'plan' => 'Piano',
+        'invoices' => 'Fatture',
+    ],
+
     'invoices' => [
-        'title' => 'Fatture',
-        'description' => 'Scarica le tue fatture passate.',
+        'columns' => [
+            'date' => 'Data',
+            'amount' => 'Importo',
+            'status' => 'Stato',
+        ],
+        'empty_title' => 'Ancora nessuna fattura',
+        'empty_description' => 'Le tue fatture appariranno qui dopo il primo pagamento.',
         'paid' => 'Pagata',
         'download' => 'Scarica fattura',
     ],
diff --git a/lang/it/offers.php b/lang/it/offers.php
new file mode 100644
index 0000000000..ef26434373
--- /dev/null
+++ b/lang/it/offers.php
@@ -0,0 +1,21 @@
+<?php
+
+return [
+    'bf26' => [
+        'name' => 'Black Friday',
+        'headline' => '50% di sconto per i primi 3 mesi',
+        'price' => '$9.50',
+        'unit' => '/mese',
+        'period' => 'per i primi 3 mesi',
+    ],
+    'first_month' => [
+        'name' => 'Primo mese',
+        'headline' => 'Il tuo primo mese a $1',
+        'price' => '$1',
+        'period' => 'per il primo mese',
+    ],
+    'free_trial_7_days' => [
+        'price' => 'Gratis',
+        'period' => 'per 7 giorni',
+    ],
+];
diff --git a/lang/it/welcome.php b/lang/it/welcome.php
index 47dd97ca87..d98cce1cd0 100644
--- a/lang/it/welcome.php
+++ b/lang/it/welcome.php
@@ -47,9 +47,8 @@
     ],
     'plan_title' => 'Attiva il tuo account',
     'plan_description' => 'Collega i tuoi canali e programma il tuo primo post oggi.',
-    'plan_first_month' => 'per il primo mese',
     'plan_terms' => 'Poi :price/mese. Disdici quando vuoi.',
-    'plan_per_month' => 'al mese',
+    'plan_start_trial' => 'Prova gratis',
     'plan_cancel_anytime' => 'Disdici quando vuoi.',
     'mcp' => [
         'title' => 'Gestisci i social dalla chat',
diff --git a/lang/ja/billing.php b/lang/ja/billing.php
index 4dbf006be6..e3e4108ddc 100644
--- a/lang/ja/billing.php
+++ b/lang/ja/billing.php
@@ -12,7 +12,6 @@
     'subscribe' => [
         'billed_monthly' => '月払い',
         'prices' => [
-            'first_month' => '$1',
             'socials' => ['monthly' => '$19', 'yearly_per_month' => '$15.83', 'yearly' => '$190'],
             'workspaces' => ['monthly' => '$99', 'yearly_per_month' => '$82.50', 'yearly' => '$990'],
         ],
@@ -24,6 +23,7 @@
         'yearly' => '年額',
         'save_two_months' => '2か月分無料',
         'per_month' => '/月',
+        'per_year' => '/年',
         'workspaces_one' => 'ワークスペース 1 つ',
         'workspaces_unlimited' => '無制限のワークスペース',
         'workspaces_tooltip' => 'ワークスペースは 1 つのブランドや顧客ごとの独立した領域です。SNS アカウント、署名、ラベル、アナリティクス、メンバー権限、MCP 接続をそれぞれ個別に持ちます。',
@@ -61,26 +61,44 @@
     ],
 
     'current_plan' => [
+        'statuses' => [
+            'active' => '有効',
+            'trial' => '無料トライアル',
+            'cancelling' => '解約済み',
+            'past_due' => '延滞',
+        ],
         'change' => 'プランを変更',
         'price_monthly' => ':price/月',
         'price_yearly' => ':price/年',
         'trial_until' => ':dateまでトライアル',
-        'renews' => '自動更新',
         'cancelled' => '解約済み、:dateに終了',
-        'workspaces_usage' => 'ワークスペース: :count / :limit',
+        'discount_until' => ':dateまで:discount割引',
+        'discount_forever' => '毎回の支払いで:discount割引',
+        'discount_once' => '次回の支払いで:discount割引',
     ],
 
     'subscription' => [
         'title' => 'お支払い方法',
+        'default' => 'デフォルト',
         'description' => 'カードや請求情報は Stripe で更新できます。',
         'no_payment_method' => 'まだ登録されたお支払い方法がありません。',
         'expires_on' => '有効期限 :month/:year',
         'manage_stripe' => 'Stripe で管理',
     ],
 
+    'tabs' => [
+        'plan' => 'プラン',
+        'invoices' => '請求書',
+    ],
+
     'invoices' => [
-        'title' => '請求書',
-        'description' => '過去の請求書をダウンロードできます。',
+        'columns' => [
+            'date' => '日付',
+            'amount' => '金額',
+            'status' => 'ステータス',
+        ],
+        'empty_title' => '請求書はまだありません',
+        'empty_description' => '初回のお支払い後、請求書がここに表示されます。',
         'paid' => '支払い済み',
         'download' => '請求書をダウンロード',
     ],
diff --git a/lang/ja/offers.php b/lang/ja/offers.php
new file mode 100644
index 0000000000..9d2d832043
--- /dev/null
+++ b/lang/ja/offers.php
@@ -0,0 +1,21 @@
+<?php
+
+return [
+    'bf26' => [
+        'name' => 'ブラックフライデー',
+        'headline' => '最初の3か月50%オフ',
+        'price' => '$9.50',
+        'unit' => '/月',
+        'period' => '最初の3か月',
+    ],
+    'first_month' => [
+        'name' => '初月',
+        'headline' => '初月は$1',
+        'price' => '$1',
+        'period' => '初月の料金',
+    ],
+    'free_trial_7_days' => [
+        'price' => '無料',
+        'period' => '7日間',
+    ],
+];
diff --git a/lang/ja/welcome.php b/lang/ja/welcome.php
index c6973a89a5..6d391cc814 100644
--- a/lang/ja/welcome.php
+++ b/lang/ja/welcome.php
@@ -47,9 +47,8 @@
     ],
     'plan_title' => 'アカウントを有効にしましょう',
     'plan_description' => 'チャンネルを連携して、今日最初の投稿を予約しましょう。',
-    'plan_first_month' => '初月の料金',
     'plan_terms' => 'その後は:price/月。いつでも解約できます。',
-    'plan_per_month' => '毎月',
+    'plan_start_trial' => '無料で試す',
     'plan_cancel_anytime' => 'いつでも解約できます。',
     'mcp' => [
         'title' => 'AIとの会話でSNSを運用',
diff --git a/lang/ko/billing.php b/lang/ko/billing.php
index 13652ad25f..334eaa96ed 100644
--- a/lang/ko/billing.php
+++ b/lang/ko/billing.php
@@ -12,7 +12,6 @@
     'subscribe' => [
         'billed_monthly' => '월간 결제',
         'prices' => [
-            'first_month' => '$1',
             'socials' => ['monthly' => '$19', 'yearly_per_month' => '$15.83', 'yearly' => '$190'],
             'workspaces' => ['monthly' => '$99', 'yearly_per_month' => '$82.50', 'yearly' => '$990'],
         ],
@@ -24,6 +23,7 @@
         'yearly' => '연간',
         'save_two_months' => '2개월 무료',
         'per_month' => '/월',
+        'per_year' => '/년',
         'workspaces_one' => '워크스페이스 하나',
         'workspaces_unlimited' => '무제한 워크스페이스',
         'workspaces_tooltip' => '워크스페이스는 브랜드나 고객 하나를 나머지와 분리한 공간입니다. 소셜 계정, 서명, 라벨, 분석, 멤버 권한, MCP 연결을 각각 따로 가집니다.',
@@ -61,26 +61,44 @@
     ],
 
     'current_plan' => [
+        'statuses' => [
+            'active' => '활성',
+            'trial' => '무료 체험',
+            'cancelling' => '취소됨',
+            'past_due' => '연체',
+        ],
         'change' => '요금제 변경',
         'price_monthly' => ':price/월',
         'price_yearly' => ':price/년',
         'trial_until' => ':date까지 체험',
-        'renews' => '자동 갱신',
         'cancelled' => '취소됨, :date에 종료',
-        'workspaces_usage' => '워크스페이스: :count / :limit',
+        'discount_until' => ':date까지 :discount 할인',
+        'discount_forever' => '매 결제 시 :discount 할인',
+        'discount_once' => '다음 결제 시 :discount 할인',
     ],
 
     'subscription' => [
         'title' => '결제 수단',
+        'default' => '기본',
         'description' => '카드나 청구 정보는 Stripe에서 업데이트하세요.',
         'no_payment_method' => '아직 등록된 결제 수단이 없습니다.',
         'expires_on' => ':month/:year 만료',
         'manage_stripe' => 'Stripe에서 관리',
     ],
 
+    'tabs' => [
+        'plan' => '요금제',
+        'invoices' => '청구서',
+    ],
+
     'invoices' => [
-        'title' => '청구서',
-        'description' => '지난 청구서를 다운로드하세요.',
+        'columns' => [
+            'date' => '날짜',
+            'amount' => '금액',
+            'status' => '상태',
+        ],
+        'empty_title' => '아직 청구서가 없습니다',
+        'empty_description' => '첫 결제 후 청구서가 여기에 표시됩니다.',
         'paid' => '결제 완료',
         'download' => '인보이스 다운로드',
     ],
diff --git a/lang/ko/offers.php b/lang/ko/offers.php
new file mode 100644
index 0000000000..6386cd3dc8
--- /dev/null
+++ b/lang/ko/offers.php
@@ -0,0 +1,21 @@
+<?php
+
+return [
+    'bf26' => [
+        'name' => '블랙 프라이데이',
+        'headline' => '첫 3개월 50% 할인',
+        'price' => '$9.50',
+        'unit' => '/월',
+        'period' => '첫 3개월',
+    ],
+    'first_month' => [
+        'name' => '첫 달',
+        'headline' => '첫 달 $1',
+        'price' => '$1',
+        'period' => '첫 달 요금',
+    ],
+    'free_trial_7_days' => [
+        'price' => '무료',
+        'period' => '7일 동안',
+    ],
+];
diff --git a/lang/ko/welcome.php b/lang/ko/welcome.php
index 2901f0ae58..818002c96d 100644
--- a/lang/ko/welcome.php
+++ b/lang/ko/welcome.php
@@ -47,9 +47,8 @@
     ],
     'plan_title' => '계정을 활성화하세요',
     'plan_description' => '채널을 연결하고 오늘 첫 게시물을 예약하세요.',
-    'plan_first_month' => '첫 달 요금',
     'plan_terms' => '이후 :price/월. 언제든지 해지 가능.',
-    'plan_per_month' => '매월',
+    'plan_start_trial' => '무료 체험 시작',
     'plan_cancel_anytime' => '언제든지 해지 가능.',
     'mcp' => [
         'title' => 'AI와 대화하며 SNS를 관리하세요',
diff --git a/lang/nl/billing.php b/lang/nl/billing.php
index 313c3ece6c..5c26ab9f7c 100644
--- a/lang/nl/billing.php
+++ b/lang/nl/billing.php
@@ -12,7 +12,6 @@
     'subscribe' => [
         'billed_monthly' => 'Maandelijks gefactureerd',
         'prices' => [
-            'first_month' => '$1',
             'socials' => ['monthly' => '$19', 'yearly_per_month' => '$15.83', 'yearly' => '$190'],
             'workspaces' => ['monthly' => '$99', 'yearly_per_month' => '$82.50', 'yearly' => '$990'],
         ],
@@ -24,6 +23,7 @@
         'yearly' => 'Jaarlijks',
         'save_two_months' => '2 maanden gratis',
         'per_month' => '/maand',
+        'per_year' => '/jaar',
         'workspaces_one' => 'Eén workspace',
         'workspaces_unlimited' => 'Onbeperkte workspaces',
         'workspaces_tooltip' => 'Een workspace is één merk of klant, gescheiden van de rest: met eigen social-media-accounts, handtekeningen, labels, analytics, ledenrechten en MCP-verbinding.',
@@ -61,26 +61,44 @@
     ],
 
     'current_plan' => [
+        'statuses' => [
+            'active' => 'Actief',
+            'trial' => 'Gratis proefperiode',
+            'cancelling' => 'Opgezegd',
+            'past_due' => 'Achterstallig',
+        ],
         'change' => 'Plan wijzigen',
         'price_monthly' => ':price/maand',
         'price_yearly' => ':price/jaar',
         'trial_until' => 'Proefperiode tot :date',
-        'renews' => 'Wordt automatisch verlengd',
         'cancelled' => 'Opgezegd, eindigt op :date',
-        'workspaces_usage' => 'Workspaces: :count van :limit',
+        'discount_until' => ':discount korting tot :date',
+        'discount_forever' => ':discount korting op elke betaling',
+        'discount_once' => ':discount korting op je volgende betaling',
     ],
 
     'subscription' => [
-        'title' => 'Betaalmethode',
+        'title' => 'Betaalmethoden',
+        'default' => 'Standaard',
         'description' => 'Werk je kaart of factuurgegevens bij in Stripe.',
         'no_payment_method' => 'Nog geen betaalmethode geregistreerd.',
         'expires_on' => 'Verloopt :month/:year',
         'manage_stripe' => 'Beheren op Stripe',
     ],
 
+    'tabs' => [
+        'plan' => 'Plan',
+        'invoices' => 'Facturen',
+    ],
+
     'invoices' => [
-        'title' => 'Facturen',
-        'description' => 'Download je eerdere facturen.',
+        'columns' => [
+            'date' => 'Datum',
+            'amount' => 'Bedrag',
+            'status' => 'Status',
+        ],
+        'empty_title' => 'Nog geen facturen',
+        'empty_description' => 'Je facturen verschijnen hier na je eerste betaling.',
         'paid' => 'Betaald',
         'download' => 'Factuur downloaden',
     ],
diff --git a/lang/nl/offers.php b/lang/nl/offers.php
new file mode 100644
index 0000000000..0790d21390
--- /dev/null
+++ b/lang/nl/offers.php
@@ -0,0 +1,21 @@
+<?php
+
+return [
+    'bf26' => [
+        'name' => 'Black Friday',
+        'headline' => '50% korting de eerste 3 maanden',
+        'price' => '$9.50',
+        'unit' => '/maand',
+        'period' => 'voor de eerste 3 maanden',
+    ],
+    'first_month' => [
+        'name' => 'Eerste maand',
+        'headline' => 'Je eerste maand voor $1',
+        'price' => '$1',
+        'period' => 'voor de eerste maand',
+    ],
+    'free_trial_7_days' => [
+        'price' => 'Gratis',
+        'period' => 'voor 7 dagen',
+    ],
+];
diff --git a/lang/nl/welcome.php b/lang/nl/welcome.php
index 3e26c19eef..3a77ac001a 100644
--- a/lang/nl/welcome.php
+++ b/lang/nl/welcome.php
@@ -47,9 +47,8 @@
     ],
     'plan_title' => 'Activeer je account',
     'plan_description' => 'Koppel je kanalen en plan vandaag je eerste post.',
-    'plan_first_month' => 'voor de eerste maand',
     'plan_terms' => 'Daarna :price/maand. Altijd opzegbaar.',
-    'plan_per_month' => 'per maand',
+    'plan_start_trial' => 'Gratis proberen',
     'plan_cancel_anytime' => 'Altijd opzegbaar.',
     'mcp' => [
         'title' => 'Beheer je socials via chat',
diff --git a/lang/pl/billing.php b/lang/pl/billing.php
index d9dc0a9d01..98ba762b90 100644
--- a/lang/pl/billing.php
+++ b/lang/pl/billing.php
@@ -12,7 +12,6 @@
     'subscribe' => [
         'billed_monthly' => 'Rozliczane miesięcznie',
         'prices' => [
-            'first_month' => '$1',
             'socials' => ['monthly' => '$19', 'yearly_per_month' => '$15.83', 'yearly' => '$190'],
             'workspaces' => ['monthly' => '$99', 'yearly_per_month' => '$82.50', 'yearly' => '$990'],
         ],
@@ -24,6 +23,7 @@
         'yearly' => 'Rocznie',
         'save_two_months' => '2 miesiące gratis',
         'per_month' => '/miesiąc',
+        'per_year' => '/rok',
         'workspaces_one' => 'Jeden workspace',
         'workspaces_unlimited' => 'Nielimitowane workspace’y',
         'workspaces_tooltip' => 'Workspace to jedna marka lub klient, oddzielony od pozostałych: własne konta społecznościowe, podpisy, etykiety, analityka, uprawnienia członków i połączenie MCP.',
@@ -61,26 +61,44 @@
     ],
 
     'current_plan' => [
+        'statuses' => [
+            'active' => 'Aktywny',
+            'trial' => 'Okres próbny',
+            'cancelling' => 'Anulowany',
+            'past_due' => 'Zaległy',
+        ],
         'change' => 'Zmień plan',
         'price_monthly' => ':price/miesiąc',
         'price_yearly' => ':price/rok',
         'trial_until' => 'Okres próbny do :date',
-        'renews' => 'Odnawia się automatycznie',
         'cancelled' => 'Anulowano, kończy się :date',
-        'workspaces_usage' => 'Workspace’y: :count z :limit',
+        'discount_until' => 'Rabat :discount do :date',
+        'discount_forever' => 'Rabat :discount na każdą płatność',
+        'discount_once' => 'Rabat :discount na następną płatność',
     ],
 
     'subscription' => [
-        'title' => 'Metoda płatności',
+        'title' => 'Metody płatności',
+        'default' => 'Domyślna',
         'description' => 'Zaktualizuj kartę lub dane rozliczeniowe w Stripe.',
         'no_payment_method' => 'Brak zapisanej metody płatności.',
         'expires_on' => 'Wygasa :month/:year',
         'manage_stripe' => 'Zarządzaj w Stripe',
     ],
 
+    'tabs' => [
+        'plan' => 'Plan',
+        'invoices' => 'Faktury',
+    ],
+
     'invoices' => [
-        'title' => 'Faktury',
-        'description' => 'Pobierz swoje wcześniejsze faktury.',
+        'columns' => [
+            'date' => 'Data',
+            'amount' => 'Kwota',
+            'status' => 'Status',
+        ],
+        'empty_title' => 'Brak faktur',
+        'empty_description' => 'Faktury pojawią się tutaj po pierwszej płatności.',
         'paid' => 'Opłacona',
         'download' => 'Pobierz fakturę',
     ],
diff --git a/lang/pl/offers.php b/lang/pl/offers.php
new file mode 100644
index 0000000000..f058022da5
--- /dev/null
+++ b/lang/pl/offers.php
@@ -0,0 +1,21 @@
+<?php
+
+return [
+    'bf26' => [
+        'name' => 'Black Friday',
+        'headline' => '50% zniżki przez pierwsze 3 miesiące',
+        'price' => '$9.50',
+        'unit' => '/miesiąc',
+        'period' => 'przez pierwsze 3 miesiące',
+    ],
+    'first_month' => [
+        'name' => 'Pierwszy miesiąc',
+        'headline' => 'Pierwszy miesiąc za $1',
+        'price' => '$1',
+        'period' => 'za pierwszy miesiąc',
+    ],
+    'free_trial_7_days' => [
+        'price' => 'Za darmo',
+        'period' => 'przez 7 dni',
+    ],
+];
diff --git a/lang/pl/welcome.php b/lang/pl/welcome.php
index a8d8f07f84..4a4daafb41 100644
--- a/lang/pl/welcome.php
+++ b/lang/pl/welcome.php
@@ -47,9 +47,8 @@
     ],
     'plan_title' => 'Aktywuj swoje konto',
     'plan_description' => 'Połącz kanały i zaplanuj pierwszy post już dziś.',
-    'plan_first_month' => 'za pierwszy miesiąc',
     'plan_terms' => 'Potem :price/mies. Anuluj w dowolnym momencie.',
-    'plan_per_month' => 'miesięcznie',
+    'plan_start_trial' => 'Wypróbuj za darmo',
     'plan_cancel_anytime' => 'Anuluj w dowolnym momencie.',
     'mcp' => [
         'title' => 'Zarządzaj social mediami w czacie',
diff --git a/lang/pt-BR/billing.php b/lang/pt-BR/billing.php
index d40a2ec821..f44b5b36f1 100644
--- a/lang/pt-BR/billing.php
+++ b/lang/pt-BR/billing.php
@@ -12,7 +12,6 @@
     'subscribe' => [
         'billed_monthly' => 'Cobrança mensal',
         'prices' => [
-            'first_month' => 'R$ 1',
             'socials' => ['monthly' => 'R$ 99', 'yearly_per_month' => 'R$ 82,50', 'yearly' => 'R$ 990'],
             'workspaces' => ['monthly' => 'R$ 499', 'yearly_per_month' => 'R$ 415,83', 'yearly' => 'R$ 4.990'],
         ],
@@ -24,6 +23,7 @@
         'yearly' => 'Anual',
         'save_two_months' => '2 meses grátis',
         'per_month' => '/mês',
+        'per_year' => '/ano',
         'workspaces_one' => 'Um workspace',
         'workspaces_unlimited' => 'Workspaces ilimitados',
         'workspaces_tooltip' => 'Um workspace é uma marca ou cliente, separado dos demais: com suas próprias redes sociais, assinaturas, labels, analytics, permissões de membros e conexão MCP.',
@@ -61,26 +61,44 @@
     ],
 
     'current_plan' => [
+        'statuses' => [
+            'active' => 'Ativo',
+            'trial' => 'Teste grátis',
+            'cancelling' => 'Cancelado',
+            'past_due' => 'Em atraso',
+        ],
         'change' => 'Mudar plano',
         'price_monthly' => ':price/mês',
         'price_yearly' => ':price/ano',
         'trial_until' => 'Trial até :date',
-        'renews' => 'Renova automaticamente',
         'cancelled' => 'Cancelado, termina em :date',
-        'workspaces_usage' => 'Workspaces: :count de :limit',
+        'discount_until' => ':discount de desconto até :date',
+        'discount_forever' => ':discount de desconto em todos os pagamentos',
+        'discount_once' => ':discount de desconto no próximo pagamento',
     ],
 
     'subscription' => [
-        'title' => 'Método de pagamento',
+        'title' => 'Métodos de pagamento',
+        'default' => 'Padrão',
         'description' => 'Atualize seu cartão ou dados de cobrança no Stripe.',
         'no_payment_method' => 'Nenhum método de pagamento cadastrado.',
         'expires_on' => 'Expira em :month/:year',
         'manage_stripe' => 'Gerenciar no Stripe',
     ],
 
+    'tabs' => [
+        'plan' => 'Plano',
+        'invoices' => 'Faturas',
+    ],
+
     'invoices' => [
-        'title' => 'Faturas',
-        'description' => 'Baixe suas faturas anteriores.',
+        'columns' => [
+            'date' => 'Data',
+            'amount' => 'Valor',
+            'status' => 'Status',
+        ],
+        'empty_title' => 'Nenhuma fatura ainda',
+        'empty_description' => 'Suas faturas aparecem aqui depois do primeiro pagamento.',
         'paid' => 'Pago',
         'download' => 'Baixar fatura',
     ],
diff --git a/lang/pt-BR/offers.php b/lang/pt-BR/offers.php
new file mode 100644
index 0000000000..83035c4fe5
--- /dev/null
+++ b/lang/pt-BR/offers.php
@@ -0,0 +1,21 @@
+<?php
+
+return [
+    'bf26' => [
+        'name' => 'Black Friday',
+        'headline' => '50% de desconto nos 3 primeiros meses',
+        'price' => 'R$ 49,50',
+        'unit' => '/mês',
+        'period' => 'nos 3 primeiros meses',
+    ],
+    'first_month' => [
+        'name' => 'Primeiro mês',
+        'headline' => 'Seu primeiro mês por R$ 1',
+        'price' => 'R$ 1',
+        'period' => 'no primeiro mês',
+    ],
+    'free_trial_7_days' => [
+        'price' => 'Grátis',
+        'period' => 'por 7 dias',
+    ],
+];
diff --git a/lang/pt-BR/welcome.php b/lang/pt-BR/welcome.php
index b74768449f..24e3c784b8 100644
--- a/lang/pt-BR/welcome.php
+++ b/lang/pt-BR/welcome.php
@@ -47,9 +47,8 @@
     ],
     'plan_title' => 'Ative sua conta',
     'plan_description' => 'Conecte suas redes e agende seu primeiro post hoje.',
-    'plan_first_month' => 'no primeiro mês',
     'plan_terms' => 'Depois, :price/mês. Cancele quando quiser.',
-    'plan_per_month' => 'por mês',
+    'plan_start_trial' => 'Testar grátis',
     'plan_cancel_anytime' => 'Cancele quando quiser.',
     'mcp' => [
         'title' => 'Gerencie suas redes pelo chat',
diff --git a/lang/ru/billing.php b/lang/ru/billing.php
index e71de5e790..7a951da92b 100644
--- a/lang/ru/billing.php
+++ b/lang/ru/billing.php
@@ -12,7 +12,6 @@
     'subscribe' => [
         'billed_monthly' => 'Ежемесячная оплата',
         'prices' => [
-            'first_month' => '$1',
             'socials' => ['monthly' => '$19', 'yearly_per_month' => '$15.83', 'yearly' => '$190'],
             'workspaces' => ['monthly' => '$99', 'yearly_per_month' => '$82.50', 'yearly' => '$990'],
         ],
@@ -24,6 +23,7 @@
         'yearly' => 'Ежегодно',
         'save_two_months' => '2 месяца бесплатно',
         'per_month' => '/месяц',
+        'per_year' => '/год',
         'workspaces_one' => 'Один workspace',
         'workspaces_unlimited' => 'Неограниченное число workspace',
         'workspaces_tooltip' => 'Workspace — это один бренд или клиент, отделённый от остальных: свои соцсети, подписи, метки, аналитика, права участников и подключение MCP.',
@@ -61,26 +61,44 @@
     ],
 
     'current_plan' => [
+        'statuses' => [
+            'active' => 'Активен',
+            'trial' => 'Пробный период',
+            'cancelling' => 'Отменён',
+            'past_due' => 'Просрочен',
+        ],
         'change' => 'Сменить план',
         'price_monthly' => ':price/месяц',
         'price_yearly' => ':price/год',
         'trial_until' => 'Пробный период до :date',
-        'renews' => 'Продлевается автоматически',
         'cancelled' => 'Отменён, действует до :date',
-        'workspaces_usage' => 'Рабочие пространства: :count из :limit',
+        'discount_until' => 'Скидка :discount до :date',
+        'discount_forever' => 'Скидка :discount на каждый платёж',
+        'discount_once' => 'Скидка :discount на следующий платёж',
     ],
 
     'subscription' => [
-        'title' => 'Способ оплаты',
+        'title' => 'Способы оплаты',
+        'default' => 'Основная',
         'description' => 'Обновите карту или платёжные данные в Stripe.',
         'no_payment_method' => 'Способ оплаты пока не добавлен.',
         'expires_on' => 'Истекает :month/:year',
         'manage_stripe' => 'Управлять в Stripe',
     ],
 
+    'tabs' => [
+        'plan' => 'План',
+        'invoices' => 'Счета',
+    ],
+
     'invoices' => [
-        'title' => 'Счета',
-        'description' => 'Скачивайте прошлые счета.',
+        'columns' => [
+            'date' => 'Дата',
+            'amount' => 'Сумма',
+            'status' => 'Статус',
+        ],
+        'empty_title' => 'Счетов пока нет',
+        'empty_description' => 'Счета появятся здесь после первой оплаты.',
         'paid' => 'Оплачено',
         'download' => 'Скачать счёт',
     ],
diff --git a/lang/ru/offers.php b/lang/ru/offers.php
new file mode 100644
index 0000000000..8b667f7eb2
--- /dev/null
+++ b/lang/ru/offers.php
@@ -0,0 +1,21 @@
+<?php
+
+return [
+    'bf26' => [
+        'name' => 'Чёрная пятница',
+        'headline' => 'Скидка 50% на первые 3 месяца',
+        'price' => '$9.50',
+        'unit' => '/месяц',
+        'period' => 'за первые 3 месяца',
+    ],
+    'first_month' => [
+        'name' => 'Первый месяц',
+        'headline' => 'Первый месяц за $1',
+        'price' => '$1',
+        'period' => 'за первый месяц',
+    ],
+    'free_trial_7_days' => [
+        'price' => 'Бесплатно',
+        'period' => 'на 7 дней',
+    ],
+];
diff --git a/lang/ru/welcome.php b/lang/ru/welcome.php
index b7d40d03b3..3e2228eb00 100644
--- a/lang/ru/welcome.php
+++ b/lang/ru/welcome.php
@@ -47,9 +47,8 @@
     ],
     'plan_title' => 'Активируйте аккаунт',
     'plan_description' => 'Подключите каналы и запланируйте первый пост уже сегодня.',
-    'plan_first_month' => 'за первый месяц',
     'plan_terms' => 'Затем :price/мес. Отмена в любой момент.',
-    'plan_per_month' => 'в месяц',
+    'plan_start_trial' => 'Начать бесплатно',
     'plan_cancel_anytime' => 'Отмена в любой момент.',
     'mcp' => [
         'title' => 'Ведите соцсети прямо в чате',
diff --git a/lang/tr/billing.php b/lang/tr/billing.php
index 74b3c4e941..038fcb241a 100644
--- a/lang/tr/billing.php
+++ b/lang/tr/billing.php
@@ -14,7 +14,6 @@
     'subscribe' => [
         'billed_monthly' => 'Aylık faturalandırılır',
         'prices' => [
-            'first_month' => '$1',
             'socials' => ['monthly' => '$19', 'yearly_per_month' => '$15.83', 'yearly' => '$190'],
             'workspaces' => ['monthly' => '$99', 'yearly_per_month' => '$82.50', 'yearly' => '$990'],
         ],
@@ -26,6 +25,7 @@
         'yearly' => 'Yıllık',
         'save_two_months' => '2 ay ücretsiz',
         'per_month' => '/ay',
+        'per_year' => '/yıl',
         'workspaces_one' => 'Bir workspace',
         'workspaces_unlimited' => 'Sınırsız workspace',
         'workspaces_tooltip' => 'Workspace, diğerlerinden ayrı tutulan tek bir marka veya müşteridir: kendi sosyal medya hesapları, imzaları, etiketleri, analizleri, üye izinleri ve MCP bağlantısı vardır.',
@@ -63,26 +63,44 @@
     ],
 
     'current_plan' => [
+        'statuses' => [
+            'active' => 'Aktif',
+            'trial' => 'Ücretsiz deneme',
+            'cancelling' => 'İptal edildi',
+            'past_due' => 'Gecikmiş',
+        ],
         'change' => 'Planı değiştir',
         'price_monthly' => ':price/ay',
         'price_yearly' => ':price/yıl',
         'trial_until' => ':date tarihine kadar deneme',
-        'renews' => 'Otomatik olarak yenilenir',
         'cancelled' => 'İptal edildi, :date tarihinde sona erer',
-        'workspaces_usage' => 'Çalışma alanları: :count / :limit',
+        'discount_until' => ':date tarihine kadar :discount indirim',
+        'discount_forever' => 'Her ödemede :discount indirim',
+        'discount_once' => 'Sonraki ödemenizde :discount indirim',
     ],
 
     'subscription' => [
-        'title' => 'Ödeme yöntemi',
+        'title' => 'Ödeme yöntemleri',
+        'default' => 'Varsayılan',
         'description' => 'Kartınızı veya fatura bilgilerinizi Stripe’da güncelleyin.',
         'no_payment_method' => 'Henüz kayıtlı ödeme yöntemi yok.',
         'expires_on' => 'Son kullanma: :month/:year',
         'manage_stripe' => 'Stripe\'ta yönet',
     ],
 
+    'tabs' => [
+        'plan' => 'Plan',
+        'invoices' => 'Faturalar',
+    ],
+
     'invoices' => [
-        'title' => 'Faturalar',
-        'description' => 'Geçmiş faturalarınızı indirin.',
+        'columns' => [
+            'date' => 'Tarih',
+            'amount' => 'Tutar',
+            'status' => 'Durum',
+        ],
+        'empty_title' => 'Henüz fatura yok',
+        'empty_description' => 'Faturalarınız ilk ödemenizden sonra burada görünür.',
         'paid' => 'Ödendi',
         'download' => 'Faturayı indir',
     ],
diff --git a/lang/tr/offers.php b/lang/tr/offers.php
new file mode 100644
index 0000000000..5e5a198233
--- /dev/null
+++ b/lang/tr/offers.php
@@ -0,0 +1,21 @@
+<?php
+
+return [
+    'bf26' => [
+        'name' => 'Black Friday',
+        'headline' => 'İlk 3 ayda %50 indirim',
+        'price' => '$9.50',
+        'unit' => '/ay',
+        'period' => 'ilk 3 ay için',
+    ],
+    'first_month' => [
+        'name' => 'İlk ay',
+        'headline' => 'İlk ayın $1',
+        'price' => '$1',
+        'period' => 'ilk ay için',
+    ],
+    'free_trial_7_days' => [
+        'price' => 'Ücretsiz',
+        'period' => '7 gün boyunca',
+    ],
+];
diff --git a/lang/tr/welcome.php b/lang/tr/welcome.php
index 1690b068c4..0c81fa1e74 100644
--- a/lang/tr/welcome.php
+++ b/lang/tr/welcome.php
@@ -47,9 +47,8 @@
     ],
     'plan_title' => 'Hesabını etkinleştir',
     'plan_description' => 'Kanallarını bağla ve ilk gönderini bugün planla.',
-    'plan_first_month' => 'ilk ay için',
     'plan_terms' => 'Sonra :price/ay. İstediğin zaman iptal et.',
-    'plan_per_month' => 'aylık',
+    'plan_start_trial' => 'Ücretsiz dene',
     'plan_cancel_anytime' => 'İstediğin zaman iptal et.',
     'mcp' => [
         'title' => 'Sosyal medyanı sohbetle yönet',
diff --git a/lang/uk/billing.php b/lang/uk/billing.php
index c08f1b0332..59157fba1f 100644
--- a/lang/uk/billing.php
+++ b/lang/uk/billing.php
@@ -12,7 +12,6 @@
     'subscribe' => [
         'billed_monthly' => 'Щомісячна оплата',
         'prices' => [
-            'first_month' => '$1',
             'socials' => ['monthly' => '$19', 'yearly_per_month' => '$15.83', 'yearly' => '$190'],
             'workspaces' => ['monthly' => '$99', 'yearly_per_month' => '$82.50', 'yearly' => '$990'],
         ],
@@ -24,6 +23,7 @@
         'yearly' => 'Щороку',
         'save_two_months' => '2 місяці безкоштовно',
         'per_month' => '/місяць',
+        'per_year' => '/рік',
         'workspaces_one' => 'Один workspace',
         'workspaces_unlimited' => 'Необмежена кількість workspace',
         'workspaces_tooltip' => 'Workspace — це один бренд або клієнт, відокремлений від інших: власні соцмережі, підписи, мітки, аналітика, права учасників і підключення MCP.',
@@ -61,26 +61,44 @@
     ],
 
     'current_plan' => [
+        'statuses' => [
+            'active' => 'Активний',
+            'trial' => 'Пробний період',
+            'cancelling' => 'Скасовано',
+            'past_due' => 'Прострочено',
+        ],
         'change' => 'Змінити план',
         'price_monthly' => ':price/місяць',
         'price_yearly' => ':price/рік',
         'trial_until' => 'Пробний період до :date',
-        'renews' => 'Поновлюється автоматично',
         'cancelled' => 'Скасовано, діє до :date',
-        'workspaces_usage' => 'Робочі простори: :count з :limit',
+        'discount_until' => 'Знижка :discount до :date',
+        'discount_forever' => 'Знижка :discount на кожен платіж',
+        'discount_once' => 'Знижка :discount на наступний платіж',
     ],
 
     'subscription' => [
-        'title' => 'Спосіб оплати',
+        'title' => 'Способи оплати',
+        'default' => 'Основна',
         'description' => 'Оновіть картку або платіжні дані в Stripe.',
         'no_payment_method' => 'Спосіб оплати ще не додано.',
         'expires_on' => 'Діє до :month/:year',
         'manage_stripe' => 'Керувати в Stripe',
     ],
 
+    'tabs' => [
+        'plan' => 'План',
+        'invoices' => 'Рахунки',
+    ],
+
     'invoices' => [
-        'title' => 'Рахунки',
-        'description' => 'Завантажуйте минулі рахунки.',
+        'columns' => [
+            'date' => 'Дата',
+            'amount' => 'Сума',
+            'status' => 'Статус',
+        ],
+        'empty_title' => 'Рахунків поки немає',
+        'empty_description' => 'Рахунки з’являться тут після першої оплати.',
         'paid' => 'Оплачено',
         'download' => 'Завантажити рахунок',
     ],
diff --git a/lang/uk/offers.php b/lang/uk/offers.php
new file mode 100644
index 0000000000..e7d2269124
--- /dev/null
+++ b/lang/uk/offers.php
@@ -0,0 +1,21 @@
+<?php
+
+return [
+    'bf26' => [
+        'name' => 'Чорна пʼятниця',
+        'headline' => 'Знижка 50% на перші 3 місяці',
+        'price' => '$9.50',
+        'unit' => '/місяць',
+        'period' => 'за перші 3 місяці',
+    ],
+    'first_month' => [
+        'name' => 'Перший місяць',
+        'headline' => 'Перший місяць за $1',
+        'price' => '$1',
+        'period' => 'за перший місяць',
+    ],
+    'free_trial_7_days' => [
+        'price' => 'Безкоштовно',
+        'period' => 'на 7 днів',
+    ],
+];
diff --git a/lang/uk/welcome.php b/lang/uk/welcome.php
index 135b45ee2b..25824952f9 100644
--- a/lang/uk/welcome.php
+++ b/lang/uk/welcome.php
@@ -47,9 +47,8 @@
     ],
     'plan_title' => 'Активуйте акаунт',
     'plan_description' => 'Підключіть канали та заплануйте перший пост уже сьогодні.',
-    'plan_first_month' => 'за перший місяць',
     'plan_terms' => 'Потім :price/міс. Скасування будь-коли.',
-    'plan_per_month' => 'на місяць',
+    'plan_start_trial' => 'Почати безкоштовно',
     'plan_cancel_anytime' => 'Скасування будь-коли.',
     'mcp' => [
         'title' => 'Ведіть соцмережі просто в чаті',
diff --git a/lang/zh/billing.php b/lang/zh/billing.php
index 0c9e8620ff..40c64c017d 100644
--- a/lang/zh/billing.php
+++ b/lang/zh/billing.php
@@ -12,7 +12,6 @@
     'subscribe' => [
         'billed_monthly' => '按月计费',
         'prices' => [
-            'first_month' => '$1',
             'socials' => ['monthly' => '$19', 'yearly_per_month' => '$15.83', 'yearly' => '$190'],
             'workspaces' => ['monthly' => '$99', 'yearly_per_month' => '$82.50', 'yearly' => '$990'],
         ],
@@ -24,6 +23,7 @@
         'yearly' => '按年',
         'save_two_months' => '免两个月',
         'per_month' => '/月',
+        'per_year' => '/年',
         'workspaces_one' => '一个工作区',
         'workspaces_unlimited' => '无限工作区',
         'workspaces_tooltip' => '一个工作区对应一个品牌或客户，与其他工作区相互隔离：拥有自己的社交账号、签名、标签、数据分析、成员权限和 MCP 连接。',
@@ -61,26 +61,44 @@
     ],
 
     'current_plan' => [
+        'statuses' => [
+            'active' => '生效中',
+            'trial' => '免费试用',
+            'cancelling' => '已取消',
+            'past_due' => '已逾期',
+        ],
         'change' => '更改套餐',
         'price_monthly' => ':price/月',
         'price_yearly' => ':price/年',
         'trial_until' => '试用至 :date',
-        'renews' => '自动续订',
         'cancelled' => '已取消，将于 :date 结束',
-        'workspaces_usage' => '工作区：:count / :limit',
+        'discount_until' => '优惠 :discount，截至 :date',
+        'discount_forever' => '每次付款优惠 :discount',
+        'discount_once' => '下次付款优惠 :discount',
     ],
 
     'subscription' => [
         'title' => '付款方式',
+        'default' => '默认',
         'description' => '在 Stripe 更新你的卡片或账单信息。',
         'no_payment_method' => '尚未添加付款方式。',
         'expires_on' => '有效期至 :month/:year',
         'manage_stripe' => '在 Stripe 上管理',
     ],
 
+    'tabs' => [
+        'plan' => '套餐',
+        'invoices' => '发票',
+    ],
+
     'invoices' => [
-        'title' => '发票',
-        'description' => '下载你过往的发票。',
+        'columns' => [
+            'date' => '日期',
+            'amount' => '金额',
+            'status' => '状态',
+        ],
+        'empty_title' => '暂无发票',
+        'empty_description' => '首次付款后，你的发票会显示在这里。',
         'paid' => '已支付',
         'download' => '下载发票',
     ],
diff --git a/lang/zh/offers.php b/lang/zh/offers.php
new file mode 100644
index 0000000000..61adef62e9
--- /dev/null
+++ b/lang/zh/offers.php
@@ -0,0 +1,21 @@
+<?php
+
+return [
+    'bf26' => [
+        'name' => '黑色星期五',
+        'headline' => '前 3 个月 5 折',
+        'price' => '$9.50',
+        'unit' => '/月',
+        'period' => '前 3 个月',
+    ],
+    'first_month' => [
+        'name' => '首月',
+        'headline' => '首月仅需 $1',
+        'price' => '$1',
+        'period' => '首月价格',
+    ],
+    'free_trial_7_days' => [
+        'price' => '免费',
+        'period' => '7 天内',
+    ],
+];
diff --git a/lang/zh/welcome.php b/lang/zh/welcome.php
index dfb4d08abf..91e709225f 100644
--- a/lang/zh/welcome.php
+++ b/lang/zh/welcome.php
@@ -47,9 +47,8 @@
     ],
     'plan_title' => '激活你的账户',
     'plan_description' => '连接你的账号，今天就排期第一条帖子。',
-    'plan_first_month' => '首月价格',
     'plan_terms' => '之后 :price/月，随时取消。',
-    'plan_per_month' => '每月',
+    'plan_start_trial' => '免费试用',
     'plan_cancel_anytime' => '随时取消。',
     'mcp' => [
         'title' => '和 AI 聊天，轻松管理社交媒体',
diff --git a/public/images/card-brands/amex.svg b/public/images/card-brands/amex.svg
new file mode 100755
index 0000000000..9007e03fc7
--- /dev/null
+++ b/public/images/card-brands/amex.svg
@@ -0,0 +1 @@
+<svg width="780" height="500" enable-background="new 0 0 780 500" version="1.1" viewBox="0 0 780 500" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><path d="m40 1e-3h700c22.092 0 40 17.909 40 40v420c0 22.092-17.908 40-40 40h-700c-22.091 0-40-17.908-40-40v-420c0-22.091 17.909-40 40-40z" fill="#2557D6"/><path d="m0.253 235.69h37.441l8.442-19.51h18.9l8.42 19.51h73.668v-14.915l6.576 14.98h38.243l6.576-15.202v15.138h183.08l-0.085-32.026h3.542c2.479 0.083 3.204 0.302 3.204 4.226v27.8h94.689v-7.455c7.639 3.92 19.518 7.455 35.148 7.455h39.836l8.525-19.51h18.9l8.337 19.51h76.765v-18.532l11.626 18.532h61.515v-122.51h-60.88v14.468l-8.522-14.468h-62.471v14.468l-7.828-14.468h-84.38c-14.123 0-26.539 1.889-36.569 7.153v-7.153h-58.229v7.153c-6.383-5.426-15.079-7.153-24.75-7.153h-212.74l-14.274 31.641-14.659-31.641h-67.005v14.468l-7.362-14.468h-57.145l-26.539 58.246v64.261h3e-3zm236.34-17.67h-22.464l-0.083-68.794-31.775 68.793h-19.24l-31.858-68.854v68.854h-44.57l-8.42-19.592h-45.627l-8.505 19.592h-23.801l39.241-87.837h32.559l37.269 83.164v-83.164h35.766l28.678 59.587 26.344-59.587h36.485l1e-3 87.838zm-165.9-37.823l-14.998-35.017-14.915 35.017h29.913zm255.3 37.821h-73.203v-87.837h73.203v18.291h-51.289v15.833h50.06v18.005h-50.061v17.542h51.289l1e-3 18.166zm103.16-64.18c0 14.004-9.755 21.24-15.439 23.412 4.794 1.748 8.891 4.838 10.84 7.397 3.094 4.369 3.628 8.271 3.628 16.116v17.255h-22.104l-0.083-11.077c0-5.285 0.528-12.886-3.458-17.112-3.202-3.09-8.083-3.76-15.973-3.76h-23.523v31.95h-21.914v-87.838h50.401c11.199 0 19.451 0.283 26.535 4.207 6.933 3.924 11.09 9.652 11.09 19.45zm-27.699 13.042c-3.013 1.752-6.573 1.81-10.841 1.81h-26.62v-19.51h26.982c3.818 0 7.804 0.164 10.393 1.584 2.842 1.28 4.601 4.003 4.601 7.765 0 3.84-1.674 6.929-4.515 8.351zm62.844 51.138h-22.358v-87.837h22.358v87.837zm259.56 0h-31.053l-41.535-65.927v65.927h-44.628l-8.527-19.592h-45.521l-8.271 19.592h-25.648c-10.649 0-24.138-2.257-31.773-9.715-7.701-7.458-11.708-17.56-11.708-33.533 0-13.027 2.395-24.936 11.812-34.347 7.085-7.01 18.18-10.242 33.28-10.242h21.215v18.821h-20.771c-7.997 0-12.514 1.14-16.862 5.203-3.735 3.699-6.298 10.69-6.298 19.897 0 9.41 1.951 16.196 6.023 20.628 3.373 3.476 9.506 4.53 15.272 4.53h9.842l30.884-69.076h32.835l37.102 83.081v-83.08h33.366l38.519 61.174v-61.174h22.445v87.833zm-133.2-37.82l-15.165-35.017-15.081 35.017h30.246zm189.04 178.08c-5.322 7.457-15.694 11.238-29.736 11.238h-42.319v-18.84h42.147c4.181 0 7.106-0.527 8.868-2.175 1.665-1.474 2.605-3.554 2.591-5.729 0-2.561-1.064-4.593-2.677-5.811-1.59-1.342-3.904-1.95-7.722-1.95-20.574-0.67-46.244 0.608-46.244-27.194 0-12.742 8.443-26.156 31.439-26.156h43.649v-17.479h-40.557c-12.237 0-21.129 2.81-27.425 7.174v-7.175h-59.985c-9.595 0-20.854 2.279-26.179 7.175v-7.175h-107.12v7.175c-8.524-5.892-22.908-7.175-29.549-7.175h-70.656v7.175c-6.745-6.258-21.742-7.175-30.886-7.175h-79.077l-18.094 18.764-16.949-18.764h-118.13v122.59h115.9l18.646-19.062 17.565 19.062 71.442 0.061v-28.838h7.021c9.479 0.14 20.66-0.228 30.523-4.312v33.085h58.928v-31.952h2.842c3.628 0 3.985 0.144 3.985 3.615v28.333h179.01c11.364 0 23.244-2.786 29.824-7.845v7.845h56.78c11.815 0 23.354-1.587 32.134-5.649l2e-3 -22.84zm-354.94-47.155c0 24.406-19.005 29.445-38.159 29.445h-27.343v29.469h-42.591l-26.984-29.086-28.042 29.086h-86.802v-87.859h88.135l26.961 28.799 27.875-28.799h70.021c17.389 0 36.929 4.613 36.929 28.945zm-174.22 40.434h-53.878v-17.48h48.11v-17.926h-48.11v-15.974h54.939l23.969 25.604-25.03 25.776zm86.81 10.06l-33.644-35.789 33.644-34.65v70.439zm49.757-39.066h-28.318v-22.374h28.572c7.912 0 13.404 3.09 13.404 10.772 0 7.599-5.238 11.602-13.658 11.602zm148.36-40.373h73.138v18.17h-51.315v15.973h50.062v17.926h-50.062v17.48l51.314 0.08v18.23h-73.139l2e-3 -87.859zm-28.119 47.029c4.878 1.725 8.865 4.816 10.734 7.375 3.095 4.291 3.542 8.294 3.631 16.037v17.418h-22.002v-10.992c0-5.286 0.531-13.112-3.542-17.198-3.201-3.147-8.083-3.899-16.076-3.899h-23.42v32.09h-22.02v-87.859h50.594c11.093 0 19.173 0.47 26.366 4.146 6.915 4.004 11.266 9.487 11.266 19.511-1e-3 14.022-9.764 21.178-15.531 23.371zm-12.385-11.107c-2.932 1.667-6.556 1.811-10.818 1.811h-26.622v-19.732h26.982c3.902 0 7.807 0.08 10.458 1.587 2.84 1.423 4.538 4.146 4.538 7.903 0 3.758-1.699 6.786-4.538 8.431zm197.82 5.597c4.27 4.229 6.554 9.571 6.554 18.613 0 18.9-12.322 27.723-34.425 27.723h-42.68v-18.84h42.51c4.157 0 7.104-0.525 8.95-2.175 1.508-1.358 2.589-3.333 2.589-5.729 0-2.561-1.17-4.592-2.675-5.811-1.675-1.34-3.986-1.949-7.803-1.949-20.493-0.67-46.157 0.609-46.157-27.192 0-12.744 8.355-26.158 31.33-26.158h43.932v18.7h-40.198c-3.984 0-6.575 0.145-8.779 1.587-2.4 1.422-3.29 3.534-3.29 6.319 0 3.314 2.037 5.57 4.795 6.546 2.311 0.77 4.795 0.995 8.526 0.995l11.797 0.306c11.895 0.276 20.061 2.248 25.024 7.065zm86.955-23.52h-39.938c-3.986 0-6.638 0.144-8.867 1.587-2.312 1.423-3.202 3.534-3.202 6.322 0 3.314 1.951 5.568 4.791 6.544 2.312 0.771 4.795 0.996 8.444 0.996l11.878 0.304c11.983 0.284 19.982 2.258 24.86 7.072 0.891 0.67 1.422 1.422 2.033 2.175v-25h1e-3z" fill="#fff"/></svg>
diff --git a/public/images/card-brands/diners.svg b/public/images/card-brands/diners.svg
new file mode 100755
index 0000000000..3f1827bf44
--- /dev/null
+++ b/public/images/card-brands/diners.svg
@@ -0,0 +1 @@
+<svg width="780" height="500" enable-background="new 0 0 780 500" version="1.1" viewBox="0 0 780 500" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><path d="M40,0h700c22.092,0,40,17.909,40,40v420c0,22.092-17.908,40-40,40H40c-22.091,0-40-17.908-40-40V40   C0,17.909,17.909,0,40,0z" fill="#0079BE"/><path d="m599.93 251.45c0-99.415-82.98-168.13-173.9-168.1h-78.242c-92.003-0.033-167.73 68.705-167.73 168.1 0 90.93 75.727 165.64 167.73 165.2h78.242c90.914 0.436 173.9-74.294 173.9-165.2z" fill="#fff"/><path d="m348.28 97.43c-84.07 0.027-152.19 68.308-152.21 152.58 0.02 84.258 68.144 152.53 152.21 152.56 84.09-0.027 152.23-68.303 152.24-152.56-0.011-84.272-68.149-152.55-152.24-152.58z" fill="#0079BE"/><path d="m252.07 249.6c0.08-41.181 25.746-76.297 61.94-90.25v180.48c-36.194-13.948-61.861-49.045-61.94-90.23zm131 90.274v-180.53c36.207 13.92 61.914 49.057 61.979 90.257-0.065 41.212-25.772 76.322-61.979 90.269z" fill="#fff"/></svg>
diff --git a/public/images/card-brands/discover.svg b/public/images/card-brands/discover.svg
new file mode 100755
index 0000000000..e6ee965659
--- /dev/null
+++ b/public/images/card-brands/discover.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg width="780" height="500" viewBox="0 0 780 500" xmlns="http://www.w3.org/2000/svg"><g fill-rule="evenodd"><path d="M54.992 0C24.627 0 0 24.63 0 55.004v390.992C0 476.376 24.619 501 54.992 501h670.016C755.373 501 780 476.37 780 445.996V55.004C780 24.624 755.381 0 725.008 0H54.992z" fill="#4D4D4D"/><path d="M327.152 161.893c8.837 0 16.248 1.784 25.268 6.09v22.751c-8.544-7.863-15.955-11.154-25.756-11.154-19.264 0-34.414 15.015-34.414 34.05 0 20.075 14.681 34.196 35.37 34.196 9.312 0 16.586-3.12 24.8-10.857v22.763c-9.341 4.14-16.911 5.776-25.756 5.776-31.278 0-55.582-22.596-55.582-51.737 0-28.826 24.951-51.878 56.07-51.878zm-97.113.627c11.546 0 22.11 3.72 30.943 10.994l-10.748 13.248c-5.35-5.646-10.41-8.028-16.564-8.028-8.853 0-15.3 4.745-15.3 10.989 0 5.354 3.619 8.188 15.944 12.482 23.365 8.044 30.29 15.176 30.29 30.926 0 19.193-14.976 32.553-36.32 32.553-15.63 0-26.994-5.795-36.458-18.872l13.268-12.03c4.73 8.61 12.622 13.222 22.42 13.222 9.163 0 15.947-5.952 15.947-13.984 0-4.164-2.055-7.734-6.158-10.258-2.066-1.195-6.158-2.977-14.2-5.647-19.291-6.538-25.91-13.527-25.91-27.185 0-16.225 14.214-28.41 32.846-28.41zm234.723 1.728h22.437l28.084 66.592 28.446-66.592h22.267l-45.494 101.686h-11.053l-44.687-101.686zm-397.348.152h30.15c33.312 0 56.534 20.382 56.534 49.641 0 14.59-7.104 28.696-19.118 38.057-10.108 7.901-21.626 11.445-37.574 11.445H67.414V164.4zm96.135 0h20.54v99.143h-20.54V164.4zm411.734 0h58.252v16.8H595.81v22.005h36.336v16.791h-36.336v26.762h37.726v16.785h-58.252V164.4zm71.858 0h30.455c23.69 0 37.265 10.71 37.265 29.272 0 15.18-8.514 25.14-23.986 28.105l33.148 41.766h-25.26l-28.429-39.828h-2.678v39.828h-20.515V164.4zm20.515 15.616v30.025h6.002c13.117 0 20.069-5.362 20.069-15.328 0-9.648-6.954-14.697-19.745-14.697h-6.326zM87.94 181.199v65.559h5.512c13.273 0 21.656-2.394 28.11-7.88 7.103-5.955 11.376-15.465 11.376-24.98 0-9.499-4.273-18.725-11.376-24.681-6.785-5.78-14.837-8.018-28.11-8.018H87.94z" fill="#FFF"/><path d="m415.13 161.21c30.941 0 56.022 23.58 56.022 52.709v0.033c0 29.13-25.081 52.742-56.021 52.742s-56.022-23.613-56.022-52.742v-0.033c0-29.13 25.082-52.71 56.022-52.71zm364.85 127.15c-26.05 18.33-221.08 149.34-558.75 212.62h503.76c30.365 0 54.992-24.63 54.992-55.004v-157.62z" fill="#F47216"/></g></svg>
diff --git a/public/images/card-brands/generic.svg b/public/images/card-brands/generic.svg
new file mode 100755
index 0000000000..e0dd349da5
--- /dev/null
+++ b/public/images/card-brands/generic.svg
@@ -0,0 +1 @@
+<svg width="780" height="500" enable-background="new 0 0 780 500" version="1.1" viewBox="0 0 780 500" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><path d="M40,0h700c22.092,0,40,17.909,40,40v420c0,22.092-17.908,40-40,40H40c-22.091,0-40-17.908-40-40V40  C0,17.909,17.909,0,40,0z" fill="#000C9D"/><rect x="66.908" y="106.91" width="110.32" height="99.679" fill="#9D9400"/><path d="m94.714 284.15v-3.795h-5.117v-11.27h-4.198l-0.402 11.27h-11.443l10.58-25.07-3.967-1.725-11.673 27.141v3.449h16.445v9.66h4.658v-9.66h5.117zm19.586-30.589c-4.025 0-7.878 1.381-11.213 4.6l2.588 2.934c2.645-2.473 5.002-3.68 8.395-3.68 4.197 0 7.532 2.357 7.532 6.727 0 4.773-3.737 6.959-7.532 6.959h-2.358l-0.575 3.795h3.335c4.658 0 8.223 1.84 8.223 7.531 0 4.945-3.278 8.107-8.855 8.107-3.22 0-6.555-1.322-8.798-3.967l-3.22 2.645c2.99 3.68 7.705 5.232 12.133 5.232 8.165 0 13.742-5.174 13.742-12.018 0-6.152-4.37-9.371-9.027-9.717 4.197-0.807 7.762-4.43 7.762-9.199 0-5.406-4.715-9.949-12.132-9.949zm34.477 0c-5.347 0-8.912 1.896-12.075 5.693l3.335 2.529c2.53-2.934 4.658-4.197 8.568-4.197 4.427 0 7.072 2.76 7.072 7.188 0 6.496-3.22 10.809-18.17 25.127v3.908h23.518l0.575-4.08h-18.63c13.052-11.904 17.71-17.826 17.71-25.07 0-6.325-4.428-11.098-11.903-11.098zm48.738 36.339h-8.28v-35.648h-4.198l-11.73 7.244 2.07 3.393 9.085-5.463v30.476h-9.775v3.908h22.828v-3.91zm69.587-5.75v-3.795h-5.117v-11.27h-4.198l-0.402 11.27h-11.443l10.58-25.07-3.967-1.725-11.673 27.141v3.449h16.445v9.66h4.658v-9.66h5.117zm19.585-30.589c-4.025 0-7.877 1.381-11.212 4.6l2.587 2.934c2.645-2.473 5.003-3.68 8.395-3.68 4.198 0 7.533 2.357 7.533 6.727 0 4.773-3.738 6.959-7.533 6.959h-2.357l-0.575 3.795h3.335c4.657 0 8.222 1.84 8.222 7.531 0 4.945-3.277 8.107-8.855 8.107-3.22 0-6.555-1.322-8.797-3.967l-3.22 2.645c2.99 3.68 7.705 5.232 12.132 5.232 8.165 0 13.743-5.174 13.743-12.018 0-6.152-4.37-9.371-9.028-9.717 4.198-0.807 7.763-4.43 7.763-9.199 0-5.406-4.715-9.949-12.133-9.949zm34.478 0c-5.348 0-8.913 1.896-12.075 5.693l3.335 2.529c2.53-2.934 4.657-4.197 8.567-4.197 4.428 0 7.073 2.76 7.073 7.188 0 6.496-3.221 10.809-18.171 25.127v3.908h23.518l0.575-4.08h-18.63c13.053-11.904 17.71-17.826 17.71-25.07 0-6.325-4.427-11.098-11.902-11.098zm48.737 36.339h-8.28v-35.648h-4.196l-11.729 7.244 2.069 3.393 9.085-5.463v30.476h-9.774v3.908h22.827l-2e-3 -3.91zm69.588-5.75v-3.795h-5.119v-11.27h-4.197l-0.401 11.27h-11.443l10.58-25.07-3.969-1.725-11.672 27.141v3.449h16.445v9.66h4.656v-9.66h5.12zm19.584-30.589c-4.023 0-7.877 1.381-11.213 4.6l2.588 2.934c2.646-2.473 5.002-3.68 8.396-3.68 4.195 0 7.531 2.357 7.531 6.727 0 4.773-3.736 6.959-7.531 6.959h-2.358l-0.574 3.795h3.334c4.658 0 8.225 1.84 8.225 7.531 0 4.945-3.278 8.107-8.854 8.107-3.222 0-6.556-1.322-8.799-3.967l-3.22 2.645c2.988 3.68 7.703 5.232 12.134 5.232 8.163 0 13.741-5.174 13.741-12.018 0-6.152-4.371-9.371-9.026-9.717 4.196-0.807 7.762-4.43 7.762-9.199-3e-3 -5.406-4.718-9.949-12.136-9.949zm34.479 0c-5.348 0-8.912 1.896-12.076 5.693l3.337 2.529c2.528-2.934 4.657-4.197 8.565-4.197 4.428 0 7.072 2.76 7.072 7.188 0 6.496-3.219 10.809-18.17 25.127v3.908h23.518l0.576-4.08h-18.631c13.053-11.904 17.711-17.826 17.711-25.07 0-6.326-4.428-11.098-11.904-11.098h2e-3zm48.736 36.339h-8.279v-35.648h-4.197l-11.729 7.244 2.07 3.393 9.084-5.463v30.476h-9.775v3.908h22.828l-2e-3 -3.91zm69.588-5.75v-3.795h-5.117v-11.27h-4.197l-0.401 11.27h-11.443l10.58-25.07-3.967-1.725-11.672 27.141v3.449h16.445v9.66h4.655v-9.66h5.117zm19.584-30.589c-4.023 0-7.877 1.381-11.211 4.6l2.588 2.934c2.646-2.473 5.002-3.68 8.396-3.68 4.196 0 7.532 2.357 7.532 6.727 0 4.773-3.737 6.959-7.532 6.959h-2.357l-0.574 3.795h3.334c4.658 0 8.224 1.84 8.224 7.531 0 4.945-3.277 8.107-8.855 8.107-3.219 0-6.555-1.322-8.797-3.967l-3.221 2.645c2.99 3.68 7.705 5.232 12.133 5.232 8.166 0 13.742-5.174 13.742-12.018 0-6.152-4.369-9.371-9.027-9.717 4.197-0.807 7.764-4.43 7.764-9.199 0-5.406-4.715-9.949-12.133-9.949h-6e-3zm34.478 0c-5.347 0-8.912 1.896-12.074 5.693l3.334 2.529c2.531-2.934 4.658-4.197 8.567-4.197 4.429 0 7.072 2.76 7.072 7.188 0 6.496-3.221 10.809-18.17 25.127v3.908h23.519l0.575-4.08h-18.631c13.054-11.904 17.711-17.826 17.711-25.07 2e-3 -6.325-4.428-11.098-11.903-11.098zm48.739 36.339h-8.278v-35.648h-4.2l-11.729 7.244 2.068 3.393 9.086-5.463v30.476h-9.775v3.908h22.828v-3.91z" fill="#fff"/><path d="m72.219 389.2h6.445v-22.246l-7.012 1.406v-3.594l6.973-1.406h3.945v25.84h6.446v3.32h-16.797v-3.32zm25.468 0h6.446v-22.246l-7.012 1.406v-3.594l6.973-1.406h3.945v25.84h6.445v3.32h-16.797v-3.32zm40.918 0h13.77v3.32h-18.516v-3.32c1.497-1.549 3.535-3.625 6.114-6.229 2.591-2.617 4.218-4.305 4.882-5.061 1.263-1.42 2.142-2.617 2.637-3.594 0.508-0.988 0.762-1.959 0.762-2.91 0-1.549-0.547-2.811-1.64-3.789-1.081-0.977-2.495-1.465-4.24-1.465-1.237 0-2.545 0.215-3.925 0.646-1.367 0.43-2.831 1.08-4.394 1.953v-3.986c1.588-0.637 3.072-1.119 4.453-1.443 1.38-0.326 2.643-0.486 3.789-0.486 3.021 0 5.429 0.754 7.226 2.264 1.797 1.512 2.696 3.529 2.696 6.055 0 1.199-0.228 2.338-0.684 3.418-0.442 1.068-1.256 2.332-2.441 3.789-0.326 0.377-1.361 1.471-3.106 3.281-1.745 1.796-4.206 4.315-7.383 7.557zm34.024-12.402c1.888 0.404 3.359 1.244 4.414 2.521 1.067 1.275 1.601 2.852 1.601 4.727 0 2.877-0.99 5.104-2.968 6.682-1.979 1.574-4.792 2.361-8.438 2.361-1.224 0-2.487-0.125-3.789-0.371-1.289-0.234-2.623-0.594-4.004-1.074v-3.809c1.093 0.639 2.292 1.119 3.594 1.445 1.302 0.324 2.663 0.488 4.082 0.488 2.474 0 4.356-0.488 5.645-1.465 1.302-0.979 1.953-2.396 1.953-4.26 0-1.719-0.605-3.061-1.817-4.021-1.198-0.979-2.872-1.465-5.02-1.465h-3.398v-3.242h3.555c1.94 0 3.425-0.385 4.453-1.152 1.029-0.781 1.543-1.9 1.543-3.359 0-1.496-0.534-2.645-1.601-3.438-1.055-0.809-2.572-1.211-4.551-1.211-1.081 0-2.24 0.117-3.477 0.354-1.237 0.232-2.597 0.598-4.082 1.092v-3.514c1.498-0.418 2.897-0.73 4.2-0.939 1.314-0.207 2.551-0.311 3.71-0.311 2.995 0 5.365 0.682 7.11 2.049 1.745 1.354 2.617 3.189 2.617 5.508 0 1.615-0.462 2.98-1.387 4.102-0.925 1.105-2.24 1.872-3.945 2.302zm26.289-13.438h15.488v3.32h-11.874v7.148c0.573-0.195 1.146-0.34 1.719-0.43 0.573-0.105 1.146-0.156 1.719-0.156 3.255 0 5.833 0.893 7.734 2.676s2.852 4.199 2.852 7.246c0 3.139-0.977 5.578-2.93 7.324-1.954 1.732-4.708 2.598-8.262 2.598-1.224 0-2.474-0.104-3.75-0.312-1.263-0.207-2.571-0.521-3.926-0.938v-3.965c1.172 0.639 2.383 1.113 3.633 1.426s2.572 0.469 3.965 0.469c2.253 0 4.037-0.594 5.352-1.777s1.972-2.793 1.972-4.824-0.657-3.639-1.972-4.824-3.099-1.775-5.352-1.775c-1.055 0-2.109 0.117-3.164 0.352-1.041 0.234-2.109 0.6-3.203 1.092l-1e-3 -14.65zm33.867 15.313c-1.875 0-3.353 0.502-4.434 1.506-1.067 1.002-1.601 2.383-1.601 4.141s0.534 3.137 1.601 4.139c1.082 1.004 2.56 1.506 4.434 1.506 1.875 0 3.354-0.502 4.434-1.504 1.08-1.016 1.62-2.396 1.62-4.141 0-1.758-0.54-3.139-1.62-4.141-1.068-1.004-2.546-1.506-4.434-1.506zm-3.945-1.68c-1.693-0.416-3.015-1.203-3.965-2.363-0.938-1.158-1.406-2.57-1.406-4.236 0-2.332 0.827-4.174 2.48-5.527 1.667-1.354 3.945-2.029 6.836-2.029 2.904 0 5.183 0.676 6.836 2.027 1.653 1.355 2.48 3.197 2.48 5.529 0 1.666-0.475 3.078-1.425 4.236-0.938 1.16-2.247 1.947-3.926 2.363 1.9 0.443 3.378 1.311 4.434 2.598 1.067 1.289 1.601 2.865 1.601 4.729 0 2.824-0.866 4.992-2.598 6.504-1.719 1.51-4.186 2.266-7.402 2.266s-5.69-0.756-7.422-2.266c-1.719-1.512-2.578-3.68-2.578-6.504 0-1.863 0.534-3.439 1.602-4.729 1.067-1.289 2.551-2.154 4.453-2.598zm-1.446-6.228c0 1.51 0.469 2.688 1.407 3.533 0.95 0.848 2.278 1.271 3.984 1.271 1.693 0 3.015-0.424 3.965-1.271 0.963-0.848 1.445-2.023 1.445-3.535 0-1.51-0.481-2.688-1.445-3.535-0.951-0.846-2.272-1.271-3.965-1.271-1.706 0-3.034 0.426-3.984 1.271-0.938 0.847-1.407 2.025-1.407 3.537z" fill="#fff" fill-opacity=".784"/><path d="m325.45 388.23h6.444v-22.246l-7.012 1.406v-3.594l6.973-1.406h3.946v25.84h6.444v3.32h-16.797l2e-3 -3.32zm36.738-12.404c1.889 0.404 3.359 1.244 4.415 2.521 1.067 1.275 1.602 2.852 1.602 4.727 0 2.877-0.989 5.105-2.969 6.68-1.979 1.576-4.791 2.363-8.438 2.363-1.224 0-2.487-0.123-3.79-0.371-1.288-0.232-2.622-0.592-4.003-1.074v-3.809c1.094 0.639 2.292 1.121 3.595 1.445 1.303 0.326 2.662 0.488 4.082 0.488 2.474 0 4.354-0.488 5.645-1.465 1.302-0.977 1.953-2.396 1.953-4.258 0-1.719-0.605-3.061-1.816-4.023-1.197-0.977-2.871-1.465-5.02-1.465h-3.398v-3.242h3.556c1.939 0 3.425-0.385 4.453-1.152 1.028-0.781 1.543-1.9 1.543-3.359 0-1.496-0.533-2.643-1.603-3.438-1.055-0.807-2.571-1.209-4.55-1.209-1.081 0-2.24 0.115-3.479 0.35-1.236 0.234-2.598 0.6-4.081 1.096v-3.518c1.497-0.416 2.896-0.729 4.198-0.938 1.315-0.209 2.553-0.312 3.71-0.312 2.996 0 5.365 0.686 7.11 2.053 1.744 1.354 2.616 3.189 2.616 5.508 0 1.613-0.462 2.98-1.386 4.102-0.923 1.103-2.239 1.872-3.945 2.3zm16.915 12.404h13.771v3.32h-18.518v-3.32c1.498-1.551 3.536-3.627 6.114-6.23 2.59-2.617 4.218-4.305 4.883-5.059 1.264-1.42 2.143-2.617 2.637-3.594 0.508-0.99 0.762-1.961 0.762-2.91 0-1.549-0.547-2.812-1.64-3.789-1.081-0.977-2.494-1.465-4.239-1.465-1.236 0-2.545 0.215-3.926 0.645-1.367 0.43-2.831 1.08-4.396 1.953v-3.984c1.589-0.639 3.073-1.119 4.453-1.445s2.645-0.488 3.789-0.488c3.021 0 5.43 0.756 7.227 2.268 1.797 1.51 2.695 3.527 2.695 6.055 0 1.195-0.227 2.336-0.684 3.418-0.441 1.066-1.256 2.33-2.441 3.789-0.325 0.377-1.36 1.471-3.104 3.279-1.746 1.796-4.206 4.315-7.383 7.557zm22.753 0h6.447v-22.246l-7.014 1.406v-3.594l6.975-1.406h3.943v25.84h6.445v3.32h-16.798l2e-3 -3.32zm49.472-12.404c1.889 0.404 3.358 1.244 4.414 2.521 1.067 1.275 1.604 2.852 1.604 4.727 0 2.877-0.99 5.105-2.971 6.68-1.979 1.576-4.791 2.363-8.438 2.363-1.223 0-2.485-0.123-3.788-0.371-1.289-0.232-2.623-0.592-4.005-1.074v-3.809c1.095 0.639 2.293 1.121 3.595 1.445 1.303 0.326 2.664 0.488 4.082 0.488 2.475 0 4.354-0.488 5.645-1.465 1.303-0.977 1.953-2.396 1.953-4.258 0-1.719-0.605-3.061-1.814-4.023-1.198-0.977-2.873-1.465-5.021-1.465h-3.396v-3.242h3.554c1.94 0 3.424-0.385 4.453-1.152 1.028-0.781 1.543-1.9 1.543-3.359 0-1.496-0.533-2.643-1.603-3.438-1.055-0.807-2.569-1.209-4.551-1.209-1.08 0-2.238 0.115-3.477 0.35-1.236 0.234-2.599 0.6-4.082 1.096v-3.518c1.497-0.416 2.897-0.729 4.2-0.938 1.314-0.209 2.552-0.312 3.709-0.312 2.996 0 5.365 0.686 7.109 2.053 1.746 1.354 2.617 3.189 2.617 5.508 0 1.613-0.461 2.98-1.387 4.102-0.923 1.103-2.238 1.872-3.945 2.3zm24.356-10l-9.959 15.568h9.959v-15.568zm-1.036-3.435h4.961v19.004h4.159v3.281h-4.159v6.875h-3.925v-6.875h-13.166v-3.811l12.132-18.477h-2e-3v3e-3zm15.706 0h15.486v3.32h-11.875v7.146c0.574-0.195 1.146-0.338 1.721-0.43 0.572-0.104 1.146-0.156 1.718-0.156 3.256 0 5.834 0.893 7.735 2.676 1.9 1.785 2.851 4.199 2.851 7.246 0 3.139-0.978 5.58-2.931 7.324-1.953 1.73-4.707 2.598-8.262 2.598-1.223 0-2.473-0.104-3.75-0.311-1.262-0.209-2.57-0.521-3.926-0.939v-3.965c1.172 0.639 2.383 1.113 3.633 1.426 1.25 0.314 2.572 0.469 3.967 0.469 2.252 0 4.035-0.592 5.351-1.775 1.315-1.186 1.973-2.793 1.973-4.824s-0.656-3.641-1.973-4.824c-1.314-1.186-3.099-1.777-5.351-1.777-1.055 0-2.108 0.117-3.164 0.352-1.043 0.234-2.11 0.6-3.203 1.094v-14.65zm25.466 0h15.489v3.32h-11.877v7.146c0.572-0.195 1.146-0.338 1.72-0.43 0.571-0.104 1.146-0.156 1.719-0.156 3.256 0 5.832 0.893 7.733 2.676 1.9 1.785 2.853 4.199 2.853 7.246 0 3.139-0.978 5.58-2.93 7.324-1.953 1.73-4.707 2.598-8.263 2.598-1.225 0-2.475-0.104-3.75-0.311-1.264-0.209-2.571-0.521-3.926-0.939v-3.965c1.172 0.639 2.383 1.113 3.633 1.426 1.25 0.314 2.572 0.469 3.965 0.469 2.252 0 4.037-0.592 5.353-1.775 1.313-1.186 1.973-2.793 1.973-4.824s-0.658-3.641-1.973-4.824c-1.316-1.186-3.101-1.777-5.353-1.777-1.055 0-2.108 0.117-3.164 0.352-1.043 0.234-2.108 0.6-3.202 1.094v-14.65z" fill="#fff" fill-opacity=".784"/></svg>
diff --git a/public/images/card-brands/jcb.svg b/public/images/card-brands/jcb.svg
new file mode 100755
index 0000000000..b1143c01bf
--- /dev/null
+++ b/public/images/card-brands/jcb.svg
@@ -0,0 +1 @@
+<svg width="780" height="500" enable-background="new 0 0 780 500" version="1.1" viewBox="0 0 780 500" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><path d="M40,0h700c22.092,0,40,17.909,40,40v420c0,22.092-17.908,40-40,40H40c-22.091,0-40-17.908-40-40V40   C0,17.909,17.909,0,40,0z" fill="#0E4C96"/><path d="m632.24 361.27c0 41.615-33.729 75.36-75.36 75.36h-409.13v-297.88c0-41.626 33.733-75.37 75.365-75.37l409.12-1e-3 1e-3 297.89z" fill="#fff"/><linearGradient id="c" x1="83.977" x2="84.977" y1="645.5" y2="645.5" gradientTransform="matrix(132.87 0 0 -323.02 -10686 2.0876e5)" gradientUnits="userSpaceOnUse"><stop stop-color="#007B40" offset="0"/><stop stop-color="#55B330" offset="1"/></linearGradient><path d="m498.86 256.54c11.684 0.253 23.437-0.516 35.076 0.4 11.787 2.199 14.629 20.043 4.156 25.888-7.141 3.851-15.633 1.433-23.379 2.113h-15.852l-1e-3 -28.401zm41.833-32.145c2.596 9.164-6.238 17.392-15.066 16.13h-26.767c0.185-8.642-0.368-18.021 0.271-26.208 10.725 0.301 21.549-0.616 32.21 0.479 4.581 1.151 8.414 4.917 9.352 9.599zm64.428-135.9c0.498 17.501 0.071 35.927 0.214 53.783-0.035 72.596 0.072 145.19-0.055 217.79-0.47 27.207-24.582 50.844-51.601 51.387-27.046 0.111-54.095 0.016-81.142 0.047v-109.75c29.47-0.154 58.959 0.307 88.417-0.232 13.667-0.859 28.632-9.875 29.27-24.914 1.61-15.103-12.632-25.551-26.152-27.201-5.198-0.135-5.044-1.516 0-2.117 12.892-2.787 23.02-16.133 19.226-29.499-3.236-14.058-18.772-19.499-31.697-19.472-26.351-0.18-52.709-0.026-79.062-0.077 0.172-20.489-0.354-41 0.286-61.474 2.087-26.716 26.806-48.747 53.447-48.27h78.849v-1e-3z" fill="url(#c)"/><linearGradient id="b" x1="83.984" x2="84.979" y1="645.5" y2="645.5" gradientTransform="matrix(133.43 0 0 -323.02 -11031 2.0876e5)" gradientUnits="userSpaceOnUse"><stop stop-color="#1D2970" offset="0"/><stop stop-color="#006DBA" offset="1"/></linearGradient><path d="m174.74 139.54c0.674-27.163 24.889-50.611 51.875-51.007 26.944-0.083 53.891-0.012 80.837-0.036-0.074 90.885 0.148 181.78-0.112 272.66-1.038 26.835-24.99 49.835-51.679 50.308-26.996 0.099-53.995 0.014-80.992 0.042v-113.45c26.223 6.194 53.722 8.832 80.473 4.721 15.993-2.574 33.488-10.424 38.902-27.014 3.986-14.191 1.742-29.126 2.334-43.691v-33.824h-46.297c-0.208 22.369 0.426 44.779-0.335 67.125-1.248 13.734-14.846 22.46-27.8 21.994-16.066 0.17-47.898-11.639-47.898-11.639-0.08-41.918 0.466-94.409 0.692-136.18z" fill="url(#b)"/><linearGradient id="a" x1="83.978" x2="84.977" y1="645.5" y2="645.5" gradientTransform="matrix(132.96 0 0 -323.03 -10842 2.0877e5)" gradientUnits="userSpaceOnUse"><stop stop-color="#6E2B2F" offset="0"/><stop stop-color="#E30138" offset="1"/></linearGradient><path d="m324.72 211.89c-2.434 0.517-0.489-8.301-1.113-11.646 0.165-21.15-0.347-42.323 0.283-63.458 2.083-26.829 26.991-48.916 53.739-48.288h78.766c-0.073 90.884 0.147 181.78-0.111 272.66-1.039 26.834-24.992 49.833-51.681 50.308-26.997 0.1-53.997 0.015-80.997 0.043v-124.3c18.44 15.128 43.5 17.483 66.473 17.524 17.316-6e-3 34.534-2.674 51.35-6.67v-22.772c-18.953 9.446-41.232 15.446-62.243 10.019-14.655-3.65-25.294-17.812-25.056-32.937-1.699-15.728 7.524-32.335 22.981-37.011 19.189-6.008 40.107-1.413 58.096 6.397 3.854 2.019 7.765 4.521 6.222-1.921v-17.9c-30.084-7.156-62.101-9.792-92.329-2.004-8.749 2.469-17.271 6.212-24.38 11.958z" fill="url(#a)"/></svg>
diff --git a/public/images/card-brands/mastercard.svg b/public/images/card-brands/mastercard.svg
new file mode 100755
index 0000000000..73b6a4d6ba
--- /dev/null
+++ b/public/images/card-brands/mastercard.svg
@@ -0,0 +1,14 @@
+<svg width="780" height="500" viewBox="0 0 780 500" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_6278_125843)">
+<path d="M40 0H740C762.092 0 780 17.909 780 40V460C780 482.092 762.092 500 740 500H40C17.909 500 0 482.092 0 460V40C0 17.909 17.909 0 40 0Z" fill="#253747"/>
+<path d="M211.053 467.045V438.109C211.053 427.041 204.311 419.793 192.736 419.793C186.949 419.793 180.657 421.703 176.33 427.996C172.959 422.715 168.127 419.793 160.879 419.793C156.047 419.793 151.215 421.254 147.395 426.535V420.748H137.281V467.045H147.395V441.481C147.395 433.278 151.721 429.401 158.463 429.401C165.205 429.401 168.577 433.727 168.577 441.481V467.045H178.69V441.481C178.69 433.278 183.522 429.401 189.759 429.401C196.501 429.401 199.872 433.727 199.872 441.481V467.045H211.053ZM361.068 420.748H344.662V406.758H334.549V420.748H325.391V429.906H334.549V451.145C334.549 461.764 338.875 468 350.449 468C354.776 468 359.608 466.539 362.979 464.629L360.057 455.92C357.135 457.831 353.764 458.336 351.348 458.336C346.516 458.336 344.606 455.415 344.606 450.639V429.906H361.012V420.748H361.068ZM446.92 419.737C441.133 419.737 437.256 422.658 434.84 426.479V420.692H424.727V466.989H434.84V440.919C434.84 433.221 438.211 428.839 444.504 428.839C446.414 428.839 448.83 429.345 450.797 429.794L453.718 420.13C451.696 419.737 448.83 419.737 446.92 419.737ZM317.187 424.569C312.356 421.198 305.613 419.737 298.365 419.737C286.791 419.737 279.094 425.524 279.094 434.682C279.094 442.38 284.881 446.762 294.994 448.167L299.826 448.672C305.108 449.628 308.029 451.088 308.029 453.504C308.029 456.875 304.152 459.291 297.41 459.291C290.668 459.291 285.33 456.875 281.959 454.459L277.127 462.157C282.409 466.034 289.657 467.944 296.904 467.944C310.389 467.944 318.143 461.651 318.143 452.999C318.143 444.796 311.85 440.469 302.242 439.008L297.41 438.503C293.084 437.997 289.713 437.042 289.713 434.176C289.713 430.805 293.084 428.895 298.421 428.895C304.209 428.895 309.996 431.311 312.917 432.772L317.187 424.569ZM586.26 419.737C580.473 419.737 576.596 422.658 574.18 426.479V420.692H564.067V466.989H574.18V440.919C574.18 433.221 577.551 428.839 583.844 428.839C585.754 428.839 588.17 429.345 590.137 429.794L593.059 420.242C591.092 419.737 588.227 419.737 586.26 419.737ZM457.033 443.897C457.033 457.887 466.697 468 481.643 468C488.385 468 493.217 466.539 498.049 462.719L493.217 454.516C489.34 457.437 485.519 458.842 481.137 458.842C472.934 458.842 467.147 453.055 467.147 443.897C467.147 435.188 472.934 429.401 481.137 428.951C485.463 428.951 489.34 430.412 493.217 433.278L498.049 425.074C493.217 421.198 488.385 419.793 481.643 419.793C466.697 419.737 457.033 429.906 457.033 443.897ZM550.582 443.897V420.748H540.469V426.535C537.098 422.209 532.266 419.793 525.973 419.793C512.938 419.793 502.825 429.906 502.825 443.897C502.825 457.887 512.938 468 525.973 468C532.715 468 537.547 465.584 540.469 461.258V467.045H550.582V443.897ZM513.444 443.897C513.444 435.693 518.725 428.951 527.434 428.951C535.637 428.951 541.424 435.244 541.424 443.897C541.424 452.1 535.637 458.842 527.434 458.842C518.781 458.336 513.444 452.043 513.444 443.897ZM392.42 419.737C378.935 419.737 369.271 429.401 369.271 443.84C369.271 458.336 378.935 467.944 392.926 467.944C399.668 467.944 406.41 466.034 411.748 461.651L406.916 454.403C403.039 457.325 398.207 459.235 393.431 459.235C387.139 459.235 380.902 456.314 379.441 448.167H413.658C413.658 446.706 413.658 445.751 413.658 444.29C414.108 429.401 405.399 419.737 392.42 419.737ZM392.42 428.446C398.713 428.446 403.039 432.322 403.994 439.514H379.891C380.846 433.278 385.172 428.446 392.42 428.446ZM643.682 443.897V402.432H633.568V426.535C630.197 422.209 625.365 419.793 619.073 419.793C606.037 419.793 595.924 429.906 595.924 443.897C595.924 457.887 606.037 468 619.073 468C625.815 468 630.647 465.584 633.568 461.258V467.045H643.682V443.897ZM606.543 443.897C606.543 435.693 611.825 428.951 620.533 428.951C628.736 428.951 634.524 435.244 634.524 443.897C634.524 452.1 628.736 458.842 620.533 458.842C611.825 458.336 606.543 452.043 606.543 443.897ZM267.969 443.897V420.748H257.855V426.535C254.484 422.209 249.652 419.793 243.36 419.793C230.325 419.793 220.211 429.906 220.211 443.897C220.211 457.887 230.325 468 243.36 468C250.102 468 254.934 465.584 257.855 461.258V467.045H267.969V443.897ZM230.381 443.897C230.381 435.693 235.662 428.951 244.371 428.951C252.574 428.951 258.361 435.244 258.361 443.897C258.361 452.1 252.574 458.842 244.371 458.842C235.662 458.336 230.381 452.043 230.381 443.897Z" fill="white"/>
+<path d="M465.738 69.1387H313.812V342.088H465.738V69.1387Z" fill="#FF5A00"/>
+<path d="M323.926 205.613C323.926 150.158 349.996 100.94 390 69.1387C360.559 45.9902 323.42 32 282.91 32C186.945 32 109.297 109.648 109.297 205.613C109.297 301.578 186.945 379.227 282.91 379.227C323.42 379.227 360.559 365.237 390 342.088C349.94 310.737 323.926 261.069 323.926 205.613Z" fill="#EB001B"/>
+<path d="M670.711 205.613C670.711 301.578 593.062 379.227 497.098 379.227C456.588 379.227 419.449 365.237 390.008 342.088C430.518 310.231 456.082 261.069 456.082 205.613C456.082 150.158 430.012 100.94 390.008 69.1387C419.393 45.9902 456.532 32 497.041 32C593.062 32 670.711 110.154 670.711 205.613Z" fill="#F79E1B"/>
+</g>
+<defs>
+<clipPath id="clip0_6278_125843">
+<rect width="780" height="500" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/public/images/card-brands/unionpay.svg b/public/images/card-brands/unionpay.svg
new file mode 100755
index 0000000000..145428d71e
--- /dev/null
+++ b/public/images/card-brands/unionpay.svg
@@ -0,0 +1 @@
+<svg width="780" height="500" enable-background="new 0 0 780 500" version="1.1" viewBox="0 0 780 500" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><path d="M40,0h700c22.092,0,40,17.909,40,40v420c0,22.092-17.908,40-40,40H40c-22.091,0-40-17.908-40-40V40   C0,17.909,17.909,0,40,0z" fill="#fff"/><path d="m216.4 69.791h142.39c19.87 0 32.287 16.406 27.63 36.47l-66.333 287.48c-4.656 20.063-24.629 36.47-44.498 36.47h-142.39c-19.87 0-32.287-16.406-27.63-36.47l66.331-287.48c4.657-20.168 24.526-36.47 44.395-36.47h0.104z" fill="#D10429"/><path d="m346.34 69.791h163.82c19.868 0 10.865 16.406 6.209 36.47l-66.334 287.48c-4.657 20.063-3.208 36.47-23.077 36.47h-163.81c-19.972 0-32.287-16.406-27.527-36.47l66.334-287.48c4.656-20.168 24.524-36.47 44.498-36.47h-0.104z" fill="#022E64"/><path d="m504.41 69.791h142.4c19.869 0 32.287 16.406 27.629 36.47l-66.332 287.48c-4.658 20.063-24.631 36.47-44.499 36.47h-142.39c-19.973 0-32.287-16.406-27.63-36.47l66.333-287.48c4.656-20.168 24.525-36.47 44.394-36.47h0.104z" fill="#076F74"/><path d="m480.5 340.81h13.453l3.829-13.063h-13.351l-3.931 13.063zm10.762-35.95l-4.657 15.467s5.071-2.613 7.865-3.449c2.794-0.627 6.933-1.15 6.933-1.15l3.208-10.763h-13.451l0.102-0.105zm6.726-22.153l-4.449 14.839s4.967-2.3 7.761-3.029c2.794-0.732 6.933-0.941 6.933-0.941l3.208-10.764h-13.349l-0.104-0.105zm29.701 0l-17.386 57.997h4.657l-3.622 12.018h-4.657l-1.138 3.657h-16.559l1.14-3.657h-33.529l3.311-11.076h3.415l17.594-58.938 3.518-11.913h16.868l-1.76 5.956s4.449-3.239 8.797-4.39c4.243-1.148 28.665-1.566 28.665-1.566l-3.622 11.809h-5.795l0.103 0.103z" fill="#FEFEFE"/><path d="m534.59 270.79h18.006l0.207 6.792c-0.103 1.149 0.828 1.672 3.001 1.672h3.622l-3.311 11.183h-9.729c-8.382 0.627-11.59-3.03-11.383-7.106l-0.311-12.437-0.102-0.104zm2.216 53.2h-17.178l2.896-9.927h19.662l2.794-9.092h-19.351l3.311-11.182h53.812l-3.312 11.182h-18.109l-2.794 9.092h18.109l-3.002 9.927h-19.558l-3.518 4.18h7.968l1.966 12.54c0.207 1.254 0.207 2.09 0.62 2.613 0.415 0.418 2.795 0.627 4.14 0.627h2.38l-3.725 12.227h-6.106c-0.93 0-2.38-0.104-4.346-0.104-1.863-0.21-3.104-1.255-4.346-1.882-1.139-0.522-2.794-1.881-3.208-4.284l-1.863-12.54-8.899 12.331c-2.795 3.866-6.622 6.897-13.143 6.897h-12.418l3.311-10.869h4.761c1.346 0 2.588-0.521 3.52-1.045 0.931-0.418 1.758-0.836 2.586-2.193l13.04-18.498zm-187.9-27.2h45.429l-3.312 10.973h-18.109l-2.793 9.299h18.627l-3.415 11.287h-18.524l-4.553 15.152c-0.517 1.672 4.45 1.881 6.209 1.881l9.313-1.254-3.726 12.54h-20.904c-1.654 0-2.896-0.209-4.76-0.627-1.76-0.418-2.587-1.254-3.311-2.403-0.726-1.254-1.968-2.195-1.14-4.912l6.002-20.063h-10.348l3.415-11.495h10.348l2.794-9.3h-10.347l3.312-10.974-0.207-0.104zm31.387-19.835h18.627l-3.415 11.39h-25.457l-2.794 2.404c-1.242 1.15-1.552 0.732-3.105 1.568-1.447 0.73-4.449 2.193-8.382 2.193h-8.175l3.311-10.972h2.484c2.07 0 3.52-0.21 4.243-0.627 0.828-0.522 1.76-1.672 2.69-3.554l4.656-8.568h18.525l-3.208 6.27v-0.104zm35.107 18.81s5.07-4.701 13.764-6.164c1.966-0.418 14.384-0.211 14.384-0.211l1.863-6.27h-26.182l-3.83 12.75 1e-3 -0.105zm24.629 4.807h-25.975l-1.552 5.329h22.56c2.69-0.313 3.208 0.104 3.415-0.104l1.655-5.225h-0.103zm-33.735-29.678h15.833l-2.276 8.047s4.967-4.075 8.485-5.539c3.519-1.254 11.383-2.508 11.383-2.508l25.664-0.104-8.796 29.469c-1.449 5.016-3.208 8.256-4.243 9.823-0.93 1.463-2.07 2.821-4.346 4.075-2.173 1.15-4.141 1.881-6.002 1.986-1.656 0.104-4.347 0.209-7.865 0.209h-24.732l-6.934 23.303c-0.62 2.299-0.931 3.447-0.517 4.074 0.31 0.523 1.241 1.15 2.38 1.15l10.865-1.045-3.726 12.749h-12.21c-3.933 0-6.727-0.104-8.693-0.21-1.862-0.208-3.83 0-5.175-1.044-1.138-1.045-2.896-2.403-2.794-3.763 0.104-1.254 0.621-3.344 1.45-6.27l22.249-74.402z" fill="#FEFEFE"/><path d="m452.43 317.79l-1.449 7.105c-0.619 2.194-1.138 3.867-2.794 5.33-1.759 1.463-3.725 3.03-8.484 3.03l-8.796 0.418-0.104 7.942c-0.103 2.193 0.519 1.984 0.828 2.402 0.414 0.418 0.724 0.523 1.138 0.732l2.794-0.21 8.384-0.417-3.52 11.704h-9.624c-6.726 0-11.797-0.21-13.35-1.463-1.655-1.046-1.862-2.3-1.862-4.599l0.62-31.141h15.42l-0.207 6.374h3.725c1.242 0 2.175-0.104 2.691-0.418s0.828-0.836 1.035-1.567l1.552-5.016h12.108l-0.105-0.206zm-219.37-156c-0.517 2.508-10.451 48.592-10.451 48.592-2.174 9.3-3.726 15.989-8.9 20.273-3.001 2.508-6.52 3.657-10.555 3.657-6.52 0-10.245-3.239-10.866-9.404l-0.104-2.09s1.966-12.436 1.966-12.54c0 0 10.349-42.009 12.212-47.548 0.103-0.313 0.103-0.522 0.103-0.627-20.18 0.21-23.801 0-24.008-0.313-0.104 0.418-0.621 3.03-0.621 3.03l-10.556 47.34-0.932 3.97-1.758 13.168c0 3.866 0.724 7.105 2.277 9.718 4.863 8.569 18.627 9.823 26.388 9.823 10.038 0 19.455-2.195 25.767-6.061 11.073-6.584 13.97-16.929 16.454-26.02l1.242-4.703s10.659-43.576 12.522-49.219c0.103-0.314 0.103-0.523 0.207-0.627-14.695 0.104-18.938 0-20.387-0.314v-0.105zm59.03 86.623c-7.141-0.105-9.728-0.105-18.11 0.313l-0.311-0.627c0.724-3.24 1.552-6.374 2.173-9.614l1.035-4.389c1.552-6.792 3.001-14.839 3.208-17.242 0.207-1.463 0.62-5.12-3.519-5.12-1.759 0-3.518 0.835-5.38 1.671-1.036 3.658-3.002 13.899-4.037 18.497-2.07 9.823-2.173 10.972-3.104 15.78l-0.621 0.626c-7.347-0.104-9.934-0.104-18.42 0.314l-0.414-0.732c1.449-5.852 2.794-11.704 4.14-17.556 3.518-15.78 4.45-21.84 5.38-29.887l0.725-0.418c8.279-1.149 10.245-1.463 19.248-3.239l0.724 0.836-1.345 5.016c1.552-0.94 3.001-1.881 4.553-2.613 4.243-2.09 8.9-2.717 11.487-2.717 3.932 0 8.279 1.15 10.038 5.748 1.656 4.075 0.62 9.091-1.656 19.019l-1.138 5.016c-2.277 11.077-2.69 13.062-3.933 20.586l-0.827 0.627 0.104 0.105zm29.057 0.027c-4.346 0-7.14-0.104-9.83 0-2.691 0-5.278 0.21-9.314 0.314l-0.207-0.314-0.207-0.418c1.138-4.18 1.656-5.643 2.277-7.106 0.517-1.463 1.034-2.926 2.07-7.21 1.241-5.539 2.069-9.405 2.586-12.854 0.621-3.24 0.932-6.06 1.346-9.3l0.31-0.209 0.31-0.313c4.347-0.627 7.038-1.045 9.832-1.463s5.691-0.94 10.141-1.776l0.207 0.418 0.103 0.418-2.482 10.345c-0.828 3.449-1.656 6.897-2.38 10.346-1.554 7.315-2.277 10.032-2.587 12.017-0.414 1.881-0.519 2.822-1.14 6.584l-0.414 0.313-0.414 0.314-0.207-0.106zm45.942-25.675c-0.31 1.881-1.966 8.883-4.139 11.809-1.553 2.194-3.312 3.553-5.382 3.553-0.62 0-4.14 0-4.242-5.33 0-2.612 0.517-5.33 1.138-8.255 1.863-8.465 4.14-15.466 9.831-15.466 4.45 0 4.76 5.225 2.794 13.689zm18.73 0.836c2.483-11.077 0.518-16.302-1.862-19.437-3.726-4.807-10.348-6.374-17.178-6.374-4.141 0-13.867 0.418-21.525 7.524-5.484 5.12-8.071 12.122-9.52 18.81-1.554 6.792-3.312 19.019 7.864 23.617 3.414 1.463 8.382 1.88 11.59 1.88 8.176 0 16.558-2.298 22.87-8.986 4.863-5.434 7.036-13.585 7.864-17.034h-0.103zm174.43 26.08c-8.693-0.104-11.176-0.104-19.146 0.314l-0.517-0.627c2.173-8.256 4.346-16.616 6.312-24.976 2.483-10.868 3.104-15.466 3.933-21.84l0.62-0.522c8.59-1.254 10.97-1.567 19.973-3.239l0.207 0.731c-1.656 6.897-3.208 13.69-4.864 20.482-3.311 14.317-4.45 21.632-5.69 29.156l-0.828 0.627v-0.106z" fill="#FEFEFE"/><path d="m547.75 224.16c-0.414 1.776-2.07 8.882-4.243 11.808-1.449 2.09-4.967 3.449-6.933 3.449-0.621 0-4.036 0-4.243-5.225 0-2.613 0.517-5.33 1.138-8.256 1.863-8.255 4.141-15.257 9.831-15.257 4.45 0 6.416 5.12 4.45 13.585v-0.104zm17.075 0.836c2.482-11.077-7.658-0.94-9.21-4.598-2.484-5.748-0.933-17.243-10.866-21.109-3.829-1.568-12.832 0.418-20.49 7.524-5.381 5.016-8.072 12.017-9.52 18.705-1.554 6.688-3.312 19.02 7.76 23.304 3.52 1.567 6.727 1.985 9.935 1.776 11.178-0.627 19.662-17.661 25.976-24.349 4.861-5.329 5.69 1.986 6.415-1.253zm-129.94 23.413c-7.14-0.105-9.624-0.105-18.006 0.313l-0.311-0.627c0.725-3.24 1.553-6.374 2.276-9.614l0.931-4.389c1.554-6.792 3.105-14.839 3.208-17.242 0.207-1.463 0.621-5.12-3.415-5.12-1.759 0-3.62 0.835-5.38 1.671-0.932 3.658-3.002 13.899-4.037 18.497-1.966 9.823-2.173 10.972-3.104 15.78l-0.621 0.626c-7.347-0.104-9.934-0.104-18.42 0.314l-0.414-0.732c1.449-5.852 2.794-11.704 4.14-17.556 3.519-15.78 4.347-21.84 5.38-29.887l0.621-0.418c8.28-1.149 10.35-1.463 19.248-3.239l0.726 0.836-1.242 5.016c1.449-0.94 3.001-1.881 4.45-2.613 4.243-2.09 8.899-2.717 11.485-2.717 3.934 0 8.177 1.15 10.038 5.748 1.656 4.075 0.519 9.091-1.759 19.019l-1.138 5.016c-2.38 11.077-2.69 13.062-3.934 20.586l-0.826 0.627 0.104 0.105zm62.001-86.519l-6.002 0.105c-15.523 0.209-21.732 0.104-24.215-0.209-0.207 1.15-0.621 3.135-0.621 3.135s-5.588 25.916-5.588 26.02c0 0-13.246 55.176-13.867 57.788 13.556-0.209 19.041-0.209 21.421 0.105 0.519-2.613 3.622-17.974 3.726-17.974 0 0 2.69-11.286 2.795-11.704 0 0 0.826-1.15 1.654-1.672h1.242c11.694 0 24.836 0 35.186-7.628 7.036-5.225 11.797-13.063 13.97-22.468 0.517-2.299 0.931-5.016 0.931-7.837 0-3.658-0.724-7.21-2.794-10.032-5.279-7.42-15.731-7.524-27.838-7.629zm7.761 27.066c-1.241 5.747-4.967 10.659-9.727 12.958-3.933 1.985-8.693 2.194-13.66 2.194h-3.208l0.207-1.254s5.899-25.916 5.899-25.811l0.206-1.359 0.104-1.045 2.38 0.21s12.211 1.044 12.418 1.044c4.759 1.881 6.83 6.688 5.381 13.063zm127.21 8.666l-0.723-0.836c-8.797 1.776-10.453 2.09-18.525 3.24l-0.619 0.626c0 0.105-0.104 0.21-0.104 0.418v-0.104c-6.002 14.107-5.9 11.077-10.762 22.154 0-0.523 0-0.836-0.105-1.359l-1.242-24.035-0.723-0.836c-9.314 1.777-9.521 2.09-18.007 3.24l-0.621 0.627c-0.104 0.313-0.104 0.627-0.104 0.94l0.104 0.105c1.035 5.538 0.828 4.284 1.863 12.958 0.517 4.284 1.138 8.569 1.655 12.749 0.828 7.106 1.346 10.554 2.381 21.318-5.797 9.613-7.142 13.271-12.729 21.734l0.31 0.836c8.384-0.312 10.246-0.312 16.455-0.312l1.346-1.568c4.656-10.135 40.256-71.79 40.256-71.79l-0.106-0.105zm-302.72 6.922c4.76-3.344 5.38-7.942 1.345-10.345-4.036-2.404-11.176-1.672-15.937 1.672-4.76 3.24-5.277 7.837-1.241 10.345 3.932 2.3 11.072 1.672 15.833-1.672z" fill="#FEFEFE"/><path d="m590.33 270.9l-6.935 12.019c-2.173 4.075-6.312 7.21-12.728 7.21l-11.073-0.209 3.208-10.868h2.173c1.138 0 1.966-0.104 2.587-0.418 0.621-0.209 0.933-0.627 1.449-1.254l4.14-6.583h17.282l-0.103 0.103z" fill="#FEFEFE"/></svg>
diff --git a/public/images/card-brands/visa.svg b/public/images/card-brands/visa.svg
new file mode 100755
index 0000000000..c2e790a0d9
--- /dev/null
+++ b/public/images/card-brands/visa.svg
@@ -0,0 +1,11 @@
+<svg width="780" height="500" viewBox="0 0 780 500" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_6278_125851)">
+<path d="M40 0H740C762.092 0 780 17.909 780 40V460C780 482.092 762.092 500 740 500H40C17.909 500 0 482.092 0 460V40C0 17.909 17.909 0 40 0Z" fill="#1434CB"/>
+<path d="M489.823 143.111C442.988 143.111 401.134 167.393 401.134 212.256C401.134 263.706 475.364 267.259 475.364 293.106C475.364 303.989 462.895 313.731 441.6 313.731C411.377 313.731 388.789 300.119 388.789 300.119L379.123 345.391C379.123 345.391 405.145 356.889 439.692 356.889C490.898 356.889 531.19 331.415 531.19 285.784C531.19 231.419 456.652 227.971 456.652 203.981C456.652 195.455 466.887 186.114 488.122 186.114C512.081 186.114 531.628 196.014 531.628 196.014L541.087 152.289C541.087 152.289 519.818 143.111 489.823 143.111ZM61.3294 146.411L60.1953 153.011C60.1953 153.011 79.8988 156.618 97.645 163.814C120.495 172.064 122.122 176.868 125.971 191.786L167.905 353.486H224.118L310.719 146.411H254.635L198.989 287.202L176.282 167.861C174.199 154.203 163.651 146.411 150.74 146.411H61.3294ZM333.271 146.411L289.275 353.486H342.756L386.598 146.411H333.271ZM631.554 146.411C618.658 146.411 611.825 153.318 606.811 165.386L528.458 353.486H584.542L595.393 322.136H663.72L670.318 353.486H719.805L676.633 146.411H631.554ZM638.848 202.356L655.473 280.061H610.935L638.848 202.356Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_6278_125851">
+<rect width="780" height="500" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/resources/js/lib/cardBrands.ts b/resources/js/lib/cardBrands.ts
new file mode 100644
index 0000000000..cc6990cc57
--- /dev/null
+++ b/resources/js/lib/cardBrands.ts
@@ -0,0 +1,28 @@
+interface CardBrand {
+    name: string;
+    logo: string;
+}
+
+/**
+ * Card brands as Stripe names them (`card.brand`), with the name people know
+ * and its card-shaped logo. A brand without its own logo gets the generic card.
+ */
+const CARD_BRANDS: Record<string, CardBrand> = {
+    amex: { name: 'American Express', logo: '/images/card-brands/amex.svg' },
+    cartes_bancaires: { name: 'Cartes Bancaires', logo: '/images/card-brands/generic.svg' },
+    diners: { name: 'Diners Club', logo: '/images/card-brands/diners.svg' },
+    discover: { name: 'Discover', logo: '/images/card-brands/discover.svg' },
+    eftpos_au: { name: 'eftpos', logo: '/images/card-brands/generic.svg' },
+    interac: { name: 'Interac', logo: '/images/card-brands/generic.svg' },
+    jcb: { name: 'JCB', logo: '/images/card-brands/jcb.svg' },
+    link: { name: 'Link', logo: '/images/card-brands/generic.svg' },
+    mastercard: { name: 'Mastercard', logo: '/images/card-brands/mastercard.svg' },
+    unionpay: { name: 'UnionPay', logo: '/images/card-brands/unionpay.svg' },
+    visa: { name: 'Visa', logo: '/images/card-brands/visa.svg' },
+};
+
+export const cardBrand = (brand: string): CardBrand =>
+    CARD_BRANDS[brand] ?? {
+        name: brand.charAt(0).toUpperCase() + brand.slice(1),
+        logo: '/images/card-brands/generic.svg',
+    };
diff --git a/resources/js/pages/auth/Login.vue b/resources/js/pages/auth/Login.vue
index 6ca5b4e5b4..8545b9be42 100644
--- a/resources/js/pages/auth/Login.vue
+++ b/resources/js/pages/auth/Login.vue
@@ -76,6 +76,7 @@ const pageErrors = usePageErrors();
                         id="email"
                         type="email"
                         name="email"
+                        data-testid="login-email"
                         autofocus
                         :tabindex="1"
                         autocomplete="email"
@@ -103,6 +104,7 @@ const pageErrors = usePageErrors();
                             id="password"
                             :type="showPassword ? 'text' : 'password'"
                             name="password"
+                            data-testid="login-password"
                             :tabindex="2"
                             autocomplete="current-password"
                             :placeholder="$t('auth.login.password')"
diff --git a/resources/js/pages/settings/account/Billing.vue b/resources/js/pages/settings/account/Billing.vue
index 79dd7552ac..7a41ccc0b1 100644
--- a/resources/js/pages/settings/account/Billing.vue
+++ b/resources/js/pages/settings/account/Billing.vue
@@ -1,12 +1,17 @@
 <script setup lang="ts">
-import { Head, useForm, usePage } from '@inertiajs/vue3';
-import { IconCreditCard, IconDownload, IconFileText } from '@tabler/icons-vue';
+import { Head, InfiniteScroll, router, useForm, usePage } from '@inertiajs/vue3';
+import {
+    IconCreditCard,
+    IconDiscount,
+    IconDownload,
+    IconFileText,
+} from '@tabler/icons-vue';
 import { computed, ref } from 'vue';
 
 import PlanPicker from '@/components/billing/PlanPicker.vue';
-import SettingsListRow from '@/components/settings/SettingsListRow.vue';
+import EmptyState from '@/components/EmptyState.vue';
 import SettingsSection from '@/components/settings/SettingsSection.vue';
-import { Badge } from '@/components/ui/badge';
+import { Badge, type BadgeVariants } from '@/components/ui/badge';
 import { Button } from '@/components/ui/button';
 import {
     Dialog,
@@ -15,14 +20,31 @@ import {
     DialogHeader,
     DialogTitle,
 } from '@/components/ui/dialog';
-import { Separator } from '@/components/ui/separator';
+import {
+    Table,
+    TableBody,
+    TableCell,
+    TableHead,
+    TableHeader,
+    TableLoadMore,
+    TableRow,
+} from '@/components/ui/table';
+import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs';
 import date from '@/date';
 import SettingsLayout from '@/layouts/SettingsLayout.vue';
+import { cardBrand } from '@/lib/cardBrands';
 import {
     changePlan as changePlanRoute,
+    index,
     portal,
 } from '@/routes/app/billing';
 import type { AuthPlan, SharedData } from '@/types';
+import type {
+    Invoice,
+    PaymentMethod,
+    Subscription,
+    SubscriptionDiscount,
+} from '@/types/billing';
 import {
     DEFAULT_BILLING_INTERVAL,
     deniedPlanIdsFor,
@@ -31,25 +53,22 @@ import {
     type PlanOption,
 } from '@/types/plan';
 
-interface Subscription {
-    stripe_status: string;
-    ends_at: string | null;
+interface ScrollInvoices {
+    data: Invoice[];
 }
 
-interface PaymentMethod {
-    brand: string;
-    last4: string;
-    exp_month: number;
-    exp_year: number;
-}
+type BillingTab = 'plan' | 'invoices';
 
-interface Invoice {
-    id: string;
-    date: string;
-    total: string;
-    status: string;
-    invoice_pdf: string;
-}
+const BILLING_TABS: BillingTab[] = ['plan', 'invoices'];
+
+type SubscriptionStatus = 'trial' | 'past_due' | 'cancelling' | 'active';
+
+const STATUS_BADGES: Record<SubscriptionStatus, BadgeVariants['variant']> = {
+    active: 'success',
+    trial: 'info',
+    cancelling: 'warning',
+    past_due: 'destructive-subtle',
+};
 
 const props = defineProps<{
     hasSubscription: boolean;
@@ -58,11 +77,21 @@ const props = defineProps<{
     subscription: Subscription | null;
     plan: PlanOption | null;
     workspaceCount: number;
-    workspaceLimit: number | null;
-    invoices: Invoice[];
-    defaultPaymentMethod: PaymentMethod | null;
+    invoices: ScrollInvoices;
+    paymentMethods: PaymentMethod[];
+    discount: SubscriptionDiscount | null;
 }>();
 
+const discountKey = computed((): string => {
+    if (props.discount?.duration === 'once') {
+        return 'billing.current_plan.discount_once';
+    }
+
+    return props.discount?.ends_at
+        ? 'billing.current_plan.discount_until'
+        : 'billing.current_plan.discount_forever';
+});
+
 const page = usePage<SharedData>();
 const plans = computed((): PlanOption[] => page.props.plans ?? []);
 const authPlan = computed((): AuthPlan | null => page.props.auth.plan);
@@ -70,21 +99,21 @@ const currentInterval = computed(
     (): BillingInterval => authPlan.value?.interval ?? DEFAULT_BILLING_INTERVAL,
 );
 
-const subscriptionStatus = computed(() => {
+const subscriptionStatus = computed((): SubscriptionStatus | null => {
     if (props.onTrial) {
-        return 'trial' as const;
+        return 'trial';
     }
 
     if (props.subscription?.stripe_status === 'past_due') {
-        return 'past_due' as const;
+        return 'past_due';
     }
 
     if (props.subscription?.ends_at) {
-        return 'cancelling' as const;
+        return 'cancelling';
     }
 
     if (props.subscription?.stripe_status === 'active') {
-        return 'active' as const;
+        return 'active';
     }
 
     return null;
@@ -105,10 +134,33 @@ const priceKey = computed((): string | null => {
     return `billing.subscribe.prices.${props.plan.slug}.${currentInterval.value === 'yearly' ? 'yearly' : 'monthly'}`;
 });
 
-const priceLabelKey = computed(
-    (): string => `billing.current_plan.price_${currentInterval.value}`,
+const priceSuffixKey = computed((): string =>
+    currentInterval.value === 'yearly'
+        ? 'billing.plans.per_year'
+        : 'billing.plans.per_month',
+);
+
+const billingTab = (value: unknown): BillingTab =>
+    BILLING_TABS.find((tab) => tab === value) ?? 'plan';
+
+const tab = ref<BillingTab>(
+    billingTab(
+        new URL(page.url, window.location.origin).searchParams.get('tab'),
+    ),
 );
 
+const selectTab = (value: string | number): void => {
+    tab.value = billingTab(value);
+
+    router.replace({
+        url: index({
+            query: tab.value === 'plan' ? {} : { tab: tab.value },
+        }).url,
+        preserveScroll: true,
+        preserveState: true,
+    });
+};
+
 const planForm = useForm<{
     plan_id: string | null;
     interval: BillingInterval;
@@ -144,217 +196,319 @@ const selectPlan = (planId: string): void => {
     <Head :title="$t('billing.title')" />
 
     <SettingsLayout :title="$t('billing.title')">
-        <div class="flex flex-col gap-10">
-            <SettingsSection
-                v-if="hasSubscription"
-                :title="$t('billing.plans.current')"
-            >
-                <div
-                    class="flex flex-wrap items-center gap-4 rounded-xl border border-border bg-card px-4 py-6"
-                    data-testid="billing-current-plan"
+        <Tabs
+            :model-value="tab"
+            class="flex flex-col gap-8"
+            @update:model-value="selectTab"
+        >
+            <TabsList variant="line">
+                <TabsTrigger
+                    v-for="value in BILLING_TABS"
+                    :key="value"
+                    :value="value"
+                    :data-testid="`billing-tab-${value}`"
                 >
-                    <div class="flex min-w-0 flex-1 flex-col gap-1">
-                        <div class="flex flex-wrap items-baseline gap-x-2">
-                            <p
-                                class="text-base leading-tight font-emphasis text-foreground"
-                                data-testid="billing-current-plan-name"
-                            >
-                                {{ plan?.name }}
-                            </p>
-                            <p
-                                v-if="priceKey"
-                                class="text-sm text-muted-foreground tabular-nums"
-                                data-testid="billing-current-plan-price"
-                            >
-                                {{
-                                    $t(priceLabelKey, {
-                                        price: $t(priceKey),
-                                    })
-                                }}
-                            </p>
+                    {{ $t(`billing.tabs.${value}`) }}
+                </TabsTrigger>
+            </TabsList>
+
+            <TabsContent value="plan" class="flex flex-col gap-10">
+                <SettingsSection
+                    v-if="hasSubscription"
+                    :title="$t('billing.plans.current')"
+                >
+                    <div
+                        class="overflow-hidden rounded-xl border border-border bg-card"
+                        data-testid="billing-current-plan"
+                    >
+                        <div class="flex flex-col gap-5 p-5 sm:p-6">
+                            <div class="flex flex-wrap items-start justify-between gap-4">
+                                <div class="flex min-w-0 flex-col gap-3">
+                                    <div class="flex flex-wrap items-center gap-2">
+                                        <p
+                                            class="text-lg leading-tight font-emphasis text-foreground"
+                                            data-testid="billing-current-plan-name"
+                                        >
+                                            {{ plan?.name }}
+                                        </p>
+                                        <Badge
+                                            v-if="subscriptionStatus"
+                                            :variant="STATUS_BADGES[subscriptionStatus]"
+                                            data-testid="billing-current-plan-badge"
+                                        >
+                                            {{
+                                                $t(
+                                                    `billing.current_plan.statuses.${subscriptionStatus}`,
+                                                )
+                                            }}
+                                        </Badge>
+                                    </div>
+                                    <p
+                                        v-if="priceKey"
+                                        class="flex items-baseline gap-1 tabular-nums"
+                                        data-testid="billing-current-plan-price"
+                                    >
+                                        <span
+                                            class="text-3xl leading-none font-emphasis text-foreground"
+                                        >
+                                            {{ $t(priceKey) }}
+                                        </span>
+                                        <span class="text-sm text-muted-foreground">
+                                            {{ $t(priceSuffixKey) }}
+                                        </span>
+                                    </p>
+                                    <p
+                                        v-if="discount"
+                                        class="flex items-center gap-1.5 text-sm text-muted-foreground"
+                                        data-testid="billing-current-plan-discount"
+                                    >
+                                        <IconDiscount
+                                            class="size-4 shrink-0 text-success-text"
+                                        />
+                                        {{
+                                            $t(discountKey, {
+                                                discount: discount.value,
+                                                date: date.formatDate(discount.ends_at),
+                                            })
+                                        }}
+                                    </p>
+                                </div>
+                                <Button
+                                    variant="outline"
+                                    class="shrink-0"
+                                    data-testid="billing-change-plan"
+                                    @click="openPlanDialog"
+                                >
+                                    {{ $t('billing.current_plan.change') }}
+                                </Button>
+                            </div>
                         </div>
                         <p
-                            class="text-sm text-muted-foreground"
+                            v-if="subscriptionStatus === 'trial' && trialEndsAt"
+                            class="border-t border-border bg-muted/40 px-5 py-3 text-sm text-muted-foreground sm:px-6"
                             data-testid="billing-current-plan-status"
                         >
-                            <template
-                                v-if="subscriptionStatus === 'trial' && trialEndsAt"
-                            >
-                                {{
-                                    $t('billing.current_plan.trial_until', {
-                                        date: date.formatDate(trialEndsAt),
-                                    })
-                                }}
-                            </template>
-                            <template
-                                v-else-if="
-                                    subscriptionStatus === 'cancelling' &&
-                                    subscription?.ends_at
-                                "
-                            >
-                                {{
-                                    $t('billing.current_plan.cancelled', {
-                                        date: date.formatDate(
-                                            subscription.ends_at,
-                                        ),
-                                    })
-                                }}
-                            </template>
-                            <template v-else-if="subscriptionStatus === 'past_due'">
-                                {{ $t('billing.past_due_notice.title') }}
-                            </template>
-                            <template v-else>
-                                {{ $t('billing.current_plan.renews') }}
-                            </template>
+                            {{
+                                $t('billing.current_plan.trial_until', {
+                                    date: date.formatDateTime(trialEndsAt),
+                                })
+                            }}
                         </p>
                         <p
-                            class="text-sm text-muted-foreground tabular-nums"
-                            data-testid="billing-current-plan-usage"
+                            v-else-if="
+                                subscriptionStatus === 'cancelling' &&
+                                subscription?.ends_at
+                            "
+                            class="border-t border-border bg-muted/40 px-5 py-3 text-sm text-muted-foreground sm:px-6"
+                            data-testid="billing-current-plan-status"
                         >
                             {{
-                                workspaceLimit === null
-                                    ? $t('billing.plans.workspaces_unlimited')
-                                    : $t('billing.current_plan.workspaces_usage', {
-                                          count: workspaceCount.toString(),
-                                          limit: workspaceLimit.toString(),
-                                      })
+                                $t('billing.current_plan.cancelled', {
+                                    date: date.formatDate(subscription.ends_at),
+                                })
                             }}
                         </p>
+                        <p
+                            v-else-if="subscriptionStatus === 'past_due'"
+                            class="border-t border-border bg-muted/40 px-5 py-3 text-sm text-muted-foreground sm:px-6"
+                            data-testid="billing-current-plan-status"
+                        >
+                            {{ $t('billing.past_due_notice.description') }}
+                        </p>
                     </div>
-                    <Button
-                        variant="outline"
-                        class="shrink-0"
-                        data-testid="billing-change-plan"
-                        @click="openPlanDialog"
-                    >
-                        {{ $t('billing.current_plan.change') }}
-                    </Button>
-                </div>
 
-                <Dialog v-model:open="isPlanDialogOpen">
-                    <DialogContent
-                        class="sm:max-w-3xl"
-                        data-testid="billing-plan-dialog"
-                    >
-                        <DialogHeader>
-                            <DialogTitle>
-                                {{ $t('billing.current_plan.change') }}
-                            </DialogTitle>
-                            <DialogDescription>
-                                {{ $t('billing.plans.description') }}
-                            </DialogDescription>
-                        </DialogHeader>
-                        <PlanPicker
-                            :plans="plans"
-                            v-model:interval="selectedInterval"
-                            :current-plan-id="plan?.id ?? null"
-                            :current-interval="currentInterval"
-                            :disabled-plan-ids="deniedPlanIds"
-                            :processing="planForm.processing"
-                            @select="selectPlan"
-                        />
-                    </DialogContent>
-                </Dialog>
-            </SettingsSection>
-
-            <Separator v-if="hasSubscription" />
-
-            <SettingsSection
-                v-if="hasSubscription"
-                :title="$t('billing.subscription.title')"
-                :description="$t('billing.subscription.description')"
-            >
-                <div
-                    class="flex flex-wrap items-center gap-4 rounded-xl border border-border bg-card px-4 py-6"
+                    <Dialog v-model:open="isPlanDialogOpen">
+                        <DialogContent
+                            class="sm:max-w-3xl"
+                            data-testid="billing-plan-dialog"
+                        >
+                            <DialogHeader>
+                                <DialogTitle>
+                                    {{ $t('billing.current_plan.change') }}
+                                </DialogTitle>
+                                <DialogDescription>
+                                    {{ $t('billing.plans.description') }}
+                                </DialogDescription>
+                            </DialogHeader>
+                            <PlanPicker
+                                :plans="plans"
+                                v-model:interval="selectedInterval"
+                                :current-plan-id="plan?.id ?? null"
+                                :current-interval="currentInterval"
+                                :disabled-plan-ids="deniedPlanIds"
+                                :processing="planForm.processing"
+                                @select="selectPlan"
+                            />
+                        </DialogContent>
+                    </Dialog>
+                </SettingsSection>
+
+                <SettingsSection
+                    v-if="hasSubscription"
+                    :title="$t('billing.subscription.title')"
+                    :description="$t('billing.subscription.description')"
                 >
-                    <span
-                        class="inline-flex size-12 shrink-0 items-center justify-center rounded-xl bg-primary-subtle text-primary-text"
+                    <template #actions>
+                        <Button
+                            as="a"
+                            variant="outline"
+                            :href="portal.url()"
+                            data-testid="billing-manage-stripe"
+                        >
+                            {{ $t('billing.subscription.manage_stripe') }}
+                        </Button>
+                    </template>
+
+                    <ul
+                        v-if="paymentMethods.length > 0"
+                        class="divide-y divide-border overflow-hidden rounded-xl border border-border bg-card"
+                        data-testid="billing-payment-methods"
                     >
-                        <IconCreditCard class="size-6" />
-                    </span>
+                        <li
+                            v-for="paymentMethod in paymentMethods"
+                            :key="paymentMethod.id"
+                            class="flex items-center gap-3 px-4 py-3"
+                            :data-testid="`billing-card-${paymentMethod.id}`"
+                        >
+                            <img
+                                :src="cardBrand(paymentMethod.brand).logo"
+                                alt=""
+                                class="h-7 w-auto shrink-0 rounded-[5px] shadow-xs"
+                                :data-testid="`billing-card-logo-${paymentMethod.id}`"
+                            />
+                            <div class="flex min-w-0 flex-1 flex-col">
+                                <p
+                                    class="flex flex-wrap items-center gap-1.5 text-[13px] leading-5 font-emphasis text-foreground"
+                                    data-testid="billing-card-label"
+                                >
+                                    {{ cardBrand(paymentMethod.brand).name }}
+                                    <span class="tabular-nums">•••• {{ paymentMethod.last4 }}</span>
+                                    <Badge
+                                        v-if="paymentMethod.is_default"
+                                        variant="secondary"
+                                        data-testid="billing-card-default"
+                                    >
+                                        {{ $t('billing.subscription.default') }}
+                                    </Badge>
+                                </p>
+                                <p class="text-xs leading-4 text-muted-foreground tabular-nums">
+                                    {{
+                                        $t('billing.subscription.expires_on', {
+                                            month: paymentMethod.exp_month
+                                                .toString()
+                                                .padStart(2, '0'),
+                                            year: paymentMethod.exp_year.toString(),
+                                        })
+                                    }}
+                                </p>
+                            </div>
+                        </li>
+                    </ul>
                     <div
-                        v-if="defaultPaymentMethod"
-                        class="flex min-w-0 flex-1 flex-col gap-1"
+                        v-else
+                        class="flex items-center gap-3 rounded-xl border border-border bg-card px-4 py-3"
                     >
-                        <p
-                            class="text-sm leading-tight font-emphasis text-foreground capitalize"
+                        <span
+                            class="inline-flex h-7 w-11 shrink-0 items-center justify-center rounded-md bg-muted text-muted-foreground"
                         >
-                            {{ defaultPaymentMethod.brand }} ••••
-                            {{ defaultPaymentMethod.last4 }}
-                        </p>
+                            <IconCreditCard class="size-5" />
+                        </span>
                         <p class="text-sm text-muted-foreground">
-                            {{
-                                $t('billing.subscription.expires_on', {
-                                    month: defaultPaymentMethod.exp_month
-                                        .toString()
-                                        .padStart(2, '0'),
-                                    year: defaultPaymentMethod.exp_year.toString(),
-                                })
-                            }}
+                            {{ $t('billing.subscription.no_payment_method') }}
                         </p>
                     </div>
-                    <p v-else class="min-w-0 flex-1 text-sm text-muted-foreground">
-                        {{ $t('billing.subscription.no_payment_method') }}
-                    </p>
-                    <Button
-                        as="a"
-                        variant="outline"
-                        :href="portal.url()"
-                        class="shrink-0"
-                    >
-                        {{ $t('billing.subscription.manage_stripe') }}
-                    </Button>
-                </div>
-            </SettingsSection>
-
-            <Separator v-if="hasSubscription && invoices.length > 0" />
-
-            <SettingsSection
-                v-if="invoices.length > 0"
-                :title="$t('billing.invoices.title')"
-                :description="$t('billing.invoices.description')"
-            >
-                <ul class="flex flex-col gap-2">
-                    <SettingsListRow
-                        v-for="invoice in invoices"
-                        :key="invoice.id"
+                </SettingsSection>
+            </TabsContent>
+
+            <TabsContent value="invoices">
+                <div
+                    v-if="invoices.data.length === 0"
+                    class="rounded-xl border border-border bg-card"
+                >
+                    <EmptyState
                         :icon="IconFileText"
+                        :title="$t('billing.invoices.empty_title')"
+                        :description="$t('billing.invoices.empty_description')"
+                        data-testid="billing-invoices-empty"
+                    />
+                </div>
+
+                <div
+                    v-else
+                    class="overflow-hidden rounded-xl border border-border bg-card"
+                >
+                    <InfiniteScroll
+                        data="invoices"
+                        items-element="#billing-invoices-body"
+                        preserve-url
                     >
-                        <p
-                            class="text-sm leading-tight font-emphasis text-foreground"
-                        >
-                            {{ date.formatDate(invoice.date) }}
-                        </p>
-                        <p class="text-sm text-muted-foreground tabular-nums">
-                            {{ invoice.total }}
-                        </p>
-                        <template #actions>
-                            <Badge
-                                :variant="
-                                    invoice.status === 'paid' ? 'success' : 'secondary'
-                                "
-                            >
-                                {{
-                                    invoice.status === 'paid'
-                                        ? $t('billing.invoices.paid')
-                                        : invoice.status
-                                }}
-                            </Badge>
-                            <Button
-                                variant="ghost"
-                                size="icon"
-                                as="a"
-                                :href="invoice.invoice_pdf"
-                                target="_blank"
-                                class="text-muted-foreground"
-                                :aria-label="$t('billing.invoices.download')"
-                            >
-                                <IconDownload class="size-4" />
-                            </Button>
+                        <div class="overflow-x-auto">
+                            <Table data-testid="billing-invoices">
+                                <TableHeader>
+                                    <TableRow class="hover:bg-transparent">
+                                        <TableHead class="border-r-0 h-11 px-4 sm:px-5">
+                                            {{ $t('billing.invoices.columns.date') }}
+                                        </TableHead>
+                                        <TableHead class="border-r-0 h-11 px-4">
+                                            {{ $t('billing.invoices.columns.amount') }}
+                                        </TableHead>
+                                        <TableHead class="border-r-0 h-11 px-4">
+                                            {{ $t('billing.invoices.columns.status') }}
+                                        </TableHead>
+                                        <TableHead class="border-r-0 h-11 w-14 px-4">
+                                            <span class="sr-only">
+                                                {{ $t('billing.invoices.download') }}
+                                            </span>
+                                        </TableHead>
+                                    </TableRow>
+                                </TableHeader>
+                                <TableBody id="billing-invoices-body">
+                                    <TableRow
+                                        v-for="invoice in invoices.data"
+                                        :key="invoice.id"
+                                        class="last:border-b-0"
+                                        :data-testid="`billing-invoice-${invoice.id}`"
+                                    >
+                                        <TableCell
+                                            class="border-r-0 px-4 py-3 font-emphasis text-foreground sm:px-5"
+                                        >
+                                            {{ date.formatDate(invoice.date) }}
+                                        </TableCell>
+                                        <TableCell class="border-r-0 px-4 py-3 tabular-nums">
+                                            {{ invoice.total }}
+                                        </TableCell>
+                                        <TableCell class="border-r-0 px-4 py-3">
+                                            <Badge variant="success">
+                                                {{ $t('billing.invoices.paid') }}
+                                            </Badge>
+                                        </TableCell>
+                                        <TableCell class="border-r-0 px-2 py-2 text-right">
+                                            <Button
+                                                v-if="invoice.invoice_pdf"
+                                                variant="ghost"
+                                                size="icon"
+                                                as="a"
+                                                :href="invoice.invoice_pdf"
+                                                target="_blank"
+                                                rel="noopener"
+                                                class="text-muted-foreground"
+                                                :aria-label="$t('billing.invoices.download')"
+                                                :data-testid="`billing-invoice-download-${invoice.id}`"
+                                            >
+                                                <IconDownload class="size-4" />
+                                            </Button>
+                                        </TableCell>
+                                    </TableRow>
+                                </TableBody>
+                            </Table>
+                        </div>
+
+                        <template #next="{ loading }">
+                            <TableLoadMore v-if="loading" />
                         </template>
-                    </SettingsListRow>
-                </ul>
-            </SettingsSection>
-        </div>
+                    </InfiniteScroll>
+                </div>
+            </TabsContent>
+        </Tabs>
     </SettingsLayout>
 </template>
diff --git a/resources/js/pages/welcome/Plan.vue b/resources/js/pages/welcome/Plan.vue
index 85645848fe..77079fe413 100644
--- a/resources/js/pages/welcome/Plan.vue
+++ b/resources/js/pages/welcome/Plan.vue
@@ -10,19 +10,35 @@ import { useAutoRotate } from '@/composables/useAutoRotate';
 import WelcomeLayout from '@/layouts/WelcomeLayout.vue';
 import { REVIEWS } from '@/lib/reviews';
 import { store } from '@/routes/app/welcome/plan';
+import type { Offer } from '@/types/offer';
 import type { PlanOption } from '@/types/plan';
 
 const props = defineProps<{
     plan: PlanOption;
-    firstMonthOffer: boolean;
+    offer: Offer | null;
 }>();
 
+const showsOfferPrice = computed((): boolean => props.offer?.has_price === true);
+
+const isTrialOnly = computed(
+    (): boolean =>
+        Boolean(props.offer?.trial_days) && props.offer?.has_coupon === false,
+);
+
 const checkoutPriceKey = computed((): string =>
-    props.firstMonthOffer
-        ? 'billing.subscribe.prices.first_month'
+    showsOfferPrice.value
+        ? `offers.${props.offer?.key}.price`
         : 'billing.subscribe.prices.socials.monthly',
 );
 
+const unitKey = computed((): string | null => {
+    if (!showsOfferPrice.value) {
+        return 'billing.plans.per_month';
+    }
+
+    return props.offer?.has_unit ? `offers.${props.offer.key}.unit` : null;
+});
+
 const form = useForm({});
 
 const {
@@ -55,6 +71,25 @@ const submit = (): void => {
         :description="$t('welcome.plan_description')"
         step="plan"
     >
+        <div
+            v-if="offer?.has_banner"
+            class="mb-6 flex justify-center"
+            data-testid="welcome-plan-offer"
+        >
+            <p
+                class="inline-flex items-center gap-3 rounded-full bg-foreground py-1.5 ps-1.5 pe-5 text-start text-sm text-background sm:text-base"
+            >
+                <span
+                    class="shrink-0 rounded-full bg-background px-3 py-1 text-xs font-strong tracking-wider text-foreground uppercase sm:text-sm"
+                    data-testid="welcome-plan-offer-name"
+                    >{{ $t(`offers.${offer.key}.name`) }}</span
+                >
+                <span data-testid="welcome-plan-offer-headline">{{
+                    $t(`offers.${offer.key}.headline`)
+                }}</span>
+            </p>
+        </div>
+
         <article
             class="grid overflow-hidden rounded-xl text-start sm:grid-cols-[2fr_3fr]"
             :data-testid="`plan-card-${plan.slug}`"
@@ -133,22 +168,34 @@ const submit = (): void => {
                     </div>
                 </div>
 
-                <p class="flex flex-col gap-1">
-                    <span
-                        class="text-5xl leading-none font-strong tabular-nums"
-                        :data-testid="`plan-price-${plan.slug}`"
-                        >{{ $t(checkoutPriceKey) }}</span
+                <div class="flex flex-col gap-1">
+                    <s
+                        v-if="offer && showsOfferPrice"
+                        class="text-sm text-muted-foreground"
+                        :data-testid="`plan-price-original-${plan.slug}`"
+                        >{{ $t('billing.subscribe.prices.socials.monthly')
+                        }}{{ $t('billing.plans.per_month') }}</s
                     >
+                    <p class="flex items-baseline gap-1 whitespace-nowrap">
+                        <span
+                            class="text-4xl leading-none font-strong tracking-tight tabular-nums [word-spacing:-0.15em] sm:text-5xl"
+                            :data-testid="`plan-price-${plan.slug}`"
+                            >{{ $t(checkoutPriceKey) }}</span
+                        >
+                        <span
+                            v-if="unitKey"
+                            class="text-base text-foreground"
+                            :data-testid="`plan-price-unit-${plan.slug}`"
+                            >{{ $t(unitKey) }}</span
+                        >
+                    </p>
                     <span
+                        v-if="offer && showsOfferPrice"
                         class="text-base text-foreground"
                         :data-testid="`plan-price-suffix-${plan.slug}`"
-                        >{{
-                            firstMonthOffer
-                                ? $t('welcome.plan_first_month')
-                                : $t('welcome.plan_per_month')
-                        }}</span
+                        >{{ $t(`offers.${offer.key}.period`) }}</span
                     >
-                </p>
+                </div>
             </div>
 
             <PlanFeatureList
@@ -163,9 +210,11 @@ const submit = (): void => {
                 :processing="form.processing"
                 :disabled="form.processing"
                 :label="
-                    $t('billing.plans.start_first_month', {
-                        price: $t(checkoutPriceKey),
-                    })
+                    isTrialOnly && showsOfferPrice
+                        ? $t('welcome.plan_start_trial')
+                        : $t('billing.plans.start_first_month', {
+                              price: $t(checkoutPriceKey),
+                          })
                 "
                 testid="welcome-plan-continue"
                 @continue="submit"
@@ -175,7 +224,7 @@ const submit = (): void => {
                 data-testid="welcome-plan-terms"
             >
                 {{
-                    firstMonthOffer
+                    showsOfferPrice
                         ? $t('welcome.plan_terms', {
                               price: $t('billing.subscribe.prices.socials.monthly'),
                           })
diff --git a/resources/js/types/billing.ts b/resources/js/types/billing.ts
new file mode 100644
index 0000000000..97c291a69c
--- /dev/null
+++ b/resources/js/types/billing.ts
@@ -0,0 +1,27 @@
+export interface Subscription {
+    stripe_status: string;
+    ends_at: string | null;
+}
+
+export interface PaymentMethod {
+    id: string;
+    brand: string;
+    last4: string;
+    exp_month: number;
+    exp_year: number;
+    is_default: boolean;
+}
+
+export interface SubscriptionDiscount {
+    value: string;
+    duration: 'once' | 'repeating' | 'forever';
+    ends_at: string | null;
+}
+
+export interface Invoice {
+    id: string;
+    date: string;
+    total: string;
+    status: string;
+    invoice_pdf: string | null;
+}
diff --git a/resources/js/types/offer.ts b/resources/js/types/offer.ts
new file mode 100644
index 0000000000..8034516930
--- /dev/null
+++ b/resources/js/types/offer.ts
@@ -0,0 +1,8 @@
+export interface Offer {
+    key: string;
+    trial_days: number | null;
+    has_coupon: boolean;
+    has_banner: boolean;
+    has_price: boolean;
+    has_unit: boolean;
+}
diff --git a/tests/Browser/BillingPageTest.php b/tests/Browser/BillingPageTest.php
index c1200ec511..3126764739 100644
--- a/tests/Browser/BillingPageTest.php
+++ b/tests/Browser/BillingPageTest.php
@@ -3,25 +3,17 @@
 declare(strict_types=1);
 
 use App\Enums\Plan\Slug;
+use App\Models\Account;
 use App\Models\Plan;
 use App\Models\User;
 use App\Models\Workspace;
+use Stripe\ApiRequestor;
 
-function waitForBillingPageTestId(mixed $page, string $testId): void
-{
-    $page->script(<<<JS
-        (async () => {
-            const selector = '[data-testid="{$testId}"]';
-            for (let attempt = 0; attempt < 200; attempt++) {
-                const element = document.querySelector(selector);
-                if (element && element.getBoundingClientRect().height > 0) return;
-                await new Promise((resolve) => setTimeout(resolve, 50));
-            }
-        })();
-    JS);
-}
+afterEach(function () {
+    ApiRequestor::setHttpClient(null);
+});
 
-function billingPageOwner(): User
+function billingPageOwner(bool $subscribed = true): User
 {
     $user = User::factory()->create();
     $user->account->update([
@@ -34,7 +26,10 @@ function billingPageOwner(): User
     ]);
     $workspace->members()->attach($user->id, membershipPivot('admin'));
     $user->update(['current_workspace_id' => $workspace->id]);
-    subscribeAccount($user->account);
+
+    if ($subscribed) {
+        subscribeAccount($user->account);
+    }
 
     return $user->fresh();
 }
@@ -45,19 +40,21 @@ function billingPageOwner(): User
     $this->actingAs(billingPageOwner());
 
     $page = visit(route('app.billing.index'));
-    waitForBillingPageTestId($page, 'billing-current-plan');
+    waitFor($page, '@billing-current-plan');
 
     $page->assertSeeIn('@billing-current-plan-name', 'Socials')
-        ->assertSeeIn('@billing-current-plan-price', '$19/month')
-        ->assertSeeIn('@billing-current-plan-status', 'Renews automatically')
-        ->assertSeeIn('@billing-current-plan-usage', 'Workspaces: 1 of 1')
+        ->assertSeeIn('@billing-current-plan-price', '$19')
+        ->assertSeeIn('@billing-current-plan-price', '/month')
+        ->assertSeeIn('@billing-current-plan-badge', 'Active')
+        ->assertMissing('@billing-current-plan-status')
+        ->assertMissing('@billing-current-plan-usage')
         ->assertVisible('@settings-nav-billing')
         ->assertMissing('@settings-nav-account')
         ->assertMissing('@billing-details-form')
         ->assertMissing('@plan-card-socials');
 
     $page->click('@billing-change-plan');
-    waitForBillingPageTestId($page, 'plan-card-workspaces');
+    waitFor($page, '@plan-card-workspaces');
 
     $page->assertVisible('@billing-plan-dialog')
         ->assertVisible('@plan-card-socials')
@@ -67,7 +64,7 @@ function billingPageOwner(): User
         ->assertSeeIn('@plan-price-socials', '$19');
 
     $page->click('@plan-interval-yearly');
-    waitForBillingPageTestId($page, 'plan-save-two-months');
+    waitFor($page, '@plan-save-two-months');
 
     $page->assertSeeIn('@plan-price-socials', '$15.83')
         ->assertSeeIn('@plan-select-socials', 'Switch to yearly')
@@ -82,9 +79,127 @@ function billingPageOwner(): User
     $this->actingAs(billingPageOwner());
 
     $page = visit(route('app.profile.edit'));
-    waitForBillingPageTestId($page, 'settings-nav-profile');
+    waitFor($page, '@settings-nav-profile');
 
     $page->assertMissing('@settings-nav-account')
         ->assertMissing('@settings-nav-billing')
         ->assertNoJavaScriptErrors();
 });
+
+test('the billing page explains a discount and lists every card, the default first', function () {
+    config(['trypost.self_hosted' => false]);
+
+    $user = billingPageOwner(subscribed: false);
+    fakeStripeBilling(
+        $user->account,
+        ['percent_off' => 50, 'amount_off' => null, 'currency' => null, 'duration' => 'repeating', 'duration_in_months' => 3],
+        now()->addMonths(3)->timestamp,
+        'visa',
+        secondCardBrand: 'mastercard',
+    );
+    $this->actingAs($user->fresh());
+
+    $page = visit(route('app.billing.index'));
+    waitFor($page, '@billing-card-pm_fake_second');
+
+    $page->assertSeeIn('@billing-current-plan-price', '$19')
+        ->assertSeeIn('@billing-current-plan-discount', '50% off until')
+        ->assertSeeIn('@billing-card-pm_fake', 'Visa')
+        ->assertSeeIn('@billing-card-pm_fake', '•••• 4242')
+        ->assertSeeIn('@billing-card-pm_fake', 'Default')
+        ->assertSeeIn('@billing-card-pm_fake_second', 'Mastercard')
+        ->assertSeeIn('@billing-card-pm_fake_second', '•••• 5454')
+        ->assertDontSeeIn('@billing-card-pm_fake_second', 'Default')
+        ->assertVisible('@billing-manage-stripe')
+        ->assertNoJavaScriptErrors();
+
+    $page->assertAttribute('@billing-card-logo-pm_fake', 'src', '/images/card-brands/visa.svg')
+        ->assertAttribute('@billing-card-logo-pm_fake_second', 'src', '/images/card-brands/mastercard.svg');
+
+    waitForState($page, '@billing-card-logo-pm_fake_second', 'element.complete && element.naturalWidth > 0');
+
+    expect($page->script("[...document.querySelectorAll('[data-testid=\"billing-payment-methods\"] > li')].map((item) => item.dataset.testid)"))
+        ->toBe(['billing-card-pm_fake', 'billing-card-pm_fake_second'])
+        ->and($page->script("document.querySelector('[data-testid=\"billing-card-logo-pm_fake_second\"]').naturalWidth > 0"))->toBeTrue();
+});
+
+test('the billing page shows the generic card for a brand without its own logo', function () {
+    config(['trypost.self_hosted' => false]);
+
+    $user = billingPageOwner(subscribed: false);
+    fakeStripeBilling($user->account, cardBrand: 'eftpos_au');
+    $this->actingAs($user->fresh());
+
+    $page = visit(route('app.billing.index'));
+    waitFor($page, '@billing-card-label');
+
+    $page->assertSeeIn('@billing-card-label', 'eftpos')
+        ->assertAttribute('@billing-card-logo-pm_fake', 'src', '/images/card-brands/generic.svg')
+        ->assertMissing('@billing-current-plan-discount')
+        ->assertNoJavaScriptErrors();
+});
+
+test('the invoices tab lists the paid invoices and loads more on scroll', function () {
+    config(['trypost.self_hosted' => false, 'app.pagination.default' => 10]);
+
+    $user = billingPageOwner(subscribed: false);
+    fakeStripeBilling($user->account, paidInvoices: 12);
+    $this->actingAs($user->fresh());
+
+    $page = visit(route('app.billing.index'));
+    waitFor($page, '@billing-tab-invoices');
+
+    $page->assertMissing('@billing-invoices')
+        ->click('@billing-tab-invoices');
+    waitFor($page, '@billing-invoice-in_fake_012');
+    waitForCondition($page, "new URLSearchParams(location.search).get('tab') === 'invoices'");
+
+    $page->assertSeeIn('@billing-invoice-in_fake_012', '$19.00')
+        ->assertSeeIn('@billing-invoice-in_fake_012', 'Paid')
+        ->assertVisible('@billing-invoice-download-in_fake_012');
+
+    $page->script('window.scrollTo(0, document.body.scrollHeight)');
+    waitFor($page, '@billing-invoice-in_fake_001');
+
+    $page->assertVisible('@billing-invoice-in_fake_001')
+        ->assertMissing('@billing-current-plan')
+        ->assertNoJavaScriptErrors();
+});
+
+test('the invoices tab opens from the link and says when there are none yet', function () {
+    config(['trypost.self_hosted' => false]);
+
+    $user = billingPageOwner(subscribed: false);
+    fakeStripeBilling($user->account);
+    $this->actingAs($user->fresh());
+
+    $page = visit(route('app.billing.index', ['tab' => 'invoices']));
+    waitFor($page, '@billing-invoices-empty');
+
+    $page->assertSeeIn('@billing-invoices-empty', 'No invoices yet')
+        ->assertMissing('@billing-invoices')
+        ->assertNoJavaScriptErrors();
+});
+
+test('a trial shows when it ends, with the time in the user\'s time zone', function () {
+    config(['trypost.self_hosted' => false]);
+
+    $user = billingPageOwner(subscribed: false);
+    $user->update(['timezone' => 'America/Sao_Paulo']);
+    $endsAt = now()->addDays(7)->setTime(15, 30)->utc();
+    $user->account->subscriptions()->create([
+        'type' => Account::SUBSCRIPTION_NAME,
+        'stripe_id' => 'sub_trial',
+        'stripe_status' => 'trialing',
+        'stripe_price' => 'price_123',
+        'trial_ends_at' => $endsAt,
+    ]);
+    $this->actingAs($user->fresh());
+
+    $page = visit(route('app.billing.index'));
+    waitFor($page, '@billing-current-plan-status');
+
+    $page->assertSeeIn('@billing-current-plan-badge', 'Trial')
+        ->assertSeeIn('@billing-current-plan-status', 'Trial until '.$endsAt->setTimezone('America/Sao_Paulo')->format('F j, Y g:i A'))
+        ->assertNoJavaScriptErrors();
+});
diff --git a/tests/Browser/SignupOfferTest.php b/tests/Browser/SignupOfferTest.php
new file mode 100644
index 0000000000..8b326b52ba
--- /dev/null
+++ b/tests/Browser/SignupOfferTest.php
@@ -0,0 +1,77 @@
+<?php
+
+declare(strict_types=1);
+
+use App\Models\Account;
+use App\Models\Offer;
+use App\Models\User;
+
+beforeEach(function () {
+    config()->set('trypost.self_hosted', false);
+    $this->offer = Offer::factory()->create(['slug' => 'black-friday-2026']);
+});
+
+test('an offer opened on the register page survives a trip to login and back to signup', function () {
+    $page = visit(route('register', ['offer' => 'black-friday-2026']));
+    waitFor($page, '@register-log-in-link');
+
+    $page->click('@register-log-in-link');
+    waitFor($page, '@login-sign-up-link');
+    $page->assertPathIs(parse_url(route('login'), PHP_URL_PATH));
+
+    $page->click('@login-sign-up-link');
+    waitFor($page, '@register-name');
+    $page->assertPathIs(parse_url(route('register'), PHP_URL_PATH));
+
+    $page->type('@register-name', 'Offer Visitor')
+        ->type('@register-email', 'offer-visitor@example.com')
+        ->type('@register-password', strongPassword())
+        ->click('@register-user-button');
+    waitForPath($page, parse_url(route('app.welcome.persona'), PHP_URL_PATH));
+
+    $page->assertNoJavaScriptErrors();
+
+    expect(User::query()->where('email', 'offer-visitor@example.com')->firstOrFail()->account->offers()->pluck('offers.id')->all())
+        ->toBe([$this->offer->id]);
+});
+
+test('an offer opened on the login page survives a trip to signup and back to login', function () {
+    $account = Account::factory()->create();
+    $owner = User::factory()->create(['account_id' => $account->id, 'email' => 'returning@example.com']);
+    $account->update(['owner_id' => $owner->id]);
+
+    $page = visit(route('login', ['offer' => 'black-friday-2026']));
+    waitFor($page, '@login-sign-up-link');
+
+    $page->click('@login-sign-up-link');
+    waitFor($page, '@register-log-in-link');
+    $page->assertPathIs(parse_url(route('register'), PHP_URL_PATH));
+
+    $page->click('@register-log-in-link');
+    waitFor($page, '@login-email');
+    $page->assertPathIs(parse_url(route('login'), PHP_URL_PATH));
+
+    $page->type('@login-email', 'returning@example.com')
+        ->type('@login-password', 'password')
+        ->click('@login-submit');
+    waitForPath($page, parse_url(route('app.welcome.persona'), PHP_URL_PATH));
+
+    $page->assertNoJavaScriptErrors();
+
+    expect($account->offers()->pluck('offers.id')->all())->toBe([$this->offer->id]);
+});
+
+test('a link to an unknown offer signs the visitor up without one', function () {
+    $page = visit(route('register', ['offer' => 'no-such-offer']));
+    waitFor($page, '@register-name');
+
+    $page->type('@register-name', 'Plain Visitor')
+        ->type('@register-email', 'plain-visitor@example.com')
+        ->type('@register-password', strongPassword())
+        ->click('@register-user-button');
+    waitForPath($page, parse_url(route('app.welcome.persona'), PHP_URL_PATH));
+
+    $page->assertNoJavaScriptErrors();
+
+    expect(User::query()->where('email', 'plain-visitor@example.com')->firstOrFail()->account->offers()->count())->toBe(0);
+});
diff --git a/tests/Browser/WelcomePlanTest.php b/tests/Browser/WelcomePlanTest.php
index 72675a1113..62e3bc5895 100644
--- a/tests/Browser/WelcomePlanTest.php
+++ b/tests/Browser/WelcomePlanTest.php
@@ -5,6 +5,7 @@
 use App\Enums\User\Goal;
 use App\Enums\User\Persona;
 use App\Enums\User\PreviousSoftware;
+use App\Models\Offer;
 use App\Models\User;
 use App\Models\Workspace;
 use Illuminate\Support\Str;
@@ -207,10 +208,12 @@ function welcomeOwnerOnPlanStep(): User
     return $user->fresh();
 }
 
-test('the plan step shows the offer, what is included and the G2 rating', function () {
-    config(['trypost.self_hosted' => false, 'cashier.first_month_coupon_ids.socials' => 'coupon_socials']);
+test('the plan step shows the free trial offer, what is included and the G2 rating', function () {
+    config(['trypost.self_hosted' => false]);
 
-    $this->actingAs(welcomeOwnerOnPlanStep());
+    $user = welcomeOwnerOnPlanStep();
+    $user->account->offers()->attach(Offer::factory()->trial(7)->firstSubscriptionOnly()->create(['slug' => 'free-trial-7-days']), ['claimed_at' => now()]);
+    $this->actingAs($user);
 
     $page = visit(route('app.welcome.plan'));
 
@@ -222,11 +225,14 @@ function welcomeOwnerOnPlanStep(): User
         ->assertSee('Activate your account')
         ->assertSee('Connect your channels and schedule your first post today.')
         ->assertMissing('@plan-card-workspaces')
-        ->assertSeeIn('@plan-price-socials', '$1')
-        ->assertSeeIn('@plan-price-suffix-socials', 'for your first month')
+        ->assertSeeIn('@plan-price-socials', 'Free')
+        ->assertSeeIn('@plan-price-suffix-socials', 'for 7 days')
+        ->assertSeeIn('@plan-price-original-socials', '$19/month')
+        ->assertMissing('@plan-price-unit-socials')
         ->assertVisible('@plan-networks-info-socials')
-        ->assertSeeIn('@welcome-plan-continue', 'Activate for $1')
+        ->assertSeeIn('@welcome-plan-continue', 'Start free trial')
         ->assertSeeIn('@welcome-plan-terms', 'Then $19/month. Cancel anytime.')
+        ->assertMissing('@welcome-plan-offer')
         ->assertVisible('@welcome-step-plan')
         ->assertNoJavaScriptErrors();
 
@@ -249,8 +255,9 @@ function welcomeOwnerOnPlanStep(): User
         ->assertVisible('@plan-feature-info-socials-ideas');
 });
 
-test('the plan step shows the full price when checkout will not apply the first-month coupon', function () {
-    config(['trypost.self_hosted' => false, 'cashier.first_month_coupon_ids.socials' => '']);
+test('the plan step shows the full price without an offer, even when a trial offer exists', function () {
+    config(['trypost.self_hosted' => false]);
+    Offer::factory()->trial(7)->firstSubscriptionOnly()->create(['slug' => 'free-trial-7-days']);
 
     $this->actingAs(welcomeOwnerOnPlanStep());
 
@@ -258,10 +265,12 @@ function welcomeOwnerOnPlanStep(): User
     waitForWelcomePlanTestId($page, 'welcome-plan-continue');
 
     $page->assertSeeIn('@plan-price-socials', '$19')
-        ->assertSeeIn('@plan-price-suffix-socials', 'per month')
+        ->assertSeeIn('@plan-price-unit-socials', '/month')
+        ->assertMissing('@plan-price-original-socials')
+        ->assertMissing('@plan-price-suffix-socials')
         ->assertSeeIn('@welcome-plan-continue', 'Activate for $19')
         ->assertSeeIn('@welcome-plan-terms', 'Cancel anytime.')
-        ->assertDontSee('first month')
+        ->assertDontSee('7 days')
         ->assertNoJavaScriptErrors();
 
     expect(trim((string) $page->text('@plan-price-socials')))->toBe('$19');
@@ -384,3 +393,66 @@ function welcomeOwnerOnPlanStep(): User
 
     expect(waitForWelcomePlanButtonSpinner($page, 'welcome-plan-continue'))->toBe(['spinner' => true, 'disabled' => true]);
 });
+
+test('the plan step shows an offer\'s banner and price', function (string $slug, string $name, string $headline, string $price, ?string $unit, string $period) {
+    config(['trypost.self_hosted' => false]);
+
+    $user = welcomeOwnerOnPlanStep();
+    $user->account->offers()->attach(Offer::factory()->withBanner()->create(['slug' => $slug]), ['claimed_at' => now()]);
+    $this->actingAs($user);
+
+    $page = visit(route('app.welcome.plan'));
+    waitFor($page, '@welcome-plan-offer');
+
+    $page->assertSeeIn('@welcome-plan-offer-name', $name)
+        ->assertSeeIn('@welcome-plan-offer-headline', $headline)
+        ->assertSeeIn('@plan-price-original-socials', '$19/month')
+        ->assertSeeIn('@plan-price-socials', $price)
+        ->assertSeeIn('@plan-price-suffix-socials', $period)
+        ->assertSeeIn('@welcome-plan-continue', "Activate for {$price}")
+        ->assertSeeIn('@welcome-plan-terms', 'Then $19/month. Cancel anytime.')
+        ->assertNoJavaScriptErrors();
+
+    if ($unit === null) {
+        $page->assertMissing('@plan-price-unit-socials');
+    } else {
+        $page->assertSeeIn('@plan-price-unit-socials', $unit);
+    }
+})->with([
+    'black friday shows its unit' => ['bf26', 'Black Friday', '50% off your first 3 months', '$9.50', '/month', 'for your first 3 months'],
+    'first month has no unit' => ['first-month', 'First month', 'Your first month for $1', '$1', null, 'for your first month'],
+]);
+
+test('the plan step keeps an offer\'s price but hides its banner when the offer does not show one', function () {
+    config(['trypost.self_hosted' => false]);
+
+    $user = welcomeOwnerOnPlanStep();
+    $user->account->offers()->attach(Offer::factory()->create(['slug' => 'bf26']), ['claimed_at' => now()]);
+    $this->actingAs($user);
+
+    $page = visit(route('app.welcome.plan'));
+    waitFor($page, '@plan-price-socials');
+
+    $page->assertMissing('@welcome-plan-offer')
+        ->assertSeeIn('@plan-price-socials', '$9.50')
+        ->assertNoJavaScriptErrors();
+});
+
+test('the plan step shows neither a banner nor an offer price for an offer without copy', function () {
+    config(['trypost.self_hosted' => false]);
+
+    $user = welcomeOwnerOnPlanStep();
+    $user->account->offers()->attach(Offer::factory()->create(), ['claimed_at' => now()]);
+    $this->actingAs($user);
+
+    $page = visit(route('app.welcome.plan'));
+    waitFor($page, '@plan-price-socials');
+
+    $page->assertMissing('@welcome-plan-offer')
+        ->assertSeeIn('@plan-price-unit-socials', '/month')
+        ->assertMissing('@plan-price-original-socials')
+        ->assertDontSee('offers.')
+        ->assertNoJavaScriptErrors();
+
+    expect(trim((string) $page->text('@plan-price-socials')))->toBe('$19');
+});
diff --git a/tests/Feature/Billing/TrialLengthTest.php b/tests/Feature/Billing/TrialLengthTest.php
index 7a61dc5e9e..cbd3a0fdc5 100644
--- a/tests/Feature/Billing/TrialLengthTest.php
+++ b/tests/Feature/Billing/TrialLengthTest.php
@@ -8,10 +8,6 @@
     expect(config('cashier.trial_days'))->toBe(8);
 });
 
-test('allow_promotion_codes defaults to false for saas recipe A', function () {
-    expect(config('cashier.allow_promotion_codes'))->toBeFalse();
-});
-
 test('signup grants a trial of cashier.trial_days in no-card mode', function () {
     config(['trypost.billing.require_card_for_trial' => false]);
 
diff --git a/tests/Feature/BillingControllerTest.php b/tests/Feature/BillingControllerTest.php
index 47a272ee18..d9556010cd 100644
--- a/tests/Feature/BillingControllerTest.php
+++ b/tests/Feature/BillingControllerTest.php
@@ -7,6 +7,7 @@
 use App\Models\User;
 use App\Models\Workspace;
 use Illuminate\Support\Facades\Route;
+use Stripe\ApiRequestor;
 
 beforeEach(function () {
     config(['trypost.billing.require_card_for_trial' => true]);
@@ -24,6 +25,10 @@
     $this->user->update(['current_workspace_id' => $this->workspace->id]);
 });
 
+afterEach(function () {
+    ApiRequestor::setHttpClient(null);
+});
+
 // Subscribe tests
 test('subscribe requires authentication', function () {
     $response = $this->get(route('app.subscribe'));
@@ -306,7 +311,7 @@
     $response->assertRedirect(route('login'));
 });
 
-test('billing index exposes the plan usage and no account details', function (string $slug, ?int $limit) {
+test('billing index exposes the plan and no account details', function (string $slug) {
     config(['trypost.self_hosted' => false]);
 
     $this->account->update([
@@ -322,12 +327,12 @@
             ->missing('account')
             ->where('plan.slug', $slug)
             ->where('workspaceCount', 1)
-            ->where('workspaceLimit', $limit)
+            ->missing('workspaceLimit')
             ->where('subscription.ends_at', null)
         );
 })->with([
-    'socials' => ['socials', 1],
-    'workspaces' => ['workspaces', null],
+    'socials' => ['socials'],
+    'workspaces' => ['workspaces'],
 ]);
 
 test('billing index exposes the end date of a cancelled subscription', function () {
@@ -375,3 +380,159 @@
     expect(Route::has('app.account.edit'))->toBeFalse()
         ->and(Route::has('app.account.update'))->toBeFalse();
 });
+
+test('billing index shows a percentage discount and when it ends', function () {
+    config(['trypost.self_hosted' => false]);
+    $endsAt = now()->addMonths(3)->startOfSecond();
+    fakeStripeBilling($this->account, ['percent_off' => 50, 'amount_off' => null, 'currency' => null, 'duration' => 'repeating', 'duration_in_months' => 3], $endsAt->timestamp);
+
+    $this->actingAs($this->user->fresh())
+        ->get(route('app.billing.index'))
+        ->assertOk()
+        ->assertInertia(fn ($page) => $page
+            ->where('discount.value', '50%')
+            ->where('discount.duration', 'repeating')
+            ->where('discount.ends_at', $endsAt->toIso8601String())
+        );
+});
+
+test('billing index shows an amount discount that never ends', function () {
+    config(['trypost.self_hosted' => false]);
+    fakeStripeBilling($this->account, ['percent_off' => null, 'amount_off' => 1800, 'currency' => 'usd', 'duration' => 'forever', 'duration_in_months' => null]);
+
+    $this->actingAs($this->user->fresh())
+        ->get(route('app.billing.index'))
+        ->assertOk()
+        ->assertInertia(fn ($page) => $page
+            ->where('discount.value', '$18.00')
+            ->where('discount.duration', 'forever')
+            ->where('discount.ends_at', null)
+        );
+});
+
+test('billing index sends no discount without one', function () {
+    config(['trypost.self_hosted' => false]);
+    fakeStripeBilling($this->account);
+
+    $this->actingAs($this->user->fresh())
+        ->get(route('app.billing.index'))
+        ->assertOk()
+        ->assertInertia(fn ($page) => $page->where('discount', null));
+});
+
+test('billing index does not ask Stripe for a discount without a Stripe customer', function () {
+    config(['trypost.self_hosted' => false]);
+    $this->account->subscriptions()->create([
+        'type' => Account::SUBSCRIPTION_NAME,
+        'stripe_id' => 'sub_no_customer',
+        'stripe_status' => 'active',
+        'stripe_price' => 'price_123',
+    ]);
+
+    $this->actingAs($this->user->fresh())
+        ->get(route('app.billing.index'))
+        ->assertOk()
+        ->assertInertia(fn ($page) => $page->where('discount', null));
+});
+
+test('billing index sends the card brand Stripe reports', function () {
+    config(['trypost.self_hosted' => false]);
+    fakeStripeBilling($this->account, cardBrand: 'mastercard');
+
+    $this->actingAs($this->user->fresh())
+        ->get(route('app.billing.index'))
+        ->assertOk()
+        ->assertInertia(fn ($page) => $page
+            ->has('paymentMethods', 1)
+            ->where('paymentMethods.0.brand', 'mastercard')
+            ->where('paymentMethods.0.last4', '4242')
+            ->where('paymentMethods.0.is_default', true)
+        );
+});
+
+test('billing index lists every card, the default one first', function () {
+    config(['trypost.self_hosted' => false]);
+    fakeStripeBilling($this->account, cardBrand: 'visa', secondCardBrand: 'mastercard');
+
+    $this->actingAs($this->user->fresh())
+        ->get(route('app.billing.index'))
+        ->assertOk()
+        ->assertInertia(fn ($page) => $page
+            ->has('paymentMethods', 2)
+            ->where('paymentMethods.0.id', 'pm_fake')
+            ->where('paymentMethods.0.brand', 'visa')
+            ->where('paymentMethods.0.is_default', true)
+            ->where('paymentMethods.1.id', 'pm_fake_second')
+            ->where('paymentMethods.1.brand', 'mastercard')
+            ->where('paymentMethods.1.last4', '5454')
+            ->where('paymentMethods.1.exp_year', 2055)
+            ->where('paymentMethods.1.is_default', false)
+        );
+});
+
+test('billing index takes the first card as the default when the customer has none', function () {
+    config(['trypost.self_hosted' => false]);
+    fakeStripeBilling($this->account, cardBrand: 'visa', secondCardBrand: 'mastercard', customerHasDefault: false);
+
+    $this->actingAs($this->user->fresh())
+        ->get(route('app.billing.index'))
+        ->assertOk()
+        ->assertInertia(fn ($page) => $page
+            ->where('paymentMethods.0.id', 'pm_fake_second')
+            ->where('paymentMethods.0.is_default', true)
+            ->where('paymentMethods.1.is_default', false)
+        );
+});
+
+test('billing index lists no cards without any', function () {
+    config(['trypost.self_hosted' => false]);
+    fakeStripeBilling($this->account);
+
+    $this->actingAs($this->user->fresh())
+        ->get(route('app.billing.index'))
+        ->assertOk()
+        ->assertInertia(fn ($page) => $page->where('paymentMethods', []));
+});
+
+test('billing index lists the paid invoices a page at a time, newest first', function () {
+    config(['trypost.self_hosted' => false, 'app.pagination.default' => 10]);
+    fakeStripeBilling($this->account, paidInvoices: 12);
+
+    $nextPage = null;
+
+    $this->actingAs($this->user->fresh())
+        ->get(route('app.billing.index'))
+        ->assertOk()
+        ->assertInertia(function ($page) use (&$nextPage) {
+            $page->has('invoices.data', 10)
+                ->where('invoices.data.0.id', 'in_fake_012')
+                ->where('invoices.data.0.total', '$19.00')
+                ->where('invoices.data.0.invoice_pdf', 'https://pay.stripe.com/invoice/in_fake_12/pdf')
+                ->where('invoices.data.9.id', 'in_fake_003')
+                ->whereType('invoices.meta.next_cursor', 'string');
+
+            $nextPage = $page->toArray()['props']['invoices']['meta']['next_cursor'];
+        });
+
+    $this->get(route('app.billing.index', ['cursor' => $nextPage]))
+        ->assertOk()
+        ->assertInertia(fn ($page) => $page
+            ->has('invoices.data', 2)
+            ->where('invoices.data.0.id', 'in_fake_002')
+            ->where('invoices.data.1.id', 'in_fake_001')
+            ->where('invoices.meta.next_cursor', null)
+        );
+});
+
+test('billing index lists no invoices for an account without any', function () {
+    config(['trypost.self_hosted' => false]);
+    fakeStripeBilling($this->account);
+
+    $this->actingAs($this->user->fresh())
+        ->get(route('app.billing.index'))
+        ->assertOk()
+        ->assertInertia(fn ($page) => $page
+            ->has('invoices.data', 0)
+            ->where('invoices.meta.next_cursor', null)
+        );
+});
diff --git a/tests/Feature/Jobs/PostHog/TrackBillingTest.php b/tests/Feature/Jobs/PostHog/TrackBillingTest.php
index cd004e7bbb..6c397fa8d2 100644
--- a/tests/Feature/Jobs/PostHog/TrackBillingTest.php
+++ b/tests/Feature/Jobs/PostHog/TrackBillingTest.php
@@ -71,38 +71,30 @@
             && $job->payload['groupKey'] === (string) $this->account->id
             && $job->payload['properties']['subscription_status'] === 'active'
             && $job->payload['properties']['has_active_subscription'] === true
-            && ! array_key_exists('first_month_offer_ends_at', $job->payload['properties']);
+            && ! array_key_exists('offer_slug', $job->payload['properties']);
     });
 });
 
-test('subscription creation sets the first month offer end on the account group', function () {
-    $periodEndsAt = now()->addMonth()->startOfSecond();
-    $this->payload['data']['object']['metadata'] = [
-        'trypost_first_month_coupon_id' => 'WORKSPACES_88USD',
-    ];
-    $this->payload['data']['object']['items']['data'][0]['current_period_end'] = $periodEndsAt->timestamp;
+test('subscription creation sets the offer slug on the account group', function () {
+    $this->payload['data']['object']['metadata'] = ['trypost_offer_slug' => 'bf26'];
     Queue::fake();
 
     (new TrackBilling((string) $this->account->id, BillingEvent::Created, $this->payload))
         ->handle(app(PostHogService::class));
 
-    Queue::assertPushed(SendEvent::class, function (SendEvent $job) use ($periodEndsAt): bool {
-        return $job->method === 'groupIdentify'
-            && $job->payload['properties']['first_month_offer_ends_at'] === $periodEndsAt->toIso8601String();
-    });
+    Queue::assertPushed(SendEvent::class, fn (SendEvent $job): bool => $job->method === 'groupIdentify'
+        && $job->payload['properties']['offer_slug'] === 'bf26');
 });
 
-test('subscription creation clears a previous first month offer when the new subscription has none', function () {
+test('subscription creation clears a previous offer when the new subscription has none', function () {
     Queue::fake();
 
     (new TrackBilling((string) $this->account->id, BillingEvent::Created, $this->payload))
         ->handle(app(PostHogService::class));
 
-    Queue::assertPushed(SendEvent::class, function (SendEvent $job): bool {
-        return $job->method === 'groupIdentify'
-            && array_key_exists('first_month_offer_ends_at', $job->payload['properties'])
-            && $job->payload['properties']['first_month_offer_ends_at'] === null;
-    });
+    Queue::assertPushed(SendEvent::class, fn (SendEvent $job): bool => $job->method === 'groupIdentify'
+        && array_key_exists('offer_slug', $job->payload['properties'])
+        && $job->payload['properties']['offer_slug'] === null);
 });
 
 test('subscription cancellation updates the account group after Cashier marks it ended', function () {
diff --git a/tests/Feature/Jobs/PostHog/TrackCheckoutCompletedTest.php b/tests/Feature/Jobs/PostHog/TrackCheckoutCompletedTest.php
index b9664e21af..97ab3445ed 100644
--- a/tests/Feature/Jobs/PostHog/TrackCheckoutCompletedTest.php
+++ b/tests/Feature/Jobs/PostHog/TrackCheckoutCompletedTest.php
@@ -15,7 +15,6 @@
 
 beforeEach(function () {
     config(['services.posthog.enabled' => true, 'services.posthog.api_key' => 'phc_test_key']);
-    config(['cashier.first_month_coupon_ids.workspaces' => 'WORKSPACES_88USD']);
 
     $this->plan = Plan::where('slug', Slug::Workspaces)->firstOrFail();
     $this->plan->update([
@@ -65,46 +64,18 @@
             && $job->payload['properties']['conversion_value'] === 99.0
             && $job->payload['properties']['conversion_currency'] === 'USD'
             && $job->payload['properties']['conversion_transaction_id'] === 'sub_test123'
-            && $job->payload['properties']['is_first_month_offer'] === false;
+            && $job->payload['properties']['offer_slug'] === null;
     });
 });
 
-test('handle marks checkout.completed when the subscription uses the configured first month coupon', function () {
-    $periodEndsAt = now()->addMonth()->startOfSecond();
-    $this->payload['data']['object']['metadata'] = [
-        'trypost_first_month_coupon_id' => 'WORKSPACES_88USD',
-    ];
-    $this->payload['data']['object']['items']['data'][0]['current_period_end'] = $periodEndsAt->timestamp;
+test('handle sends the slug of the offer the checkout applied', function () {
+    $this->payload['data']['object']['metadata'] = ['trypost_offer_slug' => 'bf26'];
     Queue::fake();
 
     (new TrackCheckoutCompleted((string) $this->account->id, $this->payload))
         ->handle(app(PostHogService::class));
 
-    Queue::assertPushed(SendEvent::class, function (SendEvent $job) use ($periodEndsAt): bool {
-        $properties = $job->payload['properties'];
-
-        return $properties['is_first_month_offer'] === true
-            && $properties['first_month_coupon_id'] === 'WORKSPACES_88USD'
-            && $properties['first_month_offer_ends_at'] === $periodEndsAt->toIso8601String();
-    });
-});
-
-test('handle uses the checkout marker even when the coupon configuration changes before the job runs', function () {
-    $this->payload['data']['object']['metadata'] = [
-        'trypost_first_month_coupon_id' => 'WORKSPACES_88USD',
-    ];
-    config(['cashier.first_month_coupon_ids.workspaces' => null]);
-    Queue::fake();
-
-    (new TrackCheckoutCompleted((string) $this->account->id, $this->payload))
-        ->handle(app(PostHogService::class));
-
-    Queue::assertPushed(SendEvent::class, function (SendEvent $job): bool {
-        $properties = $job->payload['properties'];
-
-        return $properties['is_first_month_offer'] === true
-            && $properties['first_month_coupon_id'] === 'WORKSPACES_88USD';
-    });
+    Queue::assertPushed(SendEvent::class, fn (SendEvent $job): bool => $job->payload['properties']['offer_slug'] === 'bf26');
 });
 
 test('handle resolves the yearly interval from the price id', function () {
diff --git a/tests/Feature/Jobs/PostHog/TrackCheckoutExpiredTest.php b/tests/Feature/Jobs/PostHog/TrackCheckoutExpiredTest.php
index 95d192411a..3446be4469 100644
--- a/tests/Feature/Jobs/PostHog/TrackCheckoutExpiredTest.php
+++ b/tests/Feature/Jobs/PostHog/TrackCheckoutExpiredTest.php
@@ -29,7 +29,7 @@
             'metadata' => [
                 'trypost_plan_slug' => 'socials',
                 'trypost_interval' => 'monthly',
-                'trypost_first_month_offer' => 'true',
+                'trypost_offer_slug' => 'bf26',
             ],
         ]],
     ];
@@ -58,13 +58,13 @@
             && $properties['$groups']['account'] === (string) $this->account->id
             && $properties['plan_name'] === Plan::where('slug', Slug::Socials)->value('name')
             && $properties['interval'] === 'monthly'
-            && $properties['is_first_month_offer'] === true
+            && $properties['offer_slug'] === 'bf26'
             && $properties['checkout_session_id'] === 'cs_test_expired';
     });
 });
 
-test('marks the offer false when the session had no first month offer', function () {
-    $this->payload['data']['object']['metadata']['trypost_first_month_offer'] = 'false';
+test('sends no offer when the session had none', function () {
+    unset($this->payload['data']['object']['metadata']['trypost_offer_slug']);
     Queue::fake();
 
     (new TrackCheckoutExpired((string) $this->account->id, $this->payload))
@@ -72,7 +72,7 @@
 
     Queue::assertPushed(
         SendEvent::class,
-        fn (SendEvent $job): bool => $job->payload['properties']['is_first_month_offer'] === false,
+        fn (SendEvent $job): bool => $job->payload['properties']['offer_slug'] === null,
     );
 });
 
@@ -101,7 +101,7 @@
 
         return $properties['plan_name'] === null
             && $properties['interval'] === null
-            && $properties['is_first_month_offer'] === false;
+            && $properties['offer_slug'] === null;
     });
 });
 
diff --git a/tests/Feature/Listeners/StripeBillingSignalListenerTest.php b/tests/Feature/Listeners/StripeBillingSignalListenerTest.php
index 1896de1bed..c209880ca4 100644
--- a/tests/Feature/Listeners/StripeBillingSignalListenerTest.php
+++ b/tests/Feature/Listeners/StripeBillingSignalListenerTest.php
@@ -34,7 +34,7 @@
             'metadata' => [
                 'trypost_plan_slug' => 'socials',
                 'trypost_interval' => 'monthly',
-                'trypost_first_month_offer' => 'true',
+                'trypost_offer_slug' => 'bf26',
             ],
         ]],
     ];
diff --git a/tests/Feature/Listeners/StripeEventListenerTest.php b/tests/Feature/Listeners/StripeEventListenerTest.php
index 43d9e58302..c709d062f3 100644
--- a/tests/Feature/Listeners/StripeEventListenerTest.php
+++ b/tests/Feature/Listeners/StripeEventListenerTest.php
@@ -589,7 +589,7 @@
             'customer' => 'cus_test123',
             'id' => 'sub_123',
             'status' => 'active',
-            'metadata' => ['trypost_first_month_coupon_id' => 'WORKSPACES_88USD'],
+            'metadata' => ['trypost_offer_slug' => 'bf26'],
             'items' => ['data' => [['price' => ['id' => 'price_workspaces_monthly']]]],
         ]],
     ]));
@@ -597,7 +597,7 @@
     Bus::assertDispatched(
         TrackCheckoutCompleted::class,
         fn ($job) => $job->accountId === (string) $this->account->id
-            && data_get($job->payload, 'data.object.metadata.trypost_first_month_coupon_id') === 'WORKSPACES_88USD',
+            && data_get($job->payload, 'data.object.metadata.trypost_offer_slug') === 'bf26',
     );
     Bus::assertNotDispatched(TrackTrialStarted::class);
 });
diff --git a/tests/Feature/Models/OfferTest.php b/tests/Feature/Models/OfferTest.php
new file mode 100644
index 0000000000..f5d73fd271
--- /dev/null
+++ b/tests/Feature/Models/OfferTest.php
@@ -0,0 +1,105 @@
+<?php
+
+declare(strict_types=1);
+
+use App\Models\Account;
+use App\Models\Offer;
+
+test('an offer that started and has no end is available', function () {
+    $offer = Offer::factory()->create();
+
+    expect(Offer::available()->pluck('id')->all())->toBe([$offer->id]);
+});
+
+test('an offer that has not started is not available', function () {
+    Offer::factory()->upcoming()->create();
+
+    expect(Offer::available()->count())->toBe(0);
+});
+
+test('an offer past its end is not available', function () {
+    Offer::factory()->expired()->create();
+
+    expect(Offer::available()->count())->toBe(0);
+});
+
+test('an offer with an end in the future is available', function () {
+    Offer::factory()->create(['ends_at' => now()->addDay()]);
+
+    expect(Offer::available()->count())->toBe(1);
+});
+
+test('a full offer is not available', function () {
+    $offer = Offer::factory()->limitedTo(1)->create();
+    $offer->accounts()->attach(Account::factory()->create(), ['claimed_at' => now(), 'redeemed_at' => now()]);
+
+    expect(Offer::available()->count())->toBe(0);
+});
+
+test('claims do not use up places', function () {
+    $offer = Offer::factory()->limitedTo(1)->create();
+    $offer->accounts()->attach(Account::factory()->create(), ['claimed_at' => now()]);
+
+    expect(Offer::available()->count())->toBe(1);
+});
+
+test('current offer is the latest claimed unredeemed available offer', function () {
+    $account = Account::factory()->create();
+    [$earlier, $later, $redeemed] = Offer::factory()->count(3)->create();
+
+    $account->offers()->attach($earlier, ['claimed_at' => now()->subDays(2)]);
+    $account->offers()->attach($later, ['claimed_at' => now()->subDay()]);
+    $account->offers()->attach($redeemed, ['claimed_at' => now(), 'redeemed_at' => now()]);
+
+    expect($account->currentOffer()?->id)->toBe($later->id);
+});
+
+test('current offer ignores expired claims', function () {
+    $account = Account::factory()->create();
+    $account->offers()->attach(Offer::factory()->expired()->create(), ['claimed_at' => now()]);
+
+    expect($account->currentOffer())->toBeNull();
+});
+
+test('lang key replaces dashes', function () {
+    expect(Offer::factory()->make(['slug' => 'black-friday-2026'])->langKey())->toBe('black_friday_2026');
+});
+
+test('deleting an account removes its offer claims', function () {
+    $account = Account::factory()->create();
+    $offer = Offer::factory()->create();
+    $account->offers()->attach($offer, ['claimed_at' => now()]);
+
+    $account->delete();
+
+    $this->assertDatabaseMissing('account_offer', ['offer_id' => $offer->id]);
+});
+
+test('an offer the account redeemed is no longer available to it, only to others', function () {
+    $offer = Offer::factory()->create();
+    $account = Account::factory()->create();
+    $account->offers()->attach($offer, ['claimed_at' => now(), 'redeemed_at' => now()]);
+
+    expect(Offer::availableTo($account)->whereKey($offer->id)->exists())->toBeFalse()
+        ->and(Offer::availableTo(Account::factory()->create())->whereKey($offer->id)->exists())->toBeTrue();
+});
+
+test('a first-subscription offer is not available to an account that was billed before', function () {
+    $offer = Offer::factory()->firstSubscriptionOnly()->create();
+    $account = Account::factory()->create();
+    $account->subscriptions()->create([
+        'type' => Account::SUBSCRIPTION_NAME,
+        'stripe_id' => 'sub_former',
+        'stripe_status' => 'canceled',
+        'stripe_price' => 'price_monthly_test',
+    ]);
+
+    expect(Offer::availableTo($account)->whereKey($offer->id)->exists())->toBeFalse()
+        ->and(Offer::availableTo(Account::factory()->create())->whereKey($offer->id)->exists())->toBeTrue();
+});
+
+test('current offer is empty without a claim', function () {
+    Offer::factory()->create();
+
+    expect(Account::factory()->create()->currentOffer())->toBeNull();
+});
diff --git a/tests/Feature/Offer/ClaimOfferTest.php b/tests/Feature/Offer/ClaimOfferTest.php
new file mode 100644
index 0000000000..4b6fd8ebfb
--- /dev/null
+++ b/tests/Feature/Offer/ClaimOfferTest.php
@@ -0,0 +1,259 @@
+<?php
+
+declare(strict_types=1);
+
+use App\Actions\Offer\ClaimOffer;
+use App\Http\Middleware\App\CaptureOffer;
+use App\Models\Account;
+use App\Models\Offer;
+use App\Models\User;
+use App\Models\Workspace;
+use Laravel\Socialite\Facades\Socialite;
+use Laravel\Socialite\Two\User as SocialiteUser;
+
+beforeEach(function () {
+    config(['trypost.self_hosted' => false]);
+
+    $this->offer = Offer::factory()->create(['slug' => 'black-friday-2026']);
+});
+
+function offerTestOwner(): User
+{
+    $account = Account::factory()->create();
+    $user = User::factory()->create(['account_id' => $account->id]);
+    $account->update(['owner_id' => $user->id]);
+    $workspace = Workspace::factory()->create(['account_id' => $account->id, 'user_id' => $user->id]);
+    $workspace->members()->attach($user->id, membershipPivot('member'));
+    $user->update(['current_workspace_id' => $workspace->id]);
+
+    return $user->refresh();
+}
+
+function offerTestSubscribe(Account $account, string $status = 'active'): void
+{
+    $account->subscriptions()->create([
+        'type' => Account::SUBSCRIPTION_NAME,
+        'stripe_id' => 'sub_test_'.fake()->uuid(),
+        'stripe_status' => $status,
+        'stripe_price' => 'price_123',
+        'ends_at' => $status === 'canceled' ? now()->subDay() : null,
+    ]);
+}
+
+test('a guest\'s offer is claimed when they register', function () {
+    $this->get(route('register', ['offer' => 'black-friday-2026']));
+
+    $this->followingRedirects()->post(route('register.store'), [
+        'name' => 'Offer User',
+        'email' => 'offer@example.com',
+        'password' => strongPassword(),
+        'locale' => 'en',
+    ]);
+
+    $account = User::query()->where('email', 'offer@example.com')->firstOrFail()->account;
+
+    expect($account->offers()->pluck('offers.id')->all())->toBe([$this->offer->id]);
+});
+
+test('claims a pending offer after login', function () {
+    $owner = offerTestOwner();
+    offerTestSubscribe($owner->account, 'canceled');
+
+    $this->get(route('login', ['offer' => 'black-friday-2026']));
+
+    $this->followingRedirects()->post(route('login.store'), [
+        'email' => $owner->email,
+        'password' => 'password',
+    ]);
+
+    expect($owner->account->offers()->pluck('offers.id')->all())->toBe([$this->offer->id]);
+});
+
+test('a logged-in owner without a subscription claims on any page', function () {
+    $owner = offerTestOwner();
+
+    $this->actingAs($owner)->get(route('app.welcome.plan', ['offer' => 'black-friday-2026']));
+
+    expect($owner->account->offers()->pluck('offers.id')->all())->toBe([$this->offer->id]);
+});
+
+test('ignores accounts with an active subscription', function () {
+    $owner = offerTestOwner();
+    offerTestSubscribe($owner->account);
+
+    $this->actingAs($owner)->get(route('app.calendar', ['offer' => 'black-friday-2026']));
+
+    expect($owner->account->offers()->count())->toBe(0);
+});
+
+test('ignores members who are not the owner', function () {
+    $owner = offerTestOwner();
+    $member = User::factory()->create(['account_id' => $owner->account_id]);
+
+    $this->actingAs($member)
+        ->get(route('app.welcome.subscription-required', ['offer' => 'black-friday-2026']))
+        ->assertSessionMissing(CaptureOffer::SESSION_KEY);
+
+    expect($owner->account->offers()->count())->toBe(0);
+});
+
+test('ignores unknown, upcoming, expired and full offers', function (Closure $makeOffer) {
+    $slug = $makeOffer();
+    $owner = offerTestOwner();
+
+    $this->actingAs($owner)->get(route('app.welcome.plan', ['offer' => $slug]));
+
+    expect($owner->account->offers()->count())->toBe(0);
+})->with([
+    'unknown' => fn () => fn (): string => 'no-such-offer',
+    'upcoming' => fn () => fn (): string => Offer::factory()->upcoming()->create()->slug,
+    'expired' => fn () => fn (): string => Offer::factory()->expired()->create()->slug,
+    'full' => fn () => function (): string {
+        $offer = Offer::factory()->limitedTo(1)->create();
+        $offer->accounts()->attach(Account::factory()->create(), ['claimed_at' => now(), 'redeemed_at' => now()]);
+
+        return $offer->slug;
+    },
+]);
+
+test('ignores a non-string or blank offer', function (array $query) {
+    $this->get(route('register', $query))
+        ->assertOk()
+        ->assertSessionMissing(CaptureOffer::SESSION_KEY);
+})->with([
+    'array' => [['offer' => ['black-friday-2026']]],
+    'blank' => [['offer' => '']],
+    'huge' => [['offer' => str_repeat('a', 10_000)]],
+]);
+
+test('matches the slug exactly', function () {
+    $owner = offerTestOwner();
+
+    expect(ClaimOffer::execute($owner->account, 'BLACK-FRIDAY-2026'))->toBeNull()
+        ->and($owner->account->offers()->count())->toBe(0);
+});
+
+test('does not re-offer a redeemed offer', function () {
+    $owner = offerTestOwner();
+    $redeemedAt = now()->subMonth()->startOfSecond();
+    $owner->account->offers()->attach($this->offer, ['claimed_at' => $redeemedAt, 'redeemed_at' => $redeemedAt]);
+
+    expect(ClaimOffer::execute($owner->account, 'black-friday-2026'))->toBeNull()
+        ->and($owner->account->offers()->first()->pivot->redeemed_at)->toEqual($redeemedAt->toDateTimeString());
+});
+
+test('re-claiming refreshes claimed_at', function () {
+    $owner = offerTestOwner();
+
+    $this->travelTo(now()->subDay());
+    ClaimOffer::execute($owner->account, 'black-friday-2026');
+    $this->travelBack();
+
+    $secondClaim = now()->startOfSecond();
+    $this->travelTo($secondClaim);
+    ClaimOffer::execute($owner->account, 'black-friday-2026');
+
+    expect($owner->account->offers()->first()->pivot->claimed_at)->toEqual($secondClaim->toDateTimeString());
+});
+
+test('self-hosted never claims', function () {
+    config(['trypost.self_hosted' => true]);
+    $owner = offerTestOwner();
+
+    $this->actingAs($owner)->get(route('app.calendar', ['offer' => 'black-friday-2026']));
+
+    expect($owner->account->offers()->count())->toBe(0);
+});
+
+test('a guest\'s link to an offer that has not started is not kept for later', function () {
+    Offer::factory()->create(['slug' => 'cyber-monday-2026', 'starts_at' => now()->addHour()]);
+
+    $this->get(route('register', ['offer' => 'cyber-monday-2026']))
+        ->assertSessionMissing(CaptureOffer::SESSION_KEY);
+
+    $this->travel(2)->hours();
+
+    $this->followingRedirects()->post(route('register.store'), [
+        'name' => 'Early User',
+        'email' => 'early@example.com',
+        'password' => strongPassword(),
+        'locale' => 'en',
+    ]);
+
+    expect(User::query()->where('email', 'early@example.com')->firstOrFail()->account->offers()->count())->toBe(0);
+});
+
+test('a guest\'s wrong-case slug is not kept in the session', function () {
+    $this->get(route('register', ['offer' => 'BLACK-FRIDAY-2026']))
+        ->assertSessionMissing(CaptureOffer::SESSION_KEY);
+});
+
+test('a signed-in owner claims without going through the session', function () {
+    $owner = offerTestOwner();
+
+    $this->actingAs($owner)
+        ->get(route('app.welcome.plan', ['offer' => 'black-friday-2026']))
+        ->assertSessionMissing(CaptureOffer::SESSION_KEY);
+
+    expect($owner->account->offers()->count())->toBe(1);
+});
+
+test('a user without an account claims nothing and keeps no slug', function () {
+    $user = User::factory()->create(['account_id' => null]);
+
+    $this->actingAs($user)
+        ->get(route('app.welcome.subscription-required', ['offer' => 'black-friday-2026']))
+        ->assertSessionMissing(CaptureOffer::SESSION_KEY);
+
+    $this->assertDatabaseCount('account_offer', 0);
+});
+
+test('a guest\'s offer is claimed when they sign up with google', function () {
+    config(['trypost.google_auth_enabled' => true]);
+    $this->get(route('auth.google.redirect', ['offer' => 'black-friday-2026']));
+
+    $socialiteUser = new SocialiteUser;
+    $socialiteUser->id = 'g-offer';
+    $socialiteUser->name = 'Google Offer';
+    $socialiteUser->email = 'google-offer@example.com';
+    Socialite::shouldReceive('driver')->with('google-auth')->andReturn($driver = Mockery::mock());
+    $driver->shouldReceive('user')->andReturn($socialiteUser);
+
+    $this->followingRedirects()->get(route('auth.google.callback'));
+
+    expect(User::query()->where('email', 'google-offer@example.com')->firstOrFail()->account->offers()->pluck('offers.id')->all())
+        ->toBe([$this->offer->id]);
+});
+
+test('a guest\'s offer is claimed when they sign up with github', function () {
+    config(['trypost.github_auth_enabled' => true]);
+    $this->get(route('auth.github.redirect', ['offer' => 'black-friday-2026']));
+
+    $socialiteUser = new SocialiteUser;
+    $socialiteUser->id = 'gh-offer';
+    $socialiteUser->name = 'GitHub Offer';
+    $socialiteUser->email = 'github-offer@example.com';
+    $socialiteUser->nickname = 'github-offer';
+    Socialite::shouldReceive('driver')->with('github')->andReturn($driver = Mockery::mock());
+    $driver->shouldReceive('user')->andReturn($socialiteUser);
+
+    $this->followingRedirects()->get(route('auth.github.callback'));
+
+    expect(User::query()->where('email', 'github-offer@example.com')->firstOrFail()->account->offers()->pluck('offers.id')->all())
+        ->toBe([$this->offer->id]);
+});
+
+test('the offer survives moving from the register page to login', function () {
+    $owner = offerTestOwner();
+
+    $this->get(route('register', ['offer' => 'black-friday-2026']));
+    $this->get(route('login'));
+    $this->get(route('register'));
+
+    $this->followingRedirects()->post(route('login.store'), [
+        'email' => $owner->email,
+        'password' => 'password',
+    ]);
+
+    expect($owner->account->offers()->pluck('offers.id')->all())->toBe([$this->offer->id]);
+});
diff --git a/tests/Feature/Offer/OfferCopyTest.php b/tests/Feature/Offer/OfferCopyTest.php
new file mode 100644
index 0000000000..94e062ce95
--- /dev/null
+++ b/tests/Feature/Offer/OfferCopyTest.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+use App\Enums\User\Locale;
+use Illuminate\Support\Facades\Lang;
+
+test('every offer has its price in every locale, and its banner in all or none', function () {
+    $offers = Lang::get('offers', [], Locale::DEFAULT->value);
+
+    $missing = collect(Locale::cases())->flatMap(fn (Locale $locale) => collect($offers)
+        ->flatMap(fn (array $copy, string $offer): array => collect(['price', 'period'])
+            ->when(array_key_exists('name', $copy) || array_key_exists('headline', $copy), fn ($fields) => $fields->push('name', 'headline'))
+            ->map(fn (string $field): string => "offers.{$offer}.{$field}")
+            ->all())
+        ->reject(fn (string $key): bool => Lang::has($key, $locale->value, false))
+        ->map(fn (string $key): string => "{$locale->value}: {$key}"));
+
+    expect($offers)->not->toBeEmpty()
+        ->and($missing->values()->all())->toBe([]);
+});
diff --git a/tests/Feature/Offer/RedeemOfferTest.php b/tests/Feature/Offer/RedeemOfferTest.php
new file mode 100644
index 0000000000..578c253e8f
--- /dev/null
+++ b/tests/Feature/Offer/RedeemOfferTest.php
@@ -0,0 +1,105 @@
+<?php
+
+declare(strict_types=1);
+
+use App\Listeners\StripeEventListener;
+use App\Models\Account;
+use App\Models\Offer;
+use App\Models\User;
+use Laravel\Cashier\Events\WebhookHandled;
+
+beforeEach(function () {
+    $this->account = Account::factory()->create(['stripe_id' => 'cus_offer123']);
+    $this->account->update(['owner_id' => User::factory()->create(['account_id' => $this->account->id])->id]);
+    $this->offer = Offer::factory()->limitedTo(1)->create();
+});
+
+function subscriptionCreatedWithOffer(?string $offerId, string $status = 'active', string $type = 'customer.subscription.created'): WebhookHandled
+{
+    return new WebhookHandled([
+        'id' => 'evt_'.fake()->uuid(),
+        'type' => $type,
+        'data' => ['object' => [
+            'customer' => 'cus_offer123',
+            'id' => 'sub_offer',
+            'status' => $status,
+            'metadata' => array_filter(['trypost_offer_id' => $offerId]),
+        ]],
+    ]);
+}
+
+test('marks the claimed offer redeemed', function () {
+    $this->account->offers()->attach($this->offer, ['claimed_at' => now()]);
+
+    (new StripeEventListener)->handle(subscriptionCreatedWithOffer($this->offer->id));
+
+    expect($this->account->offers()->first()->pivot->redeemed_at)->not->toBeNull();
+});
+
+test('does not overwrite an earlier redemption', function () {
+    $redeemedAt = now()->subMonth()->startOfSecond();
+    $this->account->offers()->attach($this->offer, ['claimed_at' => $redeemedAt, 'redeemed_at' => $redeemedAt]);
+
+    (new StripeEventListener)->handle(subscriptionCreatedWithOffer($this->offer->id));
+
+    expect($this->account->offers()->first()->pivot->redeemed_at)->toEqual($redeemedAt->toDateTimeString());
+});
+
+test('ignores a subscription without offer metadata', function () {
+    $this->account->offers()->attach($this->offer, ['claimed_at' => now()]);
+
+    (new StripeEventListener)->handle(subscriptionCreatedWithOffer(null));
+
+    expect($this->account->offers()->first()->pivot->redeemed_at)->toBeNull();
+});
+
+test('ignores an offer the account never claimed', function () {
+    $other = Account::factory()->create();
+    $other->offers()->attach($this->offer, ['claimed_at' => now()]);
+
+    (new StripeEventListener)->handle(subscriptionCreatedWithOffer($this->offer->id));
+
+    expect($this->account->offers()->count())->toBe(0)
+        ->and($other->offers()->first()->pivot->redeemed_at)->toBeNull();
+});
+
+test('a redeemed offer uses up a place', function () {
+    $this->account->offers()->attach($this->offer, ['claimed_at' => now()]);
+
+    (new StripeEventListener)->handle(subscriptionCreatedWithOffer($this->offer->id));
+
+    expect(Offer::available()->whereKey($this->offer->id)->exists())->toBeFalse();
+});
+
+test('an incomplete subscription does not redeem the offer', function () {
+    $this->account->offers()->attach($this->offer, ['claimed_at' => now()]);
+
+    (new StripeEventListener)->handle(subscriptionCreatedWithOffer($this->offer->id, 'incomplete'));
+
+    expect($this->account->offers()->first()->pivot->redeemed_at)->toBeNull();
+});
+
+test('the offer is redeemed once an incomplete subscription becomes active', function () {
+    $this->account->offers()->attach($this->offer, ['claimed_at' => now()]);
+
+    (new StripeEventListener)->handle(subscriptionCreatedWithOffer($this->offer->id, 'incomplete'));
+    (new StripeEventListener)->handle(subscriptionCreatedWithOffer($this->offer->id, 'active', 'customer.subscription.updated'));
+
+    expect($this->account->offers()->first()->pivot->redeemed_at)->not->toBeNull();
+});
+
+test('a trialing subscription redeems the offer', function () {
+    $this->account->offers()->attach($this->offer, ['claimed_at' => now()]);
+
+    (new StripeEventListener)->handle(subscriptionCreatedWithOffer($this->offer->id, 'trialing'));
+
+    expect($this->account->offers()->first()->pivot->redeemed_at)->not->toBeNull();
+});
+
+test('ignores offer metadata that is not an offer id', function () {
+    $this->account->offers()->attach($this->offer, ['claimed_at' => now()]);
+
+    (new StripeEventListener)->handle(subscriptionCreatedWithOffer('not-a-uuid'));
+
+    expect($this->account->offers()->first()->pivot->redeemed_at)->toBeNull();
+});
diff --git a/tests/Feature/OfferSeederTest.php b/tests/Feature/OfferSeederTest.php
new file mode 100644
index 0000000000..87f9e4bb27
--- /dev/null
+++ b/tests/Feature/OfferSeederTest.php
@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+use App\Models\Offer;
+use Database\Seeders\OfferSeeder;
+
+test('seeds the local offers on a local install', function () {
+    app()->detectEnvironment(fn (): string => 'local');
+
+    (new OfferSeeder)->run();
+    (new OfferSeeder)->run();
+
+    expect(Offer::query()->orderBy('slug')->pluck('slug')->all())->toBe(['bf26', 'first-month', 'free-trial-7-days'])
+        ->and(Offer::query()->where('slug', 'bf26')->value('show_banner'))->toBeTrue();
+});
+
+test('seeds no offer outside a local install', function (string $environment) {
+    app()->detectEnvironment(fn (): string => $environment);
+
+    (new OfferSeeder)->run();
+
+    expect(Offer::query()->count())->toBe(0);
+})->with(['production', 'testing']);
diff --git a/tests/Feature/Welcome/WelcomeControllerTest.php b/tests/Feature/Welcome/WelcomeControllerTest.php
index d601a26f54..85833c2a26 100644
--- a/tests/Feature/Welcome/WelcomeControllerTest.php
+++ b/tests/Feature/Welcome/WelcomeControllerTest.php
@@ -12,6 +12,7 @@
 use App\Enums\User\PreviousSoftware;
 use App\Jobs\PostHog\SendEvent;
 use App\Models\Account;
+use App\Models\Offer;
 use App\Models\Plan;
 use App\Models\SocialAccount;
 use App\Models\User;
@@ -196,24 +197,31 @@
         );
 });
 
-test('plan offers the first month only when checkout will apply the coupon', function (Closure $setup, bool $offered) {
-    config(['cashier.first_month_coupon_ids.socials' => 'coupon_socials']);
+test('plan sends a claimed trial offer only to an account that may use it', function (Closure $setup, bool $claims, bool $offered) {
+    $trial = Offer::factory()->trial(7)->firstSubscriptionOnly()->create(['slug' => 'free-trial-7-days']);
     completeWelcomeThroughSoftware($this->user);
     $setup($this->user);
 
+    if ($claims) {
+        $this->user->account->offers()->attach($trial, ['claimed_at' => now()]);
+    }
+
     $this->actingAs($this->user->fresh())
         ->get(route('app.welcome.plan'))
         ->assertOk()
-        ->assertInertia(fn ($page) => $page->where('firstMonthOffer', $offered));
+        ->assertInertia(fn ($page) => $offered
+            ? $page->where('offer.key', 'free_trial_7_days')->where('offer.trial_days', 7)
+            : $page->where('offer', null));
 })->with([
-    'first-time subscriber' => [fn () => null, true],
+    'no claim pays the full price' => [fn () => null, false, false],
+    'first-time subscriber' => [fn () => null, true, true],
     'retrying an incomplete checkout' => [fn (User $user) => $user->account->subscriptions()->create([
         'type' => Account::SUBSCRIPTION_NAME,
         'stripe_id' => 'sub_incomplete',
         'stripe_status' => 'incomplete',
         'stripe_price' => 'price_monthly_test',
         'quantity' => 1,
-    ]), true],
+    ]), true, true],
     'former subscriber' => [fn (User $user) => $user->account->subscriptions()->create([
         'type' => Account::SUBSCRIPTION_NAME,
         'stripe_id' => 'sub_canceled',
@@ -221,8 +229,7 @@
         'stripe_price' => 'price_monthly_test',
         'quantity' => 1,
         'ends_at' => now()->subDay(),
-    ]), false],
-    'no coupon configured' => [fn () => config(['cashier.first_month_coupon_ids.socials' => '']), false],
+    ]), true, false],
 ]);
 
 test('plan store sends the owner to Stripe checkout on the Socials monthly price', function () {
@@ -247,33 +254,6 @@
         ->assertRedirect('https://checkout.stripe.test/session');
 });
 
-test('checkout.started records whether the first-month offer was shown', function (string $couponId, bool $offered) {
-    config([
-        'services.posthog.enabled' => true,
-        'services.posthog.api_key' => 'phc_test',
-        'cashier.first_month_coupon_ids.socials' => $couponId,
-    ]);
-    Bus::fake();
-    completeWelcomeThroughSoftware($this->user);
-    Plan::where('slug', Slug::Socials)->update(['stripe_monthly_price_id' => 'price_socials_monthly']);
-
-    $this->mock(StartSubscriptionCheckout::class)
-        ->shouldReceive('redirect')
-        ->once()
-        ->andReturn(redirect('https://checkout.stripe.test/session'));
-
-    $this->actingAs($this->user->fresh())
-        ->post(route('app.welcome.plan.store'))
-        ->assertRedirect('https://checkout.stripe.test/session');
-
-    Bus::assertDispatched(SendEvent::class, fn (SendEvent $event): bool => $event->method === 'capture'
-        && data_get($event->payload, 'event') === CheckoutEvent::Started->value
-        && data_get($event->payload, 'properties.is_first_month_offer') === $offered);
-})->with([
-    'with the coupon' => ['coupon_socials', true],
-    'without the coupon' => ['', false],
-]);
-
 test('picking an AI app on the MCP step records which one', function (string $client) {
     config(['services.posthog.enabled' => true, 'services.posthog.api_key' => 'phc_test']);
     Bus::fake();
@@ -695,3 +675,111 @@ function attachCurrentWorkspace(User $user): Workspace
 
     return $workspace;
 }
+
+test('the plan step sends the current offer', function () {
+    completeWelcomeThroughSoftware($this->user);
+    $offer = Offer::factory()->create(['slug' => 'black-friday-2026']);
+    $this->user->account->offers()->attach($offer, ['claimed_at' => now()]);
+
+    $this->actingAs($this->user->fresh())
+        ->get(route('app.welcome.plan'))
+        ->assertOk()
+        ->assertInertia(fn ($page) => $page
+            ->where('offer.key', 'black_friday_2026')
+            ->where('offer.has_banner', false)
+            ->where('offer.has_price', false)
+        );
+});
+
+test('the plan step sends no offer once it expired', function () {
+    completeWelcomeThroughSoftware($this->user);
+    $offer = Offer::factory()->create(['ends_at' => now()->addHour()]);
+    $this->user->account->offers()->attach($offer, ['claimed_at' => now()]);
+
+    $this->travel(2)->hours();
+
+    $this->actingAs($this->user->fresh())
+        ->get(route('app.welcome.plan'))
+        ->assertOk()
+        ->assertInertia(fn ($page) => $page
+            ->where('offer', null)
+        );
+});
+
+test('checkout.started records the offer slug', function () {
+    config([
+        'services.posthog.enabled' => true,
+        'services.posthog.api_key' => 'phc_test',
+    ]);
+    Bus::fake();
+    completeWelcomeThroughSoftware($this->user);
+    Plan::where('slug', Slug::Socials)->update(['stripe_monthly_price_id' => 'price_socials_monthly']);
+    $offer = Offer::factory()->create(['slug' => 'black-friday-2026']);
+    $this->user->account->offers()->attach($offer, ['claimed_at' => now()]);
+
+    $this->mock(StartSubscriptionCheckout::class)
+        ->shouldReceive('redirect')
+        ->once()
+        ->andReturn(redirect('https://checkout.stripe.test/session'));
+
+    $this->actingAs($this->user->fresh())
+        ->post(route('app.welcome.plan.store'))
+        ->assertRedirect('https://checkout.stripe.test/session');
+
+    Bus::assertDispatched(SendEvent::class, fn (SendEvent $event): bool => data_get($event->payload, 'event') === CheckoutEvent::Started->value
+        && data_get($event->payload, 'properties.offer_slug') === 'black-friday-2026');
+});
+
+test('plan store hands checkout the offer it tracked', function () {
+    completeWelcomeThroughSoftware($this->user);
+    Plan::where('slug', Slug::Socials)->update(['stripe_monthly_price_id' => 'price_socials_monthly']);
+    $offer = Offer::factory()->create();
+    $this->user->account->offers()->attach($offer, ['claimed_at' => now()]);
+
+    $this->mock(StartSubscriptionCheckout::class)
+        ->shouldReceive('redirect')
+        ->once()
+        ->withArgs(fn ($account, $priceId, $cancelUrl, $plan, $checkoutOffer = null): bool => $checkoutOffer?->is($offer) === true)
+        ->andReturn(redirect('https://checkout.stripe.test/session'));
+
+    $this->actingAs($this->user->fresh())
+        ->post(route('app.welcome.plan.store'))
+        ->assertRedirect('https://checkout.stripe.test/session');
+});
+
+test('the plan step sends the banner only for an offer that shows one', function () {
+    app('translator')->addLines([
+        'offers.black_friday_2026.name' => 'Black Friday',
+        'offers.black_friday_2026.headline' => '50% off your first 3 months',
+    ], 'en');
+    completeWelcomeThroughSoftware($this->user);
+    $this->user->account->offers()->attach(Offer::factory()->create(['slug' => 'black-friday-2026']), ['claimed_at' => now()]);
+
+    $this->actingAs($this->user->fresh())
+        ->get(route('app.welcome.plan'))
+        ->assertInertia(fn ($page) => $page->where('offer.has_banner', false));
+});
+
+test('the plan step sends the offer copy only when it exists in the user\'s language', function (string $locale, bool $hasCopy) {
+    app('translator')->addLines([
+        'offers.black_friday_2026.name' => 'Black Friday',
+        'offers.black_friday_2026.headline' => '50% off your first 3 months',
+        'offers.black_friday_2026.price' => '$9.50',
+        'offers.black_friday_2026.unit' => '/month',
+        'offers.black_friday_2026.period' => 'for your first 3 months',
+    ], 'en');
+    completeWelcomeThroughSoftware($this->user);
+    $this->user->update(['locale' => $locale]);
+    $this->user->account->offers()->attach(Offer::factory()->withBanner()->create(['slug' => 'black-friday-2026']), ['claimed_at' => now()]);
+
+    $this->actingAs($this->user->fresh())
+        ->get(route('app.welcome.plan'))
+        ->assertInertia(fn ($page) => $page
+            ->where('offer.has_banner', $hasCopy)
+            ->where('offer.has_price', $hasCopy)
+            ->where('offer.has_unit', $hasCopy)
+        );
+})->with([
+    'english copy for an english user' => ['en', true],
+    'english copy only for a portuguese user' => ['pt-BR', false],
+]);
diff --git a/tests/Pest.php b/tests/Pest.php
index 6f95121eac..68f3bd5381 100644
--- a/tests/Pest.php
+++ b/tests/Pest.php
@@ -22,6 +22,8 @@
 use Illuminate\Support\Facades\Queue;
 use Illuminate\Support\Str;
 use Illuminate\Testing\TestResponse;
+use Stripe\ApiRequestor;
+use Stripe\HttpClient\ClientInterface;
 use Tests\BrowserTestCase;
 use Tests\TestCase;
 
@@ -350,6 +352,107 @@ function subscribeAccount(Account $account): void
     ]);
 }
 
+/**
+ * Answers Stripe from memory for an account billed as `cus_fake` on
+ * `sub_fake`: the subscription with an optional coupon, the customer with an
+ * optional card, and no invoices. Reset with ApiRequestor::setHttpClient(null).
+ *
+ * @param  array<string, mixed>|null  $coupon
+ */
+function fakeStripeBilling(Account $account, ?array $coupon = null, ?int $discountEndsAt = null, ?string $cardBrand = null, int $paidInvoices = 0, ?string $secondCardBrand = null, bool $customerHasDefault = true): void
+{
+    config(['cashier.secret' => 'sk_test_fake']);
+    $account->forceFill(['stripe_id' => 'cus_fake'])->save();
+    $account->subscriptions()->create([
+        'type' => Account::SUBSCRIPTION_NAME,
+        'stripe_id' => 'sub_fake',
+        'stripe_status' => 'active',
+        'stripe_price' => 'price_123',
+    ]);
+
+    ApiRequestor::setHttpClient(new class($coupon, $discountEndsAt, $cardBrand, $paidInvoices, $secondCardBrand, $customerHasDefault) implements ClientInterface
+    {
+        public function __construct(private ?array $coupon, private ?int $discountEndsAt, private ?string $cardBrand, private int $paidInvoices, private ?string $secondCardBrand, private bool $customerHasDefault) {}
+
+        public function request($method, $absUrl, $headers, $params, $hasFile, $apiMode = 'v1', $maxNetworkRetries = null): array
+        {
+            $card = blank($this->cardBrand) ? null : [
+                'id' => 'pm_fake',
+                'object' => 'payment_method',
+                'customer' => 'cus_fake',
+                'type' => 'card',
+                'card' => ['brand' => $this->cardBrand, 'last4' => '4242', 'exp_month' => 4, 'exp_year' => 2044],
+            ];
+            $secondCard = blank($this->secondCardBrand) ? null : [
+                'id' => 'pm_fake_second',
+                'object' => 'payment_method',
+                'customer' => 'cus_fake',
+                'type' => 'card',
+                'card' => ['brand' => $this->secondCardBrand, 'last4' => '5454', 'exp_month' => 5, 'exp_year' => 2055],
+            ];
+
+            $body = match (true) {
+                str_contains($absUrl, '/v1/subscriptions/') => [
+                    'id' => 'sub_fake',
+                    'object' => 'subscription',
+                    'discounts' => blank($this->coupon) ? [] : [[
+                        'id' => 'di_fake',
+                        'object' => 'discount',
+                        'coupon' => ['object' => 'coupon', 'id' => 'FAKE', ...$this->coupon],
+                        'start' => now()->subDay()->timestamp,
+                        'end' => $this->discountEndsAt,
+                    ]],
+                ],
+                str_contains($absUrl, '/v1/customers/cus_fake/payment_methods'), str_contains($absUrl, '/v1/payment_methods') => ['object' => 'list', 'data' => array_values(array_filter([$secondCard, $card])), 'has_more' => false, 'url' => '/v1/payment_methods'],
+                str_contains($absUrl, '/v1/customers/') => [
+                    'id' => 'cus_fake',
+                    'object' => 'customer',
+                    'invoice_settings' => ['default_payment_method' => $this->customerHasDefault ? $card : null],
+                ],
+                str_contains($absUrl, '/v1/invoices') => $this->invoices($params),
+                default => ['object' => 'list', 'data' => [], 'has_more' => false, 'url' => '/v1/invoices'],
+            };
+
+            return [json_encode($body), 200, []];
+        }
+
+        /**
+         * The paid invoices, newest first, paged the way Stripe pages them:
+         * `limit` and `starting_after`, and only when `status` is `paid`.
+         *
+         * @param  array<string, mixed>  $params
+         * @return array<string, mixed>
+         */
+        private function invoices(array $params): array
+        {
+            $invoices = collect($this->paidInvoices > 0 ? range($this->paidInvoices, 1) : [])
+                ->filter(fn (): bool => data_get($params, 'status') === 'paid')
+                ->map(fn (int $number): array => [
+                    'id' => sprintf('in_fake_%03d', $number),
+                    'object' => 'invoice',
+                    'customer' => 'cus_fake',
+                    'status' => 'paid',
+                    'currency' => 'usd',
+                    'total' => 1900,
+                    'created' => now()->subMonths($this->paidInvoices - $number)->timestamp,
+                    'invoice_pdf' => "https://pay.stripe.com/invoice/in_fake_{$number}/pdf",
+                ])
+                ->values();
+
+            $after = data_get($params, 'starting_after');
+            $start = blank($after) ? 0 : $invoices->search(fn (array $invoice): bool => $invoice['id'] === $after) + 1;
+            $limit = (int) data_get($params, 'limit', 10);
+
+            return [
+                'object' => 'list',
+                'data' => $invoices->slice($start, $limit)->values()->all(),
+                'has_more' => $invoices->count() > $start + $limit,
+                'url' => '/v1/invoices',
+            ];
+        }
+    });
+}
+
 /**
  * Turns PostHog on for the test, as on an install with an API key.
  */
diff --git a/tests/Unit/Actions/Billing/StartSubscriptionCheckoutTest.php b/tests/Unit/Actions/Billing/StartSubscriptionCheckoutTest.php
index 935aa25b5c..f547112e90 100644
--- a/tests/Unit/Actions/Billing/StartSubscriptionCheckoutTest.php
+++ b/tests/Unit/Actions/Billing/StartSubscriptionCheckoutTest.php
@@ -8,6 +8,7 @@
 use App\Enums\User\PreviousSoftware;
 use App\Enums\User\ReferralSource;
 use App\Models\Account;
+use App\Models\Offer;
 use App\Models\Plan;
 use App\Models\User;
 use App\Models\Workspace;
@@ -57,15 +58,6 @@ function checkoutCustomerBuilder(): SubscriptionBuilder
 });
 
 test('redirect keeps the attribution metadata on the stripe customer, not on the subscription', function () {
-    config([
-        'trypost.billing.require_card_for_trial' => true,
-        'cashier.trial_days' => 8,
-        'cashier.first_month_coupon_ids' => [
-            'socials' => '',
-            'workspaces' => '',
-        ],
-        'cashier.allow_promotion_codes' => false,
-    ]);
 
     $account = Account::factory()->create();
     Workspace::factory()->create(['account_id' => $account->id]);
@@ -93,7 +85,7 @@ function checkoutCustomerBuilder(): SubscriptionBuilder
 
     $builder = Mockery::mock(SubscriptionBuilder::class);
     $builder->shouldReceive('withMetadata')->once()->with([])->andReturnSelf();
-    $builder->shouldReceive('trialDays')->once()->with(8)->andReturnSelf();
+    $builder->shouldReceive('trialDays')->never();
     $builder->shouldReceive('withCoupon')->never();
     $builder->shouldReceive('allowPromotionCodes')->never();
     $builder->shouldReceive('checkout')
@@ -103,7 +95,6 @@ function checkoutCustomerBuilder(): SubscriptionBuilder
             'cancel_url' => $cancelUrl,
             'metadata' => [
                 'trypost_interval' => 'monthly',
-                'trypost_first_month_offer' => 'false',
             ],
         ])
         ->andReturn((object) ['url' => 'https://checkout.stripe.test/session']);
@@ -145,15 +136,6 @@ function checkoutCustomerBuilder(): SubscriptionBuilder
 });
 
 test('redirect sends no metadata for an account whose owner left every field empty', function () {
-    config([
-        'trypost.billing.require_card_for_trial' => true,
-        'cashier.trial_days' => 8,
-        'cashier.first_month_coupon_ids' => [
-            'socials' => '',
-            'workspaces' => '',
-        ],
-        'cashier.allow_promotion_codes' => false,
-    ]);
 
     $account = Account::factory()->create();
     Workspace::factory()->create(['account_id' => $account->id]);
@@ -164,7 +146,7 @@ function checkoutCustomerBuilder(): SubscriptionBuilder
 
     $builder = Mockery::mock(SubscriptionBuilder::class);
     $builder->shouldReceive('withMetadata')->once()->with([])->andReturnSelf();
-    $builder->shouldReceive('trialDays')->once()->andReturnSelf();
+    $builder->shouldReceive('trialDays')->never();
     $builder->shouldReceive('checkout')
         ->once()
         ->andReturn((object) ['url' => 'https://checkout.stripe.test/session']);
@@ -180,15 +162,6 @@ function checkoutCustomerBuilder(): SubscriptionBuilder
 });
 
 test('redirect cuts an oversized click id to the stripe metadata limit', function () {
-    config([
-        'trypost.billing.require_card_for_trial' => true,
-        'cashier.trial_days' => 8,
-        'cashier.first_month_coupon_ids' => [
-            'socials' => '',
-            'workspaces' => '',
-        ],
-        'cashier.allow_promotion_codes' => false,
-    ]);
 
     $account = Account::factory()->create();
     Workspace::factory()->create(['account_id' => $account->id]);
@@ -209,107 +182,7 @@ function checkoutCustomerBuilder(): SubscriptionBuilder
     app(StartSubscriptionCheckout::class)->redirect($accountMock, 'price_monthly_test', route('app.welcome'));
 });
 
-test('redirect applies the plan first-month coupon on a monthly price', function () {
-    config([
-        'trypost.billing.require_card_for_trial' => true,
-        'cashier.trial_days' => 8,
-        'cashier.first_month_coupon_ids.socials' => 'SOCIALS_18USD',
-        'cashier.allow_promotion_codes' => false,
-    ]);
-
-    $plan = Plan::where('slug', Slug::Socials)->firstOrFail();
-    $plan->update(['stripe_monthly_price_id' => 'price_socials_monthly']);
-
-    $account = Account::factory()->create();
-    Workspace::factory()->create(['account_id' => $account->id]);
-    User::factory()->create(['account_id' => $account->id, 'referral_source' => null]);
-    $account->refresh();
-
-    $builder = Mockery::mock(SubscriptionBuilder::class);
-    $builder->shouldReceive('withCoupon')
-        ->once()
-        ->with('SOCIALS_18USD')
-        ->ordered()
-        ->andReturnUsing(function () use ($builder): SubscriptionBuilder {
-            $builder->couponId = 'SOCIALS_18USD';
-
-            return $builder;
-        });
-    $builder->shouldReceive('withMetadata')
-        ->once()
-        ->with(['trypost_first_month_coupon_id' => 'SOCIALS_18USD'])
-        ->ordered()
-        ->andReturnSelf();
-    $builder->shouldReceive('trialDays')->never();
-    $builder->shouldReceive('checkout')
-        ->once()
-        ->andReturn((object) ['url' => 'https://checkout.stripe.test/session']);
-
-    /** @var Account&MockInterface $accountMock */
-    $accountMock = Mockery::mock($account)->makePartial();
-    $accountMock->shouldReceive('syncOrCreateStripeCustomer')->once()->andReturnNull();
-    $accountMock->shouldReceive('newSubscription')->once()->andReturn($builder);
-
-    app(StartSubscriptionCheckout::class)->redirect(
-        $accountMock,
-        'price_socials_monthly',
-        route('app.welcome.software'),
-        $plan,
-    );
-});
-
-test('checkout session carries plan, interval and first month offer metadata', function () {
-    config([
-        'trypost.billing.require_card_for_trial' => true,
-        'cashier.trial_days' => 8,
-        'cashier.first_month_coupon_ids.socials' => 'SOCIALS_18USD',
-        'cashier.allow_promotion_codes' => false,
-    ]);
-
-    $plan = Plan::where('slug', Slug::Socials)->firstOrFail();
-    $plan->update(['stripe_monthly_price_id' => 'price_socials_monthly']);
-
-    $account = Account::factory()->create();
-    Workspace::factory()->create(['account_id' => $account->id]);
-    User::factory()->create(['account_id' => $account->id, 'referral_source' => null]);
-    $account->refresh();
-
-    $builder = Mockery::mock(SubscriptionBuilder::class);
-    $builder->shouldReceive('withCoupon')->once()->andReturnUsing(function () use ($builder): SubscriptionBuilder {
-        $builder->couponId = 'SOCIALS_18USD';
-
-        return $builder;
-    });
-    $builder->shouldReceive('withMetadata')->once()->andReturnSelf();
-    $builder->shouldReceive('checkout')
-        ->once()
-        ->withArgs(fn (array $options): bool => data_get($options, 'metadata') === [
-            'trypost_plan_slug' => 'socials',
-            'trypost_interval' => 'monthly',
-            'trypost_first_month_offer' => 'true',
-        ])
-        ->andReturn((object) ['url' => 'https://checkout.stripe.test/session']);
-
-    /** @var Account&MockInterface $accountMock */
-    $accountMock = Mockery::mock($account)->makePartial();
-    $accountMock->shouldReceive('syncOrCreateStripeCustomer')->once()->andReturnNull();
-    $accountMock->shouldReceive('newSubscription')->once()->andReturn($builder);
-
-    app(StartSubscriptionCheckout::class)->redirect(
-        $accountMock,
-        'price_socials_monthly',
-        route('app.welcome.plan'),
-        $plan,
-    );
-});
-
-test('checkout session marks a yearly price without the first month offer', function () {
-    config([
-        'trypost.billing.require_card_for_trial' => true,
-        'cashier.trial_days' => 8,
-        'cashier.first_month_coupon_ids.workspaces' => 'WORKSPACES_88USD',
-        'cashier.allow_promotion_codes' => false,
-    ]);
+test('checkout session carries the plan and interval of a yearly price', function () {
 
     $plan = Plan::where('slug', Slug::Workspaces)->firstOrFail();
     $plan->update([
@@ -324,13 +197,12 @@ function checkoutCustomerBuilder(): SubscriptionBuilder
 
     $builder = Mockery::mock(SubscriptionBuilder::class);
     $builder->shouldReceive('withMetadata')->once()->andReturnSelf();
-    $builder->shouldReceive('trialDays')->once()->andReturnSelf();
+    $builder->shouldReceive('trialDays')->never();
     $builder->shouldReceive('checkout')
         ->once()
         ->withArgs(fn (array $options): bool => data_get($options, 'metadata') === [
             'trypost_plan_slug' => 'workspaces',
             'trypost_interval' => 'yearly',
-            'trypost_first_month_offer' => 'false',
         ])
         ->andReturn((object) ['url' => 'https://checkout.stripe.test/session']);
 
@@ -347,56 +219,7 @@ function checkoutCustomerBuilder(): SubscriptionBuilder
     );
 });
 
-test('redirect skips the first-month coupon on a yearly price', function () {
-    config([
-        'trypost.billing.require_card_for_trial' => true,
-        'cashier.trial_days' => 8,
-        'cashier.first_month_coupon_ids.workspaces' => 'WORKSPACES_88USD',
-        'cashier.allow_promotion_codes' => false,
-    ]);
-
-    $plan = Plan::where('slug', Slug::Workspaces)->firstOrFail();
-    $plan->update([
-        'stripe_monthly_price_id' => 'price_workspaces_monthly',
-        'stripe_yearly_price_id' => 'price_workspaces_yearly',
-    ]);
-
-    $account = Account::factory()->create();
-    Workspace::factory()->create(['account_id' => $account->id]);
-    User::factory()->create(['account_id' => $account->id, 'referral_source' => null]);
-    $account->refresh();
-
-    $builder = Mockery::mock(SubscriptionBuilder::class);
-    $builder->shouldReceive('withMetadata')->once()->with([])->andReturnSelf();
-    $builder->shouldReceive('withCoupon')->never();
-    $builder->shouldReceive('trialDays')->once()->with(8)->andReturnSelf();
-    $builder->shouldReceive('checkout')
-        ->once()
-        ->andReturn((object) ['url' => 'https://checkout.stripe.test/session']);
-
-    /** @var Account&MockInterface $accountMock */
-    $accountMock = Mockery::mock($account)->makePartial();
-    $accountMock->shouldReceive('syncOrCreateStripeCustomer')->once()->andReturnNull();
-    $accountMock->shouldReceive('newSubscription')->once()->andReturn($builder);
-
-    app(StartSubscriptionCheckout::class)->redirect(
-        $accountMock,
-        'price_workspaces_yearly',
-        route('app.welcome.software'),
-        $plan,
-    );
-});
-
 test('redirect clears a leftover plan_id before opening checkout', function () {
-    config([
-        'trypost.billing.require_card_for_trial' => true,
-        'cashier.trial_days' => 8,
-        'cashier.first_month_coupon_ids' => [
-            'socials' => '',
-            'workspaces' => '',
-        ],
-        'cashier.allow_promotion_codes' => false,
-    ]);
 
     $workspaces = Plan::where('slug', Slug::Workspaces)->firstOrFail();
     $account = Account::factory()->create(['plan_id' => $workspaces->id]);
@@ -406,7 +229,7 @@ function checkoutCustomerBuilder(): SubscriptionBuilder
 
     $builder = Mockery::mock(SubscriptionBuilder::class);
     $builder->shouldReceive('withMetadata')->once()->andReturnSelf();
-    $builder->shouldReceive('trialDays')->once()->andReturnSelf();
+    $builder->shouldReceive('trialDays')->never();
     $builder->shouldReceive('checkout')
         ->once()
         ->andReturn((object) ['url' => 'https://checkout.stripe.test/session']);
@@ -424,10 +247,6 @@ function checkoutCustomerBuilder(): SubscriptionBuilder
 test('redirect creates a new stripe customer with the owner email, the owner name and the metadata', function () {
     config([
         'cashier.secret' => 'sk_test_fake',
-        'trypost.billing.require_card_for_trial' => true,
-        'cashier.trial_days' => 8,
-        'cashier.first_month_coupon_ids' => ['socials' => '', 'workspaces' => ''],
-        'cashier.allow_promotion_codes' => false,
     ]);
     $client = fakeStripeCustomerClient();
 
@@ -463,10 +282,6 @@ function checkoutCustomerBuilder(): SubscriptionBuilder
 test('redirect updates an existing stripe customer with the current details and metadata', function () {
     config([
         'cashier.secret' => 'sk_test_fake',
-        'trypost.billing.require_card_for_trial' => true,
-        'cashier.trial_days' => 8,
-        'cashier.first_month_coupon_ids' => ['socials' => '', 'workspaces' => ''],
-        'cashier.allow_promotion_codes' => false,
     ]);
     $client = fakeStripeCustomerClient();
 
@@ -497,3 +312,141 @@ function checkoutCustomerBuilder(): SubscriptionBuilder
         ->and($client->requests[0]['params']['metadata'])->toMatchArray(['persona' => 'agency', 'referral_source' => ''])
         ->and($account->fresh()->stripe_id)->toBe('cus_existing');
 });
+
+test('stores the offer id and slug in subscription and checkout metadata', function () {
+
+    $plan = Plan::where('slug', Slug::Socials)->firstOrFail();
+    $plan->update(['stripe_monthly_price_id' => 'price_socials_monthly']);
+
+    $account = Account::factory()->create();
+    Workspace::factory()->create(['account_id' => $account->id]);
+    User::factory()->create(['account_id' => $account->id, 'referral_source' => null]);
+    $offer = Offer::factory()->create(['stripe_coupon_id' => 'BLACK_FRIDAY_50']);
+    $account->offers()->attach($offer, ['claimed_at' => now()]);
+    $account->refresh();
+
+    $builder = Mockery::mock(SubscriptionBuilder::class);
+    $builder->shouldReceive('withCoupon')->once()->with('BLACK_FRIDAY_50')->andReturnUsing(function () use ($builder): SubscriptionBuilder {
+        $builder->couponId = 'BLACK_FRIDAY_50';
+
+        return $builder;
+    });
+    $builder->shouldReceive('withMetadata')
+        ->once()
+        ->with(['trypost_offer_id' => $offer->id, 'trypost_offer_slug' => $offer->slug])
+        ->andReturnSelf();
+    $builder->shouldReceive('checkout')
+        ->once()
+        ->withArgs(fn (array $options): bool => data_get($options, 'metadata.trypost_offer_slug') === $offer->slug)
+        ->andReturn((object) ['url' => 'https://checkout.stripe.test/session']);
+
+    /** @var Account&MockInterface $accountMock */
+    $accountMock = Mockery::mock($account)->makePartial();
+    $accountMock->shouldReceive('syncOrCreateStripeCustomer')->once()->andReturnNull();
+    $accountMock->shouldReceive('newSubscription')->once()->andReturn($builder);
+
+    app(StartSubscriptionCheckout::class)->redirect(
+        $accountMock,
+        'price_socials_monthly',
+        route('app.welcome.plan'),
+        $plan,
+        $offer,
+    );
+});
+
+test('redirect uses the offer it is given and never looks one up', function () {
+
+    $plan = Plan::where('slug', Slug::Socials)->firstOrFail();
+    $plan->update(['stripe_monthly_price_id' => 'price_socials_monthly']);
+
+    $account = Account::factory()->create();
+    Workspace::factory()->create(['account_id' => $account->id]);
+    User::factory()->create(['account_id' => $account->id, 'referral_source' => null]);
+    $offer = Offer::factory()->create(['stripe_coupon_id' => 'BLACK_FRIDAY_50']);
+    $account->refresh();
+
+    $builder = Mockery::mock(SubscriptionBuilder::class);
+    $builder->shouldReceive('withCoupon')->once()->with('BLACK_FRIDAY_50')->andReturnUsing(function () use ($builder): SubscriptionBuilder {
+        $builder->couponId = 'BLACK_FRIDAY_50';
+
+        return $builder;
+    });
+    $builder->shouldReceive('withMetadata')
+        ->once()
+        ->with(['trypost_offer_id' => $offer->id, 'trypost_offer_slug' => $offer->slug])
+        ->andReturnSelf();
+    $builder->shouldReceive('checkout')->once()->andReturn((object) ['url' => 'https://checkout.stripe.test/session']);
+
+    /** @var Account&MockInterface $accountMock */
+    $accountMock = Mockery::mock($account)->makePartial();
+    $accountMock->shouldReceive('syncOrCreateStripeCustomer')->once()->andReturnNull();
+    $accountMock->shouldReceive('newSubscription')->once()->andReturn($builder);
+    $accountMock->shouldReceive('currentOffer')->never();
+
+    app(StartSubscriptionCheckout::class)->redirect(
+        $accountMock,
+        'price_socials_monthly',
+        route('app.welcome.plan'),
+        $plan,
+        $offer,
+    );
+});
+
+test('redirect skips the offer on a yearly price', function () {
+
+    $plan = Plan::where('slug', Slug::Socials)->firstOrFail();
+    $plan->update([
+        'stripe_monthly_price_id' => 'price_socials_monthly',
+        'stripe_yearly_price_id' => 'price_socials_yearly',
+    ]);
+
+    $account = Account::factory()->create();
+    Workspace::factory()->create(['account_id' => $account->id]);
+    User::factory()->create(['account_id' => $account->id, 'referral_source' => null]);
+    $account->refresh();
+
+    $builder = Mockery::mock(SubscriptionBuilder::class);
+    $builder->shouldReceive('withMetadata')->once()->with([])->andReturnSelf();
+    $builder->shouldReceive('withCoupon')->never();
+    $builder->shouldReceive('trialDays')->never();
+    $builder->shouldReceive('checkout')->once()->andReturn((object) ['url' => 'https://checkout.stripe.test/session']);
+
+    /** @var Account&MockInterface $accountMock */
+    $accountMock = Mockery::mock($account)->makePartial();
+    $accountMock->shouldReceive('syncOrCreateStripeCustomer')->once()->andReturnNull();
+    $accountMock->shouldReceive('newSubscription')->once()->andReturn($builder);
+
+    app(StartSubscriptionCheckout::class)->redirect(
+        $accountMock,
+        'price_socials_yearly',
+        route('app.welcome.plan'),
+        $plan,
+        Offer::factory()->create(),
+    );
+});
+
+test('redirect gives the trial of the offer it is given', function () {
+    $plan = Plan::where('slug', Slug::Socials)->firstOrFail();
+    $plan->update(['stripe_monthly_price_id' => 'price_socials_monthly']);
+
+    $account = Account::factory()->create();
+    User::factory()->create(['account_id' => $account->id, 'referral_source' => null]);
+    $offer = Offer::factory()->trial(7)->create(['slug' => 'free-trial-7-days']);
+    $account->refresh();
+
+    $builder = Mockery::mock(SubscriptionBuilder::class);
+    $builder->shouldReceive('trialDays')->once()->with(7)->andReturnSelf();
+    $builder->shouldReceive('withCoupon')->never();
+    $builder->shouldReceive('withMetadata')
+        ->once()
+        ->with(['trypost_offer_id' => $offer->id, 'trypost_offer_slug' => 'free-trial-7-days'])
+        ->andReturnSelf();
+    $builder->shouldReceive('checkout')->once()->andReturn((object) ['url' => 'https://checkout.stripe.test/session']);
+
+    /** @var Account&MockInterface $accountMock */
+    $accountMock = Mockery::mock($account)->makePartial();
+    $accountMock->shouldReceive('syncOrCreateStripeCustomer')->once()->andReturnNull();
+    $accountMock->shouldReceive('newSubscription')->once()->andReturn($builder);
+
+    app(StartSubscriptionCheckout::class)->redirect($accountMock, 'price_socials_monthly', route('app.welcome.plan'), $plan, $offer);
+});
diff --git a/tests/Unit/Support/Billing/ConfigureSubscriptionCheckoutTest.php b/tests/Unit/Support/Billing/ConfigureSubscriptionCheckoutTest.php
index c466e00aa2..8241649070 100644
--- a/tests/Unit/Support/Billing/ConfigureSubscriptionCheckoutTest.php
+++ b/tests/Unit/Support/Billing/ConfigureSubscriptionCheckoutTest.php
@@ -4,8 +4,8 @@
 
 use App\Enums\Plan\Slug;
 use App\Models\Account;
+use App\Models\Offer;
 use App\Models\Plan;
-use App\Models\Workspace;
 use App\Support\Billing\ConfigureSubscriptionCheckout;
 use Carbon\Carbon;
 use Illuminate\Foundation\Testing\RefreshDatabase;
@@ -15,23 +15,8 @@
 
 beforeEach(function () {
     $this->account = Account::factory()->create();
-
-    config([
-        'trypost.billing.require_card_for_trial' => true,
-        'cashier.trial_days' => 8,
-        'cashier.first_month_coupon_ids' => [
-            'socials' => '',
-            'workspaces' => '',
-        ],
-        'cashier.allow_promotion_codes' => false,
-    ]);
 });
 
-function checkoutSubscription(Account $account): SubscriptionBuilder
-{
-    return $account->newSubscription(Account::SUBSCRIPTION_NAME, 'price_monthly_test');
-}
-
 function givePriorSubscription(Account $account, string $status = 'canceled'): void
 {
     $account->subscriptions()->create([
@@ -40,6 +25,7 @@ function givePriorSubscription(Account $account, string $status = 'canceled'): v
         'stripe_status' => $status,
         'stripe_price' => 'price_monthly_test',
     ]);
+    $account->unsetRelation('subscriptions');
 }
 
 function trialExpiresAt(SubscriptionBuilder $subscription): ?Carbon
@@ -54,298 +40,120 @@ function socialsPlan(): Plan
     return Plan::where('slug', Slug::Socials)->firstOrFail();
 }
 
-function workspacesPlan(): Plan
+function claimOfferFor(Account $account, Offer $offer): Offer
 {
-    return Plan::where('slug', Slug::Workspaces)->firstOrFail();
-}
-
-test('recipe A applies an eight-day trial without coupon or promotion codes', function () {
-    Workspace::factory()->create(['account_id' => $this->account->id]);
-
-    Carbon::setTestNow('2026-08-07 12:00:00');
-
-    $subscription = checkoutSubscription($this->account);
-
-    ConfigureSubscriptionCheckout::apply($subscription, $this->account, socialsPlan());
-
-    expect($subscription->couponId)->toBeNull()
-        ->and($subscription->allowPromotionCodes)->toBeFalse()
-        ->and(trialExpiresAt($subscription)?->toDateTimeString())->toBe('2026-08-15 12:00:00');
-});
-
-test('recipe B applies the socials first-month coupon and skips trial days', function () {
-    config([
-        'cashier.first_month_coupon_ids.socials' => 'SOCIALS_18USD',
-        'cashier.allow_promotion_codes' => false,
-        'cashier.trial_days' => 8,
-    ]);
-    Workspace::factory()->create(['account_id' => $this->account->id]);
-
-    $subscription = checkoutSubscription($this->account);
-
-    ConfigureSubscriptionCheckout::apply($subscription, $this->account, socialsPlan());
-
-    expect($subscription->couponId)->toBe('SOCIALS_18USD')
-        ->and($subscription->allowPromotionCodes)->toBeFalse()
-        ->and(trialExpiresAt($subscription))->toBeNull();
-});
-
-test('applies the workspaces first-month coupon for that plan', function () {
-    config([
-        'cashier.first_month_coupon_ids.socials' => 'SOCIALS_18USD',
-        'cashier.first_month_coupon_ids.workspaces' => 'WORKSPACES_88USD',
-    ]);
-    Workspace::factory()->create(['account_id' => $this->account->id]);
-
-    $subscription = checkoutSubscription($this->account);
+    $account->offers()->attach($offer, ['claimed_at' => now()]);
 
-    ConfigureSubscriptionCheckout::apply($subscription, $this->account, workspacesPlan());
-
-    expect($subscription->couponId)->toBe('WORKSPACES_88USD')
-        ->and(trialExpiresAt($subscription))->toBeNull();
-});
+    return $offer;
+}
 
-test('does not apply the other plan\'s first-month coupon', function () {
-    config([
-        'cashier.first_month_coupon_ids.workspaces' => 'WORKSPACES_88USD',
-    ]);
-    Workspace::factory()->create(['account_id' => $this->account->id]);
+function configureCheckout(Account $account): SubscriptionBuilder
+{
+    $subscription = $account->newSubscription(Account::SUBSCRIPTION_NAME, 'price_monthly_test');
 
-    Carbon::setTestNow('2026-08-07 12:00:00');
+    ConfigureSubscriptionCheckout::apply($subscription, ConfigureSubscriptionCheckout::offerFor($account, socialsPlan()));
 
-    $subscription = checkoutSubscription($this->account);
+    return $subscription;
+}
 
-    ConfigureSubscriptionCheckout::apply($subscription, $this->account, socialsPlan());
+test('without an offer the checkout charges the full price at once', function () {
+    $subscription = configureCheckout($this->account);
 
     expect($subscription->couponId)->toBeNull()
-        ->and(trialExpiresAt($subscription)?->toDateTimeString())->toBe('2026-08-15 12:00:00');
+        ->and(trialExpiresAt($subscription))->toBeNull()
+        ->and($subscription->allowPromotionCodes)->toBeFalse();
 });
 
-test('does not apply a first-month coupon when no plan is given', function () {
-    config([
-        'cashier.first_month_coupon_ids.socials' => 'SOCIALS_18USD',
-        'cashier.first_month_coupon_ids.workspaces' => 'WORKSPACES_88USD',
-    ]);
-    Workspace::factory()->create(['account_id' => $this->account->id]);
-
-    Carbon::setTestNow('2026-08-07 12:00:00');
+test('an offer that allows promotion codes shows the field', function () {
+    claimOfferFor($this->account, Offer::factory()->trial(8)->allowingPromotionCodes()->create());
 
-    $subscription = checkoutSubscription($this->account);
-
-    ConfigureSubscriptionCheckout::apply($subscription, $this->account);
-
-    expect($subscription->couponId)->toBeNull()
-        ->and(trialExpiresAt($subscription)?->toDateTimeString())->toBe('2026-08-15 12:00:00');
+    expect(configureCheckout($this->account)->allowPromotionCodes)->toBeTrue();
 });
 
-test('recipe C applies trial days and allows promotion codes', function () {
-    config(['cashier.allow_promotion_codes' => true]);
-    Workspace::factory()->create(['account_id' => $this->account->id]);
-
+test('a trial offer gives a first-time subscriber its trial', function () {
     Carbon::setTestNow('2026-08-07 12:00:00');
+    claimOfferFor($this->account, Offer::factory()->trial(8)->firstSubscriptionOnly()->create());
 
-    $subscription = checkoutSubscription($this->account);
-
-    ConfigureSubscriptionCheckout::apply($subscription, $this->account, socialsPlan());
+    $subscription = configureCheckout($this->account);
 
     expect($subscription->couponId)->toBeNull()
-        ->and($subscription->allowPromotionCodes)->toBeTrue()
         ->and(trialExpiresAt($subscription)?->toDateTimeString())->toBe('2026-08-15 12:00:00');
 });
 
-test('recipe D charges immediately with promotion codes and no trial', function () {
-    config([
-        'cashier.trial_days' => 0,
-        'cashier.allow_promotion_codes' => true,
-    ]);
-    Workspace::factory()->create(['account_id' => $this->account->id]);
-
-    $subscription = checkoutSubscription($this->account);
-
-    ConfigureSubscriptionCheckout::apply($subscription, $this->account, socialsPlan());
-
-    expect(trialExpiresAt($subscription))->toBeNull()
-        ->and($subscription->couponId)->toBeNull()
-        ->and($subscription->allowPromotionCodes)->toBeTrue();
-});
-
-test('throws when a qualifying coupon would combine with allow promotion codes', function () {
-    config([
-        'cashier.first_month_coupon_ids.socials' => 'SOCIALS_18USD',
-        'cashier.allow_promotion_codes' => true,
-    ]);
-    Workspace::factory()->create(['account_id' => $this->account->id]);
-
-    $subscription = checkoutSubscription($this->account);
-
-    expect(fn () => ConfigureSubscriptionCheckout::apply($subscription, $this->account, socialsPlan()))
-        ->toThrow(RuntimeException::class, 'Cannot apply a first-month coupon while CASHIER_ALLOW_PROMOTION_CODES is enabled');
-
-    expect($subscription->couponId)->toBeNull()
-        ->and(trialExpiresAt($subscription))->toBeNull();
-});
-
-test('throws when coupon and promo are both set even if the account has several workspaces', function () {
-    config([
-        'cashier.first_month_coupon_ids.socials' => 'SOCIALS_18USD',
-        'cashier.allow_promotion_codes' => true,
-    ]);
-    Workspace::factory()->count(2)->create(['account_id' => $this->account->id]);
-
-    $subscription = checkoutSubscription($this->account);
-
-    expect(fn () => ConfigureSubscriptionCheckout::apply($subscription, $this->account, socialsPlan()))
-        ->toThrow(RuntimeException::class, 'Cannot apply a first-month coupon while CASHIER_ALLOW_PROMOTION_CODES is enabled');
-});
-
-test('does not throw when coupon and promo are both set but a prior canceled subscription skips the coupon', function () {
-    config([
-        'cashier.first_month_coupon_ids.socials' => 'SOCIALS_18USD',
-        'cashier.allow_promotion_codes' => true,
-    ]);
-    Workspace::factory()->create(['account_id' => $this->account->id]);
+test('a former customer gets no first-subscription trial', function () {
+    claimOfferFor($this->account, Offer::factory()->trial(8)->firstSubscriptionOnly()->create());
     givePriorSubscription($this->account);
 
-    $subscription = checkoutSubscription($this->account);
-
-    expect(fn () => ConfigureSubscriptionCheckout::apply($subscription, $this->account, socialsPlan()))
-        ->not->toThrow(RuntimeException::class);
-
-    expect($subscription->couponId)->toBeNull()
-        ->and($subscription->allowPromotionCodes)->toBeTrue()
-        ->and(trialExpiresAt($subscription))->toBeNull();
+    expect(trialExpiresAt(configureCheckout($this->account)))->toBeNull();
 });
 
-test('missing coupon with card required does not throw and still applies trial', function (?string $couponId) {
-    config([
-        'cashier.first_month_coupon_ids.socials' => $couponId,
-        'cashier.allow_promotion_codes' => false,
-    ]);
-    Workspace::factory()->create(['account_id' => $this->account->id]);
+test('a checkout that never became billable still counts as first-time', function (string $status) {
+    claimOfferFor($this->account, Offer::factory()->trial(8)->firstSubscriptionOnly()->create());
+    givePriorSubscription($this->account, $status);
 
-    Carbon::setTestNow('2026-08-07 12:00:00');
+    expect(trialExpiresAt(configureCheckout($this->account)))->not->toBeNull();
+})->with(['incomplete', 'incomplete_expired']);
 
-    $subscription = checkoutSubscription($this->account);
+test('a trial offer keeps the promotion code field, which Stripe accepts with a trial', function () {
+    claimOfferFor($this->account, Offer::factory()->trial(8)->allowingPromotionCodes()->create());
 
-    ConfigureSubscriptionCheckout::apply($subscription, $this->account, socialsPlan());
-
-    expect($subscription->couponId)->toBeNull()
-        ->and(trialExpiresAt($subscription)?->toDateTimeString())->toBe('2026-08-15 12:00:00');
-})->with([
-    'environment variable is unset' => null,
-    'environment variable is empty' => '',
-]);
-
-test('skips the coupon and allows promotion codes when a card is not required', function () {
-    config([
-        'trypost.billing.require_card_for_trial' => false,
-        'cashier.first_month_coupon_ids.socials' => 'SOCIALS_18USD',
-        'cashier.allow_promotion_codes' => true,
-    ]);
-    Workspace::factory()->create(['account_id' => $this->account->id]);
-
-    $subscription = checkoutSubscription($this->account);
-
-    expect(fn () => ConfigureSubscriptionCheckout::apply($subscription, $this->account, socialsPlan()))
-        ->not->toThrow(RuntimeException::class);
+    $subscription = configureCheckout($this->account);
 
     expect($subscription->allowPromotionCodes)->toBeTrue()
-        ->and($subscription->couponId)->toBeNull()
-        ->and(trialExpiresAt($subscription))->toBeNull();
+        ->and(trialExpiresAt($subscription))->not->toBeNull();
 });
 
-test('the first-month coupon applies to a first-time subscriber with several workspaces', function () {
-    config(['cashier.first_month_coupon_ids.socials' => 'SOCIALS_18USD']);
-    Workspace::factory()->count(2)->create(['account_id' => $this->account->id]);
-
-    $subscription = checkoutSubscription($this->account);
+test('a coupon wins over the promotion code field, which Stripe rejects with it', function () {
+    claimOfferFor($this->account, Offer::factory()->allowingPromotionCodes()->create(['stripe_coupon_id' => 'BF26_50']));
 
-    ConfigureSubscriptionCheckout::apply($subscription, $this->account, socialsPlan());
+    $subscription = configureCheckout($this->account);
 
-    expect($subscription->couponId)->toBe('SOCIALS_18USD')
-        ->and(trialExpiresAt($subscription))->toBeNull();
-});
-
-test('skips coupon and trial when the account has a prior canceled subscription', function () {
-    config(['cashier.first_month_coupon_ids.socials' => 'SOCIALS_18USD']);
-    Workspace::factory()->create(['account_id' => $this->account->id]);
-    givePriorSubscription($this->account);
-
-    $subscription = checkoutSubscription($this->account);
-
-    ConfigureSubscriptionCheckout::apply($subscription, $this->account, socialsPlan());
-
-    expect($subscription->couponId)->toBeNull()
-        ->and(trialExpiresAt($subscription))->toBeNull()
-        ->and($subscription->allowPromotionCodes)->toBeFalse();
-});
-
-test('still applies the coupon when the only prior subscription is incomplete_expired', function () {
-    config([
-        'cashier.first_month_coupon_ids.socials' => 'SOCIALS_18USD',
-        'cashier.allow_promotion_codes' => false,
-    ]);
-    Workspace::factory()->create(['account_id' => $this->account->id]);
-    givePriorSubscription($this->account, 'incomplete_expired');
-
-    $subscription = checkoutSubscription($this->account);
-
-    ConfigureSubscriptionCheckout::apply($subscription, $this->account, socialsPlan());
-
-    expect($subscription->couponId)->toBe('SOCIALS_18USD')
+    expect($subscription->couponId)->toBe('BF26_50')
         ->and($subscription->allowPromotionCodes)->toBeFalse()
         ->and(trialExpiresAt($subscription))->toBeNull();
 });
 
-test('still applies the coupon when the only prior subscription is incomplete', function () {
-    config([
-        'cashier.first_month_coupon_ids.socials' => 'SOCIALS_18USD',
-        'cashier.allow_promotion_codes' => false,
-    ]);
-    Workspace::factory()->create(['account_id' => $this->account->id]);
-    givePriorSubscription($this->account, 'incomplete');
+test('an offer can carry a coupon and a trial together', function () {
+    claimOfferFor($this->account, Offer::factory()->create(['stripe_coupon_id' => 'BF26_50', 'trial_days' => 8]));
 
-    $subscription = checkoutSubscription($this->account);
+    $subscription = configureCheckout($this->account);
 
-    ConfigureSubscriptionCheckout::apply($subscription, $this->account, socialsPlan());
-
-    expect($subscription->couponId)->toBe('SOCIALS_18USD')
-        ->and(trialExpiresAt($subscription))->toBeNull();
+    expect($subscription->couponId)->toBe('BF26_50')
+        ->and(trialExpiresAt($subscription))->not->toBeNull();
 });
 
-test('clamps a one-day trial to Stripe Checkout minimum of two days', function () {
-    config(['cashier.trial_days' => 1]);
-    Workspace::factory()->create(['account_id' => $this->account->id]);
-
+test('clamps a one-day trial to the Stripe Checkout minimum of two days', function () {
     Carbon::setTestNow('2026-08-07 12:00:00');
+    claimOfferFor($this->account, Offer::factory()->trial(1)->create());
 
-    $subscription = checkoutSubscription($this->account);
+    expect(trialExpiresAt(configureCheckout($this->account))?->toDateTimeString())->toBe('2026-08-09 12:00:00');
+});
 
-    ConfigureSubscriptionCheckout::apply($subscription, $this->account, socialsPlan());
+test('an offer applies to a former customer', function () {
+    givePriorSubscription($this->account);
+    claimOfferFor($this->account, Offer::factory()->create(['stripe_coupon_id' => 'BF26_50']));
 
-    expect(trialExpiresAt($subscription)?->toDateTimeString())->toBe('2026-08-09 12:00:00');
+    expect(configureCheckout($this->account)->couponId)->toBe('BF26_50');
 });
 
-test('skips trial days when trial_days is zero', function () {
-    config(['cashier.trial_days' => 0]);
-    Workspace::factory()->create(['account_id' => $this->account->id]);
+test('a first-subscription offer skips an account that was billed before', function () {
+    claimOfferFor($this->account, Offer::factory()->firstSubscriptionOnly()->create(['stripe_coupon_id' => 'FIRST_MONTH_1']));
 
-    $subscription = checkoutSubscription($this->account);
+    expect(configureCheckout($this->account)->couponId)->toBe('FIRST_MONTH_1');
 
-    ConfigureSubscriptionCheckout::apply($subscription, $this->account, socialsPlan());
+    givePriorSubscription($this->account);
 
-    expect(trialExpiresAt($subscription))->toBeNull()
-        ->and($subscription->couponId)->toBeNull()
-        ->and($subscription->allowPromotionCodes)->toBeFalse();
+    expect(ConfigureSubscriptionCheckout::offerFor($this->account, socialsPlan()))->toBeNull();
 });
 
-test('zero workspaces still get the first-month coupon when first-time', function () {
-    config(['cashier.first_month_coupon_ids.socials' => 'SOCIALS_18USD']);
+test('does not apply an offer without a plan', function () {
+    claimOfferFor($this->account, Offer::factory()->trial(8)->create());
 
-    $subscription = checkoutSubscription($this->account);
+    expect(ConfigureSubscriptionCheckout::offerFor($this->account, null))->toBeNull();
+});
 
-    ConfigureSubscriptionCheckout::apply($subscription, $this->account, socialsPlan());
+test('does not apply an expired offer', function () {
+    claimOfferFor($this->account, Offer::factory()->expired()->create(['stripe_coupon_id' => 'BF26_50']));
 
-    expect($subscription->couponId)->toBe('SOCIALS_18USD')
-        ->and(trialExpiresAt($subscription))->toBeNull();
+    expect(configureCheckout($this->account)->couponId)->toBeNull();
 });
diff --git a/tests/fixtures/single-line-copy.php b/tests/fixtures/single-line-copy.php
index 4847b1e71b..b3a6217caf 100644
--- a/tests/fixtures/single-line-copy.php
+++ b/tests/fixtures/single-line-copy.php
@@ -47,6 +47,17 @@
     'billing.plans.features.repurpose' => 40,
     'billing.plans.features.team' => 32,
     'billing.plans.start_first_month' => 18,
+    'welcome.plan_start_trial' => 18,
+    'billing.subscription.default' => 14,
+    'billing.tabs.plan' => 5,
+    'billing.tabs.invoices' => 10,
+    'billing.current_plan.statuses.active' => 8,
+    'billing.current_plan.statuses.trial' => 19,
+    'billing.current_plan.statuses.cancelling' => 12,
+    'billing.current_plan.statuses.past_due' => 13,
+    'billing.invoices.columns.date' => 10,
+    'billing.invoices.columns.amount' => 7,
+    'billing.invoices.columns.status' => 9,
     'calendar.title' => 10,
     'channels.description' => 43,
     'channels.goal_dialog.description' => 57,
@@ -194,7 +205,6 @@
     'welcome.mcp.connect_ai' => 20,
     'welcome.mcp.connect_other' => 28,
     'welcome.mcp.connect_with' => 16,
-    'welcome.plan_per_month' => 11,
     'mcp.connect' => 13,
     'mcp.copy' => 10,
     'mcp.copied' => 11,