Fix mobile GPS department auto-selection

Fix self-serve path editor case limit

.github/workflows/code quality.yml

@@ -1,28 +0,0 @@
-name: Qodana Configuration Upload
-
-on:
-  push:
-    branches: [main, dev]
-  pull_request:
-    branches: [main]
-  workflow_dispatch:
-
-jobs:
-  upload-qodana-config:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v5
-
-      - name: Run Qodana Configuration Uploader
-        env:
-          QODANA_CONFIGURATIONS_TOKEN: ${{ secrets.QODANA_CONFIGURATIONS_TOKEN }}
-        run: |
-          docker run --rm \
-            -v $(pwd):/workspace \
-            -w /workspace \
-            -e QODANA_CONFIGURATIONS_TOKEN=$QODANA_CONFIGURATIONS_TOKEN \
-            jetbrains/qodana-configuration-uploader:latest \
-            --global-configs-file qodana-global-configurations.yaml \
-            --qodana-host https://qodana.cloud

.github/workflows/code_quality.yml

@@ -7,9 +7,13 @@ on:
     branches: [main]
   workflow_dispatch:
 
+permissions:
+  contents: read
+
 jobs:
   upload-qodana-config:
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, Linux, X64, default]
+    timeout-minutes: 10
 
     steps:
       - name: Checkout repository
@@ -20,9 +24,9 @@ jobs:
           QODANA_CONFIGURATIONS_TOKEN: ${{ secrets.QODANA_CONFIGURATIONS_TOKEN }}
         run: |
           docker run --rm \
-            -v $(pwd):/workspace \
+            -v "$(pwd):/workspace" \
             -w /workspace \
-            -e QODANA_CONFIGURATIONS_TOKEN=$QODANA_CONFIGURATIONS_TOKEN \
-            jetbrains/qodana-configuration-uploader:latest \
+            -e QODANA_CONFIGURATIONS_TOKEN \
+            jetbrains/qodana-configuration-uploader@sha256:f4786ceea616048c3401cf0b0345d2220d22a2ec7b046fd48cbbfc522e6efe30 \
             --global-configs-file qodana-global-configurations.yaml \
             --qodana-host https://qodana.cloud

.github/workflows/release.yml

@@ -1,105 +1,151 @@
 name: Frontend Release
 
 on:
-  push:
+  workflow_run:
+    workflows:
+      - Automated Tests
+    types:
+      - completed
     branches:
       - master
-  workflow_dispatch:
 
 permissions:
   contents: read
   actions: read
 
 concurrency:
-  group: frontend-release-${{ github.ref }}
-  cancel-in-progress: false
+  group: frontend-release-${{ github.event.workflow_run.head_branch }}
+  cancel-in-progress: true
 
 jobs:
   build-upload-and-verify:
+    if: github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.event == 'push'
     runs-on: [self-hosted, Linux, X64, default]
     env:
-      RELEASE_BASE_URL: https://dev.truckwash.io
+      RELEASE_BASE_URL: https://api-v2.truckwash.io/master/frontend
       PLAYWRIGHT_BASE_URL: https://dev.truckwash.io
+      PLAYWRIGHT_RELEASE_STATIC_BASE_URL: https://api-v2.truckwash.io/master/frontend
       PLAYWRIGHT_RELEASE_API_BASE_URL: https://api-v2.truckwash.io
-      PLAYWRIGHT_RELEASE_API_PING_PATHS: /ping,/master/api/ping,/canary/api/ping,/stable/api/ping
+      PLAYWRIGHT_RELEASE_API_PING_PATHS: /master/api/ping
       RELEASE_BUILD_ID: ${{ github.run_id }}-${{ github.run_attempt }}
       RELEASE_EXPECTED_BUILD_ID: ${{ github.run_id }}-${{ github.run_attempt }}
-      RELEASE_EXPECTED_COMMIT: ${{ github.sha }}
-      RELEASE_WAIT_INITIAL_SECONDS: 30
-      RELEASE_WAIT_TIMEOUT_SECONDS: 300
+      RELEASE_EXPECTED_COMMIT: ${{ github.event.workflow_run.head_sha }}
+      RELEASE_WAIT_INITIAL_SECONDS: 45
+      RELEASE_WAIT_TIMEOUT_SECONDS: 600
       RELEASE_POLL_INTERVAL_SECONDS: 10
     steps:
       - name: Checkout repository
         uses: actions/checkout@v5
         with:
           fetch-depth: 0
+          ref: ${{ github.event.workflow_run.head_sha }}
+
+      - name: Check release commit is current
+        id: branch-head
+        run: |
+          latest_sha="$(git ls-remote origin "refs/heads/$RELEASE_BRANCH" | awk '{print $1}')"
+          if [[ -z "$latest_sha" ]]; then
+            echo "Could not resolve origin/$RELEASE_BRANCH." >&2
+            exit 1
+          fi
+          if [[ "$latest_sha" != "$RELEASE_EXPECTED_COMMIT" ]]; then
+            echo "current=false" >> "$GITHUB_OUTPUT"
+            echo "Skipping stale release for $RELEASE_EXPECTED_COMMIT; origin/$RELEASE_BRANCH is $latest_sha."
+            exit 0
+          fi
+          echo "current=true" >> "$GITHUB_OUTPUT"
+          echo "Release commit is current for $RELEASE_BRANCH."
+        env:
+          RELEASE_BRANCH: ${{ github.event.workflow_run.head_branch }}
 
       - name: Setup Node.js
+        if: steps.branch-head.outputs.current == 'true'
         uses: actions/setup-node@v5
         with:
           node-version: 22
           cache: npm
 
       - name: Install dependencies
+        if: steps.branch-head.outputs.current == 'true'
         run: npm ci --legacy-peer-deps
 
       - name: Check AI workflow sync
+        if: steps.branch-head.outputs.current == 'true'
         run: node scripts/sync-ai-workflow.mjs --check
 
       - name: Source and i18n checks
+        if: steps.branch-head.outputs.current == 'true'
         run: |
           npm run text:check-encoding
           npm run i18n:v2:source-check
 
       - name: Unit tests
+        if: steps.branch-head.outputs.current == 'true'
         run: npm run test:unit
         env:
           VITEST_BATCH_SIZE: 5
 
       - name: Build release artifact
+        if: steps.branch-head.outputs.current == 'true'
         run: npm run build
 
       - name: Install Playwright Chromium
-        run: npx playwright install --with-deps chromium
+        if: steps.branch-head.outputs.current == 'true'
+        run: node scripts/install-playwright-browsers.mjs chromium
 
       - name: Production Playwright gate
+        if: steps.branch-head.outputs.current == 'true'
         run: npm run test:e2e:prod
 
       - name: Upload dist artifact
+        if: steps.branch-head.outputs.current == 'true'
+        continue-on-error: true
         uses: actions/upload-artifact@v4
         with:
           name: frontend-dist-${{ env.RELEASE_BUILD_ID }}
           path: dist
-          retention-days: 14
+          retention-days: 3
 
-      - name: Install lftp
+      - name: Request Release Manager auto sync
+        if: steps.branch-head.outputs.current == 'true'
         run: |
-          if ! command -v lftp >/dev/null 2>&1; then
-            sudo apt-get update
-            sudo apt-get install -y lftp
+          test -n "$RELEASE_MANAGER_GATE_TOKEN" || (echo "RELEASE_MANAGER_GATE_TOKEN is required" >&2; exit 1)
+          response_file="$(mktemp)"
+          status_code="$(curl --show-error --silent \
+            --output "$response_file" \
+            --write-out "%{http_code}" \
+            -X POST "$RELEASE_MANAGER_GATE_URL" \
+            -H "Authorization: Bearer $RELEASE_MANAGER_GATE_TOKEN" \
+            -H "Content-Type: application/json" \
+            --data "{\"environment_url\":\"$RELEASE_BASE_URL\",\"channel_slug\":\"stable\",\"app\":\"frontend\",\"repository\":\"$RELEASE_REPOSITORY\",\"branch\":\"$RELEASE_BRANCH\",\"expected_commit\":\"$RELEASE_EXPECTED_COMMIT\",\"build_id\":\"$RELEASE_EXPECTED_BUILD_ID\",\"workflow_url\":\"$RELEASE_WORKFLOW_URL\",\"auto_sync\":true,\"wait_timeout_seconds\":300,\"poll_interval_seconds\":10,\"required_checks\":[\"api_gateway\"]}")"
+          if [[ "$status_code" =~ ^2 ]]; then
+            cat "$response_file"
+          elif [[ "$status_code" == "504" ]]; then
+            echo "Release Manager auto sync request reached the gateway timeout; continuing to artifact wait."
+          else
+            cat "$response_file" >&2
+            echo "Release Manager auto sync request failed with HTTP $status_code." >&2
+            exit 1
           fi
-
-      - name: Upload hashed assets before release metadata
-        run: |
-          test -n "$RELEASE_DEPLOY_HOST" || (echo "RELEASE_DEPLOY_HOST is required" >&2; exit 1)
-          test -n "$RELEASE_DEPLOY_USER" || (echo "RELEASE_DEPLOY_USER is required" >&2; exit 1)
-          test -n "$RELEASE_DEPLOY_PASSWORD" || (echo "RELEASE_DEPLOY_PASSWORD is required" >&2; exit 1)
-          npm run release:upload:lftp
         env:
-          RELEASE_DEPLOY_HOST: ${{ secrets.RELEASE_DEPLOY_HOST }}
-          RELEASE_DEPLOY_USER: ${{ secrets.RELEASE_DEPLOY_USER }}
-          RELEASE_DEPLOY_PASSWORD: ${{ secrets.RELEASE_DEPLOY_PASSWORD }}
-          RELEASE_DEPLOY_REMOTE_ROOT: ${{ secrets.RELEASE_DEPLOY_REMOTE_ROOT }}
+          RELEASE_MANAGER_GATE_URL: ${{ secrets.RELEASE_MANAGER_GATE_URL || 'https://api.truckwash.io/release/gate/test-runs' }}
+          RELEASE_MANAGER_GATE_TOKEN: ${{ secrets.RELEASE_MANAGER_GATE_TOKEN }}
+          RELEASE_REPOSITORY: ${{ github.repository }}
+          RELEASE_BRANCH: ${{ github.event.workflow_run.head_branch }}
+          RELEASE_WORKFLOW_URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
 
-      - name: Wait for exact uploaded build
+      - name: Wait for Coolify release artifact
+        if: steps.branch-head.outputs.current == 'true'
         run: npm run release:verify-upload
 
       - name: Public live Playwright gate
+        if: steps.branch-head.outputs.current == 'true'
         run: npm run test:e2e:live:public
         env:
           NODE_OPTIONS: --use-system-ca
 
       - name: Credentialed live Playwright gate
+        if: steps.branch-head.outputs.current == 'true'
         run: npm run test:e2e:live:roles
         env:
           NODE_OPTIONS: --use-system-ca
@@ -112,31 +158,35 @@ jobs:
           PLAYWRIGHT_DEPARTMENT_ID: ${{ secrets.PLAYWRIGHT_DEPARTMENT_ID }}
 
       - name: Record Release Manager gate
+        if: steps.branch-head.outputs.current == 'true'
         run: |
           test -n "$RELEASE_MANAGER_GATE_TOKEN" || (echo "RELEASE_MANAGER_GATE_TOKEN is required" >&2; exit 1)
+          release_gate_build_id="${RELEASE_VERIFIED_BUILD_ID:-$RELEASE_EXPECTED_BUILD_ID}"
           curl --fail --show-error --silent \
             -X POST "$RELEASE_MANAGER_GATE_URL" \
             -H "Authorization: Bearer $RELEASE_MANAGER_GATE_TOKEN" \
             -H "Content-Type: application/json" \
-            --data "{\"environment_url\":\"$RELEASE_BASE_URL\",\"channel_slug\":\"stable\",\"app\":\"frontend\",\"repository\":\"$RELEASE_REPOSITORY\",\"branch\":\"$RELEASE_BRANCH\",\"expected_commit\":\"$RELEASE_EXPECTED_COMMIT\",\"build_id\":\"$RELEASE_EXPECTED_BUILD_ID\",\"workflow_url\":\"$RELEASE_WORKFLOW_URL\",\"auto_sync\":true,\"wait_timeout_seconds\":300,\"poll_interval_seconds\":10,\"required_checks\":[\"static_artifact\",\"api_gateway\"]}"
+            --data "{\"environment_url\":\"$RELEASE_BASE_URL\",\"channel_slug\":\"stable\",\"app\":\"frontend\",\"repository\":\"$RELEASE_REPOSITORY\",\"branch\":\"$RELEASE_BRANCH\",\"expected_commit\":\"$RELEASE_EXPECTED_COMMIT\",\"build_id\":\"$release_gate_build_id\",\"workflow_url\":\"$RELEASE_WORKFLOW_URL\",\"auto_sync\":true,\"wait_timeout_seconds\":300,\"poll_interval_seconds\":10,\"required_checks\":[\"static_artifact\",\"api_gateway\"]}"
         env:
           RELEASE_MANAGER_GATE_URL: ${{ secrets.RELEASE_MANAGER_GATE_URL || 'https://api.truckwash.io/release/gate/test-runs' }}
           RELEASE_MANAGER_GATE_TOKEN: ${{ secrets.RELEASE_MANAGER_GATE_TOKEN }}
           RELEASE_REPOSITORY: ${{ github.repository }}
-          RELEASE_BRANCH: ${{ github.ref_name }}
+          RELEASE_BRANCH: ${{ github.event.workflow_run.head_branch }}
           RELEASE_WORKFLOW_URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
 
       - name: Update server version after verification
+        if: steps.branch-head.outputs.current == 'true'
         run: npm run release:update-server-version
         env:
           SERVER_UPDATE_TOKEN: ${{ secrets.SERVER_UPDATE_TOKEN }}
-          RELEASE_VERSION: ${{ github.sha }}
+          RELEASE_VERSION: ${{ github.event.workflow_run.head_sha }}
 
       - name: Upload Playwright report
-        if: failure()
+        if: failure() && steps.branch-head.outputs.current == 'true'
+        continue-on-error: true
         uses: actions/upload-artifact@v4
         with:
           name: frontend-release-playwright-${{ env.RELEASE_BUILD_ID }}
           path: output/playwright
           if-no-files-found: ignore
-          retention-days: 14
+          retention-days: 3

.github/workflows/tests.yml

@@ -3,6 +3,8 @@ name: Automated Tests
 on:
   pull_request:
   push:
+    branches:
+      - master
   workflow_dispatch:
   schedule:
     - cron: "0 2 * * *"
@@ -11,13 +13,14 @@ permissions:
   contents: read
 
 concurrency:
-  group: frontend-tests-${{ github.workflow }}-${{ github.ref }}
+  group: frontend-tests-${{ github.workflow }}-${{ github.head_ref || github.ref_name }}
   cancel-in-progress: true
 
 jobs:
   format-tests:
-    # Match the labels exposed by the Coolify-managed GitHub runner.
-    runs-on: [self-hosted, Linux, X64, default]
+    # CI runs on the repository's self-hosted runner pool.
+    runs-on: [self-hosted, Linux, X64, pleno, frontend]
+    timeout-minutes: 15
     steps:
       - name: Checkout repository
         uses: actions/checkout@v5
@@ -26,7 +29,6 @@ jobs:
         uses: actions/setup-node@v5
         with:
           node-version: 22
-          cache: npm
 
       - name: Check AI workflow sync
         run: node scripts/sync-ai-workflow.mjs --check
@@ -39,7 +41,8 @@ jobs:
 
   build-and-unit:
     needs: format-tests
-    runs-on: [self-hosted, Linux, X64, default]
+    runs-on: [self-hosted, Linux, X64, pleno, frontend]
+    timeout-minutes: 30
     steps:
       - name: Checkout repository
         uses: actions/checkout@v5
@@ -48,11 +51,16 @@ jobs:
         uses: actions/setup-node@v5
         with:
           node-version: 22
-          cache: npm
 
       - name: Install dependencies
         run: npm ci --legacy-peer-deps
 
+      - name: Lint
+        run: npm run lint
+
+      - name: Check i18n source consistency
+        run: npm run i18n:v2:check
+
       - name: Build sanity check
         run: npm run build
 
@@ -64,47 +72,122 @@ jobs:
   e2e-pr:
     if: github.event_name != 'schedule'
     needs: build-and-unit
-    runs-on: [self-hosted, Linux, X64, default]
+    name: E2E-pr-${{ matrix.suite }}-${{ matrix.project }}
+    runs-on: [self-hosted, Linux, X64, pleno, frontend]
+    timeout-minutes: 30
+    strategy:
+      fail-fast: false
+      max-parallel: 4
+      matrix:
+        suite: [core, changed]
+        project: [chromium-desktop, chromium-mobile]
     env:
-      PLAYWRIGHT_PR_BASE: ${{ github.event.pull_request.base.sha || github.event.before }}
-      PLAYWRIGHT_PR_HEAD: ${{ github.sha }}
+      PLAYWRIGHT_ARTIFACT_NAMESPACE: e2e-pr-${{ matrix.suite }}-${{ matrix.project }}
+      PLAYWRIGHT_REPORTER_MODE: line-html
     steps:
       - name: Checkout repository
         uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
+      - name: Resolve Playwright diff refs
+        id: playwright-diff
+        shell: bash
+        env:
+          DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
+          EVENT_NAME: ${{ github.event_name }}
+          HEAD_SHA: ${{ github.sha }}
+          PR_BASE_SHA: ${{ github.event.pull_request.base.sha }}
+          PUSH_BEFORE_SHA: ${{ github.event.before }}
+        run: |
+          set -euo pipefail
+          zero_sha="0000000000000000000000000000000000000000"
+          if [[ "$EVENT_NAME" == "pull_request" && -n "$PR_BASE_SHA" ]]; then
+            base_ref="$PR_BASE_SHA"
+          elif [[ -z "$PUSH_BEFORE_SHA" || "$PUSH_BEFORE_SHA" == "$zero_sha" ]]; then
+            git fetch --no-tags --prune origin "$DEFAULT_BRANCH"
+            base_ref="origin/$DEFAULT_BRANCH"
+          else
+            base_ref="$PUSH_BEFORE_SHA"
+          fi
+          echo "base=$base_ref" >> "$GITHUB_OUTPUT"
+          echo "head=$HEAD_SHA" >> "$GITHUB_OUTPUT"
+
       - name: Setup Node.js
         uses: actions/setup-node@v5
         with:
           node-version: 22
-          cache: npm
 
       - name: Install dependencies
         run: npm ci --legacy-peer-deps
 
       - name: Install Playwright browsers
-        run: npx playwright install --with-deps chromium
+        run: node scripts/install-playwright-browsers.mjs chromium
 
-      - name: Run Playwright PR tests
-        run: npm run test:e2e:pr -- --base="$PLAYWRIGHT_PR_BASE" --head="$PLAYWRIGHT_PR_HEAD"
+      - name: Set Playwright dev server port
+        shell: bash
+        env:
+          MATRIX_SUITE: ${{ matrix.suite }}
+          MATRIX_PROJECT: ${{ matrix.project }}
+          RUN_ID: ${{ github.run_id }}
+        run: |
+          set -euo pipefail
+          workflow_offset=$(( (RUN_ID % 90) * 600 ))
+          case "$MATRIX_SUITE" in
+            core) suite_offset=0 ;;
+            changed) suite_offset=10 ;;
+            *) echo "Unsupported Playwright PR suite: $MATRIX_SUITE" >&2; exit 1 ;;
+          esac
+          case "$MATRIX_PROJECT" in
+            chromium-desktop) project_offset=1 ;;
+            chromium-mobile) project_offset=2 ;;
+            *) echo "Unsupported Playwright PR project: $MATRIX_PROJECT" >&2; exit 1 ;;
+          esac
+          echo "PLAYWRIGHT_DEV_PORT=$((10000 + workflow_offset + suite_offset + project_offset))" >> "$GITHUB_ENV"
+
+      - name: Run Playwright smoke tests
+        if: matrix.suite == 'core'
+        run: |
+          ulimit -n 16384 || true
+          npx playwright test --grep @smoke --project="${{ matrix.project }}"
+
+      - name: Run Playwright PR core tests
+        if: matrix.suite == 'core'
+        run: |
+          ulimit -n 16384 || true
+          npm run test:e2e:pr -- --core-only --project="${{ matrix.project }}"
+
+      - name: Run Playwright changed-area tests
+        if: matrix.suite == 'changed'
+        run: |
+          ulimit -n 16384 || true
+          npm run test:e2e:pr -- --changed-only --project="${{ matrix.project }}" --base="${{ steps.playwright-diff.outputs.base }}" --head="${{ steps.playwright-diff.outputs.head }}"
 
       - name: Upload Playwright report
-        if: failure()
+        if: failure() || cancelled()
+        continue-on-error: true
         uses: actions/upload-artifact@v4
         with:
-          name: playwright-report-pr
-          path: output/playwright
+          name: playwright-report-pr-${{ matrix.suite }}-${{ matrix.project }}
+          path: |
+            output/playwright/${{ env.PLAYWRIGHT_ARTIFACT_NAMESPACE }}-*
+            output/playwright/${{ env.PLAYWRIGHT_ARTIFACT_NAMESPACE }}
           if-no-files-found: ignore
-          retention-days: 7
+          retention-days: 3
 
   e2e-full:
-    if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || github.ref_name == github.event.repository.default_branch
-    needs: build-and-unit
+    if: >
+      always() &&
+      (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || github.ref_name == github.event.repository.default_branch) &&
+      needs.build-and-unit.result == 'success' &&
+      (github.event_name == 'schedule' || needs.e2e-pr.result == 'success')
+    needs: [build-and-unit, e2e-pr]
     name: E2E-full-${{ matrix.role }}-${{ matrix.browser_label }}-${{ matrix.device }}
-    runs-on: [self-hosted, Linux, X64, default]
+    runs-on: [self-hosted, Linux, X64, pleno, frontend]
+    timeout-minutes: 60
     strategy:
       fail-fast: false
+      max-parallel: 4
       matrix:
         role: [customer, subuser, admin, superuser]
         browser: [chromium, firefox, webkit]
@@ -130,19 +213,52 @@ jobs:
         uses: actions/setup-node@v5
         with:
           node-version: 22
-          cache: npm
 
       - name: Install dependencies
         run: npm ci --legacy-peer-deps
 
       - name: Install Playwright browsers
-        run: npx playwright install --with-deps ${{ matrix.browser_install }}
+        run: node scripts/install-playwright-browsers.mjs ${{ matrix.browser_install }}
+
+      - name: Set Playwright dev server port
+        shell: bash
+        env:
+          MATRIX_ROLE: ${{ matrix.role }}
+          MATRIX_BROWSER: ${{ matrix.browser }}
+          MATRIX_DEVICE: ${{ matrix.device }}
+          RUN_ID: ${{ github.run_id }}
+        run: |
+          set -euo pipefail
+          workflow_offset=$(( (RUN_ID % 90) * 600 ))
+          case "$MATRIX_ROLE" in
+            customer) role_offset=0 ;;
+            subuser) role_offset=100 ;;
+            admin) role_offset=200 ;;
+            superuser) role_offset=300 ;;
+            *) echo "Unsupported Playwright role: $MATRIX_ROLE" >&2; exit 1 ;;
+          esac
+          case "$MATRIX_BROWSER" in
+            chromium) browser_offset=0 ;;
+            firefox) browser_offset=30 ;;
+            webkit) browser_offset=60 ;;
+            *) echo "Unsupported Playwright browser: $MATRIX_BROWSER" >&2; exit 1 ;;
+          esac
+          case "$MATRIX_DEVICE" in
+            mobile) device_offset=1 ;;
+            tablet) device_offset=2 ;;
+            desktop) device_offset=3 ;;
+            *) echo "Unsupported Playwright device: $MATRIX_DEVICE" >&2; exit 1 ;;
+          esac
+          echo "PLAYWRIGHT_DEV_PORT=$((10000 + workflow_offset + role_offset + browser_offset + device_offset))" >> "$GITHUB_ENV"
 
       - name: Run full Playwright slice
-        run: npm run test:e2e:full:slice -- --role="${{ matrix.role }}" --project="${{ matrix.browser }}-${{ matrix.device }}"
+        run: |
+          ulimit -n 16384 || true
+          npm run test:e2e:full:slice -- --role="${{ matrix.role }}" --project="${{ matrix.browser }}-${{ matrix.device }}"
 
       - name: Upload Playwright report
-        if: failure()
+        if: failure() || cancelled()
+        continue-on-error: true
         uses: actions/upload-artifact@v4
         with:
           name: playwright-report-full-${{ matrix.role }}-${{ matrix.browser }}-${{ matrix.device }}
@@ -151,4 +267,4 @@ jobs:
             output/playwright/${{ env.PLAYWRIGHT_ARTIFACT_NAMESPACE }}/test-results
             output/playwright/test-lists/${{ matrix.role }}-${{ matrix.browser }}-${{ matrix.device }}.txt
           if-no-files-found: ignore
-          retention-days: 14
+          retention-days: 3

.openclaw/workspace-state.json

@@ -0,0 +1,4 @@
+{
+  "version": 1,
+  "setupCompletedAt": "2026-06-07T11:37:04.444Z"
+}

Dockerfile.coolify-frontend

@@ -8,6 +8,14 @@ COPY package*.json ./
 RUN npm ci --ignore-scripts
 
 COPY . .
+ARG SOURCE_COMMIT
+ARG RELEASE_COMMIT_SHA
+ARG COMMIT_SHA
+ARG GITHUB_SHA
+ENV SOURCE_COMMIT=$SOURCE_COMMIT
+ENV RELEASE_COMMIT_SHA=$RELEASE_COMMIT_SHA
+ENV COMMIT_SHA=$COMMIT_SHA
+ENV GITHUB_SHA=$GITHUB_SHA
 RUN npm run build
 
 FROM nginx:1.27-alpine

README.md

@@ -38,6 +38,14 @@ To use another remote API route:
 $env:VITE_API_PROXY_BASE_PATH="/canary/api"; npm run dev
 ```
 
+TLS certificate validation is enabled for proxied HTTPS APIs by default. If you
+are using a trusted local HTTPS API with a self-signed certificate, you can opt
+out explicitly:
+
+```powershell
+$env:VITE_API_PROXY_TARGET="https://local-api.test"; $env:VITE_API_PROXY_SECURE="false"; npm run dev
+```
+
 For compatible local gateways that expect the `/api` prefix to be preserved:
 
 ```powershell

app/build.gradle

