#18 - membership

FORMS.md

@@ -6,6 +6,10 @@ The form definition is an array of element it contains. Each element has a *type
 
 Keep the form structure and content separate -> when working with the form, take time to figure, if you are working with structure, or existence of something within.
 
+## Rendering
+
+The rendering currently happens on the backend, but that might be wrong. It renders out structure, but interactive components gets rendered on the frontend anyway.
+
 ## Submitting
 
 When user submits the form, the `RsvFormSubmitter.js` is called. It collects the values, which we describe in more detail, and then sends it using `fetch` as POST to `reservations/forms/{form_id}`.

assets/js/datasource/RsvMembershipKeyResource.js

@@ -0,0 +1,4 @@
+import { RsvDataSource } from './RsvDataSource.js';
+
+export const RsvMembershipKeyResource = (program_id) =>
+    RsvDataSource.create_rsv_resource(ReservairServiceAPI.restUrl + '/membership-program/' + program_id + '/keys');

assets/js/datasource/RsvMembershipProgramResource.js

@@ -0,0 +1,4 @@
+import { RsvDataSource } from './RsvDataSource.js';
+
+export const RsvMembershipProgramResource = () =>
+    RsvDataSource.create_rsv_resource(ReservairServiceAPI.restUrl + '/membership-program');

composer.json

@@ -1,6 +1,6 @@
 {
     "require": {
-        "chillerlan/php-qrcode": "^5.0"
+        "chillerlan/php-qrcode": "^6.0.1"
     },
     "autoload": {
         "psr-4": {

composer.lock

@@ -4,40 +4,44 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "b4f5229f78cd0eed0c7166614bf05110",
+    "content-hash": "c898c79e7e1cf9625a3a3f757c17ee0d",
     "packages": [
         {
             "name": "chillerlan/php-qrcode",
-            "version": "5.0.3",
+            "version": "6.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/chillerlan/php-qrcode.git",
-                "reference": "42e215640e9ebdd857570c9e4e52245d1ee51de2"
+                "reference": "49006e34bd5328f163e80329e7312f34dceea59b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/chillerlan/php-qrcode/zipball/42e215640e9ebdd857570c9e4e52245d1ee51de2",
+                "url": "https://api.github.com/repos/chillerlan/php-qrcode/zipball/49006e34bd5328f163e80329e7312f34dceea59b",
-                "reference": "42e215640e9ebdd857570c9e4e52245d1ee51de2",
+                "reference": "49006e34bd5328f163e80329e7312f34dceea59b",
                 "shasum": ""
             },
             "require": {
-                "chillerlan/php-settings-container": "^2.1.6 || ^3.2.1",
+                "chillerlan/php-settings-container": "^3.2.1",
                 "ext-mbstring": "*",
-                "php": "^7.4 || ^8.0"
+                "php": "^8.2"
             },
             "require-dev": {
-                "chillerlan/php-authenticator": "^4.3.1 || ^5.2.1",
+                "chillerlan/php-authenticator": "^5.3",
                 "ext-fileinfo": "*",
-                "phan/phan": "^5.4.5",
+                "intervention/image": "^3.11",
-                "phpcompatibility/php-compatibility": "10.x-dev",
+                "phan/phan": "^6.0.1",
+                "phpbench/phpbench": "^1.4",
                 "phpmd/phpmd": "^2.15",
-                "phpunit/phpunit": "^9.6",
+                "phpstan/phpstan": "^2.1.40",
-                "setasign/fpdf": "^1.8.2",
+                "phpstan/phpstan-deprecation-rules": "^2.0.4",
-                "slevomat/coding-standard": "^8.15",
+                "phpunit/phpunit": "^11.5",
-                "squizlabs/php_codesniffer": "^3.11"
+                "setasign/fpdf": "^1.8.6",
+                "slevomat/coding-standard": "^8.28",
+                "squizlabs/php_codesniffer": "^4.0"
             },
             "suggest": {
                 "chillerlan/php-authenticator": "Yet another Google authenticator! Also creates URIs for mobile apps.",
+                "intervention/image": "More advanced GD and ImageMagick output.",
                 "setasign/fpdf": "Required to use the QR FPDF output.",
                 "simple-icons/simple-icons": "SVG icons that you can use to embed as logos in the QR Code"
             },
@@ -75,7 +79,7 @@
                     "homepage": "https://github.com/chillerlan/php-qrcode/graphs/contributors"
                 }
             ],
-            "description": "A QR Code generator and reader with a user-friendly API. PHP 7.4+",
+            "description": "A QR Code generator and reader with a user-friendly API. PHP 8.2+",
             "homepage": "https://github.com/chillerlan/php-qrcode",
             "keywords": [
                 "phpqrcode",
@@ -97,20 +101,20 @@
                     "type": "Ko-Fi"
                 }
             ],
-            "time": "2024-11-21T16:12:34+00:00"
+            "time": "2026-03-18T21:21:07+00:00"
         },
         {
             "name": "chillerlan/php-settings-container",
-            "version": "3.2.1",
+            "version": "3.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/chillerlan/php-settings-container.git",
-                "reference": "95ed3e9676a1d47cab2e3174d19b43f5dbf52681"
+                "reference": "a0a487cbf5344f721eb504bf0f59bada40c381b7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/chillerlan/php-settings-container/zipball/95ed3e9676a1d47cab2e3174d19b43f5dbf52681",
+                "url": "https://api.github.com/repos/chillerlan/php-settings-container/zipball/a0a487cbf5344f721eb504bf0f59bada40c381b7",
-                "reference": "95ed3e9676a1d47cab2e3174d19b43f5dbf52681",
+                "reference": "a0a487cbf5344f721eb504bf0f59bada40c381b7",
                 "shasum": ""
             },
             "require": {
@@ -118,11 +122,13 @@
                 "php": "^8.1"
             },
             "require-dev": {
+                "phan/phan": "^5.5.2",
                 "phpmd/phpmd": "^2.15",
-                "phpstan/phpstan": "^1.11",
+                "phpstan/phpstan": "^2.1.31",
-                "phpstan/phpstan-deprecation-rules": "^1.2",
+                "phpstan/phpstan-deprecation-rules": "^2.0.3",
                 "phpunit/phpunit": "^10.5",
-                "squizlabs/php_codesniffer": "^3.10"
+                "slevomat/coding-standard": "^8.22",
+                "squizlabs/php_codesniffer": "^4.0"
             },
             "type": "library",
             "autoload": {
@@ -147,7 +153,8 @@
                 "Settings",
                 "configuration",
                 "container",
-                "helper"
+                "helper",
+                "property hook"
             ],
             "support": {
                 "issues": "https://github.com/chillerlan/php-settings-container/issues",
@@ -163,7 +170,7 @@
                     "type": "ko_fi"
                 }
             ],
