+
+
{{ $plan->name }}
+ @if ($isCurrent)
+ {{ __('Aktuell') }}
+ @endif
-
-
-
{{ __('Mindeststufe') }}
-
{{ $placement['tier'] }}
+
+
+ {{ $this->formatEuro($plan->monthly_price_cents) }}
+ / {{ __('Monat') }}
-
- {{ __('Score :score', ['score' => $placement['score']]) }}
-
+
+ {{ $this->formatEuro($plan->yearly_price_cents) }}
+ / {{ __('Jahr') }}
+
+
{{ __('netto zzgl. USt.') }}
-
- {{ __('Buchung vorbereiten') }}
-
+
+ -
+
+ {{ __(':quota Pressemitteilungen pro Monat', ['quota' => $plan->press_release_quota]) }}
+
+ -
+
+ @if ($plan->daily_limit)
+ {{ __('max. :limit Veröffentlichungen pro Tag', ['limit' => $plan->daily_limit]) }}
+ @else
+ {{ __('Ohne Tageslimit') }}
+ @endif
+
+ -
+
+ {{ __('KI-Prüfung & Veröffentlichung inklusive') }}
+
+
+
+ @if ($subscription)
+
+ {{ $isCurrent ? __('Ihr aktueller Tarif') : __('Wechsel über „Abo verwalten"') }}
+
+ @else
+
+
+ {{ __('Monatlich buchen') }}
+
+
+
+
+ {{ __('Jährlich buchen') }}
+
+
+ @endif
@endforeach
+
+
+ {{ __('Mehr als 60 Pressemitteilungen pro Monat, mehrere Teams oder Sonderkonditionen? Enterprise-Konditionen erhalten Sie auf Anfrage über den Support.') }}
+
- {{-- ============== SERVICE-MARKTPLATZ ============== --}}
-
-
-
{{ __('Add-on-Marktplatz') }}
-
- {{ __('Buchbare Services nach Kategorie') }}
-
+ {{-- ============== EINZEL-PM (OHNE ABO) ============== --}}
+
+
+
+
+
+
+
+
+ {{ __('Einzel-Pressemitteilung — ohne Abo') }}
+
+
+ {{ __('Genau eine Veröffentlichung inklusive KI-Prüfung. Eingelöst wird der Kauf erst, wenn die Pressemitteilung live geht — Ablehnungen kosten nichts.') }}
+ @if ($openPurchases->isNotEmpty())
+
+ {{ trans_choice('Aktuell :count offener Kauf.|Aktuell :count offene Käufe.', $openPurchases->count(), ['count' => $openPurchases->count()]) }}
+
+ @endif
+
+
+
+
+
+
{{ $singlePmPrice }}
+
{{ __('netto zzgl. USt.') }}
+
+
+ {{ __('Jetzt buchen') }}
+
+
- @foreach ($serviceGroups as $group)
-
-
-
-
- {{ $group['title'] }}
-
-
-
- {{ $group['description'] }}
-
-
- @foreach ($group['services'] as $service)
-
-
-
{{ $service['name'] }}
-
{{ $service['meta'] }}
-
-
-
{{ $service['credits'] }}
-
{{ __('Credits') }}
-
-
- @endforeach
-
-
- @endforeach
-
{{-- ============== AKTIVE BUCHUNGEN / VERLAUF ============== --}}
@@ -375,9 +358,54 @@ new #[Layout('components.layouts.app'), Title('Buchungen & Add-ons')] class exte
{{ __('läuft aktuell') }}
- @forelse ($activeBookings as $booking)
-
{{ $booking }}
- @empty
+ @if ($subscription || $legacyOptions->isNotEmpty() || $openPurchases->isNotEmpty())
+
+ @if ($subscription && $currentPlan)
+
+
+
+ {{ __('Abo: :plan', ['plan' => $currentPlan->name]) }}
+
+
+ {{ $currentInterval === 'yearly' ? __('jährliche Abrechnung') : __('monatliche Abrechnung') }} · Stripe
+
+
+
{{ __('aktiv') }}
+
+ @endif
+
+ @foreach ($legacyOptions as $option)
+
+
+
+ {{ data_get($option->legacy_conditions, 'name') ?? $option->paymentOption?->article_number ?? __('Bestehende Vereinbarung') }}
+
+
+ {{ __('Bestandstarif · Abrechnung per Rechnung') }}
+ @if ($option->current_period_end)
+ · {{ __('nächste Rechnung :date', ['date' => $option->current_period_end->format('d.m.Y')]) }}
+ @endif
+
+
+
{{ __('aktiv') }}
+
+ @endforeach
+
+ @foreach ($openPurchases as $purchase)
+
+
+
+ {{ $purchase->type->label() }}
+
+
+ {{ __('gekauft am :date', ['date' => $purchase->paid_at?->format('d.m.Y')]) }} · {{ $this->formatEuro($purchase->price_cents) }} {{ __('netto') }}
+
+
+
{{ __('einlösbar') }}
+
+ @endforeach
+
+ @else
@@ -387,22 +415,36 @@ new #[Layout('components.layouts.app'), Title('Buchungen & Add-ons')] class exte
{{ __('Noch keine aktiven Buchungen') }}
- {{ __('Gebuchte Highlights, Newsletter-Platzierungen oder Add-ons erscheinen hier mit Laufzeit und zugehöriger Firma.') }}
+ {{ __('Ihr Abo, Bestandstarife und offene Einzelkäufe erscheinen hier mit Laufzeit und Abrechnungsart.') }}
- @endforelse
+ @endif
{{ __('Verlauf') }}
- {{ __('verbrauchte Credits') }}
+ {{ __('eingelöste Käufe') }}
- @forelse ($bookingHistory as $booking)
-
{{ $booking }}
- @empty
+ @if ($consumedPurchases->isNotEmpty())
+
+ @foreach ($consumedPurchases as $purchase)
+
+
+
+ {{ $purchase->pressRelease?->title ?? $purchase->type->label() }}
+
+
+ {{ __('eingelöst am :date', ['date' => $purchase->consumed_at?->format('d.m.Y')]) }}
+
+
+
{{ __('eingelöst') }}
+
+ @endforeach
+
+ @else
@@ -412,10 +454,10 @@ new #[Layout('components.layouts.app'), Title('Buchungen & Add-ons')] class exte
{{ __('Noch kein Buchungsverlauf') }}
- {{ __('Nach dem ersten Checkout werden Verbrauch, Rechnungsbezug und betroffene Pressemitteilung hier nachvollziehbar.') }}
+ {{ __('Eingelöste Einzelkäufe erscheinen hier mit der zugehörigen Pressemitteilung.') }}
- @endforelse
+ @endif
diff --git a/routes/customer.php b/routes/customer.php
index cfd0040..fc073df 100644
--- a/routes/customer.php
+++ b/routes/customer.php
@@ -38,6 +38,8 @@ Route::middleware(['auth', 'verified', EnsureUserIsCustomer::class, LogSlowAdmin
->name('checkout.subscription');
Route::get('checkout/einzel-pm', [CheckoutController::class, 'singlePm'])
->name('checkout.single-pm');
+ Route::get('checkout/abo-verwalten', [CheckoutController::class, 'billingPortal'])
+ ->name('checkout.billing-portal');
Volt::route('invoices', 'customer.invoices')->name('invoices.index');
Route::get('legacy-invoices/{legacyInvoice}/pdf', LegacyInvoicePdfController::class)->name('invoices.pdf');
Volt::route('tokens', 'customer.tokens')->name('tokens.index');
diff --git a/tests/Feature/Billing/BookingsPageTest.php b/tests/Feature/Billing/BookingsPageTest.php
new file mode 100644
index 0000000..6b34aa7
--- /dev/null
+++ b/tests/Feature/Billing/BookingsPageTest.php
@@ -0,0 +1,156 @@
+seed(RolesAndPermissionsSeeder::class);
+});
+
+function bookingsTestCustomer(): User
+{
+ $user = User::factory()->create();
+ $user->assignRole('customer');
+
+ return $user;
+}
+
+test('the bookings page renders the active plans with checkout links', function () {
+ /** @var TestCase $this */
+ Plan::factory()->create([
+ 'name' => 'Business',
+ 'slug' => 'business',
+ 'monthly_price_cents' => 4900,
+ 'yearly_price_cents' => 49000,
+ 'press_release_quota' => 10,
+ 'daily_limit' => 2,
+ ]);
+ Plan::factory()->inactive()->create(['name' => 'Versteckt']);
+
+ $this->actingAs(bookingsTestCustomer());
+
+ LivewireVolt::test('customer.bookings')
+ ->assertSee('Business')
+ ->assertSee('49 €')
+ ->assertSee('490 €')
+ ->assertSee('10 Pressemitteilungen pro Monat')
+ ->assertSee('max. 2 Veröffentlichungen pro Tag')
+ ->assertSee('2 Monate gratis')
+ ->assertSee(route('me.checkout.subscription', ['planSlug' => 'business', 'interval' => 'monthly']), false)
+ ->assertSee(route('me.checkout.subscription', ['planSlug' => 'business', 'interval' => 'yearly']), false)
+ ->assertDontSee('Versteckt');
+});
+
+test('the single pm block links to its checkout', function () {
+ /** @var TestCase $this */
+ config()->set('billing.single_pm_stripe_price_id', 'price_test_single_pm');
+
+ $this->actingAs(bookingsTestCustomer());
+
+ LivewireVolt::test('customer.bookings')
+ ->assertSee('Einzel-Pressemitteilung — ohne Abo')
+ ->assertSee('19 €')
+ ->assertSee(route('me.checkout.single-pm'), false);
+});
+
+test('without any booking the page shows the empty state', function () {
+ /** @var TestCase $this */
+ $this->actingAs(bookingsTestCustomer());
+
+ LivewireVolt::test('customer.bookings')
+ ->assertSee('Noch kein aktiver Tarif')
+ ->assertSee('Noch keine aktiven Buchungen');
+});
+
+test('a subscriber sees the current plan and the manage button', function () {
+ /** @var TestCase $this */
+ $user = bookingsTestCustomer();
+ $plan = Plan::factory()->create([
+ 'name' => 'Pro',
+ 'press_release_quota' => 25,
+ 'stripe_price_id_monthly' => 'price_test_m_pro',
+ ]);
+ subscribeUserToPlan($user, $plan);
+
+ $this->actingAs($user);
+
+ LivewireVolt::test('customer.bookings')
+ ->assertSee('Ihr aktueller Tarif')
+ ->assertSee('Abo verwalten')
+ ->assertSee('Abo: Pro')
+ ->assertSee(route('me.checkout.billing-portal'), false);
+});
+
+test('a grandfathered legacy user sees the bestandstarif with unlimited quota', function () {
+ /** @var TestCase $this */
+ $user = bookingsTestCustomer();
+ UserPaymentOption::factory()->create([
+ 'user_id' => $user->id,
+ 'status' => UserPaymentOptionStatus::Grandfathered->value,
+ 'current_period_end' => now()->addMonths(3),
+ 'legacy_conditions' => ['name' => 'Presseverteiler Premium'],
+ ]);
+
+ $this->actingAs($user);
+
+ LivewireVolt::test('customer.bookings')
+ ->assertSee('Bestandstarif')
+ ->assertSee('Presseverteiler Premium')
+ ->assertSee('Unbegrenzte Pressemitteilungen (Bestandsschutz).')
+ ->assertSee('Unbegrenzt');
+});
+
+test('open and consumed single purchases appear in bookings and history', function () {
+ /** @var TestCase $this */
+ $user = bookingsTestCustomer();
+ SinglePurchase::factory()->paid()->create(['user_id' => $user->id]);
+ SinglePurchase::factory()->consumed()->create(['user_id' => $user->id]);
+
+ $this->actingAs($user);
+
+ LivewireVolt::test('customer.bookings')
+ ->assertSee('einlösbar')
+ ->assertSee('eingelöst am');
+});
+
+test('the billing portal redirects without an active subscription', function () {
+ /** @var TestCase $this */
+ $this->actingAs(bookingsTestCustomer())
+ ->get(route('me.checkout.billing-portal'))
+ ->assertRedirect(route('me.bookings.index'))
+ ->assertSessionHas('checkout-notice');
+});
+
+test('the billing portal forwards a subscriber to stripe', function () {
+ /** @var TestCase $this */
+ $user = bookingsTestCustomer();
+ $user->forceFill(['stripe_id' => 'cus_test_portal'])->save();
+ $plan = Plan::factory()->create(['stripe_price_id_monthly' => 'price_test_m_portal']);
+ subscribeUserToPlan($user, $plan);
+
+ $this->mock(StripeCheckoutService::class, function ($mock) {
+ $mock->shouldReceive('billingPortalUrl')
+ ->once()
+ ->andReturn('https://billing.stripe.com/p/session/test');
+ });
+
+ $this->actingAs($user)
+ ->get(route('me.checkout.billing-portal'))
+ ->assertRedirect('https://billing.stripe.com/p/session/test');
+});
+
+test('the checkout success banner is shown after returning from stripe', function () {
+ /** @var TestCase $this */
+ $this->actingAs(bookingsTestCustomer())
+ ->get(route('me.bookings.index', ['checkout' => 'erfolg']))
+ ->assertOk()
+ ->assertSee('Vielen Dank für Ihre Buchung!');
+});
diff --git a/tests/Feature/PanelConsolidationTest.php b/tests/Feature/PanelConsolidationTest.php
index 016ff86..5d39ef2 100644
--- a/tests/Feature/PanelConsolidationTest.php
+++ b/tests/Feature/PanelConsolidationTest.php
@@ -1,5 +1,6 @@
get(route('dashboard'))->assertForbidden();
});
-test('customer bookings page shows credit packages and add ons from pricing concept', function () {
+test('customer bookings page shows the tariff grid and single pm block', function () {
+ // Seit Phase 9F zeigt die Seite das echte Tarif-Raster mit
+ // Stripe-Checkout statt des Credit-Konzept-Mocks (Credits → Phase 9I/2).
/** @var TestCase $this */
$customer = User::factory()->create(['is_active' => true]);
$customer->assignRole('customer');
+ Plan::factory()->create([
+ 'name' => 'Starter',
+ 'monthly_price_cents' => 2900,
+ 'press_release_quota' => 3,
+ ]);
+
$this->actingAs($customer)
->get(route('me.bookings.index'))
->assertSuccessful()
- ->assertSee('Credit-Pakete')
- ->assertSee('Standard')
- ->assertSee('50')
- ->assertSee('45 €')
- ->assertSee('Pressetext-Optimierung')
- ->assertSee('Top-Slot Startseite')
- ->assertSee('Score 80+')
+ ->assertSee('Den passenden Tarif wählen')
+ ->assertSee('Starter')
+ ->assertSee('29 €')
+ ->assertSee('2 Monate gratis')
+ ->assertSee('Einzel-Pressemitteilung — ohne Abo')
->assertSee('Noch keine aktiven Buchungen');
});