@@ -56,9 +56,9 @@ android {
     defaultConfig {
         applicationId "io.truckwash.twa"
         minSdkVersion 21
-        targetSdkVersion 35
-        versionCode 6
-        versionName "6"
+        targetSdkVersion 36
+        versionCode 7
+        versionName "7"
 
         // The name for the application
         resValue "string", "appName", twaManifest.name

app/src/main/res/raw/web_app_manifest.json

@@ -1 +1 @@
-{"name":"Truck Wash Kundeportal","short_name":"Truck Wash","description":"Access your Truck Wash accounts and transactions from anywhere.","start_url":"/","display":"standalone","background_color":"#0787bb","theme_color":"#063651","lang":"en","scope":"/","orientation":"portrait","launch_handler":{"client_mode":"navigate-existing"},"icons":[{"src":"favicons/web-app-manifest-192x192.png","sizes":"192x192","type":"image/png"},{"src":"favicons/web-app-manifest-512x512.png","sizes":"512x512","type":"image/png"}],"id":"pleno-pwa-test"}
+{"name":"Truck Wash Kundeportal","short_name":"Truck Wash","description":"Access your Truck Wash accounts and transactions from anywhere.","start_url":"/","display":"standalone","background_color":"#0787bb","theme_color":"#063651","lang":"en","scope":"/","orientation":"portrait","launch_handler":{"client_mode":"navigate-existing"},"icons":[{"src":"favicons/web-app-manifest-192x192.png","sizes":"192x192","type":"image/png"},{"src":"favicons/web-app-manifest-512x512.png","sizes":"512x512","type":"image/png"}],"id":"/"}

docs/user-wash-start-production-readiness.md

@@ -0,0 +1,33 @@
+# User wash start production-readiness QA matrix
+
+This note documents deterministic coverage for the self-serve user wash start flow. The `@dynamic-image` Playwright case remains separated because it validates rendered image behavior in addition to deterministic state and API transitions.
+
+## Unit matrix
+
+| Area                    | Required scenario                                                                                                              | Coverage                                                                                                                                                                                                                                                          |
+| ----------------------- | ------------------------------------------------------------------------------------------------------------------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `useWashFlowState`      | Step transitions for vehicle, questions, lane, tasks, in-progress, completed                                                   | `tests/unit/use-wash-flow-state-production.spec.js` validates step clickability, next-button gating, questions-to-lane updates, lane-to-start target selection, task completion transition, in-progress navigation, and completed-step non-clickability contract. |
+| `useWashSessionActions` | START success and failure                                                                                                      | `tests/unit/use-wash-session-actions-production.spec.js` covers successful manual START state mutation and failed START retryability without active-wash mutation.                                                                                                |
+| `useWashSessionActions` | Relay enable success and relay enable failure with STOP rollback                                                               | `tests/unit/use-wash-session-actions-production.spec.js` covers machine relay success and relay failure rollback via STOP.                                                                                                                                        |
+| `useWashSessionActions` | STOP failure and already-stopped STOP recovery                                                                                 | `tests/unit/use-wash-session-actions-production.spec.js` covers failed STOP preserving active state and already-not-occupied STOP clearing local state.                                                                                                           |
+| `useSelfServeLogic`     | Preview/summary merge                                                                                                          | `tests/unit/use-self-serve-logic-production.spec.js` covers preview questions merging with summary questions, answer maps, visible question order, tasks, and allowed services.                                                                                   |
+| `useSelfServeLogic`     | Request race handling                                                                                                          | `tests/unit/use-self-serve-logic-production.spec.js` covers stale preview/summary responses being ignored when a newer request wins.                                                                                                                              |
+| `useSelfServeLogic`     | Allowed services updates                                                                                                       | `tests/unit/use-self-serve-logic-production.spec.js` covers lane allowed-service endpoint updates and first-failure fallback behavior.                                                                                                                            |
+| `useSelfServeLogic`     | Answer sync failures                                                                                                           | `tests/unit/use-self-serve-logic-production.spec.js` covers error reporting while preserving the caller's optimistic local answer.                                                                                                                                |
+| `MyWashStart.vue`       | Local progress restore, server active-wash restore, recent-completion suppression, unmount cleanup, duplicate-fetch prevention | `tests/unit/my-wash-start-production.spec.js` locks the component contracts for restore ordering, authenticated active-wash application, recent-completion suppression across restore/polling, unmount cleanup, and duplicate-fetch/sync guards.                  |
+
+## E2E mocked matrix
+
+| Required scenario                                                    | Coverage                                                                                                                                                                                                                                                                                     |
+| -------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Full manual flow                                                     | `tests/e2e/self-serve-wash.spec.js` covers direct manual wash start, guided completion, STOP, exit-gate open, completed state, and close/reset.                                                                                                                                              |
+| Full machine flow                                                    | `tests/e2e/self-serve-wash.spec.js` covers machine task rendering, dynamic image progress, required task completion, machine start path, and reload persistence.                                                                                                                             |
+| Reload/resume active wash                                            | `tests/e2e/self-serve-wash.spec.js` covers local progress reload and authenticated server active-wash resume from another device.                                                                                                                                                            |
+| Backend says wash completed during polling                           | `tests/e2e/self-serve-wash.spec.js` covers server polling of active wash and local transition to completed when the backend no longer reports the matching in-progress wash.                                                                                                                 |
+| Network failures for preview, answer sync, START, relay enable, STOP | `tests/e2e/self-serve-wash.spec.js` covers retryable START failure, STOP failure preservation, allowed-services gateway timeout/retry, answer sync background resilience, and unit-level relay rollback. Add mocked network route overrides when expanding browser-level failure assertions. |
+
+## Optional live smoke
+
+| Optional scenario   | Coverage                                                                                                                                                                                                    |
+| ------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Dynamic image smoke | The `@dynamic-image` Playwright test in `tests/e2e/self-serve-wash.spec.js` is tagged separately from deterministic CI coverage so it can be included or excluded explicitly with Playwright grep controls. |

eslint.config.js

@@ -0,0 +1,139 @@
+import js from "@eslint/js";
+import globals from "globals";
+import tseslint from "typescript-eslint";
+import vue from "eslint-plugin-vue";
+
+const commonGlobals = {
+  ...globals.browser,
+  ...globals.node,
+  ...globals.es2024,
+  grecaptcha: "readonly",
+};
+
+const vitestGlobals = {
+  ...globals.vitest,
+};
+
+const lintTargets = ["**/*.{js,mjs,cjs,ts,tsx,vue}"];
+const tsTargets = ["**/*.{ts,tsx,mts,cts}"];
+
+function warningRules(rules = {}) {
+  return Object.fromEntries(
+    Object.entries(rules).map(([name, value]) => {
+      if (value === "off" || value === 0) {
+        return [name, value];
+      }
+
+      if (Array.isArray(value)) {
+        return [name, ["warn", ...value.slice(1)]];
+      }
+
+      return [name, "warn"];
+    }),
+  );
+}
+
+function warningConfig(config, files) {
+  return {
+    ...config,
+    files: config.files ?? files,
+    rules: warningRules(config.rules),
+  };
+}
+
+const jsRecommended = warningConfig(js.configs.recommended, lintTargets);
+const tsRecommended = tseslint.configs.recommended.map((config) =>
+  warningConfig(config, tsTargets),
+);
+const vueEssential = vue.configs["flat/essential"].map((config) =>
+  warningConfig(config, ["**/*.vue"]),
+);
+
+const ignoredPaths = [
+  "app/build/**",
+  "coverage/**",
+  "dist/**",
+  "node_modules/**",
+  "node_modules.codex-backup/**",
+  "output/**",
+  "public/build/**",
+  "src/assets/test/**",
+  "test/**",
+  "vendor/**",
+  "*.timestamp-*.mjs",
+  "**/*.timestamp-*.mjs",
+];
+
+const commonUnusedOptions = {
+  argsIgnorePattern: "^_",
+  caughtErrorsIgnorePattern: "^_",
+  varsIgnorePattern: "^_",
+};
+
+export default [
+  {
+    ignores: ignoredPaths,
+  },
+  jsRecommended,
+  ...tsRecommended,
+  ...vueEssential,
+  {
+    files: ["**/*.vue"],
+    languageOptions: {
+      parserOptions: {
+        parser: tseslint.parser,
+        extraFileExtensions: [".vue"],
+        ecmaVersion: "latest",
+        sourceType: "module",
+      },
+    },
+  },
+  {
+    files: lintTargets,
+    plugins: {
+      vue,
+    },
+    languageOptions: {
+      ecmaVersion: "latest",
+      sourceType: "module",
+      globals: commonGlobals,
+    },
+    rules: {
+      "no-console": "off",
+      "no-debugger": "warn",
+      "no-empty": "warn",
+      "no-undef": "warn",
+      "no-unused-vars": ["warn", commonUnusedOptions],
+      "no-useless-assignment": "warn",
+      "vue/multi-word-component-names": "off",
+      "vue/no-mutating-props": "warn",
+      "vue/no-unused-components": "warn",
+      "vue/no-unused-vars": "warn",
+      "vue/no-v-html": "off",
+    },
+  },
+  {
+    files: ["**/*.{ts,tsx}"],
+    plugins: {
+      "@typescript-eslint": tseslint.plugin,
+    },
+    rules: {
+      "no-unused-vars": "off",
+      "@typescript-eslint/no-explicit-any": "off",
+      "@typescript-eslint/no-unused-vars": ["warn", commonUnusedOptions],
+    },
+  },
+  {
+    files: ["tests/**/*.{js,ts}", "playwright*.ts", "scripts/**/*.{js,mjs}"],
+    languageOptions: {
+      globals: {
+        ...commonGlobals,
+        ...globals.node,
+        ...vitestGlobals,
+      },
+    },
+    rules: {
+      "no-empty": "warn",
+    },
+  },
+];

index.html

@@ -2,10 +2,19 @@
 <html lang="" class="theme-light" data-theme="light">
 <head>
     <meta charset="UTF-8">
-    <link rel="icon" type="image/png" href="/assets/favicons/favicon-96x96.png" sizes="96x96" />
-    <link rel="icon" type="image/svg+xml" href="/assets/favicons/favicon.svg" />
-    <link rel="shortcut icon" href="/assets/favicons/favicon.ico" />
-    <link rel="apple-touch-icon" sizes="180x180" href="/assets/favicons/apple-touch-icon.png" />
+    <script>
+        (function () {
+            var match = window.location.pathname.match(/^\/[^/]+\/frontend(?:\/|$)/);
+            var href = match ? match[0].replace(/\/+$/, '') + '/' : '/';
+            var base = document.createElement('base');
+            base.href = href;
+            document.currentScript.after(base);
+        })();
+    </script>
+    <link rel="icon" type="image/png" href="%BASE_URL%assets/favicons/favicon-96x96.png" sizes="96x96" />
+    <link rel="icon" type="image/svg+xml" href="%BASE_URL%assets/favicons/favicon.svg" />
+    <link rel="shortcut icon" href="%BASE_URL%assets/favicons/favicon.ico" />
+    <link rel="apple-touch-icon" sizes="180x180" href="%BASE_URL%assets/favicons/apple-touch-icon.png" />
     <meta name="apple-mobile-web-app-title" content="Truck Wash Kundeportal" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
     <meta name="apple-mobile-web-app-capable" content="yes">

nginx.coolify-frontend.conf

@@ -5,22 +5,39 @@ server {
     root /usr/share/nginx/html;
     index index.html;
 
+    add_header Content-Security-Policy "frame-ancestors 'self'" always;
+    add_header X-Frame-Options "SAMEORIGIN" always;
+
+    location ~ ^/(?:.+/)?(?<webmanifest_path>(?:assets/)?manifest\.webmanifest)$ {
+        types { application/manifest+json webmanifest; }
+        default_type application/manifest+json;
+        add_header Content-Security-Policy "frame-ancestors 'self'" always;
+        add_header X-Frame-Options "SAMEORIGIN" always;
+        try_files /$webmanifest_path =404;
+    }
+
     location ~ ^/(release-entry|release-manifest)\.json$ {
         add_header Cache-Control "no-store";
+        add_header Content-Security-Policy "frame-ancestors 'self'" always;
+        add_header X-Frame-Options "SAMEORIGIN" always;
         try_files $uri =404;
     }
 
     location ~ ^/(master|beta|canary|internal)/frontend/(release-entry|release-manifest)\.json$ {
         add_header Cache-Control "no-store";
+        add_header Content-Security-Policy "frame-ancestors 'self'" always;
+        add_header X-Frame-Options "SAMEORIGIN" always;
         try_files /$2.json =404;
     }
 
     location ~ ^/(?:.+/)?(?<static_asset_path>(?:assets|resources|favicons|icons|img|sounds|\.well-known)/.+)$ {
         add_header Cache-Control "public, max-age=31536000, immutable";
+        add_header Content-Security-Policy "frame-ancestors 'self'" always;
+        add_header X-Frame-Options "SAMEORIGIN" always;
         try_files /$static_asset_path =404;
     }
 
-    location ~ ^/(?:.+/)?(?<static_file_path>manifest\.json|manifest\.webmanifest|favicon\.ico|favicon_default\.ico|pleno-favicon\.ico|release-entry\.json|release-manifest\.json|registerSW\.js|sw\.js|workbox-[^/]+\.js)$ {
+    location ~ ^/(?:.+/)?(?<static_file_path>index\.html|manifest\.json|manifest\.webmanifest|favicon\.ico|favicon_default\.ico|pleno-favicon\.ico|release-entry\.json|release-manifest\.json|registerSW\.js|sw\.js|workbox-[^/]+\.js)$ {
         try_files /$static_file_path =404;
     }
 
@@ -30,11 +47,15 @@ server {
 
     location /assets/ {
         add_header Cache-Control "public, max-age=31536000, immutable";
+        add_header Content-Security-Policy "frame-ancestors 'self'" always;
+        add_header X-Frame-Options "SAMEORIGIN" always;
         try_files $uri =404;
     }
 
     location ~ ^/(master|beta|canary|internal)/frontend/assets/ {
         add_header Cache-Control "public, max-age=31536000, immutable";
+        add_header Content-Security-Policy "frame-ancestors 'self'" always;
+        add_header X-Frame-Options "SAMEORIGIN" always;
         rewrite ^/(master|beta|canary|internal)/frontend/(.*)$ /$2 break;
         try_files $uri =404;
     }

openapi.yaml

@@ -3056,6 +3056,8 @@ paths:
     get:
       tags:
         - Orders
+      x-api-coverage:
+        happy: true
       summary: List orders
       description: Retrieve a paginated list of orders
       operationId: listOrders
@@ -4622,7 +4624,7 @@ paths:
       tags:
         - Self-Serve
       summary: Add vehicle condition
-      description: Add a new vehicle condition (answer to a question). Customers can only add conditions for their own vehicles.
+      description: Add a new vehicle condition (answer to a question). Customers can only add conditions for their own vehicles. This answer mutation does not activate machines or synchronize live relay state; hardware changes are handled only by the explicit wash start flow.
       operationId: addSelfserveVehicleCondition
       requestBody:
         required: true
@@ -4657,14 +4659,6 @@ paths:
                   type: integer
                   nullable: true
                   description: Alias for vehicle_type.
-                activate_machine:
-                  type: boolean
-                  default: true
-                  description: Whether the session synchronization may enable the machine relay. User wash-start saves answers with false.
-                sync_relay_state:
-                  type: boolean
-                  default: true
-                  description: Whether the answer mutation should synchronize live relay state.
       responses:
         '200':
           description: Successfully added vehicle condition
@@ -4681,7 +4675,7 @@ paths:
       tags:
         - Self-Serve
       summary: Update vehicle condition
-      description: Update an existing vehicle condition. Customers can only update conditions for their own vehicles.
+      description: Update an existing vehicle condition. Customers can only update conditions for their own vehicles. This answer mutation does not activate machines or synchronize live relay state; hardware changes are handled only by the explicit wash start flow.
       operationId: updateSelfserveVehicleCondition
       parameters:
         - name: id
@@ -4717,14 +4711,6 @@ paths:
                   type: integer
                   nullable: true
                   description: Alias for vehicle_type.
-                activate_machine:
-                  type: boolean
-                  default: true
-                  description: Whether the session synchronization may enable the machine relay.
-                sync_relay_state:
-                  type: boolean
-                  default: true
-                  description: Whether the mutation should synchronize live relay state.
       responses:
         '200':
           description: Successfully updated vehicle condition
@@ -5400,7 +5386,7 @@ paths:
           application/json:
             schema:
               type: object
-              required: [department, gateway_id, action]
+              required: [department, gateway_id, action, confirm]
               properties:
                 department: { type: integer }
                 gateway_id: { type: integer }
@@ -8702,6 +8688,116 @@ paths:
               schema:
                 $ref: '#/components/schemas/SelfServeLaneStatus'
 
+  /modules/self-serve/lane/wash/my-active-wash:
+    get:
+      tags:
+        - Modules
+      summary: Get the authenticated customer's active self-serve wash
+      description: |
+        Returns the current authenticated customer's open self-serve wash session,
+        if one exists. Regular customers must only receive their own active wash
+        details from this endpoint.
+      operationId: getMyActiveSelfServeWash
+      responses:
+        '200':
+          description: Authenticated customer's active wash details resolved
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  lane_id:
+                    type: integer
+                    nullable: true
+                  in_progress:
+                    type: boolean
+                  session:
+                    type: object
+                    nullable: true
+                    properties:
+                      id:
+                        type: integer
+                      lane_id:
+                        type: integer
+                        nullable: true
+                      department_id:
+                        type: integer
+                        nullable: true
+                      status:
+                        type: string
+                      reg:
+                        type: string
+                      customer_number:
+                        type: integer
+                        nullable: true
+                      vehicle_id:
+                        type: integer
+                        nullable: true
+                      vehicle_type_id:
+                        type: integer
+                        nullable: true
+                      included_minutes:
+                        type: integer
+                        nullable: true
+                      machine_type_id:
+                        type: integer
+                        nullable: true
+                      machine_relay_enabled:
+                        type: boolean
+                      machine_relay_enabled_at:
+                        type: string
+                        nullable: true
+                      machine_start_triggered:
+                        type: boolean
+                      machine_start_triggered_at:
+                        type: string
+                        nullable: true
+                      wash_started_at:
+                        type: string
+                        nullable: true
+                      created_at:
+                        type: string
+                      updated_at:
+                        type: string
+                        nullable: true
+                  customer:
+                    type: object
+                    nullable: true
+                    properties:
+                      id:
+                        type: integer
+                        nullable: true
+                      customer_number:
+                        type: integer
+                        nullable: true
+                      display_name:
+                        type: string
+                        nullable: true
+                      email:
+                        type: string
+                        nullable: true
+                      phone_country_code:
+                        type: integer
+                        nullable: true
+                      phone:
+                        type: string
+                        nullable: true
+                  vehicle:
+                    type: object
+                    nullable: true
+                    properties:
+                      id:
+                        type: integer
+                      customer_id:
+                        type: integer
+                      type:
+                        type: integer
+                      reg:
+                        type: string
+                      reference:
+                        type: string
+                        nullable: true
+
   /modules/self-serve/lane/wash/in-progress:
     get:
       tags:

output/staging/app/build.gradle

@@ -56,9 +56,9 @@ android {
     defaultConfig {
         applicationId "io.truckwash.twa.staging"
         minSdkVersion 21
-        targetSdkVersion 35
-        versionCode 5
-        versionName "5"
+        targetSdkVersion 36
+        versionCode 6
+        versionName "6"
 
         // The name for the application
         resValue "string", "appName", twaManifest.name

output/staging/app/src/main/res/raw/web_app_manifest.json

@@ -1 +1 @@
-{"name":"Truck Wash Kundeportal","short_name":"Truck Wash","description":"Access your Truck Wash accounts and transactions from anywhere.","start_url":"/","display":"standalone","background_color":"#0787bb","theme_color":"#063651","lang":"en","scope":"/","orientation":"portrait","launch_handler":{"client_mode":"navigate-existing"},"icons":[{"src":"favicons/web-app-manifest-192x192.png","sizes":"192x192","type":"image/png"},{"src":"favicons/web-app-manifest-512x512.png","sizes":"512x512","type":"image/png"}],"id":"pleno-pwa-test"}
+{"name":"Truck Wash Kundeportal","short_name":"Truck Wash","description":"Access your Truck Wash accounts and transactions from anywhere.","start_url":"/","display":"standalone","background_color":"#0787bb","theme_color":"#063651","lang":"en","scope":"/","orientation":"portrait","launch_handler":{"client_mode":"navigate-existing"},"icons":[{"src":"favicons/web-app-manifest-192x192.png","sizes":"192x192","type":"image/png"},{"src":"favicons/web-app-manifest-512x512.png","sizes":"512x512","type":"image/png"}],"id":"/"}

package.json

@@ -7,11 +7,13 @@
     "dev": "vite",
     "build": "vite build",
     "build:dev": "vite build --mode development",
+    "lint": "eslint eslint.config.js src tests scripts vite.config.js vitest.config.js playwright*.ts --quiet",
+    "lint:strict": "npm run lint:report -- --max-warnings=0",
+    "lint:report": "eslint eslint.config.js src tests scripts vite.config.js vitest.config.js playwright*.ts",
     "format:tests": "prettier --write \"tests/**/*.{js,ts}\"",
     "format:tests:commit": "node scripts/pre-commit-format-tests.mjs",
     "format:tests:check": "prettier --check \"tests/**/*.{js,ts}\"",
     "prepare": "node scripts/prepare-husky.mjs",
-    "postinstall": "node scripts/postinstall-sync-playwright-root-links.mjs",
     "preview": "vite preview",
     "preview:prod": "npm run build && npm run preview -- --host 127.0.0.1 --port 4173",
     "text:fix-encoding": "node scripts/text-encoding.mjs fix",
@@ -109,17 +111,23 @@
   },
   "devDependencies": {
     "@creativebulma/bulma-divider": "^1.1.0",
+    "@eslint/js": "^10.0.1",
     "@event-calendar/core": "^4.1.0",
     "@playwright/test": "^1.58.2",
     "@types/event-calendar__core": "^3.7.0",
     "@vitejs/plugin-vue": "^6.0.5",
     "@vitejs/plugin-vue-jsx": "^5.1.5",
     "@vue/test-utils": "^2.4.6",
+    "eslint": "^10.4.1",
+    "eslint-plugin-vue": "^10.9.2",
+    "globals": "^17.6.0",
     "husky": "^9.1.7",
     "jsdom": "^29.0.0",
     "otpauth": "^9.5.0",
     "prettier": "2.8.8",
     "sass-embedded": "^1.81.0",
+    "typescript": "^6.0.3",
+    "typescript-eslint": "^8.60.1",
     "vite": "7.1.11",
     "vite-plugin-pwa": "^1.0.2",
     "vite-plugin-vue-devtools": "^7.5.4",

playwright.config.ts

@@ -38,10 +38,14 @@ function buildProject(name: string, browserName: "chromium" | "firefox" | "webki
 export default defineConfig({
   testDir: "./tests/e2e",
   testIgnore: ["**/release/**"],
+  snapshotPathTemplate: "{snapshotDir}/{testFileDir}/{testFileName}-snapshots/{arg}{-projectName}-win32{ext}",
   timeout: 60_000,
   fullyParallel: true,
   forbidOnly: isCI,
   retries: isCI ? 2 : 0,
+  expect: {
+    timeout: 15_000,
+  },
   workers,
   ...(process.env.PLAYWRIGHT_BASE_URL
     ? {}

playwright.global-setup.mjs

@@ -19,6 +19,16 @@ const stderrLogFile = path.resolve(serverLogDir, `dev-server-${runtimeNamespace}
 const viteCliPath = path.resolve(process.cwd(), "node_modules/vite/bin/vite.js");
 const serverOutputLimit = 80;
 const activeOutputReaders = [];
+const viteServerEnv = {
+  ...process.env,
+  PLAYWRIGHT: "1",
+  ...(process.env.CI
+    ? {
+        CHOKIDAR_INTERVAL: process.env.CHOKIDAR_INTERVAL || "300",
+        CHOKIDAR_USEPOLLING: process.env.CHOKIDAR_USEPOLLING || "true",
+      }
+    : {}),
+};
 // Hardlinked Windows worktrees can break Vite's bundled config temp paths during Playwright boot.
 const viteDevArgs = [
   ...(process.env.PLAYWRIGHT_VITE_FORCE === "1" ? ["--force"] : []),
@@ -449,10 +459,7 @@ export default async function globalSetup() {
   const serverProcess = spawn(process.execPath, [viteCliPath, ...viteDevArgs], {
     cwd: process.cwd(),
     detached: true,
-    env: {
-      ...process.env,
-      PLAYWRIGHT: "1",
-    },
+    env: viteServerEnv,
     stdio: ["ignore", "pipe", "pipe"],
     windowsHide: true,
   });

playwright.prod.config.ts

@@ -1,3 +1,4 @@
+import fs from "node:fs";
 import { defineConfig, devices } from "@playwright/test";
 
 const baseURL = "http://127.0.0.1:4173";
@@ -5,6 +6,55 @@ const isCI = !!process.env.CI;
 
 process.env.PLAYWRIGHT_BASE_URL = baseURL;
 
+const osReleaseValue = (key: string) => {
+  try {
+    const body = fs.readFileSync("/etc/os-release", "utf8");
+    const match = body.match(new RegExp(`^${key}=(.*)$`, "m"));
+    return String(match?.[1] || "").replace(/^"|"$/g, "");
+  } catch {
+    return "";
+  }
+};
+
+const isUnsupportedWebKitHost = () => {
+  if (process.platform !== "linux") {
+    return false;
+  }
+  const id = osReleaseValue("ID").toLowerCase();
+  const version = Number.parseFloat(osReleaseValue("VERSION_ID"));
+  return id === "ubuntu" && Number.isFinite(version) && version >= 26.04;
+};
+
+const webKitOverride = String(process.env.PLAYWRIGHT_PROD_WEBKIT || "")
+  .trim()
+  .toLowerCase();
+const includeWebKit =
+  webKitOverride === "1" || (webKitOverride !== "0" && webKitOverride !== "false" && !isUnsupportedWebKitHost());
+
+const projects = [
+  {
+    name: "chromium-desktop",
+    use: {
+      ...devices["Desktop Chrome"],
+    },
+  },
+  {
+    name: "chromium-mobile",
+    use: {
+      ...devices["Pixel 5"],
+    },
+  },
+];
+
+if (includeWebKit) {
+  projects.push({
+    name: "webkit-desktop",
+    use: {
+      ...devices["Desktop Safari"],
+    },
+  });
+}
+
 export default defineConfig({
   testDir: "./tests/e2e/release",
   testMatch: /.*\.local-prod\.spec\.ts/,
@@ -28,24 +78,5 @@ export default defineConfig({
     timeout: 240_000,
     reuseExistingServer: !isCI,
   },
-  projects: [
-    {
-      name: "chromium-desktop",
-      use: {
-        ...devices["Desktop Chrome"],
-      },
-    },
-    {
-      name: "chromium-mobile",
-      use: {
-        ...devices["Pixel 5"],
-      },
-    },
-    {
-      name: "webkit-desktop",
-      use: {
-        ...devices["Desktop Safari"],
-      },
-    },
-  ],
+  projects,
 });

public/.htaccess

@@ -2,6 +2,10 @@
   Options -MultiViews
 </IfModule>
 
+<IfModule mod_mime.c>
+  AddType application/manifest+json .webmanifest
+</IfModule>
+
 <IfModule mod_rewrite.c>
   RewriteEngine On
 
@@ -23,17 +27,17 @@
 
   RewriteCond %{REQUEST_FILENAME} !-f
   RewriteCond %{REQUEST_FILENAME} !-d
-  RewriteRule ^.+/((?:manifest\.json|manifest\.webmanifest|favicon\.ico|favicon_default\.ico|pleno-favicon\.ico|release-entry\.json|release-manifest\.json|registerSW\.js|sw\.js|workbox-[^/]+\.js))$ $1 [L]
+  RewriteRule ^.+/((?:index\.html|manifest\.json|manifest\.webmanifest|favicon\.ico|favicon_default\.ico|pleno-favicon\.ico|release-entry\.json|release-manifest\.json|registerSW\.js|sw\.js|workbox-[^/]+\.js))$ $1 [L]
 
   RewriteCond %{REQUEST_FILENAME} !-f
   RewriteCond %{REQUEST_FILENAME} !-d
   RewriteCond %{DOCUMENT_ROOT}/public/$1 -f
-  RewriteRule ^(?:.*?/)?((?:manifest\.json|manifest\.webmanifest|favicon\.ico|favicon_default\.ico|pleno-favicon\.ico|release-entry\.json|release-manifest\.json|registerSW\.js|sw\.js|workbox-[^/]+\.js))$ public/$1 [L]
+  RewriteRule ^(?:.*?/)?((?:index\.html|manifest\.json|manifest\.webmanifest|favicon\.ico|favicon_default\.ico|pleno-favicon\.ico|release-entry\.json|release-manifest\.json|registerSW\.js|sw\.js|workbox-[^/]+\.js))$ public/$1 [L]
 
   RewriteCond %{REQUEST_FILENAME} !-f
   RewriteCond %{REQUEST_FILENAME} !-d
   RewriteCond %{DOCUMENT_ROOT}/dist/$1 -f
-  RewriteRule ^(?:.*?/)?((?:manifest\.json|manifest\.webmanifest|favicon\.ico|favicon_default\.ico|pleno-favicon\.ico|release-entry\.json|release-manifest\.json|registerSW\.js|sw\.js|workbox-[^/]+\.js))$ dist/$1 [L]
+  RewriteRule ^(?:.*?/)?((?:index\.html|manifest\.json|manifest\.webmanifest|favicon\.ico|favicon_default\.ico|pleno-favicon\.ico|release-entry\.json|release-manifest\.json|registerSW\.js|sw\.js|workbox-[^/]+\.js))$ dist/$1 [L]
 
   RewriteCond %{REQUEST_FILENAME} !-f
   RewriteCond %{REQUEST_FILENAME} !-d
@@ -41,7 +45,7 @@
 
   RewriteCond %{REQUEST_FILENAME} !-f
   RewriteCond %{REQUEST_FILENAME} !-d
-  RewriteRule ^(?:.*?/)?(?:manifest\.json|manifest\.webmanifest|favicon\.ico|favicon_default\.ico|pleno-favicon\.ico|release-entry\.json|release-manifest\.json|registerSW\.js|sw\.js|workbox-[^/]+\.js)$ - [R=404,L]
+  RewriteRule ^(?:.*?/)?(?:index\.html|manifest\.json|manifest\.webmanifest|favicon\.ico|favicon_default\.ico|pleno-favicon\.ico|release-entry\.json|release-manifest\.json|registerSW\.js|sw\.js|workbox-[^/]+\.js)$ - [R=404,L]
 
   RewriteCond %{REQUEST_FILENAME} !-f
   RewriteCond %{REQUEST_FILENAME} !-d

public/manifest.json

@@ -2,6 +2,7 @@
   "name": "Truck Wash Kundeportal",
   "short_name": "Truck Wash",
   "description": "Access your Truck Wash accounts and transactions from anywhere.",
+  "id": "/",
   "icons": [
     {
       "src": "assets/favicons/web-app-manifest-192x192.png",

scripts/install-playwright-browsers.mjs

@@ -0,0 +1,90 @@
+import { spawnSync } from "node:child_process";
+
+const browsers = process.argv.slice(2);
+const requestedBrowsers = browsers.length > 0 ? browsers : ["chromium"];
+
+const fallbackHostPlatformByUnsupportedPlatform = (platform) => {
+  const ubuntuMatch = platform.match(/^ubuntu(\d+\.\d+)-(x64|arm64)$/);
+  if (ubuntuMatch && Number.parseInt(ubuntuMatch[1], 10) >= 26) {
+    return `ubuntu24.04-${ubuntuMatch[2]}`;
+  }
+
+  return null;
+};
+
+const outputText = (result) => `${result.stdout || ""}\n${result.stderr || ""}`;
+
+const unsupportedHostPlatform = (result) => {
+  const output = outputText(result);
+  return (
+    output.match(/Cannot install dependencies for (?<platform>\S+) with Playwright/i)?.groups?.platform ||
+    output.match(/Playwright does not support \S+ on (?<platform>\S+)/i)?.groups?.platform ||
+    null
+  );
+};
+
+const runPlaywrightInstall = (args, env = {}) =>
+  spawnSync("npx", ["playwright", "install", ...args], {
+    cwd: process.cwd(),
+    env: {
+      ...process.env,
+      ...env,
+    },
+    encoding: "utf8",
+  });
+
+const writeOutput = (result) => {
+  if (result.stdout) {
+    process.stdout.write(result.stdout);
+  }
+  if (result.stderr) {
+    process.stderr.write(result.stderr);
+  }
+};
+
+const hasUnsupportedHostPlatformFailure = (result) => {
+  const output = outputText(result);
+  return (
+    result.status !== 0 &&
+    /Playwright does not support .* on /i.test(output)
+  );
+};
+
+const withDepsResult = runPlaywrightInstall(["--with-deps", ...requestedBrowsers]);
+writeOutput(withDepsResult);
+
+if (withDepsResult.status === 0) {
+  process.exit(0);
+}
+
+if (!hasUnsupportedHostPlatformFailure(withDepsResult)) {
+  process.exit(withDepsResult.status ?? 1);
+}
+
+const unsupportedPlatform = unsupportedHostPlatform(withDepsResult);
+const fallbackHostPlatform = unsupportedPlatform
+  ? fallbackHostPlatformByUnsupportedPlatform(unsupportedPlatform)
+  : null;
+
+if (!fallbackHostPlatform) {
+  console.error(
+    `Playwright dependency install is unsupported for ${unsupportedPlatform || "this platform"}, ` +
+      "and this script does not have a safe browser archive fallback for it."
+  );
+  process.exit(withDepsResult.status ?? 1);
+}
+
+console.warn(
+  [
+    `Playwright could not install OS dependencies for ${unsupportedPlatform}.`,
+    `Retrying browser installation using Playwright fallback archive ${fallbackHostPlatform}.`,
+    "The self-hosted runner image must provide the required browser system libraries.",
+  ].join("\n")
+);
+
+const fallbackResult = runPlaywrightInstall(requestedBrowsers, {
+  PLAYWRIGHT_HOST_PLATFORM_OVERRIDE: fallbackHostPlatform,
+  PLAYWRIGHT_SKIP_VALIDATE_HOST_REQUIREMENTS: "1",
+});
+writeOutput(fallbackResult);
+process.exit(fallbackResult.status ?? 1);

scripts/postinstall-sync-playwright-root-links.mjs

@@ -1,22 +0,0 @@
-import fs from "node:fs";
-import path from "node:path";
-import { spawnSync } from "node:child_process";
-
-const helperScriptPath = path.resolve(process.cwd(), "..", "scripts", "sync-playwright-root-links.mjs");
-
-if (!fs.existsSync(helperScriptPath)) {
-  console.log(
-    `Skipping root Playwright link sync: helper script not found at ${helperScriptPath}.`
-  );
-  process.exit(0);
-}
-
-const result = spawnSync(process.execPath, [helperScriptPath], {
-  stdio: "inherit",
-});
-
-if (typeof result.status === "number") {
-  process.exit(result.status);
-}
-
-process.exit(1);

scripts/release/upload-dist-lftp.sh

@@ -23,20 +23,52 @@ if [[ -z "$DEPLOY_URL" ]]; then
     echo "Set RELEASE_DEPLOY_URL or RELEASE_DEPLOY_HOST, RELEASE_DEPLOY_USER, and RELEASE_DEPLOY_PASSWORD." >&2
     exit 1
   fi
-  DEPLOY_URL="ftp://${USER_NAME}:${PASSWORD}@${HOST}"
+  DEPLOY_URL="ftp://${HOST}"
+elif [[ -n "$USER_NAME" || -n "$PASSWORD" ]]; then
+  if [[ -z "$USER_NAME" || -z "$PASSWORD" ]]; then
+    echo "Set both RELEASE_DEPLOY_USER and RELEASE_DEPLOY_PASSWORD when providing deploy credentials separately." >&2
+    exit 1
+  fi
 fi
 
+lftp_quote() {
+  local value="${1//\'/\'\\\'\'}"
+  printf "'%s'" "$value"
+}
+
+run_lftp() {
+  local transfer_command="$1"
+
+  {
+    printf 'set ftp:ssl-allow true\n'
+    printf 'set ftp:ssl-force true\n'
+    printf 'set ftp:ssl-protect-data true\n'
+    printf 'set net:max-retries 3\n'
+    printf 'set net:timeout 20\n'
+
+    if [[ -n "$USER_NAME" && -n "$PASSWORD" ]]; then
+      printf 'open -u %s,%s %s\n' "$(lftp_quote "$USER_NAME")" "$(lftp_quote "$PASSWORD")" "$(lftp_quote "$DEPLOY_URL")"
+    else
+      printf 'open %s\n' "$(lftp_quote "$DEPLOY_URL")"
+    fi
+
+    printf 'cd %s\n' "$(lftp_quote "$REMOTE_ROOT")"
+    printf '%s\n' "$transfer_command"
+    printf 'bye\n'
+  } | lftp -f /dev/stdin
+}
+
 upload_file() {
   local source_file="$1"
   local remote_file="$2"
   if [[ -f "$source_file" ]]; then
-    lftp "$DEPLOY_URL" -e "set ftp:ssl-allow true; set net:max-retries 3; set net:timeout 20; cd \"$REMOTE_ROOT\"; put -O \"$(dirname "$remote_file")\" \"$source_file\" -o \"$(basename "$remote_file")\"; bye"
+    run_lftp "put -O $(lftp_quote "$(dirname "$remote_file")") $(lftp_quote "$source_file") -o $(lftp_quote "$(basename "$remote_file")")"
   fi
 }
 
 for directory in assets resources favicons icons img sounds .well-known; do
   if [[ -d "$DIST_DIR/$directory" ]]; then
-    lftp "$DEPLOY_URL" -e "set ftp:ssl-allow true; set net:max-retries 3; set net:timeout 20; cd \"$REMOTE_ROOT\"; mirror -R --only-newer --parallel=4 \"$DIST_DIR/$directory\" \"$directory\"; bye"
+    run_lftp "mirror -R --only-newer --parallel=4 $(lftp_quote "$DIST_DIR/$directory") $(lftp_quote "$directory")"
   fi
 done
 

scripts/release/verify-upload.mjs

@@ -1,4 +1,5 @@
 import crypto from "node:crypto";
+import fs from "node:fs";
 
 const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 
@@ -7,6 +8,24 @@ function numberEnv(name, fallback) {
   return Number.isFinite(value) && value >= 0 ? value : fallback;
 }
 
+function booleanEnv(name) {
+  return /^(1|true|yes)$/i.test(process.env[name] || "");
+}
+
+function appendGithubEnv(values) {
+  const envFile = process.env.GITHUB_ENV;
+  if (!envFile) {
+    return;
+  }
+
+  const lines = Object.entries(values)
+    .filter(([, value]) => value)
+    .map(([key, value]) => `${key}=${String(value).replace(/\r?\n/g, "")}`);
+  if (lines.length > 0) {
+    fs.appendFileSync(envFile, `${lines.join("\n")}\n`);
+  }
+}
+
 function requiredUrl() {
   const value = process.env.RELEASE_BASE_URL || process.env.PLAYWRIGHT_BASE_URL;
   if (!value) {
@@ -121,6 +140,7 @@ async function verifyShell(baseUrl, shellPath) {
 async function verifyRelease(baseUrl) {
   const expectedCommit = process.env.RELEASE_EXPECTED_COMMIT || process.env.GITHUB_SHA || "";
   const expectedBuildId = process.env.RELEASE_EXPECTED_BUILD_ID || process.env.RELEASE_BUILD_ID || "";
+  const strictBuildId = booleanEnv("RELEASE_STRICT_BUILD_ID");
   const manifest = await fetchJson(baseUrl, "release-manifest.json");
   const releaseEntry = await fetchJson(baseUrl, "release-entry.json");
 
@@ -130,7 +150,7 @@ async function verifyRelease(baseUrl) {
   if (!compareCommit(String(manifest.commit_sha || ""), expectedCommit)) {
     throw new Error(`release-manifest.json commit_sha ${manifest.commit_sha || "(missing)"} did not match ${expectedCommit}`);
   }
-  if (expectedBuildId && manifest.build_id !== expectedBuildId) {
+  if (strictBuildId && expectedBuildId && manifest.build_id !== expectedBuildId) {
     throw new Error(`release-manifest.json build_id ${manifest.build_id} did not match ${expectedBuildId}`);
   }
   if (releaseEntry.entry !== manifest.entry) {
@@ -191,6 +211,10 @@ async function main() {
     attempt += 1;
     try {
       const result = await verifyRelease(baseUrl);
+      appendGithubEnv({
+        RELEASE_VERIFIED_BUILD_ID: result.build_id,
+        RELEASE_VERIFIED_COMMIT: result.commit_sha,
+      });
       console.log(
         `Release upload verified after ${attempt} attempt(s): build_id=${result.build_id}, commit_sha=${result.commit_sha}, assets=${result.assets}`
       );

scripts/run-playwright-full-slice.mjs

@@ -1,31 +1,41 @@
 import { execFile, spawn } from "node:child_process";
 import fs from "node:fs/promises";
 import path from "node:path";
+import { fileURLToPath } from "node:url";
 import { promisify } from "node:util";
 
 const workingDirectory = process.cwd();
 const playwrightCliPath = path.join(workingDirectory, "node_modules", "@playwright", "test", "cli.js");
 const execFileAsync = promisify(execFile);
-const roles = ["customer", "subuser", "admin", "superuser"];
+export const roles = ["customer", "subuser", "admin", "superuser"];
 const listEntryPattern = /^\s+\[[^\]]+\]\s+›\s+(.+?):(\d+):(\d+)\s+›\s+(.+)\s*$/u;
 
-const ownedFilesByRole = {
+export const ownedFilesByRole = {
   customer: [
     "auth.smoke.spec.js",
     "booking-selfserve.smoke.spec.js",
     "connectivityIssue.spec.ts",
     "example.spec.ts",
+    "guest-book-wash-mobile.spec.ts",
+    "i18n-catalog-switch.spec.ts",
+    "i18n-v2-integrity.spec.ts",
     "i18n.smoke.spec.ts",
     "i18n.views.spec.ts",
     "navigation.smoke.spec.js",
     "qr-new-customer-layout.spec.ts",
+    "release-bootstrap.spec.js",
+    "release-channel-switched.spec.js",
+    "release-channel-unavailable.spec.js",
+    "release-update-widget.spec.js",
     "self-serve-wash.spec.js",
+    "session-release-runtime.spec.ts",
     "user-orders.spec.ts",
     "userBookings.spec.ts",
     "userBookWash.spec.ts",
     "userHome.spec.ts",
     "userInvoices.spec.ts",
     "userMyWashStart.spec.ts",
+    "userMyWashStartFlow.spec.ts",
     "userProfileInvoicing.spec.ts",
     "userProfileNotifications.spec.ts",
     "userProfileSecurity.spec.ts",
@@ -53,6 +63,7 @@ const ownedFilesByRole = {
     "assign-draft-order-modal-layout.spec.ts",
     "change-invoice-collection.spec.ts",
     "change-customer.spec.ts",
+    "default-mobile-redirect.spec.ts",
     "economic-queue-workflow.spec.js",
     "pos-customer-rules.spec.js",
     "pos-desktop-card-payments.spec.js",
@@ -62,18 +73,24 @@ const ownedFilesByRole = {
     "pos.visual.spec.js",
   ],
   superuser: [
+    "coolify-infrastructure.spec.js",
     "edge-gateways.fleet-outline.spec.js",
     "edge-gateways.routes.spec.js",
     "edge-gateways.smoke.spec.js",
     "edge-gateways.visual.spec.js",
+    "errorReports.spec.ts",
+    "failover-config.source.spec.ts",
+    "collected-invoice-move-customer.spec.ts",
     "invoice-distribution.smoke.spec.js",
     "invoice-transfer-monitor.spec.ts",
     "invoice-transfer-queue-history.spec.js",
     "invoicing-period.smoke.spec.js",
     "issue-repro-duplicates-date.spec.js",
+    "release-manager.spec.js",
     "self-serve-sessions.spec.js",
     "self-serve-studio-audit-navigation.spec.js",
     "self-serve-studio-flow.spec.js",
+    "session-bootstrap.spec.ts",
     "superuser-bookings.spec.ts",
     "superuser-customer-complaints.spec.ts",
     "superuser-customers-mass-import.spec.ts",
@@ -84,12 +101,13 @@ const ownedFilesByRole = {
     "superuser-drafts.spec.ts",
     "superuser-products-layout.spec.ts",
     "superuser-system-status.smoke.spec.js",
+    "superuser-users.spec.ts",
     "superuser-vehicles.smoke.spec.js",
     "workfeed-config.smoke.spec.js",
   ],
 };
 
-const titleRules = [
+export const titleRules = [
   { role: "customer", file: "userAuth.spec.ts", patterns: [/\[AUTH\]\[User\]/u] },
   { role: "subuser", file: "userAuth.spec.ts", patterns: [/\[AUTH\]\[Subuser\]/u] },
   { role: "admin", file: "userAuth.spec.ts", patterns: [/\[AUTH\]\[Operator\]/u] },
@@ -116,6 +134,11 @@ const titleRules = [
     file: "subuser-management.spec.ts",
     patterns: [/^authorized subuser managers/i, /^subuser self-service/i, /^subusers without /i],
   },
+  {
+    role: "superuser",
+    file: "subuser-management.spec.ts",
+    patterns: [/^superusers can list and invite chauffeurs/i],
+  },
   { role: "subuser", file: "userProfileVisibility.spec.ts", patterns: [/\[PROFILE\]\[Subuser\]\[Visibility\]/u] },
 ];
 
@@ -200,7 +223,7 @@ function toBaseName(filePath) {
   return filePath.split(/[\\/]/u).pop() || filePath;
 }
 
-function parseListedTests(listOutput) {
+export function parseListedTests(listOutput) {
   return listOutput
     .split(/\r?\n/u)
     .map((line) => {
@@ -222,7 +245,7 @@ function parseListedTests(listOutput) {
     .filter(Boolean);
 }
 
-function classifyTest(testEntry) {
+export function classifyTest(testEntry) {
   const matches = new Set();
   const directOwner = ownedFileToRole.get(testEntry.fileName);
 
@@ -309,8 +332,8 @@ async function runPlaywright(project, testListPath, forwardedArgs) {
   });
 }
 
-async function main() {
-  const { options, forwardedArgs } = parseCliArgs(process.argv.slice(2));
+export async function main(argv = process.argv.slice(2)) {
+  const { options, forwardedArgs } = parseCliArgs(argv);
   validateOptions(options, forwardedArgs);
 
   const listOutput = await listProjectTests(options.project, forwardedArgs);
@@ -342,4 +365,17 @@ async function main() {
   await runPlaywright(options.project, testListPath, forwardedArgs);
 }
 
-await main();
+async function isDirectRun() {
+  if (!process.argv[1]) {
+    return false;
+  }
+
+  const currentPath = await fs.realpath(fileURLToPath(import.meta.url));
+  const invokedPath = await fs.realpath(process.argv[1]).catch(() => path.resolve(process.argv[1]));
+
+  return currentPath === invokedPath;
+}
+
+if (await isDirectRun()) {
+  await main();
+}

scripts/run-playwright-pr.mjs

@@ -22,6 +22,7 @@ for (const signal of ["SIGINT", "SIGTERM"]) {
 function parseArgs(rawArgs) {
   const parsed = {
     help: false,
+    coreOnly: false,
     changedOnly: false,
     listOnly: false,
     base: "",
@@ -43,6 +44,11 @@ function parseArgs(rawArgs) {
       continue;
     }
 
+    if (value === "--core-only") {
+      parsed.coreOnly = true;
+      continue;
+    }
+
     if (value === "--changed-only") {
       parsed.changedOnly = true;
       continue;
@@ -103,12 +109,14 @@ Options:
   --base <ref>       Base ref for changed-area detection
   --head <ref>       Head ref for changed-area detection. Default: HEAD
   --project <name>   Restrict to one Chromium Playwright project. Can be repeated.
+  --core-only        Run only the core @pr gate
   --changed-only     Run changed-area selection without the core @pr gate
   --list-only        List selected tests instead of running them
   -h, --help         Show help
 
 Examples:
   npm run test:e2e:pr
+  npm run test:e2e:pr -- --core-only --project=chromium-desktop
   npm run test:e2e:changed -- --base=HEAD~1 --head=HEAD
 `);
 }
@@ -418,6 +426,10 @@ async function main() {
     return;
   }
 
+  if (args.coreOnly && args.changedOnly) {
+    throw new Error("--core-only and --changed-only cannot be used together.");
+  }
+
   await fs.access(playwrightCliPath);
 
   if (!args.changedOnly) {
@@ -428,6 +440,10 @@ async function main() {
     }
   }
 
+  if (args.coreOnly) {
+    return;
+  }
+
   const changed = await getChangedFiles();
   if (changed.unavailable) {
     console.log(`[playwright-pr] Changed-area diff unavailable for ${changed.source}; skipping changed-area selection.`);

src/App.vue

@@ -20,6 +20,7 @@ const LayoutV2 = defineAsyncComponent(() => import("@/components/page/wrappers/L
 const DefaultPageWrapper = defineAsyncComponent(() => import("@/components/page/wrappers/DefaultPageWrapper.vue"));
 const RequestQueueProgress = defineAsyncComponent(() => import("@/components/global/RequestQueueProgress.vue"));
 const ErrorReportLauncher = defineAsyncComponent(() => import("@/components/global/ErrorReportLauncher.vue"));
+const FrontendMaintenanceMenu = defineAsyncComponent(() => import("@/components/global/FrontendMaintenanceMenu.vue"));
 const ReleaseChannelUnavailable = defineAsyncComponent(() =>
   import("@/components/release/ReleaseChannelUnavailable.vue")
 );
@@ -128,6 +129,7 @@ watch([() => route.fullPath, locale], updateDocumentTitle, { immediate: true });
   </template>
   <RequestQueueProgress v-if="shouldRenderRequestQueueProgress && !shouldHideGlobalOverlays" />
   <ErrorReportLauncher v-if="shouldRenderRequestQueueProgress && !shouldHideGlobalOverlays" />
+  <FrontendMaintenanceMenu />
 </template>
 
 <style scoped></style>

src/components/displays/buttons/ActionSettingsWheelButton.vue

@@ -63,6 +63,10 @@ const props = defineProps({
     type: String,
     default: null,
   },
+  reg_3: {
+    type: String,
+    default: null,
+  },
   order_booking_id: {
     type: Number,
     default: null,
@@ -93,6 +97,10 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  allowBookingDeletion: {
+    type: Boolean,
+    default: false,
+  },
   department_lane_id: {
     type: Number,
     default: null,
@@ -917,6 +925,15 @@ const getAttachmentLabel = (attachment) => {
   );
 };
 
+const isWashCertificateAttachment = (attachment) => {
+  const marker = String(getAttachmentOtherPayload(attachment) || "").trim().toUpperCase();
+  if (marker === "WASH_CERTIFICATE") {
+    return true;
+  }
+
+  return /(?:^|[/\\])wash[_-]?certificate.*\.pdf$/i.test(getAttachmentLabel(attachment));
+};
+
 const getAttachmentExtension = (attachment) => {
   const match = String(getAttachmentLabel(attachment))
     .toLowerCase()
@@ -1045,6 +1062,10 @@ const activeAttachmentPreviewSource = computed(() => {
   return previewSourcesById.value[activeAttachment.value.id] ?? null;
 });
 
+const hasWashCertificateAttachment = computed(() =>
+  attachmentsFromOrder.value.some((attachment) => isWashCertificateAttachment(attachment))
+);
+
 const hasCachedPreviewSource = (attachmentId) => {
   return Object.prototype.hasOwnProperty.call(previewSourcesById.value, attachmentId);
 };
@@ -1609,6 +1630,48 @@ const showCompleteOrderBookingConfirmation = async () => {
   }
 };
 
+const showEmailNotificationActionResult = async (requestAction, successKey, errorKey) => {
+  try {
+    await requestAction();
+    await Swal.fire({
+      title: t(successKey),
+      icon: "success",
+      showConfirmButton: false,
+      timer: 2000,
+      heightAuto: false,
+    });
+  } catch (error) {
+    console.error(error);
+    await Swal.fire({
+      title: t("common.error"),
+      text: [t(errorKey), SessionUser.functions.parseErrorMessage?.(error)].filter(Boolean).join(": "),
+      icon: "error",
+      heightAuto: false,
+    });
+  }
+};
+
+const resendBookingConfirmation = () =>
+  showEmailNotificationActionResult(
+    () => SessionUser.objects.order_bookings.functions.resendBookingConfirmation(props.order_booking_id),
+    "admin.pos.settings_wheel.resend_booking_confirmation_success",
+    "admin.pos.settings_wheel.resend_booking_confirmation_error"
+  );
+
+const resendBookingCompletionConfirmation = () =>
+  showEmailNotificationActionResult(
+    () => SessionUser.objects.order_bookings.functions.resendBookingCompletionConfirmation(props.order_booking_id),
+    "admin.pos.settings_wheel.resend_booking_completion_confirmation_success",
+    "admin.pos.settings_wheel.resend_booking_completion_confirmation_error"
+  );
+
+const resendWashCertificate = () =>
+  showEmailNotificationActionResult(
+    () => SessionUser.objects.orders.functions.resendWashCertificate(props.order_id),
+    "admin.pos.settings_wheel.resend_wash_certificate_success",
+    "admin.pos.settings_wheel.resend_wash_certificate_error"
+  );
+
 const getAvailableInvoiceCollectionsForCustomer = async (customerNumber) => {
   const normalizedCustomerNumber = normalizePositiveInteger(customerNumber);
   if (!normalizedCustomerNumber) {
@@ -1693,6 +1756,11 @@ const acceptSelfServeWashDraft = async () => {
   }
 };
 
+const canDeleteOrderBooking = computed(() =>
+  !props.order_id &&
+  (props.allowBookingDeletion || SessionUser.canAccessAdmin() || SessionUser.canAccessSuperUser())
+);
+
 const flatBuiltInMenuSections = computed(() => {
   const sections = [];
 
@@ -1747,7 +1815,7 @@ const flatBuiltInMenuSections = computed(() => {
               ),
           })
         : null,
-      !props.order_id
+      canDeleteOrderBooking.value
         ? buildMenuAction("booking-delete", {
             icon: "fas fa-trash-alt",
             label: t("admin.pos.settings_wheel.delete_booking"),
@@ -1835,6 +1903,40 @@ const flatBuiltInMenuSections = computed(() => {
     }
   }
 
+  if (props.order_booking_id || hasWashCertificateAttachment.value) {
+    const emailNotificationsSection = buildMenuSection(
+      "email-notifications",
+      t("admin.pos.settings_wheel.email_notifications_section"),
+      [
+        props.order_booking_id
+          ? buildMenuAction("email-notifications-resend-booking-confirmation", {
+              icon: "fas fa-envelope",
+              label: t("admin.pos.settings_wheel.resend_booking_confirmation"),
+              clickAction: resendBookingConfirmation,
+            })
+          : null,
+        props.order_booking_id && hasWashCertificateAttachment.value
+          ? buildMenuAction("email-notifications-resend-booking-completion-confirmation", {
+              icon: "fas fa-envelope-open-text",
+              label: t("admin.pos.settings_wheel.resend_booking_completion_confirmation"),
+              clickAction: resendBookingCompletionConfirmation,
+            })
+          : null,
+        !props.order_booking_id && hasWashCertificateAttachment.value
+          ? buildMenuAction("email-notifications-resend-wash-certificate", {
+              icon: "fas fa-file-pdf",
+              label: t("admin.pos.settings_wheel.resend_wash_certificate"),
+              clickAction: resendWashCertificate,
+            })
+          : null,
+      ]
+    );
+
+    if (emailNotificationsSection) {
+      sections.push(emailNotificationsSection);
+    }
+  }
+
   if (props.invoice_collection_id && SessionUser.canAccessSuperUser()) {
     const invoiceCollectionLinkSection = buildMenuSection(
       "invoice-collection-link",
@@ -2136,10 +2238,10 @@ const flatBuiltInMenuSections = computed(() => {
     }
   }
 
-  if (props.reg_1 || props.reg_2) {
+  if (props.reg_1 || props.reg_2 || props.reg_3) {
     const vehicleSection = buildMenuSection(
       "vehicle",
-      props.reg_1 && props.reg_2
+      [props.reg_1, props.reg_2, props.reg_3].filter(Boolean).length > 1
         ? SessionUser.objects.vehicles.meta.labels.multiple
         : SessionUser.objects.vehicles.meta.labels.single,
       [
@@ -2157,6 +2259,13 @@ const flatBuiltInMenuSections = computed(() => {
               clickAction: () => SessionUser.functions.redirectTo.superUser("/vehicles/" + props.reg_2, true),
             })
           : null,
+        props.reg_3 && SessionUser.canAccessSuperUser()
+          ? buildMenuAction("vehicle-reg-3", {
+              icon: "fas fa-car",
+              label: t("admin.pos.settings_wheel.view_vehicle_new_tab", { reg: props.reg_3 }),
+              clickAction: () => SessionUser.functions.redirectTo.superUser("/vehicles/" + props.reg_3, true),
+            })
+          : null,
       ]
     );
 
@@ -2426,11 +2535,13 @@ const syncDesktopFlyoutPosition = () => {
       dropdownContentEl.style.top = "";
     }
 
-    const padding = 12;
+    const viewportInsets = getViewportInsets();
+    const viewportTop = viewportInsets.top;
+    const viewportBottom = viewportHeight - viewportInsets.bottom;
     let top = triggerRect.bottom;
 
-    if (top + contentHeight > viewportHeight - padding) {
-      top = Math.max(padding, triggerRect.top - contentHeight);
+    if (top + contentHeight > viewportBottom) {
+      top = Math.max(viewportTop, triggerRect.top - contentHeight);
     }
 
     const nextFixedStyles = {

src/components/displays/department/pos/displays/PayWithStripeButton.vue

@@ -15,6 +15,7 @@ import {
   selectPreferredStripeTerminalReaderId,
   STRIPE_TERMINAL_STATUS,
 } from "@/components/displays/department/pos/displays/stripeTerminalReaders.js";
+import { normalizeStripeInvoice } from "@/components/displays/department/pos/displays/stripeEmailInvoice.js";
 
 const POLLING_INTERVAL_MS = 5000;
 const STRIPE_TERMINAL_SETUP_REQUIRED_CODE = 'stripe_terminal_setup_required';
@@ -87,29 +88,6 @@ const selectedTaxRate = ref(1);
 const paymentIntent = computed(() => StripeModule.paymentIntents.paymentIntent.value);
 const isTerminalPaymentCaptured = computed(() => StripeModule.paymentIntents.isPaymentIntentAmountReceived(paymentIntent.value));
 
-const normalizeStripeInvoice = (value) => {
-  if (!value || typeof value !== 'object' || Array.isArray(value) || Object.keys(value).length === 0) {
-    return null;
-  }
-
-  const invoiceId = value.invoice_id || value.id || null;
-  if (!invoiceId) {
-    return null;
-  }
-
-  return {
-    id: value.id ?? props.order_id,
-    invoice_id: invoiceId,
-    customer_id: value.customer_id ?? null,
-    url: value.url || value.hosted_invoice_url || null,
-    created_at: value.created_at || null,
-    paid: Boolean(value.paid),
-    status: value.status || 'unknown',
-    amount_due: Number(value.amount_due ?? 0),
-    amount_paid: Number(value.amount_paid ?? 0),
-  };
-};
-
 const hasStripeEmailInvoice = computed(() => stripeInvoice.value !== null);
 const isStripeEmailInvoicePaid = computed(() => stripeInvoice.value?.paid === true);
 const isStripeEmailInvoiceTerminalState = computed(() => {
@@ -202,7 +180,7 @@ const loadStripeInvoiceState = async () => {
 
   try {
     const response = await getOrder(props.order_id, true);
-    const nextInvoice = normalizeStripeInvoice(response?.data?.includes?.stripeModuleOrders);
+    const nextInvoice = normalizeStripeInvoice(response?.data?.includes?.stripeModuleOrders, props.order_id);
     stripeInvoice.value = nextInvoice;
     if (nextInvoice) {
       emailPanelState.value = 'tracking';

src/components/displays/department/pos/displays/stripeEmailInvoice.js

@@ -0,0 +1,60 @@
+const STRIPE_INVOICE_PAID_STATUS = 'paid';
+
+export const parseStripeInvoicePaidFlag = (value) => {
+  if (typeof value === 'boolean') {
+    return value;
+  }
+
+  if (typeof value === 'number') {
+    return value === 1;
+  }
+
+  if (typeof value === 'string') {
+    const normalizedValue = value.trim().toLowerCase();
+    if (['true', '1'].includes(normalizedValue)) {
+      return true;
+    }
+
+    if (['false', '0', ''].includes(normalizedValue)) {
+      return false;
+    }
+  }
+
+  return false;
+};
+
+const toFiniteNumber = (value, fallback = 0) => {
+  const parsedValue = Number(value ?? fallback);
+  return Number.isFinite(parsedValue) ? parsedValue : fallback;
+};
+
+export const normalizeStripeInvoice = (value, fallbackOrderId = null) => {
+  if (!value || typeof value !== 'object' || Array.isArray(value) || Object.keys(value).length === 0) {
+    return null;
+  }
+
+  const invoiceId = value.invoice_id || value.id || null;
+  if (!invoiceId) {
+    return null;
+  }
+
+  const status = String(value.status || 'unknown').toLowerCase();
+  const amountDue = toFiniteNumber(value.amount_due);
+  const amountPaid = toFiniteNumber(value.amount_paid);
+  const hasCoveredAmountDue = amountDue <= 0 || amountPaid >= amountDue;
+  const isPaid = status === STRIPE_INVOICE_PAID_STATUS
+    && parseStripeInvoicePaidFlag(value.paid)
+    && hasCoveredAmountDue;
+
+  return {
+    id: value.id ?? fallbackOrderId,
+    invoice_id: invoiceId,
+    customer_id: value.customer_id ?? null,
+    url: value.url || value.hosted_invoice_url || null,
+    created_at: value.created_at || null,
+    paid: isPaid,
+    status,
+    amount_due: amountDue,
+    amount_paid: amountPaid,
+  };
+};

src/components/displays/department/pos/orders/OrderAttachmentsActionButton.vue

@@ -10,6 +10,16 @@ import { SessionUser } from "@/components/session/token/SessionUser.vue";
 const acceptedOrderAttachmentFileTypes = "image/*,application/pdf,.doc,.docx,.xls,.xlsx,.ppt,.pptx";
 const imageExtensions = [".png", ".jpg", ".jpeg", ".gif", ".webp", ".bmp", ".svg"];
 const officeExtensions = [".doc", ".docx", ".xls", ".xlsx", ".ppt", ".pptx"];
+const safePreviewBlobTypesByKind = {
+  image: {
+    fallback: "image/png",
+    allowed: new Set(["image/png", "image/jpeg", "image/gif", "image/webp", "image/bmp", "image/svg+xml"]),
+  },
+  document: {
+    fallback: "application/pdf",
+    allowed: new Set(["application/pdf"]),
+  },
+};
 
 const props = defineProps({
   order: {
@@ -324,7 +334,21 @@ const hasCachedPreviewSource = (attachmentId) => {
   return Object.prototype.hasOwnProperty.call(previewSourcesById.value, attachmentId);
 };
 
-const createEmbeddablePreviewUrl = async (downloadLink) => {
+const createSafePreviewBlob = (fileBlob, previewKind) => {
+  const previewBlobTypes = safePreviewBlobTypesByKind[previewKind];
+  if (!previewBlobTypes) {
+    return null;
+  }
+
+  const normalizedBlobType = String(fileBlob.type || "").toLowerCase();
+  const safeBlobType = previewBlobTypes.allowed.has(normalizedBlobType)
+    ? normalizedBlobType
+    : previewBlobTypes.fallback;
+
+  return new Blob([fileBlob], { type: safeBlobType });
+};
+
+const createEmbeddablePreviewUrl = async (downloadLink, previewKind) => {
   if (!downloadLink) {
     return null;
   }
@@ -340,7 +364,12 @@ const createEmbeddablePreviewUrl = async (downloadLink) => {
       return null;
     }
 
-    const objectUrl = URL.createObjectURL(fileBlob);
+    const safePreviewBlob = createSafePreviewBlob(fileBlob, previewKind);
+    if (!safePreviewBlob) {
+      return null;
+    }
+
+    const objectUrl = URL.createObjectURL(safePreviewBlob);
     generatedObjectUrls.add(objectUrl);
     return objectUrl;
   } catch (error) {
@@ -372,7 +401,7 @@ const ensurePreviewSource = async (attachment) => {
       attachment.id,
       false
     );
-    const previewSource = await createEmbeddablePreviewUrl(downloadLink);
+    const previewSource = await createEmbeddablePreviewUrl(downloadLink, previewKind);
     previewSourcesById.value = {
       ...previewSourcesById.value,
       [attachment.id]: previewSource,
@@ -517,6 +546,7 @@ const toggleDropdown = async () => {
             :src="activePreviewSource"
             class="order-attachments-preview-panel__document"
             title="Attachment preview"
+            sandbox
           ></iframe>
           <a
             v-else-if="activePreviewKind === 'link'"

src/components/displays/department/pos/orders/ordersTable.vue

@@ -275,6 +275,10 @@ const getInvoiceCollectionResponseOrders = (response) => {
     return response.data.orders;
   }
 
+  if (Array.isArray(response?.data?.data?.orders)) {
+    return response.data.data.orders;
+  }
+
   if (Array.isArray(response?.includes?.orders)) {
     return response.includes.orders;
   }
@@ -649,6 +653,41 @@ const getInvoiceCollectionDetails = (invoiceCollectionId) => {
   }
   return null;
 };
+const getInvoiceCollectionDetailOrders = (invoiceCollectionId) => {
+  const details = getInvoiceCollectionDetails(invoiceCollectionId);
+  return details ? getInvoiceCollectionResponseOrders(details) : [];
+};
+const getHiddenOrdersByInvoiceCollection = (invoiceCollectionId) => {
+  const visibleOrderIds = new Set(getOrdersByInvoiceCollection(invoiceCollectionId).map((order) => Number(order?.id)));
+  return getInvoiceCollectionDetailOrders(invoiceCollectionId).filter((order) => !visibleOrderIds.has(Number(order?.id)));
+};
+const getHiddenOrderIdsByInvoiceCollection = (invoiceCollectionId) => (
+  getHiddenOrdersByInvoiceCollection(invoiceCollectionId).map((order) => Number(order?.id))
+);
+const getHiddenInvoiceCollectionFlags = (invoiceCollectionId) => {
+  const hiddenOrderIds = new Set(getHiddenOrderIdsByInvoiceCollection(invoiceCollectionId));
+  if (hiddenOrderIds.size === 0) {
+    return [];
+  }
+
+  return sortInvoicePeriodFlags((props.invoicePeriodFlags || []).filter((flag) => {
+    if (!isActiveInvoicePeriodFlag(flag)) {
+      return false;
+    }
+
+    const targetType = String(flag?.target_type || "");
+    if (!["order", "order_field", "order_item", "order_item_field"].includes(targetType)) {
+      return false;
+    }
+
+    const flagOrderId = Number(
+      flag?.order_id
+      || flag?.context?.order_id
+      || (["order", "order_field"].includes(targetType) ? flag?.target_id : 0)
+    );
+    return flagOrderId > 0 && hiddenOrderIds.has(flagOrderId);
+  }));
+};
 watch(
   [() => props.orders, () => props.excludedOrderIds, () => props.groupInvoiceCollection],
   () => {
@@ -999,6 +1038,13 @@ const formatCashierName = (order) => {
                         }}
                         er ikke vist, men vil muligvis blive faktureret alligevel.</span
                       >
+                      <InvoicingPeriodFlagList
+                        v-if="getHiddenInvoiceCollectionFlags(order.invoice_collection_id).length > 0"
+                        class="mt-3"
+                        compact
+                        :flags="getHiddenInvoiceCollectionFlags(order.invoice_collection_id)"
+                        @statusChanged="emitFlagStatusChanged"
+                      />
                     </div>
                   </div>
                 </td>
@@ -1263,6 +1309,9 @@ const formatCashierName = (order) => {
                     v-bind:customer_number="order.customer_id"
                     v-bind:department_id="order.department_id"
                     v-bind:reg_1="order.reg_1"
+                    v-bind:reg_2="order.reg_2"
+                    v-bind:reg_3="order.reg_3"
+                    v-bind:order_booking_id="order.booking_id"
                     :refreshFunction="loadList"
                     @deleted="loadList()"
                     @flag-created="emitFlagCreated"
@@ -1506,6 +1555,9 @@ const formatCashierName = (order) => {
                       v-bind:customer_number="order.customer_id"
                       v-bind:department_id="order.department_id"
                       v-bind:reg_1="order.reg_1"
+                      v-bind:reg_2="order.reg_2"
+                      v-bind:reg_3="order.reg_3"
+                      v-bind:order_booking_id="order.booking_id"
                       :refreshFunction="loadList"
                       @deleted="loadList()"
                       @flag-created="emitFlagCreated"

src/components/displays/department/pos/steps/PosDepartmentStep1.vue

@@ -21,6 +21,7 @@ import {
   step,
   setDesktopStep1PreflightHandler,
   clearDesktopStep1PreflightHandler,
+  pushPosRouteState,
 } from "@/components/shop/POSDepartmentProcess.vue";
 import ElementTabsBox from "@/components/displays/boxes/ElementTabsBox.vue";
 import { POS_STEP_1_VERSION } from "@/config.js";
@@ -92,6 +93,7 @@ const duplicateDetailsExpanded = ref(false);
 const pendingNextResolution = ref(false);
 const isDesktopLastWashCopying = ref(false);
 let desktopStep1CoordinationPromise = Promise.resolve({ canProceed: true });
+let focusOnReg1TimeoutId = null;
 const isDesktopStep1Active = computed(() => getCurrentStep() === 1);
 
 const setTab = (tab) => {
@@ -117,7 +119,16 @@ watch(
 );
 
 const focusOnReg1 = () => {
-  setTimeout(() => {
+  if (focusOnReg1TimeoutId !== null) {
+    clearTimeout(focusOnReg1TimeoutId);
+  }
+
+  focusOnReg1TimeoutId = setTimeout(() => {
+    focusOnReg1TimeoutId = null;
+    if (typeof document === "undefined") {
+      return;
+    }
+
     const reg1Input = document.getElementById("reg_1");
     if (reg1Input) {
       reg1Input.focus();
@@ -267,12 +278,8 @@ const bookingSelectionObjects = computed(() => {
     const contentSegments = [
       `${t("admin.pos.order_booking_selector.customer_label")}: ${booking?.customer_name || t("admin.pos.not_found")}`,
       `${t("admin.pos.order_booking_selector.plates_label")}: ${plateText || t("admin.pos.not_found")}`,
-      `${t("common.reference")}: ${
-        getOrderBookingReferenceValue(booking) || t("admin.pos.not_found")
-      }`,
-      `${t("common.services")}: ${
-        getOrderBookingServiceText(booking) || t("admin.pos.not_found")
-      }`,
+      `${t("common.reference")}: ${getOrderBookingReferenceValue(booking) || t("admin.pos.not_found")}`,
+      `${t("common.services")}: ${getOrderBookingServiceText(booking) || t("admin.pos.not_found")}`,
     ];
 
     return {
@@ -639,7 +646,7 @@ const pushDesktopStepTwoRoute = () => {
     return;
   }
 
-  window.history.pushState({}, "", `?id=${order_id.value}&customer_id=${customer_id.value}&step=2`);
+  pushPosRouteState(`id=${order_id.value}&customer_id=${customer_id.value}&step=2`);
 };
 
 const handleDesktopLastWashCopy = async (payload = {}) => {
@@ -681,6 +688,10 @@ onMounted(() => {
 });
 
 onBeforeUnmount(() => {
+  if (focusOnReg1TimeoutId !== null) {
+    clearTimeout(focusOnReg1TimeoutId);
+    focusOnReg1TimeoutId = null;
+  }
   clearDesktopStep1PreflightHandler(handleDesktopStep1Preflight);
 });
 
@@ -750,13 +761,9 @@ watch(
       </div>
       <div class="pos-shell-actions">
         <ButtonsBox class="pos-actions pos-actions--stacked">
-          <Cancel tabindex="2" class="is-fullwidth" />
+          <Cancel tabindex="5" class="is-fullwidth" />
         </ButtonsBox>
-        <div
-          v-if="shouldShowActionRailControls"
-          class="pos-shell-actions__rail"
-          data-testid="pos-step-1-action-rail"
-        >
+        <div v-if="shouldShowActionRailControls" class="pos-shell-actions__rail" data-testid="pos-step-1-action-rail">
           <PosDesktopDuplicateWarning
             v-if="shouldShowDuplicateWarningInActionRail"
             :title="t('admin.pos.warning')"

src/components/displays/department/pos/steps/mobile/PosDepartmentStepMobile2.vue

@@ -53,6 +53,9 @@ import PosDepartmentStepMobile2AdditionalItems from "@/components/displays/depar
 import { pendingBookings } from "@/components/shop/POSDepartmentProcess.vue";
 import { useOrderMetadataAutosave } from "@/composables/useOrderMetadataAutosave.js";
 import { useHoldToTrigger } from "@/composables/useHoldToTrigger";
+import { useI18n } from "vue-i18n";
+
+const { t } = useI18n();
 
 onMounted(() => {
   // Set the header to be transparent
@@ -477,6 +480,8 @@ const updateLastOrderItemPrices = (items: PosOrderItem[]) => {
 const layout = {
   classes: <string[]>[],
 };
+const EXTRAORDINARY_CHEMISTRY_PRODUCT_ID = 27;
+const EXTRAORDINARY_CHEMISTRY_PRODUCT_NAME = "Ekstraordinær pr. 10 min inkl. kemi";
 
 const onCopyLastOrder = (vehicleIndex: number) => {
   lastOrders.select(vehicleIndex);
@@ -777,15 +782,18 @@ const buildDesiredOrderItemShapes = () => {
 
   const addonShapes = (transactionItems.primaryItem.value.addons || [])
     .filter((addon: any) => Number(addon?.quantity ?? 0) > 0)
-    .map((addon: any) => ({
-      kind: "addon",
-      relatedKey: "primary",
-      product_id: Number(addon?.product?.id ?? addon?.id ?? 0),
-      quantity: Number(addon?.quantity ?? 0),
-      related_item_id: "__PRIMARY__",
-      price: Number(addon?.product?.price ?? addon?.price ?? 0),
-      notes: String(addon?.product?.notes ?? ""),
-    }));
+    .map((addon: any) => {
+      const addonProduct = addon?.product ?? addon;
+      return {
+        kind: "addon",
+        relatedKey: "primary",
+        product_id: Number(addonProduct?.id ?? addon?.id ?? 0),
+        quantity: Number(addon?.quantity ?? 0),
+        related_item_id: "__PRIMARY__",
+        price: Number(addonProduct?.price ?? addon?.price ?? 0),
+        notes: String(addonProduct?.notes ?? addon?.notes ?? ""),
+      };
+    });
 
   const additionalShapes = (transactionItems.additionalItems.value || [])
     .filter((item: any) => Number(item?.quantity ?? 0) > 0)
@@ -952,16 +960,17 @@ const syncCurrentTransactionToOrder = async () => {
 
   const addonPromises = (transactionItems.primaryItem.value.addons || [])
     .filter((addon: any) => Number(addon?.quantity ?? 0) > 0)
-    .map((addon: any) =>
-      createOrderItem(
+    .map((addon: any) => {
+      const addonProduct = addon?.product ?? addon;
+      return createOrderItem(
         normalizedOrderId,
-        addon.product.id,
+        addonProduct.id,
         Number(addon.quantity),
         createdPrimaryItemId,
-        addon.product?.notes || "",
-        addon.product.price
-      )
-    );
+        addonProduct?.notes || addon?.notes || "",
+        addonProduct.price ?? addon.price
+      );
+    });
 
   const additionalPromises = (transactionItems.additionalItems.value || [])
     .filter((item: any) => Number(item?.quantity ?? 0) > 0)
@@ -973,11 +982,146 @@ const syncCurrentTransactionToOrder = async () => {
   return true;
 };
 
+const normalizeText = (value: unknown) => String(value ?? "").trim();
+
+const isEnabledFlag = (value: unknown) => value === true || value === 1 || value === "1" || value === "true";
+
+const getProductId = (product: any) =>
+  Number(product?.product?.id ?? product?.product_id ?? product?.id ?? 0);
+
+const getProductName = (product: any) => normalizeText(product?.product?.name ?? product?.name);
+
+const productRequiresOrderItemNote = (product: any) => {
+  if (!product) {
+    return false;
+  }
+
+  return (
+    isEnabledFlag(product?.requires_note ?? product?.product?.requires_note) ||
+    getProductId(product) === EXTRAORDINARY_CHEMISTRY_PRODUCT_ID ||
+    getProductName(product) === EXTRAORDINARY_CHEMISTRY_PRODUCT_NAME
+  );
+};
+
+const productHasOrderItemNote = (product: any) =>
+  normalizeText(product?.notes ?? product?.product?.notes).length > 0;
+
+const getSelectedProductsMissingRequiredNotes = () => {
+  const missingProducts: any[] = [];
+  const primaryProduct = transactionItems.primaryItem.value;
+
+  if (productRequiresOrderItemNote(primaryProduct) && !productHasOrderItemNote(primaryProduct)) {
+    missingProducts.push(primaryProduct);
+  }
+
+  (primaryProduct?.addons || [])
+    .filter((addon: any) => Number(addon?.quantity ?? 0) > 0)
+    .forEach((addon: any) => {
+      const addonProduct = addon?.product ?? addon;
+      if (
+        (productRequiresOrderItemNote(addonProduct) || productRequiresOrderItemNote(addon)) &&
+        !productHasOrderItemNote(addonProduct) &&
+        !productHasOrderItemNote(addon)
+      ) {
+        missingProducts.push(addonProduct);
+      }
+    });
+
+  (transactionItems.additionalItems.value || [])
+    .filter((item: any) => Number(item?.quantity ?? 0) > 0)
+    .forEach((item: any) => {
+      if (productRequiresOrderItemNote(item) && !productHasOrderItemNote(item)) {
+        missingProducts.push(item);
+      }
+    });
+
+  return missingProducts;
+};
+
+const promptForRequiredProductNote = (product: any) =>
+  new Promise<boolean>((resolve) => {
+    const hadOriginalNote = Object.prototype.hasOwnProperty.call(product, "notes");
+    const originalNote = product?.notes;
+
+    const resolveAndClose = (didConfirm: boolean) => {
+      if (!didConfirm) {
+        if (hadOriginalNote) {
+          product.notes = originalNote;
+        } else {
+          delete product.notes;
+        }
+      }
+      if (popups.get()?.id === "add_product_note") {
+        popups.clear();
+      }
+      resolve(didConfirm);
+    };
+
+    popups.select("add_product_note", {
+      title: `${t("common.note")}: ${getProductName(product) || `#${getProductId(product)}`}`,
+      message: t("objects.products.columns.requires_note"),
+      component: "add_product_note",
+      hideHeader: true,
+      style: { maxHeight: "40vh" },
+      props: {
+        product,
+        validationMessage: "",
+      },
+      actionButtons: [
+        {
+          label: t("common.confirm"),
+          description: t("common.confirm"),
+          color: "primary",
+          testId: "pos-mobile-product-note-confirm",
+          onClick: () => {
+            const activePopup = popups.get();
+            const normalizedNote = normalizeText(activePopup?.props?.product?.notes);
+            if (!normalizedNote) {
+              if (activePopup?.props) {
+                activePopup.props.validationMessage = t("objects.products.columns.requires_note");
+              }
+              return;
+            }
+            product.notes = normalizedNote;
+            resolveAndClose(true);
+          },
+        },
+        {
+          label: t("common.cancel"),
+          description: t("common.cancel"),
+          color: "light",
+          testId: "pos-mobile-product-note-cancel",
+          onClick: () => resolveAndClose(false),
+        },
+      ],
+    });
+  });
+
+const ensureRequiredOrderItemNotes = async () => {
+  const missingProducts = getSelectedProductsMissingRequiredNotes();
+  for (const product of missingProducts) {
+    if (productHasOrderItemNote(product)) {
+      continue;
+    }
+
+    const didConfirm = await promptForRequiredProductNote(product);
+    if (!didConfirm) {
+      return false;
+    }
+  }
+
+  return true;
+};
+
 const onBeforeComplete = async () => {
   if (!transactionItems.primaryItem.value) {
     throw new Error("No primary item selected");
   }
 
+  if (!(await ensureRequiredOrderItemNotes())) {
+    return false;
+  }
+
   await syncCurrentTransactionToOrder();
   return true;
 };

src/components/displays/department/pos/steps/mobile/PosDepartmentStepMobile3.vue

@@ -10,6 +10,7 @@ import {
   reg_1,
   reset_all_values,
   setStep,
+  pushPosRouteState,
 } from "@/components/shop/POSDepartmentProcess.vue";
 import { SessionUser } from "@/components/session/token/SessionUser.vue";
 import { StripeModule } from "@/components/stripe/StripeModule.vue";
@@ -70,10 +71,10 @@ const formatCurrency = (amount) => {
 const navigateToItems = () => {
   setStep(2);
   if (normalizedOrderId.value) {
-    window.history.pushState({}, '', `?id=${normalizedOrderId.value}&customer_id=${customer_id.value}&step=2`);
+    pushPosRouteState(`id=${normalizedOrderId.value}&customer_id=${customer_id.value}&step=2`);
     return;
   }
-  window.history.pushState({}, '', `?step=2`);
+  pushPosRouteState("step=2");
 };
 
 const clearSuccessfulMobileCardFlow = () => {

src/components/displays/department/pos/steps/mobile/elements/PosDepartmentStepMobile1Location.vue

@@ -2,25 +2,43 @@
 import { useGeolocation } from "@vueuse/core";
 import { watch } from "vue";
 import { locations } from "../objects/PosDepartmentStepMobileFlow.vue";
-const emits = defineEmits<{
-  (e: 'location-updated', coords: { latitude: number | null; longitude: number | null }): void;
-}>();
-const { coords, locatedAt, error, resume, pause } = useGeolocation({
+
+const props = withDefaults(defineProps<{
+  enableHighAccuracy?: boolean;
+  maximumAge?: number;
+  timeout?: number;
+}>(), {
   enableHighAccuracy: true,
   maximumAge: 30000,
   timeout: 27000,
 });
+
+const emits = defineEmits<{
+  (e: 'location-updated', coords: { latitude: number | null; longitude: number | null }): void;
+}>();
+
+const { coords, locatedAt, error, resume, pause } = useGeolocation({
+  enableHighAccuracy: props.enableHighAccuracy,
+  maximumAge: props.maximumAge,
+  timeout: props.timeout,
+});
+
+const getLocationTimestamp = () => {
+  const timestamp = Number(locatedAt.value);
+  return Number.isFinite(timestamp) ? timestamp : Date.now();
+};
+
 const onUpdate = (newCoords: { latitude: number | null; longitude: number | null }) => {
-  if (newCoords.latitude && newCoords.longitude) {
+  const normalizedCoords = locations.normalizeCoordinatePair(newCoords);
+  if (normalizedCoords) {
+    const timestamp = getLocationTimestamp();
     locations.set({
-      coords: {
-        latitude: newCoords.latitude,
-        longitude: newCoords.longitude,
-      },
-      timestamp: new Date(),
+      coords: normalizedCoords,
+      timestamp: new Date(timestamp),
+      locatedAt: timestamp,
       errorMessage: error.value ? error.value.message : null,
     })
-    emits('location-updated', newCoords);
+    emits('location-updated', normalizedCoords);
   }
 };
 watch(coords, (newCoords) => {

src/components/displays/department/pos/steps/mobile/elements/PosDepartmentStepMobileButtonNextStep.vue

@@ -299,14 +299,12 @@ const getSelectedBookingId = () => {
 
 const completeStep2Order = async ({
   bookingSafetySeal = null,
-  markOrderCompleted = false,
 }: {
   bookingSafetySeal?: string | null;
-  markOrderCompleted?: boolean;
 } = {}) => {
   await finalizeCurrentMobileOrder({
     bookingSafetySeal,
-    markOrderCompleted,
+    markOrderCompleted: true,
   });
   popups.select("completed_transaction", {
     message: `Order #${order_id.value} successfully created.`,
@@ -327,14 +325,12 @@ const step2 = async () => {
   const resolvedSafetySeal = getResolvedMobileSafetySeal();
   const hasResolvedSafetySeal = isNonEmptyString(resolvedSafetySeal);
   const requiresBookingCompletionPopup = Boolean(selectedBookingId && hasWashCertificateInBasket);
-  const shouldMarkOrderAsCompleted = !selectedBookingId && hasWashCertificateInBasket;
 
   try {
     if (requiresBookingCompletionPopup && hasResolvedSafetySeal) {
       syncMobileSafetySealState(resolvedSafetySeal);
       await completeStep2Order({
         bookingSafetySeal: resolvedSafetySeal,
-        markOrderCompleted: false,
       });
       return;
     }
@@ -344,7 +340,6 @@ const step2 = async () => {
         syncMobileSafetySealState(safetySeal);
         await completeStep2Order({
           bookingSafetySeal: String(safetySeal ?? ""),
-          markOrderCompleted: false,
         });
       };
 
@@ -358,9 +353,7 @@ const step2 = async () => {
       return;
     }
 
-    await completeStep2Order({
-      markOrderCompleted: shouldMarkOrderAsCompleted,
-    });
+    await completeStep2Order();
   } catch (error: any) {
     errors.value.push(error);
     console.warn("An error occurred while completing the mobile order:", error);
@@ -412,7 +405,10 @@ const onClick = async () => {
 
   isProcessingClick.value = true;
   try {
-    await props.onBeforeStep();
+    const beforeStepResult = await props.onBeforeStep();
+    if (beforeStepResult === false) {
+      return;
+    }
     // Proceed to the next step
     switch (step.value) {
       case 1:

src/components/displays/department/pos/steps/mobile/elements/PosDepartmentStepMobilePopupAddProductNote.vue

@@ -28,6 +28,7 @@ watch(note, (newNote) => {
           class="input is-searched"
           v-model="note"
           type="text"
+          data-testid="pos-mobile-product-note-input"
           placeholder="Indtast note"
         />
       </div>

src/components/displays/department/pos/steps/mobile/objects/PosDepartmentStepMobileFlow.vue

@@ -100,18 +100,57 @@ const getLocation = () => {
 const clearLocation = () => {
   location.value = null;
 };
+type CoordinatePair = {
+  latitude?: number | string | null;
+  longitude?: number | string | null;
+};
+
+export const normalizeCoordinatePair = (
+  coordinates: CoordinatePair | null | undefined,
+  { allowZeroPair = true }: { allowZeroPair?: boolean } = {}
+): { latitude: number; longitude: number } | null => {
+  const latitude = Number(coordinates?.latitude);
+  const longitude = Number(coordinates?.longitude);
+
+  if (!Number.isFinite(latitude) || !Number.isFinite(longitude)) {
+    return null;
+  }
+
+  if (latitude < -90 || latitude > 90 || longitude < -180 || longitude > 180) {
+    return null;
+  }
+
+  if (!allowZeroPair && latitude === 0 && longitude === 0) {
+    return null;
+  }
+
+  return { latitude, longitude };
+};
+
+export const hasValidCoordinatePair = (
+  coordinates: CoordinatePair | null | undefined,
+  options: { allowZeroPair?: boolean } = {}
+): boolean => normalizeCoordinatePair(coordinates, options) !== null;
+
 // Get distance in kilometers between two locations
 const getDistance = (
-  from: { latitude: number; longitude: number },
-  to: { latitude: number; longitude: number }
+  from: CoordinatePair,
+  to: CoordinatePair
 ): number => {
+  const normalizedFrom = normalizeCoordinatePair(from);
+  const normalizedTo = normalizeCoordinatePair(to);
+
+  if (!normalizedFrom || !normalizedTo) {
+    return Number.POSITIVE_INFINITY;
+  }
+
   const toRad = (value: number) => (value * Math.PI) / 180;
 
   const R = 6371; // Radius of the Earth in kilometers
-  const dLat = toRad(to.latitude - from.latitude);
-  const dLon = toRad(to.longitude - from.longitude);
-  const lat1 = toRad(from.latitude);
-  const lat2 = toRad(to.latitude);
+  const dLat = toRad(normalizedTo.latitude - normalizedFrom.latitude);
+  const dLon = toRad(normalizedTo.longitude - normalizedFrom.longitude);
+  const lat1 = toRad(normalizedFrom.latitude);
+  const lat2 = toRad(normalizedTo.latitude);
 
   const a =
     Math.sin(dLat / 2) * Math.sin(dLat / 2) + Math.sin(dLon / 2) * Math.sin(dLon / 2) * Math.cos(lat1) * Math.cos(lat2);
@@ -124,6 +163,8 @@ const locations = {
   set: setLocation,
   get: getLocation,
   clear: clearLocation,
+  normalizeCoordinatePair,
+  hasValidCoordinatePair,
   getDistance,
   defaultTimeout: locationTimeout,
 };

src/components/displays/department/pos/steps/mobile/objects/PosLocation.vue

@@ -18,7 +18,9 @@ export type PosLocation = {
   coords?: PosLocationCoords | null;
   /** Timestamp */
   timestamp?: Date | null;
+  /** Browser geolocation timestamp in milliseconds */
+  locatedAt?: number | null;
   /** Error message */
   errorMessage?: string | null;
 };
-</script>
+</script>

src/components/displays/department/pos/sync/xlvaskUsageAmountCache.js

@@ -3,6 +3,45 @@ export const XLVASK_USAGE_AMOUNT_CACHE_TTL_MS = 10 * 60 * 1000;
 const CACHE_PREFIX = "xlvask-usage-amount:";
 const memoryCache = new Map();
 
+const getStorageValue = (key) => {
+  try {
+    if (typeof window === "undefined" || !window.localStorage) {
+      return "";
+    }
+    return window.localStorage.getItem(key) || "";
+  } catch {
+    return "";
+  }
+};
+
+const hashCacheScopePart = (value) => {
+  let hash = 5381;
+  for (let index = 0; index < value.length; index += 1) {
+    hash = ((hash << 5) + hash) ^ value.charCodeAt(index);
+  }
+  return (hash >>> 0).toString(36);
+};
+
+const getAuthenticatedCacheScope = () => {
+  const token = getStorageValue("token");
+  if (!token) {
+    return "";
+  }
+
+  return [
+    hashCacheScopePart(token),
+    getStorageValue("is_subuser") === "true" ? "subuser" : "user",
+    getStorageValue("selected_customer_number"),
+  ]
+    .map((part) => encodeURIComponent(String(part ?? "")))
+    .join("|");
+};
+
+const getScopedCacheKey = (cacheKey) => {
+  const scope = getAuthenticatedCacheScope();
+  return scope ? `${scope}:${cacheKey}` : "";
+};
+
 const safeSessionStorage = () => {
   try {
     if (typeof window === "undefined" || !window.sessionStorage) {
@@ -15,9 +54,7 @@ const safeSessionStorage = () => {
 };
 
 const normalizeUsageLogId = (objectOrId) => {
-  const value = typeof objectOrId === "object"
-    ? objectOrId?.usage_log_id ?? objectOrId?.id
-    : objectOrId;
+  const value = typeof objectOrId === "object" ? objectOrId?.usage_log_id ?? objectOrId?.id : objectOrId;
   const parsed = Number.parseInt(String(value ?? ""), 10);
   return Number.isInteger(parsed) && parsed > 0 ? parsed : 0;
 };
@@ -34,17 +71,18 @@ export const buildXlvaskUsageAmountCacheKey = (objectOrId) => {
 
 export const getCachedXlvaskUsageAmount = (objectOrId) => {
   const cacheKey = buildXlvaskUsageAmountCacheKey(objectOrId);
-  if (!cacheKey) {
+  const scopedCacheKey = cacheKey ? getScopedCacheKey(cacheKey) : "";
+  if (!scopedCacheKey) {
     return null;
   }
 
-  const memoryEntry = memoryCache.get(cacheKey);
+  const memoryEntry = memoryCache.get(scopedCacheKey);
   if (isFreshEntry(memoryEntry)) {
     return memoryEntry.data;
   }
 
   if (memoryEntry) {
-    memoryCache.delete(cacheKey);
+    memoryCache.delete(scopedCacheKey);
   }
 
   const storage = safeSessionStorage();
@@ -52,14 +90,14 @@ export const getCachedXlvaskUsageAmount = (objectOrId) => {
     return null;
   }
 
-  const storageKey = `${CACHE_PREFIX}${cacheKey}`;
+  const storageKey = `${CACHE_PREFIX}${scopedCacheKey}`;
   try {
     const parsed = JSON.parse(storage.getItem(storageKey) || "null");
     if (!isFreshEntry(parsed)) {
       storage.removeItem(storageKey);
       return null;
     }
-    memoryCache.set(cacheKey, parsed);
+    memoryCache.set(scopedCacheKey, parsed);
     return parsed.data;
   } catch {
     storage.removeItem(storageKey);
@@ -69,7 +107,8 @@ export const getCachedXlvaskUsageAmount = (objectOrId) => {
 
 export const setCachedXlvaskUsageAmount = (objectOrId, data) => {
   const cacheKey = buildXlvaskUsageAmountCacheKey(objectOrId);
-  if (!cacheKey) {
+  const scopedCacheKey = cacheKey ? getScopedCacheKey(cacheKey) : "";
+  if (!scopedCacheKey) {
     return;
   }
 
@@ -77,7 +116,7 @@ export const setCachedXlvaskUsageAmount = (objectOrId, data) => {
     storedAt: Date.now(),
     data,
   };
-  memoryCache.set(cacheKey, entry);
+  memoryCache.set(scopedCacheKey, entry);
 
   const storage = safeSessionStorage();
   if (!storage) {
@@ -85,7 +124,7 @@ export const setCachedXlvaskUsageAmount = (objectOrId, data) => {
   }
 
   try {
-    storage.setItem(`${CACHE_PREFIX}${cacheKey}`, JSON.stringify(entry));
+    storage.setItem(`${CACHE_PREFIX}${scopedCacheKey}`, JSON.stringify(entry));
   } catch {
     // Best-effort cache. Quota errors should not block XL Vask usage rows.
   }
@@ -94,11 +133,12 @@ export const setCachedXlvaskUsageAmount = (objectOrId, data) => {
 export const clearCachedXlvaskUsageAmount = (objectOrId = null) => {
   const storage = safeSessionStorage();
   const cacheKey = objectOrId === null ? "" : buildXlvaskUsageAmountCacheKey(objectOrId);
+  const scopedCacheKey = cacheKey ? getScopedCacheKey(cacheKey) : "";
 
-  if (cacheKey) {
-    memoryCache.delete(cacheKey);
+  if (scopedCacheKey) {
+    memoryCache.delete(scopedCacheKey);
     try {
-      storage?.removeItem(`${CACHE_PREFIX}${cacheKey}`);
+      storage?.removeItem(`${CACHE_PREFIX}${scopedCacheKey}`);
     } catch {
       // Best-effort cache cleanup.
     }

src/components/displays/selfServe/ErrorBanner.vue

@@ -0,0 +1,70 @@
+<!--
+  ErrorBanner.vue – reusable self-serve error notification bar.
+
+  Props:
+    message          – error text to display (blank ⇒ hidden)
+    type             – Bulma tint: is-danger | is-warning (default is-danger)
+    iconLeft         – Font Awesome icon name
+    :loading         – whether retry button is in loading state
+    :showRetry       – whether to show the retry button
+  Emit:
+    retry            – fired when retry button is clicked
+-->
+<script setup lang="ts">
+interface Props {
+  message: string | null;
+  type?: "is-danger" | "is-warning";
+  iconLeft?: string;
+  loading?: boolean;
+  showRetry?: boolean;
+  retryTestId?: string | null;
+}
+
+withDefaults(
+  defineProps<{
+    message: string | null;
+    type?: "is-danger" | "is-warning";
+    iconLeft?: string;
+    loading?: boolean;
+    showRetry?: boolean;
+    retryTestId?: string | null;
+  }>(),
+  {
+    type: "is-danger",
+    iconLeft: "sync-alt",
+    loading: false,
+    showRetry: true,
+    retryTestId: null,
+  }
+);
+
+const emit = defineEmits<{
+  retry: [];
+}>();
+</script>
+
+<template>
+  <b-message v-if="message" :type="type" has-icon :closable="false" class="self-serve-error-banner">
+    <div class="is-flex is-align-items-center is-justify-content-space-between is-flex-wrap-wrap">
+      <span class="mr-3">{{ message }}</span>
+      <b-button
+        v-if="showRetry"
+        size="is-small"
+        :type="`${type} is-light`"
+        icon-pack="fas"
+        :icon-left="iconLeft"
+        :loading="loading"
+        :data-testid="retryTestId || undefined"
+        @click="emit('retry')"
+      >
+        {{ $t("common.try_again") }}
+      </b-button>
+    </div>
+  </b-message>
+</template>
+
+<style scoped>
+.self-serve-error-banner {
+  margin-bottom: 1rem;
+}
+</style>

src/components/displays/selfServe/LaneSelectionSection.vue

@@ -0,0 +1,59 @@
+<!--
+  LaneSelectionSection.vue – bane-valg radio buttons and lane status display.
+
+  Props:
+    lanes              – array of lane objects from the department
+    selectedLaneId     – currently selected lane id
+    washType           – "Manual" | "Machine"
+    departmentName     – human-readable department name
+    isLaneAvailableFn  – function(lane) => boolean
+    isMachineAvailableFn – function(laneId) => boolean
+
+  Emit:
+    update:selectedLaneId  – new lane id selected
+    update:washType        – "Manual" | "Machine"
+-->
+<script setup lang="ts">
+import SelfServeLaneStep from "@/components/displays/selfServe/SelfServeLaneStep.vue";
+
+interface Props {
+  lanes: any[];
+  selectedLaneId: number | string | null;
+  washType: string;
+  departmentName: string | null;
+  isLaneAvailableFn: (lane: any) => boolean;
+  isMachineAvailableFn: (laneId: number | string | null) => boolean;
+}
+
+defineProps<Props>();
+
+const emit = defineEmits<{
+  "update:selectedLaneId": [id: number];
+  "update:washType": [type: string];
+}>();
+
+function handleLaneUpdate(id: number) {
+  emit("update:selectedLaneId", id);
+}
+
+function handleWashTypeUpdate(type: string) {
+  emit("update:washType", type);
+}
+</script>
+
+<template>
+  <SelfServeLaneStep
+    :lanes="lanes"
+    :selected-lane-id="selectedLaneId"
+    :wash-type="washType"
+    :department-name="departmentName"
+    :is-lane-available="isLaneAvailableFn"
+    :is-machine-available="isMachineAvailableFn"
+    @update:selected-lane-id="handleLaneUpdate"
+    @update:wash-type="handleWashTypeUpdate"
+  />
+</template>
+
+<style scoped>
+/* Lane selection styling is inherited from SelfServeLaneStep */
+</style>

src/components/displays/selfServe/SelfServeLaneStep.vue

@@ -93,8 +93,6 @@ const emit = defineEmits<{
             native-value="Machine"
             type="is-link"
             :disabled="!isMachineAvailable(selectedLaneId)"
-            :title="!isMachineAvailable(selectedLaneId) ? $t('self_wash.machine_unavailable_for_lane') : null"
-            :aria-label="!isMachineAvailable(selectedLaneId) ? $t('self_wash.machine_unavailable_for_lane') : null"
             data-testid="self-serve-wash-type-machine"
             @update:model-value="emit('update:washType', 'Machine')"
             @input="emit('update:washType', 'Machine')"
@@ -117,15 +115,6 @@ const emit = defineEmits<{
           </b-radio-button>
         </div>
       </div>
-      <b-message
-        v-if="selectedLaneId && !isMachineAvailable(selectedLaneId)"
-        type="is-warning"
-        has-icon
-        :closable="false"
-        data-testid="self-serve-machine-unavailable-guidance"
-      >
-        {{ $t("self_wash.machine_unavailable_for_lane") }}
-      </b-message>
     </section>
   </div>
 </template>

src/components/displays/selfServe/SelfServeQuestionsStep.vue

@@ -43,9 +43,10 @@ const emitAnswerQuestion = (questionId: number, value: boolean) => {
 
       <div class="self-serve-questions-status-slot" aria-live="polite">
         <div
-          v-if="isLoading"
           class="notification is-info is-light py-2 px-3 mb-0"
+          :class="{ 'is-invisible': !isLoading }"
           data-testid="self-serve-questions-inline-loading"
+          :aria-hidden="!isLoading"
         >
           <b-icon pack="fas" icon="spinner" custom-class="fa-pulse" size="is-small" />
           <span class="ml-2">{{ $t("self_wash.loading_data") }}</span>
@@ -72,4 +73,8 @@ const emitAnswerQuestion = (questionId: number, value: boolean) => {
 .self-serve-questions-status-slot .notification {
   width: 100%;
 }
+
+.self-serve-questions-status-slot .notification.is-invisible {
+  visibility: hidden;
+}
 </style>

src/components/displays/selfServe/SelfServeTaskList.vue

@@ -21,16 +21,6 @@ const isImageAttachment = (attachment: any) => (
   && attachment.content.other.match(/\.(jpg|jpeg|png|gif|webp|svg)$/i)
 );
 
-const hasTaskDescription = (task: any) => {
-  const description = task?.description;
-  if (typeof description !== "string") {
-    return !!description;
-  }
-
-  const trimmedDescription = description.trim();
-  return trimmedDescription.length > 0 && trimmedDescription !== "-";
-};
-
 const getImageAttachments = (task: any) => {
   if (!Array.isArray(task?.attachments)) {
     return [];
@@ -83,7 +73,7 @@ const formatTaskTitle = (task: any) => {
   const title = String(task?.task || "");
   const programWheelSelection = getProgramWheelSelection(task);
 
-  if (programWheelSelection === null) {
+  if (programWheelSelection === null || /\bprogram\s*#\d+\b/i.test(title)) {
     return title;
   }
 
@@ -127,13 +117,11 @@ const formatTaskTitle = (task: any) => {
                     type="is-success"
                     :data-testid="`self-serve-task-${task.id}-toggle`"
                     @update:model-value="emit('toggle-task', task.id, $event)"
-                    @input="emit('toggle-task', task.id, $event)"
                   />
                 </b-field>
               </div>
               <div class="self-serve-task-image-overlay-text">
                 <p class="self-serve-task-title"><strong>{{ formatTaskTitle(task) }}</strong></p>
-                <p v-if="hasTaskDescription(task)" class="self-serve-task-description">{{ task.description }}</p>
               </div>
             </div>
           </div>
@@ -156,22 +144,21 @@ const formatTaskTitle = (task: any) => {
           </div>
         </div>
       </template>
-      <div v-else class="columns is-mobile is-vcentered">
-        <div v-if="props.showCheckboxes" class="column is-narrow">
+      <div v-else class="self-serve-task-row">
+        <div v-if="props.showCheckboxes" class="self-serve-task-checkbox">
           <b-field>
             <b-checkbox
+              class="mr-0 pr-0"
               size="is-large"
               :model-value="completedTasks[task.id] === true"
               type="is-success"
               :data-testid="`self-serve-task-${task.id}-toggle`"
               @update:model-value="emit('toggle-task', task.id, $event)"
-              @input="emit('toggle-task', task.id, $event)"
             />
           </b-field>
         </div>
-        <div class="column">
+        <div class="self-serve-task-content">
           <p><strong>{{ formatTaskTitle(task) }}</strong></p>
-          <p v-if="hasTaskDescription(task)" class="is-size-7">{{ task.description }}</p>
           <div v-if="getVisibleServices(task).length > 0" class="tags mt-2">
             <span v-for="service in getVisibleServices(task)" :key="service" class="tag is-success">{{ service }}</span>
           </div>
@@ -239,7 +226,7 @@ const formatTaskTitle = (task: any) => {
   padding: 0.65rem 0.75rem;
   display: flex;
   align-items: flex-start;
-  gap: 0.6rem;
+  gap: 0.35rem;
   pointer-events: auto;
 }
 
@@ -247,12 +234,30 @@ const formatTaskTitle = (task: any) => {
   margin-bottom: 0;
 }
 
+.self-serve-task-row {
+  display: flex;
+  align-items: center;
+  gap: 0.35rem;
+}
+
+.self-serve-task-checkbox {
+  flex: 0 0 auto;
+}
+
+.self-serve-task-checkbox :deep(.field) {
+  margin-bottom: 0;
+}
+
+.self-serve-task-content {
+  flex: 1 1 auto;
+  min-width: 0;
+}
+
+.self-serve-task-content p {
+  margin-bottom: 0;
+}
+
 .self-serve-task-title {
   margin: 0;
 }
-
-.self-serve-task-description {
-  margin: 0.25rem 0 0;
-  font-size: 0.85rem;
-}
 </style>

src/components/displays/selfServe/SelfServeTasksStep.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import { ref, watch } from "vue";
-import { BIcon, BSkeleton } from "buefy";
+import { computed, ref, watch } from "vue";
+import { BIcon } from "buefy";
 import SelfServeTaskList from "@/components/displays/selfServe/SelfServeTaskList.vue";
 
 const props = defineProps<{
@@ -19,10 +19,21 @@ const emit = defineEmits<{
 }>();
 
 const isDynamicImageLoading = ref(false);
+const failedDynamicImageUrl = ref<string | null>(null);
+const hasRenderableDynamicImageUrl = computed(
+  () => !!props.dynamicImageUrl && failedDynamicImageUrl.value !== props.dynamicImageUrl
+);
+const showDynamicImageFrame = computed(() => hasRenderableDynamicImageUrl.value && !isDynamicImageLoading.value);
+const shouldRenderDynamicImageFrame = computed(() => hasRenderableDynamicImageUrl.value);
 
-watch(() => props.dynamicImageUrl, (dynamicImageUrl) => {
-  isDynamicImageLoading.value = !!dynamicImageUrl;
-}, { immediate: true });
+watch(
+  () => props.dynamicImageUrl,
+  (dynamicImageUrl) => {
+    isDynamicImageLoading.value = !!dynamicImageUrl;
+    failedDynamicImageUrl.value = null;
+  },
+  { immediate: true }
+);
 
 const emitToggleTask = (taskId: number, value: boolean) => {
   emit("toggle-task", taskId, value);
@@ -38,6 +49,7 @@ const onDynamicImageLoad = () => {
 
 const onDynamicImageError = () => {
   isDynamicImageLoading.value = false;
+  failedDynamicImageUrl.value = props.dynamicImageUrl;
   emit("clear-dynamic-image");
 };
 </script>
@@ -58,26 +70,37 @@ const onDynamicImageError = () => {
         <span class="ml-2">{{ $t("self_wash.loading_data") }}</span>
       </div>
 
+      <img
+        v-if="dynamicImageUrl && isDynamicImageLoading"
+        :key="`${dynamicImageUrl}:preload`"
+        :src="dynamicImageUrl"
+        alt=""
+        data-testid="self-serve-dynamic-image-preload"
+        class="self-serve-dynamic-image-preload"
+        @load="onDynamicImageLoad"
+        @error="onDynamicImageError"
+      />
+
       <div
-        v-if="dynamicImageUrl"
+        v-if="shouldRenderDynamicImageFrame"
         class="self-serve-dynamic-image-frame mb-4"
-        :class="{ 'is-loading': isDynamicImageLoading }"
         data-testid="self-serve-dynamic-image-frame"
       >
-        <b-skeleton
+        <div
           v-if="isDynamicImageLoading"
           class="self-serve-dynamic-image-skeleton"
-          width="100%"
-          height="100%"
           data-testid="self-serve-dynamic-image-skeleton"
-        />
+        >
+          <b-icon pack="fas" icon="spinner" custom-class="fa-pulse" size="is-large" />
+          <span class="is-sr-only">{{ $t("self_wash.loading_data") }}</span>
+        </div>
         <img
+          v-if="showDynamicImageFrame"
           :key="dynamicImageUrl"
           :src="dynamicImageUrl"
           alt="Machine status"
           data-testid="self-serve-dynamic-image"
           class="self-serve-dynamic-image"
-          :class="{ 'is-loading': isDynamicImageLoading }"
           @load="onDynamicImageLoad"
           @error="onDynamicImageError"
         />
@@ -107,19 +130,31 @@ const onDynamicImageError = () => {
   overflow: hidden;
 }
 
+.self-serve-dynamic-image-skeleton {
+  align-items: center;
+  aspect-ratio: 16 / 9;
+  background: #edf2f7;
+  color: #112f5f;
+  display: flex;
+  height: 100%;
+  justify-content: center;
+  width: 100%;
+}
+
+.self-serve-dynamic-image-preload {
+  position: absolute;
+  width: 0;
+  height: 0;
+  opacity: 0;
+  pointer-events: none;
+}
+
 @media screen and (min-width: 769px) {
   .self-serve-dynamic-image-frame {
     max-width: 640px;
   }
 }
 
-.self-serve-dynamic-image-skeleton {
-  position: absolute;
-  inset: 0;
-  overflow: hidden;
-  border-radius: 4px;
-}
-
 .self-serve-dynamic-image {
   width: 100%;
   height: 100%;
@@ -128,8 +163,4 @@ const onDynamicImageError = () => {
   object-fit: contain;
   transition: opacity 120ms ease;
 }
-
-.self-serve-dynamic-image.is-loading {
-  opacity: 0;
-}
 </style>

src/components/displays/selfServe/SelfServeVehicleStep.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, watch } from "vue";
+import { computed, ref, watch } from "vue";
 import { BAutocomplete, BField, BInput, BMessage } from "buefy";
 import SelfServeVehicleTypeSelector from "@/components/displays/selfServe/SelfServeVehicleTypeSelector.vue";
 
@@ -21,8 +21,11 @@ const props = defineProps<{
 
 const emit = defineEmits<{
   (e: "update:customerNumber", value: string): void;
+  (e: "update:customer-number", value: string): void;
   (e: "update:registrationNumber", value: string): void;
+  (e: "update:registration-number", value: string): void;
   (e: "select-vehicle-type", selection: any): void;
+  (e: "selected", selection: any): void;
 }>();
 
 const extractRegistrationValue = (value: unknown): string => {
@@ -49,6 +52,19 @@ const normalizeRegistration = (value: unknown) => extractRegistrationValue(value
 
 const typedRegistration = ref(normalizeRegistration(props.registrationNumber));
 
+const filteredRegistrationOptions = computed(() => {
+  const query = normalizeRegistration(typedRegistration.value);
+  const options = props.registrationOptions || [];
+  if (!query) {
+    return options;
+  }
+
+  return options.filter((option) => {
+    const normalizedOption = normalizeRegistration(option);
+    return normalizedOption !== query && normalizedOption.includes(query);
+  });
+});
+
 watch(() => props.registrationNumber, (newValue) => {
   typedRegistration.value = normalizeRegistration(newValue);
 });
@@ -57,6 +73,18 @@ const emitRegistration = (value: unknown) => {
   const normalized = normalizeRegistration(value);
   typedRegistration.value = normalized;
   emit("update:registrationNumber", normalized);
+  emit("update:registration-number", normalized);
+};
+
+const emitCustomerNumber = (value: unknown) => {
+  const normalized = String(value || "");
+  emit("update:customerNumber", normalized);
+  emit("update:customer-number", normalized);
+};
+
+const emitVehicleTypeSelection = (selection: any) => {
+  emit("select-vehicle-type", selection);
+  emit("selected", selection);
 };
 </script>
 
@@ -68,38 +96,41 @@ const emitRegistration = (value: unknown) => {
         :model-value="customerNumber || ''"
         data-testid="self-serve-customer-number"
         :placeholder="$t('self_wash.enter_customer_number')"
-        @input="emit('update:customerNumber', String($event || ''))"
+        @input="emitCustomerNumber($event)"
+        @update:modelValue="emitCustomerNumber($event)"
       />
     </b-field>
-    <b-field :label="$t('self_wash.registration_number')">
-      <b-autocomplete
-        :model-value="typedRegistration"
-        data-testid="self-serve-registration"
-        :data="registrationOptions"
-        :placeholder="$t('self_wash.enter_registration_number')"
-        :debounce="300"
-        :min-length="1"
-        :filter="(option, query) => option.toLowerCase().includes(query.toLowerCase())"
-        icon-pack="fas"
-        icon="car-side"
-        clearable
-        :loading="registrationOptions.length === 0 && isCustomerVehiclesLoading"
-        :selectable-header="true"
-        @select="emitRegistration($event)"
-        @typing="emitRegistration($event)"
-        @update:modelValue="emitRegistration($event)"
-        @select-header="emitRegistration(typedRegistration)"
-      >
-        <template #header>
+    <b-field :label="$t('self_wash.registration_number')" class="self-serve-registration-field">
+      <div class="self-serve-registration-control">
+        <b-autocomplete
+          :model-value="typedRegistration"
+          data-testid="self-serve-registration"
+          :data="filteredRegistrationOptions"
+          :placeholder="$t('self_wash.enter_registration_number')"
+          :debounce="300"
+          :min-length="1"
+          icon-pack="fas"
+          icon="car-side"
+          clearable
+          :loading="filteredRegistrationOptions.length === 0 && isCustomerVehiclesLoading"
+          @select="emitRegistration($event)"
+          @typing="emitRegistration($event)"
+          @update:modelValue="emitRegistration($event)"
+        >
+        </b-autocomplete>
+        <p
+          v-if="typedRegistration"
+          class="help self-serve-registration-guidance"
+          data-testid="self-serve-registration-guidance"
+        >
           <template v-if="hasMatchingVehicle">
             {{ $t("self_wash.select_from_vehicles", { plate: typedRegistration }) }}
           </template>
           <template v-else>
             {{ $t("self_wash.add_as_new_vehicle", { plate: typedRegistration }) }}
           </template>
-        </template>
-        <template #empty>{{ $t("self_wash.no_vehicles_found") }}</template>
-      </b-autocomplete>
+        </p>
+      </div>
     </b-field>
     <b-message
       v-if="props.vehicleStepError"
@@ -124,7 +155,7 @@ const emitRegistration = (value: unknown) => {
         <SelfServeVehicleTypeSelector
           :selectedVehicleTypeId="selectedVehicleTypeId"
           :restrictToProductIds="availableProductIds"
-          @selected="emit('select-vehicle-type', $event)"
+          @selected="emitVehicleTypeSelection"
         />
       </template>
       <template v-else-if="vehicleTypes.length === 0">
@@ -140,3 +171,34 @@ const emitRegistration = (value: unknown) => {
     </b-field>
   </div>
 </template>
+
+<style scoped>
+.self-serve-registration-control {
+  display: block;
+  width: 100%;
+  min-width: 0;
+}
+
+.self-serve-registration-guidance {
+  display: block;
+  margin-top: 0.5rem;
+  line-height: 1.35;
+  white-space: normal;
+}
+
+.self-serve-registration-field :deep(.dropdown),
+.self-serve-registration-field :deep(.autocomplete) {
+  width: 100%;
+}
+
+.self-serve-registration-field :deep(.dropdown-menu) {
+  left: 0;
+  right: 0;
+  width: 100%;
+  max-width: 100%;
+}
+
+.self-serve-registration-field :deep(.dropdown-item) {
+  white-space: normal;
+}
+</style>

src/components/displays/selfServe/VehicleInputSection.vue

@@ -0,0 +1,81 @@
+<!--
+  VehicleInputSection.vue – customer number, license plate, and vehicle type inputs.
+
+  Props:
+    showCustomerNumberInput  – whether to render the customer number field
+    customerNumber           – current customer number string
+    registrationNumber       – current license plate string
+    registrationOptions      – autocomplete options for existing vehicles
+    selectedVehicleTypeId    – currently selected vehicle type id
+    selectedVehicleName      – human-readable name of selected vehicle type
+    availableProductIds      – allowed product ids for the department
+    vehicleTypes             – list of vehicle type options
+
+  Emit:
+    update:customerNumber       – new customer number string
+    update:registrationNumber   – new license plate string
+    selectVehicleType           – selected VehicleTypeTemplate object
+-->
+<script setup lang="ts">
+import { computed } from "vue";
+import SelfServeVehicleStep from "@/components/displays/selfServe/SelfServeVehicleStep.vue";
+
+interface Props {
+  showCustomerNumberInput: boolean;
+  customerNumber: string | null;
+  registrationNumber: string | null;
+  registrationOptions: string[];
+  selectedVehicleTypeId: number | null;
+  selectedVehicleName: string | null;
+  availableProductIds: (number | string)[];
+  vehicleTypes: any[];
+}
+
+defineProps<Props>();
+
+const emit = defineEmits<{
+  "update:customerNumber": [value: string];
+  "update:registrationNumber": [value: string];
+  selectVehicleType: [type: { id: number }];
+}>();
+
+function handleCustomerNumberUpdate(value: string) {
+  emit("update:customerNumber", value);
+}
+
+function handleRegistrationNumberUpdate(value: string) {
+  emit("update:registrationNumber", value);
+}
+
+function handleSelectVehicleType(selection: any) {
+  emit("selectVehicleType", selection);
+}
+</script>
+
+<template>
+  <SelfServeVehicleStep
+    :customer-number="customerNumber"
+    :show-customer-number-input="showCustomerNumberInput"
+    :registration-number="registrationNumber"
+    :registration-options="registrationOptions"
+    :is-customer-vehicles-loading="false"
+    :has-matching-vehicle="false"
+    :selected-vehicle-type-id="selectedVehicleTypeId"
+    :selected-vehicle-name="selectedVehicleName"
+    :selected-vehicle-description="null"
+    :available-product-ids="availableProductIds"
+    :vehicle-types="vehicleTypes"
+    :vehicle-step-error="null"
+    :vehicle-step-guidance="null"
+    @update:customer-number="handleCustomerNumberUpdate"
+    @update:customerNumber="handleCustomerNumberUpdate"
+    @update:registration-number="handleRegistrationNumberUpdate"
+    @update:registrationNumber="handleRegistrationNumberUpdate"
+    @select-vehicle-type="handleSelectVehicleType"
+    @selected="handleSelectVehicleType"
+  />
+</template>
+
+<style scoped>
+/* Vehicle input section styling is inherited from SelfServeVehicleStep */
+</style>

src/components/displays/selfServe/WashProgressCard.vue

@@ -0,0 +1,260 @@
+<!--
+  WashProgressCard.vue – timer, guided instructions, and bottom actions during active wash.
+
+  Renders when a wash session is in progress (WASH_IN_PROGRESS step).
+
+  Props:
+    currentGuidedWashStep   – index into guidedWashFlowSteps
+    guidedWashFlowSteps     – array of instruction step objects
+    formattedElapsed        – human-readable elapsed time string
+    isCompletingWash        – whether the wash is finishing right now
+    openingPropertyAccessGate – loading state for access gate button
+    openingPropertyExitGate   – loading state for exit gate button
+  Emit:
+    update:currentGuidedWashStep – new step index
+    goPreviousGuidedWashStep     – navigate to previous instruction
+    goNextGuidedWashStep         – navigate to next instruction
+    completeWash                – finish the wash session
+    openPropertyAccessGate      – open the property access gate (laneId)
+    openPropertyExitGate        – open the property exit gate (laneId)
+    requestAssistance           – call for assistance
+-->
+<script setup lang="ts">
+import { computed } from "vue";
+import { BButton } from "buefy";
+
+interface Props {
+  currentGuidedWashStep: number;
+  guidedWashFlowSteps: any[];
+  formattedElapsed: string;
+  isCompletingWash: boolean;
+  openingPropertyAccessGate: boolean;
+  openingPropertyExitGate: boolean;
+  showProgressActions?: boolean;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  showProgressActions: true,
+});
+
+const emit = defineEmits<{
+  "update:currentGuidedWashStep": [step: number];
+  goPreviousGuidedWashStep: [];
+  goNextGuidedWashStep: [];
+  completeWash: [];
+  openPropertyAccessGate: [];
+  openPropertyExitGate: [];
+  requestAssistance: [];
+}>();
+
+const isLastGuidedWashStep = computed(
+  () =>
+    Array.isArray(props.guidedWashFlowSteps) &&
+    props.guidedWashFlowSteps.length > 0 &&
+    props.currentGuidedWashStep >= props.guidedWashFlowSteps.length - 1
+);
+
+function handleGoPrevious() {
+  emit("goPreviousGuidedWashStep");
+}
+
+function handleGoNext() {
+  emit("goNextGuidedWashStep");
+}
+
+function handleComplete() {
+  emit("completeWash");
+}
+
+function handleOpenAccessGate() {
+  emit("openPropertyAccessGate");
+}
+
+function handleOpenExitGate() {
+  emit("openPropertyExitGate");
+}
+
+function handleRequestAssistance() {
+  emit("requestAssistance");
+}
+</script>
+
+<template>
+  <div data-testid="self-serve-wash-progress">
+    <!-- Finishing screen -->
+    <div
+      v-if="isCompletingWash && showProgressActions"
+      class="notification is-info is-light self-serve-finishing-screen"
+      data-testid="self-serve-finishing-wash"
+    >
+      <p class="title is-5 mb-0">{{ $t("self_wash.finishing_wash_exit_opening") }}</p>
+    </div>
+
+    <!-- Guided wash instructions (stepped walkthrough) -->
+    <template v-if="!isCompletingWash">
+      <!--
+        Accept a callback slot for the guided-instructions component so the
+        parent can plug in SelfServeGuidedInstructions or its own implementation.
+      -->
+      <slot
+        v-if="showProgressActions"
+        name="guided-instructions"
+        :current-step="currentGuidedWashStep"
+        :steps="guidedWashFlowSteps"
+        :is-last-step="isLastGuidedWashStep"
+        @update:current-step="emit('update:currentGuidedWashStep', $event)"
+      >
+        <!-- Default: render nothing (parent provides via slot) -->
+      </slot>
+
+      <!-- Bottom action bar while wash is in progress -->
+      <div
+        v-show="showProgressActions"
+        class="self-serve-bottom-actions"
+        data-testid="self-serve-bottom-actions"
+      >
+        <!-- Help / assistance -->
+        <div class="self-serve-bottom-actions__row" data-testid="self-serve-session-bottom-actions">
+          <b-button
+            class="self-serve-bottom-actions__button"
+            type="is-link is-light"
+            icon-pack="fas"
+            icon-right="info-circle"
+            data-testid="self-serve-nav-help"
+            @click.prevent="handleRequestAssistance"
+          >
+            {{ $t("self_wash.assistance") }}
+          </b-button>
+        </div>
+
+        <!-- Property gate controls -->
+        <div class="self-serve-bottom-actions__row" data-testid="self-serve-property-gate-actions">
+          <b-button
+            class="self-serve-bottom-actions__button"
+            type="is-link is-light"
+            icon-pack="fas"
+            icon-left="sign-in-alt"
+            data-testid="self-serve-nav-open-property-access-gate"
+            :loading="openingPropertyAccessGate"
+            :disabled="openingPropertyAccessGate"
+            @click.prevent="handleOpenAccessGate"
+          >
+            {{ $t("self_wash.open_property_access_gate") }}
+          </b-button>
+
+          <b-button
+            class="self-serve-bottom-actions__button"
+            type="is-link is-light"
+            icon-pack="fas"
+            icon-left="sign-out-alt"
+            data-testid="self-serve-nav-open-property-exit-gate"
+            :loading="openingPropertyExitGate"
+            :disabled="openingPropertyExitGate"
+            @click.prevent="handleOpenExitGate"
+          >
+            {{ $t("self_wash.open_property_exit_gate") }}
+          </b-button>
+        </div>
+
+        <!-- Guided step navigation -->
+        <div class="self-serve-bottom-actions__row" data-testid="self-serve-guided-bottom-actions">
+          <b-button
+            class="self-serve-bottom-actions__button"
+            type="is-link is-light"
+            icon-pack="fas"
+            icon-left="arrow-left"
+            data-testid="self-serve-guided-prev"
+            :disabled="currentGuidedWashStep === 0"
+            @click.prevent="handleGoPrevious"
+          >
+            {{ $t("common.previous") }}
+          </b-button>
+
+          <b-button
+            v-if="!isLastGuidedWashStep"
+            class="self-serve-bottom-actions__button"
+            type="is-link"
+            icon-pack="fas"
+            icon-right="arrow-right"
+            data-testid="self-serve-guided-next"
+            @click.prevent="handleGoNext"
+          >
+            {{ $t("common.next") }}
+          </b-button>
+
+          <b-button
+            v-else
+            class="self-serve-bottom-actions__button"
+            type="is-link"
+            icon-pack="fas"
+            icon-right="check"
+            data-testid="self-serve-nav-complete"
+            :loading="isCompletingWash"
+            :disabled="isCompletingWash"
+            @click.prevent="handleComplete"
+          >
+            {{ $t("common.done") }}
+          </b-button>
+        </div>
+      </div>
+    </template>
+  </div>
+</template>
+
+<style scoped>
+.self-serve-finishing-screen {
+  margin: 0 auto;
+  max-width: 32rem;
+  text-align: left;
+}
+
+.self-serve-bottom-actions {
+  display: flex;
+  flex-direction: column;
+  gap: 0.75rem;
+  justify-content: center;
+  margin: 0.75rem auto 0;
+  max-width: 30rem;
+}
+
+.self-serve-bottom-actions__row {
+  display: flex;
+  gap: 0.75rem;
+  justify-content: center;
+  width: 100%;
+}
+
+.self-serve-bottom-actions__button {
+  flex: 1 1 0;
+  font-weight: 700;
+  line-height: 1.15;
+  max-width: 14rem;
+  min-height: 2.75rem;
+  min-width: 0;
+  white-space: normal;
+}
+
+@media screen and (max-width: 768px) {
+  .self-serve-bottom-actions {
+    background: #ffffff;
+    border-top: 1px solid #dfe5f0;
+    bottom: calc(4.75rem + env(safe-area-inset-bottom, 0px));
+    box-shadow: 0 -0.25rem 0.75rem rgba(17, 47, 95, 0.08);
+    left: 0;
+    margin: 0;
+    max-width: none;
+    padding: 0.5rem 0.75rem;
+    position: fixed;
+    right: 0;
+    z-index: 41;
+  }
+
+  .self-serve-bottom-actions__button {
+    font-size: 0.88rem;
+    max-width: none;
+    min-height: 2.65rem;
+    padding-left: 0.55rem;
+    padding-right: 0.55rem;
+  }
+}
+</style>

src/components/displays/selfServe/WashTypeSelector.vue

@@ -0,0 +1,159 @@
+<!--
+  WashTypeSelector.vue – manual vs machine wash toggle.
+
+  Renders two radio-style cards: "Manual" (always available) and
+  "Machine" (available when the lane supports it).
+
+  Props:
+    modelValue         – current wash type ("Manual" | "Machine")
+    isMachineAvailable – whether machine wash is available for this lane
+
+  Emit:
+    update:modelValue  – new wash type string
+-->
+<script setup lang="ts">
+import { BRadioButton } from "buefy";
+
+interface Props {
+  modelValue: string;
+  isMachineAvailable: boolean;
+}
+
+defineProps<Props>();
+
+const emit = defineEmits<{
+  "update:modelValue": [type: string];
+}>();
+</script>
+
+<template>
+  <section class="self-serve-choice-group" data-testid="self-serve-wash-type-group">
+    <h2 class="self-serve-choice-label">{{ $t("self_wash.wash_type") }}</h2>
+    <div
+      class="self-serve-choice-grid self-serve-choice-grid--centered"
+      data-testid="self-serve-wash-type-options"
+    >
+      <!-- Manual option (always available) -->
+      <div class="self-serve-choice-grid__item">
+        <b-radio-button
+          class="self-serve-choice-card"
+          :model-value="modelValue"
+          native-value="Manual"
+          type="is-link"
+          data-testid="self-serve-wash-type-manual"
+          @update:model-value="emit('update:modelValue', 'Manual')"
+          @input="emit('update:modelValue', 'Manual')"
+        >
+          <span>
+            <span>{{ $t("self_wash.manual") }}<br /></span>
+            <small>
+              <b-icon icon="check-circle" type="is-success" pack="fas" class="mr-1" />
+              {{ $t("self_wash.available") }}
+            </small>
+          </span>
+        </b-radio-button>
+      </div>
+
+      <!-- Machine option (conditioned) -->
+      <div class="self-serve-choice-grid__item">
+        <b-radio-button
+          class="self-serve-choice-card"
+          :model-value="modelValue"
+          native-value="Machine"
+          type="is-link"
+          :disabled="!isMachineAvailable"
+          data-testid="self-serve-wash-type-machine"
+          @update:model-value="emit('update:modelValue', 'Machine')"
+          @input="emit('update:modelValue', 'Machine')"
+        >
+          <span>
+            <span>{{ $t("self_wash.machine") }}<br /></span>
+            <span v-if="!isMachineAvailable">
+              <small>
+                <b-icon icon="times-circle" type="is-danger" pack="fas" class="mr-1" />
+                {{ $t("self_wash.unavailable") }}
+              </small>
+            </span>
+            <span v-else>
+              <small>
+                <b-icon icon="check-circle" type="is-success" pack="fas" class="mr-1" />
+                {{ $t("self_wash.available") }}
+              </small>
+            </span>
+          </span>
+        </b-radio-button>
+      </div>
+    </div>
+  </section>
+</template>
+
+<style scoped>
+.self-serve-choice-group {
+  margin-bottom: 1.25rem;
+}
+
+.self-serve-choice-label {
+  color: #303440;
+  font-size: 1.25rem;
+  font-weight: 700;
+  line-height: 1.2;
+  margin: 0 0 0.75rem;
+}
+
+.self-serve-choice-grid {
+  display: grid;
+  gap: 1rem;
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+  margin-bottom: 0.75rem;
+  width: 100%;
+}
+
+.self-serve-choice-grid--centered {
+  justify-content: center;
+}
+
+.self-serve-choice-grid__item {
+  min-width: 0;
+}
+
+.self-serve-choice-card {
+  align-items: center;
+  display: flex;
+  height: 100%;
+  justify-content: center;
+  min-height: 5rem;
+  padding: 0.75rem 0.5rem;
+  white-space: normal;
+  width: 100%;
+}
+
+.self-serve-choice-card :deep(.button) {
+  align-items: center;
+  display: flex;
+  height: 100%;
+  justify-content: center;
+  min-height: 5rem;
+  padding: 0.75rem 0.5rem;
+  white-space: normal;
+  width: 100%;
+}
+
+.self-serve-choice-card :deep(.button),
+.self-serve-choice-card span,
+.self-serve-choice-card :deep(.button span) {
+  min-width: 0;
+}
+
+.self-serve-choice-card small,
+.self-serve-choice-card :deep(.button small) {
+  display: inline-flex;
+  align-items: center;
+  line-height: 1.25;
+}
+
+@media screen and (min-width: 769px) {
+  .self-serve-choice-grid {
+    grid-template-columns: repeat(auto-fit, minmax(11rem, 15rem));
+  }
+}
+</style>

src/components/displays/superuser/tables/OrderContentTable.vue

@@ -129,6 +129,19 @@ const getOrderItemFlags = (orderItem) => sortInvoicePeriodFlags((props.invoicePe
   return flagOrderItemId > 0 && flagOrderItemId === Number(orderItem?.id || 0);
 }));
 
+const getOrderItemFlagIconClass = (orderItem) => (
+  getOrderItemFlags(orderItem).length > 0 ? "fas fa-flag" : ""
+);
+
+const getOrderItemFlagColorClass = (orderItem) => {
+  const flags = getOrderItemFlags(orderItem);
+  if (flags.length === 0) {
+    return "";
+  }
+
+  return flags.some((flag) => flag?.source === "manual") ? "has-text-danger" : "has-text-warning";
+};
+
 const displayColumnCount = computed(() => (
   2 + (props.displayNotes ? 1 : 0) + (props.displayReference ? 1 : 0) + (props.displayPrice ? 1 : 0)
 ));
@@ -162,7 +175,17 @@ watch(() => props.orderId, (newValue, oldValue) => {
         <template v-if="!isOrderItemAddon(item)">
           <!-- If the item is included in the invoice, show it normally -->
           <tr v-if="item.include_in_invoice">
-            <td>{{ item.product.name }}</td>
+            <td>
+              <span
+                v-if="getOrderItemFlags(item).length > 0"
+                class="icon is-small mr-1 invoice-period-item-flag-indicator"
+                :class="getOrderItemFlagColorClass(item)"
+                :data-testid="`order-content-item-flag-indicator-${item.id}`"
+              >
+                <i :class="getOrderItemFlagIconClass(item)"></i>
+              </span>
+              {{ item.product.name }}
+            </td>
             <td v-if="props.displayReference">{{ item.reference }}</td>
             <td v-if="props.displayNotes">{{ item.notes }}</td>
             <td>{{ item.quantity }}</td>
@@ -170,7 +193,17 @@ watch(() => props.orderId, (newValue, oldValue) => {
           </tr>
           <!-- If the item is not included in the invoice, show it with a strikethrough -->
           <tr v-else  class="has-background-warning-light">
-            <td><span style="text-decoration: line-through;">{{ item.product.name }}</span> ( {{SessionUser.objects.vehicles.columns.wash_subscription.label }} )</td>
+            <td>
+              <span
+                v-if="getOrderItemFlags(item).length > 0"
+                class="icon is-small mr-1 invoice-period-item-flag-indicator"
+                :class="getOrderItemFlagColorClass(item)"
+                :data-testid="`order-content-item-flag-indicator-${item.id}`"
+              >
+                <i :class="getOrderItemFlagIconClass(item)"></i>
+              </span>
+              <span style="text-decoration: line-through;">{{ item.product.name }}</span> ( {{SessionUser.objects.vehicles.columns.wash_subscription.label }} )
+            </td>
             <td v-if="props.displayReference">{{ item.reference }}</td>
             <td v-if="props.displayNotes">{{ item.notes }}</td>
             <td>{{ item.quantity }}</td>
@@ -193,7 +226,17 @@ watch(() => props.orderId, (newValue, oldValue) => {
         <template v-for="addon_item in getItemAddons(item)" :key="addon_item.id">
           <!-- If the add-on item is included in the invoice, show it normally -->
           <tr v-if="addon_item.include_in_invoice">
-            <td>+ {{ addon_item.product.name }}</td>
+            <td>
+              <span
+                v-if="getOrderItemFlags(addon_item).length > 0"
+                class="icon is-small mr-1 invoice-period-item-flag-indicator"
+                :class="getOrderItemFlagColorClass(addon_item)"
+                :data-testid="`order-content-item-flag-indicator-${addon_item.id}`"
+              >
+                <i :class="getOrderItemFlagIconClass(addon_item)"></i>
+              </span>
+              + {{ addon_item.product.name }}
+            </td>
             <td v-if="props.displayReference">{{ addon_item.reference }}</td>
             <td v-if="props.displayNotes">{{ addon_item.notes }}</td>
             <td>{{ addon_item.quantity }}</td>
@@ -201,7 +244,17 @@ watch(() => props.orderId, (newValue, oldValue) => {
           </tr>
           <!-- If the add-on item is not included in the invoice, show it with a strikethrough -->
           <tr v-else class="has-background-warning">
-            <td>+ <span style="text-decoration: line-through;">{{ addon_item.product.name }}</span> ( {{SessionUser.objects.vehicles.columns.wash_subscription.label }} )</td>
+            <td>
+              <span
+                v-if="getOrderItemFlags(addon_item).length > 0"
+                class="icon is-small mr-1 invoice-period-item-flag-indicator"
+                :class="getOrderItemFlagColorClass(addon_item)"
+                :data-testid="`order-content-item-flag-indicator-${addon_item.id}`"
+              >
+                <i :class="getOrderItemFlagIconClass(addon_item)"></i>
+              </span>
+              + <span style="text-decoration: line-through;">{{ addon_item.product.name }}</span> ( {{SessionUser.objects.vehicles.columns.wash_subscription.label }} )
+            </td>
             <td v-if="props.displayReference">{{ addon_item.reference }}</td>
             <td v-if="props.displayNotes">{{ addon_item.notes }}</td>
             <td>{{ addon_item.quantity }}</td>
@@ -237,6 +290,14 @@ watch(() => props.orderId, (newValue, oldValue) => {
           <!-- If the item is a primary item, show it -->
           <template v-if="!isOrderItemAddon(item)">
             <div>
+              <span
+                v-if="getOrderItemFlags(item).length > 0"
+                class="icon is-small mr-1 invoice-period-item-flag-indicator"
+                :class="getOrderItemFlagColorClass(item)"
+                :data-testid="`order-content-item-flag-indicator-${item.id}`"
+              >
+                <i :class="getOrderItemFlagIconClass(item)"></i>
+              </span>
               <strong>{{ item.product.name }}</strong> x {{ item.quantity }}
               <span v-if="props.displayPrice"> - {{ SessionUser.functions.currency.toLocal(item.price) }}</span>
             </div>
@@ -248,6 +309,14 @@ watch(() => props.orderId, (newValue, oldValue) => {
             <!-- Show the add-on items -->
             <div v-for="addon_item in getItemAddons(item)" :key="addon_item.id" class="ml-4">
               <small>
+                <span
+                  v-if="getOrderItemFlags(addon_item).length > 0"
+                  class="icon is-small mr-1 invoice-period-item-flag-indicator"
+                  :class="getOrderItemFlagColorClass(addon_item)"
+                  :data-testid="`order-content-item-flag-indicator-${addon_item.id}`"
+                >
+                  <i :class="getOrderItemFlagIconClass(addon_item)"></i>
+                </span>
                   + {{ addon_item.product.name }} x {{ addon_item.quantity }}
                 <span v-if="props.displayPrice"> - {{ SessionUser.functions.currency.toLocal(addon_item.price) }}</span>
               </small>
@@ -265,5 +334,7 @@ watch(() => props.orderId, (newValue, oldValue) => {
 </template>
 
 <style scoped>
-
+.invoice-period-item-flag-indicator {
+  vertical-align: middle;
+}
 </style>

src/components/displays/superuser/tables/SubusersTable.vue

@@ -2,6 +2,8 @@
 import Swal from "sweetalert2";
 import { usePaginatedListInstance } from "@/components/pagination/paginatedList.vue";
 import { SessionUser } from "@/components/session/token/SessionUser.vue";
+import ActionSettingsWheelButton from "@/components/displays/buttons/ActionSettingsWheelButton.vue";
+import ActionSettingsWheelItem from "@/components/displays/buttons/ActionSettingsWheelItem.vue";
 
 const props = defineProps({
   objects: {
@@ -23,6 +25,8 @@ const canDisableAccess = () =>
 const canResendInvite = (subuser) =>
   (props.showCustomer ? SessionUser.canAccessSuperUser() : SessionUser.canAccessUser() || SessionUser.hasPermission("SUBUSERS_EDIT"))
   && Boolean(subuser?.can_resend_invite ?? subuser?.setup_required);
+const hasRowActions = (subuser) =>
+  (canEditPermissions() && subuser?.grant_id) || canResendInvite(subuser) || (canDisableAccess() && subuser?.grant_id);
 
 const formatDateTime = (dateString) => {
   if (!dateString) {
@@ -241,51 +245,49 @@ const onResendInvite = async (subuser) => {
 
           <td>
             <div>{{ subuser.grant_note || "-" }}</div>
-            <button
-              v-if="canEditPermissions() && subuser.grant_id"
-              class="button is-text is-small px-0 mt-1"
-              type="button"
-              @click="onEditNote(subuser)"
-            >
-              Redigér note
-            </button>
           </td>
 
           <td>{{ formatDateTime(subuser.created_at) }}</td>
           <td>{{ formatDateTime(subuser.updated_at) }}</td>
 
           <td>
-            <div class="buttons is-justify-content-flex-end action-buttons">
-              <button
-                v-if="canEditPermissions() && subuser.grant_id"
-                class="button is-small"
-                type="button"
-                :data-testid="`subuser-permissions-${subuser.id}`"
-                @click="onEditPermissions(subuser)"
-              >
-                Tilladelser
-              </button>
+            <div class="buttons is-justify-content-flex-end action-buttons" :data-testid="`subuser-actions-${subuser.id}`">
+              <ActionSettingsWheelButton v-if="hasRowActions(subuser)">
+                <template #actions>
+                  <ActionSettingsWheelItem
+                    v-if="canEditPermissions() && subuser.grant_id"
+                    icon="fas fa-pen"
+                    label="Redigér note"
+                    :click-action="() => onEditNote(subuser)"
+                    :test-id="`subuser-note-${subuser.id}`"
+                  />
 
-              <button
-                v-if="canResendInvite(subuser)"
-                class="button is-small"
-                type="button"
-                :data-testid="`subuser-resend-${subuser.id}`"
-                @click="onResendInvite(subuser)"
-              >
-                Gensend
-              </button>
+                  <ActionSettingsWheelItem
+                    v-if="canEditPermissions() && subuser.grant_id"
+                    icon="fas fa-user-shield"
+                    label="Tilladelser"
+                    :click-action="() => onEditPermissions(subuser)"
+                    :test-id="`subuser-permissions-${subuser.id}`"
+                  />
 
-              <button
-                v-if="canDisableAccess() && subuser.grant_id"
-                class="button is-small"
-                :class="subuser.grant_enabled ? 'is-danger is-light' : 'is-success is-light'"
-                type="button"
-                :data-testid="`subuser-toggle-${subuser.id}`"
-                @click="onToggleEnabled(subuser, !subuser.grant_enabled)"
-              >
-                {{ subuser.grant_enabled ? "Deaktivér" : "Aktivér" }}
-              </button>
+                  <ActionSettingsWheelItem
+                    v-if="canResendInvite(subuser)"
+                    icon="fas fa-paper-plane"
+                    label="Gensend"
+                    :click-action="() => onResendInvite(subuser)"
+                    :test-id="`subuser-resend-${subuser.id}`"
+                  />
+
+                  <ActionSettingsWheelItem
+                    v-if="canDisableAccess() && subuser.grant_id"
+                    :icon="subuser.grant_enabled ? 'fas fa-ban' : 'fas fa-check'"
+                    :label="subuser.grant_enabled ? 'Deaktivér' : 'Aktivér'"
+                    :template="subuser.grant_enabled ? 'danger' : 'success'"
+                    :click-action="() => onToggleEnabled(subuser, !subuser.grant_enabled)"
+                    :test-id="`subuser-toggle-${subuser.id}`"
+                  />
+                </template>
+              </ActionSettingsWheelButton>
             </div>
           </td>
         </tr>

src/components/forms/auth/LoginEmployeeForm.vue

@@ -10,6 +10,7 @@ import LoadButtonWhileAwait from "@/components/request/LoadButtonWhileAwait.vue"
 import { SessionUser } from "@/components/session/token/SessionUser.vue";
 import TwoFactorVerify from "@/components/forms/auth/TwoFactorVerify.vue";
 import { isPasskeySupported, authenticateWithPasskey } from "@/services/PasskeyAuthService.js";
+import { clearEdgeGatewayWorkspaceCache } from "@/services/edgeGateways.js";
 
 const employees = ref([]);
 const { t } = useI18n();
@@ -52,6 +53,7 @@ const login = async () => {
     }
     
     // Save the token in the local storage
+    clearEdgeGatewayWorkspaceCache();
     localStorage.setItem('token', data.token);
     // Redirect to the dashboard
     window.location.href = '/admin';
@@ -72,6 +74,7 @@ const loginWithPasskey = async () => {
     const result = await authenticateWithPasskey('employee', null, recaptchaToken);
 
     if (result.token) {
+      clearEdgeGatewayWorkspaceCache();
       localStorage.setItem('token', result.token);
       window.location.href = '/admin';
       return;

src/components/forms/auth/LoginForm.vue

@@ -9,6 +9,7 @@ import { parseError, clearErrors, addError, getError } from "@/components/reques
 import LoadButtonWhileAwait from "@/components/request/LoadButtonWhileAwait.vue";
 import { isPasskeySupported, authenticateWithPasskey } from "@/services/PasskeyAuthService.js";
 import TwoFactorVerify from "@/components/forms/auth/TwoFactorVerify.vue";
+import { clearEdgeGatewayWorkspaceCache } from "@/services/edgeGateways.js";
 
 const { t } = useI18n();
 
@@ -68,6 +69,7 @@ const login = async () => {
     }
     
     // Save the token in the local storage
+    clearEdgeGatewayWorkspaceCache();
     localStorage.setItem('token', data.token);
     // Set the success message
     successMessage.value = "Du er nu logget ind!"
@@ -103,6 +105,7 @@ const loginWithPasskey = async () => {
     const result = await authenticateWithPasskey('user', customerNum, recaptchaToken);
     console.log('Passkey authentication result:', result);
     if (result.token) {
+      clearEdgeGatewayWorkspaceCache();
       localStorage.setItem('token', result.token);
       successMessage.value = "Du er nu logget ind!";
       setTimeout(() => {

src/components/forms/auth/SubuserLoginForm.vue

@@ -9,6 +9,7 @@ import { SessionUser } from "@/components/session/token/SessionUser.vue";
 import { isPasskeySupported, authenticateWithPasskey } from "@/services/PasskeyAuthService.js";
 import { getSubuserPasswordPolicyError } from "@/services/subuserPasswordPolicy.js";
 import TwoFactorVerify from "@/components/forms/auth/TwoFactorVerify.vue";
+import { clearEdgeGatewayWorkspaceCache } from "@/services/edgeGateways.js";
 
 const { t } = useI18n();
 
@@ -69,6 +70,7 @@ const login = async () => {
     
     // Save the session token
     if (data.session) {
+      clearEdgeGatewayWorkspaceCache();
       localStorage.setItem('token', data.session);
       localStorage.setItem('is_subuser', 'true');
       window.location.reload();
@@ -97,6 +99,7 @@ const loginWithPasskey = async () => {
     // Subuser login returns 'session' token, user login returns 'token'
     const sessionToken = result.session || result.token;
     if (sessionToken) {
+      clearEdgeGatewayWorkspaceCache();
       localStorage.setItem('token', sessionToken);
       localStorage.setItem('is_subuser', 'true');
       // Reload the page to update the UI

src/components/forms/auth/TwoFactorVerify.vue

@@ -5,6 +5,7 @@ import { useI18n } from 'vue-i18n';
 import { verify2FA } from "@/services/TwoFactorAuthService.js";
 import { parseError, getError, clearErrors } from "@/components/request/HandleGlobalError.vue";
 import LoadButtonWhileAwait from "@/components/request/LoadButtonWhileAwait.vue";
+import { clearEdgeGatewayWorkspaceCache } from "@/services/edgeGateways.js";
 
 const { t } = useI18n();
 const router = useRouter();
@@ -43,9 +44,11 @@ const verify = async () => {
     
     // Handle the response based on user type
     if (props.userType === 'subuser' && result.session) {
+      clearEdgeGatewayWorkspaceCache();
       localStorage.setItem('token', result.session);
       localStorage.setItem('is_subuser', 'true');
     } else if (result.token) {
+      clearEdgeGatewayWorkspaceCache();
       localStorage.setItem('token', result.token);
       localStorage.removeItem('is_subuser');
     }

src/components/forms/department/pos/SelectVehicleFormPOS.vue

@@ -217,6 +217,54 @@ const getVehicleReferenceValue = () => {
   return String(vehicleObject.value?.reference ?? "").trim();
 };
 
+const getVehicleStateKey = (vehicle) => {
+  if (!vehicle) {
+    return "";
+  }
+
+  return [
+    vehicle?.id ?? "",
+    normalizePlateValue(vehicle?.reg),
+    normalizeCustomerNumber(vehicle?.customer_id) ?? "",
+    vehicle?.type ?? "",
+    vehicle?.booking_id ?? "",
+    String(vehicle?.reference ?? "").trim(),
+  ].join("|");
+};
+
+const getBookingStateKey = (booking) => {
+  if (!booking) {
+    return "";
+  }
+
+  return [
+    booking?.id ?? "",
+    getBookingReg1Value(booking),
+    getBookingReg2Value(booking),
+    getBookingCustomerNumber(booking) ?? "",
+    String(booking?.reference_number ?? booking?.reference ?? "").trim(),
+    String(booking?.po ?? "").trim(),
+  ].join("|");
+};
+
+const getBookingMatchesStateKey = (matches) => {
+  if (!Array.isArray(matches) || matches.length === 0) {
+    return "";
+  }
+
+  return matches.map((booking) => getBookingStateKey(booking)).join("||");
+};
+
+const hasBookingDetailsChanged = (currentBooking, nextBooking) => {
+  const currentKeys = Object.keys(currentBooking || {});
+  const nextKeys = Object.keys(nextBooking || {});
+  if (currentKeys.length !== nextKeys.length) {
+    return true;
+  }
+
+  return nextKeys.some((key) => currentBooking?.[key] !== nextBooking?.[key]);
+};
+
 const setVehicleObject = (emittedVehicleObject, options = {}) => {
   const normalizedOptions = {
     preserveManualReference: true,
@@ -224,17 +272,26 @@ const setVehicleObject = (emittedVehicleObject, options = {}) => {
     ...options,
   };
 
-  vehicleObject.value = emittedVehicleObject;
-
-  const emittedVehiclePlate = normalizePlateValue(vehicleObject.value?.reg || reg_1.value);
+  const emittedVehiclePlate = normalizePlateValue(emittedVehicleObject?.reg || reg_1.value);
   if (
     emittedVehiclePlate &&
     skippedDesktopBookingVehiclePlate.value === emittedVehiclePlate &&
-    !isBookingMarkedVehicle(vehicleObject.value)
+    !isBookingMarkedVehicle(emittedVehicleObject)
   ) {
     skippedDesktopBookingVehiclePlate.value = "";
   }
 
+  const currentVehicleKey = getVehicleStateKey(vehicleObject.value);
+  const nextVehicleKey = getVehicleStateKey(emittedVehicleObject);
+  if (currentVehicleKey === nextVehicleKey) {
+    if (normalizedOptions.nextSelectionSource) {
+      setSelectionSource(normalizedOptions.nextSelectionSource);
+    }
+    return;
+  }
+
+  vehicleObject.value = emittedVehicleObject;
+
   const matchedVehicleCustomerNumber = normalizeCustomerNumber(vehicleObject.value?.customer_id);
   const selectedCustomerNumber = normalizeCustomerNumber(customer_id.value);
 
@@ -274,6 +331,10 @@ const setBookingObject = (emittedBookingObject, options = {}) => {
     ...options,
   };
 
+  if (getBookingStateKey(bookingObject.value) === getBookingStateKey(emittedBookingObject)) {
+    return;
+  }
+
   bookingObject.value = emittedBookingObject;
 
   if (emittedBookingObject && emittedBookingObject.reference_number) {
@@ -284,7 +345,12 @@ const setBookingObject = (emittedBookingObject, options = {}) => {
 };
 
 const setBookingMatches = (emittedBookingMatches) => {
-  bookingMatches.value = Array.isArray(emittedBookingMatches) ? emittedBookingMatches : [];
+  const nextBookingMatches = Array.isArray(emittedBookingMatches) ? emittedBookingMatches : [];
+  if (getBookingMatchesStateKey(bookingMatches.value) === getBookingMatchesStateKey(nextBookingMatches)) {
+    return;
+  }
+
+  bookingMatches.value = nextBookingMatches;
 };
 
 const mergeBookingMatchDetails = (booking) => {
@@ -294,17 +360,23 @@ const mergeBookingMatchDetails = (booking) => {
   }
 
   let didMergeBooking = false;
-  bookingMatches.value = bookingMatches.value.map((entry) => {
+  let didChangeBooking = false;
+  const nextBookingMatches = bookingMatches.value.map((entry) => {
     if (normalizeBookingId(entry?.id) !== normalizedBookingId) {
       return entry;
     }
 
     didMergeBooking = true;
-    return { ...entry, ...booking };
+    const mergedBooking = { ...entry, ...booking };
+    const hasChangedEntry = hasBookingDetailsChanged(entry, mergedBooking);
+    didChangeBooking = didChangeBooking || hasChangedEntry;
+    return hasChangedEntry ? mergedBooking : entry;
   });
 
   if (!didMergeBooking) {
     bookingMatches.value = [...bookingMatches.value, booking];
+  } else if (didChangeBooking) {
+    bookingMatches.value = nextBookingMatches;
   }
 };
 

src/components/forms/department/pos/input/LicensePlateReg1Input.vue

@@ -416,6 +416,21 @@ const shouldPreserveCustomerSelection = (plateValue) => {
 };
 
 let pendingVehicleCustomerLookup = null;
+const lastAutoSyncedVehicleKey = ref("");
+
+const getVehicleAutoSyncKey = (vehicle, plateOverride = null) => {
+  if (!vehicle) {
+    return "";
+  }
+
+  return [
+    resolveBookingPlate(vehicle, plateOverride),
+    vehicle?.id ?? "",
+    normalizeCustomerNumber(vehicle?.customer_id) ?? "",
+    normalizeCustomerNumber(customer_id.value) ?? "",
+  ].join("|");
+};
+
 const syncMatchedVehicleSelection = (vehicle, options = {}) => {
   const normalizedOptions = {
     plateOverride: null,
@@ -590,6 +605,7 @@ watch(reg_1, (newValue) => {
   // Define the search ID for this input change
   const search_id = register_new_search();
   console.log("reg_1 changed:", newValue);
+  lastAutoSyncedVehicleKey.value = "";
   const shouldKeepCustomerSelection = shouldPreserveCustomerSelection(newValue);
   selectedDropdownItem.value = -1;
   // Check if the new value is empty, if so, clear the vehicles_matching array
@@ -847,11 +863,17 @@ watch(vehicles_matching, (newValue) => {
   const currentValue = reg_1.value;
   const vehicle = newValue.find((vehicle) => vehicle.reg === currentValue);
   if (vehicle) {
-    syncMatchedVehicleSelection(vehicle);
+    const nextAutoSyncKey = getVehicleAutoSyncKey(vehicle, currentValue);
+    if (lastAutoSyncedVehicleKey.value !== nextAutoSyncKey) {
+      lastAutoSyncedVehicleKey.value = nextAutoSyncKey;
+      syncMatchedVehicleSelection(vehicle);
+    }
   } else if (getBookingMatchesForSelection(null, currentValue).length > 0) {
+    lastAutoSyncedVehicleKey.value = "";
     clearCustomerConflict();
     emitVehicleObject(null, currentValue);
   } else {
+    lastAutoSyncedVehicleKey.value = "";
     clearCustomerConflict();
   }
   // Check if the selectedDropdownItem index is valid
@@ -1015,6 +1037,7 @@ const getCurrentIconColor = () => {
       @blur="lostfocus"
       @keydown="arrowKeyHandler"
       id="reg_1"
+      tabindex="1"
       autocomplete="off"
     />
   </template>
@@ -1037,6 +1060,7 @@ const getCurrentIconColor = () => {
           @blur="lostfocus"
           @keydown="arrowKeyHandler"
           id="reg_1"
+          tabindex="1"
           autocomplete="off"
         />
       </div>

src/components/forms/department/pos/input/ReferenceAutocompletePOS.vue

@@ -394,12 +394,16 @@ onBeforeUnmount(() => {
       v-model="typedReference"
       :data="groupedSuggestions"
       field="reference"
+      input-id="reference"
+      data-testid="pos-desktop-step-1-reference-input"
       group-field="group"
       group-options="items"
       :keep-first="true"
       open-on-focus
       expanded
       :loading="isFetching"
+      :tabindex="props.tabindex"
+      :aria-invalid="props.requiredWarning ? 'true' : undefined"
       custom-class="has-sharp-edges"
       icon-pack="fas"
       max-height="320"

src/components/forms/department/pos/input/vehicleCustomerSuggestionsPos.vue

@@ -52,6 +52,7 @@ const customer_suggestions = ref([
 const isSettingCustomer = ref(false);
 const isSettingCustomerToInteger = ref(0);
 const isSettingCustomerStartTime = ref(null);
+let customerSuggestionsRequestId = 0;
 
 const isSettingCustomerTo = (customer_number) => {
   return isSettingCustomerToInteger.value === parseInt(customer_number);
@@ -88,10 +89,17 @@ const getCustomerSuggestions = () => {
   if (!props.reg_1) {
     return;
   }
+  const requestedReg1 = props.reg_1;
+  const requestId = ++customerSuggestionsRequestId;
+
   SessionUser.request("/department/vehicle/customer-suggestions", "GET", {
-    reg_1: props.reg_1,
+    reg_1: requestedReg1,
   })
     .then((response) => {
+      if (requestId !== customerSuggestionsRequestId || requestedReg1 !== props.reg_1) {
+        return;
+      }
+
       // Assuming the response contains an array of customer suggestions
       console.log("Customer suggestions:", response.data.data);
       let suggestions = [];
@@ -126,6 +134,7 @@ watch(
     if (newValue) {
       getCustomerSuggestions();
     } else {
+      customerSuggestionsRequestId += 1;
       customer_suggestions.value = [];
     }
   }

src/components/global/FrontendMaintenanceMenu.vue

@@ -0,0 +1,217 @@
+<script setup>
+import { computed, onBeforeUnmount, onMounted, ref } from "vue";
+import { useI18n } from "vue-i18n";
+import { releaseUpdateState, shortReleaseCommit } from "@/services/releaseUpdate.js";
+import { forceFrontendUpdateAndClearLocal } from "@/services/frontendMaintenance.js";
+
+const SHIFT_PRESS_WINDOW_MS = 1200;
+const CLOSE_EVENT = "frontend-maintenance-menu:close";
+
+const { t } = useI18n({ useScope: "global" });
+const isOpen = ref(false);
+const isBusy = ref(false);
+const shiftPresses = ref([]);
+
+const currentVersion = computed(() => shortReleaseCommit(releaseUpdateState.currentCommit));
+const latestVersion = computed(() => shortReleaseCommit(releaseUpdateState.latestCommit || releaseUpdateState.currentCommit));
+
+const closeMenu = () => {
+  if (!isBusy.value) {
+    isOpen.value = false;
+  }
+};
+
+const handleKeydown = (event) => {
+  if (event.key !== "Shift" || event.repeat) {
+    return;
+  }
+
+  const now = Date.now();
+  shiftPresses.value = [...shiftPresses.value.filter((pressedAt) => now - pressedAt <= SHIFT_PRESS_WINDOW_MS), now];
+  if (shiftPresses.value.length >= 3) {
+    shiftPresses.value = [];
+    isOpen.value = true;
+  }
+};
+
+const forceUpdateAndClearLocal = async () => {
+  if (isBusy.value || !window.confirm(t("maintenance_menu.confirm_clear_local"))) {
+    return;
+  }
+
+  isBusy.value = true;
+  try {
+    await forceFrontendUpdateAndClearLocal();
+  } catch (error) {
+    isBusy.value = false;
+    console.error("Failed to force frontend update and clear local data:", error);
+  }
+};
+
+onMounted(() => {
+  window.addEventListener("keydown", handleKeydown);
+  window.addEventListener(CLOSE_EVENT, closeMenu);
+});
+
+onBeforeUnmount(() => {
+  window.removeEventListener("keydown", handleKeydown);
+  window.removeEventListener(CLOSE_EVENT, closeMenu);
+});
+</script>
+
+<template>
+  <Teleport to="body">
+    <div v-if="isOpen" class="frontend-maintenance-menu" data-testid="frontend-maintenance-menu">
+      <button
+        type="button"
+        class="frontend-maintenance-menu__backdrop"
+        :aria-label="t('common.close')"
+        @click="closeMenu"
+      ></button>
+      <section class="frontend-maintenance-menu__panel" role="dialog" aria-modal="true" :aria-label="t('maintenance_menu.title')">
+        <header class="frontend-maintenance-menu__header">
+          <div>
+            <p>{{ t("maintenance_menu.title") }}</p>
+            <span>{{ t("maintenance_menu.version", { current: currentVersion, latest: latestVersion }) }}</span>
+          </div>
+          <button type="button" class="frontend-maintenance-menu__close" :aria-label="t('common.close')" @click="closeMenu">
+            <i class="fas fa-times" aria-hidden="true"></i>
+          </button>
+        </header>
+
+        <button
+          type="button"
+          class="frontend-maintenance-menu__danger"
+          data-testid="frontend-maintenance-force-clear"
+          :disabled="isBusy"
+          @click="forceUpdateAndClearLocal"
+        >
+          <i class="fas fa-sync-alt" aria-hidden="true"></i>
+          <span>
+            <strong>{{ t("maintenance_menu.force_update_clear") }}</strong>
+            <small>{{ t("maintenance_menu.force_update_clear_hint") }}</small>
+          </span>
+        </button>
+      </section>
+    </div>
+  </Teleport>
+</template>
+
+<style scoped>
+.frontend-maintenance-menu {
+  position: fixed;
+  inset: 0;
+  z-index: 10000;
+  display: grid;
+  place-items: end center;
+  padding: 16px;
+  pointer-events: none;
+}
+
+.frontend-maintenance-menu__backdrop {
+  position: fixed;
+  inset: 0;
+  border: 0;
+  background: rgba(12, 22, 34, 0.32);
+  pointer-events: auto;
+}
+
+.frontend-maintenance-menu__panel {
+  position: relative;
+  width: min(420px, calc(100vw - 32px));
+  border: 1px solid #d6dde6;
+  border-radius: 8px;
+  background: #ffffff;
+  box-shadow: 0 20px 60px rgba(15, 23, 42, 0.25);
+  color: #111827;
+  pointer-events: auto;
+}
+
+.frontend-maintenance-menu__header {
+  display: flex;
+  align-items: flex-start;
+  justify-content: space-between;
+  gap: 12px;
+  padding: 14px 14px 10px;
+  border-bottom: 1px solid #edf1f5;
+}
+
+.frontend-maintenance-menu__header p {
+  margin: 0;
+  color: #172033;
+  font-size: 0.96rem;
+  font-weight: 800;
+}
+
+.frontend-maintenance-menu__header span {
+  display: block;
+  margin-top: 3px;
+  color: #667085;
+  font-family: "SFMono-Regular", Consolas, "Liberation Mono", monospace;
+  font-size: 0.72rem;
+  font-weight: 700;
+}
+
+.frontend-maintenance-menu__close {
+  width: 34px;
+  height: 34px;
+  flex: 0 0 auto;
+  border: 1px solid #d9e0e8;
+  border-radius: 6px;
+  background: #ffffff;
+  color: #334155;
+  cursor: pointer;
+}
+
+.frontend-maintenance-menu__danger {
+  width: calc(100% - 28px);
+  min-height: 58px;
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  margin: 14px;
+  padding: 10px 12px;
+  border: 1px solid #f2b8b5;
+  border-radius: 6px;
+  background: #fff7f6;
+  color: #981b1b;
+  cursor: pointer;
+  text-align: left;
+}
+
+.frontend-maintenance-menu__danger:disabled {
+  cursor: wait;
+  opacity: 0.7;
+}
+
+.frontend-maintenance-menu__danger i {
+  width: 20px;
+  flex: 0 0 auto;
+  text-align: center;
+}
+
+.frontend-maintenance-menu__danger strong,
+.frontend-maintenance-menu__danger small {
+  display: block;
+}
+
+.frontend-maintenance-menu__danger strong {
+  font-size: 0.86rem;
+  font-weight: 800;
+}
+
+.frontend-maintenance-menu__danger small {
+  margin-top: 2px;
+  color: #9f1c1c;
+  font-size: 0.72rem;
+  font-weight: 650;
+  line-height: 1.25;
+}
+
+@media (min-width: 720px) {
+  .frontend-maintenance-menu {
+    place-items: end end;
+    padding: 22px;
+  }
+}
+</style>

src/components/global/RequestQueueProgress.vue

@@ -44,6 +44,7 @@ const REQUEST_INSIGHT_DEFINITIONS = Object.freeze([
 ]);
 const SHIFT_MULTI_PRESS_WINDOW_MS = 700;
 const SYSTEM_SEARCH_CLOSE_EVENT = "system-search:close";
+const FRONTEND_MAINTENANCE_MENU_CLOSE_EVENT = "frontend-maintenance-menu:close";
 
 const isExpanded = ref(REQUEST_QUEUE_CONFIG.inspector.expandedByDefault);
 const isShortcutActivated = ref(false);
@@ -118,6 +119,7 @@ const impersonatedUserRoleId = computed(() => {
 const canGrantMissingPermissions = computed(() =>
   hasSuperuserToken.value && !SessionUser.isSubuser.value && impersonatedUserRoleId.value !== null
 );
+const canInspectReleaseRuntime = computed(() => hasSuperuserToken.value || SessionUser.canAccessAdmin?.() === true);
 
 const userDetailRows = computed(() => {
   if (SessionUser.isSubuser.value) {
@@ -284,7 +286,12 @@ const resolvePingUrl = () => {
 };
 
 const activeApiUrl = computed(() => getReleaseRuntimeApiBaseUrl());
-const releaseSessionSummary = computed(() => buildReleaseSessionSummary());
+const activeApiUrlLabel = computed(() =>
+  canInspectReleaseRuntime.value ? activeApiUrl.value : "Restricted to release operators"
+);
+const releaseSessionSummary = computed(() =>
+  buildReleaseSessionSummary(undefined, { includeInfrastructureDetails: canInspectReleaseRuntime.value })
+);
 
 const measurePingLatency = async () => {
   if (typeof fetch !== "function") {
@@ -360,6 +367,9 @@ const handleWindowKeydown = (event) => {
   }
 
   if (shiftKeyPressCount.value >= 3) {
+    event.preventDefault?.();
+    event.stopImmediatePropagation?.();
+    window.dispatchEvent(new CustomEvent(FRONTEND_MAINTENANCE_MENU_CLOSE_EVENT));
     closeSystemSearchForSuperuser();
     isShortcutActivated.value = true;
     isExpanded.value = true;
@@ -646,9 +656,10 @@ onBeforeUnmount(() => {
         </aside>
 
         <aside class="request-queue-progress__side request-queue-progress__side--runtime" data-testid="request-queue-runtime-box">
-          <div class="request-queue-progress__section-title">Session release</div>
-          <div class="request-queue-progress__section-content request-queue-progress__section-content--release">
-            <ul class="request-queue-progress__meta-list">
+          <template v-if="canInspectReleaseRuntime">
+            <div class="request-queue-progress__section-title">Session release</div>
+            <div class="request-queue-progress__section-content request-queue-progress__section-content--release">
+              <ul class="request-queue-progress__meta-list">
               <li class="request-queue-progress__meta-item">
                 <span class="request-queue-progress__meta-label">Channel</span>
                 <span
@@ -771,11 +782,15 @@ onBeforeUnmount(() => {
               </li>
             </ul>
 
-            <div class="request-queue-progress__subsection-title">Runtime details</div>
+            </div>
+          </template>
+
+          <div class="request-queue-progress__section-title">Runtime details</div>
+          <div class="request-queue-progress__section-content request-queue-progress__section-content--release">
             <ul class="request-queue-progress__meta-list">
               <li class="request-queue-progress__meta-item">
                 <span class="request-queue-progress__meta-label">API URL</span>
-                <span class="request-queue-progress__meta-value" :title="activeApiUrl">{{ activeApiUrl }}</span>
+                <span class="request-queue-progress__meta-value" :title="activeApiUrlLabel">{{ activeApiUrlLabel }}</span>
               </li>
               <li class="request-queue-progress__meta-item">
                 <span class="request-queue-progress__meta-label">Current host</span>
@@ -1485,4 +1500,3 @@ onBeforeUnmount(() => {
   opacity: 0;
 }
 </style>
-

src/components/menus/admin/AdminLeftMenu.vue

@@ -3,7 +3,7 @@ import MenuDefault from "@/components/menus/MenuDefault.vue";
 import { ref, watch, onMounted } from "vue";
 import { SessionUser } from "@/components/session/token/SessionUser.vue";
 import { useRoute } from "vue-router";
-import { isAccessibleVisibleDepartment, sortByDepartmentPriorityOrder } from "@/services/departmentVisibility.js";
+import { isAccessibleVisibleNamedDepartment, sortByDepartmentPriorityOrder } from "@/services/departmentVisibility.js";
 // Get the department ID from the URL
 const route = useRoute();
 const department_id = route.params.departmentId || SessionUser.functions.getDepartmentIdFromUrl() || null;
@@ -26,7 +26,7 @@ const loadDepartments = () => {
           value: department.id,
           icon: "fas fa-building",
           children: [],
-          hidden: !isAccessibleVisibleDepartment(department, SessionUser.canAccessAssignedDepartment),
+          hidden: !isAccessibleVisibleNamedDepartment(department, SessionUser.canAccessAssignedDepartment),
         });
       });
       menu_items.value[1].options = options;

src/components/models/navigation/items/NavigationMenuItemsAdmin.vue

@@ -13,7 +13,9 @@ import {
 } from "@/composables/useDraftTransactionCustomer.js";
 import { fetchDepartmentOrderBookingCounts } from "@/components/models/navigation/items/adminBookingCount.js";
 import { fetchDepartmentDraftCount } from "@/components/models/navigation/items/adminDraftCount.js";
+import { hasExplicitBookingCountPermission } from "@/components/models/navigation/items/bookingCountGuards.js";
 import { NAVIGATION_COUNT_REFRESH_EVENT } from "@/components/models/navigation/items/navigationCountEvents.js";
+import { isAccessibleVisibleNamedDepartment } from "@/services/departmentVisibility.js";
 
 const t = (key: string) => i18n.global.t(key);
 
@@ -70,6 +72,8 @@ let queuedBookingLoadingIndicator = false;
 let queuedDraftLoadingIndicator = false;
 const getDepartmentIdNumber = () => Number.parseInt(String(department_id.value), 10);
 const canUseAdminNavigationCounts = () => SessionUser.canAccessAdmin();
+const canUseAdminBookingNavigationCounts = () =>
+  canUseAdminNavigationCounts() && hasExplicitBookingCountPermission(SessionUser);
 const getDepartmentById = (id: number) => {
   return departments_cache.value?.find((department: any) => Number(department?.id) === Number(id)) || null;
 };
@@ -148,6 +152,19 @@ const getDepartmentDraftBadge = () => {
 };
 
 const fetchDepartmentBookingCount = async ({ showLoadingIndicator = false } = {}) => {
+  if (!canUseAdminBookingNavigationCounts()) {
+    department_booking_counts.value = {
+      past: 0,
+      current: 0,
+      future: 0,
+    };
+    department_booking_counts_loading.value = false;
+    bookingCountFetchInFlight = false;
+    bookingCountRefreshQueued = false;
+    queuedBookingLoadingIndicator = false;
+    return;
+  }
+
   if (!hasValidDepartmentId.value) {
     department_booking_counts.value = {
       past: 0,
@@ -376,17 +393,26 @@ const items = computed<NavigationItemProps[]>(() => [
     hidden: isDepartmentSet.value,
     classes: [ADMIN_DEPARTMENT_SELECTION_CLASS],
     permissions: ["admin", "list_departments"],
-    children: SessionUser.functions.getAccessibleDepartments().map((departmentId: any) => {
-      const department = getDepartmentById(departmentId);
-      return {
-        label: getDepartmentName(departmentId),
-        to: `/admin/${departmentId}`,
-        type: "department",
-        permissions: ["admin", "view_department"],
-        order_priority: department?.order_priority ?? department?.priority_order ?? null,
-        priority_order: department?.priority_order ?? department?.order_priority ?? null,
-      };
-    }),
+    children: SessionUser.functions
+      .getAccessibleDepartments()
+      .map((departmentId: any) => {
+        const label = getDepartmentName(departmentId);
+        const department = getDepartmentById(departmentId);
+
+        if (!isAccessibleVisibleNamedDepartment(department, SessionUser.canAccessAssignedDepartment)) {
+          return null;
+        }
+
+        return {
+          label,
+          to: `/admin/${department.id}`,
+          type: "department",
+          permissions: ["admin", "view_department"],
+          order_priority: department?.order_priority ?? department?.priority_order ?? null,
+          priority_order: department?.priority_order ?? department?.order_priority ?? null,
+        };
+      })
+      .filter(Boolean) as NavigationItemProps[],
   },
   // Kassesystem
   {

src/components/models/navigation/items/NavigationMenuItemsSuperUser.vue

@@ -9,6 +9,7 @@ import {
 } from "@/composables/useDraftTransactionCustomer.js";
 import { fetchSuperUserDraftCount } from "@/components/models/navigation/items/superUserDraftCount.js";
 import { fetchSuperUserBookingCounts } from "@/components/models/navigation/items/superUserBookingCount.js";
+import { hasExplicitBookingCountPermission } from "@/components/models/navigation/items/bookingCountGuards.js";
 import { NAVIGATION_COUNT_REFRESH_EVENT } from "@/components/models/navigation/items/navigationCountEvents.js";
 
 const firstToUpperCase = (str: string) => str.charAt(0).toUpperCase() + str.slice(1);
@@ -37,23 +38,29 @@ let queuedSuperUserBookingLoadingIndicator = false;
 let queuedSuperUserDraftLoadingIndicator = false;
 
 const canUseSuperUserNavigationCounts = () => SessionUser.canAccessSuperUser();
+const canUseSuperUserBookingNavigationCounts = () =>
+  canUseSuperUserNavigationCounts() && hasExplicitBookingCountPermission(SessionUser);
 
-const resetSuperUserNavigationCounts = () => {
+const resetSuperUserBookingCounts = () => {
   bookingCountRequestId += 1;
-  draftCountRequestId += 1;
   superuser_booking_counts.value = {
     past: 0,
     current: 0,
     future: 0,
   };
   superuser_booking_count_loading.value = false;
+  superUserBookingCountFetchInFlight = false;
+  superUserBookingCountRefreshQueued = false;
+  queuedSuperUserBookingLoadingIndicator = false;
+};
+
+const resetSuperUserNavigationCounts = () => {
+  resetSuperUserBookingCounts();
+  draftCountRequestId += 1;
   superuser_draft_count.value = 0;
   superuser_draft_count_loading.value = false;
-  superUserBookingCountFetchInFlight = false;
   superUserDraftCountFetchInFlight = false;
-  superUserBookingCountRefreshQueued = false;
   superUserDraftCountRefreshQueued = false;
-  queuedSuperUserBookingLoadingIndicator = false;
   queuedSuperUserDraftLoadingIndicator = false;
 };
 
@@ -125,8 +132,8 @@ const getSuperUserDraftsBadge = () => {
 };
 
 const fetchCurrentSuperUserBookingCount = async ({ showLoadingIndicator = false } = {}) => {
-  if (!canUseSuperUserNavigationCounts()) {
-    resetSuperUserNavigationCounts();
+  if (!canUseSuperUserBookingNavigationCounts()) {
+    resetSuperUserBookingCounts();
     return;
   }
 

src/components/models/navigation/items/adminBookingCount.js

@@ -1,4 +1,8 @@
 import { authenticatedRequest } from "@/components/session/authenticatedRequest.vue";
+import {
+  emptyBookingCounts,
+  isExpectedBookingCountRequestFailure,
+} from "@/components/models/navigation/items/bookingCountGuards.js";
 
 const normalizePositiveInteger = (value) => {
   const parsedValue = Number.parseInt(String(value ?? ""), 10);
@@ -24,11 +28,7 @@ export const fetchDepartmentOrderBookingCounts = async ({ departmentId }) => {
   const normalizedDepartmentId = normalizePositiveInteger(departmentId);
 
   if (!normalizedDepartmentId) {
-    return {
-      past: 0,
-      current: 0,
-      future: 0,
-    };
+    return emptyBookingCounts();
   }
 
   try {
@@ -38,12 +38,11 @@ export const fetchDepartmentOrderBookingCounts = async ({ departmentId }) => {
 
     return normalizeBookingCounts(response);
   } catch (error) {
-    console.error("Error fetching department order-booking counts:", error);
-    return {
-      past: 0,
-      current: 0,
-      future: 0,
-    };
+    if (!isExpectedBookingCountRequestFailure(error)) {
+      console.error("Error fetching department order-booking counts:", error);
+    }
+
+    return emptyBookingCounts();
   }
 };
 

src/components/models/navigation/items/bookingCountGuards.js

@@ -0,0 +1,24 @@
+export const BOOKING_COUNT_PERMISSIONS = ["list_bookings", "list_own_bookings"];
+
+export const emptyBookingCounts = () => ({
+  past: 0,
+  current: 0,
+  future: 0,
+});
+
+export const hasExplicitBookingCountPermission = (sessionUser) => {
+  const permissions = sessionUser?.permissions?.value;
+
+  if (!Array.isArray(permissions)) {
+    return false;
+  }
+
+  return BOOKING_COUNT_PERMISSIONS.some((permission) => permissions.includes(permission));
+};
+
+export const getRequestErrorStatus = (error) =>
+  Number.parseInt(String(error?.response?.status ?? error?.status ?? ""), 10);
+
+export const isExpectedBookingCountRequestFailure = (error) => {
+  return [401, 403, 404].includes(getRequestErrorStatus(error));
+};

src/components/models/navigation/items/superUserBookingCount.js

@@ -1,4 +1,8 @@
 import { authenticatedRequest } from "@/components/session/authenticatedRequest.vue";
+import {
+  emptyBookingCounts,
+  isExpectedBookingCountRequestFailure,
+} from "@/components/models/navigation/items/bookingCountGuards.js";
 
 const toNonNegativeInteger = (value) => {
   const parsedValue = Number.parseInt(String(value ?? ""), 10);
@@ -20,12 +24,11 @@ export const fetchSuperUserBookingCounts = async () => {
     const response = await authenticatedRequest("/order-bookings/counts", "GET", {});
     return normalizeBookingCounts(response);
   } catch (error) {
-    console.error("Error fetching superuser booking counts:", error);
-    return {
-      past: 0,
-      current: 0,
-      future: 0,
-    };
+    if (!isExpectedBookingCountRequestFailure(error)) {
+      console.error("Error fetching superuser booking counts:", error);
+    }
+
+    return emptyBookingCounts();
   }
 };
 

src/components/page/wrappers/RestrictedPageWrapper.vue

@@ -1,9 +1,8 @@
 <script setup>
-
-import { useRouter } from 'vue-router';
+import { useRouter } from "vue-router";
 import { SessionUser } from "@/components/session/token/SessionUser.vue";
 import Swal from "sweetalert2";
-import { computed, onBeforeUnmount, onMounted, ref } from 'vue';
+import { computed, onBeforeUnmount, onMounted, ref, watch } from "vue";
 import { pingApiServer } from "@/services/apiHealth.js";
 
 const props = defineProps({
@@ -42,12 +41,12 @@ const handleSlowSessionBootstrap = async () => {
     }
 
     const result = await Swal.fire({
-      title: 'Error',
-      text: 'The user session could not be initiated.',
-      icon: 'error',
-      confirmButtonText: 'Clear session, and try again',
+      title: "Error",
+      text: "The user session could not be initiated.",
+      icon: "error",
+      confirmButtonText: "Clear session, and try again",
       showCancelButton: true,
-      cancelButtonText: 'Retry',
+      cancelButtonText: "Retry",
     });
 
     if (result.isConfirmed) {
@@ -60,10 +59,16 @@ const handleSlowSessionBootstrap = async () => {
   }
 };
 
+watch(isSessionInitiated, (initiated) => {
+  if (initiated) {
+    clearSessionTimeout();
+  }
+});
+
 onMounted(() => {
   sessionTimeout = setTimeout(() => {
     void handleSlowSessionBootstrap();
-  }, 5000);
+  }, 15000);
 });
 
 onBeforeUnmount(clearSessionTimeout);
@@ -89,9 +94,18 @@ onBeforeUnmount(clearSessionTimeout);
         </div>
       </div>
       <!-- Simple checks -->
-      <p v-if="router.currentRoute.value.path === '/user'">You are on the /user page. <br>You do {{ SessionUser.hasPermission('user') ? '' : 'not' }} have permission ( user ) to view this page.</p>
-      <p v-if="router.currentRoute.value.path === '/admin'">You are on the /admin page. <br>You do {{ SessionUser.hasPermission('admin') ? '' : 'not' }} have permission ( admin ) to view this page.</p>
-      <p v-if="router.currentRoute.value.path === '/superuser'">You are on the /superuser <br>page. You do {{ SessionUser.hasPermission('superuser') ? '' : 'not' }} have permission ( superuser ) to view this page.</p>
+      <p v-if="router.currentRoute.value.path === '/user'">
+        You are on the /user page. <br />You do {{ SessionUser.hasPermission("user") ? "" : "not" }} have permission (
+        user ) to view this page.
+      </p>
+      <p v-if="router.currentRoute.value.path === '/admin'">
+        You are on the /admin page. <br />You do {{ SessionUser.hasPermission("admin") ? "" : "not" }} have permission (
+        admin ) to view this page.
+      </p>
+      <p v-if="router.currentRoute.value.path === '/superuser'">
+        You are on the /superuser <br />page. You do {{ SessionUser.hasPermission("superuser") ? "" : "not" }} have
+        permission ( superuser ) to view this page.
+      </p>
       <div v-if="showDebugInfo">
         <div class="message mb-6">
           <div class="message-header">
@@ -108,7 +122,9 @@ onBeforeUnmount(clearSessionTimeout);
         <!-- Button to go back to the previous page -->
         <button class="button is-dark" @click="router.go(-1)">Go back</button>
         <!-- Button to see the debug information -->
-        <button class="button is-dark" @click="showDebugInfo = !showDebugInfo" v-if="!showDebugInfo">Show debug information</button>
+        <button class="button is-dark" @click="showDebugInfo = !showDebugInfo" v-if="!showDebugInfo">
+          Show debug information
+        </button>
         <!-- Button to hide the debug information -->
         <button class="button is-dark" @click="showDebugInfo = !showDebugInfo" v-else>Hide debug information</button>
       </div>
@@ -116,6 +132,4 @@ onBeforeUnmount(clearSessionTimeout);
   </div>
 </template>
 
-<style scoped>
-
-</style>
+<style scoped></style>

src/components/pagination/departmentTabs.vue

@@ -48,10 +48,13 @@ export const getDepartmentDescription = (id) => {
 
 export const getDepartmentsGuest = async (queryParams = {}) => {
   isLoading.value = true;
-  const queryString = new URLSearchParams(queryParams).toString();
-  const request = await unauthenticatedRequest("/guest/departments" + (queryString ? `?${queryString}` : ""), "get");
-  departments.value = sortByDepartmentPriorityOrder(request.data.data || []);
-  isLoading.value = false;
-  return departments.value;
+  try {
+    const queryString = new URLSearchParams(queryParams).toString();
+    const request = await unauthenticatedRequest("/guest/departments" + (queryString ? `?${queryString}` : ""), "get");
+    departments.value = sortByDepartmentPriorityOrder(request.data.data || []);
+    return departments.value;
+  } finally {
+    isLoading.value = false;
+  }
 };
 </script>

src/components/release/ReleaseChannelSidebarSelector.vue

@@ -1,42 +1,21 @@
 <script setup>
-import { computed, inject, ref } from "vue";
+import { ref } from "vue";
 import { useI18n } from "vue-i18n";
 import { SessionUser } from "@/components/session/token/SessionUser.vue";
 import ReleaseChannelSelector from "@/components/release/ReleaseChannelSelector.vue";
 import ReleaseUpdateWidget from "@/components/release/ReleaseUpdateWidget.vue";
-import {
-  clearSelectedReleaseChannel,
-  releaseChannelSelectorVisible,
-  switchSelectedReleaseChannel,
-} from "@/services/releaseChannelAvailability.js";
-import {
-  isReleaseSourceOverrideAvailable,
-  RELEASE_SOURCE_MODES,
-  setReleaseSourceOverride,
-} from "@/services/releaseBootstrap.js";
+import { releaseChannelSelectorVisible, switchSelectedReleaseChannel } from "@/services/releaseChannelAvailability.js";
 import { inspectReleaseRuntimeForUpdate } from "@/services/releaseUpdate.js";
 import { releaseRuntimeState } from "@/services/releaseTimeline.js";
 
 const switchingSlug = ref("");
 const switchError = ref("");
 const { t, te } = useI18n({ useScope: "global" });
-const reloadWindow = inject("releaseSourceReload", () => {
-  if (typeof window !== "undefined") {
-    window.location.reload();
-  }
-});
 const tr = (key, fallback) => {
   const path = `configuration.release_manager.channel_selector.${key}`;
   return te(path) ? t(path) : fallback;
 };
 
-const showUseLocalFrontend = computed(
-  () =>
-    releaseChannelSelectorVisible.value &&
-    isReleaseSourceOverrideAvailable() &&
-    String(releaseRuntimeState.source || "").toLowerCase() !== RELEASE_SOURCE_MODES.LOCAL
-);
-
 const switchChannel = async (option) => {
   if (switchingSlug.value) {
     return;
@@ -48,21 +27,14 @@ const switchChannel = async (option) => {
     await switchSelectedReleaseChannel(option.channel, SessionUser.refreshReleaseRuntime);
     void inspectReleaseRuntimeForUpdate(releaseRuntimeState, { autoDownload: true });
   } catch (error) {
-    switchError.value = tr("switch_error", "Release channel could not be switched. The previous channel is still active.");
+    switchError.value = tr(
+      "switch_error",
+      "Release channel could not be switched. The previous channel is still active."
+    );
   } finally {
     switchingSlug.value = "";
   }
 };
-
-const useLocalFrontend = () => {
-  if (switchingSlug.value) {
-    return;
-  }
-
-  setReleaseSourceOverride(RELEASE_SOURCE_MODES.LOCAL);
-  clearSelectedReleaseChannel();
-  reloadWindow();
-};
 </script>
 
 <template>
@@ -74,17 +46,6 @@ const useLocalFrontend = () => {
       :disabled="Boolean(switchingSlug)"
       @select="switchChannel"
     />
-    <button
-      v-if="showUseLocalFrontend"
-      type="button"
-      class="release-channel-sidebar-selector__local-button"
-      data-testid="release-channel-use-local-frontend"
-      :disabled="Boolean(switchingSlug)"
-      @click="useLocalFrontend"
-    >
-      <i class="fas fa-code" aria-hidden="true"></i>
-      <span>{{ tr("use_local_frontend", "Use local frontend") }}</span>
-    </button>
     <p v-if="switchError" class="release-channel-sidebar-selector__error" role="alert">
       {{ switchError }}
     </p>
@@ -93,37 +54,6 @@ const useLocalFrontend = () => {
 </template>
 
 <style scoped>
-.release-channel-sidebar-selector__local-button {
-  width: calc(100% - 32px);
-  min-width: 0;
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  gap: 8px;
-  margin: -2px 16px 14px;
-  padding: 9px 10px;
-  border: 1px solid #b8c7d9;
-  border-radius: 5px;
-  background: #f8fbff;
-  color: #153554;
-  cursor: pointer;
-  font-size: 0.82rem;
-  font-weight: 800;
-  line-height: 1.2;
-  text-align: center;
-  transition: border-color 0.18s ease, box-shadow 0.18s ease;
-}
-
-.release-channel-sidebar-selector__local-button:hover:not(:disabled) {
-  border-color: #6f8fb4;
-  box-shadow: 0 8px 18px rgba(15, 23, 42, 0.08);
-}
-
-.release-channel-sidebar-selector__local-button:disabled {
-  cursor: default;
-  opacity: 0.7;
-}
-
 .release-channel-sidebar-selector__error {
   margin: 0 16px 14px;
   color: #b42318;

src/components/release/ReleaseContextBar.vue

@@ -295,10 +295,23 @@ const branchWarning = computed(() =>
   min-width: 12rem;
 }
 
+.release-context-bar__status {
+  align-items: flex-start;
+  flex-wrap: wrap;
+}
+
+.release-context-bar__status .tag {
+  flex: 0 0 auto;
+}
+
 .release-context-bar__warning {
   color: #9f1f17;
+  flex: 1 1 12rem;
   font-size: 0.82rem;
-  overflow-wrap: anywhere;
+  line-height: 1.25;
+  min-width: min(12rem, 100%);
+  overflow-wrap: break-word;
+  word-break: normal;
 }
 
 .release-context-bar__endpoints {

src/components/session/Session.vue

@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import axios from 'axios'
 import {API_URL} from "@/config.js";
+import { clearEdgeGatewayWorkspaceCache } from "@/services/edgeGateways.js";
 
 export const currentDepartment = ref(null);
 export const selectDepartment = (department) => {
@@ -31,6 +32,7 @@ export const exitSession = () => {
     }
   });
 
+  clearEdgeGatewayWorkspaceCache();
   localStorage.removeItem('token');
   return result;
 };

src/components/session/authenticatedRequest.vue

@@ -2,6 +2,7 @@
 import axios from 'axios'
 import { enqueueRequest } from "@/services/requestQueue.js";
 import { buildCurrentReleaseHeaders, resolveReleaseApiUrl } from "@/services/releaseTimeline.js";
+import { isTrustedReleaseUrl } from "@/services/releaseTrust.js";
 
 /**
  * Get the selected customer number for X-Customer-Number header (used by subusers)
@@ -12,33 +13,88 @@ const getSelectedCustomerNumber = () => {
   return stored ? parseInt(stored) : null;
 };
 
-export const authenticatedRequest = (url, method, data, catchCallable = null, thenCallable = null) => {
+const MY_ACTIVE_WASH_ENDPOINT = '/modules/self-serve/lane/wash/my-active-wash';
+const ACTIVE_WASH_STARTED_STATUSES = new Set(['MACHINE_RELAY_ENABLED', 'MACHINE_STARTED']);
+
+const normalizeStatus = (status) => String(status || '').trim().toUpperCase();
+
+const parseDateTimeMs = (value) => {
+  if (!value) {
+    return null;
+  }
+
+  const timestamp = Date.parse(String(value));
+  return Number.isFinite(timestamp) ? timestamp : null;
+};
+
+const hasActiveWashStartEvidence = (details) => {
+  const session = details?.session || {};
+  const status = normalizeStatus(session?.status ?? details?.status);
+
+  return (
+    ACTIVE_WASH_STARTED_STATUSES.has(status) ||
+    session?.machine_relay_enabled === true ||
+    session?.machine_start_triggered === true ||
+    details?.machine_relay_enabled === true ||
+    details?.machine_start_triggered === true ||
+    parseDateTimeMs(session?.wash_started_at) !== null ||
+    parseDateTimeMs(session?.machine_start_triggered_at) !== null ||
+    parseDateTimeMs(session?.machine_relay_enabled_at) !== null
+  );
+};
+
+const normalizeActiveWashResponse = (url, method, response) => {
+  if (String(method || '').toUpperCase() !== 'GET' || !String(url || '').includes(MY_ACTIVE_WASH_ENDPOINT)) {
+    return response;
+  }
+
+  const details = response?.data?.data;
+  if (!details?.in_progress || hasActiveWashStartEvidence(details)) {
+    return response;
+  }
+
+  return {
+    ...response,
+    data: {
+      ...response.data,
+      data: {
+        ...details,
+        in_progress: false,
+      },
+    },
+  };
+};
+
+export const authenticatedRequest = (url, method, data, catchCallable = null, thenCallable = null, options = {}) => {
   const token = localStorage.getItem('token');
   if (!token) {
     //throw new Error('No token was found, unable to make authenticated request');
   }
   
+  const requestUrl = resolveReleaseApiUrl(url);
+  const canSendCredentials = isTrustedReleaseUrl(requestUrl);
+
   // Build headers
   const headers = {
     ...buildCurrentReleaseHeaders(),
   };
-  if (token && token.length > 0) {
+  if (canSendCredentials && token && token.length > 0) {
     headers.Authorization = `Bearer ${token}`;
   }
   
   // Add X-Customer-Number header if subuser has selected a grant
   const isSubuser = localStorage.getItem('is_subuser') === 'true';
   const selectedCustomerNumber = getSelectedCustomerNumber();
-  if (isSubuser && selectedCustomerNumber) {
+  if (canSendCredentials && isSubuser && selectedCustomerNumber) {
     headers['X-Customer-Number'] = selectedCustomerNumber;
   }
   
-  const requestUrl = resolveReleaseApiUrl(url);
   return enqueueRequest(
     () => axios({
       method,
       url: requestUrl,
       ...(method === 'GET' ? { params: data } : { data }),
+      ...(options?.signal ? { signal: options.signal } : {}),
       __skipRequestQueue: true,
       headers
     }),
@@ -60,6 +116,7 @@ export const authenticatedRequest = (url, method, data, catchCallable = null, th
       throw error;
     })
     .then((response) => {
+      response = normalizeActiveWashResponse(url, method, response);
       if (thenCallable) {
         // Call the then callable
         thenCallable(response);

src/components/session/token/SessionUser.vue

@@ -58,6 +58,12 @@ import {
   releaseChannelRuntimeRequestParams,
   setReleaseChannelSwitchNoticePrincipal,
 } from "@/services/releaseChannelAvailability.js";
+import { clearCachedXlvaskUsageAmount } from "@/components/displays/department/pos/sync/xlvaskUsageAmountCache.js";
+import { clearEdgeGatewayWorkspaceCache } from "@/services/edgeGateways.js";
+import {
+  clearPeriodCache,
+  clearSelfWashCountsCache,
+} from "@/views/dashboards/superUserDashboard/InvoicingBillingPeriod/imports/InvoicingBillingPeriodImportPaging.js";
 
 const normalizePositiveInteger = (value) => {
   const parsedValue = Number.parseInt(String(value ?? ""), 10);
@@ -98,7 +104,16 @@ const hydrateSessionFromStorage = () => {
   return true;
 };
 
+const clearPrivilegedSessionCaches = () => {
+  clearPeriodCache();
+  clearSelfWashCountsCache();
+  clearCachedXlvaskUsageAmount();
+  clearEdgeGatewayWorkspaceCache();
+};
+
 const clearStoredSession = () => {
+  clearPrivilegedSessionCaches();
+
   if (typeof window === "undefined") {
     return;
   }
@@ -115,7 +130,8 @@ const applyReleaseRuntimeConfig = (runtime) => {
   const normalizedRuntime = runtime || {};
   configureReleaseRuntime(normalizedRuntime);
   reconcileSelectedReleaseChannel(normalizedRuntime);
-  const runtimeUrls = normalizedRuntime.urls && typeof normalizedRuntime.urls === "object" ? normalizedRuntime.urls : {};
+  const runtimeUrls =
+    normalizedRuntime.urls && typeof normalizedRuntime.urls === "object" ? normalizedRuntime.urls : {};
   SessionUser.runtimeConfig.release.traceId.value = normalizedRuntime.trace_id || null;
   SessionUser.runtimeConfig.release.channel.value = normalizedRuntime.channel || null;
   SessionUser.runtimeConfig.release.availableChannels.value =
@@ -168,6 +184,7 @@ const resetSessionState = () => {
   SessionUser.user.notifications.wash_certificate_email.value = null;
   SessionUser.user.notifications.email_notifications_enabled.value = null;
   SessionUser.user.notifications.sms_notifications_enabled.value = null;
+  SessionUser.user.notifications.superuser_new_customer_email_notifications_enabled.value = null;
   SessionUser.user.created_at.value = null;
   SessionUser.user.updated_at.value = null;
   SessionUser.user.cached_at.value = null;
@@ -377,6 +394,7 @@ export const authenticateUser = async (customer_number, password) => {
     password,
   })
     .then((response) => {
+      clearPrivilegedSessionCaches();
       SessionUser.token.value = response.data.token;
       SessionUser.authenticated.value = true;
       localStorage.setItem("token", response.data.token);
@@ -423,6 +441,7 @@ export const authenticateSubuser = async (credentials) => {
 
   return await authenticatedRequest("/subusers/auth/password", "POST", requestBody)
     .then((response) => {
+      clearPrivilegedSessionCaches();
       SessionUser.token.value = response.data.data.session;
       SessionUser.authenticated.value = true;
       SessionUser.isSubuser.value = true;
@@ -510,6 +529,8 @@ export const getSessionData = async () => {
       SessionUser.user.notifications.email_notifications_enabled.value =
         session.notifications.email_notifications_enabled;
       SessionUser.user.notifications.sms_notifications_enabled.value = session.notifications.sms_notifications_enabled;
+      SessionUser.user.notifications.superuser_new_customer_email_notifications_enabled.value =
+        session.notifications.superuser_new_customer_email_notifications_enabled;
       SessionUser.user.created_at.value = session.created_at;
       SessionUser.user.updated_at.value = session.updated_at;
       SessionUser.user.display_name.value = session.display_name;
@@ -605,6 +626,7 @@ export const SessionUser = {
       wash_certificate_email: ref(null),
       email_notifications_enabled: ref(null),
       sms_notifications_enabled: ref(null),
+      superuser_new_customer_email_notifications_enabled: ref(null),
       setEmailNotificationsEnabled: (enabled) => {
         return SessionUser.request("/account/notifications", "PUT", {
           email_notifications_enabled: enabled,
@@ -629,6 +651,18 @@ export const SessionUser = {
             console.error(error);
           });
       },
+      setSuperuserNewCustomerEmailNotificationsEnabled: (enabled) => {
+        return SessionUser.request("/account/notifications", "PUT", {
+          superuser_new_customer_email_notifications_enabled: enabled,
+        })
+          .then(() => {
+            SessionUser.user.notifications.superuser_new_customer_email_notifications_enabled.value = enabled;
+          })
+          .catch((error) => {
+            parseError(error, "user_notifications");
+            console.error(error);
+          });
+      },
       setWashCertificateEmail: (email) => {
         return SessionUser.request("/account/notifications", "PUT", {
           wash_certificate_email: email,
@@ -669,6 +703,7 @@ export const SessionUser = {
      * @param {number|null} customerNumber - The billing_customer_number to select, or null to clear
      */
     selectGrant: (customerNumber) => {
+      clearEdgeGatewayWorkspaceCache();
       if (customerNumber === null) {
         localStorage.removeItem("selected_customer_number");
         SessionUser.subuser.selectedGrantCustomerNumber.value = null;
@@ -886,6 +921,7 @@ export const SessionUser = {
    * @param {string} token
    */
   setToken: (token) => {
+    clearPrivilegedSessionCaches();
     SessionUser.token.value = token;
     localStorage.setItem("token", token);
     // Reload the window to make sure the user's session is initiated

src/components/session/token/SessionUser/Objects/CollectedOrderInvoices.vue

@@ -456,6 +456,29 @@ export const CollectedOrderInvoices = {
         throw error;
       });
     },
+    move_to_customer: async (id, customerNumber) => {
+      const invoiceCollectionId = parseInt(id);
+      const targetCustomerNumber = parseInt(customerNumber);
+
+      if (!Number.isInteger(invoiceCollectionId) || invoiceCollectionId <= 0) {
+        throw new Error('Invalid invoice collection id');
+      }
+
+      if (!Number.isInteger(targetCustomerNumber) || targetCustomerNumber <= 0) {
+        throw new Error('Invalid customer number');
+      }
+
+      return authenticatedRequest('/collected-invoices/move-to-customer', 'POST', {
+        id: invoiceCollectionId,
+        customer_number: targetCustomerNumber,
+      }).then((response) => {
+        console.log(response);
+        return response;
+      }).catch((error) => {
+        console.log(error);
+        throw error;
+      });
+    },
     showCreateNewCustom: showCreateCustomInvoiceCollectionForm,
     showInvoiceCollectionPickerForm: showInvoiceCollectionPickerModal,
     add_vehicle_subscriptions: async (id) => {
@@ -820,4 +843,3 @@ export const CollectedOrderInvoices = {
   }
 };
 </script>
-

src/components/session/token/SessionUser/Objects/ObjectsGlobal.vue

@@ -7,6 +7,13 @@ import { getSystemUserIds } from "@/components/session/token/SessionUser/Objects
 // Helper function to get i18n translation
 const t = (key) => i18n.global.t(key);
 
+const escapeHtml = (value = "") => String(value)
+  .replaceAll("&", "&")
+  .replaceAll("<", "&lt;")
+  .replaceAll(">", "&gt;")
+  .replaceAll("\"", "&quot;")
+  .replaceAll("'", "&#39;");
+
 const normalizeDateTimeLocalValue = (value) => {
   if (value === null || value === undefined || value === '') {
     return '';
@@ -765,9 +772,11 @@ export const ObjectsGlobal = {
           console.log(response);
           // How long are the list of options
           for (let i = 0; i < response.length; i++) {
-            var tmp = response[i];
+            const tmp = response[i];
+            const optionValue = tmp?.id ?? "";
+            const optionLabel = tmp?.name ? tmp.name : optionValue;
             console.log(tmp);
-            html += `<option value="${tmp.id}" ${(value == tmp.id || (value === null && tmp.id === 0)) ? 'selected' : ''}>${tmp.name ? tmp.name : tmp.id}</option>`;
+            html += `<option value="${escapeHtml(optionValue)}" ${(value == optionValue || (value === null && optionValue === 0)) ? 'selected' : ''}>${escapeHtml(optionLabel)}</option>`;
           }
         });
         html += `</select>

src/components/session/token/SessionUser/Objects/OrderBookings.vue

@@ -356,6 +356,20 @@ export const OrderBookings = {
           { safety_seal: normalizeCompletionSafetySeal(safetySeal) },
           onAfterComplete
       );
+    },
+    resendBookingConfirmation: async (id) => {
+      return SessionUser.request(
+          OrderBookings.meta.endpoint + "/booking-confirmation/resend",
+          "POST",
+          { id: parseInt(id, 10) }
+      ).then((response) => response.data.data);
+    },
+    resendBookingCompletionConfirmation: async (id) => {
+      return SessionUser.request(
+          OrderBookings.meta.endpoint + "/completion-confirmation/resend",
+          "POST",
+          { id: parseInt(id, 10) }
+      ).then((response) => response.data.data);
     }
   },
   /**

src/components/session/token/SessionUser/Objects/Orders.vue

@@ -19,6 +19,14 @@ const getProtectedDeletePayload = (error) => {
   return payload;
 };
 
+const escapeHtml = (value) => String(value ?? "").replace(/[&<>"']/g, (character) => ({
+  "&": "&amp;",
+  "<": "&lt;",
+  ">": "&gt;",
+  "\"": "&quot;",
+  "'": "&#39;",
+})[character]);
+
 const formatDeleteProtectionReason = (reason) => {
   switch (reason) {
     case "completed":
@@ -28,22 +36,23 @@ const formatDeleteProtectionReason = (reason) => {
     case "attachments":
       return "ordren har vedhæftninger";
     default:
-      return String(reason || "").replace(/_/g, " ");
+      return escapeHtml(String(reason || "").replace(/_/g, " "));
   }
 };
 
 const showProtectedOrderDeleteConfirmation = async (id, protectionPayload, onAfterSubmit = null) => {
   const orderId = String(id);
+  const escapedOrderId = escapeHtml(orderId);
   const reasons = Array.isArray(protectionPayload?.protected_reasons)
     ? protectionPayload.protected_reasons.map(formatDeleteProtectionReason).filter(Boolean)
     : [];
   const reasonText = reasons.length > 0 ? reasons.join(", ") : "ordren indeholder gemte data";
 
   const result = await Swal.fire({
-    title: `Bekræft sletning af ordre #${orderId}`,
+    titleText: `Bekræft sletning af ordre #${orderId}`,
     html: `
       <p>Ordren kan stadig slettes, men kræver ekstra bekræftelse fordi ${reasonText}.</p>
-      <p>Skriv <strong>${orderId}</strong> for at slette ordren.</p>
+      <p>Skriv <strong>${escapedOrderId}</strong> for at slette ordren.</p>
     `,
     input: "text",
     inputAttributes: {
@@ -924,6 +933,13 @@ const assignDraftOrderCustomer = async ({
             console.error(error);
           });
         },
+        resendWashCertificate: async (id) => {
+          return SessionUser.request(
+              Orders.meta.endpoint + "/wash-certificate/resend",
+              "POST",
+              { id: parseInt(id, 10) }
+          ).then((response) => response.data.data);
+        },
         showAttachWashCertificateForm(order_id, onAfterSubmit = null) {
           const normalizedOrderId = Number.parseInt(order_id, 10);
           if (!Number.isInteger(normalizedOrderId) || normalizedOrderId <= 0) {

src/components/session/token/SessionUser/Objects/SelfServeVehicleConditions.vue

@@ -127,6 +127,13 @@ export const SelfServeVehicleConditions = {
     }
   },
   add: async (department, lane, customer_id, reg, question, value, options = {}) => {
+    const safeOptions = {};
+    const normalizedVehicleType = parseInt(options.vehicle_type ?? options.vehicle_type_id);
+
+    if (!Number.isNaN(normalizedVehicleType) && normalizedVehicleType > 0) {
+      safeOptions.vehicle_type = normalizedVehicleType;
+    }
+
     return ObjectsGlobal.add.object(SelfServeVehicleConditions.meta.endpoint, {
       department: parseInt(department),
       lane: parseInt(lane),
@@ -134,7 +141,9 @@ export const SelfServeVehicleConditions = {
       reg: reg,
       question: parseInt(question),
       value: value === "true" || value === true,
-      ...options
+      ...safeOptions,
+      activate_machine: false,
+      sync_relay_state: false
     });
   },
   set: {
@@ -164,7 +173,7 @@ export const SelfServeVehicleConditions = {
     single: async (id) => {
       return ObjectsGlobal.get.object(SelfServeVehicleConditions.meta.endpoint, id);
     },
-    previewAllowed: async (laneId, reg, vehicleTypeId = null) => {
+    previewAllowed: async (laneId, reg, vehicleTypeId, options = {}) => {
       const params = {
         lane_id: parseInt(laneId),
         reg: reg,
@@ -175,11 +184,11 @@ export const SelfServeVehicleConditions = {
         params.vehicle_type = normalizedVehicleTypeId;
       }
 
-      return authenticatedRequest("/department/selfserve/vehicle/allowed", "GET", params)
+      return authenticatedRequest("/department/selfserve/vehicle/allowed", "GET", params, null, null, options)
         .then((response) => response.data.data || response.data);
     },
-    washSummary: async (params = {}) => {
-      return authenticatedRequest("/department/selfserve/washes/summary", "GET", params)
+    washSummary: async (params, options) => {
+      return authenticatedRequest("/department/selfserve/washes/summary", "GET", params || {}, null, null, options || {})
         .then((response) => response.data.data || response.data);
     }
   },

src/components/session/token/superUser/modules/edgegateway/Config.vue

@@ -17,13 +17,15 @@ const normalizeEntries = (entries) => {
   return [];
 };
 
+const SENSITIVE_WRITE_ONLY_KEYS = new Set(["broker_shared_secret"]);
+
 const toConfigPayload = (entries) => {
   const payload = {};
   normalizeEntries(entries).forEach((entry) => {
     if (!entry || !entry.variable) {
       return;
     }
-    payload[entry.variable] = entry.value;
+    payload[entry.variable] = SENSITIVE_WRITE_ONLY_KEYS.has(entry.variable) ? "" : entry.value;
   });
   return payload;
 };
@@ -42,6 +44,11 @@ export const Config = {
   test_broker: async (payload) => testEdgeGatewayBrokerConfig(payload),
   set: async (variable, value) => {
     const currentConfig = await Config.get_config();
+    SENSITIVE_WRITE_ONLY_KEYS.forEach((key) => {
+      if (key !== variable) {
+        delete currentConfig[key];
+      }
+    });
     return Config.set_config({
       ...currentConfig,
       [variable]: value,
@@ -73,7 +80,6 @@ export const Config = {
       set: async (value) => Config.set("broker_auth_mode", value),
     },
     broker_shared_secret: {
-      get: async () => Config.get("broker_shared_secret"),
       set: async (value) => Config.set("broker_shared_secret", value),
     },
   },

src/components/session/token/superUser/modules/selfserve/Config.vue

@@ -61,6 +61,14 @@ export const Config = {
       });
     },
     keys: {
+      dynamic_image_size: {
+        get: async () => {
+          return Config.get("dynamic_image_size");
+        },
+        set: async (value) => {
+          return Config.set("dynamic_image_size", value);
+        },
+      },
       minute_product: {
         get: async () => {
           return Config.get("minute_product");

src/components/session/token/superUser/modules/slack/Config.vue

@@ -0,0 +1,34 @@
+<script>
+import { authenticatedRequest } from "@/components/session/authenticatedRequest.vue";
+
+/**
+ * The Slack -> Config object
+ */
+export const Config = {
+  get: async (variable) => {
+    return authenticatedRequest("/slack/config?variable=" + variable, "GET");
+  },
+  get_all: async () => {
+    return authenticatedRequest("/slack/config", "GET");
+  },
+  set: async (variable, value) => {
+    return authenticatedRequest("/slack/config", "POST", {
+      variable: variable,
+      value: value,
+    });
+  },
+  test_customer_registration_webhook: async () => {
+    return authenticatedRequest("/slack/config/test", "POST", {});
+  },
+  keys: {
+    customer_registration_webhook_url: {
+      get: async () => {
+        return Config.get("customer_registration_webhook_url");
+      },
+      set: async (value) => {
+        return Config.set("customer_registration_webhook_url", value);
+      },
+    },
+  },
+};
+</script>

src/components/session/token/superUser/modules/slack/Slack.vue

@@ -0,0 +1,21 @@
+<script>
+import { Config } from "@/components/session/token/superUser/modules/slack/Config.vue";
+
+/**
+ * The Slack object
+ */
+export const Slack = {
+  meta: {
+    title: "Slack",
+    icon: "fab fa-slack",
+    description: "Slack notifications",
+    endpoint: "/slack/config",
+    config_endpoint: "/configuration/slack",
+    labels: {
+      single: "slack",
+      multiple: "slack",
+    },
+  },
+  config: Config,
+};
+</script>

src/components/session/token/superUserObject.vue

@@ -1,6 +1,7 @@
 <script>
 import { authenticatedRequest } from "@/components/session/authenticatedRequest.vue";
 import { parseError } from "@/components/request/HandleGlobalError.vue";
+import { clearEdgeGatewayWorkspaceCache } from "@/services/edgeGateways.js";
 import { DatabaseSystemObject } from "@/components/session/token/superUser/systemDatabase.vue";
 import { Cron } from "@/components/session/token/superUser/cron.vue";
 import { Economic } from "@/components/session/token/superUser/modules/Economic/Economic.vue";
@@ -27,6 +28,7 @@ import { EdgeGateway } from "@/components/session/token/superUser/modules/edgega
 import { Failover } from "@/components/session/token/superUser/modules/failover/Failover.vue";
 import { Coolify } from "@/components/session/token/superUser/modules/coolify/Coolify.vue";
 import { ReleaseManager } from "@/components/session/token/superUser/modules/releasemanager/ReleaseManager.vue";
+import { Slack } from "@/components/session/token/superUser/modules/slack/Slack.vue";
 
 let qrCodeModulePromise;
 
@@ -71,6 +73,7 @@ export const SuperUserObject = {
     get failover() { return Failover; },
     get coolify() { return Coolify; },
     get releasemanager() { return ReleaseManager; },
+    get slack() { return Slack; },
   },
   /** Intimidate a user */
   intimidate: {
@@ -106,6 +109,7 @@ export const SuperUserObject = {
                 const currentToken = localStorage.getItem("token");
                 localStorage.setItem("superuser_token", currentToken);
                 // Set the token in the local storage
+                clearEdgeGatewayWorkspaceCache();
                 localStorage.setItem("token", response.data.data.token);
                 // Redirect the user to the dashboard
                 window.location = "/";
@@ -143,6 +147,7 @@ export const SuperUserObject = {
       // Get the superuser token
       const superuserToken = localStorage.getItem("superuser_token");
       // Set the token in the local storage
+      clearEdgeGatewayWorkspaceCache();
       localStorage.setItem("token", superuserToken);
       // Clear the superuser token
       localStorage.removeItem("superuser_token");

src/components/shop/POSDepartmentProcess.vue

@@ -3,7 +3,6 @@ import { computed, ref, watch } from "vue";
 import axios from "axios";
 import { API_URL } from "@/config.js";
 import { getScansDepartmentPagination } from "@/components/numberplatescanners/Scans.vue";
-import { useRouter } from "vue-router";
 import { parseError, clearErrors } from "@/components/request/HandleGlobalError.vue";
 import { getNotes, createNote, deleteNote } from "@/components/shop/CustomerNotes.vue";
 import { createOrderItem, getOrderItems, removeOrderItem } from "@/components/shop/OrdersItems.vue";
@@ -131,12 +130,12 @@ export const nextStep = async (options = { isMobile: false, orderCreation: true
     // If the current step is 2, set the product category to addons
     setProductsCategory(4);
     // Set the step to 3 in the query parameters
-    window.history.pushState({}, "", `?id=${order_id.value}&customer_id=${customer_id.value}&step=3`);
+    pushPosRouteState(`id=${order_id.value}&customer_id=${customer_id.value}&step=3`);
   }
   if (step.value === 3) {
     if (normalizedOptions.isMobile === false && doesOrderContainMaterial()) {
       step.value = 4;
-      window.history.pushState({}, "", `?id=${order_id.value}&customer_id=${customer_id.value}&step=4`);
+      pushPosRouteState(`id=${order_id.value}&customer_id=${customer_id.value}&step=4`);
       return;
     }
 
@@ -231,11 +230,7 @@ const toPositiveInteger = (value) => {
 };
 
 const getRouteDepartmentId = () => {
-  try {
-    return toPositiveInteger(useRouter().currentRoute.value.params.departmentId);
-  } catch (error) {
-    return null;
-  }
+  return getWindowPathDepartmentId();
 };
 
 const getSessionUrlDepartmentId = () => {
@@ -320,20 +315,26 @@ export const ensureCurrentOrderDepartment = async (targetDepartmentId = null) =>
   }
 
   try {
-    let currentDepartmentId = null;
-    try {
-      currentDepartmentId = await getCurrentOrderDepartmentId(normalizedOrderId);
-    } catch (error) {
-      currentDepartmentId = null;
-    }
+    const currentDepartmentId = await getCurrentOrderDepartmentId(normalizedOrderId);
     if (currentDepartmentId === normalizedDepartmentId) {
       department_id.value = normalizedDepartmentId;
       return true;
     }
 
-    await SessionUser.objects.orders.set.department_id(normalizedOrderId, normalizedDepartmentId);
-    department_id.value = normalizedDepartmentId;
-    return true;
+    parseError(
+      {
+        response: {
+          data: {
+            data: {
+              message: "Ordren tilhører ikke den valgte afdeling",
+            },
+            message: "Ordren tilhører ikke den valgte afdeling",
+          },
+        },
+      },
+      "stepError"
+    );
+    return false;
   } catch (error) {
     parseError(error, "stepError");
     return false;
@@ -727,9 +728,9 @@ export const restoreStoredPosOrderId = async (
     if (selectedDepartmentId && toPositiveInteger(storedOrder?.department_id) !== selectedDepartmentId) {
       if (options.syncDepartment === true) {
         order_id.value = storedOrderId;
-        const didSyncDepartment = await ensureCurrentOrderDepartment(selectedDepartmentId);
-        if (!didSyncDepartment) {
-          throw new Error("Stored order department could not be changed to current department");
+        const isCurrentDepartment = await ensureCurrentOrderDepartment(selectedDepartmentId);
+        if (!isCurrentDepartment) {
+          throw new Error("Stored order department does not match current department");
         }
       } else {
         throw new Error("Stored order department does not match current department");
@@ -751,7 +752,7 @@ export const reset_all_values = () => {
   // Reset all values to their initial state
   clearActivePosOrderContext({ clearStep: true });
   // Clear the query parameters
-  window.history.pushState({}, "", `?step=1`);
+  pushPosRouteState("step=1");
 };
 
 /** Whenever the reg_1, reg_2 or reg_3 changes, remove any spaces and make the string uppercase */
@@ -762,6 +763,21 @@ const normalizeRegistrationValue = (value) =>
 
 export const isBlankPosMetadataValue = (value) => String(value ?? "").trim().length === 0;
 
+const getPosRoutePath = () => {
+  const normalizedDepartmentId = Number.parseInt(String(department_id.value || ""), 10);
+
+  if (Number.isInteger(normalizedDepartmentId) && normalizedDepartmentId > 0) {
+    return `/admin/${normalizedDepartmentId}/modules/pos`;
+  }
+
+  return window.location.pathname && window.location.pathname !== "/" ? window.location.pathname : "/admin/modules/pos";
+};
+
+export const pushPosRouteState = (queryString) => {
+  const normalizedQueryString = String(queryString || "").replace(/^\?/, "");
+  window.history.pushState({}, "", `${getPosRoutePath()}?${normalizedQueryString}`);
+};
+
 watch([reg_1, reg_2, reg_3], () => {
   reg_1.value = normalizeRegistrationValue(reg_1.value);
   reg_2.value = normalizeRegistrationValue(reg_2.value);
@@ -908,7 +924,7 @@ export const createOrder = async (options = { isMobile: false }) => {
       // Set the order id in the local storage (To be make F5 safe)
       localStorage.setItem("pos_order_id", order_id.value);
       // Set the query parameters
-      window.history.pushState({}, "", `?id=${order_id.value}&customer_id=${customer_id.value}&step=2`);
+      pushPosRouteState(`id=${order_id.value}&customer_id=${customer_id.value}&step=2`);
       return true;
     })
     .catch((error) => {
@@ -1188,6 +1204,7 @@ export const selectScan = (scan) => {
 };
 
 const cached_customer_names = [];
+const activeCustomerSelectionRequests = new Map();
 
 /** Get the customer's name */
 export const getCustomerName = async (customerNumber) => {
@@ -1216,23 +1233,62 @@ export const getCustomerName = async (customerNumber) => {
 
 /** Search, then select customer by customer number */
 export const searchAndSelectCustomer = async (customerNumber, options = {}) => {
+  const normalizedOptions = {
+    forceRefresh: false,
+    ...options,
+  };
+  const normalizedCustomerNumber = resolveCustomerNumber(customerNumber);
+  if (!normalizedCustomerNumber) {
+    return null;
+  }
+
+  const selectedCustomerNumber = getSelectedCustomerNumber();
+  const hasSelectedCustomerData =
+    customer_data.value &&
+    typeof customer_data.value === "object" &&
+    !Array.isArray(customer_data.value) &&
+    Object.keys(customer_data.value).length > 0;
+
+  if (
+    !normalizedOptions.forceRefresh &&
+    selectedCustomerNumber === normalizedCustomerNumber &&
+    hasSelectedCustomerData
+  ) {
+    return customer_data.value;
+  }
+
+  if (!normalizedOptions.forceRefresh && activeCustomerSelectionRequests.has(normalizedCustomerNumber)) {
+    return await activeCustomerSelectionRequests.get(normalizedCustomerNumber);
+  }
+
   // Get the customer data
-  return await authenticatedRequest(`/users/customer?customer_number=${customerNumber}`, "GET")
+  const request = authenticatedRequest(`/users/customer?customer_number=${normalizedCustomerNumber}`, "GET")
     .then((response) => {
       console.log(response);
       const responseData = response?.data?.data ?? {};
       const rawEconomicCustomer = responseData.economic_customer ?? null;
       const normalizedCustomer = normalizeCustomerRecord(rawEconomicCustomer, {
         ...responseData,
-        customerNumber: resolveCustomerNumber(rawEconomicCustomer) ?? resolveCustomerNumber(customerNumber),
+        customerNumber: resolveCustomerNumber(rawEconomicCustomer) ?? normalizedCustomerNumber,
       });
-      selectCustomer(normalizedCustomer, options);
+      selectCustomer(normalizedCustomer, normalizedOptions);
       return normalizedCustomer;
     })
     .catch((error) => {
       console.error(error);
       return null;
+    })
+    .finally(() => {
+      if (activeCustomerSelectionRequests.get(normalizedCustomerNumber) === request) {
+        activeCustomerSelectionRequests.delete(normalizedCustomerNumber);
+      }
     });
+
+  if (!normalizedOptions.forceRefresh) {
+    activeCustomerSelectionRequests.set(normalizedCustomerNumber, request);
+  }
+
+  return await request;
 };
 
 /** Get order items */
@@ -1585,7 +1641,7 @@ export const showDeleteEverythingDialog = () => {
 /** Clear cache */
 export const clearCache = () => {
   // Reset the query parameters
-  window.history.pushState({}, "", `?step=1`);
+  pushPosRouteState("step=1");
   // Clear the customer data
   clearCustomerSelection();
   // Clear the order data
@@ -1972,18 +2028,14 @@ export const getVehiclePlateBookings = (vehiclePlate) => {
   return sortPendingOrderBookings(matchingBookings);
 };
 
-export const ensureVehiclePlateBookingsLoaded = async (vehiclePlate, options = {}) => {
-  const normalizedOptions = {
-    force: false,
-    ...options,
-  };
+export const ensureVehiclePlateBookingsLoaded = async (vehiclePlate, _options = {}) => {
   const normalizedVehiclePlate = normalizeVehiclePlateForBookingSelection(vehiclePlate);
   const currentDepartmentKey = syncPendingBookingsDepartmentState();
   if (!normalizedVehiclePlate || !department_id.value) {
     return [];
   }
 
-  if (!normalizedOptions.force && loadedPendingBookingPlates.has(normalizedVehiclePlate)) {
+  if (loadedPendingBookingPlates.has(normalizedVehiclePlate)) {
     return getVehiclePlateBookings(normalizedVehiclePlate);
   }
 
@@ -2127,7 +2179,7 @@ const getFirstAvailableWashProduct = async () => {
   }
 };
 
-const hydrateSelectedOrderBookingForDesktop = async () => {
+export const hydrateSelectedOrderBookingForDesktop = async () => {
   const normalizedOrderId = toPositiveInteger(order_id.value);
   const normalizedBookingId = toPositiveInteger(selectedOrderBookingId.value);
 
@@ -2210,8 +2262,7 @@ const hydrateSelectedOrderBookingForDesktop = async () => {
       }
     }
 
-    const forcedPrimaryPrice =
-      typeof primaryRawItem?.price === "number" ? Number(primaryRawItem.price) : primaryProduct.price ?? null;
+    const forcedPrimaryPrice = primaryProduct.price ?? null;
     const primaryItemResponse = await createOrderItem(
       normalizedOrderId,
       primaryProduct.id,
@@ -2229,13 +2280,15 @@ const hydrateSelectedOrderBookingForDesktop = async () => {
         continue;
       }
 
+      const secondaryProduct = await fetchOrderBookingProductWithPricing(secondaryProductId);
+
       await createOrderItem(
         normalizedOrderId,
         secondaryProductId,
         Math.max(1, Number.parseInt(String(bookingItem?.quantity ?? 1), 10) || 1),
         relatedPrimaryItemId,
         String(bookingItem?.notes ?? "").trim() || null,
-        typeof bookingItem?.price === "number" ? Number(bookingItem.price) : null
+        secondaryProduct?.price ?? null
       );
     }
 

src/components/viewport/page/footers/MobileFooter.vue

@@ -26,7 +26,7 @@ const pages = {
     to: "/user/wash/start",
     label: "Selv vask",
     icon: "tint",
-    disabled: !IS_DEV,
+    disabled: false,
   },
   bookings: {
     to: "/user/bookings",

src/components/viewport/page/headers/menu/NavigationMenuDepartment.vue

@@ -13,8 +13,7 @@ import {
   getDepartmentSelectionVisibility,
 } from "@/components/viewport/page/headers/ViewportHeaderSettings.vue";
 import {
-  isAccessibleVisibleDepartment,
-  isDepartmentLabelValid,
+  isAccessibleVisibleNamedDepartment,
   sortByDepartmentPriorityOrder,
 } from "@/services/departmentVisibility.js";
 
@@ -35,7 +34,7 @@ const options = computed(() => {
   // Filter out departments the user does not have access to
   return departments.value
     .filter((department: department) => {
-      return isAccessibleVisibleDepartment(department, SessionUser.canAccessAssignedDepartment);
+      return isAccessibleVisibleNamedDepartment(department, SessionUser.canAccessAssignedDepartment);
     })
     .map((department: department) => {
       return {
@@ -56,7 +55,7 @@ const mobileOptions = computed(() => {
 });
 
 const desktopOptions = computed(() => {
-  return sortByDepartmentPriorityOrder(options.value.filter((option) => isDepartmentLabelValid(option.label)));
+  return sortByDepartmentPriorityOrder(options.value);
 });
 
 const selectDepartment = (departmentId: number | string) => {
@@ -92,11 +91,17 @@ const getDistanceToDepartment = (departmentId: number | null, optionList = mobil
     return 0;
   }
   const department = optionList.find((dept) => dept.value === departmentId);
-  if (department && locations.location.value?.coords) {
-    return locations.getDistance(
-      { latitude: locations.location.value.coords.latitude, longitude: locations.location.value.coords.longitude },
-      { latitude: department.latitude, longitude: department.longitude }
+  const currentCoords = locations.normalizeCoordinatePair(locations.location.value?.coords);
+  const departmentCoords = locations.normalizeCoordinatePair(
+    { latitude: department?.latitude, longitude: department?.longitude },
+    { allowZeroPair: false }
+  );
+  if (department && currentCoords && departmentCoords) {
+    const distance = locations.getDistance(
+      currentCoords,
+      departmentCoords
     );
+    return Number.isFinite(distance) ? distance : 0;
   }
   return 0;
 };

src/components/viewport/page/templates/scanner/graphics/ScannerCamera.vue

@@ -1,13 +1,26 @@
 <script setup lang="ts">
 import { ref, onMounted, onUnmounted, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
 
 const emits = defineEmits(['camera-toggled', 'scanner-toggled', 'update:frame']);
+const { t } = useI18n();
 const videoRef = ref<HTMLVideoElement | null>(null);
 const canvasRef = ref<HTMLCanvasElement | null>(null);
 const cameraStream = ref<MediaStream | null>(null);
 const isCameraActive = ref(false);
+const cameraErrorKey = ref('pos.camera_permission_denied');
 import { isCameraMounted, camera } from '@/components/displays/department/pos/steps/mobile/objects/PosDepartmentStepMobileFlow.vue';
 
+const getCameraErrorKey = (err: unknown) => {
+  const errorName = err instanceof DOMException ? err.name : '';
+
+  if (errorName === 'NotFoundError' || errorName === 'DevicesNotFoundError') {
+    return 'pos.no_camera_found';
+  }
+
+  return 'pos.camera_permission_denied';
+};
+
 function startCamera() {
   const constraints = {
     video: {
@@ -45,6 +58,7 @@ function startCamera() {
       })
       .catch((err) => {
         isCameraActive.value = false;
+        cameraErrorKey.value = getCameraErrorKey(err);
         console.error('Camera access error:', err);
       });
 }
@@ -171,8 +185,7 @@ watch(() => isCameraActive.value, (newVal) => {
     ></canvas>
 
     <div v-if="!isCameraActive" class="camera-inactive">
-      <p>Camera is not active.</p>
-      <p>Please enable camera access.</p>
+      <p>{{ t(cameraErrorKey) }}</p>
     </div>
   </div>
 </template>

src/composables/useOrderMetadataAutosave.js

@@ -64,6 +64,7 @@ export const useOrderMetadataAutosave = ({
 
     const requestedValue = normalizeValue(draft.value);
     const sequence = ++nextSequence;
+    let saveCompleted = false;
     isSaving.value = true;
 
     try {
@@ -83,6 +84,8 @@ export const useOrderMetadataAutosave = ({
         await onSaved(savedValue, requestedValue);
       }
 
+      saveCompleted = true;
+
       return true;
     } catch (error) {
       if (typeof onError === "function") {
@@ -95,12 +98,11 @@ export const useOrderMetadataAutosave = ({
     } finally {
       isSaving.value = false;
 
-      if (saveAgainAfterCurrentRequest || isDirty.value) {
-        saveAgainAfterCurrentRequest = false;
+      const shouldSaveAgain = saveAgainAfterCurrentRequest;
+      saveAgainAfterCurrentRequest = false;
 
-        if (isDirty.value) {
-          void persist();
-        }
+      if (saveCompleted && (shouldSaveAgain || isDirty.value) && isDirty.value) {
+        void persist();
       }
     }
   };

src/composables/useSelfServeLogic.js

@@ -1,5 +1,6 @@
-import { computed, ref } from "vue";
+import { computed, getCurrentInstance, onUnmounted, ref } from "vue";
 import { SessionUser } from "@/components/session/token/SessionUser.vue";
+import { safeAttachmentDownloadLink } from "@/services/attachmentDownloadLinks.js";
 
 const normalizeBooleanAnswer = (value) => {
   if (value === true || value === false) {
@@ -270,6 +271,55 @@ const mergeByNumericId = (existingItems, incomingItems) => {
   return merged;
 };
 
+const taskStableKey = (task) =>
+  String(task?.task ?? "")
+    .trim()
+    .toLowerCase();
+
+const mergeTaskSets = (existingTasks, incomingTasks) => {
+  if (!Array.isArray(existingTasks) || existingTasks.length === 0) {
+    return Array.isArray(incomingTasks) ? [...incomingTasks] : [];
+  }
+
+  if (!Array.isArray(incomingTasks) || incomingTasks.length === 0) {
+    return [...existingTasks];
+  }
+
+  const usedExistingIndexes = new Set();
+
+  return incomingTasks.map((incomingTask) => {
+    const incomingId = extractTaskId(incomingTask);
+    let existingIndex = -1;
+
+    if (incomingId) {
+      existingIndex = existingTasks.findIndex((task) => extractTaskId(task) === incomingId);
+    } else {
+      const incomingKey = taskStableKey(incomingTask);
+      existingIndex = existingTasks.findIndex(
+        (task, index) => !usedExistingIndexes.has(index) && taskStableKey(task) === incomingKey
+      );
+    }
+
+    if (existingIndex === -1) {
+      return incomingTask;
+    }
+
+    usedExistingIndexes.add(existingIndex);
+    const existingTask = existingTasks[existingIndex];
+
+    return {
+      ...existingTask,
+      ...incomingTask,
+      id: incomingTask.id || existingTask.id,
+      task_id: incomingTask.task_id || existingTask.task_id,
+      attachments: Array.isArray(incomingTask.attachments) && incomingTask.attachments.length > 0
+        ? incomingTask.attachments
+        : existingTask.attachments,
+      _attachmentsLoaded: incomingTask._attachmentsLoaded || existingTask._attachmentsLoaded,
+    };
+  });
+};
+
 export function useSelfServeLogic() {
   const loading = ref(false);
   const requestError = ref(null);
@@ -295,19 +345,94 @@ export function useSelfServeLogic() {
   const lastResolvedVehicleTypeId = ref(null);
   const summaryVisibleQuestionIds = ref([]);
   const summaryQuestionOrder = ref({});
-  const latestFetchRequestId = ref(0);
+  const activeFetchAbortController = ref(null);
+  const latestMutationRequestId = ref(0);
+  const latestSuccessfulFetchKey = ref(null);
+  const inFlightFetchKey = ref(null);
 
-  const beginFetchRequest = () => {
-    latestFetchRequestId.value += 1;
-    return latestFetchRequestId.value;
+  const createFetchKey = (departmentId, vehicleTypeId, laneId, reg) => {
+    const normalizedDepartmentId = parseInt(departmentId);
+    const normalizedLaneId = parseInt(laneId);
+    const normalizedReg = String(reg || "").trim().toUpperCase();
+    const normalizedVehicleTypeId = parseInt(vehicleTypeId);
+    const vehicleTypeKey = !Number.isNaN(normalizedVehicleTypeId) && normalizedVehicleTypeId > 0
+      ? normalizedVehicleTypeId
+      : "";
+
+    if (
+      Number.isNaN(normalizedDepartmentId)
+      || normalizedDepartmentId <= 0
+      || Number.isNaN(normalizedLaneId)
+      || normalizedLaneId <= 0
+      || normalizedReg.length < 2
+    ) {
+      return null;
+    }
+
+    return [normalizedDepartmentId, normalizedLaneId, normalizedReg, vehicleTypeKey].join("|");
   };
 
-  const isFetchRequestActive = (requestId) => (
-    requestId === null
-    || requestId === undefined
-    || requestId === latestFetchRequestId.value
+  const isCanceledRequest = (error) => (
+    error?.code === "ERR_CANCELED"
+    || error?.name === "CanceledError"
+    || error?.name === "AbortError"
   );
 
+  const abortActiveFetchRequest = () => {
+    // Abort the previous self-serve read before a newer one starts; only the live signal may write state.
+    activeFetchAbortController.value?.abort();
+    activeFetchAbortController.value = null;
+  };
+
+  const beginFetchRequest = (externalSignal = null) => {
+    abortActiveFetchRequest();
+    if (typeof AbortController !== "function") {
+      return null;
+    }
+
+    const abortController = new AbortController();
+    if (externalSignal) {
+      if (externalSignal.aborted) {
+        abortController.abort();
+      } else {
+        externalSignal.addEventListener("abort", () => abortController.abort(), { once: true });
+      }
+    }
+    activeFetchAbortController.value = abortController;
+    return abortController;
+  };
+
+  const isFetchSignalActive = (signal = null) => (
+    !signal || (!signal.aborted && activeFetchAbortController.value?.signal === signal)
+  );
+
+  const requestPreviewAllowed = (laneId, reg, vehicleTypeId = null, signal = null) => {
+    const previewAllowed = SessionUser.objects.self_serve_vehicle_conditions.get.previewAllowed;
+    if (!signal || previewAllowed.length < 3) {
+      return vehicleTypeId
+        ? previewAllowed(laneId, reg, vehicleTypeId)
+        : previewAllowed(laneId, reg);
+    }
+
+    return previewAllowed(laneId, reg, vehicleTypeId, { signal });
+  };
+
+  const requestWashSummary = (params = {}, signal = null) => {
+    const washSummary = SessionUser.objects.self_serve_vehicle_conditions.get.washSummary;
+    if (!signal || washSummary.length < 2) {
+      return washSummary(params);
+    }
+
+    return washSummary(params, { signal });
+  };
+
+  const beginMutationRequest = () => {
+    latestMutationRequestId.value += 1;
+    return latestMutationRequestId.value;
+  };
+
+  const isMutationRequestActive = (requestId) => requestId === latestMutationRequestId.value;
+
   const setSummaryVisibleQuestions = (questionList = []) => {
     const normalizedIds = (Array.isArray(questionList) ? questionList : [])
       .map((question) => parseInt(question?.id ?? 0))
@@ -414,8 +539,8 @@ export function useSelfServeLogic() {
   };
 
   const applyPreviewData = async (previewData, options = {}) => {
-    const { mergeQuestions = false, requestId = null } = options;
-    if (!isFetchRequestActive(requestId)) {
+    const { mergeQuestions = false, signal = null } = options;
+    if (!isFetchSignalActive(signal)) {
       return false;
     }
 
@@ -424,6 +549,10 @@ export function useSelfServeLogic() {
     machineType.value = previewData?.machine_type || machineType.value;
     vehicle.value = previewData?.vehicle || null;
     session.value = previewData?.session || session.value;
+    if (!previewData?.session?.id) {
+      summary.value = null;
+      events.value = [];
+    }
     if (Object.prototype.hasOwnProperty.call(previewData || {}, "config_version_id")) {
       configVersionId.value = previewData?.config_version_id ?? null;
     }
@@ -442,6 +571,7 @@ export function useSelfServeLogic() {
 
     questions.value = nextQuestions;
     answers.value = buildAnswersMap(nextQuestions);
+    setSummaryVisibleQuestions(nextQuestions);
 
     const normalizedConditions = Array.isArray(previewData?.conditions)
       ? previewData.conditions.map(normalizeCondition)
@@ -461,19 +591,21 @@ export function useSelfServeLogic() {
       ? previewData.tasks.map(normalizeTask).sort((a, b) => a.order_priority - b.order_priority)
       : [];
 
+    tasks.value = normalizedTasks;
+    applyAllowedServices(previewData);
+
     const hydratedTasks = await hydrateTaskAttachments(normalizedTasks);
-    if (!isFetchRequestActive(requestId)) {
+    if (!isFetchSignalActive(signal)) {
       return false;
     }
 
     tasks.value = hydratedTasks;
-    applyAllowedServices(previewData);
     return true;
   };
 
   const applySummaryData = async (summaryData, options = {}) => {
-    const { requestId = null } = options;
-    if (!isFetchRequestActive(requestId)) {
+    const { signal = null } = options;
+    if (!isFetchSignalActive(signal)) {
       return false;
     }
 
@@ -512,9 +644,10 @@ export function useSelfServeLogic() {
       const normalizedTasks = summaryData.tasks
         .map(normalizeTask)
         .sort((a, b) => a.order_priority - b.order_priority);
+      const mergedTasks = mergeTaskSets(tasks.value, normalizedTasks);
 
-      const hydratedTasks = await hydrateTaskAttachments(normalizedTasks);
-      if (!isFetchRequestActive(requestId)) {
+      const hydratedTasks = await hydrateTaskAttachments(mergedTasks);
+      if (!isFetchSignalActive(signal)) {
         return false;
       }
 
@@ -526,7 +659,7 @@ export function useSelfServeLogic() {
   };
 
   const downloadAttachment = async (taskId, attachmentId, attachment = null) => {
-    const existingDownloadLink = attachment?.download_link || null;
+    const existingDownloadLink = safeAttachmentDownloadLink(attachment?.download_link);
     if (existingDownloadLink) {
       window.open(existingDownloadLink, "_blank", "noopener");
       return;
@@ -534,10 +667,9 @@ export function useSelfServeLogic() {
 
     try {
       const response = await SessionUser.objects.self_serve_tasks.attachments.download(taskId, attachmentId);
-      if (response?.data?.download_link) {
-        window.open(response.data.download_link, "_blank", "noopener");
-      } else if (response?.download_link) {
-        window.open(response.download_link, "_blank", "noopener");
+      const downloadLink = safeAttachmentDownloadLink(response?.data?.download_link || response?.download_link);
+      if (downloadLink) {
+        window.open(downloadLink, "_blank", "noopener");
       }
     } catch (error) {
       console.error("Error downloading attachment:", error);
@@ -545,7 +677,7 @@ export function useSelfServeLogic() {
   };
 
   const fetchWashSummary = async (params = {}, manageLoading = true, options = {}) => {
-    const { requestId = null } = options;
+    const { signal = null } = options;
     if (!params.session_id && !(params.lane_id && params.reg)) {
       return null;
     }
@@ -555,30 +687,39 @@ export function useSelfServeLogic() {
     }
 
     try {
-      const summaryData = await SessionUser.objects.self_serve_vehicle_conditions.get.washSummary(params);
-      const didApply = await applySummaryData(summaryData, { requestId });
+      const summaryData = await requestWashSummary(params, signal);
+      const didApply = await applySummaryData(summaryData, { signal });
       if (!didApply) {
         return null;
       }
       requestError.value = null;
       return summaryData;
     } catch (error) {
+      if (isCanceledRequest(error)) {
+        return null;
+      }
       console.error("Error fetching self-serve summary:", error);
-      if (isFetchRequestActive(requestId)) {
+      if (isFetchSignalActive(signal)) {
         requestError.value = extractErrorMessage(error, "Kunne ikke hente vaskestatus. Prøv igen.");
       }
       return null;
     } finally {
-      if (manageLoading) {
+      if (manageLoading && isFetchSignalActive(signal)) {
         loading.value = false;
       }
     }
   };
 
-  const fetchSelfServeData = async (_departmentId, _vehicleTypeId, laneId = null, reg = null) => {
-    const requestId = beginFetchRequest();
+  const fetchSelfServeData = async (_departmentId, _vehicleTypeId, laneId = null, reg = null, options = {}) => {
+    const fetchKey = createFetchKey(_departmentId, _vehicleTypeId, laneId, reg);
+    if (!options.force && fetchKey && (fetchKey === latestSuccessfulFetchKey.value || fetchKey === inFlightFetchKey.value)) {
+      return null;
+    }
 
     if (!laneId || !reg || reg.trim().length < 2) {
+      abortActiveFetchRequest();
+      latestSuccessfulFetchKey.value = null;
+      inFlightFetchKey.value = null;
       preview.value = null;
       summary.value = null;
       session.value = null;
@@ -604,8 +745,11 @@ export function useSelfServeLogic() {
       return null;
     }
 
+    const abortController = beginFetchRequest(options.signal || null);
+    const signal = abortController?.signal || null;
     loading.value = true;
     requestError.value = null;
+    inFlightFetchKey.value = fetchKey;
     try {
       const normalizedReg = reg.trim().toUpperCase();
       const normalizedVehicleTypeId = parseInt(_vehicleTypeId);
@@ -620,18 +764,18 @@ export function useSelfServeLogic() {
       const contextKey = `${parseInt(laneId)}:${normalizedReg}:${contextVehicleTypeKey}`;
       const shouldMergeQuestions = lastPreviewContextKey.value === contextKey;
       const previewData = hasVehicleTypeOverride
-        ? await SessionUser.objects.self_serve_vehicle_conditions.get.previewAllowed(laneId, normalizedReg, normalizedVehicleTypeId)
-        : await SessionUser.objects.self_serve_vehicle_conditions.get.previewAllowed(laneId, normalizedReg);
+        ? await requestPreviewAllowed(laneId, normalizedReg, normalizedVehicleTypeId, signal)
+        : await requestPreviewAllowed(laneId, normalizedReg, null, signal);
 
-      if (!isFetchRequestActive(requestId)) {
+      if (!isFetchSignalActive(signal)) {
         return null;
       }
 
       const didApplyPreview = await applyPreviewData(previewData, {
         mergeQuestions: shouldMergeQuestions,
-        requestId,
+        signal,
       });
-      if (!didApplyPreview || !isFetchRequestActive(requestId)) {
+      if (!didApplyPreview || !isFetchSignalActive(signal)) {
         return null;
       }
 
@@ -646,11 +790,11 @@ export function useSelfServeLogic() {
         summaryData = await fetchWashSummary(
           { session_id: previewData.session.id },
           false,
-          { requestId }
+          { signal }
         );
       }
 
-      if (!isFetchRequestActive(requestId)) {
+      if (!isFetchSignalActive(signal)) {
         return null;
       }
 
@@ -672,9 +816,9 @@ export function useSelfServeLogic() {
         const fallbackSummary = await fetchWashSummary(
           fallbackSummaryParams,
           false,
-          { requestId }
+          { signal }
         );
-        if (!isFetchRequestActive(requestId)) {
+        if (!isFetchSignalActive(signal)) {
           return null;
         }
 
@@ -683,19 +827,31 @@ export function useSelfServeLogic() {
       }
 
       // If summary is not available yet, keep the preview list visible so the Questions step is not empty.
-      if (!hasSummaryQuestions && isFetchRequestActive(requestId)) {
+      if (!hasSummaryQuestions && isFetchSignalActive(signal)) {
         setSummaryVisibleQuestions(questions.value);
       }
 
+      if (isFetchSignalActive(signal)) {
+        latestSuccessfulFetchKey.value = fetchKey;
+      }
+
       return previewData;
     } catch (error) {
+      if (isCanceledRequest(error)) {
+        return null;
+      }
       console.error("Error fetching self-serve preview:", error);
-      if (isFetchRequestActive(requestId)) {
+      if (isFetchSignalActive(signal)) {
         requestError.value = extractErrorMessage(error);
       }
       return null;
     } finally {
-      if (isFetchRequestActive(requestId)) {
+      const isCurrentFetch = !abortController || activeFetchAbortController.value === abortController;
+      if (isCurrentFetch) {
+        if (inFlightFetchKey.value === fetchKey) {
+          inFlightFetchKey.value = null;
+        }
+        activeFetchAbortController.value = null;
         loading.value = false;
       }
     }
@@ -706,6 +862,7 @@ export function useSelfServeLogic() {
       return null;
     }
 
+    const mutationRequestId = beginMutationRequest();
     loading.value = true;
     try {
       const normalizedReg = reg.trim().toUpperCase();
@@ -733,6 +890,10 @@ export function useSelfServeLogic() {
       const payload = response?.data?.data || response?.data || response || {};
       const responseSummary = payload?.selfserve || null;
 
+      if (!isMutationRequestActive(mutationRequestId)) {
+        return payload;
+      }
+
       answers.value = {
         ...answers.value,
         [parseInt(questionId)]: value,
@@ -749,7 +910,10 @@ export function useSelfServeLogic() {
         updateResolvedVehicleTypeId(responseSummary, responseSummary?.session);
       }
 
-      await fetchSelfServeData(departmentId, refreshVehicleTypeId, laneId, normalizedReg);
+      await fetchSelfServeData(departmentId, refreshVehicleTypeId, laneId, normalizedReg, { force: true });
+      if (!isMutationRequestActive(mutationRequestId)) {
+        return payload;
+      }
       answers.value = {
         ...answers.value,
         [parseInt(questionId)]: value,
@@ -757,10 +921,14 @@ export function useSelfServeLogic() {
       return payload;
     } catch (error) {
       console.error("Error synchronizing vehicle answer:", error);
-      requestError.value = extractErrorMessage(error, "Kunne ikke gemme svaret. Prøv igen.");
+      if (isMutationRequestActive(mutationRequestId)) {
+        requestError.value = extractErrorMessage(error, "Kunne ikke gemme svaret. Prøv igen.");
+      }
       throw error;
     } finally {
-      loading.value = false;
+      if (isMutationRequestActive(mutationRequestId)) {
+        loading.value = false;
+      }
     }
   };
 
@@ -769,6 +937,7 @@ export function useSelfServeLogic() {
       return { deletedCount: 0 };
     }
 
+    const mutationRequestId = beginMutationRequest();
     loading.value = true;
     try {
       const normalizedReg = reg.trim().toUpperCase();
@@ -804,6 +973,10 @@ export function useSelfServeLogic() {
         SessionUser.objects.self_serve_vehicle_conditions.delete(conditionId)
       )));
 
+      if (!isMutationRequestActive(mutationRequestId)) {
+        return { deletedCount: conditionIdsToDelete.length };
+      }
+
       // Force a non-merge refresh so cleared answers are not kept from local state.
       lastPreviewContextKey.value = null;
       const refreshVehicleTypeCandidate = vehicleTypeId !== null && vehicleTypeId !== undefined
@@ -814,15 +987,19 @@ export function useSelfServeLogic() {
         ? normalizedRefreshVehicleTypeId
         : null;
 
-      await fetchSelfServeData(departmentId, refreshVehicleTypeId, parseInt(laneId), normalizedReg);
+      await fetchSelfServeData(departmentId, refreshVehicleTypeId, parseInt(laneId), normalizedReg, { force: true });
 
       return { deletedCount: conditionIdsToDelete.length };
     } catch (error) {
       console.error("Error clearing self-serve answers:", error);
-      requestError.value = extractErrorMessage(error, "Kunne ikke nulstille svar. Prøv igen.");
+      if (isMutationRequestActive(mutationRequestId)) {
+        requestError.value = extractErrorMessage(error, "Kunne ikke nulstille svar. Prøv igen.");
+      }
       throw error;
     } finally {
-      loading.value = false;
+      if (isMutationRequestActive(mutationRequestId)) {
+        loading.value = false;
+      }
     }
   };
 
@@ -984,9 +1161,27 @@ export function useSelfServeLogic() {
     return activeTaskServices.value.includes(serviceName);
   };
 
-  const updateLaneAllowedServices = async (laneId) => {
+  const updateLaneAllowedServices = async (laneId, options = {}) => {
     if (!laneId) return;
-    const taskIds = activeTasks.value.map((task) => extractTaskId(task)).filter(Boolean);
+    const hasTaskIdsOverride = Array.isArray(options.taskIds);
+    const activeTaskIds = hasTaskIdsOverride
+      ? options.taskIds.map((taskId) => parseInt(taskId)).filter(Boolean)
+      : activeTasks.value.map((task) => extractTaskId(task)).filter(Boolean);
+    const taskIds = hasTaskIdsOverride || activeTaskIds.length > 0
+      ? activeTaskIds
+      : tasks.value.map((task) => extractTaskId(task)).filter(Boolean);
+
+    if (taskIds.length === 0) {
+      requestError.value = null;
+      return {
+        success: true,
+        data: {
+          lane_id: parseInt(laneId),
+          allowed_services: allowedServices.value,
+          skipped_empty_task_sync: true,
+        },
+      };
+    }
 
     try {
       const response = await SessionUser.request('/modules/self-serve/lane/services/allowed', 'post', {
@@ -1032,6 +1227,12 @@ export function useSelfServeLogic() {
     }
   };
 
+  if (getCurrentInstance()) {
+    onUnmounted(() => {
+      abortActiveFetchRequest();
+    });
+  }
+
   return {
     loading,
     error: requestError,
@@ -1049,6 +1250,7 @@ export function useSelfServeLogic() {
     answers,
     completedTasks,
     allowedServices,
+    resolvedVehicleTypeId: lastResolvedVehicleTypeId,
     configVersionId,
     evaluationTrace,
     visibleQuestions,
@@ -1060,6 +1262,7 @@ export function useSelfServeLogic() {
     allowed,
     fetchSelfServeData,
     fetchWashSummary,
+    cancelSelfServeFetch: abortActiveFetchRequest,
     syncVehicleAnswer,
     clearVehicleAnswers,
     evaluateRule,

src/composables/useWashDepartments.js

@@ -2,12 +2,32 @@ import { computed, nextTick, onUnmounted, ref, watch } from "vue";
 import { getDepartmentsGuest } from "@/components/pagination/departmentTabs.vue";
 import { locations } from "@/components/displays/department/pos/steps/mobile/objects/PosDepartmentStepMobileFlow.vue";
 
-const isLaneSelfServeEnabled = (lane) => !(
-  lane?.selfserve_enabled === false
-  || lane?.selfserve_enabled === 0
-  || lane?.selfserve_enabled === "0"
-  || ["false", "off", "no"].includes(String(lane?.selfserve_enabled ?? "").trim().toLowerCase())
-);
+const isLaneSelfServeEnabled = (lane) =>
+  !(
+    lane?.selfserve_enabled === false ||
+    lane?.selfserve_enabled === 0 ||
+    lane?.selfserve_enabled === "0" ||
+    ["false", "off", "no"].includes(
+      String(lane?.selfserve_enabled ?? "")
+        .trim()
+        .toLowerCase()
+    )
+  );
+
+const hasSelfServeEnabledLane = (department) =>
+  department?.self_serve_enabled === true && (department.lanes || []).some(isLaneSelfServeEnabled);
+
+const normalizeLocationCoordinates = (locationValue = locations.location.value) =>
+  locations.normalizeCoordinatePair(locationValue?.coords);
+
+const normalizeDepartmentCoordinates = (department) =>
+  locations.normalizeCoordinatePair(
+    {
+      latitude: department?.latitude,
+      longitude: department?.longitude,
+    },
+    { allowZeroPair: false }
+  );
 
 const toDepartmentViewModel = (department, distance = null) => ({
   id: department.id,
@@ -18,12 +38,22 @@ const toDepartmentViewModel = (department, distance = null) => ({
   self_serve_enabled: department.self_serve_enabled,
 });
 
+const extractDepartmentFetchErrorMessage = (error) => {
+  const candidates = [
+    error?.response?.data?.data?.message,
+    error?.response?.data?.message,
+    error?.response?.data?.error,
+    error?.message,
+  ];
+
+  return (
+    candidates.find((candidate) => typeof candidate === "string" && candidate.trim() !== "") ||
+    "Kunne ikke hente vaskeafdelinger. Prøv igen."
+  );
+};
+
 export function useWashDepartments(options = {}) {
-  const {
-    includeLanes = false,
-    refreshIntervalMs = 0,
-    canAccessSuperUser = () => false,
-  } = options;
+  const { includeLanes = false, refreshIntervalMs = 0, canAccessSuperUser = () => false } = options;
 
   const guestDepartments = ref([]);
   const nearestDepartment = ref(null);
@@ -31,6 +61,8 @@ export function useWashDepartments(options = {}) {
   const forceNearestDepartmentEvaluationId = ref(0);
   const isSearchingDepartments = ref(false);
   const lastDepartmentFetchTime = ref(null);
+  const departmentFetchError = ref(null);
+  const departmentSelectionStrategy = ref(null);
 
   let refreshInterval = null;
 
@@ -57,13 +89,25 @@ export function useWashDepartments(options = {}) {
     return nearestDepartment.value.self_serve_enabled === true;
   });
 
-  const buildGuestDepartmentParams = () => (
-    includeLanes ? { include_lanes: true } : {}
-  );
+  const isDepartmentSelectionDistanceBased = computed(() => departmentSelectionStrategy.value === "distance");
+
+  const isDepartmentSelectionFallbackBased = computed(() => departmentSelectionStrategy.value === "fallback");
+
+  const hasLocationCoordinates = (locationValue = locations.location.value) =>
+    normalizeLocationCoordinates(locationValue) !== null;
+
+  const buildGuestDepartmentParams = () => (includeLanes ? { include_lanes: true } : {});
 
   const fetchDepartments = async () => {
-    guestDepartments.value = await getDepartmentsGuest(buildGuestDepartmentParams());
-    lastDepartmentFetchTime.value = Date.now();
+    try {
+      guestDepartments.value = await getDepartmentsGuest(buildGuestDepartmentParams());
+      lastDepartmentFetchTime.value = Date.now();
+      departmentFetchError.value = null;
+    } catch (error) {
+      departmentFetchError.value = extractDepartmentFetchErrorMessage(error);
+      console.warn("Failed to fetch wash departments:", error);
+    }
+
     evaluateLocationDepartments(locations.location.value);
     return guestDepartments.value;
   };
@@ -74,83 +118,112 @@ export function useWashDepartments(options = {}) {
     }
 
     const currentTime = Date.now();
-    if (
-      !lastDepartmentFetchTime.value
-      || (currentTime - lastDepartmentFetchTime.value) >= refreshIntervalMs
-    ) {
+    if (!lastDepartmentFetchTime.value || currentTime - lastDepartmentFetchTime.value >= refreshIntervalMs) {
       return fetchDepartments();
     }
 
     return guestDepartments.value;
   };
 
-  const getForcedDepartment = () => guestDepartments.value.find(
-    (department) => department.id === forceNearestDepartmentEvaluationId.value
-  );
+  const getForcedDepartment = () =>
+    guestDepartments.value.find((department) => department.id === forceNearestDepartmentEvaluationId.value);
 
   const evaluateLocationDepartments = (locationValue = locations.location.value) => {
     if (isForcingNearestDepartment.value && forceNearestDepartmentEvaluationId.value) {
       const forcedDepartment = getForcedDepartment();
       if (forcedDepartment) {
         nearestDepartment.value = toDepartmentViewModel(forcedDepartment);
+        departmentSelectionStrategy.value = "forced";
         return nearestDepartment.value;
       }
     }
 
+    if (guestDepartments.value.length === 0) {
+      nearestDepartment.value = null;
+      departmentSelectionStrategy.value = null;
+      return nearestDepartment.value;
+    }
+
+    if (!hasLocationCoordinates(locationValue)) {
+      const fallbackDepartment = guestDepartments.value.find(hasSelfServeEnabledLane);
+      nearestDepartment.value = fallbackDepartment ? toDepartmentViewModel(fallbackDepartment) : null;
+      departmentSelectionStrategy.value = fallbackDepartment ? "fallback" : null;
+      return nearestDepartment.value;
+    }
+
+    const from = normalizeLocationCoordinates(locationValue);
     let currentNearestDepartment = {
       id: null,
       distance: Infinity,
     };
 
     guestDepartments.value.forEach((department) => {
-      if (!locationValue?.coords) {
+      const to = normalizeDepartmentCoordinates(department);
+      if (!from || !to) {
         return;
       }
 
-      const from = {
-        latitude: locationValue.coords.latitude,
-        longitude: locationValue.coords.longitude,
-      };
-      const to = {
-        latitude: department.latitude,
-        longitude: department.longitude,
-      };
       const distance = locations.getDistance(from, to);
 
-      if (distance < currentNearestDepartment.distance) {
+      if (Number.isFinite(distance) && distance < currentNearestDepartment.distance) {
         currentNearestDepartment = toDepartmentViewModel(department, distance);
       }
     });
 
     if (currentNearestDepartment.id) {
       nearestDepartment.value = currentNearestDepartment;
+      departmentSelectionStrategy.value = "distance";
+      return nearestDepartment.value;
+    }
+
+    const fallbackDepartment =
+      guestDepartments.value.find((department) => department.self_serve_enabled === true) || guestDepartments.value[0];
+    if (fallbackDepartment) {
+      nearestDepartment.value = toDepartmentViewModel(fallbackDepartment);
+      departmentSelectionStrategy.value = "fallback";
+    } else {
+      nearestDepartment.value = null;
+      departmentSelectionStrategy.value = null;
     }
 
     return nearestDepartment.value;
   };
 
   const orderDepartmentsByDistance = (departmentsList = guestDepartments.value) => {
-    if (!locations.location.value?.coords) {
+    const currentCoords = normalizeLocationCoordinates(locations.location.value);
+    if (!currentCoords) {
       return departmentsList;
     }
 
+    const distanceFromCurrentLocation = (department) => {
+      const departmentCoords = normalizeDepartmentCoordinates(department);
+      if (!departmentCoords) {
+        return Number.POSITIVE_INFINITY;
+      }
+
+      return locations.getDistance(currentCoords, departmentCoords);
+    };
+
     return departmentsList.slice().sort((departmentA, departmentB) => {
-      const currentCoords = locations.location.value.coords;
-      const distanceA = locations.getDistance(
-        { latitude: currentCoords.latitude, longitude: currentCoords.longitude },
-        { latitude: departmentA.latitude, longitude: departmentA.longitude }
-      );
-      const distanceB = locations.getDistance(
-        { latitude: currentCoords.latitude, longitude: currentCoords.longitude },
-        { latitude: departmentB.latitude, longitude: departmentB.longitude }
-      );
+      const distanceA = distanceFromCurrentLocation(departmentA);
+      const distanceB = distanceFromCurrentLocation(departmentB);
+
+      if (!Number.isFinite(distanceA) && !Number.isFinite(distanceB)) {
+        return 0;
+      }
+      if (!Number.isFinite(distanceA)) {
+        return 1;
+      }
+      if (!Number.isFinite(distanceB)) {
+        return -1;
+      }
 
       return distanceA - distanceB;
     });
   };
 
   const startDepartmentSearch = () => {
-    if (!canAccessSuperUser()) {
+    if (!canAccessSuperUser() && hasLocationCoordinates()) {
       return;
     }
 
@@ -191,19 +264,30 @@ export function useWashDepartments(options = {}) {
     }
   };
 
-  watch(() => guestDepartments.value, () => {
-    evaluateLocationDepartments(locations.location.value);
-  }, { deep: true });
-
-  watch(() => locations.location.value, (newValue) => {
-    evaluateLocationDepartments(newValue);
-  }, { deep: true });
-
-  watch(() => isSearchingDepartments.value, (isSearching) => {
-    if (!isSearching) {
+  watch(
+    () => guestDepartments.value,
+    () => {
       evaluateLocationDepartments(locations.location.value);
+    },
+    { deep: true }
+  );
+
+  watch(
+    () => locations.location.value,
+    (newValue) => {
+      evaluateLocationDepartments(newValue);
+    },
+    { deep: true }
+  );
+
+  watch(
+    () => isSearchingDepartments.value,
+    (isSearching) => {
+      if (!isSearching) {
+        evaluateLocationDepartments(locations.location.value);
+      }
     }
-  });
+  );
 
   onUnmounted(() => {
     stopAutoRefresh();
@@ -216,6 +300,10 @@ export function useWashDepartments(options = {}) {
     forceNearestDepartmentEvaluationId,
     isSearchingDepartments,
     lastDepartmentFetchTime,
+    departmentFetchError,
+    departmentSelectionStrategy,
+    isDepartmentSelectionDistanceBased,
+    isDepartmentSelectionFallbackBased,
     availableProductIds,
     doesCurrentDepartmentSelectionHaveSelfServeEnabled,
     fetchDepartments,

src/composables/useWashFlowState.js

@@ -7,6 +7,11 @@ export const WASH_STEPS = {
   COMPLETED: 5,
 };
 
+const normalizeLaneId = (value) => {
+  const normalized = parseInt(String(value ?? ""), 10);
+  return Number.isNaN(normalized) || normalized <= 0 ? null : normalized;
+};
+
 export function useWashFlowState(options) {
   const {
     currentStep,
@@ -14,7 +19,7 @@ export function useWashFlowState(options) {
     customerNumberInput,
     licensePlateInput,
     vehicleTypeSelect,
-    availableProductIds,
+    isCustomerNumberRequired,
     radioLaneOption,
     nearestDepartment,
     allVisibleQuestionsAnswered,
@@ -34,6 +39,17 @@ export function useWashFlowState(options) {
     activeTasks.value.length > 0 ? steps.TASKS : steps.WASH_IN_PROGRESS
   );
 
+  const getSelectedLaneId = () => normalizeLaneId(radioLaneOption.value);
+
+  const getSelectedLane = () => {
+    const selectedLaneId = getSelectedLaneId();
+    if (selectedLaneId === null) {
+      return null;
+    }
+
+    return nearestDepartment.value?.lanes.find((lane) => normalizeLaneId(lane.id) === selectedLaneId) || null;
+  };
+
   const clickableSteps = {
     [steps.VEHICLE]: () => {
       if (washInProgress.value) {
@@ -41,16 +57,15 @@ export function useWashFlowState(options) {
       }
 
       const selectedVehicleTypeId = vehicleTypeSelect.value;
-      const allowedProductIds = new Set((availableProductIds.value || []).map((productId) => String(productId)));
-      const hasAllowedVehicleType = selectedVehicleTypeId !== null
-        && selectedVehicleTypeId !== undefined
-        && allowedProductIds.has(String(selectedVehicleTypeId));
+      const hasSelectedVehicleType = selectedVehicleTypeId !== null && selectedVehicleTypeId !== undefined;
       const customerNumberValue = customerNumberInput.value;
-      const customerNumberValid = customerNumberValue === null
+      const requiresCustomerNumber = isCustomerNumberRequired?.value ?? false;
+      const customerNumberValid = !requiresCustomerNumber
+        || customerNumberValue === null
         || customerNumberValue === undefined
         || String(customerNumberValue).trim() !== "";
       const licensePlateValid = !!(licensePlateInput.value && licensePlateInput.value.trim() !== "");
-      if (!hasAllowedVehicleType) {
+      if (!hasSelectedVehicleType) {
         return false;
       }
 
@@ -103,7 +118,7 @@ export function useWashFlowState(options) {
     }
 
     if (currentStep.value === steps.SELECT_LANE) {
-      const selectedLane = nearestDepartment.value?.lanes.find((lane) => lane.id === radioLaneOption.value);
+      const selectedLane = getSelectedLane();
       if (!selectedLane || !isLaneAvailable(selectedLane)) {
         return true;
       }
@@ -133,9 +148,10 @@ export function useWashFlowState(options) {
   const handleConfirmNext = async () => {
     if (currentStep.value === steps.QUESTIONS) {
       editAnswers.value = false;
-      if (radioLaneOption.value && radioLaneOption.value !== "Any") {
+      const selectedLaneId = getSelectedLaneId();
+      if (selectedLaneId !== null) {
         try {
-          await updateLaneAllowedServices(radioLaneOption.value);
+          await updateLaneAllowedServices(selectedLaneId);
         } catch {
           return;
         }
@@ -150,8 +166,9 @@ export function useWashFlowState(options) {
         return;
       }
 
+      const selectedLaneId = getSelectedLaneId() ?? radioLaneOption.value;
       await onStartWash(
-        radioLaneOption.value,
+        selectedLaneId,
         licensePlateInput.value,
         customerNumberInput.value,
         targetStepForStart()

src/composables/useWashSessionActions.js

@@ -70,7 +70,10 @@ export function useWashSessionActions(options) {
 
   const isAlreadyStoppedStopError = (message) => {
     const normalized = String(message || "").toLowerCase();
-    return normalized.includes("cannot stop lane") && normalized.includes("not occupied");
+    return (
+      normalized.includes("not occupied") &&
+      (normalized.includes("cannot stop lane") || normalized.includes("cannot invoice"))
+    );
   };
 
   const clearActiveWashState = () => {
@@ -170,10 +173,15 @@ export function useWashSessionActions(options) {
         return null;
       }
 
-      return await executeSelfServeCommand(resolvedLaneId, command, {
-        customer_number: null,
-        license_plate: null,
-      }, options);
+      return await executeSelfServeCommand(
+        resolvedLaneId,
+        command,
+        {
+          customer_number: null,
+          license_plate: null,
+        },
+        options
+      );
     } finally {
       loadingRef.value = false;
     }
@@ -185,6 +193,24 @@ export function useWashSessionActions(options) {
   const openPropertyExitGate = async (laneId = null, options = {}) =>
     executePropertyGateCommand("OPEN_PROPERTY_EXIT_GATE", laneId, openingPropertyExitGate, options);
 
+  const rollbackStartedWash = async (laneId) => {
+    const stopResponse = await executeSelfServeCommand(
+      laneId,
+      "STOP",
+      {
+        customer_number: null,
+        license_plate: null,
+      },
+      { suppressAlert: true }
+    );
+
+    if (!stopResponse) {
+      console.error(`Failed to roll back started wash on lane ${laneId}:`, lastCommandErrorMessage.value);
+    }
+
+    return stopResponse;
+  };
+
   const onStartWash = async (laneId, licensePlate, customerNumber, targetStep = steps.WASH_IN_PROGRESS) => {
     if (isStartingWash.value) {
       return false;
@@ -224,15 +250,36 @@ export function useWashSessionActions(options) {
         return false;
       }
 
+      const selectedWashType = radioWashType.value === "Machine" ? "Machine" : "Manual";
       const startResponse = await executeSelfServeCommand(laneId, "START", {
         customer_number: parseInt(customerNumber),
         license_plate: licensePlate.trim().toUpperCase(),
+        wash_type: selectedWashType,
         defer_relay_side_effects: true,
       });
       if (!startResponse) {
         return false;
       }
 
+      if (selectedWashType === "Machine" && isServiceAllowed("MACHINE")) {
+        let machineRelayResponse = null;
+        try {
+          machineRelayResponse = await enableMachineRelay(laneId);
+        } catch (error) {
+          console.error("Error enabling machine relay after wash start:", error);
+          await rollbackStartedWash(laneId);
+          alertFn(extractCommandErrorMessage(error, "Kunne ikke starte maskinen. Prøv igen."));
+          return false;
+        }
+
+        const machineRelaySuccessValue = machineRelayResponse?.data?.success ?? machineRelayResponse?.success;
+        if (machineRelaySuccessValue === false) {
+          await rollbackStartedWash(laneId);
+          alertFn(extractCommandErrorMessage(machineRelayResponse, "Kunne ikke starte maskinen. Prøv igen."));
+          return false;
+        }
+      }
+
       washLaneId.value = laneId;
       washStartTime.value = Date.now();
       completedDurationMs.value = null;
@@ -246,13 +293,6 @@ export function useWashSessionActions(options) {
         reg: licensePlate.trim().toUpperCase(),
       });
 
-      if (radioWashType.value === "Machine" && isServiceAllowed("MACHINE")) {
-        try {
-          await enableMachineRelay(laneId);
-        } catch (error) {
-          console.error("Error enabling machine relay after wash start:", error);
-        }
-      }
       return true;
     } catch (error) {
       console.error("Error starting self-serve wash:", error);

src/config.js

@@ -29,6 +29,7 @@ const normalizeReleaseSource = (value) => {
 };
 export const RELEASE_SOURCE_ENV = String(import.meta.env.VITE_RELEASE_SOURCE || "").trim().toLowerCase();
 export const RELEASE_SOURCE = normalizeReleaseSource(RELEASE_SOURCE_ENV);
+export const DEFAULT_LEGACY_API_URL = "https://api.truckwash.io";
 export const DEFAULT_PUBLIC_GATEWAY_API_URL = "https://api-v2.truckwash.io";
 export const DEFAULT_STABLE_API_URL = `${DEFAULT_PUBLIC_GATEWAY_API_URL}/master/api`;
 
@@ -50,11 +51,22 @@ export const RELEASE_MANAGER_CONTROL_API_FALLBACK_URLS = String(
   .split(",")
   .map((url) => normalizeApiUrl(url.trim()))
   .filter(Boolean);
+export const RELEASE_TRUSTED_ORIGINS = String(import.meta.env.VITE_RELEASE_TRUSTED_ORIGINS || "")
+  .split(",")
+  .map((origin) => origin.trim().replace(/\/+$/, ""))
+  .filter(Boolean);
+export const SELF_SERVE_ATTACHMENT_TRUSTED_ORIGINS = String(
+  import.meta.env.VITE_SELF_SERVE_ATTACHMENT_TRUSTED_ORIGINS || ""
+)
+  .split(",")
+  .map((origin) => origin.trim().replace(/\/+$/, ""))
+  .filter(Boolean);
 
 // Allowed origins
 export const ALLOWED_ORIGINS = [
   "https://truckwash.io",
   "https://www.truckwash.io",
+  new URL(DEFAULT_PUBLIC_GATEWAY_API_URL).origin,
   "http://localhost:5173",
   "http://localhost:4173",
   "http://localhost:4174",

src/features/edgeGateways/EdgeGatewayLogsPage.vue

@@ -36,7 +36,73 @@ const entryContext = (entry = {}) => {
   return context && typeof context === "object" && !Array.isArray(context) ? context : {};
 };
 
-const formatDetailValue = (value) => {
+const REDACTED_CONTEXT_VALUE = "[REDACTED]";
+const SENSITIVE_CONTEXT_KEY_PATTERN = /(?:token|secret|password|credential|api[_-]?key|authorization|auth|signature)/i;
+const SENSITIVE_CONTEXT_QUERY_PATTERN = SENSITIVE_CONTEXT_KEY_PATTERN;
+
+const redactSensitiveUrlParams = (value) => {
+  const text = String(value || "");
+  if (!text) {
+    return text;
+  }
+
+  const redactParams = (url) => {
+    let redacted = false;
+    url.searchParams.forEach((_paramValue, key) => {
+      if (SENSITIVE_CONTEXT_QUERY_PATTERN.test(key)) {
+        url.searchParams.set(key, REDACTED_CONTEXT_VALUE);
+        redacted = true;
+      }
+    });
+    return redacted ? url.toString() : text;
+  };
+
+  try {
+    return redactParams(new URL(text));
+  } catch {
+    return text.replace(/([?&])([^=&#]+)=([^&#]*)/g, (match, separator, rawKey) => {
+      let key = rawKey;
+      try {
+        key = decodeURIComponent(rawKey.replace(/\+/g, " "));
+      } catch {
+        key = rawKey;
+      }
+      return SENSITIVE_CONTEXT_QUERY_PATTERN.test(key) ? `${separator}${rawKey}=${REDACTED_CONTEXT_VALUE}` : match;
+    });
+  }
+};
+
+const redactEdgeGatewayLogContext = (value, seen = new WeakSet()) => {
+  if (value === null || typeof value === "undefined") {
+    return value;
+  }
+
+  if (typeof value === "string") {
+    return redactSensitiveUrlParams(value);
+  }
+
+  if (typeof value !== "object") {
+    return value;
+  }
+
+  if (seen.has(value)) {
+    return "[Circular]";
+  }
+  seen.add(value);
+
+  if (Array.isArray(value)) {
+    return value.map((item) => redactEdgeGatewayLogContext(item, seen));
+  }
+
+  return Object.fromEntries(
+    Object.entries(value).map(([key, item]) => [
+      key,
+      SENSITIVE_CONTEXT_KEY_PATTERN.test(key) ? REDACTED_CONTEXT_VALUE : redactEdgeGatewayLogContext(item, seen),
+    ])
+  );
+};
+
+const formatDetailValue = (value, { redactContext = false } = {}) => {
   if (value === null || typeof value === "undefined" || value === "") {
     return "None";
   }
@@ -44,13 +110,14 @@ const formatDetailValue = (value) => {
     return value ? "yes" : "no";
   }
   if (typeof value === "object") {
+    const displayValue = redactContext ? redactEdgeGatewayLogContext(value) : value;
     try {
-      return JSON.stringify(value, null, 2);
+      return JSON.stringify(displayValue, null, 2);
     } catch {
-      return String(value);
+      return String(displayValue);
     }
   }
-  return String(value);
+  return redactContext && typeof value === "string" ? redactSensitiveUrlParams(value) : String(value);
 };
 
 const detailRow = (label, value) => ({
@@ -61,7 +128,7 @@ const detailRow = (label, value) => ({
 
 const contextDetailRow = (value) => ({
   label: "Context",
-  value: formatDetailValue(value),
+  value: formatDetailValue(value, { redactContext: true }),
   multiline: true,
   actionsOnly: true,
 });
@@ -208,7 +275,9 @@ const relayActorLabel = (entry = {}) => {
 };
 
 const normalizeRelayRole = (role = "") => {
-  const normalized = String(role || "").trim().toUpperCase();
+  const normalized = String(role || "")
+    .trim()
+    .toUpperCase();
   const aliases = {
     ENTRANCE: "ENTRY",
     IN: "ENTRY",
@@ -260,7 +329,8 @@ const firstRelayText = (values = []) => {
 
 const relayDisplayName = (entry = {}) => {
   const context = entryContext(entry);
-  const actionContext = context.action_context && typeof context.action_context === "object" ? context.action_context : {};
+  const actionContext =
+    context.action_context && typeof context.action_context === "object" ? context.action_context : {};
   const binding = context.binding && typeof context.binding === "object" ? context.binding : {};
   const request = relayRequestPayload(entry);
   return firstRelayText([
@@ -284,7 +354,8 @@ const relayIdentifier = (entry = {}) => {
 
 const relaySignalLabel = (entry = {}) => {
   const context = entryContext(entry);
-  const actionContext = context.action_context && typeof context.action_context === "object" ? context.action_context : {};
+  const actionContext =
+    context.action_context && typeof context.action_context === "object" ? context.action_context : {};
   const signal = context.signal && typeof context.signal === "object" ? context.signal : {};
   const role = normalizeRelayRole(context.relay_role || actionContext.relay_role || actionContext.role);
   const action = String(context.action || signal.command_type || "RELAY").toUpperCase();