-            "time": "2024-07-16T11:13:48+00:00"
+            "time": "2026-03-20T21:10:52+00:00"
         }
     ],
     "packages-dev": [
@@ -692,16 +699,16 @@
         },
         {
             "name": "amphp/process",
-            "version": "v2.0.3",
+            "version": "v2.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/amphp/process.git",
-                "reference": "52e08c09dec7511d5fbc1fb00d3e4e79fc77d58d"
+                "reference": "583959df17d00304ad7b0b32285373f985935643"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/amphp/process/zipball/52e08c09dec7511d5fbc1fb00d3e4e79fc77d58d",
+                "url": "https://api.github.com/repos/amphp/process/zipball/583959df17d00304ad7b0b32285373f985935643",
-                "reference": "52e08c09dec7511d5fbc1fb00d3e4e79fc77d58d",
+                "reference": "583959df17d00304ad7b0b32285373f985935643",
                 "shasum": ""
             },
             "require": {
@@ -715,7 +722,7 @@
                 "amphp/php-cs-fixer-config": "^2",
                 "amphp/phpunit-util": "^3",
                 "phpunit/phpunit": "^9",
-                "psalm/phar": "^5.4"
+                "psalm/phar": "6.16.1"
             },
             "type": "library",
             "autoload": {
@@ -748,7 +755,7 @@
             "homepage": "https://amphp.org/process",
             "support": {
                 "issues": "https://github.com/amphp/process/issues",
-                "source": "https://github.com/amphp/process/tree/v2.0.3"
+                "source": "https://github.com/amphp/process/tree/v2.1.0"
             },
             "funding": [
                 {
@@ -756,7 +763,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-04-19T03:13:44+00:00"
+            "time": "2026-05-31T15:11:55+00:00"
         },
         {
             "name": "amphp/serialization",
@@ -986,28 +993,29 @@
         },
         {
             "name": "composer/pcre",
-            "version": "3.3.2",
+            "version": "3.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/pcre.git",
-                "reference": "b2bed4734f0cc156ee1fe9c0da2550420d99a21e"
+                "reference": "d5a341b3fb61f3001970940afb1d332968a183ed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/pcre/zipball/b2bed4734f0cc156ee1fe9c0da2550420d99a21e",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/d5a341b3fb61f3001970940afb1d332968a183ed",
-                "reference": "b2bed4734f0cc156ee1fe9c0da2550420d99a21e",
+                "reference": "d5a341b3fb61f3001970940afb1d332968a183ed",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.4 || ^8.0"
             },
             "conflict": {
-                "phpstan/phpstan": "<1.11.10"
+                "phpstan/phpstan": "<2.2.2"
             },
             "require-dev": {
-                "phpstan/phpstan": "^1.12 || ^2",
+                "phpstan/phpstan": "^2",
-                "phpstan/phpstan-strict-rules": "^1 || ^2",
+                "phpstan/phpstan-deprecation-rules": "^2",
-                "phpunit/phpunit": "^8 || ^9"
+                "phpstan/phpstan-strict-rules": "^2",
+                "phpunit/phpunit": "^9"
             },
             "type": "library",
             "extra": {
@@ -1045,7 +1053,7 @@
             ],
             "support": {
                 "issues": "https://github.com/composer/pcre/issues",
-                "source": "https://github.com/composer/pcre/tree/3.3.2"
+                "source": "https://github.com/composer/pcre/tree/3.4.0"
             },
             "funding": [
                 {
@@ -1055,13 +1063,9 @@
                 {
                     "url": "https://github.com/composer",
                     "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
-                    "type": "tidelift"
                 }
             ],
-            "time": "2024-11-12T16:29:46+00:00"
+            "time": "2026-06-07T11:47:49+00:00"
         },
         {
             "name": "composer/semver",
@@ -1567,16 +1571,16 @@
         },
         {
             "name": "johnpbloch/wordpress-core",
-            "version": "6.9.0",
+            "version": "6.9.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/johnpbloch/wordpress-core.git",
-                "reference": "4626d4e896c36ab77a69ce58627bc76243b5dd07"
+                "reference": "13e02e0047ca5c8ec8dc837c2de8a5bd3583b879"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/johnpbloch/wordpress-core/zipball/4626d4e896c36ab77a69ce58627bc76243b5dd07",
+                "url": "https://api.github.com/repos/johnpbloch/wordpress-core/zipball/13e02e0047ca5c8ec8dc837c2de8a5bd3583b879",
-                "reference": "4626d4e896c36ab77a69ce58627bc76243b5dd07",
+                "reference": "13e02e0047ca5c8ec8dc837c2de8a5bd3583b879",
                 "shasum": ""
             },
             "require": {
@@ -1584,7 +1588,7 @@
                 "php": ">=7.2.24"
             },
             "provide": {
-                "wordpress/core-implementation": "6.9.0"
+                "wordpress/core-implementation": "6.9.4"
             },
             "type": "wordpress-core",
             "notification-url": "https://packagist.org/downloads/",
@@ -1611,7 +1615,7 @@
                 "source": "https://core.trac.wordpress.org/browser",
                 "wiki": "https://codex.wordpress.org/"
             },
-            "time": "2025-12-02T19:10:58+00:00"
+            "time": "2026-03-11T15:27:36+00:00"
         },
         {
             "name": "kelunik/certificate",
@@ -3246,16 +3250,16 @@
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.38.1",
+            "version": "v1.38.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "14c5439eec4ccff081ac14eca2dc57feb2a66d92"
+                "reference": "d3d318bad5e7a1bfbd026009c8bfb8d8f99ae6b6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/14c5439eec4ccff081ac14eca2dc57feb2a66d92",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/d3d318bad5e7a1bfbd026009c8bfb8d8f99ae6b6",
-                "reference": "14c5439eec4ccff081ac14eca2dc57feb2a66d92",
+                "reference": "d3d318bad5e7a1bfbd026009c8bfb8d8f99ae6b6",
                 "shasum": ""
             },
             "require": {
@@ -3307,7 +3311,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.38.1"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.38.2"
             },
             "funding": [
                 {
@@ -3327,7 +3331,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-05-26T12:51:13+00:00"
+            "time": "2026-05-27T06:59:30+00:00"
         },
         {
             "name": "symfony/polyfill-php84",
@@ -3786,16 +3790,16 @@
         },
         {
             "name": "webmozart/assert",
-            "version": "2.4.0",
+            "version": "2.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webmozarts/assert.git",
-                "reference": "9007ea6f45ecf352a9422b36644e4bfc039b9155"
+                "reference": "2ccb7c2e821038c03a3e6e1700c570c158c55f70"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozarts/assert/zipball/9007ea6f45ecf352a9422b36644e4bfc039b9155",
+                "url": "https://api.github.com/repos/webmozarts/assert/zipball/2ccb7c2e821038c03a3e6e1700c570c158c55f70",
-                "reference": "9007ea6f45ecf352a9422b36644e4bfc039b9155",
+                "reference": "2ccb7c2e821038c03a3e6e1700c570c158c55f70",
                 "shasum": ""
             },
             "require": {
@@ -3846,9 +3850,9 @@
             ],
             "support": {
                 "issues": "https://github.com/webmozarts/assert/issues",
-                "source": "https://github.com/webmozarts/assert/tree/2.4.0"
+                "source": "https://github.com/webmozarts/assert/tree/2.4.1"
             },
-            "time": "2026-05-20T13:07:01+00:00"
+            "time": "2026-06-15T15:31:57+00:00"
         },
         {
             "name": "wp-hooks/wordpress-core",

includes/Controllers/RsvMembershipProgramController.php

@@ -0,0 +1,183 @@
+<?php
+
+class RsvMembershipProgramController {
+    use RsvPagedResponseTrait;
+    private string $namespace = 'reservations/v1';
+    private string $resource_name = 'membership-program';
+
+    private static function schema(): array {
+        return [
+            'type'       => 'object',
+            'properties' => [
+                'id'     => ['type' => 'integer', 'readonly' => true],
+                'name'   => ['type' => 'string', 'required' => true, 'minLength' => 1],
+                'active' => ['type' => 'boolean', 'default' => true],
+            ],
+        ];
+    }
+
+    public function register_routes(): void {
+        register_rest_route($this->namespace, '/' . $this->resource_name, [
+            [
+                'methods'             => 'GET',
+                'callback'            => [$this, 'index'],
+                'permission_callback' => [RsvRestPolicy::class, 'admin'],
+            ],
+            [
+                'methods'             => 'POST',
+                'callback'            => [$this, 'create'],
+                'permission_callback' => [RsvRestPolicy::class, 'admin'],
+                'args'                => self::input_args(self::schema()),
+            ],
+        ]);
+
+        register_rest_route($this->namespace, '/' . $this->resource_name . '/(?P<id>\d+)', [
+            [
+                'methods'             => 'GET',
+                'callback'            => [$this, 'show'],
+                'permission_callback' => [RsvRestPolicy::class, 'admin'],
+            ],
+            [
+                'methods'             => 'PUT',
+                'callback'            => [$this, 'update'],
+                'permission_callback' => [RsvRestPolicy::class, 'admin'],
+                'args'                => self::input_args(self::schema()),
+            ],
+            [
+                'methods'             => 'DELETE',
+                'callback'            => [$this, 'delete'],
+                'permission_callback' => [RsvRestPolicy::class, 'admin'],
+            ],
+        ]);
+
+        register_rest_route($this->namespace, '/' . $this->resource_name . '/(?P<id>\d+)/keys', [
+            [
+                'methods'             => 'GET',
+                'callback'            => [$this, 'index_keys'],
+                'permission_callback' => [RsvRestPolicy::class, 'admin'],
+            ],
+            [
+                'methods'             => 'POST',
+                'callback'            => [$this, 'add_key'],
+                'permission_callback' => [RsvRestPolicy::class, 'admin'],
+            ],
+        ]);
+
+        register_rest_route($this->namespace, '/' . $this->resource_name . '/(?P<id>\d+)/keys/(?P<key_id>\d+)', [
+            [
+                'methods'             => 'DELETE',
+                'callback'            => [$this, 'delete_key'],
+                'permission_callback' => [RsvRestPolicy::class, 'admin'],
+            ],
+        ]);
+    }
+
+    public function index(WP_REST_Request $request): WP_REST_Response {
+        [$skip, $limit] = self::paging($request);
+        $repo = new RsvMembershipProgramRepository();
+        $programs = array_map(fn($p) => $p->to_array(), $repo->all($limit, $skip));
+        return $this->paged_response($programs, $repo->count_all());
+    }
+
+    public function create(WP_REST_Request $request): WP_REST_Response {
+        $params = $request->get_json_params();
+        $name = $params['name'] ?? '';
+        $active = $params['active'] ?? true;
+
+        if (trim($name) === '') {
+            throw new InvalidArgumentException('Name is required.');
+        }
+
+        $repo = new RsvMembershipProgramRepository();
+        $id = $repo->add($name, $active);
+        return new WP_REST_Response(RsvMembershipProgram::from_array(['id' => $id, 'name' => $name, 'active' => $active])->to_array(), 201);
+    }
+
+    public function show(WP_REST_Request $request): WP_REST_Response {
+        $id = (int) $request->get_param('id');
+        $repo = new RsvMembershipProgramRepository();
+        $program = $repo->get($id);
+
+        if ($program === null) {
+            return new WP_REST_Response(['error' => 'Not found'], 404);
+        }
+
+        return new WP_REST_Response($program, 200);
+    }
+
+    public function update(WP_REST_Request $request): WP_REST_Response {
+        $id = (int) $request->get_param('id');
+        $params = $request->get_json_params();
+        $name = $params['name'] ?? '';
+        $active = $params['active'] ?? true;
+
+        if (trim($name) === '') {
+            throw new InvalidArgumentException('Name is required.');
+        }
+
+        $repo = new RsvMembershipProgramRepository();
+        if ($repo->get($id) === null) {
+            return new WP_REST_Response(['error' => 'Not found'], 404);
+        }
+
+        $repo->update($id, $name, $active);
+        return new WP_REST_Response(['id' => $id, 'name' => $name, 'active' => $active], 200);
+    }
+
+    public function delete(WP_REST_Request $request): WP_REST_Response {
+        $id = (int) $request->get_param('id');
+        $repo = new RsvMembershipProgramRepository();
+
+        if ($repo->get($id) === null) {
+            return new WP_REST_Response(['error' => 'Not found'], 404);
+        }
+
+        $repo->delete($id);
+        return new WP_REST_Response(['ok' => true], 200);
+    }
+
+    public function index_keys(WP_REST_Request $request): WP_REST_Response {
+        [$skip, $limit] = self::paging($request);
+        $program_id = (int) $request->get_param('id');
+        $repo = new RsvMembershipProgramRepository();
+
+        if ($repo->get($program_id) === null) {
+            return new WP_REST_Response(['error' => 'Program not found'], 404);
+        }
+
+        $keys = array_map(fn($k) => $k->to_array(), $repo->keys($program_id, $limit, $skip));
+        return $this->paged_response($keys, $repo->count_keys($program_id));
+    }
+
+    public function add_key(WP_REST_Request $request): WP_REST_Response {
+        $program_id = (int) $request->get_param('id');
+        $params = $request->get_json_params();
+        $key_value = $params['key_value'] ?? '';
+
+        if (trim($key_value) === '') {
+            throw new InvalidArgumentException('Key value is required.');
+        }
+
+        $repo = new RsvMembershipProgramRepository();
+        if ($repo->get($program_id) === null) {
+            return new WP_REST_Response(['error' => 'Program not found'], 404);
+        }
+
+        $key_id = $repo->add_key($program_id, $key_value);
+        return new WP_REST_Response(['id' => $key_id, 'program_id' => $program_id, 'key_value' => $key_value], 201);
+    }
+
+    public function delete_key(WP_REST_Request $request): WP_REST_Response {
+        $program_id = (int) $request->get_param('id');
+        $key_id = (int) $request->get_param('key_id');
+
+        $repo = new RsvMembershipProgramRepository();
+        if ($repo->get($program_id) === null) {
+            return new WP_REST_Response(['error' => 'Program not found'], 404);
+        }
+
+        $repo->delete_key($key_id);
+        return new WP_REST_Response(['ok' => true], 200);
+    }
+
+}

includes/Events/RsvTimetableReservationCreatedEvent.php

@@ -2,6 +2,7 @@
 
 class RsvTimetableReservationCreatedEvent {
     public function __construct(
-        public RsvTimetableReservation $reservation
+        public RsvTimetableReservation $reservation,
+        public RsvReservation $parent
     ) {}
 }

includes/Events/RsvTimetableReservationPendingEvent.php

@@ -9,7 +9,7 @@ class RsvTimetableReservationPendingEvent {
     public function __construct(
         public int                     $reservation_id,
         public RsvTimetableReservation $reservation,
-        public string                  $code,
+        public ?string                  $code,
         public string                  $maintainer_email
     ) {}
 }

includes/Listeners/RsvEmailListener.php

@@ -8,10 +8,12 @@ use Reservair\Templating\RsvTemplateEngine;
  *
  * Two responsibilities:
  *  1. Maintainer approval request — fires per timetable item that needs
- *     confirmation; template is hardcoded (not admin-configurable).
+ *     confirmation, carrying the accept/refuse links the maintainer acts on.
  *  2. User notification on form close — fires once per form submission when
- *     every reservation item reaches a terminal state. Subject/body come from
+ *     every reservation item reaches a terminal state.
- *     the form definition's reservation element `email_templates` attr.
+ *
+ * Both subjects/bodies come from the reservation element's `email_templates`
+ * attr, falling back to the hardcoded defaults when the admin left them blank.
  *
  * Exceptions are swallowed so a mail failure never rolls back a transaction.
  */
@@ -52,7 +54,15 @@ class RsvEmailListener {
             $start_dt = (clone $event->reservation->start_utc)->setTimezone($tz);
             $end_dt   = (clone $event->reservation->end_utc)->setTimezone($tz);
 
-            $body = $engine->render(self::DEFAULT_PENDING_BODY, [
+            [$tpl, $form_values] = self::resolve_maintainer_template($event);
+
+            // Treat blank (admin cleared the field) the same as "use the default".
+            $subject_tpl = trim((string) ($tpl['subject'] ?? '')) !== '' ? $tpl['subject'] : self::DEFAULT_PENDING_SUBJECT;
+            $body_tpl    = trim((string) ($tpl['body']    ?? '')) !== '' ? $tpl['body']    : self::DEFAULT_PENDING_BODY;
+
+            // Reservation context wins over form values on key collisions, so the
+            // accept/refuse links can never be shadowed by a submitted field.
+            $symbols = array_merge($form_values, [
                 'reservation_id' => (string) $event->reservation_id,
                 'date'           => $start_dt->format('Y-m-d'),
                 'start'          => $start_dt->format('H:i'),
@@ -61,12 +71,59 @@ class RsvEmailListener {
                 'refuse_url'     => get_rest_url(null, 'reservations/v1/timetable-reservation/refuse/' . $event->code),
             ]);
 
-            (new RsvEmailSender())->send($event->maintainer_email, self::DEFAULT_PENDING_SUBJECT, $body);
+            $subject = sanitize_text_field($engine->render_plain($subject_tpl, $symbols));
+            $body    = $engine->render($body_tpl, $symbols);
+
+            (new RsvEmailSender())->send($event->maintainer_email, $subject, $body);
         } catch (\Throwable $e) {
             Logger::error($e);
         }
     }
 
+    /**
+     * Resolves the admin-authored maintainer template for the timetable this
+     * reservation belongs to, together with the submission's field values so the
+     * template can reference the submitter's answers.
+     *
+     * @return array{0: array<string, mixed>, 1: array<string, mixed>} The
+     *         maintainer template (empty when none is configured) and form values.
+     */
+    private static function resolve_maintainer_template(RsvTimetableReservationPendingEvent $event): array {
+        $form_submit_id = (new RsvReservationRepository())->get_form_submit_id($event->reservation_id);
+        if ($form_submit_id === null) {
+            return [[], []];
+        }
+
+        $form_submit = (new RsvFormSubmitRepository())->get($form_submit_id);
+        if ($form_submit === null) {
+            return [[], []];
+        }
+
+        $form_values = is_array($form_submit['values'] ?? null) ? $form_submit['values'] : [];
+
+        $definition = (new RsvFormDefinitionRepository())->get((int) $form_submit['form_id']);
+        if ($definition === null) {
+            return [[], $form_values];
+        }
+
+        $elements            = $definition['definition']['elements'] ?? [];
+        $reservation_element = null;
+        foreach ($elements as $el) {
+            if (!is_array($el) || ($el['type'] ?? '') !== 'reservation') {
+                continue;
+            }
+            $reservation_element ??= $el; // fall back to the first reservation element
+            if ((int) ($el['timetable_id'] ?? 0) === $event->reservation->timetable_id) {
+                $reservation_element = $el;
+                break;
+            }
+        }
+
+        $template = $reservation_element['email_templates']['maintainer'] ?? [];
+
+        return [is_array($template) ? $template : [], $form_values];
+    }
+
     public static function on_form_submit_closed(RsvFormSubmitClosedEvent $event): void {
         try {
             $form_submit = (new RsvFormSubmitRepository())->get($event->form_submit_id);
@@ -123,11 +180,18 @@ class RsvEmailListener {
             global $rsv_template_registry;
             $engine = new RsvTemplateEngine(registry: $rsv_template_registry);
 
+            $form_definition = new RsvFormDefinition((string) $form_submit['form_id'], $definition['definition']);
+            $form_data       = new RsvFormData($form_values);
+
+            // Calculated values (e.g. price) win over submitted fields so they can't be shadowed.
+            $symbols = array_merge($form_values, (new RsvFormCalculatedValues())->for($form_definition, $form_data));
+
             // Subject is plain text: render without HTML-escaping, then strip tags/newlines.
-            $subject = sanitize_text_field($engine->render_plain($subject_tpl, $form_values));
+            $subject = sanitize_text_field($engine->render_plain($subject_tpl, $symbols));
 
             // Body is HTML: the engine HTML-escapes all interpolated values.
-            $body = $engine->render($body_tpl, $form_values);
+            $body = $engine->render($body_tpl, $symbols);
+            error_log("Prc");
 
             (new RsvEmailSender())->send($user_email, $subject, $body);
         } catch (\Throwable $e) {

includes/Listeners/RsvGoogleCalendarListener.php

@@ -10,23 +10,37 @@ class RsvGoogleCalendarListener {
 
     public static function on_created(RsvTimetableReservationCreatedEvent $event): void {
         try {
+            $form_submit = (new RsvFormSubmitRepository())->get((int) $event->parent->form_submit_id);
+            if ($form_submit === null) {
+                return;
+            }
+
+            $definition = (new RsvFormDefinitionRepository())->get((int) $form_submit['form_id']);
+            if ($definition === null) {
+                return;
+            }
+
+            $email_key  = $definition['definition']['email_key'] ?? null;
+            $user_email = is_string($email_key) && $email_key !== '' ? ($form_values[$email_key] ?? null) : null;
+
             $gcal = new RsvGoogleCalendarService();
             if (!$gcal->is_google_connected()) {
                 return;
             }
 
-            $calendar_id = self::resolve_calendar_id($gcal, $event->timetable_id);
+            $calendar_id = self::resolve_calendar_id($gcal, $event->reservation->timetable_id);
             if (!$calendar_id) {
                 return;
             }
 
-            $status = $event->reservation->requires_confirmation ? 'tentative' : 'confirmed';
+            $status = $event->reservation->is_confirmed == null ? 'tentative' : 'confirmed';
             $gcal->add_event(
                 $calendar_id,
                 "Reservation #{$event->reservation->id}",
-                $event->reservation->start,
+                // format time as utc
-                $event->reservation->end,
+                $event->reservation->start_utc->format('Y-m-d H:i:s'),
-                $event->reservation->user_email,
+                $event->reservation->end_utc->format('Y-m-d H:i:s'),
+                $user_email,
                 $event->reservation->id,
                 $status,
             );

includes/Models/RsvMembershipKey.php

@@ -0,0 +1,42 @@
+<?php
+
+class RsvMembershipKey {
+    public ?int $id;
+
+    public int $program_id;
+
+    public string $key_value;
+
+    public static function schema(): array {
+        return [
+            'type'       => 'object',
+            'properties' => [
+                'id'         => ['type' => 'integer', 'readonly' => true],
+                'program_id' => ['type' => 'integer', 'required' => true],
+                'key_value'  => ['type' => 'string', 'required' => true, 'minLength' => 1],
+            ],
+        ];
+    }
+
+    public static function from_array(array $data): self {
+        return new self(
+            intval($data['id'] ?? null),
+            intval($data['program_id'] ?? 0),
+            $data['key_value'] ?? ''
+        );
+    }
+
+    public function __construct(?int $id, int $program_id, string $key_value) {
+        $this->id = $id;
+        $this->program_id = $program_id;
+        $this->key_value = $key_value;
+    }
+
+    public function to_array() {
+        return [
+            'id' => $this->id,
+            'program_id' => $this->program_id,
+            'key_value' => $this->key_value,
+        ];
+    }
+}

includes/Models/RsvMembershipProgram.php

@@ -0,0 +1,42 @@
+<?php
+
+class RsvMembershipProgram {
+    public ?int $id;
+
+    public string $name;
+
+    public bool $active;
+
+    public static function schema(): array {
+        return [
+            'type'       => 'object',
+            'properties' => [
+                'id'     => ['type' => 'integer', 'readonly' => true],
+                'name'   => ['type' => 'string', 'required' => true, 'minLength' => 1],
+                'active' => ['type' => 'boolean', 'default' => true],
+            ],
+        ];
+    }
+
+    public static function from_array(array $data): self {
+        return new self(
+            intval($data['id'] ?? null),
+            $data['name'] ?? '',
+            boolval($data['active'] ?? true)
+        );
+    }
+
+    public function __construct(?int $id, string $name, bool $active = true) {
+        $this->id = $id;
+        $this->name = $name;
+        $this->active = $active;
+    }
+
+    public function to_array() {
+        return [
+            'id' => $this->id,
+            'name' => $this->name,
+            'active' => $this->active,
+        ];
+    }
+}

includes/Models/RsvTimetableReservation.php

@@ -6,6 +6,8 @@ class RsvTimetableReservation {
     public DateTime $start_utc; // UTC, 'Y-m-d H:i:s'
     public DateTime $end_utc;   // UTC, 'Y-m-d H:i:s'
 
+    public ?int $is_confirmed = null;
+
     public static function schema(): array {
         return [
             'type'       => 'object',

includes/Repository/RsvMembershipProgramRepository.php

@@ -0,0 +1,114 @@
+<?php
+
+use Reservair\Database\Db;
+
+class RsvMembershipProgramRepository {
+    private string $table_program;
+    private string $table_key;
+
+    public function __construct() {
+        $this->table_program = Db::prefix() . 'rsv_membership_program';
+        $this->table_key = Db::prefix() . 'rsv_membership_key';
+    }
+
+    public function all(?int $limit = null, int $skip = 0): array {
+        if ($limit === null) {
+            $rows = Db::get_results(
+                "SELECT * FROM {$this->table_program} ORDER BY id DESC",
+                [],
+                ARRAY_A
+            );
+        } else {
+            $rows = Db::get_results(
+                "SELECT * FROM {$this->table_program} ORDER BY id DESC LIMIT %d OFFSET %d",
+                [$limit, $skip],
+                ARRAY_A
+            );
+        }
+        return array_map(fn($row) => RsvMembershipProgram::from_array($row), $rows);
+    }
+
+    public function count_all(): int {
+        return (int) Db::get_var("SELECT COUNT(*) FROM {$this->table_program}");
+    }
+
+    public function get(int $id): ?array {
+        return Db::get_row(
+            "SELECT * FROM {$this->table_program} WHERE id = %d",
+            [$id],
+            ARRAY_A
+        );
+    }
+
+    public function add(string $name, bool $active): int {
+        return Db::insert($this->table_program, [
+            'name' => $name,
+            'active' => $active ? 1 : 0,
+        ]);
+    }
+
+    public function update(int $id, string $name, bool $active): int {
+        return Db::update(
+            $this->table_program,
+            [
+                'name' => $name,
+                'active' => $active ? 1 : 0,
+            ],
+            ['id' => $id]
+        );
+    }
+
+    public function delete(int $id): void {
+        Db::delete($this->table_program, ['id' => $id]);
+    }
+
+    public function keys(int $program_id, ?int $limit = null, int $skip = 0): array {
+        if ($limit === null) {
+            $rows = Db::get_results(
+                "SELECT * FROM {$this->table_key} WHERE program_id = %d ORDER BY id",
+                [$program_id],
+                ARRAY_A
+            );
+        } else {
+            $rows = Db::get_results(
+                "SELECT * FROM {$this->table_key} WHERE program_id = %d ORDER BY id LIMIT %d OFFSET %d",
+                [$program_id, $limit, $skip],
+                ARRAY_A
+            );
+        }
+        return array_map(fn($row) => RsvMembershipKey::from_array($row), $rows);
+    }
+
+    public function count_keys(int $program_id): int {
+        return (int) Db::get_var(
+            "SELECT COUNT(*) FROM {$this->table_key} WHERE program_id = %d",
+            [$program_id]
+        );
+    }
+
+    private function normalize_key(string $key_value): string {
+        return preg_replace('/\s+/', ' ', strtolower(trim($key_value)));
+    }
+
+    public function add_key(int $program_id, string $key_value): int {
+        return Db::insert($this->table_key, [
+            'program_id' => $program_id,
+            'key_value' => $key_value,
+            'key_normalized_value' => $this->normalize_key($key_value)
+        ]);
+    }
+
+    public function delete_key(int $key_id): void {
+        Db::delete($this->table_key, ['id' => $key_id]);
+    }
+
+    public function key_exists(int $program_id, string $key_value): bool {
+        return Db::get_var(
+            "SELECT 1 FROM {$this->table_key} k
+             INNER JOIN {$this->table_program} p ON p.id = k.program_id
+             WHERE p.active = 1 AND k.program_id = %d AND k.key_normalized_value = %s
+             LIMIT 1",
+            [$program_id, $this->normalize_key($key_value)]
+        ) !== null;
+    }
+}

includes/Repository/RsvTimetableRepository.php

@@ -50,6 +50,7 @@ class RsvTimetableRepository {
                 'name'             => $timetable->name,
                 'block_size'       => $timetable->block_size,
                 'maintainer_email' => $timetable->maintainer_email,
+                'google_calendar_id' => $timetable->google_calendar_id,
             ],
             ['id' => $id]
         );

includes/RsvAdminMenuDefinition.php

@@ -8,6 +8,7 @@ function rsv_admin_menu_definition() {
     $forms        = new RsvFormsPage();
     $timetable    = new RsvTimetablePage();
     $google_cal   = new RsvGoogleCalendarSettingsPage();
+    $membership   = new RsvMembershipProgramsPage();
 
     add_menu_page(
         'Reservations Settings',     // Page title
@@ -28,6 +29,15 @@ function rsv_admin_menu_definition() {
         [$forms, 'render']
     );
 
+    add_submenu_page(
+        'reservations-settings',
+        'Membership Programs',
+        'Membership Programs',
+        RsvCapabilities::MANAGE,
+        'membership-programs',
+        [$membership, 'render']
+    );
+
     add_submenu_page(
         'reservations-settings',
         'Timetables',

includes/RsvInstaller.php

@@ -93,6 +93,26 @@ class RsvInstaller {
                 ON DELETE CASCADE
         ) $charset_collate;");
 
+        self::run("CREATE TABLE IF NOT EXISTS {$wpdb->prefix}rsv_membership_program (
+            id      bigint unsigned NOT NULL AUTO_INCREMENT,
+            name    TINYTEXT        NOT NULL,
+            active  BOOLEAN         NOT NULL DEFAULT TRUE,
+            PRIMARY KEY (id)
+        ) $charset_collate;");
+
+        self::run("CREATE TABLE IF NOT EXISTS {$wpdb->prefix}rsv_membership_key (
+            id          bigint unsigned NOT NULL AUTO_INCREMENT,
+            program_id  bigint unsigned NOT NULL,
+            key_value   VARCHAR(191)    NOT NULL,
+            key_normalized_value   VARCHAR(191)    NOT NULL,
+            PRIMARY KEY (id),
+            UNIQUE KEY uniq_program_key (program_id, key_normalized_value),
+            KEY idx_key_value (key_normalized_value),
+            CONSTRAINT fk_member_key_program
+                FOREIGN KEY (program_id) REFERENCES {$wpdb->prefix}rsv_membership_program (id)
+                ON DELETE CASCADE
+        ) $charset_collate;");
+
         // Grant the custom capability that gates the admin REST endpoints.
         RsvCapabilities::ensure();
     }

includes/RsvRestApiDefinition.php

@@ -84,4 +84,5 @@ function rsv_define_rest_api(): void {
     (new RsvTimetableReservationController())->register_routes();
     (new RsvFormController())->register_routes();
     (new RsvFormDefinitionController())->register_routes();
+    (new RsvMembershipProgramController())->register_routes();
 }

includes/Services/Forms/Pricing/RsvFormPriceCalculator.php

@@ -0,0 +1,22 @@
+<?php
+
+/** Computes a form's total price as the sum of its elements' prices, reduced by membership discount. */
+class RsvFormPriceCalculator {
+    public function calculate(RsvFormDefinition $definition, RsvFormData $data): float {
+        global $rsv_form_price_registry;
+
+        $total = 0.0;
+
+        foreach ($definition->getElements() as $element) {
+            $calculator = $rsv_form_price_registry->get($element->getType());
+            if ($calculator === null) {
+                continue; // Unpriced element type contributes nothing.
+            }
+
+            $total += (float) $calculator($element, $data->getValue($element->getName()));
+        }
+
+        $pct = (new RsvMembershipService())->discount_for($definition, $data);
+        return $total * (1.0 - max(0.0, min(100.0, $pct)) / 100.0);
+    }
+}

includes/Services/Forms/Pricing/RsvFormPriceCalculatorRegistry.php

@@ -0,0 +1,21 @@
+<?php
+
+class RsvFormPriceCalculatorRegistry {
+    /** @var array<string, callable(RsvFormElementDefinition, mixed): float> */
+    private array $calculators = [];
+
+    public function register(string $type, callable $calculator): void {
+        $this->calculators[$type] = $calculator;
+    }
+
+    public function get(string $type): ?callable {
+        return $this->calculators[$type] ?? null;
+    }
+
+    /** Builds the registry and lets other modules contribute calculators. */
+    public static function boot(): self {
+        $registry = new self();
+        do_action('rsv-register-price-calculator', $registry);
+        return $registry;
+    }
+}

includes/Services/Forms/RsvFormCalculatedValues.php

@@ -0,0 +1,36 @@
+<?php
+
+/** Values derived from a submission (not entered by the visitor), exposed to templates. */
+final class RsvFormCalculatedValues {
+    /** @return array<string, mixed> */
+    public function for(RsvFormDefinition $definition, RsvFormData $data): array {
+        $calculator = new RsvFormPriceCalculator();
+        global $rsv_form_price_registry;
+
+        $price_before_discount = 0.0;
+        foreach ($definition->getElements() as $element) {
+            $element_calculator = $rsv_form_price_registry->get($element->getType());
+            if ($element_calculator === null) {
+                continue;
+            }
+            $price_before_discount += (float) $element_calculator($element, $data->getValue($element->getName()));
+        }
+
+        $discount_pct = (new RsvMembershipService())->discount_for($definition, $data);
+        $final_price = $calculator->calculate($definition, $data);
+
+        return [
+            'price' => $final_price,
+            'price_before_discount' => $price_before_discount,
+            'discount_percent' => $discount_pct,
+        ];
+    }
+
+    /**
+     * The names these values expose, so template validation accepts {{ price }}.
+     * @return list<string>
+     */
+    public static function names(): array {
+        return ['price', 'price_before_discount', 'discount_percent'];
+    }
+}

includes/Services/Forms/RsvFormDefinition.php

@@ -7,10 +7,12 @@ class RsvFormDefinition {
 
     public string $email_key = "";
 
+    public array $membership = [];
+
     public string $success_message = "";
 
     /**
-     * @param array<int,mixed> $definition Full definition array including 'elements', 'email_key' and 'success_message'.
+     * @param array<string,mixed> $definition Full definition array including 'elements', 'email_key' and 'success_message'.
      */
     public function __construct(string $id, array $definition) {
         $this->_elements = [];
@@ -23,6 +25,7 @@ class RsvFormDefinition {
 
         $this->_id             = $id;
         $this->email_key       = $definition['email_key'] ?? '';
+        $this->membership      = $definition['membership'] ?? [];
         $this->success_message = $definition['success_message'] ?? '';
     }
 
@@ -34,6 +37,15 @@ class RsvFormDefinition {
         return $this->email_key;
     }
 
+    /** @return array<int,array{program_id:int,discount:float,field:string}> */
+    public function getMembershipBindings(): array {
+        return $this->membership['bindings'] ?? [];
+    }
+
+    public function getMembershipCombine(): string {
+        return $this->membership['combine'] ?? 'max';
+    }
+
     /** Template shown to the visitor after a successful submission. */
     public function getSuccessMessage(): string {
         return $this->success_message;

includes/Services/Forms/RsvFormDefinitionValidator.php

@@ -34,6 +34,9 @@ final class RsvFormDefinitionValidator {
             $errors[] = 'Form must contain a submit button.';
         }
 
+        // Validate membership bindings if present.
+        $errors = array_merge($errors, $this->validate_membership_bindings($definition));
+
         return $errors;
     }
 
@@ -44,7 +47,7 @@ final class RsvFormDefinitionValidator {
      * @return list<string>
      */
     private function symbols(array $elements): array {
-        $names = [];
+        $names = RsvFormCalculatedValues::names(); // calculated values are referencable too
         foreach ($elements as $el) {
             $name = is_array($el) ? ($el['name'] ?? '') : '';
             if (is_string($name) && $name !== '') {
@@ -109,4 +112,41 @@ final class RsvFormDefinitionValidator {
         global $rsv_template_registry;
         return new RsvTemplateEngine(registry: $rsv_template_registry);
     }
+
+    /**
+     * @param array<string,mixed> $definition
+     * @return list<string>
+     */
+    private function validate_membership_bindings(array $definition): array {
+        $errors = [];
+        $membership = $definition['membership'] ?? [];
+
+        if (!is_array($membership)) {
+            return $errors;
+        }
+
+        $bindings = $membership['bindings'] ?? [];
+        if (!is_array($bindings)) {
+            return $errors;
+        }
+
+        foreach ($bindings as $idx => $binding) {
+            if (!is_array($binding)) {
+                continue;
+            }
+
+            $program_id = intval($binding['program_id'] ?? 0);
+            $discount = floatval($binding['discount'] ?? 0.0);
+
+            if ($program_id <= 0) {
+                $errors[] = "Membership binding {$idx}: program_id must be a positive integer.";
+            }
+
+            if ($discount < 0.0 || $discount > 100.0) {
+                $errors[] = "Membership binding {$idx}: discount must be between 0 and 100.";
+            }
+        }
+
+        return $errors;
+    }
 }

includes/Services/Membership/MEMBERSHIP.md

@@ -0,0 +1,9 @@
+# Membership
+
+Forms can have a price calculated from it's definition and submitted data. For a discount, the administrator can create a membership program. In the system, that means a collection of strings. In the form definition, the administrator defines, which membership program applies what discount and how to extract the key into the membership program from the from submission.
+
+## Matching the keys
+
+The membership is a collection of keys. But some types of them are hard to match exactly. For example it might be important to ignore case or be culture invariant. For this reason, second column in the membership table is used, which is for the normalized key, that must be matched exactly against another normalized key. 
+
+For example, for full names, the process of normalization might remove diacritics or convert to lowercase. The same process must be applied when looking for the key.

includes/Services/Membership/RsvMembershipService.php

@@ -0,0 +1,50 @@
+<?php
+
+class RsvMembershipService {
+
+
+
+    /**
+     * Total membership discount for a submission.
+     *
+     * Each binding names a form field whose submitted value must match a key
+     * in the bound program. Matching bindings' discounts are combined per the
+     * definition's combine mode: the best single discount, or all summed and
+     * capped at 100%.
+     */
+    public function discount_for(RsvFormDefinition $def, RsvFormData $data): float {
+        $repo = new RsvMembershipProgramRepository();
+        $matched_discounts = [];
+
+        foreach ($def->getMembershipBindings() as $binding) {
+            $program_id = intval($binding['program_id'] ?? 0);
+            $discount   = floatval($binding['discount'] ?? 0.0);
+            $field      = strval($binding['field'] ?? '');
+
+            if ($program_id <= 0 || $field === '') {
+                continue;
+            }
+
+            $raw   = $data->getValue($field, '');
+            $value = is_scalar($raw) ? trim((string) $raw) : '';
+
+            if ($value === '') {
+                continue;
+            }
+
+            if ($repo->key_exists($program_id, $value)) {
+                $matched_discounts[] = $discount;
+            }
+        }
+
+        if (empty($matched_discounts)) {
+            return 0.0;
+        }
+
+        if ($def->getMembershipCombine() === 'sum') {
+            return min(100.0, array_sum($matched_discounts));
+        }
+
+        return max($matched_discounts);
+    }
+}

includes/Services/RsvReservationService.php

@@ -27,6 +27,9 @@ class RsvReservationService {
     }
 
     public function create(RsvReservation $reservation) {
+        $reservation->timetable_reservations =
+            $this->merge_adjacent($reservation->timetable_reservations);
+
         // Serialise the availability-check + insert per timetable so two
         // concurrent bookings for the last free slot can't both pass the
         // capacity check and oversell. Locks are taken in a stable order to
@@ -50,9 +53,10 @@ class RsvReservationService {
 
             try {
                 $reservation_id = $this->repo->insert($reservation->to_array());
+                $reservation->id = $reservation_id;
 
                 foreach ($reservation->timetable_reservations as $timetable_reservation) {
-                    $timetable_reservation_service->create($reservation_id, $timetable_reservation);
+                    $timetable_reservation->id = $timetable_reservation_service->create($reservation_id, $timetable_reservation);
                 }
 
                 Db::commit();
@@ -64,7 +68,19 @@ class RsvReservationService {
 
             // Only now that the rows are durably committed do we let listeners
             // (maintainer emails, calendar sync) observe the new reservation.
-            $timetable_reservation_service->flush_deferred_events();
+            foreach($reservation->timetable_reservations as $timetable_reservation) {
+                if($timetable_reservation->is_confirmed === null) {
+                    $maintainer_email = (new RsvTimetableRepository())->get_maintainer_email($timetable_reservation->timetable_id);
+                    RsvEventDispatcher::dispatch(new RsvTimetableReservationPendingEvent(
+                        $reservation_id,
+                        $timetable_reservation,
+                        $timetable_reservation_service->get_confirmation_code($timetable_reservation->id),
+                        $maintainer_email
+                    ));
+                }
+
+                RsvEventDispatcher::dispatch(new RsvTimetableReservationCreatedEvent($timetable_reservation, $reservation));
+            }
 
             $this->confirmation_state_changed($reservation_id);
 
@@ -80,6 +96,48 @@ class RsvReservationService {
         return Db::prefix() . 'rsv_booking_' . $timetable_id;
     }
 
+    /**
+     * Collapse runs of touching reservations into single spans, so a sequence
+     * of back-to-back blocks is stored and notified as one booking.
+     *
+     * @param  list<RsvTimetableReservation> $timetable_reservations
+     * @return list<RsvTimetableReservation>
+     */
+    private function merge_adjacent(array $timetable_reservations): array {
+        $by_timetable = [];
+        foreach ($timetable_reservations as $tr) {
+            $by_timetable[$tr->timetable_id][] = $tr;
+        }
+
+        $merged = [];
+        foreach ($by_timetable as $group) {
+            usort($group, fn($a, $b) => $a->start_utc <=> $b->start_utc);
+
+            $current = null;
+            foreach ($group as $tr) {
+                if ($current !== null && $tr->start_utc <= $current->end_utc) {
+                    if ($tr->end_utc > $current->end_utc) {
+                        $current->end_utc = $tr->end_utc;
+                    }
+                    continue;
+                }
+
+                if ($current !== null) {
+                    $merged[] = $current;
+                }
+                $current = new RsvTimetableReservation(
+                    null, $tr->timetable_id, $tr->start_utc, $tr->end_utc
+                );
+            }
+
+            if ($current !== null) {
+                $merged[] = $current;
+            }
+        }
+
+        return $merged;
+    }
+
     /** Delete a reservation and its dependent timetable reservations and confirmations. */
     public function delete(int $id): void {
         $this->repo->delete($id);

includes/Services/RsvTimetableReservationService.php

@@ -115,13 +115,9 @@ class RsvTimetableReservationService {
         return $this->repo->has_pending_confirmation($reservation_id);
     }
 
-    private function get_confirmation_code(int $reservation_id): string {
+    public function get_confirmation_code(int $reservation_id): ?string {
         $code = $this->repo->get_confirmation_code($reservation_id);
 
-        if ($code === null) {
-            throw new InvalidArgumentException('No pending confirmation for this reservation.');
-        }
-
         return $code;
     }
 
@@ -157,20 +153,13 @@ class RsvTimetableReservationService {
 
             if ($maintainer_email) {
                 $code = $this->create_confirmation($reservation_id, $id);
-                $this->deferred_events[] = new RsvTimetableReservationPendingEvent(
-                    $reservation_id,
-                    $reservation,
-                    $code,
-                    $maintainer_email
-                );
             }
         } else {
+            $reservation->is_confirmed = 1;
             $reservation_service = new RsvReservationService();
             $reservation_service->confirmation_state_changed($reservation_id);
         }
 
-        $this->deferred_events[] = new RsvTimetableReservationCreatedEvent($reservation);
-
         return $id;
     }
 

includes/Views/RsvFormsPage.php

@@ -106,6 +106,7 @@ class RsvFormsPage extends RsvAdminPage {
 
         $next_id    = count($elements_with_ids) + 1;
         $timetables = (new RsvTimetableService())->get_all();
+        $programs   = array_map(fn($p) => $p->to_array(), (new RsvMembershipProgramRepository())->all());
 
         $email_key_options = ['' => '— select field —'];
         foreach ($raw_elements as $el) {
@@ -130,6 +131,25 @@ class RsvFormsPage extends RsvAdminPage {
             ->render();
         ?>
 
+        <hr>
+        <h2>Membership Discounts</h2>
+        <p>Map a membership program to a discount percentage. The chosen field's value must match a key in that program for the discount to apply.</p>
+        <?php
+        $membership = $definition['membership'] ?? [];
+        $bindings   = $membership['bindings'] ?? [];
+        ?>
+        <div id="rsv_membership_bindings_table"></div>
+        <p>
+            <button type="button" class="button" id="rsv_add_binding_btn">+ Add Binding</button>
+        </p>
+        <label>
+            Combine mode:
+            <select name="definition.membership_combine">
+                <option value="max" <?= ($membership['combine'] ?? 'max') === 'max' ? 'selected' : '' ?>>Max (best discount wins)</option>
+                <option value="sum" <?= ($membership['combine'] ?? 'max') === 'sum' ? 'selected' : '' ?>>Sum (capped at 100%)</option>
+            </select>
+        </label>
+
         <hr>
         <?php
         RsvColumnLayout::split('3:2')
@@ -149,24 +169,30 @@ class RsvFormsPage extends RsvAdminPage {
             ->output();
         ?>
 
-        <?php $this->elements_table_script($elements_with_ids, $next_id, 'edit_form_definition', $element_types, $timetables); ?>
+        <?php $this->elements_table_script($elements_with_ids, $next_id, 'edit_form_definition', $element_types, $timetables, $programs, $bindings); ?>
         <?php
     }
 
-    private function elements_table_script(array $elements_with_ids, int $next_id, string $form_id, array $element_types, array $timetables = []): void {
+    private function elements_table_script(array $elements_with_ids, int $next_id, string $form_id, array $element_types, array $timetables = [], array $programs = [], array $bindings = []): void {
         $elements_json   = json_encode($elements_with_ids);
         $types_json      = json_encode(array_values($element_types));
         $timetables_json = json_encode(array_values($timetables));
+        $programs_json   = json_encode(array_values($programs));
+        $bindings_json   = json_encode(array_values($bindings));
+        $bindings_next   = count($bindings) + 1;
         ?>
         <script>
         const rsv_element_types = <?= $types_json ?>;
         const rsv_timetables    = <?= $timetables_json ?>;
+        const rsv_membership_programs = <?= $programs_json ?>;
 
         const RSV_EMAIL_DEFAULTS = {
             accepted_subject: <?= json_encode('Rezervace přijata') ?>,
             accepted_body:    <?= json_encode("<h1>Vaše rezervace byla přijata</h1>\n<p>Vaše rezervace byla schválena. Těšíme se na vás!</p>") ?>,
             refused_subject:  <?= json_encode('Rezervace zamítnuta') ?>,
             refused_body:     <?= json_encode("<h1>Vaše rezervace byla zamítnuta</h1>\n<p>Vaše rezervace bohužel nebyla schválena. Zkuste prosím jiný termín.</p>") ?>,
+            maintainer_subject: <?= json_encode('Nová rezervace čeká na schválení') ?>,
+            maintainer_body:    <?= json_encode("<h1>Nový požadavek o rezervaci</h1>\n<p>Rezervace č. {{reservation_id}} čeká na vaše schválení.</p>\n<p><strong>Datum:</strong> {{date}}</p>\n<p><strong>Čas:</strong> {{start}} – {{end}}</p>\n<p><reservation-actions></reservation-actions></p>") ?>,
         };
 
         const rsv_elements_source = (function(initial_items, next_id_start) {
@@ -205,6 +231,10 @@ class RsvFormsPage extends RsvAdminPage {
                             timetable_id:    data.timetable_id ? parseInt(data.timetable_id) : null,
                             price_per_block: parseFloat(data.price_per_block ?? '0') || 0,
                             email_templates: {
+                                maintainer: {
+                                    subject: data.email_maintainer_subject ?? RSV_EMAIL_DEFAULTS.maintainer_subject,
+                                    body:    data.email_maintainer_body    ?? RSV_EMAIL_DEFAULTS.maintainer_body,
+                                },
                                 on_accepted: {
                                     enabled: !!data.email_accepted_enabled,
                                     subject: data.email_accepted_subject ?? RSV_EMAIL_DEFAULTS.accepted_subject,
@@ -243,14 +273,62 @@ class RsvFormsPage extends RsvAdminPage {
             };
         })(<?= $elements_json ?>, <?= $next_id ?>);
 
+        const rsv_bindings_source = (function(initial_items, next_id_start) {
+            const items = (initial_items || []).map((b, i) => ({
+                id:         i + 1,
+                program_id: parseInt(b.program_id) || 0,
+                discount:   parseFloat(b.discount) || 0,
+                field:      b.field ?? '',
+            }));
+            let next_id = next_id_start;
+
+            return {
+                get_page(skip, limit) {
+                    skip = skip ?? 0;
+                    limit = limit ?? 20;
+                    return Promise.resolve({ total: items.length, data: items.slice(skip, skip + limit) });
+                },
+                put(id, data) {
+                    const idx = items.findIndex(e => e.id === id);
+                    if (idx === -1) return Promise.reject(new Error('Binding not found'));
+                    items[idx] = {
+                        id,
+                        program_id: parseInt(data.program_id) || 0,
+                        discount:   parseFloat(data.discount) || 0,
+                        field:      data.field ?? '',
+                    };
+                    return Promise.resolve(items[idx]);
+                },
+                add() {
+                    const item = { id: next_id++, program_id: 0, discount: 0, field: '' };
+                    items.push(item);
+                    return item;
+                },
+                remove(id) {
+                    const idx = items.findIndex(e => e.id === id);
+                    if (idx !== -1) items.splice(idx, 1);
+                },
+                get_all() {
+                    return items
+                        .filter(b => b.program_id > 0)
+                        .map(({ id, ...rest }) => rest);
+                },
+            };
+        })(<?= $bindings_json ?>, <?= $bindings_next ?>);
+
         function rsv_collect_definition() {
             const form = document.getElementById('<?= $form_id ?>');
             const get  = (n) => form?.querySelector(`[name="${n}"]`)?.value ?? '';
+
             return {
                 name: get('name'),
                 definition: {
                     email_key:        get('definition.email_key'),
                     success_message:  get('definition.success_message'),
+                    membership:       {
+                        bindings: rsv_bindings_source.get_all(),
+                        combine:  get('definition.membership_combine') || 'max',
+                    },
                     elements:         rsv_elements_source.get_all(),
                 },
             };
@@ -298,6 +376,7 @@ class RsvFormsPage extends RsvAdminPage {
                     .input_checkbox('required', 'Required', data?.required ?? false);
 
             if ((data?.type ?? rsv_element_types[0]) === 'reservation') {
+                const maintainer = data?.email_templates?.maintainer  ?? {};
                 const accepted   = data?.email_templates?.on_accepted ?? {};
                 const refused    = data?.email_templates?.on_refused  ?? {};
                 const timetable_options = [
@@ -307,6 +386,9 @@ class RsvFormsPage extends RsvAdminPage {
                 builder
                     .input_select('timetable_id', 'Timetable', timetable_options, data?.timetable_id ?? '')
                     .input_number('price_per_block', 'Price per block', data?.price_per_block ?? 0)
+                    .fieldset('Email - for maintainer', '100%')
+                        .input_text('email_maintainer_subject', 'Subject', maintainer.subject ?? RSV_EMAIL_DEFAULTS.maintainer_subject)
+                        .input_textarea('email_maintainer_body', 'Body', maintainer.body ?? RSV_EMAIL_DEFAULTS.maintainer_body)
                     .fieldset('Email — accepted', '100%')
                         .input_checkbox('email_accepted_enabled', 'Send email when accepted', accepted.enabled ?? true)
                         .input_text('email_accepted_subject', 'Subject', accepted.subject ?? RSV_EMAIL_DEFAULTS.accepted_subject)
@@ -458,8 +540,87 @@ class RsvFormsPage extends RsvAdminPage {
         }
         rsv_email_key_select?.addEventListener('focus', rsv_sync_email_key_options);
 
+        // Membership discount bindings — edited in a data grid backed by the
+        // in-memory source above; persisted with the rest of the definition.
+        function rsv_binding_program_options() {
+            return [
+                { value: '', label: '— select program —' },
+                ...rsv_membership_programs.map(p => ({ value: p.id, label: p.name })),
+            ];
+        }
+
+        function rsv_binding_field_options() {
+            const options = [{ value: '', label: '— select field —' }];
+            for (const el of rsv_elements_source.get_all()) {
+                if (!el.name) continue;
+                options.push({ value: el.name, label: el.label ? `${el.label} (${el.name})` : el.name });
+            }
+            return options;
+        }
+
+        function rsv_render_binding_inline_form(dt, row, data) {
+            return RsvInlineFormBuilder.create(rsv_bindings_source)
+                .fieldset('Discount binding', '100%')
+                    .input_select('program_id', 'Program', rsv_binding_program_options(), data?.program_id ?? '')
+                    .input_number('discount', 'Discount %', data?.discount ?? 0)
+                    .input_select('field', 'Field', rsv_binding_field_options(), data?.field ?? '')
+                .build({
+                    id: data?.id,
+                    colspan: 3,
+                    save_label: 'Save',
+                    on_success: () => { rsv_bindings_dt.refresh(); rsv_schedule_preview(); },
+                    on_cancel:  () => { rsv_bindings_dt.refresh(); rsv_schedule_preview(); },
+                });
+        }
+
+        const rsv_bindings_table_el = document.getElementById('rsv_membership_bindings_table');
+        if (rsv_bindings_table_el) {
+            var rsv_bindings_dt = RsvDataGrid.create_data_grid(
+                rsv_bindings_table_el,
+                rsv_bindings_source,
+                {
+                    'program_id': RsvDataGrid.action_column('Program', false, {
+                        'Edit': RsvDataGrid.edit_action(function(dt, row, data) {
+                            row.classList.add(
+                                'inline-edit-row', 'inline-edit-row-post',
+                                'quick-edit-row',  'quick-edit-row-post',
+                                'inline-edit-post', 'inline-editor'
+                            );
+                            row.replaceChildren(rsv_render_binding_inline_form(dt, row, data));
+                        }),
+                        'Remove': RsvDataGrid.func_action(function(dt, row, data) {
+                            rsv_bindings_source.remove(data.id);
+                            dt.refresh();
+                            rsv_schedule_preview();
+                        }),
+                    }),
+                    'discount': RsvDataGrid.column('Discount %', false),
+                    'field':    RsvDataGrid.column('Field',      false),
+                }
+            );
+            rsv_bindings_dt.map_column('program_id', (dt, row, data) => {
+                const td = document.createElement('td');
+                const p = rsv_membership_programs.find(p => String(p.id) === String(data.program_id));
+                td.innerText = p ? p.name : (data.program_id ? `#${data.program_id}` : '—');
+                return td;
+            });
+            rsv_bindings_dt.map_column('field', (dt, row, data) => {
+                const td = document.createElement('td');
+                const el = rsv_elements_source.get_all().find(e => e.name === data.field);
+                td.innerText = data.field ? (el && el.label ? `${el.label} (${el.name})` : data.field) : '—';
+                return td;
+            });
+            rsv_bindings_dt.refresh();
+
+            document.getElementById('rsv_add_binding_btn')?.addEventListener('click', function() {
+                rsv_bindings_source.add();
+                rsv_bindings_dt.refresh();
+                rsv_schedule_preview();
+            });
+        }
+
         const rsv_meta_form = document.getElementById('<?= $form_id ?>');
-        ['name', 'definition.email_key', 'definition.success_message'].forEach((n) => {
+        ['name', 'definition.email_key', 'definition.success_message', 'definition.membership_combine'].forEach((n) => {
             const el = rsv_meta_form?.querySelector(`[name="${n}"]`);
             el?.addEventListener('input', rsv_schedule_preview);
             el?.addEventListener('change', rsv_schedule_preview);

includes/Views/RsvMembershipProgramsPage.php

@@ -0,0 +1,130 @@
+<?php
+
+use Reservair\Forms\RsvFormBuilder;
+use Reservair\Layout\RsvColumnLayout;
+
+class RsvMembershipProgramsPage extends RsvAdminPage {
+    protected function render_content(): void {
+        if (isset($_GET['action']) && $_GET['action'] === 'edit' && isset($_GET['id'])) {
+            $this->show_edit(intval($_GET['id']));
+            return;
+        }
+        $this->show_list();
+    }
+
+    private function show_list(): void {
+        ?>
+        <h1>Membership Programs</h1>
+        <hr>
+        <?php
+        RsvColumnLayout::split('1:2')
+            ->column(function () {
+                echo RsvFormBuilder::create('add_membership_program', get_rest_url(null, 'reservations/v1/membership-program'), 'POST', 'Membership program created.')
+                    ->heading('Add Program')
+                    ->nonce('my_action', 'add_membership_program_nonce')
+                    ->text('name', 'Name')
+                    ->render();
+                ?>
+                <hr>
+                <p class="submit">
+                    <button type="submit" form="add_membership_program" class="button button-primary">Add Program</button>
+                </p>
+            <?php })
+            ->column(function () { ?>
+                <div id="programs_table"></div>
+                <script>
+                var programs_dt = RsvDataGrid.create_data_grid(programs_table,
+                    RsvMembershipProgramResource(), {
+                        'id': RsvDataGrid.column('ID', false, 30),
+                        'name': RsvDataGrid.action_column('Name', false, {
+                            'Edit': RsvDataGrid.link_action((data) =>
+                                `<?= menu_page_url('membership-programs', false) ?>&id=${data.id}&action=edit`
+                            ),
+                            'Delete': RsvDataGrid.func_action(function(dt, row, data) {
+                                if (!confirm('Delete this program? This cannot be undone.')) return;
+                                dt.resource.delete(data.id).then(() => programs_dt.refresh()).catch(err => alert(err.message));
+                            }),
+                        }),
+                        'active': RsvDataGrid.column('Active', false),
+                    });
+                programs_dt.refresh();
+                </script>
+            <?php })
+            ->output();
+        ?>
+        <script>
+        RsvAdminForm.bind(document.getElementById('add_membership_program'), {
+            refresh: () => { if (typeof programs_dt !== 'undefined') programs_dt.refresh(); },
+        });
+        </script>
+        <?php
+    }
+
+    private function show_edit(int $id): void {
+        $repo = new RsvMembershipProgramRepository();
+        $program = $repo->get($id);
+
+        if ($program === null) {
+            echo '<div class="notice notice-error"><p>Program not found.</p></div>';
+            return;
+        }
+
+        ?>
+        <h1>Edit Program: <?= esc_html($program['name']) ?></h1>
+        <a href="<?= menu_page_url('membership-programs', false) ?>">← Back to Programs</a>
+        <hr>
+
+        <?php
+        echo RsvFormBuilder::create('edit_membership_program', get_rest_url(null, 'reservations/v1/membership-program/' . $id), 'PUT', 'Program updated.')
+            ->text('name', 'Name', '', true, $program['name'])
+            ->checkbox('active', 'Active', '', $program['active'] ?? true)
+            ->render();
+        ?>
+        <script>
+        RsvAdminForm.bind(document.getElementById('edit_membership_program'));
+        </script>
+
+        <hr>
+        <h2>Roster</h2>
+        <p>Each member is identified by a single key. The key format depends on the active membership strategy.</p>
+
+        <?php
+        RsvColumnLayout::split('1:2')
+            ->column(function () use ($id) {
+                echo RsvFormBuilder::create('add_membership_key', get_rest_url(null, 'reservations/v1/membership-program/' . $id . '/keys'), 'POST', 'Member added.')
+                    ->heading('Add Member')
+                    ->text('key_value', 'Key')
+                    ->render();
+                ?>
+                <hr>
+                <p class="submit">
+                    <button type="submit" form="add_membership_key" class="button button-primary">Add Member</button>
+                </p>
+            <?php })
+            ->column(function () use ($id) { ?>
+                <div id="roster_table"></div>
+                <script>
+                var roster_dt = RsvDataGrid.create_data_grid(roster_table,
+                    RsvMembershipKeyResource(<?= (int) $id ?>), {
+                        'id': RsvDataGrid.column('ID', false, 30),
+                        'key_value': RsvDataGrid.action_column('Key', false, {
+                            'Delete': RsvDataGrid.func_action(function(dt, row, data) {
+                                if (!confirm('Delete this member? This cannot be undone.')) return;
+                                dt.resource.delete(data.id).then(() => roster_dt.refresh()).catch(err => alert(err.message));
+                            }),
+                        }),
+                    });
+                roster_dt.refresh();
+                </script>
+            <?php })
+            ->output();
+        ?>
+        <script>
+        RsvAdminForm.bind(document.getElementById('add_membership_key'), {
+            refresh: () => { if (typeof roster_dt !== 'undefined') roster_dt.refresh(); },
+            onSuccess: () => { document.getElementById('add_membership_key')?.reset(); },
+        });
+        </script>
+        <?php
+    }
+}

modules/Templating/Elements/RsvQrPaymentElement.php

@@ -0,0 +1,90 @@
+<?php
+
+namespace Reservair\Templating\Elements;
+
+use Reservair\Templating\RsvTemplateElement;
+use Reservair\Templating\RsvTemplateSymbols;
+use chillerlan\QRCode\Output\QRGdImagePNG;
+use chillerlan\QRCode\QRCode;
+use chillerlan\QRCode\Data\QRMatrix;
+use chillerlan\QRCode\QROptions;
+use chillerlan\QRCode\Output\QROutputInterface;
+
+/** Renders a QR payment code for the form's total price into an email body. */
+class RsvQrPaymentElement implements RsvTemplateElement {
+
+    public function render(RsvTemplateSymbols $symbols): string {
+        $account = trim((string) $symbols->get('account', ''));
+        if ($account === '') {
+            return ''; // No payee account configured — nothing to render.
+        }
+
+        $payload = $this->spayd(
+            $account,
+            (float)  $symbols->get('price', 0),
+            (string) $symbols->get('currency', 'CZK'),
+            (string) $symbols->get('message', ''),
+            (string) $symbols->get('variable_symbol', '')
+        );
+
+        $src = $this->image_url($payload);
+        if ($src === '') {
+            return ''; // Image could not be written.
+        }
+
+        return '<img class="rsv-qr-payment" alt="' . esc_attr__('QR platba', 'reservair')
+            . '" src="' . esc_url($src) . '" />';
+    }
+
+    public function symbols(): array {
+        return ['account', 'currency', 'message', 'variable_symbol'];
+    }
+
+    /** Builds a SPAYD string (Czech QR payment). '*' is the field delimiter. */
+    private function spayd(string $account, float $price, string $currency, string $message, string $vs): string {
+        $parts = [
+            'SPD*1.0',
+            'ACC:' . $account,
+            'AM:'  . number_format($price, 2, '.', ''),
+            'CC:'  . $currency,
+        ];
+        if ($message !== '') {
+            $parts[] = 'MSG:' . str_replace('*', ' ', $message);
+        }
+        if ($vs !== '') {
+            $parts[] = 'X-VS:' . preg_replace('/\D/', '', $vs);
+        }
+        return implode('*', $parts);
+    }
+
+    /**
+     * Writes the QR PNG under uploads (deduped by payload hash) and returns its
+     * public URL, or '' if it could not be written.
+     */
+    private function image_url(string $payload): string {
+        $uploads = wp_upload_dir();
+        $dir     = $uploads['basedir'] . '/reservair-qr';
+        $name    = hash('sha256', $payload) . '.png';
+        $path    = $dir . '/' . $name;
+
+        if (!file_exists($path)) {
+            wp_mkdir_p($dir);
+            if (file_put_contents($path, $this->png($payload)) === false) {
+                return '';
+            }
+        }
+
+        return $uploads['baseurl'] . '/reservair-qr/' . $name;
+    }
+
+    private function png(string $payload): string {
+        $options = new QROptions();
+        $options->version             = 7;
+        $options->outputInterface     = QRGdImagePNG::class;
+        $options->scale               = 4;
+        $options->outputBase64        = false;
+        $options->bgColor             = [200, 150, 200];
+
+        return (string) (new QRCode($options))->render($payload);
+    }
+}

psalm-baseline.xml

@@ -639,9 +639,6 @@
     <ClassMustBeFinal>
       <code><![CDATA[RsvFormDefinition]]></code>
     </ClassMustBeFinal>
-    <InvalidArrayOffset>
-      <code><![CDATA[$definition['email_key']]]></code>
-    </InvalidArrayOffset>
     <MissingPropertyType>
       <code><![CDATA[$_elements]]></code>
     </MissingPropertyType>

reservair.php

@@ -3,6 +3,7 @@
 use Reservair\Templating\Elements\RsvReservationSummaryElement;
 use Reservair\Templating\Elements\RsvReservationActionsElement;
 use Reservair\Templating\Elements\RsvResetFormButtonElement;
+use Reservair\Templating\Elements\RsvQrPaymentElement;
 /**
  * Plugin Name:       Reservair
  * Description:       A reservation and booking system for WordPress. Site visitors browse available time slots and submit reservation requests via a Gutenberg block; administrators manage timetables, services, forms, and reservations from the WordPress admin panel.
@@ -33,7 +34,7 @@ register_activation_hook( __FILE__, [ 'RsvInstaller', 'install' ] );
  * plugins we might interact with) is fully loaded.
  */
 function rsv_bootstrap(): void {
-	global $rsv_form_registry, $rsv_template_registry;
+	global $rsv_form_registry, $rsv_template_registry, $rsv_form_price_registry;
 
 	// Re-grant the custom capability after a plugin *update* (the activation hook
 	// only runs on activate). No-op once the stored version matches.
@@ -53,11 +54,26 @@ function rsv_bootstrap(): void {
 	$rsv_form_registry->register( 'output-reservation-summary', new RsvReservationSummaryElementHandler() );
 	$rsv_form_registry->register( 'output-text',                new RsvOutputTextElementHandler() );
 
+	// Price calculators — extensions add per-element calculators via the action.
+	add_action( 'rsv-register-price-calculator', function ( RsvFormPriceCalculatorRegistry $reg ): void {
+		$reg->register( 'reservation', function ( RsvFormElementDefinition $def, $value ): float {
+			if ( ! is_array( $value ) || ! is_array( $value['timetable_reservations'] ?? null ) ) {
+				return 0.0;
+			}
+
+			$price_per_block = (float) $def->getAttr( 'price_per_block', 0 );
+
+			return $price_per_block * count( $value['timetable_reservations'] );
+		} );
+	} );
+	$rsv_form_price_registry = RsvFormPriceCalculatorRegistry::boot();
+
 	// Template custom-element registry. Extensions register via the action.
 	add_action( 'rsv-template-register-custom-elements', function ( \Reservair\Templating\RsvTemplateRegistry $reg ): void {
 		$reg->register( 'reservation-summary', new RsvReservationSummaryElement() );
 		$reg->register( 'reservation-actions', new RsvReservationActionsElement() );
 		$reg->register( 'reset-form-button',   new RsvResetFormButtonElement() );
+		$reg->register( 'qr-payment', new RsvQrPaymentElement() );
 	} );
 	$rsv_template_registry = new \Reservair\Templating\RsvTemplateRegistry();
 	do_action( 'rsv-template-register-custom-elements', $rsv_template_registry );

src/admin.js

@@ -12,6 +12,8 @@ import { RsvFormDefinitionResource } from '../assets/js/datasource/RsvFormDefini
 import { RsvTimetableResource } from '../assets/js/datasource/RsvTimetableResource.js';
 import { RsvTimetableCapacityResource } from '../assets/js/datasource/RsvTimetableCapacityResource.js';
 import { RsvTimetableReservationResource } from '../assets/js/datasource/RsvTimetableReservationResource.js';
+import { RsvMembershipProgramResource } from '../assets/js/datasource/RsvMembershipProgramResource.js';
+import { RsvMembershipKeyResource } from '../assets/js/datasource/RsvMembershipKeyResource.js';
 import { RsvReservationClient } from '../assets/js/datasource/RsvReservationClient.js';
 
 window.RsvDataGrid = RsvDataGrid;
@@ -22,4 +24,6 @@ window.RsvFormDefinitionResource = RsvFormDefinitionResource;
 window.RsvTimetableResource = RsvTimetableResource;
 window.RsvTimetableCapacityResource = RsvTimetableCapacityResource;
 window.RsvTimetableReservationResource = RsvTimetableReservationResource;
+window.RsvMembershipProgramResource = RsvMembershipProgramResource;
+window.RsvMembershipKeyResource = RsvMembershipKeyResource;
 window.RsvReservationClient = RsvReservationClient;