feat(tiers): add display-name layer, push.frequency entitlement, and rename pricing cards
Reconciles tier docs with `PlanSeeder` reality (basic has price_threshold and score_alerts; schema is stripe_price_id_monthly + stripe_price_id_annual) and introduces the display-name layer from pricing-plan.md v2. - PlanTier::label() + Plan::displayName() + PlanFeatures::displayName() expose user-facing names (Free/Daily/Smart/Pro); backend identifiers stay basic/plus/pro so every call site, Stripe mapping, and test keeps working. - push.frequency key added to features JSON (none/daily/triggered), mirroring email.frequency so Daily's daily push is distinguishable from Smart/Pro's triggered push. Seeder, factory, free-tier stubs, and Filament form updated. - Homepage pricing cards renamed: Basic→Daily, Plus→Smart; badge "Most Popular"→"Most pick this"; CTAs refreshed. - docs/tiers.md change log records the full diff. Fleet tier, 14-day trial copy, and Smart dark-card treatment deferred. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -105,7 +105,8 @@ Each tier has two prices:
|
|||||||
```
|
```
|
||||||
id unsignedBigInteger PK
|
id unsignedBigInteger PK
|
||||||
name string — free | basic | plus | pro
|
name string — free | basic | plus | pro
|
||||||
stripe_price_id string nullable — maps Cashier price to this plan
|
stripe_price_id_monthly string nullable — Cashier price ID for monthly billing
|
||||||
|
stripe_price_id_annual string nullable — Cashier price ID for annual billing
|
||||||
features json — see shape below
|
features json — see shape below
|
||||||
active boolean default true
|
active boolean default true
|
||||||
timestamps
|
timestamps
|
||||||
@@ -123,7 +124,8 @@ timestamps
|
|||||||
"frequency": "triggered"
|
"frequency": "triggered"
|
||||||
},
|
},
|
||||||
"push": {
|
"push": {
|
||||||
"enabled": true
|
"enabled": true,
|
||||||
|
"frequency": "triggered"
|
||||||
},
|
},
|
||||||
"whatsapp": {
|
"whatsapp": {
|
||||||
"enabled": true,
|
"enabled": true,
|
||||||
@@ -141,7 +143,20 @@ timestamps
|
|||||||
```
|
```
|
||||||
|
|
||||||
`fuel_types.max: null` means unlimited. `email.frequency` values: `weekly_digest`,
|
`fuel_types.max: null` means unlimited. `email.frequency` values: `weekly_digest`,
|
||||||
`daily`, `triggered`. All boolean features default `false` on free.
|
`daily`, `triggered`. `push.frequency` values: `none` (when disabled), `daily`,
|
||||||
|
`triggered`. All boolean features default `false` on free.
|
||||||
|
|
||||||
|
`database/seeders/PlanSeeder.php` is the source of truth. Per-tier reality:
|
||||||
|
|
||||||
|
- `price_threshold` and `score_alerts` are **enabled on basic, plus, and pro** (not plus-only).
|
||||||
|
- `ai_predictions` is **plus and pro only**.
|
||||||
|
- `whatsapp` and `sms` always carry `daily_limit` (and whatsapp carries `scheduled_updates`)
|
||||||
|
even when `enabled: false` — set to `0` on disabled tiers.
|
||||||
|
|
||||||
|
> Deeper per-tier feature flags (history window, prediction level, leaderboard size,
|
||||||
|
> saved stations, fuel log caps, brand comparison, route planner, family sharing) are
|
||||||
|
> defined in `docs/superpowers/specs/2026-04-15-tier-features-design.md` — that spec
|
||||||
|
> is the source of truth for entitlements beyond notification channels.
|
||||||
|
|
||||||
### `user_notification_preferences` table
|
### `user_notification_preferences` table
|
||||||
|
|
||||||
@@ -184,8 +199,8 @@ missed-count queries.
|
|||||||
|
|
||||||
- Casts `features` to `array`.
|
- Casts `features` to `array`.
|
||||||
- Has a static `resolveForUser(User $user): Plan` method — looks up the user's
|
- Has a static `resolveForUser(User $user): Plan` method — looks up the user's
|
||||||
active Cashier subscription price ID, matches to `stripe_price_id`, falls back
|
active Cashier subscription price ID, matches to either `stripe_price_id_monthly`
|
||||||
to the `free` plan row.
|
or `stripe_price_id_annual`, falls back to the `free` plan row.
|
||||||
- Cache the resolved plan: `Cache::tags(['plans'])->remember("plan_for_user_{$user->id}", 3600, ...)`.
|
- Cache the resolved plan: `Cache::tags(['plans'])->remember("plan_for_user_{$user->id}", 3600, ...)`.
|
||||||
- Bust `Cache::tags(['plans'])` in an Eloquent `saved` observer on `Plan`.
|
- Bust `Cache::tags(['plans'])` in an Eloquent `saved` observer on `Plan`.
|
||||||
|
|
||||||
|
|||||||
@@ -8,4 +8,14 @@ enum PlanTier: string
|
|||||||
case Basic = 'basic';
|
case Basic = 'basic';
|
||||||
case Plus = 'plus';
|
case Plus = 'plus';
|
||||||
case Pro = 'pro';
|
case Pro = 'pro';
|
||||||
|
|
||||||
|
public function label(): string
|
||||||
|
{
|
||||||
|
return match ($this) {
|
||||||
|
self::Free => 'Free',
|
||||||
|
self::Basic => 'Daily',
|
||||||
|
self::Plus => 'Smart',
|
||||||
|
self::Pro => 'Pro',
|
||||||
|
};
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -40,9 +40,17 @@ class PlanForm
|
|||||||
]),
|
]),
|
||||||
|
|
||||||
Section::make('Push')
|
Section::make('Push')
|
||||||
|
->columns(2)
|
||||||
->schema([
|
->schema([
|
||||||
Toggle::make('features.push.enabled')
|
Toggle::make('features.push.enabled')
|
||||||
->label('Enabled'),
|
->label('Enabled'),
|
||||||
|
Select::make('features.push.frequency')
|
||||||
|
->label('Frequency')
|
||||||
|
->options([
|
||||||
|
'none' => 'None (disabled)',
|
||||||
|
'daily' => 'Daily',
|
||||||
|
'triggered' => 'Triggered',
|
||||||
|
]),
|
||||||
]),
|
]),
|
||||||
|
|
||||||
Section::make('WhatsApp')
|
Section::make('WhatsApp')
|
||||||
|
|||||||
@@ -70,7 +70,7 @@ class Plan extends Model
|
|||||||
'features' => [
|
'features' => [
|
||||||
'fuel_types' => ['max' => 1],
|
'fuel_types' => ['max' => 1],
|
||||||
'email' => ['enabled' => true, 'frequency' => 'weekly_digest'],
|
'email' => ['enabled' => true, 'frequency' => 'weekly_digest'],
|
||||||
'push' => ['enabled' => false],
|
'push' => ['enabled' => false, 'frequency' => 'none'],
|
||||||
'whatsapp' => ['enabled' => false, 'daily_limit' => 0, 'scheduled_updates' => 0],
|
'whatsapp' => ['enabled' => false, 'daily_limit' => 0, 'scheduled_updates' => 0],
|
||||||
'sms' => ['enabled' => false, 'daily_limit' => 0],
|
'sms' => ['enabled' => false, 'daily_limit' => 0],
|
||||||
'ai_predictions' => false,
|
'ai_predictions' => false,
|
||||||
@@ -96,4 +96,12 @@ class Plan extends Model
|
|||||||
'active' => 'boolean',
|
'active' => 'boolean',
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** User-facing display label for this plan (e.g. basic → "Daily"). */
|
||||||
|
public function displayName(): string
|
||||||
|
{
|
||||||
|
$tier = PlanTier::tryFrom((string) $this->name) ?? PlanTier::Free;
|
||||||
|
|
||||||
|
return $tier->label();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ final class PlanFeatures
|
|||||||
'features' => [
|
'features' => [
|
||||||
'fuel_types' => ['max' => 1],
|
'fuel_types' => ['max' => 1],
|
||||||
'email' => ['enabled' => true, 'frequency' => 'weekly_digest'],
|
'email' => ['enabled' => true, 'frequency' => 'weekly_digest'],
|
||||||
'push' => ['enabled' => false],
|
'push' => ['enabled' => false, 'frequency' => 'none'],
|
||||||
'whatsapp' => ['enabled' => false, 'daily_limit' => 0, 'scheduled_updates' => 0],
|
'whatsapp' => ['enabled' => false, 'daily_limit' => 0, 'scheduled_updates' => 0],
|
||||||
'sms' => ['enabled' => false, 'daily_limit' => 0],
|
'sms' => ['enabled' => false, 'daily_limit' => 0],
|
||||||
'ai_predictions' => false,
|
'ai_predictions' => false,
|
||||||
@@ -195,4 +195,10 @@ final class PlanFeatures
|
|||||||
{
|
{
|
||||||
return $this->plan->name ?? 'free';
|
return $this->plan->name ?? 'free';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** User-facing display label for the resolved tier (e.g. basic → "Daily"). */
|
||||||
|
public function displayName(): string
|
||||||
|
{
|
||||||
|
return $this->plan->displayName();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ class PlanFactory extends Factory
|
|||||||
private static array $defaultFeatures = [
|
private static array $defaultFeatures = [
|
||||||
'fuel_types' => ['max' => 1],
|
'fuel_types' => ['max' => 1],
|
||||||
'email' => ['enabled' => false, 'frequency' => 'weekly_digest'],
|
'email' => ['enabled' => false, 'frequency' => 'weekly_digest'],
|
||||||
'push' => ['enabled' => false],
|
'push' => ['enabled' => false, 'frequency' => 'none'],
|
||||||
'whatsapp' => ['enabled' => false, 'daily_limit' => 0, 'scheduled_updates' => 0],
|
'whatsapp' => ['enabled' => false, 'daily_limit' => 0, 'scheduled_updates' => 0],
|
||||||
'sms' => ['enabled' => false, 'daily_limit' => 0],
|
'sms' => ['enabled' => false, 'daily_limit' => 0],
|
||||||
'ai_predictions' => false,
|
'ai_predictions' => false,
|
||||||
@@ -49,7 +49,7 @@ class PlanFactory extends Factory
|
|||||||
'features' => [
|
'features' => [
|
||||||
'fuel_types' => ['max' => 1],
|
'fuel_types' => ['max' => 1],
|
||||||
'email' => ['enabled' => true, 'frequency' => 'daily'],
|
'email' => ['enabled' => true, 'frequency' => 'daily'],
|
||||||
'push' => ['enabled' => true],
|
'push' => ['enabled' => true, 'frequency' => 'daily'],
|
||||||
'whatsapp' => ['enabled' => true, 'daily_limit' => 5, 'scheduled_updates' => 2],
|
'whatsapp' => ['enabled' => true, 'daily_limit' => 5, 'scheduled_updates' => 2],
|
||||||
'sms' => ['enabled' => false, 'daily_limit' => 0],
|
'sms' => ['enabled' => false, 'daily_limit' => 0],
|
||||||
'ai_predictions' => false,
|
'ai_predictions' => false,
|
||||||
@@ -67,7 +67,7 @@ class PlanFactory extends Factory
|
|||||||
'features' => [
|
'features' => [
|
||||||
'fuel_types' => ['max' => 1],
|
'fuel_types' => ['max' => 1],
|
||||||
'email' => ['enabled' => true, 'frequency' => 'triggered'],
|
'email' => ['enabled' => true, 'frequency' => 'triggered'],
|
||||||
'push' => ['enabled' => true],
|
'push' => ['enabled' => true, 'frequency' => 'triggered'],
|
||||||
'whatsapp' => ['enabled' => true, 'daily_limit' => 5, 'scheduled_updates' => 2],
|
'whatsapp' => ['enabled' => true, 'daily_limit' => 5, 'scheduled_updates' => 2],
|
||||||
'sms' => ['enabled' => true, 'daily_limit' => 1],
|
'sms' => ['enabled' => true, 'daily_limit' => 1],
|
||||||
'ai_predictions' => true,
|
'ai_predictions' => true,
|
||||||
@@ -85,7 +85,7 @@ class PlanFactory extends Factory
|
|||||||
'features' => [
|
'features' => [
|
||||||
'fuel_types' => ['max' => null],
|
'fuel_types' => ['max' => null],
|
||||||
'email' => ['enabled' => true, 'frequency' => 'triggered'],
|
'email' => ['enabled' => true, 'frequency' => 'triggered'],
|
||||||
'push' => ['enabled' => true],
|
'push' => ['enabled' => true, 'frequency' => 'triggered'],
|
||||||
'whatsapp' => ['enabled' => true, 'daily_limit' => 5, 'scheduled_updates' => 2],
|
'whatsapp' => ['enabled' => true, 'daily_limit' => 5, 'scheduled_updates' => 2],
|
||||||
'sms' => ['enabled' => true, 'daily_limit' => 3],
|
'sms' => ['enabled' => true, 'daily_limit' => 3],
|
||||||
'ai_predictions' => true,
|
'ai_predictions' => true,
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ class PlanSeeder extends Seeder
|
|||||||
'features' => [
|
'features' => [
|
||||||
'fuel_types' => ['max' => 1],
|
'fuel_types' => ['max' => 1],
|
||||||
'email' => ['enabled' => true, 'frequency' => 'weekly_digest'],
|
'email' => ['enabled' => true, 'frequency' => 'weekly_digest'],
|
||||||
'push' => ['enabled' => false],
|
'push' => ['enabled' => false, 'frequency' => 'none'],
|
||||||
'whatsapp' => ['enabled' => false, 'daily_limit' => 0, 'scheduled_updates' => 0],
|
'whatsapp' => ['enabled' => false, 'daily_limit' => 0, 'scheduled_updates' => 0],
|
||||||
'sms' => ['enabled' => false, 'daily_limit' => 0],
|
'sms' => ['enabled' => false, 'daily_limit' => 0],
|
||||||
'ai_predictions' => false,
|
'ai_predictions' => false,
|
||||||
@@ -31,7 +31,7 @@ class PlanSeeder extends Seeder
|
|||||||
'features' => [
|
'features' => [
|
||||||
'fuel_types' => ['max' => 1],
|
'fuel_types' => ['max' => 1],
|
||||||
'email' => ['enabled' => true, 'frequency' => 'daily'],
|
'email' => ['enabled' => true, 'frequency' => 'daily'],
|
||||||
'push' => ['enabled' => true],
|
'push' => ['enabled' => true, 'frequency' => 'daily'],
|
||||||
'whatsapp' => ['enabled' => true, 'daily_limit' => 5, 'scheduled_updates' => 2],
|
'whatsapp' => ['enabled' => true, 'daily_limit' => 5, 'scheduled_updates' => 2],
|
||||||
'sms' => ['enabled' => false, 'daily_limit' => 0],
|
'sms' => ['enabled' => false, 'daily_limit' => 0],
|
||||||
'ai_predictions' => false,
|
'ai_predictions' => false,
|
||||||
@@ -45,7 +45,7 @@ class PlanSeeder extends Seeder
|
|||||||
'features' => [
|
'features' => [
|
||||||
'fuel_types' => ['max' => 1],
|
'fuel_types' => ['max' => 1],
|
||||||
'email' => ['enabled' => true, 'frequency' => 'triggered'],
|
'email' => ['enabled' => true, 'frequency' => 'triggered'],
|
||||||
'push' => ['enabled' => true],
|
'push' => ['enabled' => true, 'frequency' => 'triggered'],
|
||||||
'whatsapp' => ['enabled' => true, 'daily_limit' => 5, 'scheduled_updates' => 2],
|
'whatsapp' => ['enabled' => true, 'daily_limit' => 5, 'scheduled_updates' => 2],
|
||||||
'sms' => ['enabled' => true, 'daily_limit' => 1],
|
'sms' => ['enabled' => true, 'daily_limit' => 1],
|
||||||
'ai_predictions' => true,
|
'ai_predictions' => true,
|
||||||
@@ -59,7 +59,7 @@ class PlanSeeder extends Seeder
|
|||||||
'features' => [
|
'features' => [
|
||||||
'fuel_types' => ['max' => null],
|
'fuel_types' => ['max' => null],
|
||||||
'email' => ['enabled' => true, 'frequency' => 'triggered'],
|
'email' => ['enabled' => true, 'frequency' => 'triggered'],
|
||||||
'push' => ['enabled' => true],
|
'push' => ['enabled' => true, 'frequency' => 'triggered'],
|
||||||
'whatsapp' => ['enabled' => true, 'daily_limit' => 5, 'scheduled_updates' => 2],
|
'whatsapp' => ['enabled' => true, 'daily_limit' => 5, 'scheduled_updates' => 2],
|
||||||
'sms' => ['enabled' => true, 'daily_limit' => 3],
|
'sms' => ['enabled' => true, 'daily_limit' => 3],
|
||||||
'ai_predictions' => true,
|
'ai_predictions' => true,
|
||||||
|
|||||||
@@ -8,14 +8,20 @@ decision — which channels a user can receive, how often, and what features the
|
|||||||
|
|
||||||
## Tiers at a glance
|
## Tiers at a glance
|
||||||
|
|
||||||
| Tier | Price | Email | Push | WhatsApp | SMS | AI predictions | Fuel types |
|
| Tier | Price | Email | Push | WhatsApp | SMS | AI predictions | Price threshold | Score alerts | Fuel types |
|
||||||
|-------|--------|-------------------|---------|----------|--------------|----------------|------------|
|
|-------|--------|---------------|-----------|-----------|------------|----------------|-----------------|--------------|------------|
|
||||||
| free | £0 | weekly digest | — | — | — | — | 1 |
|
| free | £0 | weekly digest | — | — | — | — | — | — | 1 |
|
||||||
| basic | £0.99 | daily | daily | daily | — | — | 1 |
|
| basic | £0.99 | daily | daily | daily | — | — | ✓ | ✓ | 1 |
|
||||||
| plus | £2.49 | triggered | triggered | triggered | max 1/day | yes | 1 |
|
| plus | £2.49 | triggered | triggered | triggered | max 1/day | ✓ | ✓ | ✓ | 1 |
|
||||||
| pro | £3.99 | triggered | triggered | triggered | max 3/day | yes | unlimited |
|
| pro | £3.99 | triggered | triggered | triggered | max 3/day | ✓ | ✓ | ✓ | unlimited |
|
||||||
|
|
||||||
Tiers are stored in the `plans` table. The `features` JSON column defines every limit and flag.
|
Tiers are stored in the `plans` table. The `features` JSON column defines every limit and flag.
|
||||||
|
`database/seeders/PlanSeeder.php` is the source of truth — this table mirrors it.
|
||||||
|
|
||||||
|
> **Deeper entitlements** (history window, prediction level, leaderboard size, saved stations,
|
||||||
|
> fuel log caps, brand comparison, route planner, family sharing) are defined in
|
||||||
|
> `docs/superpowers/specs/2026-04-15-tier-features-design.md`. That spec extends the
|
||||||
|
> `features` JSON shape with additional keys beyond the notification-channel flags below.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -40,19 +46,20 @@ Tiers are stored in the `plans` table. The `features` JSON column defines every
|
|||||||
```
|
```
|
||||||
id bigint PK
|
id bigint PK
|
||||||
name string — free | basic | plus | pro
|
name string — free | basic | plus | pro
|
||||||
stripe_price_id string nullable — matches Cashier's stripe_price column
|
stripe_price_id_monthly string nullable — Cashier price ID for monthly billing
|
||||||
|
stripe_price_id_annual string nullable — Cashier price ID for annual billing
|
||||||
features json — see shape below
|
features json — see shape below
|
||||||
active boolean
|
active boolean
|
||||||
timestamps
|
timestamps
|
||||||
```
|
```
|
||||||
|
|
||||||
### `features` JSON shape
|
### `features` JSON shape (notification-channel flags)
|
||||||
|
|
||||||
```json
|
```json
|
||||||
{
|
{
|
||||||
"fuel_types": { "max": 1 },
|
"fuel_types": { "max": 1 },
|
||||||
"email": { "enabled": true, "frequency": "triggered" },
|
"email": { "enabled": true, "frequency": "triggered" },
|
||||||
"push": { "enabled": true },
|
"push": { "enabled": true, "frequency": "triggered" },
|
||||||
"whatsapp": { "enabled": true, "daily_limit": 5, "scheduled_updates": 2 },
|
"whatsapp": { "enabled": true, "daily_limit": 5, "scheduled_updates": 2 },
|
||||||
"sms": { "enabled": true, "daily_limit": 3 },
|
"sms": { "enabled": true, "daily_limit": 3 },
|
||||||
"ai_predictions": true,
|
"ai_predictions": true,
|
||||||
@@ -63,8 +70,14 @@ timestamps
|
|||||||
|
|
||||||
`fuel_types.max: null` means unlimited (pro only).
|
`fuel_types.max: null` means unlimited (pro only).
|
||||||
`email.frequency` values: `weekly_digest`, `daily`, `triggered`.
|
`email.frequency` values: `weekly_digest`, `daily`, `triggered`.
|
||||||
|
`push.frequency` values: `none` (when disabled), `daily`, `triggered`.
|
||||||
|
`whatsapp` and `sms` always carry `daily_limit` (and whatsapp carries `scheduled_updates`)
|
||||||
|
even when `enabled: false` — set to `0` on disabled tiers. See `PlanSeeder`.
|
||||||
Boolean features default to `false` on the free tier.
|
Boolean features default to `false` on the free tier.
|
||||||
|
|
||||||
|
**`price_threshold` and `score_alerts` are enabled on basic and above** (not plus-only).
|
||||||
|
**`ai_predictions` is plus and above only.**
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## Resolving the plan for a user
|
## Resolving the plan for a user
|
||||||
@@ -222,6 +235,45 @@ Test files live in `tests/Feature/Tiers/`:
|
|||||||
|
|
||||||
| File | Covers |
|
| File | Covers |
|
||||||
|------|--------|
|
|------|--------|
|
||||||
| `PlanFeaturesTest.php` | `canUseChannel`, `canSendNow`, `canTrackFuelType`, `can()`, middleware, log scopes |
|
| `PlanFeaturesTest.php` | `canUseChannel`, `canSendNow`, `canTrackFuelType`, `can()`, middleware, log scopes, display name, `push.frequency` shape |
|
||||||
| `PlanResourceTest.php` | Filament list/edit, no create/delete, saves features correctly |
|
| `PlanResourceTest.php` | Filament list/edit, no create/delete, saves features correctly |
|
||||||
| `DispatchUserNotificationJobTest.php` | Sent logging, `tier_restricted`, `daily_limit`, user-disabled suppression, queue name, fan-out |
|
| `DispatchUserNotificationJobTest.php` | Sent logging, `tier_restricted`, `daily_limit`, user-disabled suppression, queue name, fan-out |
|
||||||
|
|
||||||
|
Unit:
|
||||||
|
|
||||||
|
| File | Covers |
|
||||||
|
|------|--------|
|
||||||
|
| `tests/Unit/Enums/PlanTierTest.php` | `PlanTier::label()` — user-facing display names |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Change log
|
||||||
|
|
||||||
|
### 2026-04-20 — display-name layer, `push.frequency`, pricing card rename
|
||||||
|
|
||||||
|
Reconciled docs with `PlanSeeder` reality and introduced the display-name layer from `Downloads/pricing-plan.md` v2.
|
||||||
|
|
||||||
|
**Entitlement reality (docs were stale before this pass):**
|
||||||
|
- `price_threshold` and `score_alerts` are on **basic, plus, pro** — not plus-only.
|
||||||
|
- `ai_predictions` is plus+pro only.
|
||||||
|
- Schema columns are `stripe_price_id_monthly` and `stripe_price_id_annual` (not a single `stripe_price_id`).
|
||||||
|
|
||||||
|
**New: display-name layer.** Backend tier identifiers stay `basic/plus/pro`; UI-facing names are `Free/Daily/Smart/Pro`.
|
||||||
|
- `app/Enums/PlanTier.php` — added `label(): string`
|
||||||
|
- `app/Models/Plan.php` — added `displayName(): string` (delegates to enum)
|
||||||
|
- `app/Services/PlanFeatures.php` — added `displayName(): string`
|
||||||
|
|
||||||
|
**New: `push.frequency` key in `features` JSON.** Mirrors `email.frequency` so Daily's "daily push" is distinguishable from Smart/Pro's "triggered push".
|
||||||
|
- Values: `none` (when disabled), `daily`, `triggered`
|
||||||
|
- Seeded: free=`none`, basic=`daily`, plus=`triggered`, pro=`triggered`
|
||||||
|
- Touched: `PlanSeeder`, `PlanFactory`, free-tier stubs in `Plan::resolveForUser` + `PlanFeatures::__construct`, Filament `PlanForm`
|
||||||
|
|
||||||
|
**Marketing: homepage pricing cards renamed.** `resources/js/views/Home.vue`:
|
||||||
|
- Card labels: `Basic` → `Daily`, `Plus` → `Smart`
|
||||||
|
- Badge: `Most Popular` → `Most pick this`
|
||||||
|
- CTAs: `Select Basic` → `Choose Daily`, `Join Plus` → `Choose Smart`, `Go Pro` → `Choose Pro`, free unauthed `Get started` → `Start free`
|
||||||
|
- Smart retains the existing accent-ring highlight; Pro retains the dark card.
|
||||||
|
|
||||||
|
**Deferred:** `Fleet` tier (per-seat B2B), `Start 14-day trial` CTA on Smart (no trial backend), swapping Smart to a dark card (current accent ring is sufficient).
|
||||||
|
|
||||||
|
**Operational:** existing DB rows won't have `push.frequency` until `php artisan db:seed --class=PlanSeeder` runs. The seeder is idempotent.
|
||||||
|
|||||||
@@ -259,10 +259,10 @@
|
|||||||
<a :href="ctaHref('free')" class="w-full py-3 px-4 border border-zinc-300 rounded-xl text-center font-bold hover:bg-zinc-100 transition-colors">{{ ctaLabel('free') }}</a>
|
<a :href="ctaHref('free')" class="w-full py-3 px-4 border border-zinc-300 rounded-xl text-center font-bold hover:bg-zinc-100 transition-colors">{{ ctaLabel('free') }}</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Basic -->
|
<!-- Daily (backend: basic) -->
|
||||||
<div class="bg-white border border-zinc-300 p-8 rounded-3xl flex flex-col h-full">
|
<div class="bg-white border border-zinc-300 p-8 rounded-3xl flex flex-col h-full">
|
||||||
<div class="mb-8">
|
<div class="mb-8">
|
||||||
<h4 class="text-xl font-bold font-display mb-2">Basic</h4>
|
<h4 class="text-xl font-bold font-display mb-2">Daily</h4>
|
||||||
<div class="flex items-baseline gap-1">
|
<div class="flex items-baseline gap-1">
|
||||||
<span class="text-4xl font-black">{{ PRICES[cadence].basic }}</span>
|
<span class="text-4xl font-black">{{ PRICES[cadence].basic }}</span>
|
||||||
<span class="text-zinc-500 text-sm">{{ PRICE_SUFFIX[cadence] }}</span>
|
<span class="text-zinc-500 text-sm">{{ PRICE_SUFFIX[cadence] }}</span>
|
||||||
@@ -276,11 +276,11 @@
|
|||||||
<a :href="ctaHref('basic')" class="w-full py-3 px-4 border border-zinc-300 rounded-xl text-center font-bold hover:bg-zinc-100 transition-colors">{{ ctaLabel('basic') }}</a>
|
<a :href="ctaHref('basic')" class="w-full py-3 px-4 border border-zinc-300 rounded-xl text-center font-bold hover:bg-zinc-100 transition-colors">{{ ctaLabel('basic') }}</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Plus -->
|
<!-- Smart (backend: plus) -->
|
||||||
<div class="bg-white border-2 border-accent p-8 rounded-3xl flex flex-col h-full relative">
|
<div class="bg-white border-2 border-accent p-8 rounded-3xl flex flex-col h-full relative">
|
||||||
<div class="absolute -top-4 left-1/2 -translate-x-1/2 bg-accent text-white px-4 py-1 rounded-full text-[10px] font-black uppercase tracking-widest whitespace-nowrap">Most Popular</div>
|
<div class="absolute -top-4 left-1/2 -translate-x-1/2 bg-accent text-white px-4 py-1 rounded-full text-[10px] font-black uppercase tracking-widest whitespace-nowrap">Most pick this</div>
|
||||||
<div class="mb-8">
|
<div class="mb-8">
|
||||||
<h4 class="text-xl font-bold font-display mb-2">Plus</h4>
|
<h4 class="text-xl font-bold font-display mb-2">Smart</h4>
|
||||||
<div class="flex items-baseline gap-1">
|
<div class="flex items-baseline gap-1">
|
||||||
<span class="text-4xl font-black text-accent">{{ PRICES[cadence].plus }}</span>
|
<span class="text-4xl font-black text-accent">{{ PRICES[cadence].plus }}</span>
|
||||||
<span class="text-zinc-500 text-sm">{{ PRICE_SUFFIX[cadence] }}</span>
|
<span class="text-zinc-500 text-sm">{{ PRICE_SUFFIX[cadence] }}</span>
|
||||||
@@ -454,15 +454,15 @@ function ctaHref(tier) {
|
|||||||
|
|
||||||
function ctaLabel(tier) {
|
function ctaLabel(tier) {
|
||||||
if (tier === 'free') {
|
if (tier === 'free') {
|
||||||
return isAuthenticated.value ? 'Go to dashboard' : 'Get started'
|
return isAuthenticated.value ? 'Go to dashboard' : 'Start free'
|
||||||
}
|
}
|
||||||
if (isAuthenticated.value && userTier.value === tier) {
|
if (isAuthenticated.value && userTier.value === tier) {
|
||||||
return 'Manage subscription'
|
return 'Manage subscription'
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
basic: 'Select Basic',
|
basic: 'Choose Daily',
|
||||||
plus: 'Join Plus',
|
plus: 'Choose Smart',
|
||||||
pro: 'Go Pro',
|
pro: 'Choose Pro',
|
||||||
}[tier]
|
}[tier]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -208,3 +208,31 @@ it('scopeForFuelType filters by fuel type', function (): void {
|
|||||||
|
|
||||||
expect(UserNotificationPreference::forFuelType(FuelType::E10->value)->where('user_id', $user->id)->count())->toBe(1);
|
expect(UserNotificationPreference::forFuelType(FuelType::E10->value)->where('user_id', $user->id)->count())->toBe(1);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// ─── push frequency ───────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
it('seeds push.frequency for every tier', function (): void {
|
||||||
|
expect(Plan::where('name', 'free')->first()->features['push'])
|
||||||
|
->toBe(['enabled' => false, 'frequency' => 'none'])
|
||||||
|
->and(Plan::where('name', 'basic')->first()->features['push'])
|
||||||
|
->toBe(['enabled' => true, 'frequency' => 'daily'])
|
||||||
|
->and(Plan::where('name', 'plus')->first()->features['push'])
|
||||||
|
->toBe(['enabled' => true, 'frequency' => 'triggered'])
|
||||||
|
->and(Plan::where('name', 'pro')->first()->features['push'])
|
||||||
|
->toBe(['enabled' => true, 'frequency' => 'triggered']);
|
||||||
|
});
|
||||||
|
|
||||||
|
// ─── display name ─────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
it('Plan::displayName returns the user-facing label for each seeded tier', function (): void {
|
||||||
|
expect(Plan::where('name', 'free')->first()->displayName())->toBe('Free')
|
||||||
|
->and(Plan::where('name', 'basic')->first()->displayName())->toBe('Daily')
|
||||||
|
->and(Plan::where('name', 'plus')->first()->displayName())->toBe('Smart')
|
||||||
|
->and(Plan::where('name', 'pro')->first()->displayName())->toBe('Pro');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('PlanFeatures::displayName delegates to the resolved tier', function (): void {
|
||||||
|
$user = User::factory()->create();
|
||||||
|
|
||||||
|
expect(PlanFeatures::for($user)->displayName())->toBe('Free');
|
||||||
|
});
|
||||||
|
|||||||
10
tests/Unit/Enums/PlanTierTest.php
Normal file
10
tests/Unit/Enums/PlanTierTest.php
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use App\Enums\PlanTier;
|
||||||
|
|
||||||
|
it('exposes the user-facing display label for each tier', function () {
|
||||||
|
expect(PlanTier::Free->label())->toBe('Free')
|
||||||
|
->and(PlanTier::Basic->label())->toBe('Daily')
|
||||||
|
->and(PlanTier::Plus->label())->toBe('Smart')
|
||||||
|
->and(PlanTier::Pro->label())->toBe('Pro');
|
||||||
|
});
|
||||||
Reference in New Issue
Block a user