Merge remote-tracking branch 'origin/main'

# Conflicts:
#	apps/web/app/[locale]/home/[account]/members-cms/[memberId]/page.tsx

Dockerfile

@@ -22,6 +22,7 @@ ARG NEXT_PUBLIC_ENABLE_FISCHEREI=true
 ARG NEXT_PUBLIC_ENABLE_MEETING_PROTOCOLS=true
 ARG NEXT_PUBLIC_ENABLE_VERBANDSVERWALTUNG=true
 ARG NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY=
+ARG NEXT_PUBLIC_BILLING_PROVIDER=stripe
 ENV NEXT_PUBLIC_CI=${NEXT_PUBLIC_CI}
 ENV NEXT_PUBLIC_SITE_URL=${NEXT_PUBLIC_SITE_URL}
 ENV NEXT_PUBLIC_SUPABASE_URL=${NEXT_PUBLIC_SUPABASE_URL}
@@ -31,6 +32,7 @@ ENV NEXT_PUBLIC_ENABLE_FISCHEREI=${NEXT_PUBLIC_ENABLE_FISCHEREI}
 ENV NEXT_PUBLIC_ENABLE_MEETING_PROTOCOLS=${NEXT_PUBLIC_ENABLE_MEETING_PROTOCOLS}
 ENV NEXT_PUBLIC_ENABLE_VERBANDSVERWALTUNG=${NEXT_PUBLIC_ENABLE_VERBANDSVERWALTUNG}
 ENV NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY=${NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY}
+ENV NEXT_PUBLIC_BILLING_PROVIDER=${NEXT_PUBLIC_BILLING_PROVIDER}
 RUN pnpm --filter web build
 
 # --- Run ---

apps/web/app/[locale]/home/[account]/bookings/page.tsx

