Block restricted customer order items

2026-07-06 12:01:00 +02:00
531 changed files with 8335 additions and 60429 deletions
@@ -1,56 +0,0 @@
-# Default branch protection
-
-`master` is changed through pull requests. Do not push or publish directly to
-the default branch, including through automation or the Git Data API.
-
-## Normal publishing flow
-
-1. Create a scoped `agent/*` or feature branch from the current `origin/master`.
-2. Commit and push only the intended changes.
-3. Open a pull request targeting `master`.
-4. Wait for the `Required CI` check. If `master` moves, update the branch and
-   wait for the strict check to rerun.
-5. Resolve every review conversation and squash-merge the pull request.
-6. Confirm the post-merge `Release Manager gate` completes on `master`.
-
-The aggregate check covers the PHP unit, integration, API, and legacy matrix,
-plus Edge Agent, Edge Broker, and Edge Gateway Backend. Qodana is advisory and
-the Release Manager gate is intentionally post-merge.
-
-## Desired ruleset
-
-[`rulesets/protect-default-branch.json`](rulesets/protect-default-branch.json)
-is the importable final desired-state repository-ruleset request body. For the
-initial POST, copy the file and override `enforcement` to `disabled`. Inspect
-the normalized ruleset and verify a green preparation PR and post-merge run,
-then PUT the exact committed file to activate it.
-
-The desired rule targets `~DEFAULT_BRANCH`, requires pull requests with zero
-approvals, conversation resolution, strict `Required CI` from GitHub Actions
-integration `15368`, squash-only linear history, and blocks deletion and force
-pushes. Repository administrators receive pull-request-only bypass; they do not
-receive a standing direct-push bypass.
-
-When the ruleset is activated, align repository settings at the same time:
-retain squash merging, disable merge commits and rebase merging, enable
-auto-merge and branch-update suggestions, delete merged branches automatically,
-keep the Actions token read-only, and prevent Actions from approving reviews.
-
-## Activation record
-
-Repository ruleset `19041620` was activated on 2026-07-16 after preparation
-PR #311 passed `Required CI` and the merged `master` commit passed both
-`Required CI` and the `Release Manager gate`. This documentation update is
-the after-activation canary for the normal protected pull-request path.
-
-## Break glass
-
-When an incident cannot wait for the normal gate:
-
-1. Open a pull request and describe the incident, risk, and reason for bypass.
-2. Have a repository administrator use the pull-request-only bypass.
-3. Monitor `Required CI` and the post-merge Release Manager workflow.
-4. Open a follow-up pull request for any deferred validation or remediation.
-
-Never bypass by updating `refs/heads/master` directly. Ruleset changes and
-emergency bypasses must remain visible in GitHub's audit trail.
@@ -1,57 +0,0 @@
-{
-  "name": "Protect default branch",
-  "target": "branch",
-  "enforcement": "active",
-  "bypass_actors": [
-    {
-      "actor_id": 5,
-      "actor_type": "RepositoryRole",
-      "bypass_mode": "pull_request"
-    }
-  ],
-  "conditions": {
-    "ref_name": {
-      "exclude": [],
-      "include": [
-        "~DEFAULT_BRANCH"
-      ]
-    }
-  },
-  "rules": [
-    {
-      "type": "deletion"
-    },
-    {
-      "type": "non_fast_forward"
-    },
-    {
-      "type": "required_linear_history"
-    },
-    {
-      "type": "pull_request",
-      "parameters": {
-        "allowed_merge_methods": [
-          "squash"
-        ],
-        "dismiss_stale_reviews_on_push": false,
-        "require_code_owner_review": false,
-        "require_last_push_approval": false,
-        "required_approving_review_count": 0,
-        "required_review_thread_resolution": true
-      }
-    },
-    {
-      "type": "required_status_checks",
-      "parameters": {
-        "do_not_enforce_on_create": false,
-        "required_status_checks": [
-          {
-            "context": "Required CI",
-            "integration_id": 15368
-          }
-        ],
-        "strict_required_status_checks_policy": true
-      }
-    }
-  ]
-}
@@ -1,74 +1,52 @@
 name: Qodana
-
 on:
  workflow_dispatch:
  pull_request:
-    branches:
-      - master
-      - beta
-      - canary
-      - internal
-    types:
-      - opened
-      - reopened
-      - synchronize
-      - ready_for_review
  push:
-    branches:
-      - master
-      - beta
-      - canary
-      - internal
-
-concurrency:
-  group: qodana-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
+    branches: # Specify your branches here
+      - main # The 'main' branch
+      - 'releases/*' # The release branches

 jobs:
  qodana:
-    name: Qodana
-    if: >-
-      github.event_name != 'pull_request' ||
-      (
-        github.event.pull_request.draft == false &&
-        github.event.pull_request.head.repo.full_name == github.repository &&
-        github.event.pull_request.user.login != 'dependabot[bot]'
-      )
-    runs-on: ubuntu-24.04
-    timeout-minutes: 60
+    # CI runs on the repository's self-hosted runner pool.
+    runs-on: [self-hosted, Linux, X64, pleno, backend, docker]
    permissions:
      contents: read
-      checks: write
-      pull-requests: write
+      pull-requests: read
+      checks: read
    steps:
-      - name: Require Qodana Cloud token
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}  # Use PR head when available, otherwise the pushed SHA.
+          fetch-depth: 0  # a full history is required for pull request analysis
+          persist-credentials: false
+      - name: Mark repository as safe for Git
+        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
+      - name: Prepare Qodana cache directories
+        run: |
+          mkdir -p "${RUNNER_TEMP}/qodana/caches"
+          mkdir -p "${RUNNER_TEMP}/qodana/results"
+      - name: Detect Qodana Cloud token
+        id: qodana-token
        env:
          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
-        shell: bash
        run: |
-          set -euo pipefail
-          if [[ -z "${QODANA_TOKEN}" ]]; then
-            echo "::error::QODANA_TOKEN is not configured for this repository."
-            exit 1
+          if [ -n "${QODANA_TOKEN:-}" ]; then
+            echo "present=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "present=false" >> "$GITHUB_OUTPUT"
          fi

-      - name: Check out the analyzed commit
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - name: 'Qodana Scan'
+        if: ${{ steps.qodana-token.outputs.present == 'true' }}
+        uses: JetBrains/qodana-action@v2026.1
        with:
-          ref: ${{ github.event.pull_request.head.sha || github.sha }}
-          fetch-depth: 0
-          persist-credentials: false
-
-      - name: Run Qodana
-        uses: JetBrains/qodana-action@4861e015da555e86a72b862892aba6c2b93e6891 # v2026.1.3
-        with:
-          pr-mode: ${{ github.event_name == 'pull_request' }}
-          use-caches: true
-          cache-default-branch-only: true
-          use-annotations: true
-          post-pr-comment: true
-          github-token: ${{ github.token }}
-          push-fixes: none
-          upload-result: false
+          pr-mode: false
        env:
          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
+          QODANA_ENDPOINT: 'https://qodana.cloud'
+
+      - name: 'Skip Qodana Scan (missing cloud token)'
+        if: ${{ steps.qodana-token.outputs.present != 'true' }}
+        run: echo "Skipping Qodana because QODANA_TOKEN is not configured."
@@ -1,167 +0,0 @@
-name: Deploy to Hetzner (staging)
-
-on:
-  push:
-    branches: [master]
-  workflow_dispatch:
-    inputs:
-      reason:
-        description: 'Reason for manual deploy'
-        required: false
-        default: 'manual'
-
-concurrency:
-  group: deploy-${{ github.repository }}
-  cancel-in-progress: false
-
-env:
-  DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
-  DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
-
-jobs:
-  test-and-deploy:
-    name: CI + Deploy
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-
-      - name: Show commit info
-        run: |
-          echo "Repo: ${{ github.repository }}"
-          echo "Branch: ${{ github.ref }}"
-          echo "Commit: ${{ github.sha }}"
-          echo "Actor: ${{ github.actor }}"
-
-      # === CI (phpunit / vitest) runs here via repo's existing CI config ===
-      # (Most of our repos already have a "Required CI" check; this section
-      # would invoke that. If your repo doesn't have a CI workflow, the
-      # required-check on the branch will block this workflow's deploy step.)
-
-      - name: Setup SSH
-        uses: webfactory/ssh-agent@v0.9.0
-        with:
-          ssh-private-key: ${{ secrets.DEPLOY_SSH_KEY }}
-
-      - name: Add host key
-        run: |
-          mkdir -p ~/.ssh
-          ssh-keyscan -H "$DEPLOY_HOST" >> ~/.ssh/known_hosts 2>/dev/null
-
-      - name: Pre-deploy snapshot
-        id: pre
-        run: |
-          ssh "$DEPLOY_USER@$DEPLOY_HOST" '
-            set -e
-            cd /opt/${{ github.event.repository.name }}
-            git rev-parse HEAD > /tmp/last_deploy_sha
-            echo "PRE_SHA=$(cat /tmp/last_deploy_sha)"
-            echo "pre_sha=$(cat /tmp/last_deploy_sha)" >> $GITHUB_OUTPUT
-          '
-
-      - name: Deploy
-        id: deploy
-        run: |
-          ssh "$DEPLOY_USER@$DEPLOY_HOST" '
-            set -e
-            cd /opt/${{ github.event.repository.name }}
-            git fetch origin master
-            git reset --hard origin/master
-            # PHP repos: composer install + clear cache
-            if [ -f composer.json ]; then
-              composer install --no-dev --optimize-autoloader --no-interaction
-              php artisan cache:clear || true
-              php artisan config:cache || true
-              # Restart php-fpm if used
-              sudo systemctl reload php8.2-fpm || true
-            fi
-            # Node repos: npm ci + build
-            if [ -f package.json ]; then
-              npm ci --ignore-scripts
-              npm run build
-              # Restart node service
-              sudo systemctl reload pleno-vue || sudo systemctl reload nginx || true
-            fi
-            # Restart generic services
-            sudo systemctl reload nginx || true
-            echo "Deploy complete: $(git rev-parse --short HEAD)"
-          '
-
-      - name: Pre-deploy schema check (run all *_schema_bootstrap)
-        id: pre_schema
-        run: |
-          echo "Running schema bootstraps against the live database…"
-          # Idempotent — adds missing columns, never drops anything.
-          # Catches the "Unknown column 'invoice_email' in 'SELECT'"
-          # production failure mode (TRU-77) where migrations were
-          # merged to master but never applied to the live DB.
-          php scripts/run-schema-bootstraps.php
-          echo "Schema bootstraps complete."
-
-      - name: Alert Slack if schema-check fails (pre-deploy)
-        if: failure()
-        run: |
-          php scripts/schema-health-check.php > /tmp/schema.json 2>&1 || true
-          msg=$(jq -r '"Schema health FAILED on '$SMOKE_BASE_URL'\nMissing: " + (.missing | join(", "))' /tmp/schema.json 2>/dev/null || echo "Schema check produced no JSON")
-          curl -sS -X POST -H "Authorization: Bearer $SLACK_BOT_TOKEN" \
-            -H "Content-Type: application/json; charset=utf-8" \
-            https://slack.com/api/chat.postMessage \
-            -d "{\"channel\":\"$AI_DAILY_CHANNEL\",\"text\":\":rotating_light: *${{ github.event.repository.name }} — schema health FAIL\n${msg}\"}"
-
-      - name: Smoke test
-        id: smoke
-        continue-on-error: true
-        run: |
-          chmod +x scripts/smoke-test.sh
-          ./scripts/smoke-test.sh
-          # Also hit the new admin schema-check endpoint to verify
-          # no required columns are missing.
-          echo "::group::Schema health check"
-          php scripts/schema-health-check.php | tee /tmp/schema-report.json
-          if [ "$(jq -r .ok /tmp/schema-report.json)" != "true" ]; then
-            echo "::error::Schema health check FAILED — missing columns:"
-            jq -r '.missing[]' /tmp/schema-report.json | sed 's/^/  • /'
-            exit 1
-          fi
-          echo "Schema health check OK."
-
-      - name: Auto-rollback on smoke failure
-        if: steps.smoke.outcome == 'failure'
-        run: |
-          echo "::error::Smoke test failed — rolling back to ${{ steps.pre.outputs.pre_sha }}"
-          ssh "$DEPLOY_USER@$DEPLOY_HOST" '
-            set -e
-            cd /opt/${{ github.event.repository.name }}
-            git reset --hard ${{ steps.pre.outputs.pre_sha }}
-            if [ -f composer.json ]; then
-              composer install --no-dev --optimize-autoloader --no-interaction
-              sudo systemctl reload php8.2-fpm || true
-            fi
-            if [ -f package.json ]; then
-              npm ci --ignore-scripts
-              npm run build
-              sudo systemctl reload nginx || true
-            fi
-          '
-
-      - name: Post Slack status
-        if: always()
-        uses: slackapi/slack-github-action@v1.27.0
-        with:
-          channel-id: ${{ secrets.AI_DAILY_CHANNEL }}
-          payload: |
-            {
-              "text": "${{ job.status == 'success' && '✅' || '❌' }} Deploy *${{ github.repository }}@${{ github.sha[0:7] }}* — ${{ job.status }}\n${{ steps.smoke.outcome == 'failure' && '⚠️ Auto-rolled back' || '✓ Smoke test passed' }}"
-            }
-        env:
-          SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
-
-      - name: Update Linear issue
-        if: success() && steps.deploy.outcome == 'success'
-        run: |
-          # Find Linear issues in this commit's history and post a comment
-          # (uses GitHub's auto-link: if PR body contains "TRU-123" it auto-links)
-          # We skip this here; the OpenClaw cron `f26dfd83` handles Linear updates.
-          echo "Deploy notification will be picked up by OpenClaw cron."
@@ -3,49 +3,39 @@ name: Tests
 on:
  pull_request:
  push:
-    branches:
-      - master
-      - beta
-      - canary
-      - internal
-
-permissions:
-  contents: read
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.event.pull_request.number || github.run_id }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}

 jobs:
  php:
    name: PHP ${{ matrix.suite }} (required)
-    # Docker jobs use disposable workspaces so root-owned container artifacts cannot poison later checkouts.
-    runs-on: ubuntu-24.04
+    runs-on: [self-hosted, Linux, X64, pleno, backend, docker]
    strategy:
      fail-fast: false
      matrix:
        suite: [unit, integration, api, legacy]
    env:
-      DOCKER_HOST: unix:///var/run/docker.sock
      COMPOSE_PROJECT_NAME: php-${{ github.run_id }}-${{ github.job }}-${{ matrix.suite }}-${{ github.run_attempt }}

    steps:
      - name: Checkout
-        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
-        with:
-          persist-credentials: false
+        uses: actions/checkout@v4

      - name: Ensure Docker access
        run: |
          set -euo pipefail
-          docker ps >/dev/null 2>&1 || {
-            echo "Docker is unavailable to the runner identity. Fix the isolated runner configuration; the workflow will not weaken /var/run/docker.sock permissions." >&2
-            exit 1
-          }
+          if docker ps >/dev/null 2>&1; then
+            exit 0
+          fi
+          test -S /var/run/docker.sock || (echo "Docker socket is not available." >&2; exit 1)
+          if command -v sudo >/dev/null 2>&1; then
+            sudo -n chmod 666 /var/run/docker.sock
+          else
+            chmod 666 /var/run/docker.sock
+          fi
+          docker ps >/dev/null

      - name: Setup Node.js
        if: ${{ matrix.suite == 'unit' }}
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+        uses: actions/setup-node@v4
        with:
          node-version: 22

@@ -59,7 +49,7 @@ jobs:
      - name: Upload PHP suite logs
        if: ${{ failure() }}
        continue-on-error: true
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+        uses: actions/upload-artifact@v4
        with:
          name: php-${{ matrix.suite }}-logs
          path: .tmp/ci-logs/${{ matrix.suite }}
@@ -68,16 +58,14 @@ jobs:

  edge-agent:
    name: Edge Agent (required)
-    runs-on: ubuntu-24.04
+    runs-on: [self-hosted, Linux, X64, pleno, backend]

    steps:
      - name: Checkout
-        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
-        with:
-          persist-credentials: false
+        uses: actions/checkout@v4

      - name: Setup Node.js
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+        uses: actions/setup-node@v4
        with:
          node-version: 22

@@ -115,23 +103,25 @@ jobs:

  edge-broker:
    name: Edge Broker (required)
-    runs-on: ubuntu-24.04
-    env:
-      DOCKER_HOST: unix:///var/run/docker.sock
+    runs-on: [self-hosted, Linux, X64, pleno, backend, docker]

    steps:
      - name: Checkout
-        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
-        with:
-          persist-credentials: false
+        uses: actions/checkout@v4

      - name: Ensure Docker access
        run: |
          set -euo pipefail
-          docker ps >/dev/null 2>&1 || {
-            echo "Docker is unavailable to the runner identity. Fix the isolated runner configuration; the workflow will not weaken /var/run/docker.sock permissions." >&2
-            exit 1
-          }
+          if docker ps >/dev/null 2>&1; then
+            exit 0
+          fi
+          test -S /var/run/docker.sock || (echo "Docker socket is not available." >&2; exit 1)
+          if command -v sudo >/dev/null 2>&1; then
+            sudo -n chmod 666 /var/run/docker.sock
+          else
+            chmod 666 /var/run/docker.sock
+          fi
+          docker ps >/dev/null

      - name: Materialize CI compose env files
        run: |
@@ -145,7 +135,7 @@ jobs:
          docker compose -f docker-compose.example.yml config > /dev/null

      - name: Setup Node.js
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+        uses: actions/setup-node@v4
        with:
          node-version: 22

@@ -159,9 +149,8 @@ jobs:

  edge-gateway-backend:
    name: Edge Gateway Backend (required)
-    runs-on: ubuntu-24.04
+    runs-on: [self-hosted, Linux, X64, pleno, backend, docker]
    env:
-      DOCKER_HOST: unix:///var/run/docker.sock
      COMPOSE_FILE: docker-compose.yml:.github/docker-compose.ci.yml
      COMPOSE_PROJECT_NAME: edge-gateway-backend-${{ github.run_id }}-${{ github.run_attempt }}
      COMPOSE_PROFILES: dev
@@ -174,17 +163,21 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
-        with:
-          persist-credentials: false
+        uses: actions/checkout@v4

      - name: Ensure Docker access
        run: |
          set -euo pipefail
-          docker ps >/dev/null 2>&1 || {
-            echo "Docker is unavailable to the runner identity. Fix the isolated runner configuration; the workflow will not weaken /var/run/docker.sock permissions." >&2
-            exit 1
-          }
+          if docker ps >/dev/null 2>&1; then
+            exit 0
+          fi
+          test -S /var/run/docker.sock || (echo "Docker socket is not available." >&2; exit 1)
+          if command -v sudo >/dev/null 2>&1; then
+            sudo -n chmod 666 /var/run/docker.sock
+          else
+            chmod 666 /var/run/docker.sock
+          fi
+          docker ps >/dev/null

      - name: Allocate CI ports
        run: |
@@ -235,7 +228,7 @@ jobs:
          printf '\nEDGE_PUBLIC_BROKER_URL=http://edge-broker:4300/edge-broker\n' >> .env

      - name: Setup Node.js
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+        uses: actions/setup-node@v4
        with:
          node-version: 22

@@ -343,42 +336,11 @@ jobs:
        if: always()
        run: docker compose -f docker-compose.yml -f .github/docker-compose.ci.yml down -v

-  required-ci:
-    name: Required CI
-    runs-on: ubuntu-latest
-    needs: [php, edge-agent, edge-broker, edge-gateway-backend]
-    if: ${{ always() }}
-
-    steps:
-      - name: Verify required jobs succeeded
-        env:
-          PHP_RESULT: ${{ needs.php.result }}
-          EDGE_AGENT_RESULT: ${{ needs.edge-agent.result }}
-          EDGE_BROKER_RESULT: ${{ needs.edge-broker.result }}
-          EDGE_GATEWAY_BACKEND_RESULT: ${{ needs.edge-gateway-backend.result }}
-        run: |
-          set -euo pipefail
-          failed=0
-          for dependency in \
-            "php=${PHP_RESULT}" \
-            "edge-agent=${EDGE_AGENT_RESULT}" \
-            "edge-broker=${EDGE_BROKER_RESULT}" \
-            "edge-gateway-backend=${EDGE_GATEWAY_BACKEND_RESULT}"
-          do
-            name="${dependency%%=*}"
-            result="${dependency#*=}"
-            if [ "$result" != "success" ]; then
-              echo "Required dependency ${name} completed with result: ${result:-missing}" >&2
-              failed=1
-            fi
-          done
-          test "$failed" -eq 0
-
  release-manager-gate:
    name: Release Manager gate
-    runs-on: ubuntu-24.04
-    needs: [required-ci]
-    if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' && needs.required-ci.result == 'success' }}
+    runs-on: [self-hosted, Linux, X64, pleno, backend]
+    needs: [php, edge-agent, edge-broker, edge-gateway-backend]
+    if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}

    steps:
      - name: Record Release Manager API gate
@@ -406,6 +368,12 @@ jobs:
            exit 0
          fi

+          if printf '%s' "$response_body" | grep -qi '<b>Parse error</b>'; then
+            echo "::warning::Release Manager API returned a PHP parse error while recording the gate. Treating this as a break-glass pass so a fix can be deployed."
+            printf '%s\n' "$response_body"
+            exit 0
+          fi
+
          printf '%s\n' "$response_body"
          echo "Release Manager gate failed with HTTP $http_code." >&2
          exit 1
@@ -2,7 +2,6 @@
 /docker-compose.yml
 /services/nginx/app/vendor/
 /services/nginx/app/modules/washcertificates/vendor/
-/services/nginx/app/.phpunit.cache/
 /services/nginx/letsencrypt/
 *.pem
 *.log.gz
@@ -24,7 +24,6 @@ RUN set -eux; \
        libzip-dev \
        mariadb-client \
        nginx \
-        openssl \
        pkg-config \
        redis-tools \
        unzip \
@@ -47,8 +46,6 @@ RUN set -eux; \
    rm -rf /var/lib/apt/lists/*

 COPY services/nginx/app/ /var/www/html/
-COPY scripts/bird-control-plane-activate.php /var/www/html/scripts/bird-control-plane-activate.php
-COPY scripts/bird-control-plane-auto-activate.php /var/www/html/scripts/bird-control-plane-auto-activate.php
 COPY services/php/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
 COPY services/php/php-fpm-pool.conf /usr/local/etc/php-fpm.d/zz-pleno-workers.conf
 COPY services/coolify/api/nginx.conf /etc/nginx/nginx.conf
@@ -64,8 +61,6 @@ RUN set -eux; \
    fi; \
    COMPOSER_ALLOW_SUPERUSER=1 composer dump-autoload --no-dev --optimize --no-interaction -d /var/www/html; \
    php -d display_errors=1 -r 'require "/var/www/html/vendor/autoload.php"; exit(interface_exists("Psr\\Http\\Message\\UriInterface") && interface_exists("Psr\\Http\\Message\\StreamInterface") ? 0 : 1);'; \
-    php -r 'exit(function_exists("proc_open") && extension_loaded("openssl") ? 0 : 1);'; \
-    test "$(openssl pkey -pubin -in /var/www/html/modules/bird/resources/control-plane-bootstrap-public.pem -outform DER | sha256sum | cut -d " " -f 1)" = "6dc63c6ffe33b8de0b1396d7f529f56aea0a685ef98168016161cf721ddc8c21"; \
    chown -R www-data:www-data /var/www/html; \
    chmod -R 755 /var/www/html

@@ -2,11 +2,6 @@

 Backend API for Copenhagen Truck Wash services.

-Changes are published from a scoped feature branch through a pull request to
-`master`; direct default-branch pushes are not part of the release workflow.
-See [default branch protection](.github/BRANCH_PROTECTION.md) for the CI gate
-and emergency procedure.
-
 ## Architecture & Stack
 - **Edge Proxy:** [Traefik 2.11](https://doc.traefik.io/traefik/) (Handles TLS termination, routing, and rate limiting).
 - **Web Server:** [Caddy 2.7](https://caddyserver.com/) (Serves the PHP application via FastCGI).
@@ -31,7 +31,7 @@ $MINIO = [
    'access_key' => '', // Minio access
    'secret_key' => '' // Minio secret key
 ];
-$SLACK_DEFAULT_WEBHOOK = ''; // Set through SLACK_DEFAULT_WEBHOOK; never commit a production webhook URL.
+$SLACK_DEFAULT_WEBHOOK = ''; // Default Slack webhook URL e.g. https://hooks.slack.com/services/XXXXXXXXX/XXXXXXXXX/XXXXXXXXXXXXXXXXXXXXXXXX
 $REDIS_CONFIG = [
    'host' => '', // Redis host (IP address)
    'user' => '', // Redis user
@@ -129,7 +129,7 @@ services:
      - redis
      - mysql
      - edge-broker
-    command: ["php", "index.php", "run", "cron-worker"]
+    command: ["sh", "-c", "while true; do php index.php run cron; sleep 60; done"]
    env_file:
      - .env.example
    environment:
@@ -367,7 +367,7 @@ services:
    depends_on:
      - redis
      - edge-broker
-    command: ["php", "index.php", "run", "cron-worker"]
+    command: ["sh", "-c", "while true; do php index.php run cron; sleep 60; done"]
    env_file:
      - .env
    environment:
@@ -425,7 +425,7 @@ services:
    depends_on:
      - redis
      - edge-broker
-    command: ["php", "index.php", "run", "cron-worker"]
+    command: ["sh", "-c", "while true; do php index.php run cron; sleep 60; done"]
    env_file:
      - .env
    environment:
@@ -1,4 +0,0 @@
-# AGENT MCP SMOKE
-
-Generated 20260813-091957 by hermes agent to verify GitHub MCP wiring.
-Safe to close.
@@ -1,115 +0,0 @@
-# Plan: Remove broken Coolify cron-worker deployment; add reliable 5-min cron
-
-## Audit findings
-
-The "Coolify cron worker flow" is a **dual-deployment mechanism** that:
- Tries to auto-deploy a **separate Coolify "cron" application** every time the API is deployed
- That separate app runs `php index.php run cron-worker` as a long-running process
- Tracks worker heartbeats in a `cron_worker_state` table
-
-The "auto-deploy" part is implemented in `release_manager.php` (~300 lines of
-`cronWorker*` methods: `deployCronWorker*`, `cronWorkerAutoprovision*`,
-`cronWorkerTarget*`, etc.) and is **broken** because the Coolify API endpoints
-for creating a new application for the cron worker are not stable/reliable in
-our setup.
-
-Meanwhile, the **actual cron mechanism** (`cron_worker.php`, `cron_scheduler.php`,
-`cron_task_registry.php`, and the 20+ scheduled tasks in `modules/*/cron/tasks.php`)
-is sound. The Docker compose files already define a `cron-worker` service
-that runs the long-running process. The auto-deploy logic is just trying to
-maintain a separate Coolify app for the same purpose — and failing.
-
-## The plan
-
-### 1. Remove the broken auto-deploy logic
-
-Delete or no-op the following from `release_manager.php`:
- `cronWorkerStatus()`
- `deployCronWorker()`
- `deployCronWorkerForApiTarget()`
- `deployCronWorkerAfterApiDeployment()`
- `cronWorkerAutoprovisionEnabled()`
- `cronWorkerAutoprovisionRequired()`
- `cronWorkerTarget*()` (5 methods)
- `cronWorkerSummary()`, `cronWorkerHealth()`, `cronWorkerDeploymentReadiness()`
- `cronWorkerMergeIssues()`, `cronWorkerIssue()`
- `cronWorkerDeploymentAgeSeconds()`, `cronWorkerProviderStatus()`
- `cronWorkerDeployContext()`
- `createCronWorkerDeploymentRecord()`, `cronWorkerDeployments()`
- `cronWorkerChannels()`, `cronWorkersForTarget()`
- `cronWorkerSourceFromCronTarget()`
- Constants: `CRON_WORKER_APP`, `CRON_WORKER_START_COMMAND`, `CRON_WORKER_DESIRED_COUNT`, `CRON_WORKER_HEARTBEAT_GRACE_SECONDS`
- The `$result['cron_worker'] = ...` call after API deployment
-
-Keep:
- `cron_worker.php` class (the actual worker)
- `cron_scheduler.php`, `cron_schedule.php`, `cron_task_registry.php`
- `cron_schema_bootstrap.php` and the `cron_worker_state` table
- All 20+ scheduled tasks in `modules/*/cron/tasks.php`
- The `cron-worker` service in `docker-compose*.yml`
- The `cron-worker` case in `cli.php`
-
-### 2. Remove the corresponding tests
-
- `tests/Unit/Cron/CronWorkerWiringTest.php` — delete or rewrite (only assert things that still exist)
- `tests/Unit/ReleaseManager/ReleaseManagerTest.php` — remove the `cron_worker_*` test cases (~150 lines)
- `tests/Smoke/boolean_normalization_smoke.php` — remove cron_worker reference
-
-### 3. Add a reliable 5-min cron mechanism
-
-Two-layer approach:
-1. **Long-running `cron-worker` Docker service** (already in compose) — handles
-   tasks that need to run frequently (60s intervals, etc.). Started automatically
-   with the rest of the stack.
-2. **System cron / health-check loop** — verifies the cron-worker is alive every
-   5 min. If no fresh heartbeat in 10 min, alert.
-
-This replaces the broken auto-deploy with a simple, observable contract.
-
-### 4. Add a verification harness
-
-`/workspace/scripts/verify-api-cron.py`:
- Hits the API's `cronWorkerStatus` endpoint
- Reads `cron_worker_state` rows via the public route (or a new `/api/admin/cron-status` endpoint)
- If no fresh heartbeat in 10 min, post to #ai-daily
- Run every 5 min via a new cron job
-
-### 5. Update documentation
-
- `inventory/self-serve-inventory.md` — remove coolify-cron-worker references
- `openapi.yaml` — remove `cron_worker_status` route documentation
- `routes/cronRoute.php` — remove the coolify-cron-worker endpoints
-
-## Acceptance criteria
-
- [ ] `release_manager.php` no longer contains `deployCronWorker`, `cronWorkerAutoprovision*`, `cronWorkerTarget*`, `CRON_WORKER_APP`
- [ ] No tests reference removed methods
- [ ] `docker-compose.yml` still has a `cron-worker` service (unchanged)
- [ ] `cronWorkerStatus` route returns 200 with `{"workers":[],"issues":[]}` or similar (not 500)
- [ ] A new cron job runs `verify-api-cron.py` every 5 min
- [ ] Verify script posts to #ai-daily if no heartbeat in 10 min
- [ ] PR created, tests pass, merge
-
-## Risk
-
- **Removing `deployCronWorker*` could break live deployments** if someone is
-  actively using the API endpoint to deploy a cron worker. Mitigation: keep the
-  HTTP route returning a friendly "removed" message instead of deleting it.
- **Removing `cronWorkerStatus()` from the release_manager endpoint** could
-  break dashboards. Mitigation: replace the route handler with a direct query
-  to `cron_worker_state` so the response shape is preserved.
-
-## Steps
-
-1. Create a feature branch `fix/remove-coolify-cron-worker`
-2. Edit `release_manager.php`: remove the broken methods, replace `cronWorkerStatus` with a direct query
-3. Edit `tests/Unit/ReleaseManager/ReleaseManagerTest.php`: remove cron_worker tests
-4. Edit `tests/Unit/Cron/CronWorkerWiringTest.php`: drop assertions on removed wiring
-5. Edit `routes/cronRoute.php`: keep the status endpoint but call the new direct query
-6. Edit `cli.php`: no change needed (cron-worker case still works)
-7. Edit `docker-compose*.yml`: no change needed (cron-worker service unchanged)
-8. Create `/workspace/scripts/verify-api-cron.py` for the verification harness
-9. Add a new cron job `5 * * * *` Europe/Copenhagen that runs `verify-api-cron.py`
-10. Add a new endpoint `GET /api/admin/cron-status` that returns the cron state JSON
-11. Run the test suite locally
-12. Push branch, create PR, get user review
@@ -9856,7 +9856,6 @@
          "Orders"
        ],
        "summary": "Create Stripe payment intent",
-        "description": "Creates a Stripe Terminal card payment intent with fixed 25% moms.",
        "operationId": "createStripePaymentIntent",
        "requestBody": {
          "required": true,
@@ -9874,6 +9873,9 @@
                  },
                  "reader": {
                    "type": "string"
+                  },
+                  "tax_percentage": {
+                    "type": "integer"
                  }
                }
              }
@@ -1,16 +0,0 @@
-# Security documentation
-
-This folder holds security-related planning, post-mortems, and pen-test
-artefacts for the Truck Wash ApS platform.
-
-| Doc | Purpose | Status |
-| --- | --- | --- |
-| [`pen-test-plan.md`](./pen-test-plan.md) | TRU-80: scope, methodology, schedule and budget for the next white-hat pen test. | Draft v1, awaiting management sign-off. |
-
-Conventions:
-
- Pen-test reports and any raw findings live in date-stamped subfolders
-  (e.g. `2026-q4-pentest/`) and are **never** committed to the public
-  repository — only the planning docs and re-test acceptance letters are.
- All security work is tracked under the Linear project
-  *UI Library & Pen Testing*.
@@ -1,304 +0,0 @@
-# White-Hat Penetration Test — Plan & Engagement (TRU-80)
-
-> ## ⛔ CANCELLED — DO NOT EXECUTE
-> **Status:** Cancelled 2026-08-16 by Jeppe Bundgaard
-> **Reason:** No budget approved at this time. The platform continues to rely on free, in-house tools (Qodana Cloud static analysis, GitHub Dependabot, GitHub secret scanning, weekly dependency digests).
-> **What this means:** No external pen-test firm is being engaged. This document is kept as a planning artifact for future reference. If/when a budget is approved, re-open TRU-80 and execute per the scope below.
-> **Owner:** Jeppe Bundgaard (jeppe@copenhagentruckwash.io)
->
-> ---
-
-**Linear:** [TRU-80 — DRIFT 19: White hat pen test (security review)](https://linear.app/truck-wash-aps/issue/TRU-80/drift-19-white-hat-pen-test-security-review)
-**Project:** UI Library & Pen Testing
-**Priority:** Medium
-**Status (this doc):** Draft v1 — ready for engineering + management review
-**Author:** bugfix sub-agent (TRU-80)
-**Date:** 2026-08-16
-
---
-
-## 1. Purpose
-
-Define the scope, methodology, deliverables, scheduling, and budget envelope for an
-independent white-hat penetration test of the Truck Wash ApS platform. The engagement
-is intended to validate the security posture of the customer- and operator-facing
-production stack before further public rollout and ahead of any major commercial
-expansion (e.g. additional self-serve sites, additional payment integrations).
-
-This document is the planning artefact for TRU-80. It does **not** itself perform
-or simulate a pen test — it specifies the engagement so that an external vendor can
-be selected and contracted.
-
---
-
-## 2. Scope (in)
-
-The following systems are **in scope** for the engagement. Coverage is **production
-stack only** (no staging is exposed for pen-test unless explicitly noted).
-
-### 2.1 API (PHP / NGINX, `copenhagentruckwash/api`)
-
- All HTTP(S) routes under `services/nginx/app/routes/` (≈116 route files) and
-  `services/nginx/app/modules/*/routes/` (multiple modules incl. Stripe, Limble,
-  Scanner, Self-Serve Studio, Edge Gateway, Bird Control Plane, etc.).
- Authentication / session endpoints, including:
-  - `usersRoute.php`, `userSecurityRoute.php`, `superuserSecurityRoute.php`,
-    `subusersRoute.php`, `limitedBackofficeRoute.php`
-  - `limitedBackofficeLoginGrantService.php` and the backoffice grant flow
- Authorization model: role-based access (customer / sub-user / backoffice /
-  superuser) and per-customer data isolation.
- Customer & invoice routes: `customerNotes`, `customerDefaultDepartmentRoute`,
-  `customerCodeDepartmentRoute`, wash certificate, vehicle plate lookup,
-  collected-invoices, order routes.
- Payment integration: Stripe module (`moduleStripeRoute.php`).
- Economic ERP integration (`economic_endpoint_t.php` trait) — read-only
-  token handling, invoice push.
- Edge gateway / IoT surface: `moduleEdgeGatewayRoute.php`, `edgegateway.php`,
-  `shelly.php`, `gateway_shelly_transport.php`, `birdControlPlaneRoute.php`.
- File / media endpoints: `file_server.php` (auth-gated downloads, S3 / local).
- Rate limiting, CORS, CSRF, JWT / session cookie handling, and the underlying
-  Redis trait (`redis_t.php`).
- WordPress trait / integration (`wordpress_api_object_t.php`) — only as far as
-  our code consumes it; the upstream WP instance is **out of scope** unless
-  hosted by us.
- Container/infrastructure: `Dockerfile`, `Dockerfile.coolify-api`, NGINX
-  config (`nginx.conf`, `apache-ssl.conf`), `docker-compose.prod.yml`,
-  `coolify` deploy config. Black-box reachable attack surface only.
-
-### 2.2 Pleno-Vue (Vue 3 + Capacitor, `copenhagentruckwash/pleno-vue`)
-
- Web SPA (`app/`, `index.html`, `dist/`) reachable at the production hostname.
- Mobile builds for Android (`android/`, `build.gradle`, `fastlane/`) and iOS
-  (`ios/`) packaged via Capacitor (`capacitor.config.ts`).
- API client and token storage in the SPA (where tokens live, at-rest
-  protection, refresh flow).
- Build-time secrets, env handling (`env.d.ts`, `manifest-checksum.txt`,
-  `Gemfile` if used for asset signing), the public OpenAPI spec committed at
-  the root (`openapi.yaml`).
- Capacitor deep-link / universal-link / custom-scheme handling
-  (`capacitor.config.ts`).
-
-### 2.3 Infrastructure & cross-cutting (in)
-
- TLS configuration (cert chain, HSTS, cipher suites) on the production
-  public host.
- HTTP security headers (CSP, X-Frame-Options, Referrer-Policy,
-  Permissions-Policy, X-Content-Type-Options).
- Subdomain / wildcard exposure (`*.truckwash.dk` style).
- Email & SMS notification paths only as far as they can be abused for
-  spoofing / phishing of our users (we control the From domain).
-
-### 2.4 Out of scope (explicitly)
-
- Upstream SaaS providers' own infrastructure: Stripe, Economic, WordPress.com,
-  Shelly cloud, Limble, Mailgun, etc. We will only test the **integration**,
-  not the third party itself.
- Internal office LAN, employee laptops, MDT, and physical site hardware
-  (gate controllers, scanners) — these are covered by a separate physical /
-  OT scope and **out of scope** for this IT pen test.
- Denial-of-service / load testing.
- Social engineering of Truck Wash staff.
- Source-code review of `node_modules` / vendor dependencies (the engagement
-  will use SCA tooling to flag known CVEs, but not audit transitive deps).
- Any production data exfiltration — the vendor will be given sanitised or
-  test accounts and synthetic data only.
-
---
-
-## 3. Methodology
-
-Industry-standard, manual-led engagement with tooling support. Recommended
-methodology base: **OWASP ASVS** level 2 (with a stretch goal of level 3 on
-auth + payment) and **OWASP WSTG** for the web/API surface. Mobile builds will
-use **OWASP MASVS** as the checklist.
-
-Phases (estimated total: 12 working days of vendor effort, see §6):
-
-1. **Scoping & recon (1 day)**
-   - Confirm target list, accounts, and rules of engagement.
-   - Passive recon (DNS, cert transparency, subdomains, public OpenAPI spec).
-   - Active recon limited to non-destructive fingerprinting.
-2. **API pen test (3 days)**
-   - AuthN/AuthZ boundary testing on every route group in §2.1.
-   - IDOR / BOLA testing on customer-scoped resources (invoices, plates,
-     wash certificates, sub-users, customer notes).
-   - Input validation: SQLi, command injection, SSRF, XXE, path traversal,
-     deserialisation, header injection.
-   - Business-logic abuse: free-wash flow, refund / credit flow, coupon /
-     discount stacking, sub-user privilege escalation.
-   - Webhook signature validation (Stripe, Edge Gateway, Shelly).
-3. **Web SPA pen test (2 days)**
-   - XSS (reflected, stored, DOM-based) including Vue template injection.
-   - Token storage, leakage via 3rd-party scripts, postMessage abuse.
-   - Open-redirect / OAuth misconfig in any SSO flow.
-   - CSP / SRI effectiveness.
-4. **Mobile (Capacitor) review (2 days)**
-   - Static analysis of the built APK / IPA (Capacitor WebView).
-   - Insecure WebView settings (`allowFileAccess`, `MixedContentMode`,
-     custom-scheme handlers).
-   - Local storage of tokens, biometric bypass if implemented.
-   - Deep-link / universal-link hijack attempts.
-5. **Infrastructure & config (1.5 days)**
-   - TLS, headers, cookie flags, HSTS preload eligibility.
-   - NGINX hardening review (based on provided config snapshots).
-   - Docker / coolify surface only as externally reachable.
-6. **SCA / dependency check (0.5 day)**
-   - `composer.json` and `package.json` SCA scan.
-   - High-severity known-CVE report only; no deep audit.
-7. **Exploitation & PoC (1 day)**
-   - Build proofs-of-concept for any Critical / High findings.
-8. **Reporting & re-test (1 day)**
-   - Draft report → vendor walkthrough → final report.
-   - Re-test of fixed findings is scoped separately (see §6).
-
---
-
-## 4. Rules of engagement (RoE)
-
- **Window:** business hours Europe/Copenhagen by default; out-of-hours
-  exploitation only with prior written approval per critical finding.
- **Contact channel:** shared Signal thread + email; vendor given a Slack
-  guest account in a dedicated `#sec-pentest-2026Q4` channel.
- **Stop conditions:** any finding that risks data loss, payment integrity,
-  or production gate operation → immediate stop + phone call to on-call.
- **Data handling:** vendor may only use synthetic / test data. No
-  exfiltration of real customer PII. All artifacts returned or destroyed at
-  end of engagement (TBD in contract).
- **Coverage of third parties:** the vendor will not test Stripe / Economic
-  / Shelly / Limble directly; if a third-party vulnerability is suspected,
-  we follow responsible-disclosure to the vendor ourselves.
-
---
-
-## 5. Deliverables
-
-1. **Kick-off doc** (this plan, signed off by both parties).
-2. **Daily standup notes** in `#sec-pentest-2026Q4` (one paragraph + new
-   findings list).
-3. **Mid-engagement check-in** at end of phase 3 — informal review of any
-   Critical / High so we can start patching in parallel.
-4. **Final report (PDF + JSON)** including:
-   - Executive summary, risk heatmap, business-impact narrative.
-   - Each finding: title, CVSS v3.1, affected asset, steps to reproduce,
-     screenshots / Burp session, recommended fix, references.
-   - SCA dependency report as an appendix.
-5. **Re-test letter** (separate SOW, see §6).
-6. **Knowledge transfer**: 60-min session for engineering on the top 5
-   findings.
-
---
-
-## 6. Budget & scheduling
-
-### 6.1 Indicative effort
-
-| Phase | Days | Notes |
-| --- | --- | --- |
-| 1. Scoping & recon | 1.0 | joint with us |
-| 2. API pen test | 3.0 | |
-| 3. Web SPA | 2.0 | |
-| 4. Mobile (Capacitor) | 2.0 | |
-| 5. Infra & config | 1.5 | |
-| 6. SCA | 0.5 | tooling-led |
-| 7. Exploitation / PoC | 1.0 | |
-| 8. Reporting | 1.0 | incl. 1 review round |
-| **Total** | **12.0 days** | |
-
-### 6.2 Indicative cost (DKK, ex. VAT)
-
-Pricing varies significantly with vendor. Three realistic budget tiers for
-procurement:
-
-| Tier | Daily rate (DKK) | Total (12 d) | Notes |
-| --- | --- | --- | --- |
-| Boutique / Nordic boutique (e.g. Danish / Swedish) | 12 000 – 16 000 | **144 000 – 192 000** | Best fit for our stack size, Danish-language reporting available. |
-| Mid-tier international (e.g. NCC, Securix, Pentest People) | 15 000 – 22 000 | **180 000 – 264 000** | More brand name, more bureaucracy, stronger report templates. |
-| Top-tier / Big-4 style | 25 000 – 40 000 | **300 000 – 480 000** | Overkill for current footprint; revisit at Series-A. |
-
-**Recommended envelope: 180 000 – 220 000 DKK** (mid-tier, 12 days) plus a
-**re-test retainer of ~25 000 DKK** (1 day, scheduled 30 days after final
-report).
-
-Add ~5 000 DKK contingency for incident-response hours if a Critical is
-found mid-engagement.
-
-### 6.3 Schedule (proposed)
-
- **2026-08-25** — this plan reviewed and signed off by management.
- **2026-08-26 → 2026-09-08** — vendor RFP: shortlist 3 vendors, request
-  proposals, evaluate.
- **2026-09-09 → 2026-09-15** — contract + NDA + RoE finalisation.
- **2026-09-22 (week 39)** — engagement kick-off.
- **2026-09-22 → 2026-10-07** — on-site / remote testing (2.5 calendar
-  weeks, vendor working in parallel with their normal cadence).
- **2026-10-08** — draft report.
- **2026-10-15** — final report + walkthrough.
- **2026-11-15** — re-test (retainer).
-
-All dates are **provisional** until a vendor is selected.
-
-### 6.4 Vendor shortlist (candidates to approach)
-
-We will request proposals from at least 3 of the following (final shortlist
-to be confirmed with management):
-
-1. **Securix** (DK) — boutique, OWASP ASVS-aligned, good fit for our size.
-2. **Pentest People** (UK / EU) — mid-tier, mobile capability.
-3. **NCC Group / nCC / NowSecure** (international) — heavier, good brand
-   for enterprise due-diligence.
-4. **Curity** (SE) — strong API / OAuth expertise, fits our auth model.
-5. **Deutsche Cyber AG / similar Nordic boutique** — fallback.
-
-Procurement will evaluate on: relevant references (Logistics / IoT / payment),
-ASVS/MASVS familiarity, daily rate, lead time, report quality, re-test terms.
-
---
-
-## 7. Pre-engagement hardening checklist (for engineering, run in parallel)
-
-We should land these before the vendor starts — they reduce noise and let
-the vendor focus on real issues:
-
- [ ] HSTS preload submitted; `Strict-Transport-Security: max-age=63072000; includeSubDomains; preload`
- [ ] CSP `default-src 'self'` baseline, no `unsafe-inline`; report-only first
- [ ] All cookies `Secure; HttpOnly; SameSite=Lax` (or `Strict` for backoffice)
- [ ] CSRF token on every state-changing route; verified for Stripe / Edge
-      Gateway webhooks
- [ ] Webhook signature verification on Stripe, Shelly, Edge Gateway
- [ ] Rate-limit on auth, password reset, and OTP endpoints
- [ ] Sub-user privilege model re-verified against `subusersRoute.php`
- [ ] File-server (`file_server.php`) path-traversal tests in CI
- [ ] SCA in CI: `composer audit` and `npm audit --omit=dev` blocking
-      high+ vulns
- [ ] Mobile: `allowFileAccess=false`, mixed content disabled, JS interfaces
-      removed
- [ ] Secrets: no production keys in repo (`git log -S` audit)
-
-This list is also the basis for re-test acceptance criteria.
-
---
-
-## 8. Open questions for management
-
-1. Confirm total budget cap (recommend ≤ 220 000 DKK + 25 000 retainer).
-2. Confirm legal/procurement owner and contract template.
-3. Confirm whether to require a Danish-language final report (recommended).
-4. Confirm re-test budget is approved up-front, or per-finding.
-5. Confirm we are comfortable with the 12-day estimate, or want a lighter
-   6-day "API + SPA only" first pass.
-
---
-
-## 9. References
-
- OWASP ASVS 4.0 — https://owasp.org/www-project-application-security-verification-standard/
- OWASP WSTG — https://owasp.org/www-project-web-security-testing-guide/
- OWASP MASVS — https://mas.owasp.org/MASVS/
- OWASP API Security Top 10 (2023) — https://owasp.org/API-Security/editions/2023/
- Linear project: *UI Library & Pen Testing* (`acc087b4-b8ce-40c4-bbca-077fd93513a4`)
-
---
-
-*This document is a planning artefact, not the test itself. Once approved, a
-separate SOW will be drafted with the selected vendor and linked from this
-issue.*
@@ -7,5 +7,4 @@

    <!-- AUTO-GENERATED, DO NOT EDIT -->
    <p>Comprehensive API reference generated from the repository root <code>openapi.yaml</code>.</p>
-    <p>The edge broker's <code>/api/health</code> response additionally exposes a <code>lastActivityAt</code> field (ISO 8601 timestamp). It reports the most recent successful HTTP request handled by the broker container and defaults to the container's start time when no request has been processed yet.</p>
 </topic>
@@ -12,7 +12,7 @@
    </chapter>
    <chapter title="Operation" id="operation">
        <p>Operation ID: <code>createStripePaymentIntent</code></p>
-        <p>Creates a Stripe Terminal card payment intent with fixed 25% moms.</p>
+        <p>Create Stripe payment intent</p>
    </chapter>
    <chapter title="Authentication" id="authentication">
        <p>Security requirements:</p>
@@ -32,6 +32,9 @@
    },
    &quot;reader&quot;: {
      &quot;type&quot;: &quot;string&quot;
+    },
+    &quot;tax_percentage&quot;: {
+      &quot;type&quot;: &quot;integer&quot;
    }
  },
  &quot;required&quot;: [
@@ -1,95 +0,0 @@
-# XL Vask Selvvask surface — inventory & simplification plan
-
-## Scope
-
-The XLVask surface that powers the **Superuser → Fakturaer → Periode → Selvvask**
-view. Goal: remove the AI / MiniMax / autopilot pipeline, leaving only the
-operator-facing review and order-creation flow.
-
-Out of scope: any other XLVask, plate scanner, customer, or vehicle surface.
-
-## Files removed
-
-| Path | Reason |
-| --- | --- |
-| `services/nginx/app/classes/xlvask_autopilot_service.php` | AI autopilot pipeline |
-| `services/nginx/app/classes/xlvask_automation_service.php` | AI automation pipeline |
-| `services/nginx/app/classes/xlvask_automation_policy_service.php` | AI policy service |
-| `services/nginx/app/classes/minimax.php` | MiniMax integration |
-| `services/nginx/app/modules/miniMax/` | MiniMax module (config + class) |
-| `services/nginx/app/modules/xlvask/AUTOMATION_RUNBOOK.md` | Runbook for removed pipeline |
-| `services/nginx/app/modules/xlvask/cron/tasks.php` | Module-owned cron registry (replaced by empty `cron_task_registry` discovery) |
-| `services/nginx/app/modules/xlvask/migrations/20260804_xlvask_ai_auto_policy_v2.php` | Migration for removed AI schema |
-| `services/nginx/app/modules/xlvask/config/xlvask_automatic_order_attachment_enabled_c.php` | Legacy autopilot gate |
-| `services/nginx/app/modules/xlvask/config/xlvask_automatic_order_creation_enabled_c.php` | Legacy autopilot gate |
-| `services/nginx/app/modules/xlvask/config/xlvask_minimax_integration_enabled_c.php` | MiniMax gate |
-| `services/nginx/app/modules/xlvask/config/xlvask_openai_integration_enabled_c.php` | OpenAI gate |
-| `services/nginx/app/cron/EnsureXLVaskAutomationSchema.php` | Migration helper |
-| `scripts/xlvask-automation-migrate.php` | CLI wrapper for migration |
-| `services/nginx/app/tests/Unit/XLVask/XLVaskAutomationMigrateScriptTest.php` | Removed migration test |
-| `services/nginx/app/tests/Unit/XLVask/XLVaskAutomationServiceTest.php` | Removed automation test |
-| `services/nginx/app/tests/Api/XLVaskReviewApiTest.php` | Replaced by Selvvask route contract test |
-
-## Code changes (kept & simplified)
-
-| Path | Change |
-| --- | --- |
-| `services/nginx/app/cron/Cron.php` | Drop `ProcessXLVaskAutopilotQueueCron` registration + function |
-| `services/nginx/app/cli.php` | Drop `xlvask-automation-migrate` case |
-| `services/nginx/app/routes/moduleConfigRoute.php` | Drop `/minimax/config` GET/POST endpoints |
-| `services/nginx/app/routes/moduleXLVaskRoute.php` | Drop `/modules/xlvask/tasks/import-usage` 410 stub and `/tasks/debug` route |
-| `services/nginx/app/routes/xlvaskUsageLogsRoute.php` | Slim to operator-only: list, summary, ignore/unignore, accept, reject, fast-link |
-| `services/nginx/app/modules/xlvask/helpers/xlvask_tasks.php` | Drop `runScheduledAutomationIfReady`, `processAutopilotQueue`, autopilot cleanup, legacy auto-creation branch |
-| `services/nginx/app/modules/xlvask/xlvask_c.php` | Drop `minimax_integration_enabled`, `automatic_order_attachment_enabled`, `automatic_order_creation_enabled`, `openai_integration_enabled` |
-| `services/nginx/app/objects/xlvask_usage_logs_o.php` | Add `summarizeUsageOrdersReadOnly` (replaces autopilot summary) |
-| `services/nginx/app/openapi.yaml` | Replace autopilot/automation openapi block with operator-flow endpoints |
-| `services/nginx/app/tests/Unit/Cron/CronTaskRegistryTest.php` | Update count: 24 → 22, drop `xlvask.autopilot_queue` assertion |
-| `services/nginx/app/tests/Unit/XLVask/XLVaskUsageRouteContractTest.php` | Replaced with end-to-end contract assertions for the new operator surface |
-
-## New operator-facing endpoints
-
-All under `routes/xlvaskUsageLogsRoute.php` and scoped to the operator's
-`allowedHallIds` (all-scope users see every configured scanner hall; own-scope
-users see only their group's halls).
-
-| Method | Path | Permission | Purpose |
-| --- | --- | --- | --- |
-| `GET` | `/modules/xlvask/services/usage/orders` | `list_xlvask_usage_orders_own/all` | List usage logs with direct linked order id, amount summary, ignored metadata |
-| `GET` | `/modules/xlvask/services/usage/orders/summary` | `list_xlvask_usage_orders_own/all` | Read-only per-period summary (counts + net amount) |
-| `PATCH` | `/modules/xlvask/services/usage/orders/{id}/ignore` | `review_xlvask_usage_order` | Mark ignored with reason |
-| `POST` | `/modules/xlvask/services/usage/orders/{id}/unignore` | `review_xlvask_usage_order` | Clear ignored metadata |
-| `POST` | `/modules/xlvask/services/usage/orders/{id}/accept` | `review_xlvask_usage_order` | Convert to order via `createOrderFromWash` |
-| `POST` | `/modules/xlvask/services/usage/orders/{id}/reject` | `review_xlvask_usage_order` | Mark ignored with reject reason |
-| `GET` | `/modules/xlvask/services/usage/orders/fast-link` | `list_xlvask_usage_orders_own` | Cached fast-link redeem (existing) |
-
-## Permissions
-
-The Selvvask surface uses these permissions only:
-
- `list_xlvask_usage_orders_own`
- `list_xlvask_usage_orders_all`
- `review_xlvask_usage_order`
-
-`manage_xlvask_usage_automation`, `ignore_xlvask_usage_order`,
-`superuser_xlvask_automation_activate` are not referenced anywhere in the
-slimmed surface.
-
-## Persistence model
-
-`xlvask_usage_logs_o` already exposes `ignored_at`, `ignored_by`, `ignored_reason`
-columns — no migration required for the simplified flow.
-
-`orders_o::selectByWashId(int|string $WashId)` and
-`orders_o::addXLVaskOrder(users_o $user, xlvask_usage_log $xlvask_usage_log)` are
-the only integration points with the order pipeline.
-
-## Tests
-
- `vendor/bin/pest --testsuite=Unit --colors=never` passes 1266 tests.
- One pre-existing failure (`BirdControlPlaneActivationTest`) requires
-  `PLENO_REPO_ROOT_FOR_TESTS` (coolify repo) and is unrelated to this change.
-
-## Repo scope
-
-This inventory covers `api`. The `pleno-vue` side has not yet been updated in
-this session and will be handled in a follow-up PR.
@@ -1,55 +1,46 @@
+#-------------------------------------------------------------------------------#
+#               Qodana analysis is configured by qodana.yaml file               #
+#             https://www.jetbrains.com/help/qodana/qodana-yaml.html            #
+#-------------------------------------------------------------------------------#
+
+#################################################################################
+#              WARNING: Do not store sensitive information in this file,        #
+#               as its contents will be included in the Qodana report.          #
+#################################################################################
 version: "1.0"

-linter: jetbrains/qodana-php:2026.1
-
+#Specify inspection profile for code analysis
 profile:
-  name: qodana.recommended
+  name: qodana.starter

-php:
-  version: "8.2"
+#Enable inspections
+#include:
+#  - name: <SomeEnabledInspectionId>

-bootstrap: |+
-  set -eu
-  composer --working-dir=services/nginx/app install --no-interaction --prefer-dist --no-progress --ignore-platform-reqs
-  composer --working-dir=services/nginx/app/modules/washcertificates install --no-interaction --prefer-dist --no-progress --ignore-platform-reqs
-  npm --prefix services/edge-agent ci --ignore-scripts
-  npm --prefix services/edge-broker ci --ignore-scripts
+#Disable inspections
+#exclude:
+#  - name: <SomeDisabledInspectionId>
+#    paths:
+#      - <path/where/not/run/inspection>

-exclude:
-  # This application is intentionally Composer-classmapped and keeps legacy snake_case
-  # classes plus multiple local test doubles in single files; PSR path rules do not apply.
-  - name: PhpIllegalPsrClassPathInspection
-    paths:
-      - services/nginx/app
-  # Unit-test doubles intentionally bypass integration-heavy parent constructors.
-  - name: PhpMissingParentConstructorInspection
-    paths:
-      - services/nginx/app/tests
-  # These focused tests configure doubles through public fields before invoking behavior.
-  - name: PhpObjectFieldsAreOnlyWrittenInspection
-    paths:
-      - services/nginx/app/tests/Unit/Bird/BirdGateCallFlowTest.php
-      - services/nginx/app/tests/Unit/Invoicing/EconomicCustomersDiscountFallbackTest.php
-      - services/nginx/app/tests/Unit/Selfserve/SelfserveCustomerLaneAccessTest.php
-  # API coverage markers are intentional statement-style calls in the Pest DSL.
-  # Their return value is irrelevant; the call records route/scenario coverage.
-  - name: PhpExpressionResultUnusedInspection
-    paths:
-      - services/nginx/app/tests/Api
-  - name: All
-    paths:
-      - services/nginx/app/vendor
-      - services/nginx/app/modules/washcertificates/vendor
-      - services/nginx/app/build
-      - services/nginx/app/.phpunit.cache
-      - services/nginx/app/tests/Legacy
-      - services/edge-agent/node_modules
-      - services/edge-broker/node_modules
-      - services/edge-agent/dist
-      - documentation/generated
-      - documentation/topics/generated
-      - documentation/_build
-      - documentation/_site_rebuild_20260317
-      - docs_bird_voice_calls.html
-      - .tmp
-      - .openclaw
+#Execute shell command before Qodana execution (Applied in CI/CD pipeline)
+#bootstrap: sh ./prepare-qodana.sh
+
+#Install IDE plugins before Qodana execution (Applied in CI/CD pipeline)
+#plugins:
+#  - id: <plugin.id> #(plugin id can be found at https://plugins.jetbrains.com)
+
+# Quality gate. Will fail the CI/CD pipeline if any condition is not met
+# severityThresholds - configures maximum thresholds for different problem severities
+# testCoverageThresholds - configures minimum code coverage on a whole project and newly added code
+# Code Coverage is available in Ultimate and Ultimate Plus plans
+#failureConditions:
+#  severityThresholds:
+#    any: 15
+#    critical: 5
+#  testCoverageThresholds:
+#    fresh: 70
+#    total: 50
+
+#Specify Qodana linter for analysis (Applied in CI/CD pipeline)
+linter: jetbrains/qodana-php:2025.3
@@ -1,35 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-if (PHP_SAPI !== 'cli') {
-    fwrite(STDERR, "This command is CLI-only.\n");
-    exit(2);
-}
-
-const WD = __DIR__ . '/../services/nginx/app';
-require_once WD . '/vendor/autoload.php';
-require_once WD . '/config.php';
-require_once WD . '/classes/db.php';
-require_once WD . '/classes/account_deletion_schema_bootstrap.php';
-
-$response = null;
-$db = new \classes\db($CONFIG_DB);
-$db->connect();
-$command = $argv[1] ?? 'check';
-
-if ($command === 'apply') {
-    if (($argv[2] ?? '') !== '--yes') {
-        fwrite(STDERR, "Refusing schema mutation without: apply --yes\n");
-        exit(2);
-    }
-    \classes\account_deletion_schema_bootstrap::apply();
-}
-
-if (!in_array($command, ['check', 'apply'], true)) {
-    fwrite(STDERR, "Usage: scripts/account-deletion-schema.php check|apply --yes\n");
-    exit(2);
-}
-
-$status = \classes\account_deletion_schema_bootstrap::check();
-fwrite(STDOUT, json_encode($status, JSON_UNESCAPED_SLASHES) . PHP_EOL);
-exit($status['ready'] ? 0 : 1);
@@ -1,58 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-if (PHP_SAPI !== 'cli') {
-    fwrite(STDERR, "This command is CLI-only.\n");
-    exit(2);
-}
-
-$command = $argv[1] ?? 'check';
-if (!in_array($command, ['check', 'apply', 'webhooks-check', 'webhooks-apply'], true)) {
-    fwrite(
-        STDERR,
-        "Usage: scripts/bird-control-plane-activate.php check|apply|webhooks-check|webhooks-apply [--yes]\n"
-    );
-    exit(2);
-}
-if (in_array($command, ['apply', 'webhooks-apply'], true) && ($argv[2] ?? '') !== '--yes') {
-    fwrite(STDERR, "Refusing Bird activation without: apply --yes\n");
-    exit(2);
-}
-
-$appDirectory = __DIR__ . '/../services/nginx/app';
-if (!is_file($appDirectory . '/config.php')) {
-    $appDirectory = dirname(__DIR__);
-}
-define('WD', $appDirectory);
-require_once WD . '/vendor/autoload.php';
-require_once WD . '/config.php';
-require_once WD . '/classes/db.php';
-require_once WD . '/modules/bird/classes/bird_control_plane_activator.php';
-require_once WD . '/modules/bird/classes/bird_webhook_subscription_reconciler.php';
-
-try {
-    $pdo = \classes\db::getPDO();
-    if (str_starts_with($command, 'webhooks-')) {
-        $reconciler = new \bird\classes\bird_webhook_subscription_reconciler($pdo);
-        $organizationId = trim((string)(getenv('BIRD_ORGANIZATION_ID') ?: ''));
-        $status = $command === 'webhooks-apply'
-            ? $reconciler->apply($organizationId)
-            : $reconciler->check($organizationId);
-    } else {
-        $activator = new \bird\classes\bird_control_plane_activator($pdo);
-        $status = $command === 'apply' ? $activator->apply([
-            'controlPlaneToken' => trim((string)(getenv('BIRD_CONTROL_PLANE_TOKEN') ?: '')),
-            'webhookSigningKey' => trim((string)(getenv('BIRD_WEBHOOK_SIGNING_KEY') ?: '')),
-            'participantId' => trim((string)(getenv('BIRD_PARTICIPANT_ID') ?: '')),
-        ]) : $activator->check();
-    }
-    fwrite(STDOUT, json_encode($status, JSON_UNESCAPED_SLASHES) . PHP_EOL);
-    exit(($status['ready'] ?? false) === true ? 0 : 1);
-} catch (Throwable $throwable) {
-    error_log('[bird-control-plane-activate] Failed: ' . get_class($throwable));
-    fwrite(STDOUT, json_encode([
-        'ready' => false,
-        'errorCode' => 'bird_activation_failed',
-    ], JSON_UNESCAPED_SLASHES) . PHP_EOL);
-    exit(1);
-}
@@ -1,28 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-if (PHP_SAPI !== 'cli') {
-    exit(2);
-}
-
-$appDirectory = __DIR__ . '/../services/nginx/app';
-if (!is_file($appDirectory . '/config.php')) {
-    $appDirectory = dirname(__DIR__);
-}
-define('WD', $appDirectory);
-require_once WD . '/vendor/autoload.php';
-require_once WD . '/config.php';
-require_once WD . '/classes/db.php';
-require_once WD . '/modules/bird/classes/bird_control_plane_auto_activation.php';
-
-try {
-    $status = (new \bird\classes\bird_control_plane_auto_activation(
-        \classes\db::getPDO()
-    ))->run();
-    fwrite(STDOUT, json_encode($status, JSON_UNESCAPED_SLASHES) . PHP_EOL);
-    exit(($status['ready'] ?? false) === true ? 0 : 1);
-} catch (Throwable $throwable) {
-    error_log('[bird-control-plane-auto-activate] Failed: ' . get_class($throwable));
-    fwrite(STDOUT, '{"ready":false,"errorCode":"bird_auto_activation_failed"}' . PHP_EOL);
-    exit(1);
-}
@@ -1,79 +0,0 @@
-#!/bin/sh
-set -eu
-
-bootstrap_url='https://api.truckwash.io:4433/bird/control-plane/v1/bootstrap'
-status_url='https://api.truckwash.io:4433/bird/control-plane/v1/status'
-expected_algorithm='RSA-OAEP-256'
-expected_fingerprint='6dc63c6ffe33b8de0b1396d7f529f56aea0a685ef98168016161cf721ddc8c21'
-private_key='/home/jeppe/.openclaw/credentials/bird.bootstrap-private.pem'
-credential_dir='/home/jeppe/.openclaw/credentials'
-destination="$credential_dir/bird.gateway-token"
-
-umask 077
-mkdir -p "$credential_dir"
-envelope_file="$(mktemp "$credential_dir/.bird-bootstrap-envelope.XXXXXX")"
-candidate_file="$(mktemp "$credential_dir/.bird-gateway-token.XXXXXX")"
-payload_file="$(mktemp "$credential_dir/.bird-bootstrap-payload.XXXXXX")"
-status_file="$(mktemp "$credential_dir/.bird-bootstrap-status.XXXXXX")"
-cleanup() {
-    rm -f "$envelope_file" "$candidate_file" "$payload_file" "$status_file"
-}
-trap cleanup EXIT HUP INT TERM
-
-test -r "$private_key"
-test "$(stat -c '%a' "$private_key")" = '600'
-
-curl --proto '=https' --tlsv1.2 --fail --silent --show-error \
-    --max-time 30 "$bootstrap_url" > "$envelope_file"
-
-test "$(jq -r '.success // false' "$envelope_file")" = 'true'
-test "$(jq -r '.data.algorithm // empty' "$envelope_file")" = "$expected_algorithm"
-test "$(jq -r '.data.keyFingerprint // empty' "$envelope_file")" = "$expected_fingerprint"
-jq -e '.data | keys == ["algorithm","ciphertext","keyFingerprint","tokenVersion","updatedAt"]' \
-    "$envelope_file" >/dev/null
-jq -e '.data.tokenVersion | type == "number" and . >= 1 and floor == .' \
-    "$envelope_file" >/dev/null
-jq -e '.data.updatedAt | type == "string" and test("^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z$")' \
-    "$envelope_file" >/dev/null
-jq -e '.data.ciphertext | type == "string" and length == 512 and test("^[A-Za-z0-9+/]{512}$")' \
-    "$envelope_file" >/dev/null
-
-jq -r '.data.ciphertext' "$envelope_file" \
-    | base64 -d \
-    | openssl pkeyutl -decrypt -inkey "$private_key" \
-        -pkeyopt rsa_padding_mode:oaep \
-        -pkeyopt rsa_oaep_md:sha256 \
-        -pkeyopt rsa_mgf1_md:sha256 > "$payload_file"
-
-jq -e '. | keys == ["algorithm","keyFingerprint","token","tokenVersion","updatedAt"]' \
-    "$payload_file" >/dev/null
-test "$(jq -r '.algorithm // empty' "$payload_file")" = "$expected_algorithm"
-test "$(jq -r '.keyFingerprint // empty' "$payload_file")" = "$expected_fingerprint"
-test "$(jq -r '.tokenVersion // empty' "$payload_file")" = \
-    "$(jq -r '.data.tokenVersion' "$envelope_file")"
-test "$(jq -r '.updatedAt // empty' "$payload_file")" = \
-    "$(jq -r '.data.updatedAt' "$envelope_file")"
-jq -j '.token' "$payload_file" > "$candidate_file"
-
-test "$(wc -c < "$candidate_file")" = '64'
-grep -Eq '^[A-Za-z0-9_-]{64}$' "$candidate_file"
-chmod 600 "$candidate_file"
-
-token="$(cat "$candidate_file")"
-{
-    printf 'url = "%s"\n' "$status_url"
-    printf 'proto = "=https"\n'
-    printf 'tlsv1.2\n'
-    printf 'fail\nsilent\nshow-error\n'
-    printf 'max-time = 30\n'
-    printf 'header = "Authorization: Bearer %s"\n' "$token"
-} | curl --config - > "$status_file"
-unset token
-
-jq -e '.success == true and .data.enabled == true and .data.webhookConfigured == true' \
-    "$status_file" >/dev/null
-mv -f "$candidate_file" "$destination"
-chmod 600 "$destination"
-trap - EXIT HUP INT TERM
-rm -f "$envelope_file" "$payload_file" "$status_file"
-printf 'Bird gateway credential bootstrapped and authenticated.\n'
@@ -1,32 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-if (PHP_SAPI !== 'cli') {
-    fwrite(STDERR, "This command is CLI-only.\n");
-    exit(2);
-}
-
-const WD = __DIR__ . '/../services/nginx/app';
-require_once WD . '/vendor/autoload.php';
-require_once WD . '/config.php';
-require_once WD . '/classes/db.php';
-require_once WD . '/modules/bird/classes/bird_control_plane_schema_bootstrap.php';
-
-$command = $argv[1] ?? 'check';
-if (!in_array($command, ['check', 'apply'], true)) {
-    fwrite(STDERR, "Usage: scripts/bird-control-plane-schema.php check|apply --yes\n");
-    exit(2);
-}
-
-$pdo = \classes\db::getPDO();
-if ($command === 'apply') {
-    if (($argv[2] ?? '') !== '--yes') {
-        fwrite(STDERR, "Refusing schema mutation without: apply --yes\n");
-        exit(2);
-    }
-    \bird\classes\bird_control_plane_schema_bootstrap::apply($pdo);
-}
-
-$status = \bird\classes\bird_control_plane_schema_bootstrap::check($pdo);
-fwrite(STDOUT, json_encode($status, JSON_UNESCAPED_SLASHES) . PHP_EOL);
-exit($status['ready'] ? 0 : 1);
@@ -144,7 +144,7 @@ function requestJson({ method = "GET", port, path: requestPath, body = null, hea
        raw += chunk;
      });
      response.on("end", () => {
-        let decoded;
+        let decoded = {};
        try {
          decoded = raw.trim() === "" ? {} : JSON.parse(raw);
        } catch {
@@ -95,7 +95,7 @@ function directCaddyBaseUrl(baseUrl) {
 }

 function isLocalHost(hostname) {
-  const normalized = String(hostname || "").toLowerCase().replace(/^\x5b|\x5d$/g, "");
+  const normalized = String(hostname || "").toLowerCase().replace(/^\[|\]$/g, "");
  return normalized === "localhost" || normalized === "127.0.0.1" || normalized === "::1";
 }

@@ -227,7 +227,11 @@ async function connectCurrentContainerToComposeNetwork(rootDir, composeProject)
    return true;
  }

-  return /already exists|already connected/i.test(stderr);
+  if (/already exists|already connected/i.test(stderr)) {
+    return true;
+  }
+
+  return false;
 }

 async function disconnectCurrentContainerFromComposeNetwork(rootDir, composeProject) {
@@ -829,7 +833,7 @@ async function main() {
        { timeoutMs: 180_000, message: "Gateway operation never completed through the live agent." }
      );
    } catch (error) {
-      let operationSnapshot;
+      let operationSnapshot = null;
      try {
        const operations = await apiRequest(baseUrl, "GET", `/edge-gateways/${gatewayId}/operations`, {
          token: authToken,
@@ -924,20 +928,22 @@ async function main() {
      { timeoutMs: 20_000, message: "Browser shell never closed cleanly." }
    );

-    await waitForCondition(
-      async () => {
-        const logsAfterShell = await apiRequest(baseUrl, "GET", `/edge-gateways/${gatewayId}/logs`, {
-          token: authToken,
-        });
-        const shellTranscripts = Array.isArray(logsAfterShell?.data?.shell_sessions)
-          ? logsAfterShell.data.shell_sessions.map((session) => String(session?.transcript || ""))
-          : [];
-        const timelineMessages = collectMessages(logsAfterShell?.data?.timeline || []);
+    const logsAfterShell = await apiRequest(baseUrl, "GET", `/edge-gateways/${gatewayId}/logs`, {
+      token: authToken,
+    });
+    const shellTranscripts = Array.isArray(logsAfterShell?.data?.shell_sessions)
+      ? logsAfterShell.data.shell_sessions.map((session) => String(session?.transcript || ""))
+      : [];

-        return shellTranscripts.some((transcript) => transcript.includes("edge-e2e-shell"))
-          && timelineMessages.includes("GATEWAY_SHELL_SESSION_CLOSED");
-      },
-      { timeoutMs: 30_000, message: "Gateway logs page did not persist the shell transcript and close audit event." }
+    assert.ok(
+      shellTranscripts.some((transcript) => transcript.includes("edge-e2e-shell")),
+      "Gateway logs page did not persist the shell transcript."
+    );
+
+    const timelineMessages = collectMessages(logsAfterShell?.data?.timeline || []);
+    assert.ok(
+      timelineMessages.includes("GATEWAY_SHELL_SESSION_CLOSED"),
+      "Gateway logs page did not include the shell close audit event."
    );

    process.stdout.write("Edge gateway E2E smoke completed successfully.\n");
@@ -955,10 +961,9 @@ async function main() {
      allowFailure: true,
    }).catch(() => {});

-    const fixtureAuthToken = fixture?.auth_token;
-    if (gatewayId !== null && fixtureAuthToken) {
+    if (gatewayId !== null && fixture?.auth_token) {
      await apiRequest(baseUrl, "DELETE", `/edge-gateways/${gatewayId}`, {
-        token: String(fixtureAuthToken),
+        token: String(fixture.auth_token),
      }).catch(() => {});
    }

@@ -405,10 +405,6 @@ def render_api_reference_topic() -> str:
        '       title="API Reference" id="API-Reference">\n'
        f"\n    <!-- {AUTOGEN_NOTE} -->\n"
        "    <p>Comprehensive API reference generated from the repository root <code>openapi.yaml</code>.</p>\n"
-        "    <p>The edge broker's <code>/api/health</code> response additionally exposes a "
-        "<code>lastActivityAt</code> field (ISO 8601 timestamp). It reports the most recent "
-        "successful HTTP request handled by the broker container and defaults to the container's "
-        "start time when no request has been processed yet.</p>\n"
        "</topic>\n"
    )

@@ -146,13 +146,6 @@ tar \
  -cf - \
  Dockerfile \
  Dockerfile.coolify-api \
-  docker-compose.yml \
-  docker-compose.example.yml \
-  docker-compose.prod.standalone.yml \
-  scripts/bird-control-plane-auto-activate.php \
-  scripts/bird-control-plane-bootstrap-local.sh \
-  scripts/xlvask-automation-migrate.php \
-  services/coolify/api/start.sh \
  services/php/Dockerfile \
  services/php/php-fpm-pool.conf \
  | docker compose $compose_files exec -T php1 tar --no-same-owner -C /var/www/repo-root -xf -
@@ -1,64 +0,0 @@
-#!/usr/bin/env php
-<?php
-/**
- * Pre-deploy schema bootstrap runner.
- *
- * Loads and runs every `*_schema_bootstrap` class so the production
- * database has all the columns the current code expects. Each
- * bootstrap is additive and idempotent — safe to run on every deploy.
- *
- * Run via:
- *   php scripts/run-schema-bootstraps.php
- *
- * Used in .github/workflows/deploy.yml as a pre-deploy step.
- *
- * When you add a new *_schema_bootstrap class, you don't need to
- * edit this file — the runner auto-discovers any class whose name
- * ends in `_schema_bootstrap`.
- */
-
-namespace scripts;
-
-// Load the app entry point so $db is wired up the same way as in
-// normal request handling.
-$index = __DIR__ . '/../services/nginx/app/index.php';
-if (!file_exists($index)) {
-    fwrite(STDERR, "Cannot find app entry point at {$index}\n");
-    exit(2);
-}
-require_once $index;
-
-$classesDir = __DIR__ . '/../services/nginx/app/classes';
-$bootstraps = glob($classesDir . '/*_schema_bootstrap.php');
-if (!$bootstraps) {
-    fwrite(STDERR, "No *_schema_bootstrap.php files found in {$classesDir}\n");
-    exit(0);
-}
-
-$ran = 0;
-$skipped = 0;
-foreach ($bootstraps as $file) {
-    require_once $file;
-    $base = basename($file, '.php');
-    $class = "classes\\{$base}";
-    if (!class_exists($class)) {
-        fwrite(STDERR, "  [skip] {$base}: class not found\n");
-        $skipped++;
-        continue;
-    }
-    if (!method_exists($class, 'ensureSchema')) {
-        fwrite(STDERR, "  [skip] {$base}: no ensureSchema() method\n");
-        $skipped++;
-        continue;
-    }
-    try {
-        $class::ensureSchema();
-        echo "  [ok]   {$base}\n";
-        $ran++;
-    } catch (\Throwable $e) {
-        fwrite(STDERR, "  [FAIL] {$base}: " . $e->getMessage() . "\n");
-        exit(1);
-    }
-}
-
-echo "Schema bootstraps complete: {$ran} ran, {$skipped} skipped.\n";
@@ -1,96 +0,0 @@
-#!/usr/bin/env php
-<?php
-/**
- * Schema health check — verifies all required DB columns exist.
- *
- * Run via:
- *   GET  /api/admin/schema-check    (returns JSON report)
- *   php  scripts/schema-health-check.php   (CLI, exits 0/1)
- *
- * Lists the columns that the code expects to find in each critical
- * table. If a column is missing, the response is 503 (HTTP) or
- * exit code 1 (CLI) — clearly distinct from a generic 500.
- *
- * Add to the list when introducing a new optional column.
- */
-
-namespace scripts;
-
-require_once __DIR__ . '/../services/nginx/app/classes/customer_invoice_email_schema_bootstrap.php';
-
-use classes\customer_invoice_email_schema_bootstrap;
-
-const SCHEMA_REQUIREMENTS = [
-    'users' => [
-        'invoice_email',       // TRU-77 (added 2026-08-16)
-        'wash_certificate_email',
-        'email',
-        'customer_number',
-    ],
-    'invoices' => [
-        'po_number',
-        'closed_at',
-        'customer_number',
-    ],
-    'bookings' => [
-        'id',
-        'customer_number',
-        'department',
-    ],
-];
-
-function check_schema(): array
-{
-    global $db;
-    $report = [
-        'ok' => true,
-        'missing' => [],
-        'tables_checked' => 0,
-        'columns_checked' => 0,
-        'timestamp' => date('c'),
-    ];
-
-    if (!isset($db) || !is_object($db) || !method_exists($db, 'query')) {
-        $report['ok'] = false;
-        $report['error'] = 'no_db_connection';
-        return $report;
-    }
-
-    // First: run the schema bootstrap (additive, idempotent) so we
-    // give the DB a chance to self-heal.
-    if (class_exists(customer_invoice_email_schema_bootstrap::class)) {
-        customer_invoice_email_schema_bootstrap::ensureSchema();
-    }
-
-    foreach (SCHEMA_REQUIREMENTS as $table => $columns) {
-        $report['tables_checked']++;
-
-        // Confirm the table itself exists
-        $tableSafe = str_replace('`', '', $table);
-        $result = $db->query("SHOW TABLES LIKE '{$tableSafe}'");
-        if (!$result || (int)$result->num_rows === 0) {
-            $report['ok'] = false;
-            $report['missing'][] = "table `{$table}` does not exist";
-            continue;
-        }
-
-        foreach ($columns as $column) {
-            $report['columns_checked']++;
-            $colSafe = str_replace("'", '', $column);
-            $r = $db->query("SHOW COLUMNS FROM `{$tableSafe}` LIKE '{$colSafe}'");
-            if (!$r || (int)$r->num_rows === 0) {
-                $report['ok'] = false;
-                $report['missing'][] = "{$table}.{$column}";
-            }
-        }
-    }
-
-    return $report;
-}
-
-// CLI mode
-if (PHP_SAPI === 'cli') {
-    $report = check_schema();
-    echo json_encode($report, JSON_PRETTY_PRINT) . "\n";
-    exit($report['ok'] ? 0 : 1);
-}
@@ -1,80 +0,0 @@
-#!/usr/bin/env bash
-# Generic smoke test for any deployed app.
-#
-# Usage: ./scripts/smoke-test.sh [base_url]
-# Default: https://staging.truckwash.io
-#
-# Required env vars (set by GitHub Action):
-#   SMOKE_BASE_URL  - base URL to test (default: https://staging.truckwash.io)
-#
-# Optional env vars:
-#   SMOKE_TOKEN     - bearer token for authenticated checks
-#   SMOKE_TIMEOUT   - curl timeout in seconds (default: 10)
-#
-# Exits 0 on all-pass, 1 on any failure.
-
-set -euo pipefail
-
-BASE_URL="${SMOKE_BASE_URL:-${1:-https://staging.truckwash.io}}"
-TIMEOUT="${SMOKE_TIMEOUT:-10}"
-
-# Color codes
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
-NC='\033[0m'
-
-FAIL=0
-
-check() {
-  local name="$1"
-  local url="$2"
-  local expected="${3:-200}"
-  local method="${4:-GET}"
-
-  local status
-  status=$(curl -s -o /dev/null -w "%{http_code}" -X "$method" --max-time "$TIMEOUT" "$url" || echo "000")
-
-  if [[ "$status" =~ ^($expected)$ ]] || [[ "$expected" == "2xx" && "$status" =~ ^2 ]]; then
-    echo -e "  ${GREEN}✓${NC} $name ($status) — $url"
-  else
-    echo -e "  ${RED}✗${NC} $name (expected $expected, got $status) — $url"
-    FAIL=1
-  fi
-}
-
-echo "Smoke test against $BASE_URL"
-echo "  (timeout ${TIMEOUT}s per check)"
-echo
-
-# === Health endpoints (universal) ===
-check "health check"  "$BASE_URL/healthz"     "2xx"
-check "ping"          "$BASE_URL/api/ping"    "2xx"
-
-# === Authentication (should NOT 500) ===
-check "login page"    "$BASE_URL/login"       "2xx"
-
-# === Public endpoints (api repo) ===
-check "customer list (public schema)"  "$BASE_URL/api/customer"            "2xx"
-check "kundeoprettelse form"           "$BASE_URL/kundeoprettelse"         "2xx"
-
-# === Public endpoints (pleno-vue) ===
-check "self-serve program picker"  "$BASE_URL/self-serve/program"  "2xx"
-check "vehicle step"               "$BASE_URL/self-serve/vehicle"  "2xx"
-
-# === Custom 404 should not 500 ===
-check "404 page"  "$BASE_URL/this-route-does-not-exist"  "404"
-
-# === Optional authenticated check ===
-if [ -n "${SMOKE_TOKEN:-}" ]; then
-  check "auth check"  "$BASE_URL/api/me"  "2xx"
-fi
-
-echo
-if [ "$FAIL" -eq 0 ]; then
-  echo -e "${GREEN}✓ All smoke tests passed${NC}"
-  exit 0
-else
-  echo -e "${RED}✗ Some smoke tests failed${NC}"
-  exit 1
-fi
@@ -4,9 +4,9 @@
  "requires": true,
  "packages": {
    "node_modules/ws": {
-      "version": "8.21.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.21.1.tgz",
-      "integrity": "sha512-+0NTnW77fFN/DjQi6k/Sq/Yvk4Sgajw7urW8V+asjXnRgDs9gyGkdb7EzgfhA4goXsRIZKE28fzIXBHEzhuiWw==",
+      "version": "8.20.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.20.0.tgz",
+      "integrity": "sha512-sAt8BhgNbzCtgGbt2OxmpuryO63ZoDk/sqaB/znQm94T4fCEsy/yV+7CdC1kJhOU9lboAEU7R3kquuycDoibVA==",
      "license": "MIT",
      "engines": {
        "node": ">=10.0.0"
@@ -40,10 +40,6 @@ class Receiver extends Writable {
   *     extensions
   * @param {Boolean} [options.isServer=false] Specifies whether to operate in
   *     client or server mode
-   * @param {Number} [options.maxBufferedChunks=0] The maximum number of
-   *     buffered data chunks
-   * @param {Number} [options.maxFragments=0] The maximum number of message
-   *     fragments
   * @param {Number} [options.maxPayload=0] The maximum allowed message length
   * @param {Boolean} [options.skipUTF8Validation=false] Specifies whether or
   *     not to skip UTF-8 validation for text and close messages
@@ -58,8 +54,6 @@ class Receiver extends Writable {
    this._binaryType = options.binaryType || BINARY_TYPES[0];
    this._extensions = options.extensions || {};
    this._isServer = !!options.isServer;
-    this._maxBufferedChunks = options.maxBufferedChunks | 0;
-    this._maxFragments = options.maxFragments | 0;
    this._maxPayload = options.maxPayload | 0;
    this._skipUTF8Validation = !!options.skipUTF8Validation;
    this[kWebSocket] = undefined;
@@ -77,7 +71,6 @@ class Receiver extends Writable {

    this._totalPayloadLength = 0;
    this._messageLength = 0;
-    this._numFragments = 0;
    this._fragments = [];

    this._errored = false;
@@ -96,22 +89,6 @@ class Receiver extends Writable {
  _write(chunk, encoding, cb) {
    if (this._opcode === 0x08 && this._state == GET_INFO) return cb();

-    if (
-      this._maxBufferedChunks > 0 &&
-      this._buffers.length >= this._maxBufferedChunks
-    ) {
-      cb(
-        this.createError(
-          RangeError,
-          'Too many buffered chunks',
-          false,
-          1008,
-          'WS_ERR_TOO_MANY_BUFFERED_PARTS'
-        )
-      );
-      return;
-    }
-
    this._bufferedBytes += chunk.length;
    this._buffers.push(chunk);
    this.startLoop(cb);
@@ -501,19 +478,6 @@ class Receiver extends Writable {
      return;
    }

-    if (this._maxFragments > 0 && ++this._numFragments > this._maxFragments) {
-      const error = this.createError(
-        RangeError,
-        'Too many message fragments',
-        false,
-        1008,
-        'WS_ERR_TOO_MANY_BUFFERED_PARTS'
-      );
-
-      cb(error);
-      return;
-    }
-
    if (this._compressed) {
      this._state = INFLATING;
      this.decompress(data, cb);
@@ -586,7 +550,6 @@ class Receiver extends Writable {
    this._totalPayloadLength = 0;
    this._messageLength = 0;
    this._fragmented = 0;
-    this._numFragments = 0;
    this._fragments = [];

    if (this._opcode === 2) {
@@ -4,9 +4,6 @@

 const { Duplex } = require('stream');
 const { randomFillSync } = require('crypto');
-const {
-  types: { isUint8Array }
-} = require('util');

 const PerMessageDeflate = require('./permessage-deflate');
 const { EMPTY_BUFFER, kWebSocket, NOOP } = require('./constants');
@@ -203,10 +200,8 @@ class Sender {

      if (typeof data === 'string') {
        buf.write(data, 2);
-      } else if (isUint8Array(data)) {
-        buf.set(data, 2);
      } else {
-        throw new TypeError('Second argument must be a string or a Uint8Array');
+        buf.set(data, 2);
      }
    }

@@ -43,10 +43,6 @@ class WebSocketServer extends EventEmitter {
   *     called
   * @param {Function} [options.handleProtocols] A hook to handle protocols
   * @param {String} [options.host] The hostname where to bind the server
-   * @param {Number} [options.maxBufferedChunks=262144] The maximum number of
-   *     buffered data chunks
-   * @param {Number} [options.maxFragments=16384] The maximum number of message
-   *     fragments
   * @param {Number} [options.maxPayload=104857600] The maximum allowed message
   *     size
   * @param {Boolean} [options.noServer=false] Enable no server mode
@@ -69,8 +65,6 @@ class WebSocketServer extends EventEmitter {
    options = {
      allowSynchronousEvents: true,
      autoPong: true,
-      maxBufferedChunks: 256 * 1024,
-      maxFragments: 16 * 1024,
      maxPayload: 100 * 1024 * 1024,
      skipUTF8Validation: false,
      perMessageDeflate: false,
@@ -430,8 +424,6 @@ class WebSocketServer extends EventEmitter {

    ws.setSocket(socket, head, {
      allowSynchronousEvents: this.options.allowSynchronousEvents,
-      maxBufferedChunks: this.options.maxBufferedChunks,
-      maxFragments: this.options.maxFragments,
      maxPayload: this.options.maxPayload,
      skipUTF8Validation: this.options.skipUTF8Validation
    });
@@ -201,10 +201,6 @@ class WebSocket extends EventEmitter {
   *     multiple times in the same tick
   * @param {Function} [options.generateMask] The function used to generate the
   *     masking key
-   * @param {Number} [options.maxBufferedChunks=0] The maximum number of
-   *     buffered data chunks
-   * @param {Number} [options.maxFragments=0] The maximum number of message
-   *     fragments
   * @param {Number} [options.maxPayload=0] The maximum allowed message size
   * @param {Boolean} [options.skipUTF8Validation=false] Specifies whether or
   *     not to skip UTF-8 validation for text and close messages
@@ -216,8 +212,6 @@ class WebSocket extends EventEmitter {
      binaryType: this.binaryType,
      extensions: this._extensions,
      isServer: this._isServer,
-      maxBufferedChunks: options.maxBufferedChunks,
-      maxFragments: options.maxFragments,
      maxPayload: options.maxPayload,
      skipUTF8Validation: options.skipUTF8Validation
    });
@@ -646,10 +640,6 @@ module.exports = WebSocket;
 *     masking key
 * @param {Number} [options.handshakeTimeout] Timeout in milliseconds for the
 *     handshake request
- * @param {Number} [options.maxBufferedChunks=262144] The maximum number of
- *     buffered data chunks
- * @param {Number} [options.maxFragments=16384] The maximum number of message
- *     fragments
 * @param {Number} [options.maxPayload=104857600] The maximum allowed message
 *     size
 * @param {Number} [options.maxRedirects=10] The maximum number of redirects
@@ -670,8 +660,6 @@ function initAsClient(websocket, address, protocols, options) {
    autoPong: true,
    closeTimeout: CLOSE_TIMEOUT,
    protocolVersion: protocolVersions[1],
-    maxBufferedChunks: 256 * 1024,
-    maxFragments: 16 * 1024,
    maxPayload: 100 * 1024 * 1024,
    skipUTF8Validation: false,
    perMessageDeflate: true,
@@ -1029,8 +1017,6 @@ function initAsClient(websocket, address, protocols, options) {
    websocket.setSocket(socket, head, {
      allowSynchronousEvents: opts.allowSynchronousEvents,
      generateMask: opts.generateMask,
-      maxBufferedChunks: opts.maxBufferedChunks,
-      maxFragments: opts.maxFragments,
      maxPayload: opts.maxPayload,
      skipUTF8Validation: opts.skipUTF8Validation
    });
@@ -1,6 +1,6 @@
 {
  "name": "ws",
-  "version": "8.21.1",
+  "version": "8.20.0",
  "description": "Simple to use, blazing fast and thoroughly tested websocket client and server for Node.js",
  "keywords": [
    "HyBi",
@@ -66,9 +66,5 @@
    "nyc": "^15.0.0",
    "prettier": "^3.0.0",
    "utf-8-validate": "^6.0.0"
-  },
-  "allowScripts": {
-    "bufferutil": true,
-    "utf-8-validate": true
  }
 }
@@ -6,13 +6,13 @@
    "": {
      "name": "truckwash-edge-broker",
      "dependencies": {
-        "ws": "^8.21.1"
+        "ws": "^8.18.0"
      }
    },
    "node_modules/ws": {
-      "version": "8.21.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.21.1.tgz",
-      "integrity": "sha512-+0NTnW77fFN/DjQi6k/Sq/Yvk4Sgajw7urW8V+asjXnRgDs9gyGkdb7EzgfhA4goXsRIZKE28fzIXBHEzhuiWw==",
+      "version": "8.20.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.20.0.tgz",
+      "integrity": "sha512-sAt8BhgNbzCtgGbt2OxmpuryO63ZoDk/sqaB/znQm94T4fCEsy/yV+7CdC1kJhOU9lboAEU7R3kquuycDoibVA==",
      "license": "MIT",
      "engines": {
        "node": ">=10.0.0"
@@ -7,6 +7,6 @@
    "test:live": "node --test live/live-smoke.mjs"
  },
  "dependencies": {
-    "ws": "^8.21.1"
+    "ws": "^8.18.0"
  }
 }
@@ -49,7 +49,7 @@ function resolveManagerUrl(options = {}) {
  return trimTrailingSlash(options.managerUrl || process.env.EDGE_MANAGER_URL || process.env.EDGE_PUBLIC_API_URL || "");
 }

-function resolveAuthMode(options = {}) {
+function resolveAuthMode(options = {}, managerUrl = "") {
  if (options.authMode) {
    return options.authMode;
  }
@@ -179,7 +179,7 @@ function rejectUpgrade(socket, statusCode, errorCode, message, details = {}) {
 export function createBrokerServer(options = {}) {
  const sharedSecret = resolveSharedSecret(options);
  const managerUrl = resolveManagerUrl(options);
-  const authMode = resolveAuthMode(options);
+  const authMode = resolveAuthMode(options, managerUrl);
  const commandTimeoutMs = options.commandTimeoutMs ?? 10000;
  const shellOpenTimeoutMs = options.shellOpenTimeoutMs ?? DEFAULT_SHELL_OPEN_TIMEOUT_MS;

@@ -189,8 +189,6 @@ export function createBrokerServer(options = {}) {
  const browserStreamSessions = new Map();
  const gatewayStreamSessions = new Map();
  const inflightGatewaySyncs = new Map();
-  const containerStartedAt = currentTimestamp();
-  let lastActivityAt = containerStartedAt;

  const managerRequest = async (path, body = {}, method = "POST") => {
    if (!managerUrl) {
@@ -482,7 +480,6 @@ export function createBrokerServer(options = {}) {
  const server = http.createServer(async (req, res) => {
    try {
      const url = new URL(req.url, "http://localhost");
-      lastActivityAt = currentTimestamp();
      if (req.method === "GET" && url.pathname === "/api/health") {
        jsonResponse(res, 200, {
          ok: true,
@@ -491,7 +488,6 @@ export function createBrokerServer(options = {}) {
          manager_url_configured: Boolean(managerUrl),
          shared_secret_configured: Boolean(sharedSecret),
          agents_connected: agents.size,
-          lastActivityAt,
        });
        return;
      }
@@ -1087,10 +1083,6 @@ export function createBrokerServer(options = {}) {
      pendingCommands,
      managerUrl,
      authMode,
-      containerStartedAt,
-      get lastActivityAt() {
-        return lastActivityAt;
-      },
    },
  };
 }
@@ -219,10 +219,6 @@ test("broker exposes health and shared-secret diagnostics", async () => {
  assert.equal(healthJson.auth_mode, "manager");
  assert.equal(healthJson.manager_url_configured, true);
  assert.equal(healthJson.shared_secret_configured, true);
-  assert.equal(typeof healthJson.lastActivityAt, "string");
-  assert.match(healthJson.lastActivityAt, /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/);
-  assert.ok(healthJson.lastActivityAt >= broker.state.containerStartedAt);
-  assert.equal(healthJson.lastActivityAt, broker.state.lastActivityAt);

  const invalidSecretResponse = await fetch(`http://127.0.0.1:${port}/api/diagnostics/shared-secret`, {
    method: "POST",
@@ -251,41 +247,6 @@ test("broker exposes health and shared-secret diagnostics", async () => {
  await broker.close();
 });

-test("broker updates lastActivityAt after each successful request", async () => {
-  const broker = createBrokerServer({ authMode: "manager", sharedSecret: "secret", managerUrl: "http://manager.test" });
-  const address = await broker.listen(0);
-  const port = address.port;
-
-  assert.equal(broker.state.lastActivityAt, broker.state.containerStartedAt);
-
-  const firstResponse = await fetch(`http://127.0.0.1:${port}/api/health`);
-  const firstJson = await firstResponse.json();
-  const firstActivityAt = broker.state.lastActivityAt;
-
-  assert.equal(typeof firstJson.lastActivityAt, "string");
-  assert.equal(firstJson.lastActivityAt, firstActivityAt);
-  assert.ok(firstActivityAt >= broker.state.containerStartedAt);
-
-  await new Promise((resolve) => setTimeout(resolve, 5));
-
-  await fetch(`http://127.0.0.1:${port}/api/diagnostics/shared-secret`, {
-    method: "POST",
-    headers: {
-      "x-edge-broker-secret": "secret",
-    },
-  });
-
-  assert.notEqual(broker.state.lastActivityAt, firstActivityAt);
-  assert.ok(broker.state.lastActivityAt > firstActivityAt);
-
-  const secondResponse = await fetch(`http://127.0.0.1:${port}/api/health`);
-  const secondJson = await secondResponse.json();
-
-  assert.equal(secondJson.lastActivityAt, broker.state.lastActivityAt);
-
-  await broker.close();
-});
-
 test("broker bridges browser shell sessions through the connected agent", async () => {
  const closedSessions = [];
  const broker = createBrokerServer({
@@ -39,8 +39,8 @@ test("traefik does not expose a dedicated public edge broker port", () => {
 test("base docker compose routes edge broker traffic through traefik", () => {
  const serviceBlock = readComposeServiceBlock(baseComposeSource, "edge-broker");
  assert.doesNotMatch(serviceBlock, /\n\s+ports:\s*\n[\s\S]*?\n\s+- "4300:4300"/);
-  assert.match(serviceBlock, /EDGE_AUTH_MODE:\s*\$\x7bEDGE_AUTH_MODE:-strict\x7d/);
-  assert.match(serviceBlock, /EDGE_MANAGER_URL:\s*\$\x7bEDGE_MANAGER_URL:-http:\/\/caddy\x7d/);
+  assert.match(serviceBlock, /EDGE_AUTH_MODE:\s*\$\{EDGE_AUTH_MODE:-strict\}/);
+  assert.match(serviceBlock, /EDGE_MANAGER_URL:\s*\$\{EDGE_MANAGER_URL:-http:\/\/caddy\}/);
  assert.match(serviceBlock, /traefik\.http\.routers\.edge-broker-api\.priority=200/);
  assert.match(serviceBlock, /traefik\.http\.routers\.edge-broker-local\.priority=200/);
  assert.match(serviceBlock, /traefik\.http\.routers\.edge-broker-api\.rule=Host\(`api\.truckwash\.dk`\) && PathPrefix\(`\/edge-broker`\)/);
@@ -55,8 +55,8 @@ test("base docker compose routes edge broker traffic through traefik", () => {
 test("example docker compose routes edge broker traffic through traefik", () => {
  const serviceBlock = readComposeServiceBlock(exampleComposeSource, "edge-broker");
  assert.doesNotMatch(serviceBlock, /\n\s+ports:\s*\n[\s\S]*?\n\s+- "4300:4300"/);
-  assert.match(serviceBlock, /EDGE_AUTH_MODE:\s*\$\x7bEDGE_AUTH_MODE:-strict\x7d/);
-  assert.match(serviceBlock, /EDGE_MANAGER_URL:\s*\$\x7bEDGE_MANAGER_URL:-http:\/\/caddy\x7d/);
+  assert.match(serviceBlock, /EDGE_AUTH_MODE:\s*\$\{EDGE_AUTH_MODE:-strict\}/);
+  assert.match(serviceBlock, /EDGE_MANAGER_URL:\s*\$\{EDGE_MANAGER_URL:-http:\/\/caddy\}/);
  assert.match(serviceBlock, /traefik\.http\.routers\.edge-broker-api\.rule=Host\(`api\.example\.com`\) && PathPrefix\(`\/edge-broker`\)/);
  assert.match(serviceBlock, /traefik\.http\.routers\.edge-broker-local\.rule=Host\(`localhost`\) && PathPrefix\(`\/api\/edge-broker`\)/);
  assert.match(serviceBlock, /traefik\.http\.services\.edge-broker\.loadbalancer\.server\.port=4300/);
@@ -65,8 +65,8 @@ test("example docker compose routes edge broker traffic through traefik", () =>
 test("standalone production compose routes edge broker traffic through traefik", () => {
  const serviceBlock = readComposeServiceBlock(standaloneProdComposeSource, "edge-broker");
  assert.doesNotMatch(serviceBlock, /\n\s+ports:\s*\n[\s\S]*?\n\s+- "4300:4300"/);
-  assert.match(serviceBlock, /EDGE_AUTH_MODE:\s*\$\x7bEDGE_AUTH_MODE:-manager\x7d/);
-  assert.match(serviceBlock, /EDGE_MANAGER_URL:\s*\$\x7bEDGE_MANAGER_URL:-http:\/\/caddy\x7d/);
+  assert.match(serviceBlock, /EDGE_AUTH_MODE:\s*\$\{EDGE_AUTH_MODE:-manager\}/);
+  assert.match(serviceBlock, /EDGE_MANAGER_URL:\s*\$\{EDGE_MANAGER_URL:-http:\/\/caddy\}/);
  assert.match(serviceBlock, /traefik\.http\.routers\.edge-broker-api\.priority=200/);
  assert.match(serviceBlock, /traefik\.http\.routers\.edge-broker-local\.priority=200/);
  assert.match(serviceBlock, /traefik\.http\.routers\.edge-broker-api\.rule=Host\(`api\.truckwash\.dk`\) && PathPrefix\(`\/edge-broker`\)/);
@@ -78,8 +78,8 @@ test("standalone production compose routes edge broker traffic through traefik",

 test("compose config does not provide insecure broker secret defaults", () => {
  for (const composeSource of [baseComposeSource, exampleComposeSource]) {
-    assert.match(composeSource, /EDGE_BROKER_URL:\s*\$\x7bEDGE_BROKER_URL:-http:\/\/edge-broker:4300\x7d/);
-    assert.match(composeSource, /EDGE_BROKER_SHARED_SECRET:\s*\$\x7bEDGE_BROKER_SHARED_SECRET:\?set EDGE_BROKER_SHARED_SECRET in \.env\x7d/);
+    assert.match(composeSource, /EDGE_BROKER_URL:\s*\$\{EDGE_BROKER_URL:-http:\/\/edge-broker:4300\}/);
+    assert.match(composeSource, /EDGE_BROKER_SHARED_SECRET:\s*\$\{EDGE_BROKER_SHARED_SECRET:\?set EDGE_BROKER_SHARED_SECRET in \.env\}/);
  }
 });

@@ -87,7 +87,7 @@ test("base docker compose wires the broker into each php worker", () => {
  for (const serviceName of ["php1", "php2", "php3", "php4", "php5", "php-staging", "php-cron"]) {
    const serviceBlock = readComposeServiceBlock(baseComposeSource, serviceName);
    assert.match(serviceBlock, /\n\s+depends_on:\s*\n[\s\S]*?\n\s+- edge-broker/);
-    assert.match(serviceBlock, /EDGE_BROKER_URL:\s*\$\x7bEDGE_BROKER_URL:-http:\/\/edge-broker:4300\x7d/);
-    assert.match(serviceBlock, /EDGE_BROKER_SHARED_SECRET:\s*\$\x7bEDGE_BROKER_SHARED_SECRET:\?set EDGE_BROKER_SHARED_SECRET in \.env\x7d/);
+    assert.match(serviceBlock, /EDGE_BROKER_URL:\s*\$\{EDGE_BROKER_URL:-http:\/\/edge-broker:4300\}/);
+    assert.match(serviceBlock, /EDGE_BROKER_SHARED_SECRET:\s*\$\{EDGE_BROKER_SHARED_SECRET:\?set EDGE_BROKER_SHARED_SECRET in \.env\}/);
  }
 });
@@ -1,13 +0,0 @@
-<?php
-
-namespace classes;
-
-use RuntimeException;
-
-class account_deletion_http_exception extends RuntimeException
-{
-    public function __construct(string $message, public readonly int $status)
-    {
-        parent::__construct($message);
-    }
-}
@@ -1,127 +0,0 @@
-<?php
-
-namespace classes;
-
-/**
- * Explicit account-deletion schema management.
- *
- * apply() must only be invoked by the dedicated CLI. Web requests and cron jobs
- * are deliberately limited to the read-only check().
- */
-class account_deletion_schema_bootstrap
-{
-    /** @return array{ready:bool,missing:array<int,string>} */
-    public static function check(): array
-    {
-        global $db;
-        $missing = [];
-        foreach (['account_deletion_requests', 'account_deletion_credential_attempts', 'account_deletion_outbox'] as $table) {
-            $tableSql = $db->escape_string($table);
-            $result = $db->query("SHOW TABLES LIKE '$tableSql'");
-            if ($result === false || $result->num_rows === 0) {
-                $missing[] = 'table:' . $table;
-            }
-        }
-        foreach (['users' => 'deleted_at', 'subusers' => 'deleted_at'] as $table => $column) {
-            $result = $db->query("SHOW COLUMNS FROM `$table` LIKE '$column'");
-            if ($result === false || $result->num_rows === 0) {
-                $missing[] = 'column:' . $table . '.' . $column;
-            }
-        }
-        if (!in_array('table:account_deletion_requests', $missing, true)) {
-            $result = $db->query("SHOW COLUMNS FROM account_deletion_requests LIKE 'manual_review_required_at'");
-            if ($result === false || $result->num_rows === 0) {
-                $missing[] = 'column:account_deletion_requests.manual_review_required_at';
-            }
-        }
-        return ['ready' => $missing === [], 'missing' => $missing];
-    }
-
-    public static function apply(): void
-    {
-        if (PHP_SAPI !== 'cli') {
-            throw new \RuntimeException('Account deletion schema changes are CLI-only.');
-        }
-        global $db;
-        self::execute("CREATE TABLE IF NOT EXISTS account_deletion_requests (
-            id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
-            request_id CHAR(36) NOT NULL,
-            principal_type VARCHAR(16) NOT NULL,
-            principal_id BIGINT UNSIGNED NOT NULL,
-            customer_number_snapshot INT NULL,
-            active_principal_key VARCHAR(191) NULL,
-            status VARCHAR(32) NOT NULL DEFAULT 'requested',
-            policy_version VARCHAR(32) NOT NULL,
-            retained_data_json LONGTEXT NOT NULL,
-            request_ip VARCHAR(45) NULL,
-            request_user_agent VARCHAR(512) NULL,
-            retry_count INT UNSIGNED NOT NULL DEFAULT 0,
-            failure_code VARCHAR(191) NULL,
-            requested_at DATETIME NOT NULL,
-            processing_at DATETIME NULL,
-            completed_at DATETIME NULL,
-            next_attempt_at DATETIME NULL,
-            manual_review_required_at DATETIME NULL,
-            created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-            updated_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-            PRIMARY KEY (id),
-            UNIQUE KEY uniq_account_deletion_request_id (request_id),
-            UNIQUE KEY uniq_account_deletion_active_principal (active_principal_key),
-            INDEX idx_account_deletion_worker (status, next_attempt_at, requested_at),
-            INDEX idx_account_deletion_principal (principal_type, principal_id, requested_at)
-        ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci");
-        self::ensureColumn('account_deletion_requests', 'manual_review_required_at', 'DATETIME NULL AFTER `next_attempt_at`');
-        self::execute("CREATE TABLE IF NOT EXISTS account_deletion_credential_attempts (
-            throttle_key CHAR(64) NOT NULL,
-            attempt_count INT UNSIGNED NOT NULL DEFAULT 1,
-            window_started_at DATETIME NOT NULL,
-            blocked_until DATETIME NULL,
-            updated_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-            PRIMARY KEY (throttle_key), INDEX idx_account_deletion_throttle_expiry (updated_at)
-        ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci");
-        self::execute("CREATE TABLE IF NOT EXISTS account_deletion_outbox (
-            id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
-            request_id CHAR(36) NOT NULL,
-            event_type VARCHAR(64) NOT NULL,
-            payload_json LONGTEXT NOT NULL,
-            status VARCHAR(16) NOT NULL DEFAULT 'pending',
-            attempts INT UNSIGNED NOT NULL DEFAULT 0,
-            available_at DATETIME NOT NULL,
-            processing_at DATETIME NULL,
-            delivered_at DATETIME NULL,
-            last_error VARCHAR(191) NULL,
-            created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-            PRIMARY KEY (id), UNIQUE KEY uniq_account_deletion_outbox_event (request_id, event_type),
-            INDEX idx_account_deletion_outbox_delivery (status, available_at)
-        ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci");
-        self::ensureColumn('account_deletion_outbox', 'processing_at', 'DATETIME NULL AFTER `available_at`');
-        self::ensureColumn('users', 'deleted_at', 'DATETIME NULL AFTER `updated_at`');
-        self::ensureColumn('subusers', 'deleted_at', 'DATETIME NULL AFTER `suspended_at`');
-        self::ensureIndex('users', 'idx_users_deleted_at', '`deleted_at`');
-        self::ensureIndex('subusers', 'idx_subusers_deleted_at', '`deleted_at`');
-    }
-
-    private static function execute(string $sql): void
-    {
-        global $db;
-        if ($db->query($sql) === false) {
-            throw new \RuntimeException('Account deletion schema operation failed.');
-        }
-    }
-
-    private static function ensureColumn(string $table, string $column, string $definition): void
-    {
-        global $db;
-        $result = $db->query("SHOW COLUMNS FROM `$table` LIKE '$column'");
-        if ($result === false) throw new \RuntimeException('Unable to inspect account deletion schema.');
-        if ($result->num_rows === 0) self::execute("ALTER TABLE `$table` ADD COLUMN `$column` $definition");
-    }
-
-    private static function ensureIndex(string $table, string $index, string $columns): void
-    {
-        global $db;
-        $result = $db->query("SHOW INDEX FROM `$table` WHERE Key_name = '$index'");
-        if ($result === false) throw new \RuntimeException('Unable to inspect account deletion indexes.');
-        if ($result->num_rows === 0) self::execute("ALTER TABLE `$table` ADD INDEX `$index` ($columns)");
-    }
-}
@@ -37,21 +37,8 @@ class attachment_store implements minio_uploads_i
     */
    public function isValidFilePath(string $filePath): bool
    {
-        if (
-            $filePath === ''
-            || str_starts_with($filePath, '/')
-            || preg_match('/^[a-zA-Z0-9_\-\/.]+$/', $filePath) !== 1
-        ) {
-            return false;
-        }
-
-        foreach (explode('/', $filePath) as $segment) {
-            if ($segment === '' || $segment === '.' || $segment === '..') {
-                return false;
-            }
-        }
-
-        return true;
+        // Check if the file path is valid
+        return preg_match('/^[a-zA-Z0-9_\-\/.]+$/', $filePath) === 1;
    }

    /**
@@ -95,10 +82,7 @@ class attachment_store implements minio_uploads_i
    {
        $host = 'https://api.truckwash.io';

-        $this->requireValidFilePath($fileName);
-        $encodedPath = implode('/', array_map('rawurlencode', explode('/', $fileName)));
-
        // Generate a direct download URL for the given file name
-        return $host . '/files/' . $encodedPath;
+        return $host . '/files/' . $fileName;
    }
-}
+}
@@ -2,8 +2,6 @@

 namespace classes;

-require_once WD . '/classes/account_deletion_service.php';
-
 use classes\totp;
 use Exception;
 use interfaces\authentication_i;
@@ -71,10 +69,6 @@ class authentication implements authentication_i

    public function create_2fa_token(int $id, string $type): string
    {
-        $principalType = $type === '2FA_VERIFICATION_SUBUSER' ? 'subuser' : 'customer';
-        if (account_deletion_service::principalIsBlocked($principalType, $id)) {
-            throw new Exception('Account unavailable');
-        }
        // Create a temporary 2FA token
        $token = bin2hex(random_bytes(32));
        (new tokens_o())->create($id, $token, $type);
@@ -106,9 +100,6 @@ class authentication implements authentication_i
            throw new \Exception('User not found for customer number: ' . $customer_number);
        }
        $user_id = $user->id;
-        if (account_deletion_service::principalIsBlocked('customer', (int)$user_id)) {
-            throw new Exception('Account unavailable');
-        }
        // Save the token in the database
        (new tokens_o())->create($user_id, $token, 'AUTH_TOKEN');
        return $token;
@@ -116,9 +107,6 @@ class authentication implements authentication_i

    public function create_token_by_user_id(int $user_id): string
    {
-        if (account_deletion_service::principalIsBlocked('customer', $user_id)) {
-            throw new Exception('Account unavailable');
-        }
        // Create a token
        $token = bin2hex(random_bytes(32));
        // Save the token in the database
@@ -128,9 +116,6 @@ class authentication implements authentication_i

    public function create_employee_token(int $employee_id): string
    {
-        if (account_deletion_service::principalIsBlocked('customer', $employee_id)) {
-            throw new Exception('Account unavailable');
-        }
        // Create a token
        $token = bin2hex(random_bytes(32));
        // Save the token in the database
@@ -138,26 +123,13 @@ class authentication implements authentication_i
        return $token;
    }

-    public function create_impersonation_token(int $target_user_id, int $actor_user_id): string
-    {
-        if ($actor_user_id <= 0 || account_deletion_service::principalIsBlocked('customer', $target_user_id)) {
-            throw new Exception('Account unavailable');
-        }
-        $token = bin2hex(random_bytes(32));
-        (new tokens_o())->create($target_user_id, $token, 'AUTH_TOKEN_IMPERSONATION:' . $actor_user_id);
-        return $token;
-    }
-
    public function validate_token(string $token): bool
    {
        // First: try validating as a classic user auth token
        try {
            $dbToken = (new tokens_o())->getToken($token);
-            if ($dbToken && $dbToken->id && $this->isClassicAuthTokenType((string)$dbToken->type->value())) {
-                return !account_deletion_service::principalIsBlocked(
-                    'customer',
-                    (int)$dbToken->user_id->value()
-                );
+            if ($dbToken && $dbToken->id && $dbToken->type->value() === 'AUTH_TOKEN') {
+                return true;
            }
        } catch (Exception) {
            // Ignore and continue to subuser session validation
@@ -165,7 +137,7 @@ class authentication implements authentication_i
        // Fallback: try validating as a subuser session token
        $subuser = (new subusers_o())->getSubuserBySessionToken($token);
        if ($subuser !== null) {
-            return !account_deletion_service::principalIsBlocked('subuser', (int)$subuser->id);
+            return true;
        }
        return false;
    }
@@ -196,10 +168,7 @@ class authentication implements authentication_i
        if (!$token->id) {
            return false;
        }
-        if (!$this->isClassicAuthTokenType((string)$token->type->value())) {
-            return false;
-        }
-        if (account_deletion_service::principalIsBlocked('customer', (int)$token->user_id->value())) {
+        if ($token->type->value() !== 'AUTH_TOKEN') {
            return false;
        }
        // Get the user from the database
@@ -208,11 +177,6 @@ class authentication implements authentication_i
        return $user;
    }

-    private function isClassicAuthTokenType(string $type): bool
-    {
-        return $type === 'AUTH_TOKEN' || str_starts_with($type, 'AUTH_TOKEN_IMPERSONATION:');
-    }
-
    public function get_plate_scanner(): plate_scanners_o|false
    {
        // Get the token from the headers
@@ -263,9 +227,6 @@ class authentication implements authentication_i
        if ($subuser === null) {
            return false;
        }
-        if (account_deletion_service::principalIsBlocked('subuser', (int)$subuser->id)) {
-            return false;
-        }
        $customerNumberContext = null;
        if (isset($headers['X-Customer-Number'])) {
            $customerNumberContext = (int)$headers['X-Customer-Number'];
@@ -1,127 +0,0 @@
-<?php
-
-namespace classes;
-
-class backup_schema_bootstrap
-{
-    private static bool $initialized = false;
-
-    public static function ensureTables(): void
-    {
-        if (self::$initialized) {
-            return;
-        }
-
-        global $db;
-
-        if (!isset($db) || !is_object($db) || !method_exists($db, 'query')) {
-            return;
-        }
-
-        $db->query(
-            "CREATE TABLE IF NOT EXISTS backup_records (
-                backup_uuid VARCHAR(64) NOT NULL PRIMARY KEY,
-                name VARCHAR(191) NOT NULL,
-                description TEXT NULL,
-                source VARCHAR(32) NOT NULL DEFAULT 'manual',
-                status VARCHAR(32) NOT NULL DEFAULT 'queued',
-                schema_version INT UNSIGNED NOT NULL DEFAULT 2,
-                storage_bucket VARCHAR(191) NOT NULL DEFAULT 'backups',
-                storage_prefix VARCHAR(255) NOT NULL,
-                manifest_key VARCHAR(255) NULL,
-                manifest_sha256 CHAR(64) NULL,
-                encryption_key_id VARCHAR(191) NULL,
-                component_count INT UNSIGNED NOT NULL DEFAULT 0,
-                object_count INT UNSIGNED NOT NULL DEFAULT 0,
-                total_bytes BIGINT UNSIGNED NOT NULL DEFAULT 0,
-                requested_by_user_id INT NULL,
-                started_at DATETIME NULL,
-                completed_at DATETIME NULL,
-                verified_at DATETIME NULL,
-                expires_at DATETIME NULL,
-                last_error TEXT NULL,
-                created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-                updated_at TIMESTAMP NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
-                KEY idx_backup_records_status_created (status, created_at),
-                KEY idx_backup_records_verified (verified_at),
-                KEY idx_backup_records_expires (expires_at)
-            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci"
-        );
-
-        $db->query(
-            "CREATE TABLE IF NOT EXISTS backup_components (
-                id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
-                backup_uuid VARCHAR(64) NOT NULL,
-                component_type VARCHAR(32) NOT NULL,
-                logical_name VARCHAR(191) NOT NULL,
-                source_bucket VARCHAR(191) NULL,
-                source_prefix VARCHAR(255) NULL,
-                storage_key VARCHAR(255) NULL,
-                manifest_key VARCHAR(255) NULL,
-                object_count INT UNSIGNED NOT NULL DEFAULT 0,
-                byte_size BIGINT UNSIGNED NOT NULL DEFAULT 0,
-                content_sha256 CHAR(64) NULL,
-                encrypted_sha256 CHAR(64) NULL,
-                encryption_key_id VARCHAR(191) NULL,
-                status VARCHAR(32) NOT NULL DEFAULT 'pending',
-                error_message TEXT NULL,
-                created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-                updated_at TIMESTAMP NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
-                KEY idx_backup_components_backup (backup_uuid),
-                KEY idx_backup_components_status (status),
-                KEY idx_backup_components_type_name (component_type, logical_name)
-            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci"
-        );
-
-        $db->query(
-            "CREATE TABLE IF NOT EXISTS backup_jobs (
-                id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
-                job_type VARCHAR(32) NOT NULL,
-                backup_uuid VARCHAR(64) NULL,
-                status VARCHAR(32) NOT NULL DEFAULT 'queued',
-                progress_percent TINYINT UNSIGNED NOT NULL DEFAULT 0,
-                progress_message VARCHAR(255) NULL,
-                payload_json LONGTEXT NULL,
-                result_json LONGTEXT NULL,
-                actor_user_id INT NULL,
-                locked_at DATETIME NULL,
-                lock_owner VARCHAR(191) NULL,
-                started_at DATETIME NULL,
-                completed_at DATETIME NULL,
-                error_message TEXT NULL,
-                created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-                updated_at TIMESTAMP NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
-                KEY idx_backup_jobs_status_created (status, created_at),
-                KEY idx_backup_jobs_backup (backup_uuid),
-                KEY idx_backup_jobs_type_status (job_type, status)
-            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci"
-        );
-
-        $db->query(
-            "CREATE TABLE IF NOT EXISTS backup_restore_audit (
-                id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
-                restore_job_id BIGINT UNSIGNED NULL,
-                preview_job_id BIGINT UNSIGNED NULL,
-                backup_uuid VARCHAR(64) NOT NULL,
-                actor_user_id INT NULL,
-                target_environment VARCHAR(64) NOT NULL DEFAULT 'production',
-                confirmation_fingerprint CHAR(64) NULL,
-                reason TEXT NULL,
-                ip_address VARCHAR(64) NULL,
-                user_agent VARCHAR(255) NULL,
-                pre_restore_backup_uuid VARCHAR(64) NULL,
-                status VARCHAR(32) NOT NULL DEFAULT 'queued',
-                started_at DATETIME NULL,
-                completed_at DATETIME NULL,
-                error_message TEXT NULL,
-                created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-                updated_at TIMESTAMP NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
-                KEY idx_backup_restore_audit_backup (backup_uuid),
-                KEY idx_backup_restore_audit_job (restore_job_id),
-                KEY idx_backup_restore_audit_created (created_at)
-            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci"
-        );
-
-        self::$initialized = true;
-    }
-}
@@ -212,7 +212,19 @@ class bird implements bird_i
            throw new Exception('cURL error: ' . $err);
        }
        curl_close($ch);
+        // Debug slack
+        $data = json_decode($body, true) ?? [];
        $resp = $resp === false ? 'cURL error with no response' : $resp;
+        $slack_debug_message = "*Bird API Request Debug:*"
+            . "\nEndpoint: $url"
+            . "\nMethod: $method"
+            . "\nStatus: $code"
+            . "\nPayload Keys: " . implode(',', array_keys($data))
+            . "\nResponse: $resp";
+
+        // Send slack notification for every request for easier debugging of issues in production (can be removed later if too noisy)
+        $slack = new \classes\slack();
+        $slack->send_message($slack_debug_message);
        return [
            'status_code' => (int)$code,
            'body' => $resp,
@@ -1061,3 +1073,4 @@ class bird implements bird_i
    }
 }

+
@@ -64,11 +64,6 @@ class coolify_api_client
        return $this->request('GET', '/services');
    }

-    public function listApplications(): array
-    {
-        return $this->request('GET', '/applications');
-    }
-
    public function listGithubApps(): array
    {
        return $this->request('GET', '/github-apps');
@@ -174,11 +169,6 @@ class coolify_api_client
        return $this->request('GET', '/applications/' . rawurlencode($uuid) . '/restart');
    }

-    public function stopService(string $uuid): array
-    {
-        return $this->request('GET', '/services/' . rawurlencode($uuid) . '/stop');
-    }
-
    public function stopApplication(string $uuid): array
    {
        return $this->request('GET', '/applications/' . rawurlencode($uuid) . '/stop');
@@ -189,11 +179,6 @@ class coolify_api_client
        return $this->request('DELETE', '/services/' . rawurlencode($uuid));
    }

-    public function deleteApplication(string $uuid): array
-    {
-        return $this->request('DELETE', '/applications/' . rawurlencode($uuid));
-    }
-
    public function listDeployments(): array
    {
        return $this->request('GET', '/deployments');
@@ -5,8 +5,6 @@ namespace classes;
 use RuntimeException;
 use Throwable;

-require_once __DIR__ . '/cors_policy.php';
-
 class coolify_manager
 {
    private const KINDS = ['database', 'redis', 'minio'];
@@ -1072,9 +1070,7 @@ class coolify_manager
                        $targetPublicUrl,
                        $resourceUuid,
                        self::resourceFirstExposedPort($resource, $target),
-                        $resource['custom_labels'] ?? null,
-                        $app,
-                        self::gatewayRouteTargetCorsConfig($target)
+                        $resource['custom_labels'] ?? null
                    );
                $update = $resourceType === 'service'
                    ? $client->updateService($resourceUuid, $updatePayload)
@@ -2424,9 +2420,7 @@ class coolify_manager
        string $publicUrl,
        string $resourceUuid = '',
        ?int $port = null,
-        mixed $existingLabels = null,
-        string $app = '',
-        string $corsConfig = ''
+        mixed $existingLabels = null
    ): array
    {
        $decodedLabels = self::decodeCoolifyLabels($existingLabels);
@@ -2441,9 +2435,7 @@ class coolify_manager
            $publicUrl,
            $resourceUuid,
            $routePort,
-            self::gatewayRouteDefaultCertResolver($publicUrl),
-            $app,
-            $corsConfig
+            self::gatewayRouteDefaultCertResolver($publicUrl)
        );
        if ($labels !== []) {
            $payload['custom_labels'] = base64_encode(implode("\n", self::mergeCoolifyLabels(
@@ -2468,49 +2460,6 @@ class coolify_manager
        ];
    }

-    private static function gatewayRouteTargetCorsConfig(array $target): string
-    {
-        $context = self::jsonDecode($target['deploy_context_json'] ?? null);
-        $configured = null;
-
-        foreach (['coolify_env', 'runtime_env', 'environment_variables'] as $key) {
-            $env = $context[$key] ?? null;
-            if (is_array($env) && array_key_exists('CORS', $env) && is_scalar($env['CORS'])) {
-                $configured = (string)$env['CORS'];
-            }
-        }
-
-        foreach (['coolify_env_file', 'env'] as $key) {
-            $raw = $context[$key] ?? null;
-            if (!is_string($raw)) {
-                continue;
-            }
-            foreach (preg_split('/\r\n|\r|\n/', $raw) ?: [] as $line) {
-                $line = trim((string)$line);
-                if ($line === '' || str_starts_with($line, '#') || !str_contains($line, '=')) {
-                    continue;
-                }
-                [$envKey, $value] = explode('=', $line, 2);
-                if (trim($envKey) === 'CORS') {
-                    $configured = $value;
-                }
-            }
-        }
-
-        if ($configured === null) {
-            $runtimeValue = getenv('CORS');
-            if ($runtimeValue !== false) {
-                $configured = $runtimeValue;
-            } elseif (array_key_exists('CORS', $_ENV ?? [])) {
-                $configured = (string)$_ENV['CORS'];
-            } elseif (array_key_exists('CORS', $_SERVER ?? [])) {
-                $configured = (string)$_SERVER['CORS'];
-            }
-        }
-
-        return cors_policy::withRequiredOrigins((string)($configured ?? ''));
-    }
-
    private static function coolifyProxyUrl(string $publicUrl, ?int $port): string
    {
        if ($port === null || $port <= 0) {
@@ -2534,9 +2483,7 @@ class coolify_manager
        string $publicUrl,
        string $resourceUuid,
        ?int $port = null,
-        ?string $certResolver = null,
-        string $app = '',
-        string $corsConfig = ''
+        ?string $certResolver = null
    ): array
    {
        $resourceUuid = self::gatewayRouteLabelId($resourceUuid);
@@ -2561,7 +2508,6 @@ class coolify_manager
        $certResolver = trim((string)($certResolver ?? ''));
        $httpLabel = 'http-0-' . $resourceUuid;
        $httpsLabel = 'https-0-' . $resourceUuid;
-        $isApi = strtolower(trim($app)) === 'api';
        $labels = [
            'traefik.enable=true',
            'traefik.http.middlewares.gzip.compress=true',
@@ -2575,18 +2521,12 @@ class coolify_manager
                $labels[] = "traefik.http.routers.{$httpsLabel}.service={$httpsLabel}";
                $labels[] = "traefik.http.services.{$httpsLabel}.loadbalancer.server.port={$routePort}";
            }
-            $httpsMiddlewares = [];
-            if ($isApi) {
-                $corsMiddleware = "{$httpsLabel}-cors";
-                $labels = array_merge($labels, cors_policy::traefikHeadersMiddlewareLabels($corsMiddleware, $corsConfig));
-                $httpsMiddlewares[] = $corsMiddleware;
-            }
            if ($path !== '/') {
                $labels[] = "traefik.http.middlewares.{$httpsLabel}-stripprefix.stripprefix.prefixes={$path}";
-                $httpsMiddlewares[] = "{$httpsLabel}-stripprefix";
+                $labels[] = "traefik.http.routers.{$httpsLabel}.middlewares={$httpsLabel}-stripprefix,gzip";
+            } else {
+                $labels[] = "traefik.http.routers.{$httpsLabel}.middlewares=gzip";
            }
-            $httpsMiddlewares[] = 'gzip';
-            $labels[] = "traefik.http.routers.{$httpsLabel}.middlewares=" . implode(',', $httpsMiddlewares);
            $labels[] = "traefik.http.routers.{$httpsLabel}.tls=true";
            if ($certResolver !== '') {
                $labels[] = "traefik.http.routers.{$httpsLabel}.tls.certresolver={$certResolver}";
@@ -29,7 +29,6 @@ class cors_policy
        'http://localhost:5174',
        'http://127.0.0.1:5173',
        'http://127.0.0.1:5174',
-        'capacitor://localhost',
    ];

    public static function normalizeOrigin(?string $value): string
@@ -39,7 +38,7 @@ class cors_policy
            return $value;
        }

-        if (preg_match('#^[a-z][a-z0-9+.-]*://#i', $value) !== 1) {
+        if (preg_match('#^https?://#i', $value) !== 1) {
            return '';
        }

@@ -49,7 +48,7 @@ class cors_policy
        }

        $scheme = strtolower((string)$parts['scheme']);
-        if (!in_array($scheme, ['http', 'https', 'capacitor'], true)) {
+        if (!in_array($scheme, ['http', 'https'], true)) {
            return '';
        }

@@ -59,27 +58,6 @@ class cors_policy
        return $scheme . '://' . $host . $port;
    }

-    public static function normalizeRequestOrigin(?string $value): string
-    {
-        $value = trim((string)$value);
-        if ($value === '' || $value === '*') {
-            return '';
-        }
-
-        $parts = parse_url($value);
-        if (!is_array($parts)) {
-            return '';
-        }
-
-        foreach (['user', 'pass', 'path', 'query', 'fragment'] as $disallowedPart) {
-            if (array_key_exists($disallowedPart, $parts)) {
-                return '';
-            }
-        }
-
-        return self::normalizeOrigin($value);
-    }
-
    /**
     * @return array<int,string>
     */
@@ -88,39 +66,6 @@ class cors_policy
        return self::REQUIRED_ALLOWED_ORIGINS;
    }

-    /**
-     * @return array<int,string>
-     */
-    public static function traefikHeadersMiddlewareLabels(string $middlewareName, string $corsConfig = ''): array
-    {
-        $middlewareName = trim($middlewareName);
-        if ($middlewareName === '' || preg_match('/^[a-zA-Z0-9-]+$/', $middlewareName) !== 1) {
-            return [];
-        }
-
-        $allowedHeaders = array_values(array_filter(
-            array_map('trim', explode(',', self::ALLOWED_HEADERS)),
-            static fn(string $header): bool => $header !== '' && $header !== '*'
-        ));
-        $allowedMethods = array_values(array_filter(array_map('trim', explode(',', self::ALLOWED_METHODS))));
-        $exposedHeaders = array_values(array_filter(array_map('trim', explode(',', self::EXPOSED_HEADERS))));
-        $prefix = "traefik.http.middlewares.{$middlewareName}.headers";
-        $allowedOrigins = self::allowedOrigins($corsConfig);
-        $originLabel = $allowedOrigins === ['*']
-            ? "{$prefix}.accesscontrolalloworiginlistregex=^(https?://[^/]+|capacitor://[^/]+)$"
-            : "{$prefix}.accesscontrolalloworiginlist=" . implode(',', $allowedOrigins);
-
-        return [
-            "{$prefix}.accesscontrolallowcredentials=true",
-            "{$prefix}.accesscontrolallowheaders=" . implode(',', $allowedHeaders),
-            "{$prefix}.accesscontrolallowmethods=" . implode(',', $allowedMethods),
-            $originLabel,
-            "{$prefix}.accesscontrolexposeheaders=" . implode(',', $exposedHeaders),
-            "{$prefix}.accesscontrolmaxage=" . self::MAX_AGE_SECONDS,
-            "{$prefix}.addvaryheader=true",
-        ];
-    }
-
    /**
     * @return array<int,string>
     */
@@ -160,8 +105,8 @@ class cors_policy

    public static function isOriginAllowed(?string $origin, string $corsConfig): bool
    {
-        $origin = self::normalizeRequestOrigin($origin);
-        if ($origin === '') {
+        $origin = self::normalizeOrigin($origin);
+        if ($origin === '' || $origin === '*') {
            return false;
        }

@@ -174,7 +119,7 @@ class cors_policy
     */
    public static function responseHeaders(?string $origin, string $corsConfig): array
    {
-        $origin = self::normalizeRequestOrigin($origin);
+        $origin = self::normalizeOrigin($origin);
        if ($origin === '' || !self::isOriginAllowed($origin, $corsConfig)) {
            return [];
        }
@@ -1,58 +0,0 @@
-<?php
-
-namespace classes;
-
-use InvalidArgumentException;
-
-class cron_schedule
-{
-    public static function normalize(array $schedule): array
-    {
-        $type = strtolower(trim((string)($schedule['type'] ?? 'interval')));
-        if ($type !== 'interval') {
-            throw new InvalidArgumentException('Unsupported cron schedule type: ' . $type);
-        }
-
-        $seconds = (int)($schedule['seconds'] ?? $schedule['interval'] ?? 0);
-        if ($seconds < 30 || $seconds > 2678400) {
-            throw new InvalidArgumentException('Cron interval must be between 30 seconds and 31 days.');
-        }
-
-        return [
-            'type' => 'interval',
-            'seconds' => $seconds,
-        ];
-    }
-
-    public static function nextRunAt(array $schedule, ?string $anchorDateTime, int $now): string
-    {
-        $normalized = self::normalize($schedule);
-        $anchor = $anchorDateTime !== null && trim($anchorDateTime) !== ''
-            ? strtotime($anchorDateTime)
-            : false;
-        $base = $anchor !== false ? (int)$anchor : $now;
-        $next = $base + (int)$normalized['seconds'];
-
-        if ($next <= $now) {
-            $missed = (int)floor(($now - $next) / (int)$normalized['seconds']) + 1;
-            $next += $missed * (int)$normalized['seconds'];
-        }
-
-        return date('Y-m-d H:i:s', $next);
-    }
-
-    public static function dueAt(array $schedule, ?string $lastRunAt, int $now, ?int $legacyLastRun = null): string
-    {
-        $normalized = self::normalize($schedule);
-
-        if ($lastRunAt !== null && trim($lastRunAt) !== '') {
-            return self::nextRunAt($normalized, $lastRunAt, $now);
-        }
-
-        if ($legacyLastRun !== null && $legacyLastRun > 0) {
-            return date('Y-m-d H:i:s', $legacyLastRun + (int)$normalized['seconds']);
-        }
-
-        return date('Y-m-d H:i:s', $now);
-    }
-}
@@ -1,702 +0,0 @@
-<?php
-
-namespace classes;
-
-use RuntimeException;
-use Throwable;
-
-class cron_scheduler
-{
-    private cron_task_registry $registry;
-    private string $lock_owner;
-
-    public function __construct(?cron_task_registry $registry = null)
-    {
-        $this->registry = $registry ?? new cron_task_registry();
-        $this->lock_owner = gethostname() . ':' . getmypid() . ':' . bin2hex(random_bytes(4));
-    }
-
-    public function listTasks(): array
-    {
-        $this->ensureReady();
-        $this->syncDefinitions();
-
-        $states = $this->stateRows();
-        $estimates = $this->durationEstimates();
-        $tasks = [];
-        $now = time();
-
-        foreach ($this->registry->definitions() as $definition) {
-            $state = $states[$definition->id] ?? [];
-            $schedule = is_array($state['schedule'] ?? null) && $state['schedule'] !== []
-                ? $state['schedule']
-                : $definition->schedule;
-            $nextRunAt = $state['next_run_at'] ?? null;
-            if ($nextRunAt === null || trim((string)$nextRunAt) === '') {
-                $nextRunAt = cron_schedule::dueAt($schedule, $state['last_run_at'] ?? null, $now);
-            }
-
-            $task = $definition->asArray($state + ['next_run_at' => $nextRunAt], $estimates[$definition->id] ?? null);
-            $task['due'] = strtotime($nextRunAt) !== false && strtotime($nextRunAt) <= $now;
-            $task['seconds_until_due'] = max(0, (int)strtotime($nextRunAt) - $now);
-            $tasks[] = $task;
-        }
-
-        return [
-            'tasks' => $tasks,
-            'summary' => [
-                'total' => count($tasks),
-                'enabled' => count(array_filter($tasks, static fn(array $task): bool => (bool)$task['enabled'])),
-                'due' => count(array_filter($tasks, static fn(array $task): bool => (bool)$task['due'] && (bool)$task['enabled'])),
-            ],
-        ];
-    }
-
-    public function listRuns(?string $task_id = null, int $limit = 50): array
-    {
-        $this->ensureReady();
-        $limit = max(1, min(200, $limit));
-
-        $where = '';
-        if ($task_id !== null && trim($task_id) !== '') {
-            $where = "WHERE task_id = " . $this->sql($task_id);
-        }
-
-        return $this->fetchAll(
-            "SELECT * FROM cron_task_runs $where ORDER BY id DESC LIMIT $limit"
-        );
-    }
-
-    public function queueTaskRun(string $task_id_or_legacy_name, ?int $actor_user_id = null, bool $force = false): array
-    {
-        $this->ensureReady();
-        $this->syncDefinitions();
-
-        $definition = $this->registry->get($task_id_or_legacy_name);
-        if ($definition === null) {
-            throw new RuntimeException('Cron task not found.');
-        }
-
-        $state = $this->stateRows()[$definition->id] ?? [];
-        $enabled = (bool)($state['enabled'] ?? $definition->enabled);
-        if (!$enabled && !$force) {
-            throw new RuntimeException('Cron task is disabled.');
-        }
-        if ($this->taskIsLocked($state)) {
-            throw new RuntimeException('Cron task is already running.');
-        }
-
-        $existing = $this->fetchOne(
-            "SELECT * FROM cron_task_runs
-            WHERE task_id = " . $this->sql($definition->id) . " AND status = 'queued'
-            ORDER BY id DESC LIMIT 1"
-        );
-        if ($existing !== null) {
-            $this->markTaskQueued($definition);
-            return $this->publicRun($existing);
-        }
-
-        $scheduled_for = date('Y-m-d H:i:s');
-        $this->query(
-            "INSERT INTO cron_task_runs
-                (task_id, module, source, status, actor_user_id, scheduled_for, force_run)
-            VALUES ("
-                . $this->sql($definition->id) . ', '
-                . $this->sql($definition->module) . ", 'manual', 'queued', "
-                . ($actor_user_id === null ? 'NULL' : (string)(int)$actor_user_id) . ', '
-                . $this->sql($scheduled_for) . ', '
-                . ($force ? '1' : '0')
-            . ")"
-        );
-
-        $run_id = (int)$this->insertId();
-        $this->markTaskQueued($definition);
-
-        return $this->publicRun($this->fetchOne("SELECT * FROM cron_task_runs WHERE id = $run_id") ?? []);
-    }
-
-    public function runDue(string $source = 'automatic'): array
-    {
-        $this->ensureReady();
-        $this->syncDefinitions();
-
-        $ran = [];
-        foreach ($this->queuedRuns() as $queuedRun) {
-            try {
-                $run = $this->runQueuedRun($queuedRun);
-                if ($run !== null) {
-                    $ran[] = $run;
-                }
-            } catch (Throwable $throwable) {
-                $ran[] = [
-                    'task_id' => (string)($queuedRun['task_id'] ?? ''),
-                    'module' => (string)($queuedRun['module'] ?? ''),
-                    'source' => (string)($queuedRun['source'] ?? 'manual'),
-                    'status' => 'skipped',
-                    'error_message' => $throwable->getMessage(),
-                ];
-            }
-        }
-
-        $now = time();
-        $states = $this->stateRows();
-        foreach ($this->registry->definitions() as $definition) {
-            $state = $states[$definition->id] ?? [];
-            if (!(bool)($state['enabled'] ?? $definition->enabled)) {
-                continue;
-            }
-
-            $nextRunAt = (string)($state['next_run_at'] ?? '');
-            if ($nextRunAt === '' || strtotime($nextRunAt) === false || strtotime($nextRunAt) > $now) {
-                continue;
-            }
-
-            try {
-                $ran[] = $this->runTask($definition->id, $source, null, false, $nextRunAt);
-            } catch (Throwable $throwable) {
-                $ran[] = [
-                    'task_id' => $definition->id,
-                    'module' => $definition->module,
-                    'source' => $source,
-                    'status' => 'skipped',
-                    'error_message' => $throwable->getMessage(),
-                ];
-            }
-        }
-
-        return [
-            'ran' => $ran,
-            'count' => count($ran),
-        ];
-    }
-
-    public function markExpiredRunningRuns(): int
-    {
-        $this->ensureReady();
-        $now = date('Y-m-d H:i:s');
-        $message = 'Task lock expired before completion.';
-
-        $this->query(
-            "UPDATE cron_task_runs r
-            INNER JOIN cron_task_state s ON s.task_id = r.task_id AND s.current_run_id = r.id
-            SET r.status = 'timed_out',
-                r.completed_at = COALESCE(s.locked_until, " . $this->sql($now) . "),
-                r.error_message = COALESCE(r.error_message, " . $this->sql($message) . "),
-                s.current_run_id = NULL,
-                s.locked_until = NULL,
-                s.lock_owner = NULL,
-                s.last_status = 'timed_out',
-                s.last_error = " . $this->sql($message) . "
-            WHERE r.status = 'running'
-              AND s.locked_until IS NOT NULL
-              AND s.locked_until < " . $this->sql($now)
-        );
-
-        return $this->affectedRows();
-    }
-
-    public function runTask(
-        string $task_id_or_legacy_name,
-        string $source = 'manual',
-        ?int $actor_user_id = null,
-        bool $force = false,
-        ?string $scheduled_for = null
-    ): array {
-        $this->ensureReady();
-        $this->syncDefinitions();
-
-        $definition = $this->registry->get($task_id_or_legacy_name);
-        if ($definition === null) {
-            throw new RuntimeException('Cron task not found.');
-        }
-
-        $state = $this->stateRows()[$definition->id] ?? [];
-        $enabled = (bool)($state['enabled'] ?? $definition->enabled);
-        if (!$enabled && !$force) {
-            throw new RuntimeException('Cron task is disabled.');
-        }
-
-        if (!$this->claimLock($definition)) {
-            throw new RuntimeException('Cron task is already running.');
-        }
-
-        $started = microtime(true);
-        $started_at = date('Y-m-d H:i:s', (int)$started);
-        $run_id = $this->createRun($definition, $source, $actor_user_id, $scheduled_for, $started_at, $force);
-        $this->query(
-            "UPDATE cron_task_state SET current_run_id = $run_id WHERE task_id = " . $this->sql($definition->id)
-        );
-
-        return $this->executeClaimedRun($definition, $run_id, $started, $scheduled_for);
-    }
-
-    private function executeClaimedRun(
-        cron_task_definition $definition,
-        int $run_id,
-        float $started,
-        ?string $scheduled_for = null
-    ): array
-    {
-        $status = 'succeeded';
-        $summary = [];
-        $error_message = null;
-        $output = '';
-
-        try {
-            if (function_exists('set_time_limit')) {
-                @set_time_limit($definition->timeout_seconds + 30);
-            }
-
-            $this->ensureLegacyFunctionsLoaded($definition);
-            if (!is_callable($definition->handler)) {
-                throw new RuntimeException('Cron task handler is not callable: ' . $definition->handler);
-            }
-
-            ob_start();
-            $result = call_user_func($definition->handler);
-            $output = (string)ob_get_clean();
-            $summary = is_array($result) ? $result : [];
-        } catch (Throwable $throwable) {
-            if (ob_get_level() > 0) {
-                $output .= (string)ob_get_clean();
-            }
-            $status = 'failed';
-            $error_message = $throwable->getMessage();
-        }
-
-        $completed = microtime(true);
-        $duration_ms = (int)round(($completed - $started) * 1000);
-        if ($duration_ms > ($definition->timeout_seconds * 1000) && $status === 'succeeded') {
-            $status = 'timed_out';
-            $error_message = 'Task exceeded its configured timeout window.';
-        }
-
-        if ($output !== '') {
-            $summary['output'] = substr($output, 0, 8000);
-        }
-
-        $completed_at = date('Y-m-d H:i:s', (int)$completed);
-        $this->completeRun($run_id, $status, $completed_at, $duration_ms, $summary, $error_message);
-        $this->releaseLock($definition, $status, $error_message, $completed_at, $scheduled_for);
-
-        return $this->publicRun($this->fetchOne("SELECT * FROM cron_task_runs WHERE id = $run_id") ?? []);
-    }
-
-    public function updateTaskConfig(string $task_id, array $config): array
-    {
-        $this->ensureReady();
-        $this->syncDefinitions();
-
-        $definition = $this->registry->get($task_id);
-        if ($definition === null) {
-            throw new RuntimeException('Cron task not found.');
-        }
-
-        $updates = [];
-        if (array_key_exists('enabled', $config)) {
-            $updates[] = 'enabled = ' . ((bool)$config['enabled'] ? '1' : '0');
-        }
-
-        if (array_key_exists('schedule', $config)) {
-            $schedule = $config['schedule'] === null ? null : cron_schedule::normalize((array)$config['schedule']);
-            $updates[] = 'schedule_json = ' . ($schedule === null ? 'NULL' : $this->sql(json_encode($schedule)));
-            $anchor = (string)($this->fetchOne("SELECT last_run_at FROM cron_task_state WHERE task_id = " . $this->sql($definition->id))['last_run_at'] ?? '');
-            $updates[] = 'next_run_at = ' . $this->sql(cron_schedule::dueAt($schedule ?? $definition->schedule, $anchor !== '' ? $anchor : null, time()));
-        }
-
-        if ($updates !== []) {
-            $this->query(
-                "UPDATE cron_task_state SET " . implode(', ', $updates) . " WHERE task_id = " . $this->sql($definition->id)
-            );
-        }
-
-        return $this->listTasks();
-    }
-
-    private function ensureReady(): void
-    {
-        cron_schema_bootstrap::ensureTables();
-    }
-
-    private function syncDefinitions(): void
-    {
-        $now = time();
-        foreach ($this->registry->definitions() as $definition) {
-            $row = $this->fetchOne(
-                "SELECT * FROM cron_task_state WHERE task_id = " . $this->sql($definition->id)
-            );
-            if ($row !== null) {
-                continue;
-            }
-
-            $legacyLastRun = $this->legacyLastRun($definition);
-            $nextRunAt = cron_schedule::dueAt($definition->schedule, null, $now, $legacyLastRun);
-            $this->query(
-                "INSERT INTO cron_task_state (task_id, module, enabled, schedule_json, next_run_at)
-                VALUES ("
-                . $this->sql($definition->id) . ', '
-                . $this->sql($definition->module) . ', '
-                . ($definition->enabled ? '1' : '0') . ', NULL, '
-                . $this->sql($nextRunAt)
-                . ")"
-            );
-        }
-    }
-
-    private function legacyLastRun(cron_task_definition $definition): ?int
-    {
-        if ($definition->legacy_name === null || !defined('redis')) {
-            return null;
-        }
-
-        try {
-            $last_run = redis->get_last_crond_run($definition->legacy_name);
-            return $last_run !== null ? (int)$last_run : null;
-        } catch (Throwable) {
-            return null;
-        }
-    }
-
-    private function claimLock(cron_task_definition $definition): bool
-    {
-        $now = date('Y-m-d H:i:s');
-        $locked_until = date('Y-m-d H:i:s', time() + $definition->timeout_seconds + 60);
-        $this->query(
-            "UPDATE cron_task_state
-            SET locked_until = " . $this->sql($locked_until) . ",
-                lock_owner = " . $this->sql($this->lock_owner) . "
-            WHERE task_id = " . $this->sql($definition->id) . "
-              AND (locked_until IS NULL OR locked_until < " . $this->sql($now) . ")"
-        );
-
-        return $this->affectedRows() === 1;
-    }
-
-    private function taskIsLocked(array $state): bool
-    {
-        $lockedUntil = (string)($state['locked_until'] ?? '');
-        return $lockedUntil !== ''
-            && strtotime($lockedUntil) !== false
-            && strtotime($lockedUntil) >= time();
-    }
-
-    private function markTaskQueued(cron_task_definition $definition): void
-    {
-        $now = date('Y-m-d H:i:s');
-        $this->query(
-            "UPDATE cron_task_state
-            SET last_status = 'queued',
-                last_error = NULL,
-                next_run_at = CASE
-                    WHEN next_run_at IS NULL OR next_run_at > " . $this->sql($now) . " THEN " . $this->sql($now) . "
-                    ELSE next_run_at
-                END
-            WHERE task_id = " . $this->sql($definition->id)
-        );
-    }
-
-    /**
-     * @return array<int, array<string, mixed>>
-     */
-    private function queuedRuns(): array
-    {
-        return $this->fetchAll("SELECT * FROM cron_task_runs WHERE status = 'queued' ORDER BY id ASC LIMIT 50");
-    }
-
-    private function runQueuedRun(array $queuedRun): ?array
-    {
-        $run_id = (int)($queuedRun['id'] ?? 0);
-        $definition = $this->registry->get((string)($queuedRun['task_id'] ?? ''));
-        if ($run_id < 1 || $definition === null) {
-            if ($run_id > 0) {
-                $this->skipQueuedRun($run_id, 'Cron task not found.');
-                return $this->publicRun($this->fetchOne("SELECT * FROM cron_task_runs WHERE id = $run_id") ?? []);
-            }
-            return null;
-        }
-
-        $force = (bool)($queuedRun['force_run'] ?? false);
-        $state = $this->stateRows()[$definition->id] ?? [];
-        $enabled = (bool)($state['enabled'] ?? $definition->enabled);
-        if (!$enabled && !$force) {
-            $this->skipQueuedRun($run_id, 'Cron task is disabled.', $definition);
-            return $this->publicRun($this->fetchOne("SELECT * FROM cron_task_runs WHERE id = $run_id") ?? []);
-        }
-
-        if (!$this->claimLock($definition)) {
-            return null;
-        }
-
-        $started = microtime(true);
-        $started_at = date('Y-m-d H:i:s', (int)$started);
-        $this->query(
-            "UPDATE cron_task_runs
-            SET status = 'running',
-                started_at = " . $this->sql($started_at) . ",
-                lock_owner = " . $this->sql($this->lock_owner) . "
-            WHERE id = $run_id AND status = 'queued'"
-        );
-
-        if ($this->affectedRows() !== 1) {
-            $this->clearClaimedLock($definition);
-            return null;
-        }
-
-        $this->query(
-            "UPDATE cron_task_state SET current_run_id = $run_id WHERE task_id = " . $this->sql($definition->id)
-        );
-
-        return $this->executeClaimedRun(
-            $definition,
-            $run_id,
-            $started,
-            isset($queuedRun['scheduled_for']) ? (string)$queuedRun['scheduled_for'] : null
-        );
-    }
-
-    private function skipQueuedRun(int $run_id, string $message, ?cron_task_definition $definition = null): void
-    {
-        $completed_at = date('Y-m-d H:i:s');
-        $this->query(
-            "UPDATE cron_task_runs
-            SET status = 'skipped',
-                completed_at = " . $this->sql($completed_at) . ",
-                duration_ms = 0,
-                error_message = " . $this->sql($message) . "
-            WHERE id = $run_id AND status = 'queued'"
-        );
-        $updated = $this->affectedRows() === 1;
-        if (!$updated || $definition === null) {
-            return;
-        }
-
-        $this->query(
-            "UPDATE cron_task_state
-            SET last_status = 'skipped',
-                last_error = " . $this->sql($message) . "
-            WHERE task_id = " . $this->sql($definition->id)
-        );
-    }
-
-    private function clearClaimedLock(cron_task_definition $definition): void
-    {
-        $this->query(
-            "UPDATE cron_task_state
-            SET locked_until = NULL,
-                lock_owner = NULL
-            WHERE task_id = " . $this->sql($definition->id) . "
-              AND lock_owner = " . $this->sql($this->lock_owner)
-        );
-    }
-
-    private function releaseLock(
-        cron_task_definition $definition,
-        string $status,
-        ?string $error_message,
-        string $completed_at,
-        ?string $scheduled_for = null
-    ): void
-    {
-        $state = $this->fetchOne("SELECT schedule_json FROM cron_task_state WHERE task_id = " . $this->sql($definition->id));
-        $schedule = $this->decodeJson($state['schedule_json'] ?? null);
-        if ($schedule === []) {
-            $schedule = $definition->schedule;
-        }
-
-        // Automatic runs stay anchored to their intended schedule slot. Anchoring
-        // to completion time causes every task to drift by its execution time.
-        $scheduleAnchor = $scheduled_for !== null && strtotime($scheduled_for) !== false
-            ? $scheduled_for
-            : $completed_at;
-        $nextRunAt = cron_schedule::nextRunAt($schedule, $scheduleAnchor, time());
-        if ($status !== 'succeeded') {
-            $retrySeconds = min(300, max(60, (int)$schedule['seconds']));
-            $nextRunAt = date('Y-m-d H:i:s', time() + $retrySeconds);
-        }
-
-        $this->query(
-            "UPDATE cron_task_state
-            SET last_run_at = " . $this->sql($completed_at) . ",
-                next_run_at = " . $this->sql($nextRunAt) . ",
-                locked_until = NULL,
-                lock_owner = NULL,
-                current_run_id = NULL,
-                last_status = " . $this->sql($status) . ",
-                last_error = " . $this->nullableSql($error_message) . "
-            WHERE task_id = " . $this->sql($definition->id) . "
-              AND lock_owner = " . $this->sql($this->lock_owner)
-        );
-
-        if ($definition->legacy_name !== null && defined('redis')) {
-            try {
-                redis->set_last_crond_run($definition->legacy_name, time());
-            } catch (Throwable) {
-            }
-        }
-    }
-
-    private function createRun(
-        cron_task_definition $definition,
-        string $source,
-        ?int $actor_user_id,
-        ?string $scheduled_for,
-        string $started_at,
-        bool $force = false
-    ): int {
-        $this->query(
-            "INSERT INTO cron_task_runs
-                (task_id, module, source, status, actor_user_id, scheduled_for, started_at, lock_owner, force_run)
-            VALUES ("
-                . $this->sql($definition->id) . ', '
-                . $this->sql($definition->module) . ', '
-                . $this->sql($source) . ", 'running', "
-                . ($actor_user_id === null ? 'NULL' : (string)(int)$actor_user_id) . ', '
-                . $this->nullableSql($scheduled_for) . ', '
-                . $this->sql($started_at) . ', '
-                . $this->sql($this->lock_owner) . ', '
-                . ($force ? '1' : '0')
-            . ")"
-        );
-
-        return $this->insertId();
-    }
-
-    private function completeRun(
-        int $run_id,
-        string $status,
-        string $completed_at,
-        int $duration_ms,
-        array $summary,
-        ?string $error_message
-    ): void {
-        $this->query(
-            "UPDATE cron_task_runs
-            SET status = " . $this->sql($status) . ",
-                completed_at = " . $this->sql($completed_at) . ",
-                duration_ms = " . (string)$duration_ms . ",
-                summary_json = " . $this->sql(json_encode($summary, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES)) . ",
-                error_message = " . $this->nullableSql($error_message) . "
-            WHERE id = " . (string)$run_id
-        );
-    }
-
-    private function ensureLegacyFunctionsLoaded(cron_task_definition $definition): void
-    {
-        if (function_exists($definition->handler)) {
-            return;
-        }
-
-        if (!defined('WD')) {
-            return;
-        }
-
-        if (!defined('CRON_LOAD_LEGACY_FUNCTIONS_ONLY')) {
-            define('CRON_LOAD_LEGACY_FUNCTIONS_ONLY', true);
-        }
-
-        require_once WD . '/cron/Cron.php';
-    }
-
-    /**
-     * @return array<string, array<string, mixed>>
-     */
-    private function stateRows(): array
-    {
-        $rows = $this->fetchAll("SELECT * FROM cron_task_state");
-        $states = [];
-        foreach ($rows as $row) {
-            $row['enabled'] = (bool)$row['enabled'];
-            $row['schedule'] = $this->decodeJson($row['schedule_json'] ?? null);
-            $states[(string)$row['task_id']] = $row;
-        }
-        return $states;
-    }
-
-    /**
-     * @return array<string, int>
-     */
-    private function durationEstimates(): array
-    {
-        $rows = $this->fetchAll(
-            "SELECT task_id, AVG(duration_ms) AS avg_duration_ms
-            FROM (
-                SELECT task_id, duration_ms
-                FROM cron_task_runs
-                WHERE status = 'succeeded' AND duration_ms IS NOT NULL
-                ORDER BY id DESC
-                LIMIT 500
-            ) recent_runs
-            GROUP BY task_id"
-        );
-
-        $estimates = [];
-        foreach ($rows as $row) {
-            $estimates[(string)$row['task_id']] = (int)round((float)$row['avg_duration_ms']);
-        }
-        return $estimates;
-    }
-
-    private function decodeJson(mixed $json): array
-    {
-        if (!is_string($json) || trim($json) === '') {
-            return [];
-        }
-        $decoded = json_decode($json, true);
-        return is_array($decoded) ? $decoded : [];
-    }
-
-    private function publicRun(array $run): array
-    {
-        if ($run === []) {
-            return [];
-        }
-
-        $run['force_run'] = (bool)($run['force_run'] ?? false);
-        $run['summary'] = $this->decodeJson($run['summary_json'] ?? null);
-        return $run;
-    }
-
-    private function fetchOne(string $sql): ?array
-    {
-        $rows = $this->fetchAll($sql);
-        return $rows[0] ?? null;
-    }
-
-    private function fetchAll(string $sql): array
-    {
-        $result = $this->query($sql);
-        if ($result === false || $result === true) {
-            return [];
-        }
-        return $result->fetch_all(MYSQLI_ASSOC);
-    }
-
-    private function query(string $sql): \mysqli_result|bool
-    {
-        global $db;
-        return $db->query($sql);
-    }
-
-    private function sql(string $value): string
-    {
-        global $db;
-        return "'" . $db->escape_string($value) . "'";
-    }
-
-    private function nullableSql(?string $value): string
-    {
-        return $value === null ? 'NULL' : $this->sql($value);
-    }
-
-    private function affectedRows(): int
-    {
-        global $db;
-        return (int)$db->conn()->affected_rows;
-    }
-
-    private function insertId(): int
-    {
-        global $db;
-        return (int)$db->insert_id();
-    }
-}
@@ -1,121 +0,0 @@
-<?php
-
-namespace classes;
-
-class cron_schema_bootstrap
-{
-    private static bool $initialized = false;
-
-    public static function ensureTables(): void
-    {
-        if (self::$initialized) {
-            return;
-        }
-
-        global $db;
-
-        if (!isset($db) || !is_object($db) || !method_exists($db, 'query')) {
-            return;
-        }
-
-        $db->query(
-            "CREATE TABLE IF NOT EXISTS cron_task_state (
-                task_id VARCHAR(191) NOT NULL PRIMARY KEY,
-                module VARCHAR(64) NOT NULL,
-                enabled TINYINT(1) NOT NULL DEFAULT 1,
-                schedule_json LONGTEXT NULL,
-                last_run_at DATETIME NULL,
-                next_run_at DATETIME NULL,
-                locked_until DATETIME NULL,
-                lock_owner VARCHAR(191) NULL,
-                current_run_id BIGINT UNSIGNED NULL,
-                last_status VARCHAR(32) NULL,
-                last_error TEXT NULL,
-                created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-                updated_at TIMESTAMP NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
-                KEY idx_cron_task_state_next_run (enabled, next_run_at),
-                KEY idx_cron_task_state_lock (locked_until)
-            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci"
-        );
-
-        $db->query(
-            "CREATE TABLE IF NOT EXISTS cron_task_runs (
-                id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
-                task_id VARCHAR(191) NOT NULL,
-                module VARCHAR(64) NOT NULL,
-                source VARCHAR(32) NOT NULL,
-                status VARCHAR(32) NOT NULL DEFAULT 'running',
-                actor_user_id INT NULL,
-                scheduled_for DATETIME NULL,
-                started_at DATETIME NULL,
-                completed_at DATETIME NULL,
-                duration_ms INT UNSIGNED NULL,
-                summary_json LONGTEXT NULL,
-                error_message TEXT NULL,
-                lock_owner VARCHAR(191) NULL,
-                force_run TINYINT(1) NOT NULL DEFAULT 0,
-                created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-                updated_at TIMESTAMP NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
-                KEY idx_cron_task_runs_task_created (task_id, created_at),
-                KEY idx_cron_task_runs_status_created (status, created_at),
-                KEY idx_cron_task_runs_module_created (module, created_at)
-            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci"
-        );
-        self::ensureColumn('cron_task_runs', 'force_run', 'TINYINT(1) NOT NULL DEFAULT 0 AFTER lock_owner');
-
-        $db->query(
-            "CREATE TABLE IF NOT EXISTS cron_worker_state (
-                worker_id VARCHAR(191) NOT NULL PRIMARY KEY,
-                name VARCHAR(191) NOT NULL,
-                hostname VARCHAR(191) NULL,
-                pid INT UNSIGNED NULL,
-                source VARCHAR(64) NOT NULL DEFAULT 'coolify_worker',
-                status VARCHAR(32) NOT NULL DEFAULT 'starting',
-                release_channel_id BIGINT UNSIGNED NULL,
-                release_target_id BIGINT UNSIGNED NULL,
-                coolify_resource_uuid VARCHAR(128) NULL,
-                coolify_resource_type VARCHAR(32) NULL,
-                commit_sha VARCHAR(64) NULL,
-                poll_seconds INT UNSIGNED NOT NULL DEFAULT 15,
-                last_run_count INT UNSIGNED NOT NULL DEFAULT 0,
-                last_stale_run_count INT UNSIGNED NOT NULL DEFAULT 0,
-                last_error TEXT NULL,
-                started_at DATETIME NULL,
-                last_heartbeat_at DATETIME NULL,
-                last_loop_started_at DATETIME NULL,
-                last_loop_finished_at DATETIME NULL,
-                last_loop_gap_seconds INT UNSIGNED NULL,
-                consecutive_minute_loops INT UNSIGNED NOT NULL DEFAULT 0,
-                stopped_at DATETIME NULL,
-                created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-                updated_at TIMESTAMP NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
-                KEY idx_cron_worker_state_heartbeat (last_heartbeat_at),
-                KEY idx_cron_worker_state_status (status),
-                KEY idx_cron_worker_state_release_target (release_target_id),
-                KEY idx_cron_worker_state_coolify_resource (coolify_resource_uuid)
-            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci"
-        );
-        self::ensureColumn('cron_worker_state', 'last_loop_gap_seconds', 'INT UNSIGNED NULL AFTER last_loop_finished_at');
-        self::ensureColumn('cron_worker_state', 'consecutive_minute_loops', 'INT UNSIGNED NOT NULL DEFAULT 0 AFTER last_loop_gap_seconds');
-
-        self::$initialized = true;
-    }
-
-    private static function ensureColumn(string $table, string $column, string $definition): void
-    {
-        global $db;
-
-        $table = preg_replace('/[^a-zA-Z0-9_]/', '', $table);
-        $column = preg_replace('/[^a-zA-Z0-9_]/', '', $column);
-        if ($table === '' || $column === '') {
-            return;
-        }
-
-        $result = $db->query("SHOW COLUMNS FROM `{$table}` LIKE '{$column}'");
-        if ($result && $result->num_rows > 0) {
-            return;
-        }
-
-        $db->query("ALTER TABLE `{$table}` ADD COLUMN `{$column}` {$definition}");
-    }
-}
@@ -1,85 +0,0 @@
-<?php
-
-namespace classes;
-
-use InvalidArgumentException;
-
-class cron_task_definition
-{
-    public string $id;
-    public string $name;
-    public string $description;
-    public string $module;
-    public string $handler;
-    public array $schedule;
-    public bool $enabled;
-    public int $timeout_seconds;
-    public int $estimated_duration_ms;
-    public int $priority;
-    public ?string $legacy_name;
-
-    public function __construct(array $definition)
-    {
-        $this->id = self::requiredString($definition, 'id');
-        $this->name = self::requiredString($definition, 'name');
-        $this->description = (string)($definition['description'] ?? '');
-        $this->module = self::requiredString($definition, 'module');
-        $this->handler = self::requiredString($definition, 'handler');
-        $this->schedule = cron_schedule::normalize($definition['schedule'] ?? []);
-        $this->enabled = (bool)($definition['enabled'] ?? true);
-        $this->timeout_seconds = max(30, (int)($definition['timeout_seconds'] ?? 600));
-        $this->estimated_duration_ms = max(0, (int)($definition['estimated_duration_ms'] ?? 0));
-        $this->priority = (int)($definition['priority'] ?? 100);
-        $legacy_name = trim((string)($definition['legacy_name'] ?? ''));
-        $this->legacy_name = $legacy_name !== '' ? $legacy_name : null;
-
-        if (!preg_match('/^[a-z0-9][a-z0-9_.-]{1,190}$/', $this->id)) {
-            throw new InvalidArgumentException('Invalid cron task id: ' . $this->id);
-        }
-        if (!preg_match('/^[a-z0-9][a-z0-9_-]{1,63}$/', $this->module)) {
-            throw new InvalidArgumentException('Invalid cron task module: ' . $this->module);
-        }
-    }
-
-    public function asArray(?array $state = null, ?int $estimatedDurationMs = null): array
-    {
-        $schedule = is_array($state['schedule'] ?? null) && ($state['schedule'] ?? []) !== []
-            ? $state['schedule']
-            : $this->schedule;
-        $enabled = array_key_exists('enabled', $state ?? [])
-            ? (bool)$state['enabled']
-            : $this->enabled;
-
-        return [
-            'id' => $this->id,
-            'name' => $this->name,
-            'description' => $this->description,
-            'module' => $this->module,
-            'handler' => $this->handler,
-            'schedule' => $schedule,
-            'default_schedule' => $this->schedule,
-            'enabled' => $enabled,
-            'default_enabled' => $this->enabled,
-            'timeout_seconds' => $this->timeout_seconds,
-            'estimated_duration_ms' => $estimatedDurationMs ?? $this->estimated_duration_ms,
-            'priority' => $this->priority,
-            'legacy_name' => $this->legacy_name,
-            'last_run_at' => $state['last_run_at'] ?? null,
-            'next_run_at' => $state['next_run_at'] ?? null,
-            'locked_until' => $state['locked_until'] ?? null,
-            'lock_owner' => $state['lock_owner'] ?? null,
-            'current_run_id' => $state['current_run_id'] ?? null,
-            'last_status' => $state['last_status'] ?? null,
-            'last_error' => $state['last_error'] ?? null,
-        ];
-    }
-
-    private static function requiredString(array $definition, string $key): string
-    {
-        $value = trim((string)($definition[$key] ?? ''));
-        if ($value === '') {
-            throw new InvalidArgumentException('Missing cron task definition field: ' . $key);
-        }
-        return $value;
-    }
-}
@@ -1,85 +0,0 @@
-<?php
-
-namespace classes;
-
-use InvalidArgumentException;
-
-class cron_task_registry
-{
-    private string $modules_root;
-
-    /** @var array<string, cron_task_definition>|null */
-    private ?array $definitions = null;
-
-    public function __construct(?string $modules_root = null)
-    {
-        $this->modules_root = $modules_root ?? (defined('WD') ? WD . '/modules' : dirname(__DIR__) . '/modules');
-    }
-
-    /**
-     * @return array<string, cron_task_definition>
-     */
-    public function definitions(): array
-    {
-        if ($this->definitions !== null) {
-            return $this->definitions;
-        }
-
-        $definitions = [];
-        foreach ($this->definitionFiles() as $file) {
-            $module_definitions = require $file;
-            if (!is_array($module_definitions)) {
-                throw new InvalidArgumentException('Cron definition file must return an array: ' . $file);
-            }
-
-            foreach ($module_definitions as $definition) {
-                $task = new cron_task_definition($definition);
-                if (isset($definitions[$task->id])) {
-                    throw new InvalidArgumentException('Duplicate cron task id: ' . $task->id);
-                }
-                $definitions[$task->id] = $task;
-            }
-        }
-
-        uasort($definitions, static function (cron_task_definition $left, cron_task_definition $right): int {
-            if ($left->priority !== $right->priority) {
-                return $left->priority <=> $right->priority;
-            }
-            return strcmp($left->id, $right->id);
-        });
-
-        $this->definitions = $definitions;
-        return $definitions;
-    }
-
-    public function get(string $id_or_legacy_name): ?cron_task_definition
-    {
-        $normalized = trim($id_or_legacy_name);
-        if ($normalized === '') {
-            return null;
-        }
-
-        $definitions = $this->definitions();
-        if (isset($definitions[$normalized])) {
-            return $definitions[$normalized];
-        }
-
-        foreach ($definitions as $definition) {
-            if ($definition->legacy_name !== null && hash_equals($definition->legacy_name, $normalized)) {
-                return $definition;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * @return array<int, string>
-     */
-    private function definitionFiles(): array
-    {
-        $files = glob($this->modules_root . '/*/cron/tasks.php') ?: [];
-        sort($files, SORT_STRING);
-        return $files;
-    }
-}
@@ -1,361 +0,0 @@
-<?php
-
-namespace classes;
-
-use Throwable;
-use traits\boolean_normalization_t;
-
-require_once __DIR__ . '/../traits/boolean_normalization_t.php';
-
-class cron_worker
-{
-    use boolean_normalization_t;
-
-    private cron_scheduler $scheduler;
-    private string $worker_id;
-    private string $name;
-    private string $source;
-    private int $poll_seconds;
-    private int $heartbeat_seconds;
-    private int $max_runtime_seconds;
-    private bool $should_stop = false;
-    private int $last_heartbeat = 0;
-
-    public function __construct(?cron_scheduler $scheduler = null, array $options = [])
-    {
-        $this->scheduler = $scheduler ?? new cron_scheduler();
-        $this->name = $this->stringOption($options, 'name', 'CRON_WORKER_NAME', 'cron-worker');
-        $this->worker_id = $this->stringOption($options, 'worker_id', 'CRON_WORKER_ID', $this->name);
-        $this->source = $this->stringOption($options, 'source', 'CRON_WORKER_SOURCE', 'coolify_worker');
-        $this->poll_seconds = $this->intOption($options, 'poll_seconds', 'CRON_WORKER_POLL_SECONDS', 15, 1, 300);
-        $this->heartbeat_seconds = $this->intOption($options, 'heartbeat_seconds', 'CRON_WORKER_HEARTBEAT_SECONDS', 30, 5, 300);
-        $this->max_runtime_seconds = $this->intOption($options, 'max_runtime_seconds', 'CRON_WORKER_MAX_RUNTIME_SECONDS', 0, 0, 86400);
-    }
-
-    public function run(): int
-    {
-        if (!$this->boolOption('CRON_WORKER_ENABLED', true)) {
-            $this->heartbeat('disabled', 0, 0, null, true);
-            return 0;
-        }
-
-        $this->registerSignalHandlers();
-        $started = time();
-        $this->heartbeat('starting', 0, 0, null, true);
-
-        while (!$this->should_stop) {
-            $pollStarted = microtime(true);
-            $result = $this->tick();
-            $this->writeStatusLine($result);
-
-            if ($this->max_runtime_seconds > 0 && time() - $started >= $this->max_runtime_seconds) {
-                $this->should_stop = true;
-                break;
-            }
-
-            $this->sleepUntilNextPoll($pollStarted + $this->poll_seconds);
-        }
-
-        $this->heartbeat('stopped', 0, 0, null, true, true);
-        return 0;
-    }
-
-    public function tick(): array
-    {
-        $this->heartbeat('running');
-        $loopStartedAt = date('Y-m-d H:i:s');
-        $staleRuns = 0;
-        $ran = ['count' => 0, 'ran' => []];
-        $error = null;
-        $status = 'running';
-
-        try {
-            $staleRuns = $this->scheduler->markExpiredRunningRuns();
-            $ran = $this->scheduler->runDue($this->source);
-        } catch (Throwable $throwable) {
-            $status = 'failed';
-            $error = $throwable->getMessage();
-        }
-
-        $this->heartbeat($status, (int)($ran['count'] ?? 0), $staleRuns, $error, true, false, $loopStartedAt);
-
-        return [
-            'worker_id' => $this->worker_id,
-            'status' => $status,
-            'ran' => (int)($ran['count'] ?? 0),
-            'stale_runs' => $staleRuns,
-            'error' => $error,
-        ];
-    }
-
-    public function listWorkers(): array
-    {
-        cron_schema_bootstrap::ensureTables();
-        $rows = $this->fetchAll('SELECT * FROM cron_worker_state ORDER BY last_heartbeat_at DESC, worker_id');
-        $workers = [];
-        foreach ($rows as $row) {
-            $workers[] = $this->publicWorker($row);
-        }
-
-        return [
-            'workers' => $workers,
-            'summary' => [
-                'total' => count($workers),
-                'running' => count(array_filter($workers, static fn(array $worker): bool => ($worker['status'] ?? '') === 'running')),
-                'stale' => count(array_filter($workers, static fn(array $worker): bool => (bool)($worker['stale'] ?? false))),
-            ],
-        ];
-    }
-
-    private function registerSignalHandlers(): void
-    {
-        if (!function_exists('pcntl_signal')) {
-            return;
-        }
-
-        if (function_exists('pcntl_async_signals')) {
-            pcntl_async_signals(true);
-        }
-
-        pcntl_signal(SIGTERM, function (): void {
-            $this->should_stop = true;
-        });
-        pcntl_signal(SIGINT, function (): void {
-            $this->should_stop = true;
-        });
-    }
-
-    private function sleepUntilNextPoll(float $nextPollAt): void
-    {
-        while (!$this->should_stop) {
-            $remaining = $nextPollAt - microtime(true);
-            if ($remaining <= 0) {
-                return;
-            }
-            usleep((int)(min(1.0, $remaining) * 1000000));
-            if (time() - $this->last_heartbeat >= $this->heartbeat_seconds) {
-                $this->heartbeat('running');
-            }
-        }
-    }
-
-    private function heartbeat(
-        string $status,
-        int $runCount = 0,
-        int $staleRunCount = 0,
-        ?string $error = null,
-        bool $force = false,
-        bool $stopped = false,
-        ?string $loopStartedAt = null
-    ): void {
-        if (!$force && time() - $this->last_heartbeat < $this->heartbeat_seconds) {
-            return;
-        }
-
-        cron_schema_bootstrap::ensureTables();
-        $this->last_heartbeat = time();
-        $now = date('Y-m-d H:i:s');
-        $workerId = $this->sql($this->worker_id);
-        $name = $this->sql($this->name);
-        $hostname = $this->nullableSql(gethostname() ?: null);
-        $pid = getmypid() ?: 0;
-        $source = $this->sql($this->source);
-        $statusSql = $this->sql($status);
-        $releaseChannelId = $this->nullableInt($this->env('CRON_WORKER_RELEASE_CHANNEL_ID'));
-        $releaseTargetId = $this->nullableInt($this->env('CRON_WORKER_RELEASE_TARGET_ID'));
-        $resourceUuid = $this->nullableSql($this->env('COOLIFY_RESOURCE_UUID') ?: $this->env('CRON_WORKER_COOLIFY_RESOURCE_UUID'));
-        $resourceType = $this->nullableSql($this->env('COOLIFY_RESOURCE_TYPE') ?: $this->env('CRON_WORKER_COOLIFY_RESOURCE_TYPE') ?: 'application');
-        $commitSha = $this->nullableSql($this->commitSha());
-        $errorSql = $this->nullableSql($error);
-        $loopStarted = $this->nullableSql($loopStartedAt);
-        $stoppedAt = $stopped ? $this->sql($now) : 'NULL';
-        $nowSql = $this->sql($now);
-
-        $this->query(
-            "INSERT INTO cron_worker_state (
-                worker_id, name, hostname, pid, source, status, release_channel_id, release_target_id,
-                coolify_resource_uuid, coolify_resource_type, commit_sha, poll_seconds, last_run_count,
-                last_stale_run_count, last_error, started_at, last_heartbeat_at, last_loop_started_at,
-                last_loop_finished_at, last_loop_gap_seconds, consecutive_minute_loops, stopped_at
-            ) VALUES (
-                $workerId, $name, $hostname, $pid, $source, $statusSql, $releaseChannelId, $releaseTargetId,
-                $resourceUuid, $resourceType, $commitSha, $this->poll_seconds, $runCount,
-                $staleRunCount, $errorSql, $nowSql, $nowSql, $loopStarted,
-                $nowSql, NULL, " . ($loopStartedAt !== null ? '1' : '0') . ", $stoppedAt
-            )
-            ON DUPLICATE KEY UPDATE
-                name = VALUES(name),
-                hostname = VALUES(hostname),
-                pid = VALUES(pid),
-                source = VALUES(source),
-                status = VALUES(status),
-                release_channel_id = VALUES(release_channel_id),
-                release_target_id = VALUES(release_target_id),
-                coolify_resource_uuid = VALUES(coolify_resource_uuid),
-                coolify_resource_type = VALUES(coolify_resource_type),
-                commit_sha = VALUES(commit_sha),
-                poll_seconds = VALUES(poll_seconds),
-                last_run_count = VALUES(last_run_count),
-                last_stale_run_count = VALUES(last_stale_run_count),
-                last_error = VALUES(last_error),
-                last_heartbeat_at = VALUES(last_heartbeat_at),
-                last_loop_gap_seconds = CASE
-                    WHEN VALUES(last_loop_started_at) IS NULL OR last_loop_started_at IS NULL THEN last_loop_gap_seconds
-                    ELSE GREATEST(0, TIMESTAMPDIFF(SECOND, last_loop_started_at, VALUES(last_loop_started_at)))
-                END,
-                consecutive_minute_loops = CASE
-                    WHEN VALUES(last_loop_started_at) IS NULL THEN consecutive_minute_loops
-                    WHEN last_loop_started_at IS NULL THEN 1
-                    WHEN TIMESTAMPDIFF(SECOND, last_loop_started_at, VALUES(last_loop_started_at)) BETWEEN 0 AND 60
-                        THEN consecutive_minute_loops + 1
-                    ELSE 1
-                END,
-                last_loop_started_at = COALESCE(VALUES(last_loop_started_at), last_loop_started_at),
-                last_loop_finished_at = VALUES(last_loop_finished_at),
-                stopped_at = VALUES(stopped_at)"
-        );
-    }
-
-    private function publicWorker(array $row): array
-    {
-        $heartbeatAt = (string)($row['last_heartbeat_at'] ?? '');
-        $heartbeatTs = strtotime($heartbeatAt);
-        $threshold = max(60, ((int)($row['poll_seconds'] ?? 15) * 4) + 30);
-        $age = $heartbeatTs !== false ? max(0, time() - $heartbeatTs) : null;
-        $loopStartedAt = (string)($row['last_loop_started_at'] ?? '');
-        $loopStartedTs = strtotime($loopStartedAt);
-        $loopAge = $loopStartedTs !== false ? max(0, time() - $loopStartedTs) : null;
-        $loopGap = isset($row['last_loop_gap_seconds']) ? (int)$row['last_loop_gap_seconds'] : null;
-        $consecutiveMinuteLoops = (int)($row['consecutive_minute_loops'] ?? 0);
-        $minuteCadenceVerified = ($row['status'] ?? '') === 'running'
-            && $loopAge !== null
-            && $loopAge <= 60
-            && $loopGap !== null
-            && $loopGap <= 60
-            && $consecutiveMinuteLoops >= 2;
-
-        return [
-            'worker_id' => (string)($row['worker_id'] ?? ''),
-            'name' => (string)($row['name'] ?? ''),
-            'hostname' => $row['hostname'] ?? null,
-            'pid' => isset($row['pid']) ? (int)$row['pid'] : null,
-            'source' => (string)($row['source'] ?? ''),
-            'status' => (string)($row['status'] ?? 'unknown'),
-            'release_channel_id' => isset($row['release_channel_id']) ? (int)$row['release_channel_id'] : null,
-            'release_target_id' => isset($row['release_target_id']) ? (int)$row['release_target_id'] : null,
-            'coolify_resource_uuid' => $row['coolify_resource_uuid'] ?? null,
-            'coolify_resource_type' => $row['coolify_resource_type'] ?? null,
-            'commit_sha' => $row['commit_sha'] ?? null,
-            'poll_seconds' => (int)($row['poll_seconds'] ?? 0),
-            'last_run_count' => (int)($row['last_run_count'] ?? 0),
-            'last_stale_run_count' => (int)($row['last_stale_run_count'] ?? 0),
-            'last_error' => $row['last_error'] ?? null,
-            'started_at' => $row['started_at'] ?? null,
-            'last_heartbeat_at' => $heartbeatAt !== '' ? $heartbeatAt : null,
-            'last_heartbeat_age_seconds' => $age,
-            'last_loop_started_at' => $row['last_loop_started_at'] ?? null,
-            'last_loop_finished_at' => $row['last_loop_finished_at'] ?? null,
-            'last_loop_age_seconds' => $loopAge,
-            'last_loop_gap_seconds' => $loopGap,
-            'consecutive_minute_loops' => $consecutiveMinuteLoops,
-            'minute_cadence' => [
-                'verified' => $minuteCadenceVerified,
-                'maximum_gap_seconds' => 60,
-                'last_gap_seconds' => $loopGap,
-                'consecutive_loops' => $consecutiveMinuteLoops,
-            ],
-            'stopped_at' => $row['stopped_at'] ?? null,
-            'stale' => $age === null || $age > $threshold,
-            'stale_after_seconds' => $threshold,
-        ];
-    }
-
-    private function writeStatusLine(array $result): void
-    {
-        echo '[' . date('Y-m-d H:i:s') . '][CRON_WORKER] '
-            . json_encode($result, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES)
-            . PHP_EOL;
-    }
-
-    private function stringOption(array $options, string $key, string $env, string $default): string
-    {
-        $value = trim((string)($options[$key] ?? $this->env($env) ?? ''));
-        return $value !== '' ? $value : $default;
-    }
-
-    private function intOption(array $options, string $key, string $env, int $default, int $min, int $max): int
-    {
-        $value = (int)($options[$key] ?? $this->env($env) ?? $default);
-        return max($min, min($max, $value));
-    }
-
-    private function boolOption(string $env, bool $default): bool
-    {
-        $value = $this->env($env);
-        if ($value === null || trim($value) === '') {
-            return $default;
-        }
-
-        return self::normalizeBoolean($value);
-    }
-
-    private function commitSha(): string
-    {
-        foreach (['CRON_WORKER_COMMIT_SHA', 'API_COMMIT_SHA', 'RELEASE_COMMIT_SHA', 'COMMIT_SHA', 'GITHUB_SHA'] as $key) {
-            $value = trim((string)($this->env($key) ?? ''));
-            if ($value !== '') {
-                return $value;
-            }
-        }
-
-        return '';
-    }
-
-    private function env(string $key): ?string
-    {
-        $value = getenv($key);
-        if ($value !== false) {
-            return (string)$value;
-        }
-
-        return isset($_SERVER[$key]) ? (string)$_SERVER[$key] : null;
-    }
-
-    private function nullableInt(?string $value): string
-    {
-        $value = trim((string)$value);
-        if ($value === '' || filter_var($value, FILTER_VALIDATE_INT) === false) {
-            return 'NULL';
-        }
-
-        return (string)max(0, (int)$value);
-    }
-
-    private function nullableSql(?string $value): string
-    {
-        $value = $value !== null ? trim($value) : '';
-        return $value === '' ? 'NULL' : $this->sql($value);
-    }
-
-    private function fetchAll(string $sql): array
-    {
-        $result = $this->query($sql);
-        if ($result === false || $result === true) {
-            return [];
-        }
-
-        return $result->fetch_all(MYSQLI_ASSOC);
-    }
-
-    private function query(string $sql): \mysqli_result|bool
-    {
-        global $db;
-        return $db->query($sql);
-    }
-
-    private function sql(string $value): string
-    {
-        global $db;
-        return "'" . $db->escape_string($value) . "'";
-    }
-}
@@ -1,93 +0,0 @@
-<?php
-
-namespace classes;
-
-/**
- * Ensures additive schema for the customer `invoice_email` field
- * (TRU-77 / DRIFT 16). The field is optional and stores an
- * e-mail address that should receive the customer's invoices
- * separately from the customer's primary `email`.
- */
-class customer_invoice_email_schema_bootstrap
-{
-    private static bool $initialized = false;
-    private const TABLE = 'users';
-    private const COLUMN = 'invoice_email';
-
-    public static function ensureSchema(): void
-    {
-        if (self::$initialized) {
-            return;
-        }
-
-        global $db;
-        if (!isset($db) || !is_object($db) || !method_exists($db, 'query')) {
-            return;
-        }
-
-        self::ensureUsersTable($db);
-        self::ensureInvoiceEmailColumn($db);
-
-        self::$initialized = true;
-    }
-
-    private static function ensureUsersTable(object $db): void
-    {
-        $db->query(
-            "CREATE TABLE IF NOT EXISTS users (
-                id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
-                customer_number INT NOT NULL,
-                display_name VARCHAR(255) NULL,
-                email VARCHAR(255) NULL,
-                phone_country_code INT NULL,
-                phone BIGINT NULL,
-                password VARCHAR(255) NULL,
-                group_id INT NOT NULL DEFAULT 0,
-                xlvask_customer_id VARCHAR(255) NULL,
-                sms_notifications_enabled TINYINT(1) NOT NULL DEFAULT 0,
-                email_notifications_enabled TINYINT(1) NOT NULL DEFAULT 0,
-                wash_certificate_email VARCHAR(255) NULL,
-                invoice_email VARCHAR(255) NULL,
-                two_factor_enabled TINYINT(1) NOT NULL DEFAULT 0,
-                two_factor_secret VARCHAR(255) NULL,
-                created_at DATETIME NULL DEFAULT CURRENT_TIMESTAMP,
-                updated_at DATETIME NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-                deleted_at DATETIME NULL,
-                KEY idx_users_customer_number (customer_number),
-                KEY idx_users_group_id (group_id)
-            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci"
-        );
-    }
-
-    private static function ensureInvoiceEmailColumn(object $db): void
-    {
-        if (!self::tableExists($db, self::TABLE)) {
-            return;
-        }
-        if (self::columnExists($db, self::TABLE, self::COLUMN)) {
-            return;
-        }
-
-        $safeTable = str_replace('`', '', self::TABLE);
-        $db->query(
-            "ALTER TABLE `{$safeTable}`
-                ADD COLUMN " . self::COLUMN . " VARCHAR(255) NULL
-                AFTER wash_certificate_email"
-        );
-    }
-
-    private static function tableExists(object $db, string $table): bool
-    {
-        $safeTable = str_replace('`', '', $table);
-        $result = $db->query("SHOW TABLES LIKE '{$safeTable}'");
-        return $result && (int)$result->num_rows > 0;
-    }
-
-    private static function columnExists(object $db, string $table, string $column): bool
-    {
-        $safeTable = str_replace('`', '', $table);
-        $safeColumn = str_replace("'", '', $column);
-        $result = $db->query("SHOW COLUMNS FROM `{$safeTable}` LIKE '{$safeColumn}'");
-        return $result && (int)$result->num_rows > 0;
-    }
-}
@@ -14,10 +14,6 @@ class customer_mass_import_service
     */
    public function import(array $payload): array
    {
-        // TRU-77 / DRIFT 16: ensure the invoice_email column exists before we
-        // attempt to populate it on a local customer.
-        customer_invoice_email_schema_bootstrap::ensureSchema();
-
        $normalized = $this->normalizePayload($payload);
        $this->assertValidNormalizedPayload($normalized);

@@ -66,15 +62,9 @@ class customer_mass_import_service
        }

        $normalized['name'] = $this->resolveCreateName($normalized);
-        // TRU-77 / DRIFT 16: resolve the e-conomic delivery address into a
-        // local variable instead of overwriting $normalized['email']. The
-        // primary customer email must remain intact for the result payload
-        // and for downstream local-customer sync; the create call needs the
-        // dedicated invoice address (or the primary as a fallback) on its
-        // own.
-        $createEmail = $this->resolveCreateEmail($normalized, $warnings);
+        $normalized['email'] = $this->resolveCreateEmail($normalized, $warnings);

-        $createResponse = $this->createEconomicCustomer($normalized, $createEmail);
+        $createResponse = $this->createEconomicCustomer($normalized);
        $createdCustomerNumber = $this->extractEconomicCustomerNumber($createResponse);

        if ($createdCustomerNumber !== $customerNumber) {
@@ -121,7 +111,6 @@ class customer_mass_import_service
            'cvr' => $this->normalizeDigitString($payload['cvr'] ?? null),
            'name' => $this->normalizeText($payload['name'] ?? $payload['company_name'] ?? null),
            'email' => $this->normalizeEmail($payload['email'] ?? null),
-            'invoice_email' => $this->normalizeInvoiceEmail($payload['invoice_email'] ?? null),
            'ean' => $this->normalizeDigitString($payload['ean'] ?? null),
        ];
    }
@@ -148,10 +137,6 @@ class customer_mass_import_service
        if ($cvrLength < 8 || $cvrLength > 20) {
            throw new \RuntimeException('CVR must be between 8 and 20 digits.', 400);
        }
-
-        if ($normalized['ean'] !== null && strlen((string)$normalized['ean']) > 13) {
-            throw new \RuntimeException('EAN must be at most 13 digits.', 400);
-        }
    }

    protected function normalizePositiveInt(mixed $value): ?int
@@ -204,42 +189,6 @@ class customer_mass_import_service
        return $email;
    }

-    /**
-     * Normalize the optional dedicated invoice email (TRU-77 / DRIFT 16).
-     * Empty/whitespace values collapse to null. An explicit non-empty value
-     * must be a syntactically valid email address; an invalid value is
-     * rejected to keep invoices from being routed to a malformed address.
-     */
-    protected function normalizeInvoiceEmail(mixed $value): ?string
-    {
-        $email = $this->normalizeText($value);
-        if ($email === null) {
-            return null;
-        }
-        if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
-            throw new \RuntimeException('Invalid invoice email address.', 400);
-        }
-        return $email;
-    }
-
-    /**
-     * Resolve the e-mail address that e-conomic should use to deliver
-     * invoices for the customer (TRU-77 / DRIFT 16). Prefers the dedicated
-     * `invoice_email` when provided, falling back to the customer's primary
-     * `email`.
-     */
-    protected function resolveInvoiceEmail(array $normalized, array &$warnings): string
-    {
-        if (!empty($normalized['invoice_email'])) {
-            return (string)$normalized['invoice_email'];
-        }
-        if (!empty($normalized['email'])) {
-            return (string)$normalized['email'];
-        }
-        $warnings[] = 'No invoice email was provided, defaulted to jb@truckwash.dk for the new e-conomic customer.';
-        return 'jb@truckwash.dk';
-    }
-
    protected function resolveCreateName(array $normalized): string
    {
        if ($normalized['name'] !== null) {
@@ -256,9 +205,12 @@ class customer_mass_import_service

    protected function resolveCreateEmail(array $normalized, array &$warnings): string
    {
-        // TRU-77 / DRIFT 16: invoices must be routed to the dedicated
-        // invoice_email when provided, otherwise to the customer's email.
-        return $this->resolveInvoiceEmail($normalized, $warnings);
+        if ($normalized['email'] !== null) {
+            return $normalized['email'];
+        }
+
+        $warnings[] = 'No email was provided, defaulted to jb@truckwash.dk for the new e-conomic customer.';
+        return 'jb@truckwash.dk';
    }

    protected function searchEconomicCustomersByCvr(string $cvr): array
@@ -273,7 +225,7 @@ class customer_mass_import_service
        return is_array($response) ? $response : [];
    }

-    protected function createEconomicCustomer(array $normalized, string $createEmail): object
+    protected function createEconomicCustomer(array $normalized): object
    {
        $payload = [
            'customerNumber' => (int)$normalized['customer_number'],
@@ -285,10 +237,7 @@ class customer_mass_import_service
                'paymentTermsNumber' => 12,
            ],
            'name' => (string)$normalized['name'],
-            // TRU-77 / DRIFT 16: the dedicated invoice_email (or the
-            // primary email as a fallback) is passed in explicitly so the
-            // caller's $normalized['email'] is never mutated here.
-            'email' => $createEmail,
+            'email' => (string)$normalized['email'],
            'phone' => (int)$normalized['phone'],
            'telephoneAndFaxNumber' => (string)$normalized['phone'],
            'mobilePhone' => (string)$normalized['phone'],
@@ -443,7 +392,6 @@ class customer_mass_import_service
            'cvr' => (string)$normalized['cvr'],
            'name' => $customerName,
            'email' => $normalized['email'],
-            'invoice_email' => $normalized['invoice_email'] ?? null,
            'ean' => $normalized['ean'],
            'action' => $action,
            'message' => $message,
@@ -464,7 +412,6 @@ class customer_mass_import_service

        $name = $normalized['name'] ?? null;
        $email = $normalized['email'] ?? null;
-        $invoice_email = $normalized['invoice_email'] ?? null;
        $phone = $normalized['phone'] ?? null;

        $displayName = trim((string)($customer->display_name->value() ?? ''));
@@ -480,16 +427,6 @@ class customer_mass_import_service
            }
        }

-        // TRU-77 / DRIFT 16: persist the dedicated invoice email override
-        // when provided so invoice routing survives subsequent local edits.
-        if ($invoice_email !== null && $customer->getInvoiceEmailOverride() === null) {
-            try {
-                $customer->setInvoiceEmail($invoice_email);
-            } catch (\Throwable $throwable) {
-                $warnings[] = 'Unable to update local invoice email: ' . $throwable->getMessage();
-            }
-        }
-
        if ($phone !== null && empty($customer->phone->value())) {
            try {
                $customer->setPhoneNumber((int)$phone);
@@ -1,46 +0,0 @@
-<?php
-
-namespace classes;
-
-use RuntimeException;
-
-class customer_order_product_policy
-{
-    public static function assertOrderAllowsProduct(int $orderId, int $productId): void
-    {
-        $message = self::orderProductViolationMessage($orderId, $productId);
-        if ($message !== null) {
-            throw new RuntimeException($message);
-        }
-    }
-
-    public static function orderProductViolationMessage(int $orderId, int $productId): ?string
-    {
-        $customerNumber = self::loadOrderCustomerNumber($orderId);
-        if ($customerNumber === null) {
-            return null;
-        }
-        $violation = (new customer_rule_product_restriction_service())
-            ->violationForCustomerProduct($customerNumber, $productId);
-        return $violation === null ? null : (string)$violation['message'];
-    }
-
-    private static function loadOrderCustomerNumber(int $orderId): ?int
-    {
-        global $db;
-
-        if ($orderId < 1) {
-            return null;
-        }
-
-        $result = $db->query("SELECT customer_id FROM orders WHERE id = {$orderId} LIMIT 1");
-        if (!$result || $result->num_rows < 1) {
-            return null;
-        }
-
-        $row = $result->fetch_assoc();
-        $customerNumber = (int)($row['customer_id'] ?? 0);
-        return $customerNumber > 0 ? $customerNumber : null;
-    }
-
-}
@@ -3,13 +3,18 @@
 namespace classes;

 use objects\orders_o;
+use objects\products_o;
+use objects\users_o;

 class customer_product_rule_service
 {
    public const BLOCK_MESSAGE = 'This product is not allowed for the selected customer';

+    private const ADDON_CATEGORY_ID = 4;
+    private const TANK_CLEANING_CATEGORY_ID = 5;
+
    /**
-     * @return array{rule:string,rules:list<string>,collections:list<int>,product_id:int,code:string,message:string}|null
+     * @return array{rule:string,message:string}|null
     */
    public function firstViolationForOrderItem(int $orderId, int $productId, ?int $relatedItemId): ?array
    {
@@ -17,17 +22,137 @@ class customer_product_rule_service
        if (!$order->exists()) {
            return null;
        }
-        $violation = (new customer_rule_product_restriction_service())->violationForCustomerProduct(
-            (int)$order->customer_id->value(),
-            $productId
-        );
-        if ($violation === null) {
+
+        $product = (new products_o())->getProductById($productId);
+        if (!$product->exists()) {
            return null;
        }

-        // Keep the singular key during the API migration for existing invoice
-        // and logging consumers while also returning every matching rule.
-        return ['rule' => (string)$violation['rules'][0]] + $violation;
+        $customer = (new users_o())->getUserByCustomerNumber((int)$order->customer_id->value());
+        if (!$customer->exists()) {
+            return null;
+        }
+
+        $categoryId = (int)$product->category->value();
+        $categoryName = $this->categoryName($categoryId);
+        $searchableProduct = $this->searchableProductText($product, $categoryName);
+        $isTankCleaningProduct = $this->isTankCleaningProduct($categoryId, $searchableProduct);
+
+        if ($customer->doesUserHaveAttribute('restrictAdditionalServices')
+            && $this->isAdditionalServiceProduct($orderId, $relatedItemId, $categoryId, $searchableProduct)) {
+            return $this->violation('restrictAdditionalServices');
+        }
+
+        if ($customer->doesUserHaveAttribute('restrictTankCleaning') && $isTankCleaningProduct) {
+            return $this->violation('restrictTankCleaning');
+        }
+
+        if ($customer->doesUserHaveAttribute('onlyTankCleaning') && !$isTankCleaningProduct) {
+            return $this->violation('onlyTankCleaning');
+        }
+
+        if ($customer->doesUserHaveAttribute('restrictSpotFree')
+            && $this->containsAny($searchableProduct, ['spot free', 'spotfree'])) {
+            return $this->violation('restrictSpotFree');
+        }
+
+        if ($customer->doesUserHaveAttribute('restrictInteriorCleaning')
+            && $this->containsAny($searchableProduct, ['interior', 'indvendig'])) {
+            return $this->violation('restrictInteriorCleaning');
+        }
+
+        return null;
    }

+    /**
+     * @return array{rule:string,message:string}
+     */
+    private function violation(string $rule): array
+    {
+        return [
+            'rule' => $rule,
+            'message' => self::BLOCK_MESSAGE,
+        ];
+    }
+
+    private function isAdditionalServiceProduct(int $orderId, ?int $relatedItemId, int $categoryId, string $searchableProduct): bool
+    {
+        if ($relatedItemId !== null && $relatedItemId > 0) {
+            return true;
+        }
+
+        if ($categoryId === self::ADDON_CATEGORY_ID) {
+            return true;
+        }
+
+        if ($this->containsAny($searchableProduct, ['add-on', 'add on', 'addon', 'tilvalg'])) {
+            return true;
+        }
+
+        return $this->countStandaloneOrderItems($orderId) > 0;
+    }
+
+    private function isTankCleaningProduct(int $categoryId, string $searchableProduct): bool
+    {
+        if ($categoryId === self::TANK_CLEANING_CATEGORY_ID) {
+            return true;
+        }
+
+        return $this->containsAny($searchableProduct, ['tank cleaning', 'tankcleaning', 'tankrens', 'tank rens']);
+    }
+
+    private function searchableProductText(products_o $product, string $categoryName): string
+    {
+        return strtolower(trim((string)$product->name->value() . ' ' . $categoryName));
+    }
+
+    /**
+     * @param array<int, string> $terms
+     */
+    private function containsAny(string $value, array $terms): bool
+    {
+        foreach ($terms as $term) {
+            if ($term !== '' && str_contains($value, $term)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private function categoryName(int $categoryId): string
+    {
+        global $db;
+
+        if ($categoryId <= 0) {
+            return '';
+        }
+
+        $result = $db->query('SELECT name FROM categories WHERE id = ' . $categoryId . ' LIMIT 1');
+        if (!$result || $result->num_rows === 0) {
+            return '';
+        }
+
+        $row = $result->fetch_assoc();
+        return strtolower((string)($row['name'] ?? ''));
+    }
+
+    private function countStandaloneOrderItems(int $orderId): int
+    {
+        global $db;
+
+        $result = $db->query(
+            'SELECT COUNT(*) AS item_count
+             FROM order_items
+             WHERE order_id = ' . $orderId . '
+               AND deleted_at IS NULL
+               AND (related_item_id IS NULL OR related_item_id = 0)'
+        );
+        if (!$result) {
+            return 0;
+        }
+
+        $row = $result->fetch_assoc();
+        return (int)($row['item_count'] ?? 0);
+    }
 }
@@ -1,291 +0,0 @@
-<?php
-
-namespace classes;
-
-use RuntimeException;
-use Throwable;
-
-/**
- * Additive schema and the one-time legacy-to-exact-product migration for
- * customer-rule product restrictions.
- */
-class customer_rule_product_restriction_schema_bootstrap
-{
-    public const LEGACY_SEED_KEY = 'legacy_exact_product_sets_v1';
-
-    private static bool $initialized = false;
-
-    /** @var array<string, string> */
-    private const RULES = [
-        'restrictAdditionalServices' => 'Additional services',
-        'restrictTankCleaning' => 'Tank cleaning',
-        'restrictSpotFree' => 'SpotFree',
-        'restrictInteriorCleaning' => 'Interior cleaning',
-        'onlyTankCleaning' => 'Non-tank products',
-    ];
-
-    public static function ensureSchema(): void
-    {
-        if (self::$initialized) {
-            return;
-        }
-
-        global $db;
-        if (!isset($db) || !is_object($db) || !method_exists($db, 'query')) {
-            return;
-        }
-
-        self::createTables($db);
-        self::deduplicateCustomerAttributes($db);
-        self::seedLegacyProductSets($db);
-        self::$initialized = true;
-    }
-
-    private static function createTables(object $db): void
-    {
-        $statements = [
-            "CREATE TABLE IF NOT EXISTS customer_rule_product_restrictions (
-                attribute VARCHAR(191) NOT NULL,
-                version INT UNSIGNED NOT NULL DEFAULT 1,
-                created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-                updated_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-                PRIMARY KEY (attribute)
-            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
-            "CREATE TABLE IF NOT EXISTS customer_rule_product_collections (
-                id INT UNSIGNED NOT NULL AUTO_INCREMENT,
-                attribute VARCHAR(191) NOT NULL,
-                name VARCHAR(191) NOT NULL,
-                sort_order INT NOT NULL DEFAULT 0,
-                created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-                updated_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-                PRIMARY KEY (id),
-                UNIQUE KEY uniq_customer_rule_collection_name (attribute, name),
-                KEY idx_customer_rule_collection_attribute_order (attribute, sort_order, id),
-                CONSTRAINT fk_customer_rule_collection_attribute
-                    FOREIGN KEY (attribute) REFERENCES customer_rule_product_restrictions(attribute)
-                    ON DELETE CASCADE ON UPDATE CASCADE
-            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
-            "CREATE TABLE IF NOT EXISTS customer_rule_product_collection_products (
-                collection_id INT UNSIGNED NOT NULL,
-                product_id INT UNSIGNED NOT NULL,
-                created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-                PRIMARY KEY (collection_id, product_id),
-                KEY idx_customer_rule_collection_product (product_id, collection_id),
-                CONSTRAINT fk_customer_rule_collection_product_collection
-                    FOREIGN KEY (collection_id) REFERENCES customer_rule_product_collections(id)
-                    ON DELETE CASCADE ON UPDATE CASCADE
-            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
-            "CREATE TABLE IF NOT EXISTS customer_rule_product_migrations (
-                migration_key VARCHAR(191) NOT NULL,
-                details_json LONGTEXT NULL,
-                applied_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-                PRIMARY KEY (migration_key)
-            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
-            "CREATE TABLE IF NOT EXISTS customer_rule_product_audit_logs (
-                id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
-                actor_user_id INT UNSIGNED NULL,
-                attribute VARCHAR(191) NOT NULL,
-                old_version INT UNSIGNED NOT NULL,
-                new_version INT UNSIGNED NOT NULL,
-                changes_json LONGTEXT NOT NULL,
-                created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-                PRIMARY KEY (id),
-                KEY idx_customer_rule_product_audit_attribute (attribute, created_at),
-                KEY idx_customer_rule_product_audit_actor (actor_user_id, created_at)
-            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
-        ];
-
-        foreach ($statements as $statement) {
-            if ($db->query($statement) === false) {
-                throw new RuntimeException('Unable to initialize customer-rule product restriction schema');
-            }
-        }
-    }
-
-    private static function deduplicateCustomerAttributes(object $db): void
-    {
-        if (!self::tableExists($db, 'customer_attributes')) {
-            return;
-        }
-
-        if (self::indexExists($db, 'customer_attributes', 'uniq_customer_attributes_user_attribute')) {
-            return;
-        }
-
-        if ($db->query(
-            'DELETE duplicate_row FROM customer_attributes duplicate_row
-             INNER JOIN customer_attributes keep_row
-                ON keep_row.user_id = duplicate_row.user_id
-               AND keep_row.attribute = duplicate_row.attribute
-               AND keep_row.id < duplicate_row.id'
-        ) === false) {
-            throw new RuntimeException('Unable to deduplicate customer attributes');
-        }
-
-        if ($db->query(
-            'ALTER TABLE customer_attributes
-             ADD UNIQUE KEY uniq_customer_attributes_user_attribute (user_id, attribute)'
-        ) === false) {
-            throw new RuntimeException('Unable to enforce unique customer attributes');
-        }
-    }
-
-    private static function seedLegacyProductSets(object $db): void
-    {
-        if (!self::tableExists($db, 'products') || !self::tableExists($db, 'categories')) {
-            return;
-        }
-
-        $migrationKey = self::escape($db, self::LEGACY_SEED_KEY);
-        $existing = $db->query(
-            "SELECT migration_key FROM customer_rule_product_migrations WHERE migration_key = '{$migrationKey}' LIMIT 1"
-        );
-        if ($existing && (int)$existing->num_rows > 0) {
-            return;
-        }
-
-        if ($db->query('START TRANSACTION') === false) {
-            throw new RuntimeException('Unable to start customer-rule product migration');
-        }
-        try {
-            if ($db->query(
-                "INSERT IGNORE INTO customer_rule_product_migrations (migration_key, details_json)
-                 VALUES ('{$migrationKey}', '{\"status\":\"in_progress\"}')"
-            ) === false) {
-                throw new RuntimeException('Unable to claim customer-rule product migration');
-            }
-            if (self::affectedRows($db) === 0) {
-                $db->query('ROLLBACK');
-                return;
-            }
-
-            foreach (array_keys(self::RULES) as $attribute) {
-                $safeAttribute = self::escape($db, $attribute);
-                if ($db->query(
-                    "INSERT IGNORE INTO customer_rule_product_restrictions (attribute, version)
-                     VALUES ('{$safeAttribute}', 1)"
-                ) === false) {
-                    throw new RuntimeException("Unable to initialize restriction {$attribute}");
-                }
-            }
-
-            $counts = [];
-            $seededProductIds = [];
-            foreach (self::RULES as $attribute => $collectionName) {
-                $safeAttribute = self::escape($db, $attribute);
-                $safeName = self::escape($db, 'Legacy migration: ' . $collectionName);
-                if ($db->query(
-                    "INSERT INTO customer_rule_product_collections (attribute, name, sort_order)
-                     VALUES ('{$safeAttribute}', '{$safeName}', 0)"
-                ) === false) {
-                    throw new RuntimeException("Unable to create seed collection for {$attribute}");
-                }
-                $collectionId = (int)$db->insert_id();
-                if ($collectionId < 1) {
-                    throw new RuntimeException("Unable to create seed collection for {$attribute}");
-                }
-
-                $predicate = self::legacyPredicate($db, $attribute);
-                $activePredicate = self::columnExists($db, 'products', 'deleted_at')
-                    ? 'p.deleted_at IS NULL'
-                    : '1 = 1';
-                $insert = $db->query(
-                    "INSERT IGNORE INTO customer_rule_product_collection_products (collection_id, product_id)
-                     SELECT {$collectionId}, p.id
-                     FROM products p
-                     LEFT JOIN categories c ON c.id = p.category
-                     WHERE ({$activePredicate}) AND ({$predicate})"
-                );
-                if ($insert === false) {
-                    throw new RuntimeException("Unable to seed products for {$attribute}");
-                }
-                $counts[$attribute] = self::affectedRows($db);
-                $seeded = $db->query(
-                    "SELECT product_id FROM customer_rule_product_collection_products
-                     WHERE collection_id = {$collectionId} ORDER BY product_id"
-                );
-                $seededProductIds[$attribute] = [];
-                if ($seeded) {
-                    while ($row = $seeded->fetch_assoc()) {
-                        $seededProductIds[$attribute][] = (int)$row['product_id'];
-                    }
-                }
-            }
-
-            $details = self::escape($db, (string)json_encode([
-                'counts' => $counts,
-                'product_ids' => $seededProductIds,
-                'seeded_at' => gmdate(DATE_ATOM),
-            ], JSON_UNESCAPED_SLASHES));
-            if ($db->query(
-                "UPDATE customer_rule_product_migrations
-                 SET details_json = '{$details}', applied_at = NOW()
-                 WHERE migration_key = '{$migrationKey}'"
-            ) === false) {
-                throw new RuntimeException('Unable to record customer-rule product migration');
-            }
-            if ($db->query('COMMIT') === false) {
-                throw new RuntimeException('Unable to commit customer-rule product migration');
-            }
-        } catch (Throwable $throwable) {
-            $db->query('ROLLBACK');
-            throw $throwable;
-        }
-    }
-
-    private static function legacyPredicate(object $db, string $attribute): string
-    {
-        $text = "LOWER(CONCAT(COALESCE(p.name, ''), ' ', COALESCE(c.name, '')))";
-
-        return match ($attribute) {
-            'restrictAdditionalServices' => "p.category = 8 OR LOWER(COALESCE(c.name, '')) IN ('tillægsydelser', 'tillaegsydelser')" .
-                (self::tableExists($db, 'products_options') && self::columnExists($db, 'products_options', 'option_id')
-                    ? ' OR EXISTS (SELECT 1 FROM products_options po WHERE po.option_id = p.id)'
-                    : ''),
-            'restrictTankCleaning' => "p.category = 5 OR {$text} LIKE '%tank cleaning%' OR {$text} LIKE '%tankcleaning%' OR {$text} LIKE '%tankrens%' OR {$text} LIKE '%tank rens%'",
-            'restrictSpotFree' => "p.id IN (23, 24) OR {$text} LIKE '%spot free%' OR {$text} LIKE '%spotfree%' OR {$text} LIKE '%skylning med ro%'",
-            'restrictInteriorCleaning' => "{$text} LIKE '%interior%' OR {$text} LIKE '%indvendig%'",
-            'onlyTankCleaning' => "NOT (p.category = 5 OR {$text} LIKE '%tank cleaning%' OR {$text} LIKE '%tankcleaning%' OR {$text} LIKE '%tankrens%' OR {$text} LIKE '%tank rens%')",
-            default => '0 = 1',
-        };
-    }
-
-    private static function tableExists(object $db, string $table): bool
-    {
-        $safeTable = self::escape($db, $table);
-        $result = $db->query("SHOW TABLES LIKE '{$safeTable}'");
-        return $result && (int)$result->num_rows > 0;
-    }
-
-    private static function indexExists(object $db, string $table, string $index): bool
-    {
-        $safeTable = str_replace('`', '', $table);
-        $safeIndex = self::escape($db, $index);
-        $result = $db->query("SHOW INDEX FROM `{$safeTable}` WHERE Key_name = '{$safeIndex}'");
-        return $result && (int)$result->num_rows > 0;
-    }
-
-    private static function columnExists(object $db, string $table, string $column): bool
-    {
-        $safeTable = str_replace('`', '', $table);
-        $safeColumn = self::escape($db, $column);
-        $result = $db->query("SHOW COLUMNS FROM `{$safeTable}` LIKE '{$safeColumn}'");
-        return $result && (int)$result->num_rows > 0;
-    }
-
-    private static function escape(object $db, string $value): string
-    {
-        return method_exists($db, 'escape_string')
-            ? $db->escape_string($value)
-            : addslashes($value);
-    }
-
-    private static function affectedRows(object $db): int
-    {
-        if (method_exists($db, 'conn')) {
-            $connection = $db->conn();
-            return (int)($connection->affected_rows ?? 0);
-        }
-        return (int)($db->affected_rows ?? 0);
-    }
-}
@@ -1,508 +0,0 @@
-<?php
-
-namespace classes;
-
-use RuntimeException;
-use Throwable;
-
-class customer_rule_product_restriction_exception extends RuntimeException
-{
-    public function __construct(string $message, private readonly int $httpStatus = 422, string $code = 'INVALID_CUSTOMER_RULE_CONFIGURATION')
-    {
-        parent::__construct($message);
-        $this->restrictionCode = $code;
-    }
-
-    private string $restrictionCode;
-
-    public function httpStatus(): int
-    {
-        return $this->httpStatus;
-    }
-
-    public function restrictionCode(): string
-    {
-        return $this->restrictionCode;
-    }
-}
-
-/**
- * Source of truth for globally configured customer-rule product collections.
- */
-class customer_rule_product_restriction_service
-{
-    /** @var list<string> */
-    public const PRODUCT_IMPACT_ATTRIBUTES = [
-        'restrictAdditionalServices',
-        'restrictTankCleaning',
-        'restrictSpotFree',
-        'restrictInteriorCleaning',
-        'onlyTankCleaning',
-    ];
-
-    /** @var list<string> */
-    public const SUPPORTED_ATTRIBUTES = [
-        'restrictAdditionalServices',
-        'restrictTankCleaning',
-        'restrictSpotFree',
-        'restrictInteriorCleaning',
-        'onlyTankCleaning',
-        'requiresReferenceNumber',
-        'requiresRegistrationNumbersInvoice',
-        'invoiceAllOrdersIndividually',
-        'invoiceWithStripe',
-        'showPricesOnBookingPage',
-        'usePONumbers',
-        'exemptFromAdministrationFee',
-    ];
-
-    public function __construct()
-    {
-        customer_rule_product_restriction_schema_bootstrap::ensureSchema();
-    }
-
-    /** @return array{rules:list<array<string,mixed>>,products:list<array<string,mixed>>} */
-    public function listConfiguration(): array
-    {
-        return [
-            'rules' => array_map(fn(string $attribute): array => $this->ruleConfiguration($attribute), self::PRODUCT_IMPACT_ATTRIBUTES),
-            'products' => $this->productCatalog(),
-        ];
-    }
-
-    /** @return array<string,mixed> */
-    public function ruleConfiguration(string $attribute): array
-    {
-        $this->assertSupportedAttribute($attribute);
-        global $db;
-
-        $safeAttribute = $this->escape($attribute);
-        $versionResult = $db->query(
-            "SELECT version FROM customer_rule_product_restrictions WHERE attribute = '{$safeAttribute}' LIMIT 1"
-        );
-        if (!$versionResult || $versionResult->num_rows < 1) {
-            throw new RuntimeException("Unable to load customer-rule restriction version for {$attribute}");
-        }
-        $versionRow = $versionResult->fetch_assoc();
-
-        $result = $db->query(
-            "SELECT c.id AS collection_id, c.name, c.sort_order, cp.product_id
-             FROM customer_rule_product_collections c
-             LEFT JOIN customer_rule_product_collection_products cp ON cp.collection_id = c.id
-             WHERE c.attribute = '{$safeAttribute}'
-             ORDER BY c.sort_order ASC, c.id ASC, cp.product_id ASC"
-        );
-
-        if (!$result) {
-            throw new RuntimeException("Unable to load customer-rule restriction collections for {$attribute}");
-        }
-
-        $collections = [];
-        $disabled = [];
-        while ($row = $result->fetch_assoc()) {
-            $collectionId = (int)$row['collection_id'];
-            if (!isset($collections[$collectionId])) {
-                $collections[$collectionId] = [
-                    'id' => $collectionId,
-                    'name' => (string)$row['name'],
-                    'sort_order' => (int)$row['sort_order'],
-                    'product_ids' => [],
-                ];
-            }
-            if ($row['product_id'] !== null) {
-                $productId = (int)$row['product_id'];
-                $collections[$collectionId]['product_ids'][] = $productId;
-                $disabled[$productId] = true;
-            }
-        }
-
-        return [
-            'attribute' => $attribute,
-            'version' => max(1, (int)($versionRow['version'] ?? 1)),
-            'collections' => array_values($collections),
-            'disabled_product_ids' => array_map('intval', array_keys($disabled)),
-        ];
-    }
-
-    /**
-     * @param array<string,mixed> $payload
-     * @return array<string,mixed>
-     */
-    public function replaceRuleConfiguration(string $attribute, array $payload, int $actorUserId): array
-    {
-        $this->assertSupportedAttribute($attribute);
-        $expectedVersion = $this->positiveInt($payload['version'] ?? null, 'version');
-        $collections = $this->validateCollections($attribute, $payload['collections'] ?? null);
-
-        global $db;
-        $safeAttribute = $this->escape($attribute);
-        if ($db->query('START TRANSACTION') === false) {
-            throw new customer_rule_product_restriction_exception('Unable to start configuration transaction', 500, 'CUSTOMER_RULE_CONFIGURATION_SAVE_FAILED');
-        }
-        try {
-            $versionResult = $db->query(
-                "SELECT version FROM customer_rule_product_restrictions
-                 WHERE attribute = '{$safeAttribute}' FOR UPDATE"
-            );
-            if (!$versionResult || $versionResult->num_rows < 1) {
-                throw new customer_rule_product_restriction_exception('Customer rule configuration was not found', 404, 'CUSTOMER_RULE_CONFIGURATION_NOT_FOUND');
-            }
-            $versionRow = $versionResult->fetch_assoc();
-            $currentVersion = (int)$versionRow['version'];
-            if ($currentVersion !== $expectedVersion) {
-                throw new customer_rule_product_restriction_exception(
-                    'Customer rule configuration has changed; reload before saving',
-                    409,
-                    'CUSTOMER_RULE_CONFIGURATION_CONFLICT'
-                );
-            }
-
-            $old = $this->ruleConfiguration($attribute);
-            $existingIds = $this->existingCollectionIds($attribute);
-            foreach ($collections as $collection) {
-                if ($collection['id'] !== null && !isset($existingIds[$collection['id']])) {
-                    throw new customer_rule_product_restriction_exception('A collection does not belong to this customer rule');
-                }
-            }
-
-            // Avoid temporary unique-name collisions while two collections swap names.
-            foreach ($existingIds as $collectionId => $_) {
-                $temporaryName = $this->escape('__pending_' . $collectionId . '_' . bin2hex(random_bytes(6)));
-                if ($db->query(
-                    "UPDATE customer_rule_product_collections
-                     SET name = '{$temporaryName}'
-                     WHERE id = {$collectionId} AND attribute = '{$safeAttribute}'"
-                ) === false) {
-                    throw new customer_rule_product_restriction_exception('Unable to prepare collection update', 500, 'CUSTOMER_RULE_CONFIGURATION_SAVE_FAILED');
-                }
-            }
-
-            $keptIds = [];
-            foreach ($collections as $collection) {
-                $name = $this->escape($collection['name']);
-                $sortOrder = (int)$collection['sort_order'];
-                $collectionId = $collection['id'];
-                if ($collectionId === null) {
-                    if ($db->query(
-                        "INSERT INTO customer_rule_product_collections (attribute, name, sort_order)
-                         VALUES ('{$safeAttribute}', '{$name}', {$sortOrder})"
-                    ) === false) {
-                        throw new customer_rule_product_restriction_exception('Unable to create collection');
-                    }
-                    $collectionId = (int)$db->insert_id();
-                } else {
-                    if ($db->query(
-                        "UPDATE customer_rule_product_collections
-                         SET name = '{$name}', sort_order = {$sortOrder}
-                         WHERE id = {$collectionId} AND attribute = '{$safeAttribute}'"
-                    ) === false) {
-                        throw new customer_rule_product_restriction_exception('Unable to update collection');
-                    }
-                }
-
-                $keptIds[$collectionId] = true;
-                if ($db->query("DELETE FROM customer_rule_product_collection_products WHERE collection_id = {$collectionId}") === false) {
-                    throw new customer_rule_product_restriction_exception('Unable to replace collection products', 500, 'CUSTOMER_RULE_CONFIGURATION_SAVE_FAILED');
-                }
-                foreach ($collection['product_ids'] as $productId) {
-                    if ($db->query(
-                        "INSERT INTO customer_rule_product_collection_products (collection_id, product_id)
-                         VALUES ({$collectionId}, {$productId})"
-                    ) === false) {
-                        throw new customer_rule_product_restriction_exception('Unable to save collection products');
-                    }
-                }
-            }
-
-            $removeIds = array_values(array_diff(array_keys($existingIds), array_keys($keptIds)));
-            if ($removeIds !== []) {
-                if ($db->query(
-                    'DELETE FROM customer_rule_product_collections WHERE attribute = \'' . $safeAttribute . '\' AND id IN (' .
-                    implode(',', array_map('intval', $removeIds)) . ')'
-                ) === false) {
-                    throw new customer_rule_product_restriction_exception('Unable to remove collections', 500, 'CUSTOMER_RULE_CONFIGURATION_SAVE_FAILED');
-                }
-            }
-
-            $newVersion = $currentVersion + 1;
-            if ($db->query(
-                "UPDATE customer_rule_product_restrictions
-                 SET version = {$newVersion}, updated_at = NOW()
-                 WHERE attribute = '{$safeAttribute}'"
-            ) === false) {
-                throw new customer_rule_product_restriction_exception('Unable to update configuration version', 500, 'CUSTOMER_RULE_CONFIGURATION_SAVE_FAILED');
-            }
-            $new = $this->ruleConfiguration($attribute);
-            $changes = $this->escape((string)json_encode([
-                'before' => $old,
-                'after' => $new,
-            ], JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
-            if ($db->query(
-                "INSERT INTO customer_rule_product_audit_logs
-                    (actor_user_id, attribute, old_version, new_version, changes_json)
-                 VALUES ({$actorUserId}, '{$safeAttribute}', {$currentVersion}, {$newVersion}, '{$changes}')"
-            ) === false) {
-                throw new customer_rule_product_restriction_exception('Unable to audit configuration update', 500, 'CUSTOMER_RULE_CONFIGURATION_SAVE_FAILED');
-            }
-            if ($db->query('COMMIT') === false) {
-                throw new customer_rule_product_restriction_exception('Unable to commit configuration update', 500, 'CUSTOMER_RULE_CONFIGURATION_SAVE_FAILED');
-            }
-            return $new;
-        } catch (Throwable $throwable) {
-            $db->query('ROLLBACK');
-            throw $throwable;
-        }
-    }
-
-    /**
-     * Return configured product restrictions for all active product-impact
-     * attributes belonging to any account with the customer number.
-     *
-     * @return list<array<string,mixed>>
-     */
-    public function restrictionsForCustomerNumber(int $customerNumber): array
-    {
-        if ($customerNumber < 1) {
-            return [];
-        }
-
-        global $db;
-        $result = $db->query(
-            "SELECT DISTINCT ca.attribute
-             FROM users u
-             INNER JOIN customer_attributes ca ON ca.user_id = u.id
-             WHERE u.customer_number = {$customerNumber}"
-        );
-        if (!$result) {
-            throw new RuntimeException('Unable to load active customer-rule product restrictions');
-        }
-        $activeAttributes = [];
-        while ($row = $result->fetch_assoc()) {
-            $attribute = (string)$row['attribute'];
-            if (in_array($attribute, self::PRODUCT_IMPACT_ATTRIBUTES, true)) {
-                $activeAttributes[$attribute] = true;
-            }
-        }
-
-        $active = [];
-        foreach (self::PRODUCT_IMPACT_ATTRIBUTES as $attribute) {
-            if (isset($activeAttributes[$attribute])) {
-                $active[] = $this->ruleConfiguration($attribute);
-            }
-        }
-        return $active;
-    }
-
-    /** @return array{rules:list<string>,collections:list<int>,message:string,code:string,product_id:int}|null */
-    public function violationForCustomerProduct(int $customerNumber, int $productId): ?array
-    {
-        if ($productId < 1) {
-            return null;
-        }
-        $rules = [];
-        $collections = [];
-        foreach ($this->restrictionsForCustomerNumber($customerNumber) as $restriction) {
-            if (!in_array($productId, $restriction['disabled_product_ids'], true)) {
-                continue;
-            }
-            $rules[] = (string)$restriction['attribute'];
-            foreach ($restriction['collections'] as $collection) {
-                if (in_array($productId, $collection['product_ids'], true)) {
-                    $collections[] = (int)$collection['id'];
-                }
-            }
-        }
-        if ($rules === []) {
-            return null;
-        }
-        return [
-            'code' => 'CUSTOMER_RULE_PRODUCT_RESTRICTED',
-            'message' => customer_product_rule_service::BLOCK_MESSAGE,
-            'product_id' => $productId,
-            'rules' => array_values(array_unique($rules)),
-            'collections' => array_values(array_unique($collections)),
-        ];
-    }
-
-    /**
-     * @param list<array<string,mixed>> $attributes
-     * @return list<array<string,mixed>>
-     */
-    public function enrichAttributes(int $customerNumber, array $attributes): array
-    {
-        $restrictions = [];
-        foreach ($this->restrictionsForCustomerNumber($customerNumber) as $restriction) {
-            $restrictions[(string)$restriction['attribute']] = [
-                'attribute' => (string)$restriction['attribute'],
-                'version' => (int)$restriction['version'],
-                'collections' => $restriction['collections'],
-                'disabled_product_ids' => $restriction['disabled_product_ids'],
-            ];
-        }
-
-        foreach ($attributes as &$attribute) {
-            $key = (string)($attribute['attribute'] ?? '');
-            $attribute['product_restriction'] = $restrictions[$key] ?? null;
-        }
-        unset($attribute);
-        return $attributes;
-    }
-
-    /** @return list<array<string,mixed>> */
-    private function productCatalog(): array
-    {
-        global $db;
-        $activeExpression = $this->columnExists('products', 'deleted_at')
-            ? 'CASE WHEN p.deleted_at IS NULL THEN 1 ELSE 0 END'
-            : '1';
-        $result = $db->query(
-            "SELECT p.id, p.name, p.category AS category_id, c.name AS category_name,
-                    {$activeExpression} AS active
-             FROM products p
-             LEFT JOIN categories c ON c.id = p.category
-             ORDER BY c.name ASC, p.name ASC, p.id ASC"
-        );
-        if (!$result) {
-            throw new RuntimeException('Unable to load the customer-rule product catalog');
-        }
-        $products = [];
-        while ($row = $result->fetch_assoc()) {
-            $products[] = [
-                'id' => (int)$row['id'],
-                'name' => (string)$row['name'],
-                'category_id' => (int)$row['category_id'],
-                'category_name' => (string)($row['category_name'] ?? ''),
-                'active' => (bool)$row['active'],
-            ];
-        }
-        return $products;
-    }
-
-    /**
-     * @return array<int,true>
-     */
-    private function existingCollectionIds(string $attribute): array
-    {
-        global $db;
-        $safeAttribute = $this->escape($attribute);
-        $result = $db->query("SELECT id FROM customer_rule_product_collections WHERE attribute = '{$safeAttribute}'");
-        if (!$result) {
-            throw new RuntimeException("Unable to load existing collections for {$attribute}");
-        }
-        $ids = [];
-        while ($row = $result->fetch_assoc()) {
-            $ids[(int)$row['id']] = true;
-        }
-        return $ids;
-    }
-
-    /** @return list<array{id: ?int, name: string, sort_order: int, product_ids: list<int>}> */
-    private function validateCollections(string $attribute, mixed $value): array
-    {
-        if (!is_array($value)) {
-            throw new customer_rule_product_restriction_exception('collections must be an array');
-        }
-        $normalized = [];
-        $names = [];
-        $collectionIds = [];
-        $allProductIds = [];
-        foreach (array_values($value) as $index => $collection) {
-            if (!is_array($collection)) {
-                throw new customer_rule_product_restriction_exception("Collection {$index} must be an object");
-            }
-            $name = trim((string)($collection['name'] ?? ''));
-            if ($name === '' || mb_strlen($name) > 191) {
-                throw new customer_rule_product_restriction_exception('Collection names must be between 1 and 191 characters');
-            }
-            $nameKey = mb_strtolower($name);
-            if (isset($names[$nameKey])) {
-                throw new customer_rule_product_restriction_exception('Collection names must be unique within a rule');
-            }
-            $names[$nameKey] = true;
-            if (!isset($collection['product_ids']) || !is_array($collection['product_ids'])) {
-                throw new customer_rule_product_restriction_exception('product_ids must be an array');
-            }
-            $productIds = [];
-            foreach ($collection['product_ids'] as $productId) {
-                $id = $this->positiveInt($productId, 'product_id');
-                $productIds[$id] = true;
-                $allProductIds[$id] = true;
-            }
-            $id = isset($collection['id']) && $collection['id'] !== null
-                ? $this->positiveInt($collection['id'], 'collection id')
-                : null;
-            if ($id !== null && isset($collectionIds[$id])) {
-                throw new customer_rule_product_restriction_exception('Collection IDs must be unique within a rule');
-            }
-            if ($id !== null) {
-                $collectionIds[$id] = true;
-            }
-            $normalized[] = [
-                'id' => $id,
-                'name' => $name,
-                'sort_order' => isset($collection['sort_order']) && is_numeric($collection['sort_order'])
-                    ? (int)$collection['sort_order']
-                    : $index,
-                'product_ids' => array_map('intval', array_keys($productIds)),
-            ];
-        }
-
-        $this->assertProductsExist(array_map('intval', array_keys($allProductIds)));
-        return $normalized;
-    }
-
-    /** @param list<int> $productIds */
-    private function assertProductsExist(array $productIds): void
-    {
-        if ($productIds === []) {
-            return;
-        }
-        global $db;
-        $result = $db->query('SELECT id FROM products WHERE id IN (' . implode(',', $productIds) . ')');
-        if (!$result) {
-            throw new customer_rule_product_restriction_exception(
-                'Unable to validate collection products',
-                500,
-                'CUSTOMER_RULE_CONFIGURATION_SAVE_FAILED'
-            );
-        }
-        $found = [];
-        while ($row = $result->fetch_assoc()) {
-            $found[(int)$row['id']] = true;
-        }
-        $missing = array_values(array_diff($productIds, array_keys($found)));
-        if ($missing !== []) {
-            throw new customer_rule_product_restriction_exception('Unknown product IDs: ' . implode(', ', $missing));
-        }
-    }
-
-    private function assertSupportedAttribute(string $attribute): void
-    {
-        if (!in_array($attribute, self::PRODUCT_IMPACT_ATTRIBUTES, true)) {
-            throw new customer_rule_product_restriction_exception('Unsupported product-impact customer rule');
-        }
-    }
-
-    private function positiveInt(mixed $value, string $field): int
-    {
-        if (!is_numeric($value) || (int)$value < 1 || (string)(int)$value !== trim((string)$value)) {
-            throw new customer_rule_product_restriction_exception("{$field} must be a positive integer");
-        }
-        return (int)$value;
-    }
-
-    private function escape(string $value): string
-    {
-        global $db;
-        return method_exists($db, 'escape_string') ? $db->escape_string($value) : addslashes($value);
-    }
-
-    private function columnExists(string $table, string $column): bool
-    {
-        global $db;
-        $safeTable = str_replace('`', '', $table);
-        $safeColumn = $this->escape($column);
-        $result = $db->query("SHOW COLUMNS FROM `{$safeTable}` LIKE '{$safeColumn}'");
-        return $result && (int)$result->num_rows > 0;
-    }
-}
@@ -177,19 +177,15 @@ class db
        return $this->database;
    }

-    public function getPort(): int
-    {
-        return $this->port;
-    }
-
-    public function getSslMode(): string
-    {
-        return $this->ssl_mode;
-    }
-
    public function backupDatabase(string $path): bool
    {
+        // Save the database to the path
+        // Build a safe mysqldump command with configurable SSL (MariaDB-compatible flags)
        $mode = strtoupper(trim($this->ssl_mode));
+        // Map ssl_mode to MariaDB client flags
+        // DISABLED => --skip-ssl (no TLS)
+        // PREFERRED => (no flag; client decides)
+        // REQUIRED/VERIFY_* => --ssl (enable TLS without strict verification unless CA materials provided)
        $sslFlag = '';
        switch ($mode) {
            case 'DISABLED':
@@ -205,42 +201,17 @@ class db
                $sslFlag = '--ssl';
                break;
        }
-
        $host = escapeshellarg($this->host);
        $user = escapeshellarg($this->user);
+        $pass = escapeshellarg($this->password);
        $db   = escapeshellarg($this->database);
        $port = (int)$this->port;
+        $outfile = escapeshellarg($path);
        $sslPart = $sslFlag !== '' ? ($sslFlag . ' ') : '';
-        $command = "mysqldump {$sslPart}--single-transaction --quick --routines --triggers --events --hex-blob -h $host -P $port -u $user $db";
-
-        $directory = dirname($path);
-        if (!is_dir($directory) && !mkdir($directory, 0770, true) && !is_dir($directory)) {
-            return false;
-        }
-
-        $environment = array_merge(getenv() ?: [], $_ENV);
-        $environment['MYSQL_PWD'] = $this->password;
-        $descriptors = [
-            0 => ['pipe', 'r'],
-            1 => ['file', $path, 'w'],
-            2 => ['pipe', 'w'],
-        ];
-
-        $process = proc_open($command, $descriptors, $pipes, null, $environment);
-        if (!is_resource($process)) {
-            return false;
-        }
-
-        fclose($pipes[0]);
-        $stderr = stream_get_contents($pipes[2]);
-        fclose($pipes[2]);
-        $return = proc_close($process);
-
-        if ($return !== 0 && is_string($stderr) && $stderr !== '') {
-            @file_put_contents($path . '.error.log', $stderr);
-        }
-
-        return $return === 0 && is_file($path) && filesize($path) !== false;
+        $command = "mysqldump {$sslPart}-h $host -P $port -u $user --password=$pass $db > $outfile 2>&1";
+        exec($command, $output, $return);
+        // Check if the command was successful
+        return $return === 0;
    }

    public function getView(string $view): array
@@ -267,4 +238,4 @@ class db
    }


-}
+}
@@ -1,44 +0,0 @@
-<?php
-
-namespace classes;
-
-/**
- * Ensures additive schema for department-scoped customer price overrides.
- */
-class department_customer_price_overrides_schema_bootstrap
-{
-    private static bool $initialized = false;
-
-    public static function ensureTables(): void
-    {
-        if (self::$initialized) {
-            return;
-        }
-
-        global $db;
-
-        if (!isset($db) || !is_object($db) || !method_exists($db, 'query')) {
-            return;
-        }
-
-        $db->query(
-            "CREATE TABLE IF NOT EXISTS `department_customer_price_overrides` (
-                `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
-                `department_id` INT NOT NULL,
-                `user_id` INT NOT NULL,
-                `is_category` TINYINT(1) NOT NULL DEFAULT 0,
-                `product_or_category_id` VARCHAR(191) NOT NULL,
-                `percentage` INT NOT NULL DEFAULT 0,
-                `fixed_price` INT NULL DEFAULT NULL,
-                `created_at` DATETIME NULL DEFAULT CURRENT_TIMESTAMP,
-                `updated_at` DATETIME NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-                PRIMARY KEY (`id`),
-                UNIQUE KEY `uniq_department_customer_price_overrides_lookup` (`department_id`, `user_id`, `is_category`, `product_or_category_id`),
-                KEY `idx_department_customer_price_overrides_department` (`department_id`),
-                KEY `idx_department_customer_price_overrides_user` (`user_id`)
-            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci"
-        );
-
-        self::$initialized = true;
-    }
-}
@@ -1,458 +0,0 @@
-<?php
-
-namespace classes;
-
-use objects\department_customer_price_overrides_o;
-use objects\departments_o;
-use objects\products_o;
-use objects\users_o;
-
-class department_customer_pricing_service
-{
-    /**
-     * @return array<string, mixed>
-     */
-    public function getPricing(int $departmentId, int $userId): array
-    {
-        $department = $this->department($departmentId);
-        $customer = $this->customer($userId);
-        $this->assertEnabled($department);
-
-        $overrides = (new department_customer_price_overrides_o())->getAllPrices($departmentId, $userId);
-
-        return [
-            'department' => $department,
-            'customer' => $customer,
-            'overrides' => $overrides,
-            'categories' => $this->catalog($departmentId, $customer['id']),
-            'revision' => $this->revision($overrides),
-        ];
-    }
-
-    /**
-     * @param array<string, mixed> $payload
-     * @return array<string, mixed>
-     */
-    public function updatePricing(int $departmentId, int $userId, array $payload): array
-    {
-        $department = $this->department($departmentId);
-        $customer = $this->customer($userId);
-        $this->assertEnabled($department);
-
-        if (array_key_exists('department_id', $payload) && (int)$payload['department_id'] !== $departmentId) {
-            throw new limited_backoffice_exception('Department ID in body does not match the route.', 400);
-        }
-        if (array_key_exists('user_id', $payload) && (int)$payload['user_id'] !== $userId) {
-            throw new limited_backoffice_exception('User ID in body does not match the route.', 400);
-        }
-
-        $overrides = $payload['overrides'] ?? null;
-        if (!is_array($overrides)) {
-            throw new limited_backoffice_exception('Overrides are required.', 400);
-        }
-
-        $normalized = $this->normalizeOverrides($departmentId, $overrides);
-        $overrideObject = new department_customer_price_overrides_o();
-        $expectedRevision = $this->normalizeExpectedRevision($payload['expected_revision'] ?? null);
-        $existingOverrides = [];
-        $normalizedKeys = [];
-        foreach ($normalized as $override) {
-            $normalizedKeys[$this->overrideKey((bool)$override['is_category'], $override['product_or_category_id'])] = true;
-        }
-
-        global $db;
-        $mysqli = $db->conn();
-        $mysqli->begin_transaction();
-        try {
-            $this->lockDepartment($departmentId);
-            $existingOverrides = $overrideObject->getAllPrices($departmentId, $customer['id']);
-            $currentRevision = $this->revision($existingOverrides);
-            if ($expectedRevision !== null && !hash_equals($currentRevision, $expectedRevision)) {
-                throw $this->revisionConflict($currentRevision);
-            }
-
-            $deleteStatement = $mysqli->prepare(
-                'DELETE FROM `department_customer_price_overrides` WHERE `department_id` = ? AND `user_id` = ?'
-            );
-            $insertStatement = $mysqli->prepare(
-                'INSERT INTO `department_customer_price_overrides`
-                    (`department_id`, `user_id`, `is_category`, `product_or_category_id`, `percentage`, `fixed_price`)
-                 VALUES (?, ?, ?, ?, ?, ?)'
-            );
-            if ($deleteStatement === false || $insertStatement === false) {
-                throw new \RuntimeException('Unable to prepare department customer pricing update.');
-            }
-
-            $customerId = (int)$customer['id'];
-            $deleteStatement->bind_param('ii', $departmentId, $customerId);
-            if (!$deleteStatement->execute()) {
-                throw new \RuntimeException('Unable to clear department customer pricing.');
-            }
-
-            foreach ($normalized as $override) {
-                $isCategory = (int)(bool)$override['is_category'];
-                $objectId = (string)$override['product_or_category_id'];
-                $percentage = (int)$override['percentage'];
-                $fixedPrice = $override['fixed_price'] === null ? null : (int)$override['fixed_price'];
-                $insertStatement->bind_param(
-                    'iiisii',
-                    $departmentId,
-                    $customerId,
-                    $isCategory,
-                    $objectId,
-                    $percentage,
-                    $fixedPrice
-                );
-                if (!$insertStatement->execute()) {
-                    throw new \RuntimeException('Unable to save department customer pricing.');
-                }
-            }
-
-            $deleteStatement->close();
-            $insertStatement->close();
-            $mysqli->commit();
-        } catch (limited_backoffice_exception $exception) {
-            $mysqli->rollback();
-            throw $exception;
-        } catch (\Throwable) {
-            $mysqli->rollback();
-            throw new limited_backoffice_exception('Unable to update department customer pricing.', 500);
-        }
-
-        foreach ($normalized as $override) {
-            $this->recordVersion($customer, $departmentId, $override);
-        }
-
-        foreach ($existingOverrides as $existingOverride) {
-            $key = $this->overrideKey((bool)$existingOverride['is_category'], $existingOverride['product_or_category_id']);
-            if (isset($normalizedKeys[$key])) {
-                continue;
-            }
-
-            $this->recordVersion($customer, $departmentId, [
-                'is_category' => (bool)$existingOverride['is_category'],
-                'product_or_category_id' => $existingOverride['product_or_category_id'],
-                'percentage' => 0,
-                'fixed_price' => null,
-            ]);
-        }
-
-        return $this->getPricing($departmentId, $customer['id']);
-    }
-
-    /**
-     * @return array{id:int,name:string,description:string,custom_pricing_only:bool}
-     */
-    private function department(int $departmentId): array
-    {
-        $department = (new departments_o())->getDepartmentById($departmentId);
-        if (!is_array($department) || empty($department)) {
-            throw new limited_backoffice_exception('Department not found', 404);
-        }
-
-        return [
-            'id' => (int)$department['id'],
-            'name' => (string)$department['name'],
-            'description' => (string)($department['description'] ?? ''),
-            'custom_pricing_only' => (bool)(int)($department['custom_pricing_only'] ?? 0),
-        ];
-    }
-
-    /**
-     * @return array{id:int,customer_number:int,display_name:string}
-     */
-    private function customer(int $userId): array
-    {
-        $customer = (new users_o())->getUserById($userId);
-        if (!$customer->exists()) {
-            throw new limited_backoffice_exception('Customer not found', 404);
-        }
-
-        return [
-            'id' => (int)$customer->id,
-            'customer_number' => (int)$customer->customer_number->value(),
-            'display_name' => (string)($customer->display_name->value() ?: ('Customer #' . $customer->customer_number->value())),
-        ];
-    }
-
-    /**
-     * @param array<string, mixed> $department
-     */
-    private function assertEnabled(array $department): void
-    {
-        if (!($department['custom_pricing_only'] ?? false)) {
-            throw new limited_backoffice_exception('Department customer pricing is disabled.', 409, [
-                'message' => 'Department customer pricing is disabled.',
-                'code' => 'department_customer_pricing_disabled',
-                'department' => $department,
-            ]);
-        }
-    }
-
-    /**
-     * @return array<int, array<string, mixed>>
-     */
-    private function catalog(int $departmentId, int $userId): array
-    {
-        global $db;
-
-        $sql = "
-            SELECT
-                c.`id` AS `category_id`,
-                c.`name` AS `category_name`,
-                c.`description` AS `category_description`,
-                p.*,
-                pdp.`price` AS `department_price`
-            FROM `department_categories` dc
-            INNER JOIN `categories` c ON c.`id` = dc.`category_id`
-            INNER JOIN `products` p ON p.`category` = dc.`category_id`
-            LEFT JOIN `product_department_prices` pdp
-                ON pdp.`department_id` = dc.`department_id`
-               AND pdp.`product_id` = p.`id`
-            WHERE dc.`department_id` = " . (int)$departmentId . "
-              AND dc.`deleted_at` IS NULL
-            ORDER BY c.`name` ASC, c.`id` ASC, p.`order_priority` ASC, p.`name` ASC, p.`id` ASC";
-
-        $result = $db->query($sql);
-        $rows = $result ? $db->fetch_all($result) : [];
-        $customer = (new users_o())->getUserById($userId);
-        $categories = [];
-        $seen = [];
-
-        foreach ($rows as $row) {
-            $productId = (int)$row['id'];
-            if (isset($seen[$productId])) {
-                continue;
-            }
-            $seen[$productId] = true;
-
-            $categoryId = (int)$row['category_id'];
-            if (!isset($categories[$categoryId])) {
-                $categories[$categoryId] = [
-                    'id' => $categoryId,
-                    'name' => (string)$row['category_name'],
-                    'description' => (string)($row['category_description'] ?? ''),
-                    'products' => [],
-                ];
-            }
-
-            $departmentPrice = $row['department_price'] === null ? null : (int)$row['department_price'];
-            $effectivePrice = products_o::CUSTOM_PRICING_MISSING_PRICE;
-            if ($departmentPrice !== null) {
-                $effectivePrice = $customer->applyProductCustomerPricing($productId, $departmentPrice, true, $departmentId);
-            }
-
-            $categories[$categoryId]['products'][] = [
-                'id' => $productId,
-                'name' => (string)$row['name'],
-                'description' => (string)($row['description'] ?? ''),
-                'category' => $categoryId,
-                'apply_category_discount' => (bool)$row['apply_category_discount'],
-                'base_price' => (int)$row['price'],
-                'department_price' => $departmentPrice,
-                'effective_price' => $effectivePrice,
-                'missing_department_price' => $departmentPrice === null,
-            ];
-        }
-
-        return array_values($categories);
-    }
-
-    /**
-     * @param array<int, mixed> $overrides
-     * @return array<int, array{is_category:bool,product_or_category_id:int|string,percentage:int,fixed_price:int|null}>
-     */
-    private function normalizeOverrides(int $departmentId, array $overrides): array
-    {
-        $normalized = [];
-        foreach ($overrides as $override) {
-            if (!is_array($override)) {
-                throw new limited_backoffice_exception('Invalid override payload.', 400);
-            }
-
-            $isCategory = (bool)($override['is_category'] ?? false);
-            $objectId = $override['product_or_category_id'] ?? $override['object_id'] ?? null;
-            if ($objectId === null || $objectId === '') {
-                throw new limited_backoffice_exception('Override object is required.', 400);
-            }
-
-            $percentage = filter_var($override['discount'] ?? $override['percentage'] ?? 0, FILTER_VALIDATE_INT);
-            if ($percentage === false || $percentage < 0 || $percentage > 100) {
-                throw new limited_backoffice_exception('Discount must be between 0 and 100.', 400);
-            }
-
-            $fixedPrice = null;
-            if (array_key_exists('fixed_price', $override) && $override['fixed_price'] !== null && $override['fixed_price'] !== '') {
-                $fixedPrice = filter_var($override['fixed_price'], FILTER_VALIDATE_INT);
-                if ($fixedPrice === false || $fixedPrice < 0) {
-                    throw new limited_backoffice_exception('Fixed price must be zero or more.', 400);
-                }
-            }
-
-            if ($isCategory) {
-                if ($fixedPrice !== null) {
-                    throw new limited_backoffice_exception('Fixed prices can only be assigned to products.', 400);
-                }
-                $fixedPrice = null;
-                $objectId = (string)$objectId;
-                if ($objectId !== 'global') {
-                    $this->assertDepartmentCategory($departmentId, $objectId);
-                }
-            } else {
-                $objectId = (int)$objectId;
-                $this->assertDepartmentProduct($departmentId, $objectId);
-            }
-
-            if ($percentage <= 0 && $fixedPrice === null) {
-                continue;
-            }
-
-            $key = $this->overrideKey($isCategory, $objectId);
-            if (isset($normalized[$key])) {
-                throw new limited_backoffice_exception('Duplicate customer price overrides are not allowed.', 400);
-            }
-
-            if ($fixedPrice !== null && $percentage > 0) {
-                throw new limited_backoffice_exception('Choose either a discount or a fixed price.', 400);
-            }
-
-            $normalized[$key] = [
-                'is_category' => $isCategory,
-                'product_or_category_id' => $objectId,
-                'percentage' => (int)$percentage,
-                'fixed_price' => $fixedPrice === null ? null : (int)$fixedPrice,
-            ];
-        }
-
-        return array_values($normalized);
-    }
-
-    /**
-     * @param array{id:int,customer_number:int,display_name:string} $customer
-     * @param array{is_category:bool,product_or_category_id:int|string,percentage:int,fixed_price:int|null} $override
-     */
-    private function recordVersion(array $customer, int $departmentId, array $override): void
-    {
-        try {
-            (new economic_v2_versioning_service())->recordDiscountOverrideVersion(
-                (int)$customer['id'],
-                (int)$customer['customer_number'],
-                (bool)$override['is_category'],
-                (string)$override['product_or_category_id'],
-                (int)$override['percentage'],
-                date('Y-m-d H:i:s'),
-                'live.department_discount_override.route',
-                1.0,
-                false,
-                [
-                    'route' => 'department_customer_pricing',
-                    'department_id' => $departmentId,
-                ],
-                $override['fixed_price'],
-                $departmentId
-            );
-        } catch (\Throwable) {
-        }
-    }
-
-    private function overrideKey(bool $isCategory, int|string $objectId): string
-    {
-        return ((int)$isCategory) . ':' . (string)$objectId;
-    }
-
-    /**
-     * @param array<int, array<string, mixed>> $overrides
-     */
-    private function revision(array $overrides): string
-    {
-        $revisionRows = array_map(static fn(array $override): array => [
-            'is_category' => (bool)$override['is_category'],
-            'product_or_category_id' => (string)$override['product_or_category_id'],
-            'percentage' => (int)$override['percentage'],
-            'fixed_price' => $override['fixed_price'] === null ? null : (int)$override['fixed_price'],
-        ], $overrides);
-
-        usort($revisionRows, static function (array $left, array $right): int {
-            return [$left['is_category'] ? 0 : 1, $left['product_or_category_id']]
-                <=> [$right['is_category'] ? 0 : 1, $right['product_or_category_id']];
-        });
-
-        return hash('sha256', json_encode($revisionRows, JSON_THROW_ON_ERROR));
-    }
-
-    private function normalizeExpectedRevision(mixed $value): ?string
-    {
-        if ($value === null || $value === '') {
-            // Keep the backend-first rollout compatible with the currently deployed UI.
-            return null;
-        }
-
-        if (!is_string($value) || preg_match('/^[a-f0-9]{64}$/', $value) !== 1) {
-            throw new limited_backoffice_exception('Expected revision is invalid.', 400, [
-                'message' => 'Expected revision is invalid.',
-                'code' => 'pricing_revision_invalid',
-            ]);
-        }
-
-        return $value;
-    }
-
-    private function lockDepartment(int $departmentId): void
-    {
-        global $db;
-
-        $result = $db->query(
-            'SELECT `id` FROM `departments` WHERE `id` = ' . (int)$departmentId . ' FOR UPDATE'
-        );
-        if (!$result || $result->num_rows < 1) {
-            throw new limited_backoffice_exception('Department not found', 404);
-        }
-    }
-
-    private function revisionConflict(string $currentRevision): limited_backoffice_exception
-    {
-        return new limited_backoffice_exception('Pricing has changed. Reload and try again.', 409, [
-            'message' => 'Pricing has changed. Reload and try again.',
-            'code' => 'pricing_revision_conflict',
-            'current_revision' => $currentRevision,
-        ]);
-    }
-
-    private function assertDepartmentProduct(int $departmentId, int $productId): void
-    {
-        global $db;
-
-        $result = $db->query(
-            'SELECT p.`id`
-             FROM `department_categories` dc
-             INNER JOIN `products` p ON p.`category` = dc.`category_id`
-             WHERE dc.`department_id` = ' . (int)$departmentId . '
-               AND dc.`deleted_at` IS NULL
-               AND p.`id` = ' . (int)$productId . '
-             LIMIT 1'
-        );
-
-        if (!$result || $result->num_rows < 1) {
-            throw new limited_backoffice_exception('Product is not available for this department.', 400);
-        }
-    }
-
-    private function assertDepartmentCategory(int $departmentId, string $categoryId): void
-    {
-        global $db;
-
-        $categoryId = $db->escape_string($categoryId);
-        $result = $db->query(
-            "SELECT `id`
-             FROM `department_categories`
-             WHERE `department_id` = " . (int)$departmentId . "
-               AND `deleted_at` IS NULL
-               AND `category_id` = '{$categoryId}'
-             LIMIT 1"
-        );
-
-        if (!$result || $result->num_rows < 1) {
-            throw new limited_backoffice_exception('Category is not available for this department.', 400);
-        }
-    }
-}
@@ -302,10 +302,10 @@ class department_outside_hours_statistics_service
     * @param array<int,array<string,mixed>> $opening_hours_by_department_id
     * @param array<string,array<int,bool>>|null $missing_lookup_by_day
     * @return array{
-     *   counted: bool,
-     *   reason: string,
-     *   candidate_date: ?string,
-     *   department_id: int
+     *   counted:bool,
+     *   reason:string,
+     *   candidate_date:?string,
+     *   department_id:int
     * }
     */
    public function classifyCandidateAgainstOpeningHours(
@@ -1,252 +0,0 @@
-<?php
-
-namespace classes;
-
-require_once WD . '/classes/selfserve_schema_bootstrap.php';
-
-use Exception;
-
-class department_wash_count_service
-{
-    /**
-     * @throws Exception
-     */
-    public function countInDateRange(string $date_start, string $date_end, int $department_id): int
-    {
-        $rows = $this->countByHourForDepartments($date_start, $date_end, [$department_id]);
-        $total = 0;
-
-        foreach ($rows as $row) {
-            $total += (int)($row['wash_count'] ?? 0);
-        }
-
-        return $total;
-    }
-
-    /**
-     * @param array<int|string> $department_ids
-     * @return array<int,array{department_id:int,hour_bucket:string,wash_count:int}>
-     * @throws Exception
-     */
-    public function countByHourForDepartments(string $date_start, string $date_end, array $department_ids): array
-    {
-        global $db;
-
-        $this->validateDateRange($date_start, $date_end);
-        $normalized_department_ids = $this->normalizeIds($department_ids);
-        if ($normalized_department_ids === []) {
-            return [];
-        }
-
-        selfserve_schema_bootstrap::ensureTables();
-
-        $department_ids_sql = implode(',', $normalized_department_ids);
-        $escaped_start = $db->escape_string($date_start);
-        $escaped_end = $db->escape_string($date_end);
-        $candidate_sql = $this->candidateUnionSql($department_ids_sql, $escaped_start, $escaped_end);
-
-        $sql = "SELECT deduped.department_id,
-                       DATE_FORMAT(deduped.counted_at, '%Y-%m-%d %H:00:00') AS hour_bucket,
-                       COUNT(*) AS wash_count
-                FROM (
-                    SELECT dedupe_key,
-                           department_id,
-                           MIN(counted_at) AS counted_at
-                    FROM ($candidate_sql) candidates
-                    GROUP BY dedupe_key, department_id
-                ) deduped
-                GROUP BY deduped.department_id, DATE_FORMAT(deduped.counted_at, '%Y-%m-%d %H:00:00')
-                ORDER BY deduped.department_id ASC, hour_bucket ASC";
-
-        $result = $db->query($sql);
-        if (!is_object($result) || $result->num_rows === 0) {
-            return [];
-        }
-
-        $rows = [];
-        while ($row = $result->fetch_assoc()) {
-            $rows[] = [
-                'department_id' => (int)($row['department_id'] ?? 0),
-                'hour_bucket' => (string)($row['hour_bucket'] ?? ''),
-                'wash_count' => (int)($row['wash_count'] ?? 0),
-            ];
-        }
-
-        return $rows;
-    }
-
-    /**
-     * @param array<int|string> $department_ids
-     * @return array{quantity:int,products:int,earnings:int,washes:int}
-     * @throws Exception
-     */
-    public function transactionSummary(string $date_start, string $date_end, array $department_ids): array
-    {
-        global $db;
-
-        $this->validateDateRange($date_start, $date_end);
-        $normalized_department_ids = $this->normalizeIds($department_ids);
-        if ($normalized_department_ids === []) {
-            return [
-                'quantity' => 0,
-                'products' => 0,
-                'earnings' => 0,
-                'washes' => 0,
-            ];
-        }
-
-        $department_ids_sql = implode(',', $normalized_department_ids);
-        $escaped_start = $db->escape_string($date_start);
-        $escaped_end = $db->escape_string($date_end);
-
-        $sql = "SELECT COUNT(DISTINCT o.id) AS quantity,
-                       COALESCE(SUM(oi.quantity), 0) AS products,
-                       COALESCE(SUM(oi.price * oi.quantity), 0) AS earnings
-                FROM orders o
-                JOIN order_items oi ON oi.order_id = o.id
-                WHERE o.department_id IN ($department_ids_sql)
-                  AND o.created_at BETWEEN '$escaped_start' AND '$escaped_end'
-                  AND o.deleted_at IS NULL
-                  AND oi.deleted_at IS NULL";
-
-        $result = $db->query($sql);
-        $row = is_object($result) ? $result->fetch_assoc() : null;
-
-        return [
-            'quantity' => (int)($row['quantity'] ?? 0),
-            'products' => (int)($row['products'] ?? 0),
-            'earnings' => (int)round((float)($row['earnings'] ?? 0)),
-            'washes' => $this->countRows($date_start, $date_end, $normalized_department_ids),
-        ];
-    }
-
-    /**
-     * @param array<int|string> $department_ids
-     * @return array<int,array{id:int,department_id:int,created_at:string}>
-     * @throws Exception
-     */
-    public function listTransactions(string $date_start, string $date_end, array $department_ids): array
-    {
-        global $db;
-
-        $this->validateDateRange($date_start, $date_end);
-        $normalized_department_ids = $this->normalizeIds($department_ids);
-        if ($normalized_department_ids === []) {
-            return [];
-        }
-
-        selfserve_schema_bootstrap::ensureTables();
-
-        $department_ids_sql = implode(',', $normalized_department_ids);
-        $escaped_start = $db->escape_string($date_start);
-        $escaped_end = $db->escape_string($date_end);
-        $candidate_sql = $this->candidateUnionSql($department_ids_sql, $escaped_start, $escaped_end);
-
-        $sql = "SELECT CAST(SUBSTRING_INDEX(GROUP_CONCAT(entity_id ORDER BY source_priority ASC, entity_id ASC), ',', 1) AS UNSIGNED) AS id,
-                       department_id,
-                       MIN(counted_at) AS created_at
-                FROM ($candidate_sql) candidates
-                GROUP BY dedupe_key, department_id
-                ORDER BY created_at ASC";
-
-        $result = $db->query($sql);
-        if (!is_object($result) || $result->num_rows === 0) {
-            return [];
-        }
-
-        $rows = [];
-        while ($row = $result->fetch_assoc()) {
-            $rows[] = [
-                'id' => (int)($row['id'] ?? 0),
-                'department_id' => (int)($row['department_id'] ?? 0),
-                'created_at' => (string)($row['created_at'] ?? ''),
-            ];
-        }
-
-        return $rows;
-    }
-
-    /**
-     * @param array<int> $department_ids
-     * @throws Exception
-     */
-    private function countRows(string $date_start, string $date_end, array $department_ids): int
-    {
-        $rows = $this->countByHourForDepartments($date_start, $date_end, $department_ids);
-        $total = 0;
-
-        foreach ($rows as $row) {
-            $total += (int)($row['wash_count'] ?? 0);
-        }
-
-        return $total;
-    }
-
-    private function candidateUnionSql(string $department_ids_sql, string $escaped_start, string $escaped_end): string
-    {
-        return "SELECT CONCAT('order:', o.id) AS dedupe_key,
-                       o.id AS entity_id,
-                       o.department_id,
-                       o.created_at AS counted_at,
-                       0 AS source_priority
-                FROM orders o
-                JOIN order_items oi ON oi.order_id = o.id
-                JOIN products p ON p.id = oi.product_id
-                WHERE o.department_id IN ($department_ids_sql)
-                  AND o.created_at BETWEEN '$escaped_start' AND '$escaped_end'
-                  AND o.deleted_at IS NULL
-                  AND oi.deleted_at IS NULL
-                  AND p.is_wash = 1
-                UNION ALL
-                SELECT CASE
-                           WHEN linked_o.id IS NOT NULL THEN CONCAT('order:', linked_o.id)
-                           ELSE CONCAT('selfserve:', s.id)
-                       END AS dedupe_key,
-                       CASE
-                           WHEN linked_o.id IS NOT NULL THEN linked_o.id
-                           ELSE s.id
-                       END AS entity_id,
-                       COALESCE(linked_o.department_id, s.department_id) AS department_id,
-                       COALESCE(linked_o.created_at, s.completed_at) AS counted_at,
-                       1 AS source_priority
-                FROM selfserve_wash_sessions s
-                LEFT JOIN orders linked_o
-                  ON linked_o.id = s.order_id
-                 AND linked_o.deleted_at IS NULL
-                WHERE COALESCE(linked_o.department_id, s.department_id) IN ($department_ids_sql)
-                  AND COALESCE(linked_o.created_at, s.completed_at) BETWEEN '$escaped_start' AND '$escaped_end'
-                  AND s.deleted_at IS NULL
-                  AND s.completed_at IS NOT NULL
-                  AND UPPER(TRIM(s.status)) = 'COMPLETED'";
-    }
-
-    /**
-     * @param array<int|string> $ids
-     * @return array<int>
-     */
-    private function normalizeIds(array $ids): array
-    {
-        $normalized = [];
-        foreach ($ids as $id) {
-            $value = (int)$id;
-            if ($value > 0) {
-                $normalized[$value] = $value;
-            }
-        }
-
-        return array_values($normalized);
-    }
-
-    /**
-     * @throws Exception
-     */
-    private function validateDateRange(string $date_start, string $date_end): void
-    {
-        if (strtotime($date_start) === false || strtotime($date_end) === false) {
-            throw new Exception('Invalid date range provided');
-        }
-        if (strtotime($date_start) > strtotime($date_end)) {
-            throw new Exception('The start date cannot be after the end date');
-        }
-    }
-}
@@ -34,14 +34,6 @@ class departments_schema_bootstrap
            );
        }

-        if (!self::columnExists($db, 'departments', 'custom_pricing_only')) {
-            $db->query(
-                "ALTER TABLE departments
-                    ADD COLUMN custom_pricing_only TINYINT(1) NOT NULL DEFAULT 0
-                    AFTER archived"
-            );
-        }
-
        if (!self::indexExists($db, 'departments', self::ARCHIVED_INDEX)) {
            $db->query(
                "ALTER TABLE departments
@@ -172,8 +172,7 @@ class economic implements economic_i
        string $email,
        int $phone,
        ?int $mobile_phone = null,
-        object|array|null $company_information = null,
-        ?string $ean = null
+        object|array|null $company_information = null
    ): object
    {
        $payload = [
@@ -197,37 +196,10 @@ class economic implements economic_i
        ];

        $payload = array_replace($payload, $this->buildCustomerPayloadFromCompanyInformation($company_information));
-        $normalized_ean = self::normalizeCustomerEan($ean);
-        if ($normalized_ean !== null) {
-            $payload['ean'] = $normalized_ean;
-        }

        return $this->customers->customers->create($payload);
    }

-    public static function normalizeCustomerEan(mixed $value): ?string
-    {
-        if ($value === null) {
-            return null;
-        }
-
-        $digits = preg_replace('/\D+/', '', (string)$value);
-        if (!is_string($digits)) {
-            return null;
-        }
-
-        $digits = trim($digits);
-        if ($digits === '') {
-            return null;
-        }
-
-        if (strlen($digits) > 13) {
-            throw new \InvalidArgumentException('EAN must be at most 13 digits.');
-        }
-
-        return $digits;
-    }
-
    private function buildCustomerPayloadFromCompanyInformation(object|array|null $company_information): array
    {
        if ($company_information === null) {
@@ -1,111 +0,0 @@
-<?php
-
-namespace classes;
-
-/**
- * Sanitizes user-input fields that are sent to the e-conomic API.
- *
- * Background: e-conomic returns 400 errors when description fields contain
- * certain characters. The known issue is "/" in the order reference field
- * (TRU-188), but we sanitize defensively for all such cases.
- *
- * - sanitizeTextLine(): for plain text lines (reference, notes, po, etc.)
- * - sanitizeProductNumber(): for product identifiers
- * - sanitizeProductDescription(): for product-line descriptions
- * - sanitizeForEconApi(): catch-all for arbitrary user input
- */
-class economic_export_sanitizer
-{
-    /** E-conomic soft limit for a single description line. */
-    public const TEXT_LINE_MAX_LENGTH = 250;
-    /** E-conomic soft limit for a product description. */
-    public const PRODUCT_DESCRIPTION_MAX_LENGTH = 500;
-    /** E-conomic soft limit for a product number. */
-    public const PRODUCT_NUMBER_MAX_LENGTH = 50;
-
-    /** Characters that are illegal in product numbers on most e-conomic setups. */
-    private const PRODUCT_NUMBER_FORBIDDEN = ['/', '\\', ':', '*', '?', '"', '<', '>', '|', "\0"];
-
-    /**
-     * Sanitize a value for use in a single-line text description.
-     *
-     * Transformations (in order):
-     * 1. Replaces "/" with "-" (the reported 400 trigger)
-     * 2. Strips control characters (\x00-\x1F) except \t and \n
-     * 3. Replaces tab with single space
-     * 4. Collapses newlines into spaces (text lines are single-line)
-     * 5. Collapses runs of spaces to a single space
-     * 6. Trims leading/trailing whitespace
-     * 7. Truncates to $maxLength with "..." suffix if needed
-     */
-    public static function sanitizeTextLine(mixed $value, int $maxLength = self::TEXT_LINE_MAX_LENGTH): string
-    {
-        if ($value === null) {
-            return '';
-        }
-        $text = (string)$value;
-        if ($text === '') {
-            return '';
-        }
-        // 1. Strip control characters except \t and \n
-        $text = preg_replace('/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]/u', '', $text);
-        // 2. Replace tab with single space
-        $text = str_replace("\t", ' ', $text);
-        // 3. Collapse newlines to single space (text lines are single-line)
-        $text = preg_replace('/[\r\n]+/u', ' ', $text);
-        // 4. Replace forward slashes (the reported 400 trigger)
-        $text = str_replace('/', '-', $text);
-        // 5. Collapse runs of spaces
-        $text = preg_replace('/\s+/u', ' ', $text);
-        // 6. Trim
-        $text = trim($text);
-        // 7. Truncate with ellipsis if too long
-        if ($maxLength > 3 && mb_strlen($text) > $maxLength) {
-            $text = mb_substr($text, 0, $maxLength - 3) . '...';
-        } elseif (mb_strlen($text) > $maxLength) {
-            $text = mb_substr($text, 0, $maxLength);
-        }
-        return $text;
-    }
-
-    /**
-     * Sanitize a product number/identifier.
-     *
-     * Removes characters that are illegal in product numbers on most
-     * e-conomic setups (filesystem-unsafe + path separators).
-     */
-    public static function sanitizeProductNumber(mixed $value): string
-    {
-        if ($value === null) {
-            return '';
-        }
-        $text = (string)$value;
-        if ($text === '') {
-            return '';
-        }
-        $text = str_replace(self::PRODUCT_NUMBER_FORBIDDEN, '', $text);
-        $text = preg_replace('/[\x00-\x1F\x7F]/u', '', $text);
-        $text = trim($text);
-        if (mb_strlen($text) > self::PRODUCT_NUMBER_MAX_LENGTH) {
-            $text = mb_substr($text, 0, self::PRODUCT_NUMBER_MAX_LENGTH);
-        }
-        return $text;
-    }
-
-    /**
-     * Sanitize a longer product description.
-     */
-    public static function sanitizeProductDescription(mixed $value): string
-    {
-        return self::sanitizeTextLine($value, self::PRODUCT_DESCRIPTION_MAX_LENGTH);
-    }
-
-    /**
-     * Catch-all sanitizer for any user-input value going to e-conomic.
-     * Defaults to text-line rules.
-     */
-    public static function sanitizeForEconApi(mixed $value): string
-    {
-        return self::sanitizeTextLine($value);
-    }
-}
@@ -240,13 +240,7 @@ class economic_transfer_executor
            'Queued transfer processed successfully for collected invoice #' . $collected_invoice_id
        );

-        $result = $collected_order_invoices->asArray();
-        $transfer_metrics = $collected_order_invoices->getLastEconomicTransferMetrics();
-        if ($transfer_metrics !== null) {
-            $result['economic_transfer_metrics'] = $transfer_metrics;
-        }
-
-        return $result;
+        return $collected_order_invoices->asArray();
    }

    /**
@@ -328,21 +322,23 @@ class economic_transfer_executor
        $economic_dimension_id = $department['economic_dimension_id'] ?? 0;
        $order_item_price = (float)($order_item['price'] ?? 0);
        $product_price = (float)($order_item['product']['price'] ?? 0);
-        $discount_percentage = 0.0;
-        if (abs($product_price) > 0.00001 && $order_item_price < $product_price) {
-            $discount_percentage = round((($product_price - $order_item_price) / $product_price) * 100, 10);
-        }

        $economic_invoice_draft->addLine(
            $product_number,
            $product_name,
            $quantity,
            $order_item_price,
-            $discount_percentage,
+            0,
            (int)$economic_department_id ?? 0,
            (int)$economic_dimension_id ?? 0
        );

+        $show_discount = abs($order_item_price - $product_price) > 0.00001;
+        if ($show_discount && abs($product_price) > 0.00001) {
+            $discount_percentage = round((($product_price - $order_item_price) / $product_price) * 100, 0);
+            $economic_invoice_draft->addLineTEXT('Rabat: ' . ($order_item_price - $product_price) . ' DKK (' . $discount_percentage . '%)');
+        }
+
        if ($reference !== '') {
            $economic_invoice_draft->addLineTEXT('Reference:');
            if (str_contains($reference, "\n")) {
@@ -40,14 +40,9 @@ class economic_transfer_queue
        $max_attempts = max(1, min(10, $max_attempts));
        $transfer_type = $this->validateTransferType($transfer_type);
        $payload = $this->normalizePayloadForTransferType($transfer_type, $payload, $created_by);
-        $collected_invoice_lock = $this->acquireCollectedInvoiceExportLock($transfer_type, $payload);
-        if ($collected_invoice_lock !== null) {
-            $this->assertCollectedInvoiceExportIsStillEligible($payload);
-        }

        $active_job = $this->findActiveJobByTarget($transfer_type, $payload, $created_by);
        if ($active_job !== null) {
-            $this->registerJobRequester((int)($active_job['id'] ?? 0), $created_by);
            $target_label = $this->buildTargetLabel($transfer_type, $payload);
            $this->logQueueEvent(
                1,
@@ -80,8 +75,6 @@ class economic_transfer_queue
        $job_id = (int)$db->insert_id();
        $stmt->close();

-        $this->registerJobRequester($job_id, $created_by);
-
        $this->logQueueEvent(
            1,
            $created_by,
@@ -152,19 +145,12 @@ class economic_transfer_queue
            return null;
        }

-        $stmt = $db->prepare(
-            "SELECT q.*
-             FROM economic_transfer_queue_jobs q
-             LEFT JOIN economic_transfer_queue_job_requesters r
-               ON r.queue_job_id = q.id AND r.user_id = ?
-             WHERE q.id = ? AND (q.created_by = ? OR r.user_id = ?)
-             LIMIT 1"
-        );
+        $stmt = $db->prepare("SELECT * FROM economic_transfer_queue_jobs WHERE id = ? AND created_by = ? LIMIT 1");
        if (!$stmt) {
            return null;
        }

-        $stmt->bind_param('iiii', $created_by, $job_id, $created_by, $created_by);
+        $stmt->bind_param('ii', $job_id, $created_by);
        if (!$stmt->execute()) {
            $stmt->close();
            return null;
@@ -193,8 +179,7 @@ class economic_transfer_queue
        $offset = max(0, $offset);

        $where = $this->buildListJobsWhereClause($statuses, $transfer_type);
-        $visibility = $this->jobVisibilitySql('economic_transfer_queue_jobs', $created_by);
-        $where .= $where === '' ? 'WHERE ' . $visibility : ' AND ' . $visibility;
+        $where .= $where === '' ? 'WHERE created_by = ' . $created_by : ' AND created_by = ' . $created_by;
        $sql = "SELECT * FROM economic_transfer_queue_jobs $where ORDER BY id DESC LIMIT $limit OFFSET $offset";
        $result = $db->query($sql);
        if (!$result instanceof mysqli_result) {
@@ -218,8 +203,7 @@ class economic_transfer_queue
        }

        $where = $this->buildListJobsWhereClause($statuses, $transfer_type);
-        $visibility = $this->jobVisibilitySql('economic_transfer_queue_jobs', $created_by);
-        $where .= $where === '' ? 'WHERE ' . $visibility : ' AND ' . $visibility;
+        $where .= $where === '' ? 'WHERE created_by = ' . $created_by : ' AND created_by = ' . $created_by;
        $sql = "SELECT COUNT(*) AS total FROM economic_transfer_queue_jobs $where";
        $result = $db->query($sql);
        if (!$result instanceof mysqli_result) {
@@ -258,9 +242,6 @@ class economic_transfer_queue
        global $db;

        $user_id = max(0, $user_id);
-        if ($user_id < 1) {
-            return [];
-        }
        $limit = max(1, min(100, $limit));
        try {
            $normalized_transfer_type = $transfer_type !== null && trim($transfer_type) !== ''
@@ -281,7 +262,7 @@ class economic_transfer_queue
                  ON d.queue_job_id = q.id
                 AND d.user_id = $user_id
                 AND d.dismissed_status = q.status
-                WHERE " . $this->jobVisibilitySql('q', $user_id) . "
+                WHERE q.created_by = $user_id
                  $transfer_condition
                  AND (
                    q.status IN ('" . self::STATUS_QUEUED . "', '" . self::STATUS_PROCESSING . "')
@@ -374,7 +355,7 @@ class economic_transfer_queue
                  ON d.queue_job_id = q.id
                 AND d.user_id = $user_id
                 AND d.dismissed_status = q.status
-                WHERE " . $this->jobVisibilitySql('q', $user_id) . "
+                WHERE q.created_by = $user_id
                  AND q.status IN ('" . self::STATUS_COMPLETED . "', '" . self::STATUS_FAILED . "')
                  $transfer_condition
                  AND d.queue_job_id IS NULL
@@ -408,9 +389,6 @@ class economic_transfer_queue
        if ($existing_job === null) {
            throw new Exception('Queue job not found');
        }
-        if ($created_by !== null && (int)($existing_job['created_by'] ?? 0) !== $created_by) {
-            throw new Exception('Only the queue job creator can retry this job');
-        }
        if ((string)($existing_job['status'] ?? '') !== self::STATUS_FAILED) {
            throw new Exception('Only failed jobs can be retried');
        }
@@ -632,53 +610,11 @@ class economic_transfer_queue
        if ($collected_invoice_id < 1) {
            throw new Exception('collected_invoice_id is required');
        }
-        $collection_lock = $this->acquireCollectedInvoiceExportLock(
-            self::TYPE_COLLECTED_INVOICE_EXPORT,
-            $payload
-        );
-        $this->assertCollectedInvoiceExportIsStillEligible($payload);
        $send_as_is = (bool)($payload['send_as_is'] ?? false);
        $this->updateProgress((int)$job['id'], 65, 'Exporting collected invoice');
        return $this->executor->exportCollectedInvoice($collected_invoice_id, $send_as_is, $requested_by);
    }

-    /**
-     * Enqueue, worker execution, payments, and invoice-tree mutations share the
-     * same collection lock. The returned object intentionally stays in scope
-     * for the complete enqueue/export operation and releases in its destructor.
-     *
-     * @throws Exception
-     */
-    private function acquireCollectedInvoiceExportLock(string $transfer_type, array $payload): ?order_payment_lock
-    {
-        if ($transfer_type !== self::TYPE_COLLECTED_INVOICE_EXPORT) {
-            return null;
-        }
-        $collected_invoice_id = (int)($payload['collected_invoice_id'] ?? 0);
-        if ($collected_invoice_id < 1) {
-            throw new Exception('collected_invoice_id is required');
-        }
-        $lock = order_payment_lock::tryAcquireInvoiceCollection($collected_invoice_id);
-        if ($lock === null) {
-            throw new Exception('Invoice collection is currently being changed or paid. Try again.');
-        }
-        return $lock;
-    }
-
-    /**
-     * Re-read eligibility after acquiring the collection lock so a queued job
-     * cannot export a collection that was booked or superseded while waiting.
-     *
-     * @throws Exception
-     */
-    private function assertCollectedInvoiceExportIsStillEligible(array $payload): void
-    {
-        $collection = (new \objects\collected_order_invoices_o())->select(
-            (int)($payload['collected_invoice_id'] ?? 0)
-        );
-        invoice_collection_bulk_action_service::assertCollectionCanQueueEconomic($collection);
-    }
-
    private function updateProgress(int $job_id, int $percent, string $message): void
    {
        global $db;
@@ -791,38 +727,6 @@ class economic_transfer_queue
        $db->query("DELETE FROM economic_transfer_queue_job_dismissals WHERE queue_job_id = $job_id");
    }

-    private function registerJobRequester(int $job_id, int $user_id): void
-    {
-        global $db;
-
-        if ($job_id < 1 || $user_id < 1) {
-            return;
-        }
-        $stmt = $db->prepare(
-            "INSERT INTO economic_transfer_queue_job_requesters (queue_job_id, user_id, requested_at)
-             VALUES (?, ?, NOW())
-             ON DUPLICATE KEY UPDATE requested_at = VALUES(requested_at)"
-        );
-        if (!$stmt) {
-            throw new Exception('Failed to prepare queue requester registration');
-        }
-        $stmt->bind_param('ii', $job_id, $user_id);
-        if (!$stmt->execute()) {
-            $stmt->close();
-            throw new Exception('Failed to register queue requester');
-        }
-        $stmt->close();
-    }
-
-    private function jobVisibilitySql(string $alias, int $user_id): string
-    {
-        $user_id = max(0, $user_id);
-        return "($alias.created_by = $user_id OR EXISTS (
-            SELECT 1 FROM economic_transfer_queue_job_requesters requester
-            WHERE requester.queue_job_id = $alias.id AND requester.user_id = $user_id
-        ))";
-    }
-
    /**
     * Release jobs stuck in PROCESSING due to crashes or killed workers.
     */
@@ -852,14 +756,11 @@ class economic_transfer_queue
            $normalized_payload['requested_by'] = max(0, (int)$normalized_payload['requested_by']);
        }

-        if ($transfer_type === self::TYPE_COLLECTED_INVOICE_EXPORT) {
-            return $this->normalizeCollectedInvoicePayload($normalized_payload, $created_by);
-        }
-        if (!in_array($transfer_type, [self::TYPE_ORDER_DRAFT_EXPORT, self::TYPE_ORDER_INVOICE_EXPORT], true)) {
-            $this->rejectPayload($created_by, 'Unsupported transfer type payload: ' . $transfer_type);
-        }
-
-        return $this->normalizeOrderPayload($normalized_payload, $created_by);
+        return match ($transfer_type) {
+            self::TYPE_ORDER_DRAFT_EXPORT, self::TYPE_ORDER_INVOICE_EXPORT => $this->normalizeOrderPayload($normalized_payload, $created_by),
+            self::TYPE_COLLECTED_INVOICE_EXPORT => $this->normalizeCollectedInvoicePayload($normalized_payload, $created_by),
+            default => $this->rejectPayload($created_by, 'Unsupported transfer type payload: ' . $transfer_type),
+        };
    }

    /**
@@ -869,7 +770,7 @@ class economic_transfer_queue
    {
        $order_id = $payload['order_id'] ?? null;
        if ($order_id === null || !is_numeric($order_id) || (int)$order_id < 1) {
-            $this->rejectPayload($created_by, 'order_id is required and must be a positive number');
+            return $this->rejectPayload($created_by, 'order_id is required and must be a positive number');
        }
        $payload['order_id'] = (int)$order_id;
        return $payload;
@@ -882,7 +783,7 @@ class economic_transfer_queue
    {
        $collected_invoice_id = $payload['collected_invoice_id'] ?? null;
        if ($collected_invoice_id === null || !is_numeric($collected_invoice_id) || (int)$collected_invoice_id < 1) {
-            $this->rejectPayload($created_by, 'collected_invoice_id is required and must be a positive number');
+            return $this->rejectPayload($created_by, 'collected_invoice_id is required and must be a positive number');
        }

        $payload['collected_invoice_id'] = (int)$collected_invoice_id;
@@ -903,17 +804,17 @@ class economic_transfer_queue
            if ($numeric === 0 || $numeric === 1) {
                return $numeric === 1;
            }
-            $this->rejectPayload($created_by, $field_name . ' must be a boolean');
+            return $this->rejectPayload($created_by, $field_name . ' must be a boolean');
        }
        if (is_string($value)) {
            $normalized = strtolower(trim($value));
            if (in_array($normalized, ['true', 'false', '1', '0'], true)) {
                return in_array($normalized, ['true', '1'], true);
            }
-            $this->rejectPayload($created_by, $field_name . ' must be a boolean');
+            return $this->rejectPayload($created_by, $field_name . ' must be a boolean');
        }

-        $this->rejectPayload($created_by, $field_name . ' must be a boolean');
+        return $this->rejectPayload($created_by, $field_name . ' must be a boolean');
    }

    private function findActiveJobByTarget(string $transfer_type, array $payload, int $created_by): ?array
@@ -939,8 +840,8 @@ class economic_transfer_queue
    {
        global $db;

-        // Active work is unique by transfer type and business target across all requesting users.
-        if ($target_value < 1) {
+        $created_by = max(0, $created_by);
+        if ($target_value < 1 || $created_by < 1) {
            return null;
        }

@@ -950,6 +851,7 @@ class economic_transfer_queue
             WHERE transfer_type = ?
               AND status IN (?, ?)
               AND CAST(JSON_UNQUOTE(JSON_EXTRACT(payload_json, '$json_path')) AS UNSIGNED) = ?
+               AND created_by = ?
             ORDER BY id DESC
             LIMIT 1"
        );
@@ -959,7 +861,7 @@ class economic_transfer_queue

        $queued = self::STATUS_QUEUED;
        $processing = self::STATUS_PROCESSING;
-        $stmt->bind_param('sssi', $transfer_type, $queued, $processing, $target_value);
+        $stmt->bind_param('sssii', $transfer_type, $queued, $processing, $target_value, $created_by);
        if (!$stmt->execute()) {
            $stmt->close();
            return null;
@@ -54,17 +54,6 @@ class economic_transfer_queue_schema_bootstrap
            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci"
        );

-        $db->query(
-            "CREATE TABLE IF NOT EXISTS economic_transfer_queue_job_requesters (
-                queue_job_id BIGINT UNSIGNED NOT NULL,
-                user_id INT NOT NULL,
-                requested_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-                PRIMARY KEY (queue_job_id, user_id),
-                INDEX idx_economic_transfer_queue_job_requesters_user (user_id, queue_job_id),
-                INDEX idx_economic_transfer_queue_job_requesters_job (queue_job_id)
-            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci"
-        );
-
        self::$initialized = true;
    }
 }
@@ -40,7 +40,6 @@ class economic_v2_distribution_service

    public function __construct(?economic_v2_versioning_service $versioning = null, ?economic $economic = null)
    {
-        department_customer_price_overrides_schema_bootstrap::ensureTables();
        $this->versioning = $versioning ?? new economic_v2_versioning_service();
        $this->economic = $economic;
    }
@@ -389,16 +388,7 @@ class economic_v2_distribution_service
                    continue;
                }

-                $discount_row = $this->resolveDiscountForProduct($customer_number, $product_id, $created_at, $department_id);
-                if ($discount_row === null) {
-                    continue;
-                }
-                if (array_key_exists('fixed_price', $discount_row) && $discount_row['fixed_price'] !== null) {
-                    $fixed_price = (float)$discount_row['fixed_price'];
-                    $order_discount_total += (($base_price - $fixed_price) * $quantity);
-                    continue;
-                }
-
+                $discount_row = $this->resolveDiscountForProduct($customer_number, $product_id, $created_at);
                $discount_percentage = (float)($discount_row['discount'] ?? 0);
                if ($discount_percentage <= 0) {
                    continue;
@@ -1529,13 +1519,7 @@ class economic_v2_distribution_service
                $line_price = ((float)$this->getProductDepartmentPrice($product_id, $department_id)) * $quantity;
            }

-            $discount_row = $this->resolveDiscountForProduct($customer_number, $product_id, $timestamp, $department_id);
-            if ($discount_row !== null && array_key_exists('fixed_price', $discount_row) && $discount_row['fixed_price'] !== null) {
-                $line_price = ((float)$discount_row['fixed_price']) * $quantity;
-                $total += $line_price;
-                continue;
-            }
-
+            $discount_row = $this->resolveDiscountForProduct($customer_number, $product_id, $timestamp);
            $discount_percentage = (float)($discount_row['discount'] ?? 0);
            if ($discount_percentage > 0) {
                $line_price *= (1 - ($discount_percentage / 100));
@@ -1545,22 +1529,15 @@ class economic_v2_distribution_service
        return $total;
    }

-    protected function resolveDiscountForProduct(int $customer_number, int $product_id, string $timestamp, ?int $department_id = null): ?array
+    protected function resolveDiscountForProduct(int $customer_number, int $product_id, string $timestamp): ?array
    {
-        $cache_key = $customer_number . '|' . $product_id . '|' . (int)($department_id ?? 0) . '|' . substr($timestamp, 0, 19);
+        $cache_key = $customer_number . '|' . $product_id . '|' . substr($timestamp, 0, 19);
        if (array_key_exists($cache_key, $this->discount_resolution_cache)) {
            return $this->discount_resolution_cache[$cache_key];
        }

-        $scopedDepartmentId = $department_id !== null && (new \objects\departments_o())->isCustomPricingOnly((int)$department_id)
-            ? (int)$department_id
-            : null;
-
-        $direct = $this->versioning->resolveDiscountOverrideAt($customer_number, false, (string)$product_id, $timestamp, $scopedDepartmentId);
-        if ($direct !== null && (
-            (array_key_exists('fixed_price', $direct) && $direct['fixed_price'] !== null)
-            || (int)($direct['discount'] ?? 0) > 0
-        )) {
+        $direct = $this->versioning->resolveDiscountOverrideAt($customer_number, false, (string)$product_id, $timestamp);
+        if ($direct !== null && (int)($direct['discount'] ?? 0) > 0) {
            return $this->discount_resolution_cache[$cache_key] = $direct;
        }

@@ -1568,20 +1545,13 @@ class economic_v2_distribution_service
        if ($product !== null) {
            $category = (string)$product->category->value();
            if ($category !== '') {
-                $category_discount = $this->versioning->resolveDiscountOverrideAt($customer_number, true, $category, $timestamp, $scopedDepartmentId);
+                $category_discount = $this->versioning->resolveDiscountOverrideAt($customer_number, true, $category, $timestamp);
                if ($category_discount !== null && (int)($category_discount['discount'] ?? 0) > 0) {
                    return $this->discount_resolution_cache[$cache_key] = $category_discount;
                }
            }
        }

-        if ($scopedDepartmentId !== null) {
-            $global_discount = $this->versioning->resolveDiscountOverrideAt($customer_number, true, 'global', $timestamp, $scopedDepartmentId);
-            if ($global_discount !== null && (int)($global_discount['discount'] ?? 0) > 0) {
-                return $this->discount_resolution_cache[$cache_key] = $global_discount;
-            }
-        }
-
        return $this->discount_resolution_cache[$cache_key] = null;
    }

@@ -10,7 +10,7 @@ class economic_v2_revenue_statistics_service

    private economic $economic;

-    /** @var array<int, array{customer_number: int, name: ?string, barred: ?bool, status: string}> */
+    /** @var array<int, array{customer_number:int,name:?string,barred:?bool,status:string}> */
    private array $customer_cache = [];

    public function __construct(?economic $economic = null)
@@ -44,6 +44,7 @@ class economic_v2_revenue_statistics_service
        $summary = [
            'invoice_count' => 0,
            'line_count' => 0,
+            'unique_customers' => 0,
            'net_amount' => 0.0,
            'vat_amount' => 0.0,
            'gross_amount' => 0.0,
@@ -397,7 +398,7 @@ class economic_v2_revenue_statistics_service
    }

    /**
-     * @return array{customer_number: int, name: ?string, barred: ?bool, status: string}
+     * @return array{customer_number:int,name:?string,barred:?bool,status:string}
     */
    private function resolveCustomerSnapshot(int $customer_number, array &$warnings): array
    {
@@ -499,3 +500,4 @@ class economic_v2_revenue_statistics_service
        return $data;
    }
 }
+
@@ -60,13 +60,11 @@ class economic_v2_schema_bootstrap

            "CREATE TABLE IF NOT EXISTS customer_discount_override_versions (
                id INT AUTO_INCREMENT PRIMARY KEY,
-                department_id INT NULL DEFAULT NULL,
                user_id INT NOT NULL,
                customer_number INT NOT NULL,
                is_category TINYINT(1) NOT NULL,
                object_id VARCHAR(64) NOT NULL,
                discount INT NOT NULL,
-                fixed_price INT NULL DEFAULT NULL,
                effective_from DATETIME NOT NULL,
                effective_to DATETIME NULL,
                source VARCHAR(64) NOT NULL DEFAULT 'live',
@@ -76,7 +74,6 @@ class economic_v2_schema_bootstrap
                created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
                updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
                INDEX idx_discount_override_versions_lookup (customer_number, is_category, object_id, effective_from, effective_to),
-                INDEX idx_discount_override_versions_department_lookup (department_id, customer_number, is_category, object_id, effective_from, effective_to),
                INDEX idx_discount_override_versions_user (user_id),
                INDEX idx_discount_override_versions_source (source)
            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
@@ -86,22 +83,6 @@ class economic_v2_schema_bootstrap
            $db->query($sql);
        }

-        if (!self::tableHasColumn('customer_discount_override_versions', 'fixed_price')) {
-            $db->query(
-                "ALTER TABLE customer_discount_override_versions
-                    ADD COLUMN fixed_price INT NULL DEFAULT NULL
-                    AFTER discount"
-            );
-        }
-
-        if (!self::tableHasColumn('customer_discount_override_versions', 'department_id')) {
-            $db->query(
-                "ALTER TABLE customer_discount_override_versions
-                    ADD COLUMN department_id INT NULL DEFAULT NULL
-                    AFTER id"
-            );
-        }
-
        self::$initialized = true;
    }

@@ -125,3 +106,4 @@ class economic_v2_schema_bootstrap
        return ((int)($row['c'] ?? 0)) > 0;
    }
 }
+
@@ -135,9 +135,7 @@ class economic_v2_versioning_service
        string $source = 'live.discount_override',
        float $confidence = 1.0,
        bool $inferred = false,
-        array $metadata = [],
-        ?int $fixed_price = null,
-        ?int $department_id = null
+        array $metadata = []
    ): array {
        $identity = [
            'user_id' => $user_id,
@@ -145,11 +143,8 @@ class economic_v2_versioning_service
            'is_category' => (int)$is_category,
            'object_id' => (string)$object_id,
        ];
-        if ($department_id !== null) {
-            $identity['department_id'] = (int)$department_id;
-        }

-        if (($discount === null || (int)$discount === 0) && $fixed_price === null) {
+        if ($discount === null || (int)$discount === 0) {
            return $this->closeActiveVersion(
                'customer_discount_override_versions',
                $identity,
@@ -166,7 +161,6 @@ class economic_v2_versioning_service
            $identity,
            [
                'discount' => (int)$discount,
-                'fixed_price' => $is_category ? null : $fixed_price,
            ],
            $this->normalizeDatetime($effective_from),
            $source,
@@ -244,21 +238,15 @@ class economic_v2_versioning_service
        int $customer_number,
        bool $is_category,
        int|string $object_id,
-        string $timestamp,
-        ?int $department_id = null
+        string $timestamp
    ): ?array {
-        $identity = [
-            'customer_number' => $customer_number,
-            'is_category' => (int)$is_category,
-            'object_id' => (string)$object_id,
-        ];
-        if ($department_id !== null) {
-            $identity['department_id'] = (int)$department_id;
-        }
-
        $rows = $this->resolveActiveVersions(
            'customer_discount_override_versions',
-            $identity,
+            [
+                'customer_number' => $customer_number,
+                'is_category' => (int)$is_category,
+                'object_id' => (string)$object_id,
+            ],
            $timestamp,
            'effective_from DESC, id DESC',
            1
@@ -423,11 +411,8 @@ class economic_v2_versioning_service
        }

        // Discount overrides current state.
-        price_overrides_schema_bootstrap::ensureColumns();
        $has_override_created_at = economic_v2_schema_bootstrap::tableHasColumn('price_overrides', 'created_at');
-        $has_override_fixed_price = economic_v2_schema_bootstrap::tableHasColumn('price_overrides', 'fixed_price');
        $discount_cols = 'po.user_id, u.customer_number, po.is_category, po.product_or_category_id, po.percentage' .
-            ($has_override_fixed_price ? ', po.fixed_price' : '') .
            ($has_override_created_at ? ', po.created_at' : '');
        $discount_rows = $this->fetchAll(
            "SELECT $discount_cols
@@ -449,8 +434,7 @@ class economic_v2_versioning_service
                'backfill.current_discount_override',
                $confidence,
                true,
-                ['table' => 'price_overrides'],
-                $has_override_fixed_price && $row['fixed_price'] !== null ? (int)$row['fixed_price'] : null
+                ['table' => 'price_overrides']
            );
            $this->incrementReportAction($report['discount_overrides'], $result['action'] ?? 'noop');
        }
@@ -723,3 +707,4 @@ class economic_v2_versioning_service
        $bucket[$action]++;
    }
 }
+
@@ -34,7 +34,6 @@ use MailerSend\Helpers\Builder\Recipient;
 use MailerSend\MailerSend;
 use objects\bookings_o;
 use objects\departments_o;
-use objects\logs_o;
 use objects\users_o;
 use Psr\Http\Client\ClientExceptionInterface;

@@ -145,15 +144,6 @@ use Psr\Http\Client\ClientExceptionInterface;
        ];
        // If the email is blacklisted, return without sending the email
        if (in_array($to, $blacklisted_emails)) {
-            // Previously this was a silent return - ops could not tell whether a
-            // missing delivery was caused by the blacklist or a real provider
-            // outage. Emit a structured skip event before returning.
-            $context = [
-                'reason' => 'recipient_blacklisted',
-                'recipient' => $to,
-                'subject' => $subject,
-            ];
-            error_log('[email-skip] ' . json_encode($context, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
            return;
        }
        // Send POST request to email service
@@ -174,19 +164,12 @@ use Psr\Http\Client\ClientExceptionInterface;
        if ($attachments) {
            $attachments = array_map(function ($attachment) {
                // Read the data from the path (Attachment[0]) and set the filename (Attachment[1])
-                $path = (string)$attachment[0];
-                $contents = file_get_contents($path);
-                if ($contents === false) {
-                    // Capture the path before it is overwritten so the resulting
-                    // exception message is useful in ops logs. Previously this
-                    // threw with binary contents (because $attachment[0] had
-                    // already been replaced by file_get_contents()'s output),
-                    // making the failure essentially un-diagnosable.
-                    throw new Exception('Failed to read attachment file: ' . $path);
+                $attachment[0] = file_get_contents($attachment[0]);
+                if ($attachment[0] === false) {
+                    throw new Exception('Failed to read file: ' . $attachment[0]);
                }
-                $attachment[0] = $contents;
                if (empty($attachment[1])) {
-                    throw new Exception('Attachment filename is empty (path: ' . $path . ')');
+                    throw new Exception('Filename is empty');
                }
                return new Attachment($attachment[0], $attachment[1]);
            }, $attachments);
@@ -506,13 +489,7 @@ use Psr\Http\Client\ClientExceptionInterface;
    {
        // Validate the booking object
        $order_booking->requireSelected();
-        if (!$order_booking->hasTransaction()) {
-            // Previously this was a silent return which made wash-certificate
-            // delivery failures (e.g. k.sand@ksand.dk) impossible to diagnose
-            // without DB access. Emit a structured skip event before returning.
-            self::logWashCertificateSkip('no_transaction_email', (int)$order_booking->id, (int)$order_booking->customer_number->value());
-            return;
-        } // Only send a wash certificate if the order has been created.
+        if (!$order_booking->hasTransaction()) return; // Only send a wash certificate if the order has been created.
        // Get the order details
        $order = $order_booking->getOrder();
        // Get customer details
@@ -627,14 +604,6 @@ use Psr\Http\Client\ClientExceptionInterface;
        foreach ((new users_o())->getSuperuserNewCustomerEmailNotificationRecipients() as $recipient) {
            $recipientEmail = trim((string)($recipient['email'] ?? ''));
            if ($recipientEmail === '') {
-                // Recipient has no email address; surface the skip so an admin
-                // with no configured inbox can be fixed instead of silently
-                // dropping new-customer notifications.
-                $context = [
-                    'reason' => 'superuser_recipient_empty_email',
-                    'recipient_display_name' => trim((string)($recipient['display_name'] ?? '')),
-                ];
-                error_log('[email-skip] ' . json_encode($context, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
                continue;
            }

@@ -643,61 +612,12 @@ use Psr\Http\Client\ClientExceptionInterface;
                $recipientName = $recipientEmail;
            }

-            // Per-recipient try/catch so a single bad MailerSend response does
-            // not break delivery to the remaining superuser recipients - this
-            // loop is unprotected upstream and a transient 5xx would otherwise
-            // mean the rest of the team silently stops hearing about new
-            // customer registrations.
-            try {
-                $this->sendEmail(
-                    $recipientEmail,
-                    $recipientName,
-                    'New customer registered on Truck Wash',
-                    $message,
-                );
-            } catch (Exception $e) {
-                $context = [
-                    'reason' => 'superuser_recipient_send_failed',
-                    'recipient' => $recipientEmail,
-                    'subject' => 'New customer registered on Truck Wash',
-                    'error' => $e->getMessage(),
-                ];
-                error_log('[email-skip] ' . json_encode($context, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
-            }
-        }
-    }
-
-    /**
-     * Record a structured "wash certificate was skipped" event.
-     *
-     * Mirrors the helper of the same name on order_bookings_o so that every
-     * silent-return path in the email delivery flow (this class plus the
-     * order-bookings wrapper) is observable from the same grep target.
-     *
-     * TODO: migrate to the project logger when one is available globally.
-     *
-     * @param array<string, mixed> $extra
-     */
-    private static function logWashCertificateSkip(string $reason, int $booking_id, int $customer_number, array $extra = []): void
-    {
-        $context = array_merge([
-            'reason' => $reason,
-            'booking_id' => $booking_id,
-            'customer_number' => $customer_number,
-        ], $extra);
-        try {
-            (new logs_o())->add(
-                'email',
-                'global',
-                3,
-                0,
-                'WASH_CERT_SKIP',
-                json_encode($context, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)
+            $this->sendEmail(
+                $recipientEmail,
+                $recipientName,
+                'New customer registered on Truck Wash',
+                $message,
            );
-        } catch (\Throwable) {
-            // Logging must never block the booking flow.
        }
-        // Also emit to PHP error stream so this is visible in container logs.
-        error_log('[wash-cert-skip] ' . json_encode($context, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
    }
 }
@@ -9,11 +9,41 @@ class encrypt implements encrypt_i

    public function encrypt(string $data): string
    {
+        // Debug:
        return $data;
+        // Encrypt data
+        global $ENCRYPTION_KEY;
+        // Use AES 256 encryption
+        $cipher = "aes-256-cbc";
+        // Use the encryption key
+        $options = 0;
+        // Get the initialization vector
+        $iv_length = openssl_cipher_iv_length($cipher);
+        $iv = openssl_random_pseudo_bytes($iv_length);
+        // Use the first 16 bytes of the initialization vector
+        $iv = substr($iv, 0, 16);
+        // Encrypt the data
+        $encrypted = openssl_encrypt($data, $cipher, $ENCRYPTION_KEY, $options, $iv);
+        // Save the initialization vector for decryption
+        return $iv . $encrypted;
    }

    public function decrypt(string $data): string
    {
+        // Debug:
        return $data;
+        // Decrypt data
+        global $ENCRYPTION_KEY;
+        // Use AES 256 encryption
+        $cipher = "aes-256-cbc";
+        // Use the encryption key and initialization vector
+        $options = 0;
+        // Get the initialization vector
+        $iv_length = openssl_cipher_iv_length($cipher);
+        $iv = substr($data, 0, $iv_length);
+        // Get the encrypted data
+        $encrypted = substr($data, $iv_length);
+        // Decrypt the data
+        return openssl_decrypt($encrypted, $cipher, $ENCRYPTION_KEY, $options, $iv);
    }
-}
+}
@@ -5,6 +5,9 @@ namespace classes;
 require_once WD . '/modules/entra/entra_c.php';

 use entra\entra_c;
+use Microsoft\Graph\GraphServiceClient;
+use Microsoft\Kiota\Authentication\Oauth\ClientCredentialContext;
+use Microsoft\Kiota\Authentication\Oauth\ClientCredentialContextBuilder;


 class entra
@@ -20,95 +23,42 @@ class entra
        $this->config = new entra_c();
    }

-    public function get_users(bool $array = false): array
+    public function get_users($array = false): array|object
    {
-        $accessToken = $this->requestAccessToken();
-        $usersResponse = $this->requestJson(
-            'https://graph.microsoft.com/v1.0/users?$select=id,displayName,mail,userPrincipalName',
-            ['Authorization: Bearer ' . $accessToken]
-        );
-        $users = is_array($usersResponse['value'] ?? null) ? $usersResponse['value'] : [];
+        $graphClient = $this->getGraphClient();
+
+        $users = $graphClient->users()
+            ->get()
+            ->wait()
+            ->getValue();
        if (!$array) {
            return $users;
        }
-
        $result = [];
-        foreach ($users as $user) {
-            if (!is_array($user)) {
-                continue;
-            }
+        foreach ( $users as $user ) {
            $result[] = [
-                'id' => $user['id'] ?? null,
-                'displayName' => $user['displayName'] ?? null,
-                'mail' => $user['mail'] ?? null,
-                'userPrincipalName' => $user['userPrincipalName'] ?? null,
+                'id' => $user->getId(),
+                'displayName' => $user->getDisplayName(),
+                'mail' => $user->getMail(),
+                'userPrincipalName' => $user->getUserPrincipalName(),
            ];
        }
        return $result;
    }

-    private function requestAccessToken(): string
+    public function getGraphClient(): GraphServiceClient
    {
-        $tenantId = trim((string)$this->config->tenant_id->getVariableValue());
-        $response = $this->requestJson(
-            'https://login.microsoftonline.com/' . rawurlencode($tenantId) . '/oauth2/v2.0/token',
-            ['Content-Type: application/x-www-form-urlencoded'],
-            http_build_query([
-                'client_id' => (string)$this->config->client_id->getVariableValue(),
-                'client_secret' => (string)$this->config->client_secret->getVariableValue(),
-                'scope' => 'https://graph.microsoft.com/.default',
-                'grant_type' => 'client_credentials',
-            ])
+        return new GraphServiceClient(
+            $this->getTokenRequestContext(),
        );
-
-        $token = trim((string)($response['access_token'] ?? ''));
-        if ($token === '') {
-            throw new \RuntimeException('Microsoft Entra token response did not contain an access token.');
-        }
-
-        return $token;
    }

-    /**
-     * @param list<string> $headers
-     * @return array<string,mixed>
-     */
-    private function requestJson(string $url, array $headers, ?string $postFields = null): array
+    public function getTokenRequestContext(): ClientCredentialContext
    {
-        $curl = curl_init($url);
-        if ($curl === false) {
-            throw new \RuntimeException('Unable to initialize Microsoft Entra request.');
-        }
-
-        curl_setopt_array($curl, [
-            CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_CONNECTTIMEOUT => 5,
-            CURLOPT_TIMEOUT => 20,
-            CURLOPT_HTTPHEADER => $headers,
-        ]);
-        if ($postFields !== null) {
-            curl_setopt($curl, CURLOPT_POST, true);
-            curl_setopt($curl, CURLOPT_POSTFIELDS, $postFields);
-        }
-
-        try {
-            $body = curl_exec($curl);
-            $status = (int)curl_getinfo($curl, CURLINFO_RESPONSE_CODE);
-            if ($body === false) {
-                throw new \RuntimeException('Microsoft Entra request failed: ' . curl_error($curl));
-            }
-        } finally {
-            curl_close($curl);
-        }
-
-        $decoded = json_decode((string)$body, true);
-        if ($status < 200 || $status >= 300 || !is_array($decoded)) {
-            $message = is_array($decoded)
-                ? (string)($decoded['error_description'] ?? $decoded['error']['message'] ?? 'Unexpected response')
-                : 'Invalid JSON response';
-            throw new \RuntimeException('Microsoft Entra request failed with HTTP ' . $status . ': ' . $message);
-        }
-
-        return $decoded;
+        return new ClientCredentialContext(
+            $this->config->tenant_id->getVariableValue(),
+            $this->config->client_id->getVariableValue(),
+            $this->config->client_secret->getVariableValue()
+        );
    }
-}
+}
@@ -92,17 +92,12 @@ class error_report_service
            throw new RuntimeException('Data collection acceptance is required.');
        }

+        $screenshot = self::decodeScreenshotDataUri((string)($payload['screenshot'] ?? ''));
+        $storedScreenshot = $this->store->storeScreenshot($screenshot['mime_type'], $screenshot['contents']);
        $context = is_array($payload['context'] ?? null) ? $payload['context'] : [];
-        $storedScreenshot = $this->storeOptionalScreenshot($payload['screenshot'] ?? null, $context);
        $requestErrors = $this->boundedArray($payload['request_errors'] ?? ($context['request_errors'] ?? []), 25);
        $vueErrors = $this->boundedArray($payload['vue_errors'] ?? ($context['vue_errors'] ?? []), 25);
        $runtimeContext = $this->runtimeContext($payload, $context);
-        $runtimeContext['screenshot_attachment'] = [
-            'status' => $storedScreenshot['status'],
-            'attached' => $storedScreenshot['key'] !== '',
-            'mime_type' => $storedScreenshot['mime_type'] !== '' ? $storedScreenshot['mime_type'] : null,
-            'size_bytes' => (int)$storedScreenshot['size_bytes'],
-        ];

        $this->execute(
            "INSERT INTO error_reports (
@@ -300,67 +295,6 @@ class error_report_service
        return $value === true || $value === 1 || $value === '1' || $value === 'true';
    }

-    private function storeOptionalScreenshot(mixed $value, array $context): array
-    {
-        if (!is_scalar($value) && !$value instanceof \Stringable && $value !== null) {
-            return $this->emptyScreenshotAttachment('invalid');
-        }
-
-        $dataUri = trim((string)($value ?? ''));
-        if ($dataUri === '') {
-            return $this->emptyScreenshotAttachment($this->contextScreenshotStatus($context) ?? 'not_provided');
-        }
-
-        try {
-            $screenshot = self::decodeScreenshotDataUri($dataUri);
-        } catch (RuntimeException $exception) {
-            $message = strtolower($exception->getMessage());
-            return $this->emptyScreenshotAttachment(str_contains($message, 'too large') ? 'too_large' : 'invalid');
-        }
-
-        try {
-            $storedScreenshot = $this->store->storeScreenshot($screenshot['mime_type'], $screenshot['contents']);
-        } catch (Throwable) {
-            return $this->emptyScreenshotAttachment('storage_failed');
-        }
-
-        return [
-            'key' => (string)($storedScreenshot['key'] ?? ''),
-            'mime_type' => (string)($storedScreenshot['mime_type'] ?? $screenshot['mime_type']),
-            'size_bytes' => (int)($storedScreenshot['size_bytes'] ?? $screenshot['size_bytes']),
-            'status' => 'stored',
-        ];
-    }
-
-    private function emptyScreenshotAttachment(string $status): array
-    {
-        return [
-            'key' => '',
-            'mime_type' => '',
-            'size_bytes' => 0,
-            'status' => $status,
-        ];
-    }
-
-    private function contextScreenshotStatus(array $context): ?string
-    {
-        $attachment = $context['screenshot_attachment'] ?? null;
-        $status = is_array($attachment) ? ($attachment['status'] ?? null) : null;
-        $status ??= $context['screenshot_capture_status'] ?? $context['screenshot_status'] ?? null;
-
-        return $this->normalizeEmptyScreenshotStatus($status);
-    }
-
-    private function normalizeEmptyScreenshotStatus(mixed $status): ?string
-    {
-        $status = strtolower(trim((string)$status));
-        if (in_array($status, ['capture_failed', 'not_provided'], true)) {
-            return $status;
-        }
-
-        return null;
-    }
-
    private function runtimeContext(array $payload, array $context): array
    {
        return [
@@ -498,10 +432,6 @@ class error_report_service

    private function publicReport(array $row, bool $includeDetail): array
    {
-        $screenshotMimeType = trim((string)($row['screenshot_mime_type'] ?? ''));
-        $screenshotSizeBytes = isset($row['screenshot_size_bytes']) ? (int)$row['screenshot_size_bytes'] : 0;
-        $hasScreenshot = $screenshotMimeType !== '' && $screenshotSizeBytes > 0;
-
        $report = [
            'id' => (int)$row['id'],
            'status' => (string)$row['status'],
@@ -519,10 +449,10 @@ class error_report_service
            'release_trace_id' => $row['release_trace_id'] ?? null,
            'frontend_version' => $row['frontend_version'] ?? null,
            'api_version' => $row['api_version'] ?? null,
-            'screenshot' => $hasScreenshot ? [
-                'mime_type' => $screenshotMimeType,
-                'size_bytes' => $screenshotSizeBytes,
-            ] : null,
+            'screenshot' => [
+                'mime_type' => $row['screenshot_mime_type'] ?? null,
+                'size_bytes' => isset($row['screenshot_size_bytes']) ? (int)$row['screenshot_size_bytes'] : 0,
+            ],
            'answers' => [
                'before_error' => $row['before_error'] ?? '',
                'expected' => $row['expected'] ?? '',
@@ -537,11 +467,8 @@ class error_report_service
        ];

        if ($includeDetail) {
-            if ($hasScreenshot) {
-                $objectKey = trim((string)($row['screenshot_object_key'] ?? ''));
-                $report['screenshot']['url'] = $this->store->screenshotUrl($objectKey);
-                $report['screenshot']['object_key'] = $objectKey !== '' ? $objectKey : null;
-            }
+            $report['screenshot']['url'] = $this->store->screenshotUrl((string)($row['screenshot_object_key'] ?? ''));
+            $report['screenshot']['object_key'] = $row['screenshot_object_key'] ?? null;
            $report['request_errors'] = $this->jsonDecode($row['request_errors_json'] ?? null);
            $report['vue_errors'] = $this->jsonDecode($row['vue_errors_json'] ?? null);
            $report['runtime_context'] = $this->jsonDecode($row['runtime_context_json'] ?? null);
@@ -10,6 +10,7 @@ require_once WD . '/modules/forms/form_helper_c.php';

 use Exception;
 use forms\form_helper_c;
+use forms\objects\book_interior_wash_f;
 use forms\objects\book_wash_f;
 use objects\form_submissions_o;
 use traits\form_t;
@@ -11,7 +11,6 @@ use fxratesapi\actions\convert_rate_a;
 use fxratesapi\fxratesapi_c;
 use interfaces\fxratesapi_i;
 use objects\fxratesapi_conversion_rates_o;
-use Throwable;

 class fxratesapi implements fxratesapi_i
 {
@@ -118,10 +117,10 @@ class fxratesapi implements fxratesapi_i
        // Validate the base and target currencies
        self::requireValidCurrency($base);
        self::requireValidCurrency($target);
+        // Validate the daily limit
+        self::requireDailyLimitNotExceeded();
        // Validate the secret key
        self::requireValidSecretKey();
-        // Reserve quota for the outbound provider call. Cached conversion reads return before this point.
-        $this->reserveRateFetchQuota($base, $target, $endpoint, $method);
        // Send the request
        $response = match ($method) {
            'GET' => self::sendGetRequest($base, $target, $endpoint, $data),
@@ -168,7 +167,7 @@ class fxratesapi implements fxratesapi_i
    function requireDailyLimitNotExceeded(): void
    {
        // Check if the daily limit is exceeded
-        if ($this->getDailyRequestCounter() >= (int)$this->config->daily_limit->getVariableValue()) {
+        if ($this->getDailyRequestCounter() >= $this->config->daily_limit->getVariableValue()) {
            throw new Exception('Daily limit exceeded');
        }
    }
@@ -178,30 +177,12 @@ class fxratesapi implements fxratesapi_i
     */
    function getDailyRequestCounter(): int
    {
-        try {
-            return (new module_usage_service())->currentUsedQuantity('fxratesapi', 'rate_fetch_calls');
-        } catch (Throwable) {
-        }
-
        // Count the rows from the fxratesapi request log that was made today
        $fxratesapi_lookups = new fxratesapi_conversion_rates_o();
        $fxratesapi_lookups->getTodayCount();
        return $fxratesapi_lookups->getTodayCount();
    }

-    /**
-     * @throws Exception
-     */
-    private function reserveRateFetchQuota(string $base, string $target, string $endpoint, string $method): void
-    {
-        (new module_usage_service())->reserveOrFail('fxratesapi', 'rate_fetch_calls', 1, [
-            'base' => $base,
-            'target' => $target,
-            'endpoint' => $endpoint,
-            'method' => strtoupper($method),
-        ]);
-    }
-
    /**
     * @inheritDoc
     */
@@ -534,4 +515,4 @@ class fxratesapi implements fxratesapi_i
            throw new Exception('Failed to add request to log');
        }
    }
-}
+}
@@ -1,142 +0,0 @@
-<?php
-
-namespace classes;
-
-/**
- * Ensures additive audit columns used when invoice collections are superseded.
- */
-class invoice_collection_schema_bootstrap
-{
-    private const TABLE = 'collected_order_invoices';
-    private const LOCK_NAME = 'invoice_collection_schema_v1';
-
-    /** @var array<string, string> */
-    private const REQUIRED_COLUMNS = [
-        'superseded_by_collection_id' => 'INT NULL',
-        'superseded_at' => 'DATETIME NULL',
-        'superseded_by_user_id' => 'INT NULL',
-    ];
-
-    public static function hasRequiredColumns(): bool
-    {
-        try {
-            global $db;
-            if (!self::canInspectSchema($db) || !self::tableExists($db)) {
-                return false;
-            }
-            if (self::allColumnsExist($db)) {
-                return true;
-            }
-            if (!self::acquireLock($db)) {
-                return false;
-            }
-
-            try {
-                // Another worker may have completed the additive migration while
-                // this request waited for the advisory lock.
-                foreach (self::REQUIRED_COLUMNS as $column => $definition) {
-                    if (self::columnExists($db, $column)) {
-                        continue;
-                    }
-                    $result = $db->query(
-                        "ALTER TABLE `" . self::TABLE . "` ADD COLUMN `{$column}` {$definition}"
-                    );
-                    if ($result === false) {
-                        return false;
-                    }
-                }
-
-                if (!self::allColumnsExist($db)) {
-                    return false;
-                }
-                return true;
-            } finally {
-                self::releaseLock($db);
-            }
-        } catch (\Throwable) {
-            // Schema readiness is a capability gate. It must never break the
-            // legacy invoicing routes when DDL or metadata access is unavailable.
-            return false;
-        }
-    }
-
-    private static function canInspectSchema(mixed $db): bool
-    {
-        return is_object($db)
-            && method_exists($db, 'query')
-            && method_exists($db, 'escape_string')
-            && method_exists($db, 'getDatabase');
-    }
-
-    private static function tableExists(object $db): bool
-    {
-        return self::informationSchemaCount(
-            $db,
-            'information_schema.TABLES',
-            'TABLE_NAME',
-            self::TABLE
-        ) > 0;
-    }
-
-    private static function columnExists(object $db, string $column): bool
-    {
-        return self::informationSchemaCount(
-            $db,
-            'information_schema.COLUMNS',
-            'COLUMN_NAME',
-            $column
-        ) > 0;
-    }
-
-    private static function informationSchemaCount(
-        object $db,
-        string $informationSchemaTable,
-        string $nameField,
-        string $name
-    ): int {
-        $database = $db->escape_string((string)$db->getDatabase());
-        $name = $db->escape_string($name);
-        $result = $db->query(
-            "SELECT COUNT(*) AS c FROM {$informationSchemaTable} "
-            . "WHERE TABLE_SCHEMA = '{$database}' AND TABLE_NAME = '" . self::TABLE . "' "
-            . "AND {$nameField} = '{$name}'"
-        );
-        if (!is_object($result) || !method_exists($result, 'fetch_assoc')) {
-            throw new \RuntimeException('Invoice collection schema inspection failed');
-        }
-        $row = $result->fetch_assoc();
-        if (!is_array($row) || !array_key_exists('c', $row)) {
-            throw new \RuntimeException('Invoice collection schema inspection returned an invalid result');
-        }
-        return (int)$row['c'];
-    }
-
-    private static function allColumnsExist(object $db): bool
-    {
-        foreach (array_keys(self::REQUIRED_COLUMNS) as $column) {
-            if (!self::columnExists($db, $column)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    private static function acquireLock(object $db): bool
-    {
-        $result = $db->query("SELECT GET_LOCK('" . self::LOCK_NAME . "', 5) AS acquired");
-        if (!is_object($result) || !method_exists($result, 'fetch_assoc')) {
-            return false;
-        }
-        $row = $result->fetch_assoc();
-        return is_array($row) && (int)($row['acquired'] ?? 0) === 1;
-    }
-
-    private static function releaseLock(object $db): void
-    {
-        try {
-            $db->query("SELECT RELEASE_LOCK('" . self::LOCK_NAME . "')");
-        } catch (\Throwable) {
-            // The connection also releases advisory locks automatically.
-        }
-    }
-}
@@ -57,10 +57,7 @@ class invoice_period_flag_schema_bootstrap
        );

        products_schema_bootstrap::ensureTables();
-
-        // Invoice-period flags remain available while the separately operated
-        // XL Vask automation migration is pending. XL Vask-specific flag
-        // detection already fails closed when its optional schema is absent.
+        xlvask_usage_logs_schema_bootstrap::ensureTables();

        self::$initialized = true;
    }
@@ -30,8 +30,6 @@ class invoice_period_flag_service
    public function __construct()
    {
        invoice_period_flag_schema_bootstrap::ensureTables();
-        price_overrides_schema_bootstrap::ensureColumns();
-        department_customer_price_overrides_schema_bootstrap::ensureTables();
    }

    public function createManualFlag(array $payload, int $userId): array
@@ -76,11 +74,8 @@ class invoice_period_flag_service
            $this->nullableIntSql($userId > 0 ? $userId : null)
        );
        $db->query($sql);
-        $flagId = (int)$db->insert_id();

-        $this->refreshManualFlagsCacheAfterMutation();
-
-        return $this->getStoredFlag($flagId);
+        return $this->getStoredFlag((int)$db->insert_id());
    }

    public function updateManualFlagStatus(int $id, string $status, ?string $reason, int $userId): array
@@ -110,8 +105,6 @@ class invoice_period_flag_service
        );
        $db->query($sql);

-        $this->refreshManualFlagsCacheAfterMutation();
-
        return $this->getStoredFlag($id);
    }

@@ -232,61 +225,6 @@ class invoice_period_flag_service
        return $types;
    }

-    /**
-     * Add only aggregate active manual-flag counts for readiness derivation.
-     * Flag details remain absent when the caller lacks list_invoice_period_flags.
-     *
-     * @param array<string,array<int,array<string,mixed>>> $types
-     * @param int[]|null $onlyCustomerNumbers
-     * @return array<string,array<int,array<string,mixed>>>
-     */
-    public function applyManualFlagCountsToPeriodTypes(
-        array $types,
-        string $dateFrom,
-        string $dateTo,
-        ?array $onlyCustomerNumbers = null
-    ): array {
-        $context = $this->buildPeriodContext($types, $dateFrom, $dateTo, $onlyCustomerNumbers);
-        $manualFlags = $this->getManualFlagsForPeriod($context, $dateFrom, $dateTo, $onlyCustomerNumbers);
-        return $this->applyManualFlagCounts($types, $manualFlags);
-    }
-
-    private function applyManualFlagCounts(array $types, array $manualFlags): array
-    {
-        $flagsByCustomerNumber = [];
-        foreach ($manualFlags as $flag) {
-            $customerNumber = (int)($flag['customer_number'] ?? 0);
-            if ($customerNumber > 0) {
-                $flagsByCustomerNumber[$customerNumber][] = $flag;
-            }
-        }
-
-        foreach ($types as $typeName => $customers) {
-            foreach ($customers as $index => $customer) {
-                $customerNumber = (int)($customer['customer_number'] ?? 0);
-                $customerFlags = $this->flagsForCustomerCard(
-                    $customer,
-                    $flagsByCustomerNumber[$customerNumber] ?? [],
-                    (string)$typeName
-                );
-                $activeManualCount = count(array_filter(
-                    $customerFlags,
-                    static fn(array $flag): bool => ($flag['source'] ?? null) === self::SOURCE_MANUAL
-                        && ($flag['status'] ?? self::STATUS_ACTIVE) === self::STATUS_ACTIVE
-                ));
-                $existingAutomaticCount = (int)($customer['flag_counts']['automatic'] ?? 0);
-                $types[$typeName][$index]['flag_counts'] = [
-                    'manual' => $activeManualCount,
-                    'automatic' => $existingAutomaticCount,
-                    'total' => $activeManualCount + $existingAutomaticCount,
-                ];
-                unset($types[$typeName][$index]['flags']);
-            }
-        }
-
-        return $types;
-    }
-
    private function flagsForCustomerCard(array $customer, array $flags, string $typeName = ''): array
    {
        $transactionIds = [];
@@ -391,12 +329,6 @@ class invoice_period_flag_service
        }
    }

-    private function refreshManualFlagsCacheAfterMutation(): void
-    {
-        $this->manualFlagsInstanceCache = null;
-        $this->warmManualFlagsCache();
-    }
-
    private function fetchActiveManualFlagsFromDb(): array
    {
        global $db;
@@ -756,7 +688,6 @@ class invoice_period_flag_service
                o.po AS order_po,
                o.notes AS order_notes,
                o.department_id,
-                d.custom_pricing_only AS department_custom_pricing_only,
                o.reg_1,
                o.invoice_collection_id,
                o.wash_id,
@@ -779,21 +710,8 @@ class invoice_period_flag_service
                p.max_quantity_per_order,
                c.name AS category_name,
                pdp.price AS department_price,
-                CASE
-                    WHEN d.custom_pricing_only = 1 THEN department_product_discount.percentage
-                    ELSE product_discount.percentage
-                END AS product_discount_percentage,
-                CASE
-                    WHEN d.custom_pricing_only = 1 THEN department_product_discount.fixed_price
-                    ELSE product_discount.fixed_price
-                END AS product_fixed_price,
-                CASE
-                    WHEN d.custom_pricing_only = 1 THEN GREATEST(
-                        COALESCE(department_category_discount.percentage, 0),
-                        COALESCE(department_global_discount.percentage, 0)
-                    )
-                    ELSE category_discount.percentage
-                END AS category_discount_percentage
+                product_discount.percentage AS product_discount_percentage,
+                category_discount.percentage AS category_discount_percentage
            FROM orders o
            LEFT JOIN (
                SELECT customer_number, MIN(id) AS id, MAX(display_name) AS display_name
@@ -802,12 +720,11 @@ class invoice_period_flag_service
                GROUP BY customer_number
            ) u ON u.customer_number = o.customer_id
            LEFT JOIN order_items oi ON oi.order_id = o.id AND (oi.deleted_at IS NULL OR oi.deleted_at = '')
-            LEFT JOIN departments d ON d.id = o.department_id
            LEFT JOIN products p ON p.id = oi.product_id
            LEFT JOIN categories c ON c.id = p.category
            LEFT JOIN product_department_prices pdp ON pdp.department_id = o.department_id AND pdp.product_id = p.id
            LEFT JOIN (
-                SELECT discount_user.customer_number, po.product_or_category_id, MAX(po.percentage) AS percentage, MAX(po.fixed_price) AS fixed_price
+                SELECT discount_user.customer_number, po.product_or_category_id, MAX(po.percentage) AS percentage
                FROM price_overrides po
                INNER JOIN users discount_user ON discount_user.id = po.user_id
                WHERE po.is_category = 0
@@ -824,32 +741,6 @@ class invoice_period_flag_service
            ) category_discount
                ON category_discount.customer_number = o.customer_id
               AND category_discount.product_or_category_id = p.category
-            LEFT JOIN (
-                SELECT department_id, user_id, product_or_category_id, MAX(percentage) AS percentage, MAX(fixed_price) AS fixed_price
-                FROM department_customer_price_overrides
-                WHERE is_category = 0
-                GROUP BY department_id, user_id, product_or_category_id
-            ) department_product_discount
-                ON department_product_discount.department_id = o.department_id
-               AND department_product_discount.user_id = u.id
-               AND department_product_discount.product_or_category_id = p.id
-            LEFT JOIN (
-                SELECT department_id, user_id, product_or_category_id, MAX(percentage) AS percentage
-                FROM department_customer_price_overrides
-                WHERE is_category = 1 AND product_or_category_id <> 'global'
-                GROUP BY department_id, user_id, product_or_category_id
-            ) department_category_discount
-                ON department_category_discount.department_id = o.department_id
-               AND department_category_discount.user_id = u.id
-               AND department_category_discount.product_or_category_id = p.category
-            LEFT JOIN (
-                SELECT department_id, user_id, MAX(percentage) AS percentage
-                FROM department_customer_price_overrides
-                WHERE is_category = 1 AND product_or_category_id = 'global'
-                GROUP BY department_id, user_id
-            ) department_global_discount
-                ON department_global_discount.department_id = o.department_id
-               AND department_global_discount.user_id = u.id
            WHERE o.created_at BETWEEN '{$escapedDateFrom}' AND '{$escapedDateTo}'
              AND o.deleted_at IS NULL
            ORDER BY o.customer_id, o.id, oi.id";
@@ -913,16 +804,11 @@ class invoice_period_flag_service
    {
        global $db;

-        customer_rule_product_restriction_schema_bootstrap::ensureSchema();
-
        $customerFilter = $this->customerFilterSql('u.customer_number', $onlyCustomerNumbers);
        $result = $db->query(
-            "SELECT u.customer_number, ca.attribute, cp.product_id
+            "SELECT u.customer_number, ca.attribute
             FROM customer_attributes ca
             JOIN users u ON u.id = ca.user_id
-             LEFT JOIN customer_rule_product_restrictions r ON r.attribute = ca.attribute
-             LEFT JOIN customer_rule_product_collections c ON c.attribute = r.attribute
-             LEFT JOIN customer_rule_product_collection_products cp ON cp.collection_id = c.id
             WHERE 1=1 {$customerFilter}"
        );

@@ -933,11 +819,7 @@ class invoice_period_flag_service

        while ($row = $result->fetch_assoc()) {
            $customerNumber = (int)$row['customer_number'];
-            $attribute = (string)$row['attribute'];
-            $attributes[$customerNumber][$attribute] = true;
-            if ($row['product_id'] !== null && in_array($attribute, customer_rule_product_restriction_service::PRODUCT_IMPACT_ATTRIBUTES, true)) {
-                $attributes[$customerNumber]['__disabled_products'][(int)$row['product_id']][$attribute] = true;
-            }
+            $attributes[$customerNumber][(string)$row['attribute']] = true;
        }

        return $attributes;
@@ -948,8 +830,6 @@ class invoice_period_flag_service
        $flags = [];
        $orders = [];
        $collectionOrders = [];
-        $matchingRules = static fn(int $customerNumber, int $productId): array =>
-            array_keys($attributes[$customerNumber]['__disabled_products'][$productId] ?? []);

        foreach ($rows as $row) {
            $customerNumber = (int)$row['customer_number'];
@@ -975,17 +855,57 @@ class invoice_period_flag_service
                continue;
            }

-            $productRuleDefinitions = [
-                'restrictAdditionalServices' => 'customer_rule_restrict_addon_services',
-                'restrictTankCleaning' => 'customer_rule_restrict_tank_cleaning',
-                'onlyTankCleaning' => 'customer_rule_only_tank_cleaning',
-                'restrictSpotFree' => 'customer_rule_restrict_spot_free',
-                'restrictInteriorCleaning' => 'customer_rule_restrict_interior_cleaning',
+            $isTankCleaningProduct = $this->rowIsTankCleaningProduct($row);
+
+            if ($this->hasAttribute($attributes, $customerNumber, 'restrictAdditionalServices')
+                && (int)($row['related_item_id'] ?? 0) > 0
+                && (int)($row['item_price'] ?? 0) > 0) {
+                $flags[] = $this->automaticFlag(
+                    'customer_rule_restrict_addon_services',
+                    'order_item',
+                    (int)$row['order_item_id'],
+                    null,
+                    $row,
+                    ['product' => $this->productLabel($row)],
+                    $this->orderItemContext($row)
+                );
+            }
+
+            if ($this->hasAttribute($attributes, $customerNumber, 'restrictTankCleaning') && $isTankCleaningProduct) {
+                $flags[] = $this->automaticFlag(
+                    'customer_rule_restrict_tank_cleaning',
+                    'order_item',
+                    (int)$row['order_item_id'],
+                    null,
+                    $row,
+                    ['product' => $this->productLabel($row)],
+                    $this->orderItemContext($row)
+                );
+            }
+
+            if ($this->hasAttribute($attributes, $customerNumber, 'onlyTankCleaning') && !$isTankCleaningProduct) {
+                $flags[] = $this->automaticFlag(
+                    'customer_rule_only_tank_cleaning',
+                    'order_item',
+                    (int)$row['order_item_id'],
+                    null,
+                    $row,
+                    ['product' => $this->productLabel($row)],
+                    $this->orderItemContext($row)
+                );
+            }
+
+            $restrictedProducts = [
+                'restrictSpotFree' => ['customer_rule_restrict_spot_free', ['spot free', 'spotfree']],
+                'restrictInteriorCleaning' => ['customer_rule_restrict_interior_cleaning', ['interior', 'indvendig']],
+                'exemptFromAdministrationFee' => ['customer_rule_exempt_from_administration_fees', ['administration fee', 'administrationsgebyr', 'administration']],
            ];
-            foreach ($matchingRules($customerNumber, (int)($row['product_id'] ?? 0)) as $attribute) {
-                if (isset($productRuleDefinitions[$attribute])) {
+
+            foreach ($restrictedProducts as $attribute => [$definitionKey, $terms]) {
+                if ($this->hasAttribute($attributes, $customerNumber, $attribute)
+                    && $this->rowMatchesProductTerms($row, $terms)) {
                    $flags[] = $this->automaticFlag(
-                        $productRuleDefinitions[$attribute],
+                        $definitionKey,
                        'order_item',
                        (int)$row['order_item_id'],
                        null,
@@ -995,19 +915,6 @@ class invoice_period_flag_service
                    );
                }
            }
-
-            if ($this->hasAttribute($attributes, $customerNumber, 'exemptFromAdministrationFee')
-                && $this->rowMatchesProductTerms($row, ['administration fee', 'administrationsgebyr', 'administration'])) {
-                $flags[] = $this->automaticFlag(
-                    'customer_rule_exempt_from_administration_fees',
-                    'order_item',
-                    (int)$row['order_item_id'],
-                    null,
-                    $row,
-                    ['product' => $this->productLabel($row)],
-                    $this->orderItemContext($row)
-                );
-            }
        }

        foreach ($orders as $orderId => $row) {
@@ -1297,34 +1204,7 @@ class invoice_period_flag_service
            }
        }

-        // Partition primary rows by whether reg_2 is empty. A single-tractor order (reg_2 = '')
-        // should only be compared against historical orders that ALSO had reg_2 empty, so we don't
-        // raise a "historical_primary_product_mismatch" flag that names the tractor-trailer
-        // (Forvogn med hænger) product as the expected one when the current order has no trailer.
-        $hasReg2 = [];
-        $emptyReg2 = [];
-        foreach ($primaryRows as $row) {
-            if (trim((string)($row['reg_2'] ?? '')) === '') {
-                $emptyReg2[] = $row;
-            } else {
-                $hasReg2[] = $row;
-            }
-        }
-        $history = [];
-        if (!empty($emptyReg2)) {
-            $history = $history + $this->getPrimaryProductHistory(
-                $dateFrom,
-                array_column($emptyReg2, 'reg_1'),
-                true
-            );
-        }
-        if (!empty($hasReg2)) {
-            $history = $history + $this->getPrimaryProductHistory(
-                $dateFrom,
-                array_column($hasReg2, 'reg_1'),
-                false
-            );
-        }
+        $history = $this->getPrimaryProductHistory($dateFrom, array_column($primaryRows, 'reg_1'));
        foreach ($primaryRows as $row) {
            $reg = strtoupper(trim((string)($row['reg_1'] ?? '')));
            if ($reg === '' || !isset($history[$reg])) {
@@ -1495,7 +1375,6 @@ class invoice_period_flag_service
    {
        $product = (string)($params['product'] ?? 'Item');
        $expectedProduct = (string)($params['expected_product'] ?? 'expected product');
-        $washId = (string)($params['wash_id'] ?? '');
        return match ($definitionKey) {
            'price_mismatch' => "{$product} product price differs from expected.",
            'customer_rule_restrict_addon_services' => "{$product} violates restricted addon services.",
@@ -1515,9 +1394,7 @@ class invoice_period_flag_service
            'duplicate_vehicle_subscription_charge_same_month' => "Duplicate vehicle subscription charges exist in the same month.",
            'vehicle_subscription_type_mismatch' => "{$product} does not match the vehicle subscription type {$expectedProduct}.",
            'historical_primary_product_mismatch' => "{$product} differs from the registration number's usual product {$expectedProduct}.",
-            'xlvask_missing_order_link' => $washId === ''
-                ? 'XL Vask wash is neither ignored nor linked to an order in the selected period.'
-                : "XL Vask wash {$washId} is neither ignored nor linked to an order in the selected period.",
+            'xlvask_missing_order_link' => "XL Vask wash is neither ignored nor linked to an order in the selected period.",
            default => "Automatically detected invoice-period issue.",
        };
    }
@@ -1544,8 +1421,7 @@ class invoice_period_flag_service
                ['type' => 'text', 'text' => ' is attached without a wash certificate item.'],
            ],
            'xlvask_missing_order_link' => [
-                ['type' => 'text', 'text' => 'XL Vask wash '],
-                ['type' => 'xlvask_usage_log', 'text' => (string)($params['wash_id'] ?? '')],
+                ['type' => 'xlvask_usage_log', 'text' => 'XL Vask wash'],
                ['type' => 'text', 'text' => ' is neither ignored nor linked to an order in the selected period.'],
            ],
            default => [],
@@ -1805,7 +1681,7 @@ class invoice_period_flag_service
        return $map;
    }

-    private function getPrimaryProductHistory(string $dateFrom, array $registrationNumbers, ?bool $requireReg2Empty = null): array
+    private function getPrimaryProductHistory(string $dateFrom, array $registrationNumbers): array
    {
        global $db;

@@ -1826,16 +1702,6 @@ class invoice_period_flag_service
        $registrationFilter = implode(',', array_map(static function (string $registrationNumber) use ($db): string {
            return "'" . $db->escape_string($registrationNumber) . "'";
        }, array_keys($registrations)));
-        // Restrict historical orders to those whose reg_2 status matches the current rows:
-        //   - null  → no filter (default behaviour, backwards compatible)
-        //   - true  → reg_2 empty (single-tractor orders only)
-        //   - false → reg_2 non-empty (tractor-trailer combo orders only)
-        $reg2Filter = '';
-        if ($requireReg2Empty === true) {
-            $reg2Filter = "AND (COALESCE(o.reg_2, '') = '')";
-        } elseif ($requireReg2Empty === false) {
-            $reg2Filter = "AND (COALESCE(o.reg_2, '') <> '')";
-        }
        $result = $db->query(
            "SELECT UPPER(TRIM(o.reg_1)) AS reg, oi.product_id, p.name AS product_name, COUNT(*) AS usage_count
             FROM orders o
@@ -1849,7 +1715,6 @@ class invoice_period_flag_service
               AND COALESCE(oi.related_item_id, 0) = 0
               AND COALESCE(o.reg_1, '') <> ''
               AND o.reg_1 IN ({$registrationFilter})
-               {$reg2Filter}
             GROUP BY UPPER(TRIM(o.reg_1)), oi.product_id, p.name
             ORDER BY reg, usage_count DESC, oi.product_id ASC"
        );
@@ -2056,19 +1921,7 @@ class invoice_period_flag_service

    private function calculateExpectedPrice(array $row): int
    {
-        $customMissingPrice = $this->isCustomMissingDepartmentPrice($row);
-        if ($customMissingPrice) {
-            return \objects\products_o::CUSTOM_PRICING_MISSING_PRICE;
-        }
-
-        $fixedPrice = $this->rowProductFixedPrice($row);
-        if ($fixedPrice !== null) {
-            return $fixedPrice;
-        }
-
-        $base = $row['department_price'] !== null
-            ? (int)$row['department_price']
-            : (int)($row['product_base_price'] ?? 0);
+        $base = $row['department_price'] !== null ? (int)$row['department_price'] : (int)($row['product_base_price'] ?? 0);
        $discount = $this->discountBreakdown($row)['applied_discount_percentage'];
        return (int)round($base * (1 - ($discount / 100)));
    }
@@ -2076,18 +1929,13 @@ class invoice_period_flag_service
    private function priceBreakdown(array $row, int $expected): array
    {
        $departmentPrice = $row['department_price'] !== null ? (int)$row['department_price'] : null;
-        $customMissingPrice = $this->isCustomMissingDepartmentPrice($row);
-        $base = $departmentPrice ?? ($customMissingPrice ? \objects\products_o::CUSTOM_PRICING_MISSING_PRICE : (int)($row['product_base_price'] ?? 0));
+        $base = $departmentPrice ?? (int)($row['product_base_price'] ?? 0);
        $discount = $this->discountBreakdown($row);
-        if ($customMissingPrice) {
-            $discount['applied_discount_percentage'] = 0;
-        }

        return [
-            'product_price' => $customMissingPrice ? \objects\products_o::CUSTOM_PRICING_MISSING_PRICE : (int)($row['product_base_price'] ?? 0),
+            'product_price' => (int)($row['product_base_price'] ?? 0),
            'department_price' => $departmentPrice,
            'effective_base_price' => $base,
-            'product_fixed_price' => $this->rowProductFixedPrice($row),
            'product_discount_percentage' => $discount['product_discount_percentage'],
            'category_discount_percentage' => $discount['category_discount_percentage'],
            'economic_customer_discount_percentage' => $discount['economic_customer_discount_percentage'],
@@ -2096,36 +1944,21 @@ class invoice_period_flag_service
        ];
    }

-    private function isCustomMissingDepartmentPrice(array $row): bool
-    {
-        return $row['department_price'] === null && (bool)(int)($row['department_custom_pricing_only'] ?? 0);
-    }
-
    private function discountBreakdown(array $row): array
    {
        $productDiscount = (int)($row['product_discount_percentage'] ?? 0);
        $categoryApplied = (int)($row['apply_category_discount'] ?? 0) === 1;
        $categoryDiscount = $categoryApplied ? (int)($row['category_discount_percentage'] ?? 0) : 0;
        $economicDiscount = $categoryApplied ? $this->economicCustomerDiscountPercentage($row) : 0;
-        $appliedDiscount = $this->rowProductFixedPrice($row) !== null
-            ? 0
-            : max($productDiscount, $categoryDiscount, $economicDiscount);

        return [
            'product_discount_percentage' => $productDiscount,
            'category_discount_percentage' => $categoryDiscount,
            'economic_customer_discount_percentage' => $economicDiscount,
-            'applied_discount_percentage' => $appliedDiscount,
+            'applied_discount_percentage' => max($productDiscount, $categoryDiscount, $economicDiscount),
        ];
    }

-    private function rowProductFixedPrice(array $row): ?int
-    {
-        return array_key_exists('product_fixed_price', $row) && $row['product_fixed_price'] !== null
-            ? (int)$row['product_fixed_price']
-            : null;
-    }
-
    private function economicCustomerDiscountPercentage(array $row): int
    {
        $customerNumber = (int)($row['customer_number'] ?? 0);
@@ -2201,6 +2034,12 @@ class invoice_period_flag_service
        return false;
    }

+    private function rowIsTankCleaningProduct(array $row): bool
+    {
+        return (int)($row['product_category'] ?? 0) === 5
+            || $this->rowMatchesProductTerms($row, ['tank cleaning', 'tankcleaning', 'tankrens']);
+    }
+
    private function isIncludedOrderItem(array $row): bool
    {
        $value = $row['item_include_in_invoice'] ?? 1;
@@ -27,7 +27,7 @@ class invoice_store implements minio_invoices_i
        return count($objects['Contents'] ?? []) > 0;
    }

-    public function getInvoiceDownloadUrl(int|string $id): string
+    public function getInvoiceDownloadUrl(int $id): string
    {
        return self::getPresignedUrl('invoice_' . $id . '.pdf');
    }
@@ -51,4 +51,4 @@ class invoice_store implements minio_invoices_i
    {
        return self::getS3Client()->doesObjectExist(self::getBucket(), $file);
    }
-}
+}
@@ -137,7 +137,7 @@ class licenseplaterecognizer implements licenseplaterecognizer_i
                            $cached_result = $this->readRecognitionResultCache($result_cache, $result_cache_key);
                            if ($cached_result !== null) {
                                $this->last_timings['cache_hit'] = 1;
-                                return $this->completeRecognition($started_at, $cached_result);
+                                return $cached_result;
                            }
                        }
                    }
@@ -202,7 +202,7 @@ class licenseplaterecognizer implements licenseplaterecognizer_i

                $this->writeRecognitionResultCache($result_cache, $result_cache_key, $recognized_result);

-                return $this->completeRecognition($started_at, $recognized_result);
+                return $recognized_result;
            }

            $recognized_result = [
@@ -211,19 +211,12 @@ class licenseplaterecognizer implements licenseplaterecognizer_i
            ];
            $this->writeRecognitionResultCache($result_cache, $result_cache_key, $recognized_result);

-            return $this->completeRecognition($started_at, $recognized_result);
-        } catch (\Throwable $exception) {
+            return $recognized_result;
+        } finally {
            $this->last_timings['total'] = $this->elapsedMs($started_at);
-            throw $exception;
        }
    }

-    private function completeRecognition(float $started_at, array $result): array
-    {
-        $this->last_timings['total'] = $this->elapsedMs($started_at);
-        return $result;
-    }
-
    private static function clientDisconnectAbortCallback(): callable
    {
        return static function (): int {
@@ -251,11 +244,6 @@ class licenseplaterecognizer implements licenseplaterecognizer_i
        return (string)$configured;
    }

-    public static function configuredApiBaseUrl(): string
-    {
-        return self::normalizeApiUrl(self::configuredApiUrl());
-    }
-
    private static function normalizeApiUrl(string $api_url): string
    {
        $api_url = trim($api_url);
@@ -1,579 +0,0 @@
-<?php
-
-namespace classes;
-
-use objects\logs_o;
-use objects\users_o;
-
-/**
- * Issues narrowly scoped bearer grants which can be exchanged once for a normal
- * employee session. Only a SHA-256 digest is persisted. The bearer is derived
- * under the server encryption key so the same authorized idempotent request can
- * recover an unconsumed grant after a lost response without storing plaintext.
- */
-class limited_backoffice_login_grant_service
-{
-    public const PURPOSE_EMPLOYEE_DIRECT_LOGIN = 'limited_backoffice_employee_login';
-    public const DEFAULT_TTL_SECONDS = 300;
-    public const MIN_TTL_SECONDS = 60;
-    public const MAX_TTL_SECONDS = 900;
-
-    public function __construct()
-    {
-        limited_backoffice_schema_bootstrap::ensureTables();
-    }
-
-    /**
-     * @param array<string, mixed> $payload
-     * @return array<string, mixed>
-     */
-    public function create(users_o $manager, int $employeeId, array $payload): array
-    {
-        (new limited_backoffice_service())->assertEmployeeLoginTarget($manager, $employeeId);
-
-        $purpose = trim((string)($payload['purpose'] ?? self::PURPOSE_EMPLOYEE_DIRECT_LOGIN));
-        if ($purpose !== self::PURPOSE_EMPLOYEE_DIRECT_LOGIN) {
-            throw new limited_backoffice_exception('Unsupported login grant purpose.', 400);
-        }
-
-        $ttlSeconds = $this->ttlSeconds($payload['ttl_seconds'] ?? self::DEFAULT_TTL_SECONDS);
-        $expiresAt = time() + $ttlSeconds;
-        $preflight = ($payload['preflight'] ?? false) === true;
-
-        $base = [
-            'employee_id' => $employeeId,
-            'purpose' => $purpose,
-            'ttl_seconds' => $ttlSeconds,
-            'expires_at' => gmdate('c', $expiresAt),
-            'one_time' => true,
-        ];
-        if ($preflight) {
-            return $base + ['preflight' => true];
-        }
-
-        $idempotencyKey = trim((string)($payload['idempotency_key'] ?? ''));
-        if (strlen($idempotencyKey) < 16 || strlen($idempotencyKey) > 128) {
-            throw new limited_backoffice_exception(
-                'idempotency_key must contain between 16 and 128 characters.',
-                400
-            );
-        }
-        $idempotencyKeyHash = hash('sha256', $idempotencyKey);
-
-        $grantId = bin2hex(random_bytes(16));
-        $bearer = $this->bearerForIdempotency(
-            (int)$manager->id,
-            $employeeId,
-            $purpose,
-            $ttlSeconds,
-            $idempotencyKey
-        );
-        $secretHash = hash('sha256', $bearer);
-
-        $mysqli = $this->mysqli();
-        for ($attempt = 0; $attempt < 3; $attempt++) {
-            $mysqli->begin_transaction();
-            try {
-                if (!$this->lockActiveManagedEmployee($employeeId)) {
-                    throw new limited_backoffice_exception(
-                        'Cannot create a login grant for an inactive employee.',
-                        409
-                    );
-                }
-                // Target-first ordering matches employee update/deletion. Two
-                // cross-managing actors can still form a cycle, so deadlock
-                // victims are retried below with the same idempotency identity.
-                $authorizedActor = $this->lockAuthorizedActor($manager);
-                (new limited_backoffice_service())->assertEmployeeLoginTarget(
-                    $authorizedActor['manager'],
-                    $employeeId,
-                    $authorizedActor['group_id']
-                );
-
-                $existing = $this->findIdempotentGrant(
-                    (int)$manager->id,
-                    $employeeId,
-                    $purpose,
-                    $idempotencyKeyHash
-                );
-                if ($existing !== null) {
-                    if ($this->isReplayableGrant($existing, $secretHash)) {
-                        $mysqli->commit();
-                        return $this->grantResult($employeeId, $purpose, $bearer, $existing);
-                    }
-                    throw $this->duplicateGrantException($existing);
-                }
-
-                $statement = $mysqli->prepare(
-                    'INSERT INTO `limited_backoffice_login_grants`
-                        (`grant_id`, `secret_hash`, `target_user_id`, `actor_user_id`, `purpose`,
-                         `idempotency_key_hash`, `expires_at`)
-                     VALUES (?, ?, ?, ?, ?, ?, ?)'
-                );
-                if ($statement === false) {
-                    throw new limited_backoffice_exception('Unable to prepare login grant.', 500);
-                }
-                $actorUserId = (int)$manager->id;
-                $statement->bind_param(
-                    'ssiissi',
-                    $grantId,
-                    $secretHash,
-                    $employeeId,
-                    $actorUserId,
-                    $purpose,
-                    $idempotencyKeyHash,
-                    $expiresAt
-                );
-                try {
-                    $statement->execute();
-                } finally {
-                    $statement->close();
-                }
-                $mysqli->commit();
-                break;
-            } catch (limited_backoffice_exception $exception) {
-                $mysqli->rollback();
-                throw $exception;
-            } catch (\mysqli_sql_exception $exception) {
-                $mysqli->rollback();
-                $errorCode = (int)$exception->getCode();
-                if (in_array($errorCode, [1205, 1213], true) && $attempt < 2) {
-                    usleep(1000 * ($attempt + 1));
-                    continue;
-                }
-                if ($errorCode === 1062) {
-                    $existing = $this->findIdempotentGrant(
-                        (int)$manager->id,
-                        $employeeId,
-                        $purpose,
-                        $idempotencyKeyHash
-                    );
-                    if ($existing !== null) {
-                        if ($this->isReplayableGrant($existing, $secretHash)) {
-                            return $this->grantResult($employeeId, $purpose, $bearer, $existing);
-                        }
-                        throw $this->duplicateGrantException($existing);
-                    }
-                }
-                throw new limited_backoffice_exception('Unable to create login grant.', 500);
-            } catch (\Throwable) {
-                $mysqli->rollback();
-                throw new limited_backoffice_exception('Unable to create login grant.', 500);
-            }
-        }
-
-        $this->audit(
-            (int)$manager->id,
-            'AUTH_SUCCESS_LIMITED_BACKOFFICE_LOGIN_GRANT_CREATED',
-            'Created one-time login grant ' . $grantId . ' for employee: ' . $employeeId
-        );
-
-        return $this->grantResult($employeeId, $purpose, $bearer, [
-            'grant_id' => $grantId,
-            'expires_at' => $expiresAt,
-        ]);
-    }
-
-    /**
-     * @return array{employee_id:int,token:string}
-     */
-    public function exchange(string $bearer): array
-    {
-        if (!preg_match('/^lbg_[a-f0-9]{64}$/', $bearer)) {
-            throw $this->invalidGrantException();
-        }
-
-        $mysqli = $this->mysqli();
-        $secretHash = hash('sha256', $bearer);
-        $mysqli->begin_transaction();
-
-        try {
-            // Resolve the target without locking, then lock employee -> grant. Employee
-            // deactivation uses the same order, preventing a direct-login session from
-            // surviving a concurrent deactivation and avoiding inverse-order deadlocks.
-            $targetLookup = $mysqli->prepare(
-                'SELECT `target_user_id`
-                 FROM `limited_backoffice_login_grants`
-                 WHERE `secret_hash` = ?
-                 LIMIT 1'
-            );
-            if ($targetLookup === false) {
-                throw new \RuntimeException('Unable to prepare login grant target lookup.');
-            }
-            $targetLookup->bind_param('s', $secretHash);
-            $targetLookup->execute();
-            $target = $targetLookup->get_result()->fetch_assoc() ?: null;
-            $targetLookup->close();
-            if ($target === null || !$this->lockActiveManagedEmployee((int)$target['target_user_id'])) {
-                throw $this->invalidGrantException();
-            }
-
-            $statement = $mysqli->prepare(
-                'SELECT `id`, `grant_id`, `target_user_id`, `purpose`, `expires_at`,
-                        `consumed_at`, `revoked_at`
-                 FROM `limited_backoffice_login_grants`
-                 WHERE `secret_hash` = ?
-                 LIMIT 1
-                 FOR UPDATE'
-            );
-            if ($statement === false) {
-                throw new \RuntimeException('Unable to prepare login grant exchange.');
-            }
-            $statement->bind_param('s', $secretHash);
-            $statement->execute();
-            $row = $statement->get_result()->fetch_assoc() ?: null;
-            $statement->close();
-
-            if (
-                $row === null
-                || $row['purpose'] !== self::PURPOSE_EMPLOYEE_DIRECT_LOGIN
-                || $row['consumed_at'] !== null
-                || $row['revoked_at'] !== null
-                || (int)$row['expires_at'] <= time()
-                || (int)$row['target_user_id'] !== (int)$target['target_user_id']
-            ) {
-                throw $this->invalidGrantException();
-            }
-
-            $grantRowId = (int)$row['id'];
-            $consume = $mysqli->prepare(
-                'UPDATE `limited_backoffice_login_grants`
-                 SET `consumed_at` = UTC_TIMESTAMP()
-                 WHERE `id` = ? AND `consumed_at` IS NULL AND `revoked_at` IS NULL
-                 LIMIT 1'
-            );
-            if ($consume === false) {
-                throw new \RuntimeException('Unable to prepare login grant consumption.');
-            }
-            $consume->bind_param('i', $grantRowId);
-            $consume->execute();
-            $affectedRows = $consume->affected_rows;
-            $consume->close();
-            if ($affectedRows !== 1) {
-                throw $this->invalidGrantException();
-            }
-
-            $employeeId = (int)$row['target_user_id'];
-            $token = (new authentication())->create_employee_token($employeeId);
-            $mysqli->commit();
-        } catch (limited_backoffice_exception $exception) {
-            $mysqli->rollback();
-            throw $exception;
-        } catch (\Throwable) {
-            $mysqli->rollback();
-            throw new limited_backoffice_exception('Unable to exchange login grant.', 500);
-        }
-
-        $this->audit(
-            $employeeId,
-            'AUTH_SUCCESS_LIMITED_BACKOFFICE_LOGIN_GRANT_EXCHANGED',
-            'Exchanged one-time login grant ' . (string)$row['grant_id'] . ' for employee: ' . $employeeId
-        );
-
-        return ['employee_id' => $employeeId, 'token' => $token];
-    }
-
-    /**
-     * @return array{employee_id:int,revoked_count:int}
-     */
-    public function revokeForEmployee(users_o $manager, int $employeeId): array
-    {
-        (new limited_backoffice_service())->assertEmployeeLoginTarget($manager, $employeeId);
-
-        $statement = $this->mysqli()->prepare(
-            'UPDATE `limited_backoffice_login_grants`
-             SET `revoked_at` = UTC_TIMESTAMP()
-             WHERE `target_user_id` = ?
-               AND `consumed_at` IS NULL
-               AND `revoked_at` IS NULL
-               AND `expires_at` >= ?'
-        );
-        if ($statement === false) {
-            throw new limited_backoffice_exception('Unable to prepare login grant revocation.', 500);
-        }
-        $now = time();
-        $statement->bind_param('ii', $employeeId, $now);
-        $statement->execute();
-        $revokedCount = $statement->affected_rows;
-        $statement->close();
-
-        $this->audit(
-            (int)$manager->id,
-            'AUTH_SUCCESS_LIMITED_BACKOFFICE_LOGIN_GRANTS_REVOKED',
-            'Revoked ' . $revokedCount . ' login grants for employee: ' . $employeeId
-        );
-
-        return ['employee_id' => $employeeId, 'revoked_count' => $revokedCount];
-    }
-
-    private function ttlSeconds(mixed $value): int
-    {
-        if (is_string($value) && ctype_digit($value)) {
-            $value = (int)$value;
-        }
-        if (!is_int($value) || $value < self::MIN_TTL_SECONDS || $value > self::MAX_TTL_SECONDS) {
-            throw new limited_backoffice_exception(
-                'ttl_seconds must be between ' . self::MIN_TTL_SECONDS . ' and ' . self::MAX_TTL_SECONDS . '.',
-                400
-            );
-        }
-        return $value;
-    }
-
-    /**
-     * @return array<string, mixed>|null
-     */
-    private function findIdempotentGrant(
-        int $actorUserId,
-        int $employeeId,
-        string $purpose,
-        string $idempotencyKeyHash
-    ): ?array {
-        $statement = $this->mysqli()->prepare(
-            'SELECT `grant_id`, `secret_hash`, `target_user_id`, `purpose`, `expires_at`,
-                    `consumed_at`, `revoked_at`
-             FROM `limited_backoffice_login_grants`
-             WHERE `actor_user_id` = ?
-               AND `target_user_id` = ?
-               AND `purpose` = ?
-               AND `idempotency_key_hash` = ?
-             LIMIT 1'
-        );
-        if ($statement === false) {
-            throw new limited_backoffice_exception('Unable to check login grant idempotency.', 500);
-        }
-        $statement->bind_param('iiss', $actorUserId, $employeeId, $purpose, $idempotencyKeyHash);
-        $statement->execute();
-        $row = $statement->get_result()->fetch_assoc() ?: null;
-        $statement->close();
-        return $row;
-    }
-
-    private function bearerForIdempotency(
-        int $actorUserId,
-        int $employeeId,
-        string $purpose,
-        int $ttlSeconds,
-        string $idempotencyKey
-    ): string {
-        $key = trim((string)($GLOBALS['ENCRYPTION_KEY'] ?? getenv('ENCRYPTION_KEY') ?: ''));
-        if ($key === '') {
-            throw new limited_backoffice_exception('Login grant encryption key is unavailable.', 503);
-        }
-        return 'lbg_' . hash_hmac(
-            'sha256',
-            $actorUserId . ':' . $employeeId . ':' . $purpose . ':' . $ttlSeconds . ':' . $idempotencyKey,
-            $key
-        );
-    }
-
-    private function isReplayableGrant(array $row, string $secretHash): bool
-    {
-        return hash_equals((string)($row['secret_hash'] ?? ''), $secretHash)
-            && ($row['consumed_at'] ?? null) === null
-            && ($row['revoked_at'] ?? null) === null
-            && (int)($row['expires_at'] ?? 0) > time();
-    }
-
-    /**
-     * @param array<string, mixed> $row
-     * @return array<string, mixed>
-     */
-    private function grantResult(
-        int $employeeId,
-        string $purpose,
-        string $bearer,
-        array $row
-    ): array {
-        $expiresAt = (int)$row['expires_at'];
-        return [
-            'employee_id' => $employeeId,
-            'purpose' => $purpose,
-            'ttl_seconds' => max(0, $expiresAt - time()),
-            'expires_at' => gmdate('c', $expiresAt),
-            'one_time' => true,
-            'preflight' => false,
-            'grant_id' => (string)$row['grant_id'],
-            // The fragment avoids ingress request logs and Referer propagation.
-            'login_path' => '/login/qr#grant=' . rawurlencode($bearer),
-            'exchange_path' => '/auth/limited-backoffice-login-grants/exchange',
-        ];
-    }
-
-    private function duplicateGrantException(array $row): limited_backoffice_exception
-    {
-        return new limited_backoffice_exception(
-            'A login grant already exists for this idempotency key.',
-            409,
-            [
-                'message' => 'A login grant already exists for this idempotency key.',
-                'code' => 'LOGIN_GRANT_IDEMPOTENCY_CONFLICT',
-                'grant_id' => (string)$row['grant_id'],
-                'employee_id' => (int)$row['target_user_id'],
-                'purpose' => (string)$row['purpose'],
-                'expires_at' => gmdate('c', (int)$row['expires_at']),
-                'consumed' => $row['consumed_at'] !== null,
-                'revoked' => $row['revoked_at'] !== null,
-            ]
-        );
-    }
-
-    private function invalidGrantException(): limited_backoffice_exception
-    {
-        return new limited_backoffice_exception('Invalid or expired login grant.', 401);
-    }
-
-    private function lockActiveManagedEmployee(int $employeeId): bool
-    {
-        $statement = $this->mysqli()->prepare(
-            'SELECT lbe.`user_id`, lbe.`managed_group_id`, u.`group_id`
-             FROM `limited_backoffice_employees` lbe
-             INNER JOIN `users` u ON u.`id` = lbe.`user_id`
-             WHERE lbe.`user_id` = ? AND lbe.`deactivated_at` IS NULL
-             LIMIT 1
-             FOR UPDATE'
-        );
-        if ($statement === false) {
-            throw new limited_backoffice_exception('Unable to lock login grant employee.', 500);
-        }
-        $statement->bind_param('i', $employeeId);
-        $statement->execute();
-        $employee = $statement->get_result()->fetch_assoc() ?: null;
-        $statement->close();
-        if ($employee === null) {
-            return false;
-        }
-
-        $groupId = (int)$employee['group_id'];
-        $managedGroupId = (int)$employee['managed_group_id'];
-        if ($groupId <= 0 || $groupId === 1 || $managedGroupId !== $groupId) {
-            throw new limited_backoffice_exception('Login grant target is no longer safe.', 403);
-        }
-
-        // Lock the complete permission range so role changes cannot add elevated
-        // capabilities between validation and token creation.
-        $permissions = $this->mysqli()->prepare(
-            'SELECT `permission`
-             FROM `groups_permissions`
-             WHERE `group_id` = ?
-             FOR UPDATE'
-        );
-        if ($permissions === false) {
-            throw new limited_backoffice_exception('Unable to validate login grant role.', 500);
-        }
-        $permissions->bind_param('i', $groupId);
-        $permissions->execute();
-        $result = $permissions->get_result();
-        while ($row = $result->fetch_assoc()) {
-            if ((string)($row['permission'] ?? '') === 'superuser') {
-                $permissions->close();
-                throw new limited_backoffice_exception('Login grant target is no longer safe.', 403);
-            }
-        }
-        $permissions->close();
-
-        $groupUsers = $this->mysqli()->prepare(
-            'SELECT `id` FROM `users` WHERE `group_id` = ? FOR UPDATE'
-        );
-        if ($groupUsers === false) {
-            throw new limited_backoffice_exception('Unable to validate login grant group.', 500);
-        }
-        $groupUsers->bind_param('i', $groupId);
-        $groupUsers->execute();
-        $groupUserResult = $groupUsers->get_result();
-        $userCount = 0;
-        while ($groupUserResult->fetch_assoc() !== null) {
-            $userCount++;
-        }
-        $groupUsers->close();
-        if ($userCount !== 1) {
-            throw new limited_backoffice_exception('Login grant target group is shared.', 403);
-        }
-
-        return true;
-    }
-
-    /**
-     * @return array{manager:users_o,group_id:int}
-     */
-    private function lockAuthorizedActor(users_o $manager): array
-    {
-        $actorUserId = (int)$manager->id;
-        $statement = $this->mysqli()->prepare(
-            'SELECT `group_id` FROM `users` WHERE `id` = ? LIMIT 1 FOR UPDATE'
-        );
-        if ($statement === false) {
-            throw new limited_backoffice_exception('Unable to lock login grant actor.', 500);
-        }
-        $statement->bind_param('i', $actorUserId);
-        $statement->execute();
-        $actor = $statement->get_result()->fetch_assoc() ?: null;
-        $statement->close();
-        if (
-            $actor === null
-            || (int)$actor['group_id'] <= 0
-            || account_deletion_service::principalIsBlocked('customer', $actorUserId)
-        ) {
-            throw new limited_backoffice_exception('Login grant actor is no longer authorized.', 403);
-        }
-
-        $groupId = (int)$actor['group_id'];
-        if ($groupId !== 1) {
-            $requiredPermissions = [
-                limited_backoffice_service::PERMISSION_ACCESS,
-                limited_backoffice_service::PERMISSION_MANAGE_EMPLOYEES,
-            ];
-            // Lock the actor's complete permission set, including every department_access_* row
-            // consumed by assertEmployeeLoginTarget.
-            // The group_id range lock prevents concurrent role replacement
-            // from revoking scope between authorization and grant insertion.
-            $permissions = $this->mysqli()->prepare(
-                'SELECT `permission`
-                 FROM `groups_permissions`
-                 WHERE `group_id` = ?
-                 FOR UPDATE'
-            );
-            if ($permissions === false) {
-                throw new limited_backoffice_exception('Unable to validate login grant actor.', 500);
-            }
-            $permissions->bind_param('i', $groupId);
-            $permissions->execute();
-            $result = $permissions->get_result();
-            $granted = [];
-            while ($row = $result->fetch_assoc()) {
-                $granted[] = (string)$row['permission'];
-            }
-            $permissions->close();
-            if (array_diff($requiredPermissions, $granted) !== []) {
-                throw new limited_backoffice_exception(
-                    'Login grant actor is no longer authorized.',
-                    403
-                );
-            }
-        }
-
-        $currentManager = (new users_o())->getUserById($actorUserId);
-        if (!$currentManager->exists()) {
-            throw new limited_backoffice_exception('Login grant actor is no longer authorized.', 403);
-        }
-        return [
-            'manager' => $currentManager,
-            'group_id' => $groupId,
-        ];
-    }
-
-    private function audit(int $actorUserId, string $event, string $message): void
-    {
-        try {
-            (new logs_o())->add('auth', 'global', 1, $actorUserId, $event, $message);
-        } catch (\Throwable) {
-            // Audit logging must not expose a bearer or block the grant lifecycle.
-        }
-    }
-
-    private function mysqli(): \mysqli
-    {
-        global $db;
-        return $db->conn();
-    }
-}
@@ -36,45 +36,6 @@ CREATE TABLE IF NOT EXISTS `limited_backoffice_employees` (
    KEY `idx_limited_backoffice_employees_role_key` (`role_key`),
    KEY `idx_limited_backoffice_employees_deactivated_at` (`deactivated_at`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
-SQL);
-
-        $db->query(<<<'SQL'
-CREATE TABLE IF NOT EXISTS `limited_backoffice_login_grants` (
-    `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
-    `grant_id` CHAR(32) NOT NULL,
-    `secret_hash` CHAR(64) NOT NULL,
-    `target_user_id` INT NOT NULL,
-    `actor_user_id` INT NOT NULL,
-    `purpose` VARCHAR(64) NOT NULL,
-    `idempotency_key_hash` CHAR(64) NULL,
-    `expires_at` BIGINT UNSIGNED NOT NULL,
-    `consumed_at` DATETIME NULL,
-    `revoked_at` DATETIME NULL,
-    `created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    PRIMARY KEY (`id`),
-    UNIQUE KEY `uniq_limited_backoffice_login_grants_grant_id` (`grant_id`),
-    UNIQUE KEY `uniq_limited_backoffice_login_grants_secret_hash` (`secret_hash`),
-    UNIQUE KEY `uniq_limited_backoffice_login_grants_idempotency` (`actor_user_id`, `target_user_id`, `purpose`, `idempotency_key_hash`),
-    KEY `idx_limited_backoffice_login_grants_target` (`target_user_id`, `expires_at`),
-    KEY `idx_limited_backoffice_login_grants_expiry` (`expires_at`),
-    KEY `idx_limited_backoffice_login_grants_state` (`consumed_at`, `revoked_at`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
-SQL);
-
-        $db->query(<<<'SQL'
-CREATE TABLE IF NOT EXISTS `limited_backoffice_action_idempotency` (
-    `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
-    `actor_user_id` INT NOT NULL,
-    `action_type` VARCHAR(64) NOT NULL,
-    `idempotency_key_hash` CHAR(64) NOT NULL,
-    `payload_hash` CHAR(64) NOT NULL,
-    `result_user_id` INT NULL,
-    `created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    PRIMARY KEY (`id`),
-    UNIQUE KEY `uniq_limited_backoffice_action_idempotency`
-        (`actor_user_id`, `action_type`, `idempotency_key_hash`),
-    KEY `idx_limited_backoffice_action_result` (`result_user_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
 SQL);

        self::$initialized = true;
@@ -1,169 +0,0 @@
-<?php
-
-namespace classes;
-
-class module_usage_registry
-{
-    public const DEFAULT_SOFT_LIMIT_PERCENT = 90.0;
-
-    public function all(): array
-    {
-        return array_map(
-            fn(array $descriptor): array => $this->withDefaults($descriptor),
-            [
-                [
-                    'module_key' => 'motorapi',
-                    'module_label' => 'MotorAPI',
-                    'metric_key' => 'lookup_calls',
-                    'metric_label' => 'License plate lookups',
-                    'unit' => 'calls',
-                    'period' => 'day',
-                    'source' => 'internal_counter',
-                    'default_enforce_mode' => 'block',
-                    'config_module' => 'motorapi',
-                    'config_variable' => 'daily_limit',
-                    'config_type' => 'int',
-                    'legacy_count_table' => 'motorapi_lookups',
-                    'primary' => true,
-                    'writable_limit' => true,
-                ],
-                [
-                    'module_key' => 'motorapi',
-                    'module_label' => 'MotorAPI',
-                    'metric_key' => 'provider_usage',
-                    'metric_label' => 'Provider usage',
-                    'unit' => 'calls',
-                    'period' => 'provider',
-                    'source' => 'provider_snapshot',
-                ],
-                [
-                    'module_key' => 'fxratesapi',
-                    'module_label' => 'FXRatesAPI',
-                    'metric_key' => 'rate_fetch_calls',
-                    'metric_label' => 'Currency rate fetches',
-                    'unit' => 'calls',
-                    'period' => 'day',
-                    'source' => 'internal_counter',
-                    'default_enforce_mode' => 'block',
-                    'config_module' => 'fxratesapi',
-                    'config_variable' => 'daily_limit',
-                    'config_type' => 'int',
-                    'legacy_count_table' => 'fxratesapi_conversion_rates',
-                    'primary' => true,
-                    'writable_limit' => true,
-                ],
-                [
-                    'module_key' => 'virkdata',
-                    'module_label' => 'VirkData',
-                    'metric_key' => 'company_search_calls',
-                    'metric_label' => 'Company searches',
-                    'unit' => 'calls',
-                    'period' => 'month',
-                    'source' => 'internal_counter',
-                    'default_enforce_mode' => 'observe',
-                    'config_module' => 'virkdata',
-                    'config_variable' => 'monthly_limit',
-                    'config_type' => 'int',
-                    'legacy_log_module' => 'VIRKDATA',
-                    'legacy_log_action' => 'VIRKDATA_SEARCH',
-                    'primary' => true,
-                    'writable_limit' => true,
-                ],
-                [
-                    'module_key' => 'licenseplaterecognizer',
-                    'module_label' => 'License Plate Recognizer',
-                    'metric_key' => 'plate_recognition_calls',
-                    'metric_label' => 'Plate recognition calls',
-                    'unit' => 'calls',
-                    'period' => 'provider',
-                    'source' => 'provider_snapshot',
-                    'default_enforce_mode' => 'observe',
-                    'primary' => true,
-                ],
-                [
-                    'module_key' => 'email',
-                    'module_label' => 'Email',
-                    'metric_key' => 'mailersend_messages',
-                    'metric_label' => 'MailerSend messages',
-                    'unit' => 'messages',
-                    'period' => 'provider',
-                    'source' => 'provider_snapshot',
-                ],
-                ['module_key' => 'openai', 'module_label' => 'OpenAI', 'metric_key' => 'api_calls', 'metric_label' => 'API calls', 'unit' => 'calls', 'period' => 'month', 'source' => 'internal_counter'],
-                ['module_key' => 'openai', 'module_label' => 'OpenAI', 'metric_key' => 'total_tokens', 'metric_label' => 'Total tokens', 'unit' => 'tokens', 'period' => 'month', 'source' => 'internal_counter'],
-                ['module_key' => 'weatherapi', 'module_label' => 'WeatherAPI', 'metric_key' => 'requests', 'metric_label' => 'Weather requests', 'unit' => 'calls', 'period' => 'day', 'source' => 'internal_counter'],
-                ['module_key' => 'gatewayapi', 'module_label' => 'GatewayAPI', 'metric_key' => 'sms_messages', 'metric_label' => 'SMS messages', 'unit' => 'messages', 'period' => 'month', 'source' => 'internal_counter'],
-                ['module_key' => 'bird', 'module_label' => 'Bird', 'metric_key' => 'messages_and_calls', 'metric_label' => 'Messages and calls', 'unit' => 'events', 'period' => 'month', 'source' => 'internal_counter'],
-                ['module_key' => 'ocrspace', 'module_label' => 'OCRSpace', 'metric_key' => 'ocr_requests', 'metric_label' => 'OCR requests', 'unit' => 'calls', 'period' => 'month', 'source' => 'internal_counter'],
-                ['module_key' => 'limble', 'module_label' => 'Limble', 'metric_key' => 'api_requests', 'metric_label' => 'API requests', 'unit' => 'calls', 'period' => 'month', 'source' => 'internal_counter'],
-                ['module_key' => 'workfeed', 'module_label' => 'Workfeed', 'metric_key' => 'api_requests', 'metric_label' => 'API requests', 'unit' => 'calls', 'period' => 'month', 'source' => 'internal_counter'],
-                ['module_key' => 'stripe', 'module_label' => 'Stripe', 'metric_key' => 'payment_events', 'metric_label' => 'Payment events', 'unit' => 'events', 'period' => 'month', 'source' => 'internal_counter'],
-                ['module_key' => 'coolify', 'module_label' => 'Coolify', 'metric_key' => 'operations', 'metric_label' => 'Operations', 'unit' => 'events', 'period' => 'month', 'source' => 'derived'],
-                ['module_key' => 'backups', 'module_label' => 'Backups', 'metric_key' => 'backup_jobs', 'metric_label' => 'Backup jobs', 'unit' => 'jobs', 'period' => 'month', 'source' => 'derived'],
-                ['module_key' => 'backups', 'module_label' => 'Backups', 'metric_key' => 'stored_bytes', 'metric_label' => 'Stored backup data', 'unit' => 'bytes', 'period' => 'all_time', 'source' => 'derived'],
-                ['module_key' => 'selfserve', 'module_label' => 'Self Serve', 'metric_key' => 'wash_sessions', 'metric_label' => 'Wash sessions', 'unit' => 'sessions', 'period' => 'month', 'source' => 'derived'],
-                ['module_key' => 'selfserve', 'module_label' => 'Self Serve', 'metric_key' => 'lane_commands', 'metric_label' => 'Lane commands', 'unit' => 'events', 'period' => 'month', 'source' => 'internal_counter', 'legacy_log_module' => 'SELFSERVE'],
-                ['module_key' => 'xlvask', 'module_label' => 'XLVask', 'metric_key' => 'usage_rows', 'metric_label' => 'Usage rows', 'unit' => 'rows', 'period' => 'month', 'source' => 'derived'],
-                ['module_key' => 'attachments', 'module_label' => 'Attachments', 'metric_key' => 'stored_files', 'metric_label' => 'Stored files', 'unit' => 'files', 'period' => 'all_time', 'source' => 'derived'],
-                ['module_key' => 'dynamicimages', 'module_label' => 'Dynamic Images', 'metric_key' => 'renders', 'metric_label' => 'Image renders', 'unit' => 'renders', 'period' => 'month', 'source' => 'internal_counter'],
-                ['module_key' => 'html2pdf', 'module_label' => 'HTML2PDF', 'metric_key' => 'pdf_jobs', 'metric_label' => 'PDF jobs', 'unit' => 'jobs', 'period' => 'month', 'source' => 'internal_counter'],
-                ['module_key' => 'forms', 'module_label' => 'Forms', 'metric_key' => 'submissions', 'metric_label' => 'Submissions', 'unit' => 'submissions', 'period' => 'month', 'source' => 'derived'],
-                ['module_key' => 'notifications', 'module_label' => 'Notifications', 'metric_key' => 'notification_sends', 'metric_label' => 'Notification sends', 'unit' => 'notifications', 'period' => 'month', 'source' => 'derived'],
-                ['module_key' => 'shelly', 'module_label' => 'Shelly', 'metric_key' => 'relay_commands', 'metric_label' => 'Relay commands', 'unit' => 'commands', 'period' => 'month', 'source' => 'internal_counter', 'legacy_log_module' => 'SHELLY'],
-                ['module_key' => 'edgegateway', 'module_label' => 'Edge Gateway', 'metric_key' => 'relay_commands', 'metric_label' => 'Relay commands', 'unit' => 'commands', 'period' => 'month', 'source' => 'derived'],
-                ['module_key' => 'system', 'module_label' => 'System', 'metric_key' => 'cron_runs', 'metric_label' => 'Cron runs', 'unit' => 'runs', 'period' => 'day', 'source' => 'derived'],
-            ]
-        );
-    }
-
-    public function find(string $moduleKey, string $metricKey): ?array
-    {
-        $moduleKey = $this->normalizeModuleKey($moduleKey);
-        $metricKey = $this->normalizeMetricKey($metricKey);
-
-        foreach ($this->all() as $descriptor) {
-            if ($descriptor['module_key'] === $moduleKey && $descriptor['metric_key'] === $metricKey) {
-                return $descriptor;
-            }
-        }
-
-        return null;
-    }
-
-    public function forModule(string $moduleKey): array
-    {
-        $moduleKey = $this->normalizeModuleKey($moduleKey);
-        return array_values(array_filter(
-            $this->all(),
-            static fn(array $descriptor): bool => $descriptor['module_key'] === $moduleKey
-        ));
-    }
-
-    public function normalizeModuleKey(string $moduleKey): string
-    {
-        return strtolower(trim($moduleKey));
-    }
-
-    public function normalizeMetricKey(string $metricKey): string
-    {
-        return strtolower(trim($metricKey));
-    }
-
-    private function withDefaults(array $descriptor): array
-    {
-        $descriptor['module_key'] = $this->normalizeModuleKey((string)$descriptor['module_key']);
-        $descriptor['metric_key'] = $this->normalizeMetricKey((string)$descriptor['metric_key']);
-        $descriptor['module_label'] = (string)($descriptor['module_label'] ?? $descriptor['module_key']);
-        $descriptor['metric_label'] = (string)($descriptor['metric_label'] ?? $descriptor['metric_key']);
-        $descriptor['unit'] = (string)($descriptor['unit'] ?? 'count');
-        $descriptor['period'] = (string)($descriptor['period'] ?? 'all_time');
-        $descriptor['scope_type'] = (string)($descriptor['scope_type'] ?? 'global');
-        $descriptor['scope_id'] = (string)($descriptor['scope_id'] ?? '');
-        $descriptor['source'] = (string)($descriptor['source'] ?? 'internal_counter');
-        $descriptor['default_enforce_mode'] = (string)($descriptor['default_enforce_mode'] ?? 'observe');
-        $descriptor['soft_limit_percent'] = (float)($descriptor['soft_limit_percent'] ?? self::DEFAULT_SOFT_LIMIT_PERCENT);
-        $descriptor['writable_limit'] = (bool)($descriptor['writable_limit'] ?? false);
-        $descriptor['primary'] = (bool)($descriptor['primary'] ?? false);
-        return $descriptor;
-    }
-}
--- a/Show More
+++ b/Show More