@@ -126,7 +126,7 @@ export default async function BookingsPage({
             icon={<CalendarCheck className="h-5 w-5" />}
           />
           <StatsCard
-            title={t('common.of')}
+            title={t('list.total')}
             value={total}
             icon={<Euro className="h-5 w-5" />}
           />

apps/web/app/[locale]/home/[account]/events/page.tsx

@@ -138,7 +138,7 @@ export default async function EventsPage({ params, searchParams }: PageProps) {
                         {t('capacity')}
                       </th>
                       <th scope="col" className="p-3 text-left font-medium">
-                        {t('status')}
+                        {t('statusLabel')}
                       </th>
                       <th scope="col" className="p-3 text-right font-medium">
                         {t('registrations')}

apps/web/app/[locale]/home/[account]/events/registrations/page.tsx

@@ -116,7 +116,7 @@ export default async function EventRegistrationsPage({ params }: PageProps) {
                         {t('eventDate')}
                       </th>
                       <th scope="col" className="p-3 text-left font-medium">
-                        {t('status')}
+                        {t('statusLabel')}
                       </th>
                       <th scope="col" className="p-3 text-right font-medium">
                         {t('capacity')}

apps/web/app/[locale]/home/[account]/finance/page.tsx

@@ -144,13 +144,13 @@ export default async function FinancePage({ params, searchParams }: PageProps) {
 
         {/* Toolbar */}
         <ListToolbar
-          searchPlaceholder={t('common.showAll')}
+          searchPlaceholder={t('common.searchPlaceholder')}
           filters={[
             {
               param: 'status',
               label: t('common.status'),
               options: [
-                { value: '', label: t('common.noData') },
+                { value: '', label: t('common.all') },
                 { value: 'draft', label: t('status.draft') },
                 { value: 'ready', label: t('sepa.newBatch') },
                 { value: 'sent', label: t('status.sent') },

apps/web/components/cms-page-shell.tsx

@@ -9,6 +9,8 @@ interface CmsPageShellProps {
   account: string;
   title: string;
   description?: string;
+  /** Override breadcrumb labels for URL path segments (e.g. UUID → name) */
+  breadcrumbValues?: Record<string, string>;
   children: ReactNode;
 }
 
@@ -20,6 +22,7 @@ export function CmsPageShell({
   account,
   title,
   description,
+  breadcrumbValues,
   children,
 }: CmsPageShellProps) {
   return (
@@ -28,7 +31,11 @@ export function CmsPageShell({
         account={account}
         title={title}
         description={
-          description !== undefined ? description : <AppBreadcrumbs />
+          description !== undefined ? (
+            description
+          ) : (
+            <AppBreadcrumbs values={breadcrumbValues} />
+          )
         }
       />
 

apps/web/config/billing.config.ts

@@ -33,7 +33,7 @@ export default createBillingSchema({
           interval: 'month',
           lineItems: [
             {
-              id: 'price_starter_monthly',
+              id: 'price_1THsqKKttnWb7SsFttMu9VzG',
               name: 'Starter',
               cost: 29,
               type: 'flat' as const,
@@ -47,7 +47,7 @@ export default createBillingSchema({
           interval: 'year',
           lineItems: [
             {
-              id: 'price_starter_yearly',
+              id: 'price_1THsqLKttnWb7SsFgvjsKXzs',
               name: 'Starter',
               cost: 290,
               type: 'flat' as const,
@@ -82,7 +82,7 @@ export default createBillingSchema({
           interval: 'month',
           lineItems: [
             {
-              id: 'price_pro_monthly',
+              id: 'price_1THsqLKttnWb7SsFlWPf5IdP',
               name: 'Pro',
               cost: 59,
               type: 'flat' as const,
@@ -96,7 +96,7 @@ export default createBillingSchema({
           interval: 'year',
           lineItems: [
             {
-              id: 'price_pro_yearly',
+              id: 'price_1THsqMKttnWb7SsFZq3A4QkU',
               name: 'Pro',
               cost: 590,
               type: 'flat' as const,
@@ -130,7 +130,7 @@ export default createBillingSchema({
           interval: 'month',
           lineItems: [
             {
-              id: 'price_verband_monthly',
+              id: 'price_1THsqNKttnWb7SsFGv7YskgJ',
               name: 'Verband',
               cost: 199,
               type: 'flat' as const,
@@ -144,7 +144,7 @@ export default createBillingSchema({
           interval: 'year',
           lineItems: [
             {
-              id: 'price_verband_yearly',
+              id: 'price_1THsqNKttnWb7SsFhNl2bVn8',
               name: 'Verband',
               cost: 1990,
               type: 'flat' as const,
@@ -178,7 +178,7 @@ export default createBillingSchema({
           interval: 'month',
           lineItems: [
             {
-              id: 'price_enterprise_monthly',
+              id: 'price_1THsqOKttnWb7SsFlLjfLw72',
               name: 'Enterprise',
               cost: 349,
               type: 'flat' as const,
@@ -192,7 +192,7 @@ export default createBillingSchema({
           interval: 'year',
           lineItems: [
             {
-              id: 'price_enterprise_yearly',
+              id: 'price_1THsqOKttnWb7SsF8Sr12isW',
               name: 'Enterprise',
               cost: 3490,
               type: 'flat' as const,

apps/web/i18n/messages/de/cms.json

@@ -304,34 +304,54 @@
     "paginationNext": "Weiter →"
   },
   "permissions": {
-    "modules.read": "Module lesen",
+    "modules": {
-    "modules.write": "Module bearbeiten",
+      "read": "Module lesen",
-    "modules.delete": "Module löschen",
+      "write": "Module bearbeiten",
-    "modules.insert": "Datensätze erstellen",
+      "delete": "Module löschen",
-    "modules.lock": "Datensätze sperren",
+      "insert": "Datensätze erstellen",
-    "modules.import": "Daten importieren",
+      "lock": "Datensätze sperren",
-    "modules.export": "Daten exportieren",
+      "import": "Daten importieren",
-    "modules.print": "Drucken",
+      "export": "Daten exportieren",
-    "modules.manage": "Module verwalten",
+      "print": "Drucken",
-    "members.read": "Mitglieder lesen",
+      "manage": "Module verwalten"
-    "members.write": "Mitglieder bearbeiten",
+    },
-    "courses.read": "Kurse lesen",
+    "members": {
-    "courses.write": "Kurse bearbeiten",
+      "read": "Mitglieder lesen",
-    "bookings.read": "Buchungen lesen",
+      "write": "Mitglieder bearbeiten"
-    "bookings.write": "Buchungen bearbeiten",
+    },
-    "finance.read": "Finanzen lesen",
+    "courses": {
-    "finance.write": "Finanzen bearbeiten",
+      "read": "Kurse lesen",
-    "finance.sepa": "SEPA-Einzüge ausführen",
+      "write": "Kurse bearbeiten"
-    "documents.generate": "Dokumente generieren",
+    },
-    "newsletter.send": "Newsletter versenden",
+    "bookings": {
-    "fischerei.read": "Fischerei lesen",
+      "read": "Buchungen lesen",
-    "fischerei.write": "Fischerei bearbeiten",
+      "write": "Buchungen bearbeiten"
-    "meetings.read": "Sitzungsprotokolle lesen",
+    },
-    "meetings.write": "Sitzungsprotokolle bearbeiten",
+    "finance": {
-    "meetings.delete": "Sitzungsprotokolle löschen",
+      "read": "Finanzen lesen",
-    "verband.read": "Verbandsverwaltung lesen",
+      "write": "Finanzen bearbeiten",
-    "verband.write": "Verbandsverwaltung bearbeiten",
+      "sepa": "SEPA-Einzüge ausführen"
-    "verband.delete": "Verbandsverwaltung löschen"
+    },
+    "documents": {
+      "generate": "Dokumente generieren"
+    },
+    "newsletter": {
+      "send": "Newsletter versenden"
+    },
+    "fischerei": {
+      "read": "Fischerei lesen",
+      "write": "Fischerei bearbeiten"
+    },
+    "meetings": {
+      "read": "Sitzungsprotokolle lesen",
+      "write": "Sitzungsprotokolle bearbeiten",
+      "delete": "Sitzungsprotokolle löschen"
+    },
+    "verband": {
+      "read": "Verbandsverwaltung lesen",
+      "write": "Verbandsverwaltung bearbeiten",
+      "delete": "Verbandsverwaltung löschen"
+    }
   },
   "status": {
     "active": "Aktiv",
@@ -812,4 +832,4 @@
       "formatExcel": "Excel"
     }
   }
-}
+}

apps/web/i18n/messages/de/finance.json

@@ -146,7 +146,9 @@
     "next": "Weiter",
     "type": "Typ",
     "date": "Datum",
-    "description": "Beschreibung"
+    "description": "Beschreibung",
+    "searchPlaceholder": "Rechnung suchen...",
+    "all": "Alle"
   },
   "status": {
     "draft": "Entwurf",
@@ -160,4 +162,4 @@
     "completed": "Abgeschlossen",
     "failed": "Fehlgeschlagen"
   }
-}
+}

apps/web/i18n/messages/en/cms.json

@@ -295,26 +295,40 @@
     "paginationNext": "Next →"
   },
   "permissions": {
-    "modules.read": "Read Modules",
+    "modules": {
-    "modules.write": "Edit Modules",
+      "read": "Read Modules",
-    "modules.delete": "Delete Modules",
+      "write": "Edit Modules",
-    "modules.insert": "Create Records",
+      "delete": "Delete Modules",
-    "modules.lock": "Lock Records",
+      "insert": "Create Records",
-    "modules.import": "Import Data",
+      "lock": "Lock Records",
-    "modules.export": "Export Data",
+      "import": "Import Data",
-    "modules.print": "Print",
+      "export": "Export Data",
-    "modules.manage": "Manage Modules",
+      "print": "Print",
-    "members.read": "Read Members",
+      "manage": "Manage Modules"
-    "members.write": "Edit Members",
+    },
-    "courses.read": "Read Courses",
+    "members": {
-    "courses.write": "Edit Courses",
+      "read": "Read Members",
-    "bookings.read": "Read Bookings",
+      "write": "Edit Members"
-    "bookings.write": "Edit Bookings",
+    },
-    "finance.read": "Read Finance",
+    "courses": {
-    "finance.write": "Edit Finance",
+      "read": "Read Courses",
-    "finance.sepa": "Execute SEPA Collections",
+      "write": "Edit Courses"
-    "documents.generate": "Generate Documents",
+    },
-    "newsletter.send": "Send Newsletter",
+    "bookings": {
+      "read": "Read Bookings",
+      "write": "Edit Bookings"
+    },
+    "finance": {
+      "read": "Read Finance",
+      "write": "Edit Finance",
+      "sepa": "Execute SEPA Collections"
+    },
+    "documents": {
+      "generate": "Generate Documents"
+    },
+    "newsletter": {
+      "send": "Send Newsletter"
+    },
     "verband": {
       "delete": "Delete Association Data"
     }
@@ -338,4 +352,4 @@
       }
     }
   }
-}
+}

apps/web/i18n/messages/en/finance.json

@@ -146,7 +146,9 @@
     "next": "Next",
     "type": "Type",
     "date": "Date",
-    "description": "Description"
+    "description": "Description",
+    "searchPlaceholder": "Search invoices...",
+    "all": "All"
   },
   "status": {
     "draft": "Draft",
@@ -160,4 +162,4 @@
     "completed": "Completed",
     "failed": "Failed"
   }
-}
+}

docker-compose.yml

@@ -330,6 +330,9 @@ services:
         # Browser-side Supabase URL — goes through external domain (Traefik → Kong)
         NEXT_PUBLIC_SUPABASE_URL: ${API_EXTERNAL_URL:-http://localhost:8000}
         NEXT_PUBLIC_SUPABASE_PUBLIC_KEY: ${SUPABASE_ANON_KEY}
+        # Stripe (build-time)
+        NEXT_PUBLIC_BILLING_PROVIDER: stripe
+        NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY: ${NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY}
     restart: unless-stopped
     depends_on:
       supabase-kong:
@@ -352,12 +355,17 @@ services:
       NEXT_PUBLIC_ENABLE_THEME_TOGGLE: 'true'
       NEXT_PUBLIC_ENABLE_TEAM_ACCOUNTS: 'true'
       NEXT_PUBLIC_ENABLE_TEAM_ACCOUNTS_CREATION: 'true'
-      NEXT_PUBLIC_ENABLE_TEAM_ACCOUNTS_BILLING: 'false'
+      NEXT_PUBLIC_ENABLE_TEAM_ACCOUNTS_BILLING: 'true'
-      NEXT_PUBLIC_ENABLE_PERSONAL_ACCOUNT_BILLING: 'false'
+      NEXT_PUBLIC_ENABLE_PERSONAL_ACCOUNT_BILLING: 'true'
       NEXT_PUBLIC_ENABLE_NOTIFICATIONS: 'true'
       NEXT_PUBLIC_ENABLE_FISCHEREI: 'true'
       NEXT_PUBLIC_ENABLE_MEETING_PROTOCOLS: 'true'
       NEXT_PUBLIC_ENABLE_VERBANDSVERWALTUNG: 'true'
+      # Stripe (runtime)
+      NEXT_PUBLIC_BILLING_PROVIDER: stripe
+      NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY: ${NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY}
+      STRIPE_SECRET_KEY: ${STRIPE_SECRET_KEY}
+      STRIPE_WEBHOOK_SECRET: ${STRIPE_WEBHOOK_SECRET}
 
 volumes:
   supabase-db-data:

packages/features/member-management/src/components/application-workflow.tsx

@@ -95,7 +95,8 @@ export function ApplicationWorkflow({
       <div className="flex items-center justify-between">
         <h2 className="text-lg font-semibold">Aufnahmeanträge</h2>
         <p className="text-muted-foreground text-sm">
-          {applications.length} Antrag{applications.length !== 1 ? 'e' : ''}
+          {applications.length}{' '}
+          {applications.length === 1 ? 'Antrag' : 'Anträge'}
         </p>
       </div>