Compare commits
16
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
238fcd6fd7 | ||
|
|
78b64329cc | ||
|
|
afcc14cbb3 | ||
|
|
1b92fae76c | ||
|
|
4c76c77005 | ||
|
|
93cff6099e | ||
|
|
7bcaec6284 | ||
|
|
2f4fd7c040 | ||
|
|
1516e104df | ||
|
|
e9588aeba8 | ||
|
|
83df90b531 | ||
|
|
87ffe3b84b | ||
|
|
9a4bf51ad4 | ||
|
|
d84663f901 | ||
|
|
be621c49a2 | ||
|
|
edf7c3052b |
@@ -7,6 +7,103 @@ and this project follows [Semantic Versioning](https://semver.org/).
|
|||||||
|
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
|
## [1.21.0] - 2026-10-19
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- Post-event feedback, set up in a new Feedback step in the event wizard.
|
||||||
|
- Questions use the form builder.
|
||||||
|
- You pick when it's sent (the default is the morning after the event) and who gets it: everyone who checked in, or everyone registered.
|
||||||
|
- Each person gets a personal link by email (and WhatsApp where they use it).
|
||||||
|
- Anyone who hasn't answered gets one reminder 3 days later.
|
||||||
|
- Answers can be anonymous or named.
|
||||||
|
- "Send now" is available, and the questions lock once people start answering.
|
||||||
|
- New form field types: **Rating (1–5 stars)** and **Multiple choice**. They're used for feedback, and can also go on attendee forms (registration page, My Events, the kiosk, manual registration and Supervisor → Forms).
|
||||||
|
- New report, **Feedback summary**:
|
||||||
|
- response rate;
|
||||||
|
- average rating per question, with star distribution;
|
||||||
|
- multiple-choice and yes/no breakdowns as bar charts;
|
||||||
|
- a list of text answers (with names unless the form is anonymous).
|
||||||
|
- Select several events to compare their ratings (e.g. Camp 2025 vs Camp 2026). Exports to PDF and Excel like other reports.
|
||||||
|
- New `/api/feedback` endpoints and a job every 15 minutes (`FEEDBACK_JOB_ENABLED=false` to turn it off).
|
||||||
|
- Requires the `add_feedback_forms` database migration.
|
||||||
|
|
||||||
|
## [1.20.0] - 2026-10-19
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- Sponsor a spot: a new event setting, "Allow sponsorships" (event wizard → Sponsor a spot).
|
||||||
|
- It adds a "Sponsor a spot" button on the event page so people can fund a place for someone who can't afford it.
|
||||||
|
- Sponsors choose one or more whole spots (at the main ticket price) or a custom amount, and pay through Yoco. Guests just give a name and email.
|
||||||
|
- Sponsors can give anonymously, or add a name and a message for the organisers.
|
||||||
|
- An optional goal ("12 of 20 spots sponsored") and public progress bar.
|
||||||
|
- Each sponsorship is recorded as a donation tagged to the event, in that event's sponsorship pool.
|
||||||
|
- Supervisors assign pool money to registrations with the existing donation assign/unassign flow, fully or partly.
|
||||||
|
- Under Payments → Donations, sponsorships are labelled, there's an "Only the sponsorship pool" filter, and the sponsor's message is shown.
|
||||||
|
- Who receives help is never shown to sponsors.
|
||||||
|
- Sponsors get a "Thank you for sponsoring a spot" receipt.
|
||||||
|
- Automations has a new "Thank Your Sponsors" email for events with sponsorships.
|
||||||
|
- Email attendees can target an event's sponsors (`filter.audience: 'sponsors'`).
|
||||||
|
- The Donations breakdown report has sponsorship pool columns per event: received, assigned and remaining.
|
||||||
|
- New `/api/sponsorships` endpoints.
|
||||||
|
- Requires the `add_sponsorships` database migration.
|
||||||
|
|
||||||
|
## [1.19.0] - 2026-10-19
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- Rooms & groups (Supervisor → Rooms & groups), for camps and lockdowns: put attendees into rooms, cabins, small groups, teams or buses.
|
||||||
|
- Each event can have several allocation sets (e.g. "Rooms" and "Buses"). Each set has groups with an optional capacity, an optional gender restriction and an optional leader (a staff member).
|
||||||
|
- A drag-and-drop board puts people not yet placed on the left and groups, with capacity counters, on the right. Full groups and groups for the other gender won't accept a person.
|
||||||
|
- Auto-allocate fills groups evenly with everyone not yet placed, respecting capacity and gender. It can keep people on the same booking together or spread them out.
|
||||||
|
- Printable lists per group (with leader) and a master list. On youth events they can include medical and emergency details from consent forms; viewing those is recorded in the audit log.
|
||||||
|
- "Show on tickets" prints the group on each person's ticket and shows it in My Events.
|
||||||
|
- Email and WhatsApp attendees can be sent to one group ("Bus 2 leaves at 07:30"). Messages go to whoever booked for the people in it.
|
||||||
|
- Group leaders see their people under Staff → My groups. Medical details are shown to supervisors only.
|
||||||
|
- New event setting "Ask each person's gender" (under Named attendees). It adds a gender choice for each named person on the registration page, at the door, on the kiosk, in manual registration and in My Events, and is needed for gender-split rooms.
|
||||||
|
- New `/api/allocations` endpoints.
|
||||||
|
- Requires the `add_room_allocation` database migration.
|
||||||
|
|
||||||
|
## [1.18.0] - 2026-10-19
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- Ticket transfer. On My Events, "Transfer" hands a ticket to someone else before the event: enter their name and email or phone.
|
||||||
|
- The new holder gets the ticket by email/WhatsApp with a new QR code. If they're new, an inactive account is created and they get an activation link.
|
||||||
|
- The old QR code stops working, so screenshots of it won't scan. Scanning it says who the ticket was transferred to, and offline-mode sync flags it.
|
||||||
|
- For a ticket covering several people, one place is split off to the new holder.
|
||||||
|
- The payer stays responsible for the registration.
|
||||||
|
- Transfer rules:
|
||||||
|
- Only before the event starts, and only for tickets that haven't been scanned.
|
||||||
|
- It can be turned off per event (new "Ticket transfer" setting in the event wizard, on by default). Supervisors can always transfer, from At the door → Tickets.
|
||||||
|
- On youth events, the new holder's date of birth, and a parent's details for a minor, are needed, and a new consent request is sent.
|
||||||
|
- The previous holder's attendee form answers and consent medical details are removed.
|
||||||
|
- Every transfer is recorded in the audit log.
|
||||||
|
- New endpoints `POST /api/tickets/:id/transfer` and `GET /api/tickets/:id/transfers`.
|
||||||
|
- Requires the `add_ticket_transfer` database migration.
|
||||||
|
|
||||||
|
## [1.17.0] - 2026-10-19
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- Offline ticket scanning. While online, staff pick an event and section on the scanner and tap "Enable offline mode". The section (or the whole event) is locked to their device and its tickets are downloaded to the device.
|
||||||
|
- With no connection, scans are checked against that list and queued on the device.
|
||||||
|
- The panel shows when the list was downloaded and how many scans are waiting.
|
||||||
|
- Queued scans sync automatically when the device is back online (or with "Sync now"), and check-in messages go out then.
|
||||||
|
- "Release section" ends offline mode and deletes the list from the device.
|
||||||
|
- Only one device can hold a section at a time (a whole-event lock clashes with every section). While a section is locked, other devices see who holds it and can't scan it, online or offline, so a ticket can never be redeemed twice by two offline devices.
|
||||||
|
- Syncing is idempotent and never redeems more than is left on a ticket. Anything that needs a person to look goes into a sync report: tickets not found, cancelled registrations, used-up tickets, scans outside the locked section, and check-ins without consent.
|
||||||
|
- Supervisor → Offline scanning page: active locks with force release (for a lost or flat phone; its scans still sync if it reconnects, and are flagged), and sync reports to review. Locks, releases, force-releases and syncs are recorded in the audit log.
|
||||||
|
- The scanner is installable as an app (web app manifest), and a service worker caches the scanner page and its scripts so it opens with no connection.
|
||||||
|
- The app now stays signed in with the last confirmed profile when it's reloaded without a connection, instead of sending the user to the login page.
|
||||||
|
- New `/api/scan-locks` endpoints.
|
||||||
|
- Requires the `add_offline_scanning` database migration.
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- `POST /api/tickets/scan/:qrCode` now accepts `sectionId` and checks it on the server; this was previously only checked in the browser.
|
||||||
|
- It now refuses (423) scans in a section that another device has locked for offline scanning.
|
||||||
|
|
||||||
## [1.16.0] - 2026-10-19
|
## [1.16.0] - 2026-10-19
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|||||||
+51
-3
@@ -171,6 +171,24 @@ Items & Pricing → Sections → Form → Visibility → Attachments**.
|
|||||||
Each payment records **who recorded it** as well as who it's for.
|
Each payment records **who recorded it** as well as who it's for.
|
||||||
- **Refunds** — negative payments against an original payment, netted against
|
- **Refunds** — negative payments against an original payment, netted against
|
||||||
the original method.
|
the original method.
|
||||||
|
- **Post-event feedback** — a Feedback step in the event wizard.
|
||||||
|
- Questions use the form builder, with new **star rating (1–5)** and **multiple
|
||||||
|
choice** types (also available on attendee forms).
|
||||||
|
- The form goes out at a chosen time to everyone who checked in, or to everyone
|
||||||
|
registered, each with a personal link (`/feedback/<token>`). One reminder goes
|
||||||
|
3 days later to anyone who hasn't answered.
|
||||||
|
- Answers can be anonymous or named. "Send now" is available, and the questions
|
||||||
|
lock once people have answered.
|
||||||
|
- **Sponsor a spot** — per-event setting. A "Sponsor a spot" button on the event page
|
||||||
|
lets anyone, including guests, pay for one or more spots (at the main ticket price)
|
||||||
|
or any amount through Yoco. They can give anonymously or add a name and a message.
|
||||||
|
The money is a donation tagged to the event and goes into its sponsorship pool, which
|
||||||
|
supervisors assign to registrations with the usual donation flow.
|
||||||
|
- An optional public progress bar ("12 of 20 spots sponsored") with an optional goal.
|
||||||
|
- Sponsors get a thank-you receipt, and an Automations thank-you can go to all of an
|
||||||
|
event's sponsors.
|
||||||
|
- The Donations breakdown report shows each pool: received, assigned and remaining.
|
||||||
|
- Who is helped is never shown.
|
||||||
- **Donations** — users can donate from their dashboard (`/dashboard/user/donate`).
|
- **Donations** — users can donate from their dashboard (`/dashboard/user/donate`).
|
||||||
Supervisors can **assign** a donation (fully or partly) to someone's
|
Supervisors can **assign** a donation (fully or partly) to someone's
|
||||||
registration and **unassign** it later. Assignments are kept as separate
|
registration and **unassign** it later. Assignments are kept as separate
|
||||||
@@ -200,6 +218,13 @@ Items & Pricing → Sections → Form → Visibility → Attachments**.
|
|||||||
- **Check-in confirmation** — holders get an email/WhatsApp saying how many were
|
- **Check-in confirmation** — holders get an email/WhatsApp saying how many were
|
||||||
checked in and how many remain.
|
checked in and how many remain.
|
||||||
- **Scan stats** — recent scans and per-event scan counts.
|
- **Scan stats** — recent scans and per-event scan counts.
|
||||||
|
- **Offline scanning** — while online, a staff member locks an event section (or the
|
||||||
|
whole event) to their device and downloads its tickets. They can then keep scanning
|
||||||
|
with no connection; scans are queued on the device and sync automatically when it's
|
||||||
|
back online (never redeeming more than is left). Only one device can hold a section,
|
||||||
|
and while it's locked nobody else can scan it, online or offline. Problems found
|
||||||
|
while syncing go into a report for a supervisor. Supervisors can force-release a
|
||||||
|
lost device. The scanner can be added to the home screen (PWA) and opens offline.
|
||||||
- **Printing** — A4 sheets (8 tickets per page) and A6 single tickets.
|
- **Printing** — A4 sheets (8 tickets per page) and A6 single tickets.
|
||||||
- **Resend** — send tickets to a different email/phone at the door.
|
- **Resend** — send tickets to a different email/phone at the door.
|
||||||
|
|
||||||
@@ -259,6 +284,15 @@ logout controls. Disconnected sessions are recovered automatically.
|
|||||||
- Registration detail: itemised bill (early-bird lines grouped), payments,
|
- Registration detail: itemised bill (early-bird lines grouped), payments,
|
||||||
**Invoice** and **Receipt** buttons, edit, cancel, **Make payment**.
|
**Invoice** and **Receipt** buttons, edit, cancel, **Make payment**.
|
||||||
- Upcoming events and tickets side by side, with bulk ticket email/WhatsApp.
|
- Upcoming events and tickets side by side, with bulk ticket email/WhatsApp.
|
||||||
|
- **Ticket transfer** — hand a ticket to someone else before the event (name plus
|
||||||
|
email/phone). They get a new ticket and QR code, and an inactive account with an
|
||||||
|
activation link if they're new. The old code stops working, and scanning it says it
|
||||||
|
was transferred, both online and in offline-mode sync reports. One place can be split
|
||||||
|
off a ticket covering several people. Billing stays with the payer. It's not allowed
|
||||||
|
once a ticket has been scanned, and it can be turned off per event (supervisors can
|
||||||
|
always transfer, from At the door → Tickets). On youth events the new holder needs
|
||||||
|
their own parental consent, and the previous holder's form answers are removed.
|
||||||
|
Every transfer is in the audit log.
|
||||||
- **Payment history** (`/dashboard/user/payments`) — paginated, with filters by
|
- **Payment history** (`/dashboard/user/payments`) — paginated, with filters by
|
||||||
date, method and payment/refund.
|
date, method and payment/refund.
|
||||||
- **Donate** page.
|
- **Donate** page.
|
||||||
@@ -299,6 +333,19 @@ logout controls. Disconnected sessions are recovered automatically.
|
|||||||
Reconcile (Yoco transactions), and Payment Link.
|
Reconcile (Yoco transactions), and Payment Link.
|
||||||
- **Coupon codes** (`/dashboard/supervisor/coupons`) — create, edit and turn off
|
- **Coupon codes** (`/dashboard/supervisor/coupons`) — create, edit and turn off
|
||||||
discount codes, and see who used each one.
|
discount codes, and see who used each one.
|
||||||
|
- **Rooms & groups** (`/dashboard/supervisor/allocations`):
|
||||||
|
- Per event, allocation sets such as "Rooms", "Small groups" or "Buses". Each set
|
||||||
|
has groups with an optional capacity, gender restriction and leader (staff).
|
||||||
|
- A drag-and-drop board, plus auto-allocate: fill evenly, respecting capacity and
|
||||||
|
gender, keeping bookings together or splitting them.
|
||||||
|
- Printable per-group and master lists. On youth events they can include medical
|
||||||
|
details, and viewing those is audited.
|
||||||
|
- The group can show on tickets and in My Events.
|
||||||
|
- Email and WhatsApp attendees can be filtered to one group.
|
||||||
|
- Leaders see their people under Staff → **My groups**.
|
||||||
|
- Works on named attendees. Events can ask each person's gender.
|
||||||
|
- **Offline scanning** (`/dashboard/supervisor/offline-scans`) — devices holding
|
||||||
|
offline locks (with force release) and sync reports to review.
|
||||||
- **Waitlist** (`/dashboard/supervisor/waitlist`) — the queue per event: offer a
|
- **Waitlist** (`/dashboard/supervisor/waitlist`) — the queue per event: offer a
|
||||||
place now, move people up or down, or remove them.
|
place now, move people up or down, or remove them.
|
||||||
- **Parental consent** (`/dashboard/supervisor/consent`) — consent status per
|
- **Parental consent** (`/dashboard/supervisor/consent`) — consent status per
|
||||||
@@ -357,9 +404,9 @@ a viewer with its own filters, stat tiles and bar charts.
|
|||||||
| Category | Reports |
|
| Category | Reports |
|
||||||
|----------|---------|
|
|----------|---------|
|
||||||
| Financial | Payments between dates · Revenue summary (by method) · Revenue detailed · Finance report (revenue & costs, after discounts) · Profit report · Discounts (coupon codes) |
|
| Financial | Payments between dates · Revenue summary (by method) · Revenue detailed · Finance report (revenue & costs, after discounts) · Profit report · Discounts (coupon codes) |
|
||||||
| Registration | Attendees per event (grouped by option) · Registration type counts · Master orders breakdown · Registration status breakdown (count by registration or ticket quantity) · Parental consent status · Medical & emergency list |
|
| Registration | Attendees per event (grouped by option) · Registration type counts · Master orders breakdown · Registration status breakdown (count by registration or ticket quantity) · Parental consent status · Medical & emergency list · Feedback summary (response rate, average ratings, choice breakdowns, comments; compare events) |
|
||||||
| Ticketing | Ticket usage summary |
|
| Ticketing | Ticket usage summary |
|
||||||
| Donations | Donations breakdown (used / unused per event) |
|
| Donations | Donations breakdown (used / unused per event, plus the sponsorship pool) |
|
||||||
| Cashup | Cashup reconciliation · Cashup audit trail |
|
| Cashup | Cashup reconciliation · Cashup audit trail |
|
||||||
|
|
||||||
**Export:** Print, branded PDF download, styled Excel (`.xlsx`) workbook,
|
**Export:** Print, branded PDF download, styled Excel (`.xlsx`) workbook,
|
||||||
@@ -430,6 +477,7 @@ falling back to a general guide.
|
|||||||
| Scheduled email/WhatsApp worker | Polls every 30 s (`SCHEDULED_EMAILS_INTERVAL_MS`) and purges sent jobs after 24 h |
|
| Scheduled email/WhatsApp worker | Polls every 30 s (`SCHEDULED_EMAILS_INTERVAL_MS`) and purges sent jobs after 24 h |
|
||||||
| Daily event summary email | 07:00 daily |
|
| Daily event summary email | 07:00 daily |
|
||||||
| Waitlist: expire unclaimed offers, offer freed places | Every 10 minutes (`WAITLIST_JOB_ENABLED=false` to disable) |
|
| Waitlist: expire unclaimed offers, offer freed places | Every 10 minutes (`WAITLIST_JOB_ENABLED=false` to disable) |
|
||||||
|
| Post-event feedback forms and their 3-day reminder | Every 15 minutes (`FEEDBACK_JOB_ENABLED=false` to disable) |
|
||||||
| Parental consent reminders, and deleting medical details after events | 09:00 daily (`CONSENT_JOBS_ENABLED=false` to disable) |
|
| Parental consent reminders, and deleting medical details after events | 09:00 daily (`CONSENT_JOBS_ENABLED=false` to disable) |
|
||||||
| Database backup (`pg_dump`, gzipped, 14-day retention) | 02:00 daily (`BACKUP_ENABLED=false` to disable) |
|
| Database backup (`pg_dump`, gzipped, 14-day retention) | 02:00 daily (`BACKUP_ENABLED=false` to disable) |
|
||||||
| Temp file cleanup (files older than 7 days in `/temp`) | Daily |
|
| Temp file cleanup (files older than 7 days in `/temp`) | Daily |
|
||||||
@@ -469,5 +517,5 @@ falling back to a general guide.
|
|||||||
| `/set-banner` | Supervisor | Site banner |
|
| `/set-banner` | Supervisor | Site banner |
|
||||||
| `/dashboard/user` (+ `/payments`, `/donate`, `/forms`, `/profile`, `/reset-password`) | User | My Events |
|
| `/dashboard/user` (+ `/payments`, `/donate`, `/forms`, `/profile`, `/reset-password`) | User | My Events |
|
||||||
| `/dashboard/staff` (+ `/ticket-scanning`, `/event-tickets`) | Staff | Staff tools |
|
| `/dashboard/staff` (+ `/ticket-scanning`, `/event-tickets`) | Staff | Staff tools |
|
||||||
| `/dashboard/supervisor` (+ `/events`, `/event-options`, `/at-the-door`, `/manual`, `/manual-registration`, `/payments`, `/coupons`, `/waitlist`, `/consent`, `/email-attendees`, `/whatsapp-attendees`, `/forms`, `/reports`) | Supervisor | Supervisor tools |
|
| `/dashboard/supervisor` (+ `/events`, `/event-options`, `/at-the-door`, `/manual`, `/manual-registration`, `/payments`, `/coupons`, `/waitlist`, `/consent`, `/offline-scans`, `/allocations`, `/email-attendees`, `/whatsapp-attendees`, `/forms`, `/reports`) | Supervisor | Supervisor tools |
|
||||||
| `/dashboard/admin` (+ `/users`, `/registrations`, `/forms`, `/cashup`, `/cashup/[id]`, `/audit-log`, `/settings`) | Admin | Admin tools |
|
| `/dashboard/admin` (+ `/users`, `/registrations`, `/forms`, `/cashup`, `/cashup/[id]`, `/audit-log`, `/settings`) | Admin | Admin tools |
|
||||||
|
|||||||
@@ -21,6 +21,11 @@ Tokens are issued by `POST /api/users/login`.
|
|||||||
- [Coupons](#coupons)
|
- [Coupons](#coupons)
|
||||||
- [Parental consent](#parental-consent)
|
- [Parental consent](#parental-consent)
|
||||||
- [Waitlist](#waitlist)
|
- [Waitlist](#waitlist)
|
||||||
|
- [Offline scanning](#offline-scanning)
|
||||||
|
- [Ticket transfer](#ticket-transfer)
|
||||||
|
- [Rooms & groups](#rooms--groups)
|
||||||
|
- [Sponsor a spot](#sponsor-a-spot)
|
||||||
|
- [Post-event feedback](#post-event-feedback)
|
||||||
- [Payments](#payments)
|
- [Payments](#payments)
|
||||||
- [Tickets](#tickets)
|
- [Tickets](#tickets)
|
||||||
- [Broadcasts (Email)](#broadcasts-email)
|
- [Broadcasts (Email)](#broadcasts-email)
|
||||||
@@ -278,6 +283,103 @@ For unauthenticated (guest) registration on events with `requiresAuth: false`:
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
## Post-event feedback
|
||||||
|
|
||||||
|
| Method | Path | Auth | Description |
|
||||||
|
|--------|------|------|-------------|
|
||||||
|
| GET | `/api/feedback/event/:eventId` | supervisor+ | The event's feedback form (with `invited` / `responses` counts), or null |
|
||||||
|
| PUT | `/api/feedback/event/:eventId` | supervisor+ | `{ sendAt, audience: 'checked_in'\|'all', anonymous, intro, fields[] }` — fields can't change once answered (409) |
|
||||||
|
| DELETE | `/api/feedback/event/:eventId` | supervisor+ | Remove the form |
|
||||||
|
| POST | `/api/feedback/event/:eventId/send-now` | supervisor+ | Send now (also invites anyone not yet invited) |
|
||||||
|
| GET / POST | `/api/feedback/public/:token` | link holder | Load the form / submit `{ answers: { fieldId: value } }` once |
|
||||||
|
| GET | `/api/feedback/summary?eventIds=a,b` | supervisor+ | Per event: invited, responses, response rate, and per question: rating average + distribution, choice counts, text answers (names only when not anonymous) |
|
||||||
|
|
||||||
|
Notes:
|
||||||
|
- New field types `rating` (answers `"1"`–`"5"`) and `multiple_choice` (`options`: array of strings). They can be used on attendee forms too.
|
||||||
|
- Only HMACs of link tokens are stored, and a reminder issues a new link.
|
||||||
|
- A job every 15 minutes (`FEEDBACK_JOB_ENABLED`, `FEEDBACK_JOB_INTERVAL_MS`) sends due forms, and sends one reminder 3 days later to people who haven't answered.
|
||||||
|
|
||||||
|
## Sponsor a spot
|
||||||
|
|
||||||
|
| Method | Path | Auth | Description |
|
||||||
|
|--------|------|------|-------------|
|
||||||
|
| GET | `/api/sponsorships/event/:eventId` | public | `{ enabled, open, spotPrice, showProgress, goalSpots, spotsFunded, sponsors }` — never recipients |
|
||||||
|
| POST | `/api/sponsorships/checkout` | public (optional login) | `{ eventId, spots? \| amount?, anonymous?, sponsorName?, message?, name?, email? }` → Yoco `redirectUrl`. Guests give a name and email |
|
||||||
|
| GET | `/api/sponsorships/event/:eventId/pool` | supervisor+ | `{ received, assigned, remaining, sponsors, spotsFunded, spotPrice, goalSpots }` |
|
||||||
|
|
||||||
|
How the money is handled:
|
||||||
|
- A spot costs the cheapest paid main ticket.
|
||||||
|
- Yoco checkout metadata carries `type: 'sponsorship'`. The webhook records the payment as `isDonation` + `isSponsorship` against the event, together with `sponsorName`, `sponsorMessage` and `sponsorAnonymous`.
|
||||||
|
- Pool funds are assigned with `PUT /api/payments/assign-donation`.
|
||||||
|
|
||||||
|
Other changes:
|
||||||
|
- Event fields: `allowSponsorships`, `sponsorshipGoalSpots`, `showSponsorshipProgress`.
|
||||||
|
- `POST /api/events/:id/email-attendees` accepts `filter.audience: 'sponsors'`.
|
||||||
|
- `POST /api/automations/schedule` jobs accept `audience: 'sponsors'`.
|
||||||
|
|
||||||
|
## Rooms & groups
|
||||||
|
|
||||||
|
| Method | Path | Auth | Description |
|
||||||
|
|--------|------|------|-------------|
|
||||||
|
| GET | `/api/allocations/event/:eventId` | supervisor+ | Board: sets (groups, assignments), named attendees, possible leaders, unnamed places |
|
||||||
|
| POST | `/api/allocations/sets` | supervisor+ | `{ eventId, name, showOnTicket? }` |
|
||||||
|
| PUT / DELETE | `/api/allocations/sets/:id` | supervisor+ | Rename / show on tickets; delete |
|
||||||
|
| POST | `/api/allocations/sets/:id/groups` | supervisor+ | `{ name, capacity?, gender? ('male'\|'female'), leaderUserId? }` |
|
||||||
|
| PUT / DELETE | `/api/allocations/groups/:id` | supervisor+ | Edit (can't drop below current members or break gender); delete (members become unassigned) |
|
||||||
|
| PUT | `/api/allocations/sets/:id/assignments` | supervisor+ | `{ attendeeId, groupId }` (null unassigns); enforces capacity and gender |
|
||||||
|
| DELETE | `/api/allocations/sets/:id/assignments` | supervisor+ | Clear the set |
|
||||||
|
| POST | `/api/allocations/sets/:id/auto` | supervisor+ | `{ mode: 'together' \| 'split' }` — places everyone not yet placed |
|
||||||
|
| GET | `/api/allocations/sets/:id/lists?medical=true` | supervisor+ | Groups with members for printing (medical view is audited) |
|
||||||
|
| GET | `/api/allocations/my-groups` | staff+ | Groups the caller leads (medical details for supervisors only) |
|
||||||
|
|
||||||
|
Related changes:
|
||||||
|
- `Event.collectGender` makes a gender (`male` / `female`) required for each named attendee.
|
||||||
|
- Email and WhatsApp attendees accept `filter.allocationGroupId`.
|
||||||
|
|
||||||
|
## Ticket transfer
|
||||||
|
|
||||||
|
| Method | Path | Auth | Description |
|
||||||
|
|--------|------|------|-------------|
|
||||||
|
| POST | `/api/tickets/:id/transfer` | payer, holder or supervisor+ | `{ name, email?, phone?, dateOfBirth?, parentName?, parentEmail?, parentPhone? }` (date of birth, plus parent details for a minor, on youth events) |
|
||||||
|
| GET | `/api/tickets/:id/transfers` | payer, holder or staff+ | Transfer history |
|
||||||
|
|
||||||
|
Rules:
|
||||||
|
- Only before the event starts, and only for tickets that have never been scanned.
|
||||||
|
- `Event.allowTicketTransfer` turns it off for non-supervisors.
|
||||||
|
|
||||||
|
What a transfer does:
|
||||||
|
- The new holder becomes the ticket's attendee and gets a new QR code. A shared ticket for several places has one place split off into its own ticket.
|
||||||
|
- An account is matched by email/phone, or created inactive with an activation link.
|
||||||
|
- The previous holder's attendee form answers are deleted, and the medical details on their consent are cleared. A minor on a youth event gets a new consent request.
|
||||||
|
|
||||||
|
Old QR codes:
|
||||||
|
- `scan-preview` and `scan` return `410 { code: "TICKET_TRANSFERRED" }`.
|
||||||
|
- Offline sync reports them as `transferred`.
|
||||||
|
- Each transfer is audited as `ticket_transferred`.
|
||||||
|
|
||||||
|
## Offline scanning
|
||||||
|
|
||||||
|
| Method | Path | Auth | Description |
|
||||||
|
|--------|------|------|-------------|
|
||||||
|
| GET | `/api/scan-locks?eventId=` | staff+ | Active offline locks for an event |
|
||||||
|
| POST | `/api/scan-locks` | staff+ | Lock `{ eventId, sectionId?, deviceId, deviceName? }` to this device (409 if the scope is held elsewhere) |
|
||||||
|
| GET | `/api/scan-locks/:id/snapshot?deviceId=` | staff+ | Tickets valid in the lock's scope (lock holder only) |
|
||||||
|
| POST | `/api/scan-locks/:id/sync` | staff+ | `{ deviceId, scans: [{ clientScanId, qrCode, qty, scannedAt }] }` — idempotent; returns accepted, duplicates, conflicts |
|
||||||
|
| DELETE | `/api/scan-locks/:id` | staff+ | Release (`{ deviceId }`, lock holder only) |
|
||||||
|
| POST | `/api/scan-locks/:id/force-release` | supervisor+ | Release a lost device's lock |
|
||||||
|
| GET | `/api/scan-locks/reports?eventId=&unreviewed=` | supervisor+ | Sync reports |
|
||||||
|
| POST | `/api/scan-locks/reports/:id/review` | supervisor+ | Mark a report reviewed |
|
||||||
|
|
||||||
|
How locks work:
|
||||||
|
- One device per scope. A whole-event lock (`sectionId` null) clashes with every section lock on that event.
|
||||||
|
- `POST /api/tickets/scan/:qrCode` now accepts `sectionId` and `deviceId`. It enforces the section on the server, and returns `423 { code: "SCAN_LOCKED" }` when another device holds a lock covering the ticket.
|
||||||
|
|
||||||
|
How syncing works:
|
||||||
|
- Synced scans never redeem more than is left on a ticket.
|
||||||
|
- Conflicts are recorded in the sync report: `not_found`, `cancelled`, `wrong_scope`, `already_used`, `partly_used` and `consent`.
|
||||||
|
- Check-in messages are sent after the sync.
|
||||||
|
- Locks, releases, force-releases and syncs are written to the admin audit log.
|
||||||
|
|
||||||
## Waitlist
|
## Waitlist
|
||||||
|
|
||||||
Events with `waitlistEnabled` (plus `waitlistOfferHours`, default 24, and `waitlistPartialOffers`, default true) take a queue for sold-out lines.
|
Events with `waitlistEnabled` (plus `waitlistOfferHours`, default 24, and `waitlistPartialOffers`, default true) take a queue for sold-out lines.
|
||||||
|
|||||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "event-management-backend",
|
"name": "event-management-backend",
|
||||||
"version": "1.16.0",
|
"version": "1.21.0",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "event-management-backend",
|
"name": "event-management-backend",
|
||||||
"version": "1.16.0",
|
"version": "1.21.0",
|
||||||
"hasInstallScript": true,
|
"hasInstallScript": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@prisma/client": "^5.4.2",
|
"@prisma/client": "^5.4.2",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "event-management-backend",
|
"name": "event-management-backend",
|
||||||
"version": "1.16.0",
|
"version": "1.21.0",
|
||||||
"description": "Event Management System Backend",
|
"description": "Event Management System Backend",
|
||||||
"main": "src/index.js",
|
"main": "src/index.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
@@ -0,0 +1,93 @@
|
|||||||
|
-- AlterEnum
|
||||||
|
-- This migration adds more than one value to an enum.
|
||||||
|
-- With PostgreSQL versions 11 and earlier, this is not possible
|
||||||
|
-- in a single migration. This can be worked around by creating
|
||||||
|
-- multiple migrations, each migration adding only one value to
|
||||||
|
-- the enum.
|
||||||
|
|
||||||
|
|
||||||
|
ALTER TYPE "AdminAuditAction" ADD VALUE 'scan_lock_acquired';
|
||||||
|
ALTER TYPE "AdminAuditAction" ADD VALUE 'scan_lock_released';
|
||||||
|
ALTER TYPE "AdminAuditAction" ADD VALUE 'scan_lock_force_released';
|
||||||
|
ALTER TYPE "AdminAuditAction" ADD VALUE 'offline_sync';
|
||||||
|
|
||||||
|
-- AlterTable
|
||||||
|
ALTER TABLE "TicketUsage" ADD COLUMN "clientScanId" TEXT,
|
||||||
|
ADD COLUMN "offline" BOOLEAN NOT NULL DEFAULT false,
|
||||||
|
ADD COLUMN "scanLockId" TEXT,
|
||||||
|
ADD COLUMN "syncedAt" TIMESTAMP(3);
|
||||||
|
|
||||||
|
-- CreateTable
|
||||||
|
CREATE TABLE "ScanLock" (
|
||||||
|
"id" TEXT NOT NULL,
|
||||||
|
"eventId" TEXT NOT NULL,
|
||||||
|
"sectionId" TEXT,
|
||||||
|
"deviceId" TEXT NOT NULL,
|
||||||
|
"deviceName" TEXT,
|
||||||
|
"userId" TEXT NOT NULL,
|
||||||
|
"lockedAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
"snapshotAt" TIMESTAMP(3),
|
||||||
|
"lastSyncAt" TIMESTAMP(3),
|
||||||
|
"releasedAt" TIMESTAMP(3),
|
||||||
|
"forceReleasedById" TEXT,
|
||||||
|
|
||||||
|
CONSTRAINT "ScanLock_pkey" PRIMARY KEY ("id")
|
||||||
|
);
|
||||||
|
|
||||||
|
-- CreateTable
|
||||||
|
CREATE TABLE "OfflineSyncReport" (
|
||||||
|
"id" TEXT NOT NULL,
|
||||||
|
"scanLockId" TEXT NOT NULL,
|
||||||
|
"accepted" INTEGER NOT NULL DEFAULT 0,
|
||||||
|
"duplicates" INTEGER NOT NULL DEFAULT 0,
|
||||||
|
"conflicts" JSONB NOT NULL DEFAULT '[]',
|
||||||
|
"afterForceRelease" BOOLEAN NOT NULL DEFAULT false,
|
||||||
|
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
"reviewedAt" TIMESTAMP(3),
|
||||||
|
"reviewedById" TEXT,
|
||||||
|
|
||||||
|
CONSTRAINT "OfflineSyncReport_pkey" PRIMARY KEY ("id")
|
||||||
|
);
|
||||||
|
|
||||||
|
-- CreateIndex
|
||||||
|
CREATE INDEX "ScanLock_eventId_releasedAt_idx" ON "ScanLock"("eventId", "releasedAt");
|
||||||
|
|
||||||
|
-- CreateIndex
|
||||||
|
CREATE INDEX "ScanLock_userId_idx" ON "ScanLock"("userId");
|
||||||
|
|
||||||
|
-- CreateIndex
|
||||||
|
CREATE INDEX "ScanLock_sectionId_idx" ON "ScanLock"("sectionId");
|
||||||
|
|
||||||
|
-- CreateIndex
|
||||||
|
CREATE INDEX "ScanLock_forceReleasedById_idx" ON "ScanLock"("forceReleasedById");
|
||||||
|
|
||||||
|
-- CreateIndex
|
||||||
|
CREATE INDEX "OfflineSyncReport_scanLockId_idx" ON "OfflineSyncReport"("scanLockId");
|
||||||
|
|
||||||
|
-- CreateIndex
|
||||||
|
CREATE INDEX "OfflineSyncReport_reviewedById_idx" ON "OfflineSyncReport"("reviewedById");
|
||||||
|
|
||||||
|
-- CreateIndex
|
||||||
|
CREATE UNIQUE INDEX "TicketUsage_clientScanId_key" ON "TicketUsage"("clientScanId");
|
||||||
|
|
||||||
|
-- AddForeignKey
|
||||||
|
ALTER TABLE "TicketUsage" ADD CONSTRAINT "TicketUsage_scanLockId_fkey" FOREIGN KEY ("scanLockId") REFERENCES "ScanLock"("id") ON DELETE SET NULL ON UPDATE CASCADE;
|
||||||
|
|
||||||
|
-- AddForeignKey
|
||||||
|
ALTER TABLE "ScanLock" ADD CONSTRAINT "ScanLock_eventId_fkey" FOREIGN KEY ("eventId") REFERENCES "Event"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
||||||
|
|
||||||
|
-- AddForeignKey
|
||||||
|
ALTER TABLE "ScanLock" ADD CONSTRAINT "ScanLock_sectionId_fkey" FOREIGN KEY ("sectionId") REFERENCES "Section"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
||||||
|
|
||||||
|
-- AddForeignKey
|
||||||
|
ALTER TABLE "ScanLock" ADD CONSTRAINT "ScanLock_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
||||||
|
|
||||||
|
-- AddForeignKey
|
||||||
|
ALTER TABLE "ScanLock" ADD CONSTRAINT "ScanLock_forceReleasedById_fkey" FOREIGN KEY ("forceReleasedById") REFERENCES "User"("id") ON DELETE SET NULL ON UPDATE CASCADE;
|
||||||
|
|
||||||
|
-- AddForeignKey
|
||||||
|
ALTER TABLE "OfflineSyncReport" ADD CONSTRAINT "OfflineSyncReport_scanLockId_fkey" FOREIGN KEY ("scanLockId") REFERENCES "ScanLock"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
||||||
|
|
||||||
|
-- AddForeignKey
|
||||||
|
ALTER TABLE "OfflineSyncReport" ADD CONSTRAINT "OfflineSyncReport_reviewedById_fkey" FOREIGN KEY ("reviewedById") REFERENCES "User"("id") ON DELETE SET NULL ON UPDATE CASCADE;
|
||||||
|
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
-- AlterEnum
|
||||||
|
ALTER TYPE "AdminAuditAction" ADD VALUE 'ticket_transferred';
|
||||||
|
|
||||||
|
-- AlterTable
|
||||||
|
ALTER TABLE "Event" ADD COLUMN "allowTicketTransfer" BOOLEAN NOT NULL DEFAULT true;
|
||||||
|
|
||||||
|
-- CreateTable
|
||||||
|
CREATE TABLE "TicketTransfer" (
|
||||||
|
"id" TEXT NOT NULL,
|
||||||
|
"ticketId" TEXT NOT NULL,
|
||||||
|
"fromHolderName" TEXT NOT NULL,
|
||||||
|
"fromUserId" TEXT,
|
||||||
|
"toName" TEXT NOT NULL,
|
||||||
|
"toUserId" TEXT,
|
||||||
|
"byUserId" TEXT,
|
||||||
|
"oldQrCode" TEXT,
|
||||||
|
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
|
||||||
|
CONSTRAINT "TicketTransfer_pkey" PRIMARY KEY ("id")
|
||||||
|
);
|
||||||
|
|
||||||
|
-- CreateIndex
|
||||||
|
CREATE INDEX "TicketTransfer_ticketId_idx" ON "TicketTransfer"("ticketId");
|
||||||
|
|
||||||
|
-- CreateIndex
|
||||||
|
CREATE INDEX "TicketTransfer_oldQrCode_idx" ON "TicketTransfer"("oldQrCode");
|
||||||
|
|
||||||
|
-- AddForeignKey
|
||||||
|
ALTER TABLE "TicketTransfer" ADD CONSTRAINT "TicketTransfer_ticketId_fkey" FOREIGN KEY ("ticketId") REFERENCES "Ticket"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
||||||
|
|
||||||
|
-- AddForeignKey
|
||||||
|
ALTER TABLE "TicketTransfer" ADD CONSTRAINT "TicketTransfer_toUserId_fkey" FOREIGN KEY ("toUserId") REFERENCES "User"("id") ON DELETE SET NULL ON UPDATE CASCADE;
|
||||||
|
|
||||||
|
-- AddForeignKey
|
||||||
|
ALTER TABLE "TicketTransfer" ADD CONSTRAINT "TicketTransfer_byUserId_fkey" FOREIGN KEY ("byUserId") REFERENCES "User"("id") ON DELETE SET NULL ON UPDATE CASCADE;
|
||||||
|
|
||||||
@@ -0,0 +1,78 @@
|
|||||||
|
-- AlterTable
|
||||||
|
ALTER TABLE "Event" ADD COLUMN "collectGender" BOOLEAN NOT NULL DEFAULT false;
|
||||||
|
|
||||||
|
-- CreateTable
|
||||||
|
CREATE TABLE "AllocationSet" (
|
||||||
|
"id" TEXT NOT NULL,
|
||||||
|
"eventId" TEXT NOT NULL,
|
||||||
|
"name" TEXT NOT NULL,
|
||||||
|
"showOnTicket" BOOLEAN NOT NULL DEFAULT false,
|
||||||
|
"order" INTEGER NOT NULL DEFAULT 0,
|
||||||
|
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
"updatedAt" TIMESTAMP(3) NOT NULL,
|
||||||
|
|
||||||
|
CONSTRAINT "AllocationSet_pkey" PRIMARY KEY ("id")
|
||||||
|
);
|
||||||
|
|
||||||
|
-- CreateTable
|
||||||
|
CREATE TABLE "AllocationGroup" (
|
||||||
|
"id" TEXT NOT NULL,
|
||||||
|
"setId" TEXT NOT NULL,
|
||||||
|
"name" TEXT NOT NULL,
|
||||||
|
"capacity" INTEGER,
|
||||||
|
"gender" TEXT,
|
||||||
|
"leaderUserId" TEXT,
|
||||||
|
"order" INTEGER NOT NULL DEFAULT 0,
|
||||||
|
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
"updatedAt" TIMESTAMP(3) NOT NULL,
|
||||||
|
|
||||||
|
CONSTRAINT "AllocationGroup_pkey" PRIMARY KEY ("id")
|
||||||
|
);
|
||||||
|
|
||||||
|
-- CreateTable
|
||||||
|
CREATE TABLE "AllocationAssignment" (
|
||||||
|
"id" TEXT NOT NULL,
|
||||||
|
"setId" TEXT NOT NULL,
|
||||||
|
"groupId" TEXT NOT NULL,
|
||||||
|
"attendeeId" TEXT NOT NULL,
|
||||||
|
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
|
||||||
|
CONSTRAINT "AllocationAssignment_pkey" PRIMARY KEY ("id")
|
||||||
|
);
|
||||||
|
|
||||||
|
-- CreateIndex
|
||||||
|
CREATE INDEX "AllocationSet_eventId_idx" ON "AllocationSet"("eventId");
|
||||||
|
|
||||||
|
-- CreateIndex
|
||||||
|
CREATE INDEX "AllocationGroup_setId_idx" ON "AllocationGroup"("setId");
|
||||||
|
|
||||||
|
-- CreateIndex
|
||||||
|
CREATE INDEX "AllocationGroup_leaderUserId_idx" ON "AllocationGroup"("leaderUserId");
|
||||||
|
|
||||||
|
-- CreateIndex
|
||||||
|
CREATE INDEX "AllocationAssignment_groupId_idx" ON "AllocationAssignment"("groupId");
|
||||||
|
|
||||||
|
-- CreateIndex
|
||||||
|
CREATE INDEX "AllocationAssignment_attendeeId_idx" ON "AllocationAssignment"("attendeeId");
|
||||||
|
|
||||||
|
-- CreateIndex
|
||||||
|
CREATE UNIQUE INDEX "AllocationAssignment_setId_attendeeId_key" ON "AllocationAssignment"("setId", "attendeeId");
|
||||||
|
|
||||||
|
-- AddForeignKey
|
||||||
|
ALTER TABLE "AllocationSet" ADD CONSTRAINT "AllocationSet_eventId_fkey" FOREIGN KEY ("eventId") REFERENCES "Event"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
||||||
|
|
||||||
|
-- AddForeignKey
|
||||||
|
ALTER TABLE "AllocationGroup" ADD CONSTRAINT "AllocationGroup_setId_fkey" FOREIGN KEY ("setId") REFERENCES "AllocationSet"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
||||||
|
|
||||||
|
-- AddForeignKey
|
||||||
|
ALTER TABLE "AllocationGroup" ADD CONSTRAINT "AllocationGroup_leaderUserId_fkey" FOREIGN KEY ("leaderUserId") REFERENCES "User"("id") ON DELETE SET NULL ON UPDATE CASCADE;
|
||||||
|
|
||||||
|
-- AddForeignKey
|
||||||
|
ALTER TABLE "AllocationAssignment" ADD CONSTRAINT "AllocationAssignment_setId_fkey" FOREIGN KEY ("setId") REFERENCES "AllocationSet"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
||||||
|
|
||||||
|
-- AddForeignKey
|
||||||
|
ALTER TABLE "AllocationAssignment" ADD CONSTRAINT "AllocationAssignment_groupId_fkey" FOREIGN KEY ("groupId") REFERENCES "AllocationGroup"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
||||||
|
|
||||||
|
-- AddForeignKey
|
||||||
|
ALTER TABLE "AllocationAssignment" ADD CONSTRAINT "AllocationAssignment_attendeeId_fkey" FOREIGN KEY ("attendeeId") REFERENCES "Attendee"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
||||||
|
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
-- AlterTable
|
||||||
|
ALTER TABLE "Event" ADD COLUMN "allowSponsorships" BOOLEAN NOT NULL DEFAULT false,
|
||||||
|
ADD COLUMN "showSponsorshipProgress" BOOLEAN NOT NULL DEFAULT true,
|
||||||
|
ADD COLUMN "sponsorshipGoalSpots" INTEGER;
|
||||||
|
|
||||||
|
-- AlterTable
|
||||||
|
ALTER TABLE "Payment" ADD COLUMN "isSponsorship" BOOLEAN NOT NULL DEFAULT false,
|
||||||
|
ADD COLUMN "sponsorAnonymous" BOOLEAN NOT NULL DEFAULT false,
|
||||||
|
ADD COLUMN "sponsorMessage" TEXT,
|
||||||
|
ADD COLUMN "sponsorName" TEXT;
|
||||||
|
|
||||||
@@ -0,0 +1,122 @@
|
|||||||
|
-- AlterEnum
|
||||||
|
-- This migration adds more than one value to an enum.
|
||||||
|
-- With PostgreSQL versions 11 and earlier, this is not possible
|
||||||
|
-- in a single migration. This can be worked around by creating
|
||||||
|
-- multiple migrations, each migration adding only one value to
|
||||||
|
-- the enum.
|
||||||
|
|
||||||
|
|
||||||
|
ALTER TYPE "FormFieldType" ADD VALUE 'rating';
|
||||||
|
ALTER TYPE "FormFieldType" ADD VALUE 'multiple_choice';
|
||||||
|
|
||||||
|
-- CreateTable
|
||||||
|
CREATE TABLE "FeedbackForm" (
|
||||||
|
"id" TEXT NOT NULL,
|
||||||
|
"eventId" TEXT NOT NULL,
|
||||||
|
"sendAt" TIMESTAMP(3),
|
||||||
|
"audience" TEXT NOT NULL DEFAULT 'checked_in',
|
||||||
|
"anonymous" BOOLEAN NOT NULL DEFAULT false,
|
||||||
|
"intro" TEXT,
|
||||||
|
"sentAt" TIMESTAMP(3),
|
||||||
|
"reminderSentAt" TIMESTAMP(3),
|
||||||
|
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
"updatedAt" TIMESTAMP(3) NOT NULL,
|
||||||
|
|
||||||
|
CONSTRAINT "FeedbackForm_pkey" PRIMARY KEY ("id")
|
||||||
|
);
|
||||||
|
|
||||||
|
-- CreateTable
|
||||||
|
CREATE TABLE "FeedbackField" (
|
||||||
|
"id" TEXT NOT NULL,
|
||||||
|
"formId" TEXT NOT NULL,
|
||||||
|
"type" "FormFieldType" NOT NULL,
|
||||||
|
"label" TEXT NOT NULL,
|
||||||
|
"isRequired" BOOLEAN NOT NULL DEFAULT false,
|
||||||
|
"order" INTEGER NOT NULL DEFAULT 0,
|
||||||
|
"helpText" TEXT,
|
||||||
|
"options" JSONB,
|
||||||
|
|
||||||
|
CONSTRAINT "FeedbackField_pkey" PRIMARY KEY ("id")
|
||||||
|
);
|
||||||
|
|
||||||
|
-- CreateTable
|
||||||
|
CREATE TABLE "FeedbackInvite" (
|
||||||
|
"id" TEXT NOT NULL,
|
||||||
|
"formId" TEXT NOT NULL,
|
||||||
|
"userId" TEXT NOT NULL,
|
||||||
|
"tokenHash" TEXT NOT NULL,
|
||||||
|
"sentAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
"remindedAt" TIMESTAMP(3),
|
||||||
|
"respondedAt" TIMESTAMP(3),
|
||||||
|
|
||||||
|
CONSTRAINT "FeedbackInvite_pkey" PRIMARY KEY ("id")
|
||||||
|
);
|
||||||
|
|
||||||
|
-- CreateTable
|
||||||
|
CREATE TABLE "FeedbackResponse" (
|
||||||
|
"id" TEXT NOT NULL,
|
||||||
|
"formId" TEXT NOT NULL,
|
||||||
|
"userId" TEXT,
|
||||||
|
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
|
||||||
|
CONSTRAINT "FeedbackResponse_pkey" PRIMARY KEY ("id")
|
||||||
|
);
|
||||||
|
|
||||||
|
-- CreateTable
|
||||||
|
CREATE TABLE "FeedbackAnswer" (
|
||||||
|
"id" TEXT NOT NULL,
|
||||||
|
"responseId" TEXT NOT NULL,
|
||||||
|
"fieldId" TEXT NOT NULL,
|
||||||
|
"value" TEXT NOT NULL,
|
||||||
|
|
||||||
|
CONSTRAINT "FeedbackAnswer_pkey" PRIMARY KEY ("id")
|
||||||
|
);
|
||||||
|
|
||||||
|
-- CreateIndex
|
||||||
|
CREATE UNIQUE INDEX "FeedbackForm_eventId_key" ON "FeedbackForm"("eventId");
|
||||||
|
|
||||||
|
-- CreateIndex
|
||||||
|
CREATE INDEX "FeedbackField_formId_idx" ON "FeedbackField"("formId");
|
||||||
|
|
||||||
|
-- CreateIndex
|
||||||
|
CREATE UNIQUE INDEX "FeedbackInvite_tokenHash_key" ON "FeedbackInvite"("tokenHash");
|
||||||
|
|
||||||
|
-- CreateIndex
|
||||||
|
CREATE INDEX "FeedbackInvite_userId_idx" ON "FeedbackInvite"("userId");
|
||||||
|
|
||||||
|
-- CreateIndex
|
||||||
|
CREATE UNIQUE INDEX "FeedbackInvite_formId_userId_key" ON "FeedbackInvite"("formId", "userId");
|
||||||
|
|
||||||
|
-- CreateIndex
|
||||||
|
CREATE INDEX "FeedbackResponse_formId_idx" ON "FeedbackResponse"("formId");
|
||||||
|
|
||||||
|
-- CreateIndex
|
||||||
|
CREATE INDEX "FeedbackAnswer_responseId_idx" ON "FeedbackAnswer"("responseId");
|
||||||
|
|
||||||
|
-- CreateIndex
|
||||||
|
CREATE INDEX "FeedbackAnswer_fieldId_idx" ON "FeedbackAnswer"("fieldId");
|
||||||
|
|
||||||
|
-- AddForeignKey
|
||||||
|
ALTER TABLE "FeedbackForm" ADD CONSTRAINT "FeedbackForm_eventId_fkey" FOREIGN KEY ("eventId") REFERENCES "Event"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
||||||
|
|
||||||
|
-- AddForeignKey
|
||||||
|
ALTER TABLE "FeedbackField" ADD CONSTRAINT "FeedbackField_formId_fkey" FOREIGN KEY ("formId") REFERENCES "FeedbackForm"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
||||||
|
|
||||||
|
-- AddForeignKey
|
||||||
|
ALTER TABLE "FeedbackInvite" ADD CONSTRAINT "FeedbackInvite_formId_fkey" FOREIGN KEY ("formId") REFERENCES "FeedbackForm"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
||||||
|
|
||||||
|
-- AddForeignKey
|
||||||
|
ALTER TABLE "FeedbackInvite" ADD CONSTRAINT "FeedbackInvite_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
||||||
|
|
||||||
|
-- AddForeignKey
|
||||||
|
ALTER TABLE "FeedbackResponse" ADD CONSTRAINT "FeedbackResponse_formId_fkey" FOREIGN KEY ("formId") REFERENCES "FeedbackForm"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
||||||
|
|
||||||
|
-- AddForeignKey
|
||||||
|
ALTER TABLE "FeedbackResponse" ADD CONSTRAINT "FeedbackResponse_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE SET NULL ON UPDATE CASCADE;
|
||||||
|
|
||||||
|
-- AddForeignKey
|
||||||
|
ALTER TABLE "FeedbackAnswer" ADD CONSTRAINT "FeedbackAnswer_responseId_fkey" FOREIGN KEY ("responseId") REFERENCES "FeedbackResponse"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
||||||
|
|
||||||
|
-- AddForeignKey
|
||||||
|
ALTER TABLE "FeedbackAnswer" ADD CONSTRAINT "FeedbackAnswer_fieldId_fkey" FOREIGN KEY ("fieldId") REFERENCES "FeedbackField"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
||||||
|
|
||||||
+238
-167
@@ -103,8 +103,16 @@ model User {
|
|||||||
couponsApplied CouponRedemption[] @relation("CouponRedemptionAppliedBy")
|
couponsApplied CouponRedemption[] @relation("CouponRedemptionAppliedBy")
|
||||||
|
|
||||||
attendeeProfiles Attendee[]
|
attendeeProfiles Attendee[]
|
||||||
heldTickets Ticket[] @relation("TicketHolder")
|
heldTickets Ticket[] @relation("TicketHolder")
|
||||||
waitlistEntries WaitlistEntry[]
|
waitlistEntries WaitlistEntry[]
|
||||||
|
scanLocks ScanLock[] @relation("ScanLockOwner")
|
||||||
|
transfersTo TicketTransfer[] @relation("TransferRecipient")
|
||||||
|
transfersBy TicketTransfer[] @relation("TransferActor")
|
||||||
|
ledGroups AllocationGroup[] @relation("AllocationGroupLeader")
|
||||||
|
feedbackInvites FeedbackInvite[]
|
||||||
|
feedbackGiven FeedbackResponse[]
|
||||||
|
scanLocksForced ScanLock[] @relation("ScanLockForcedBy")
|
||||||
|
syncReportsDone OfflineSyncReport[] @relation("SyncReportReviewer")
|
||||||
|
|
||||||
twoFactorChallenges TwoFactorChallenge[]
|
twoFactorChallenges TwoFactorChallenge[]
|
||||||
trustedDevices TrustedDevice[]
|
trustedDevices TrustedDevice[]
|
||||||
@@ -138,6 +146,14 @@ model Event {
|
|||||||
// them for waitlistOfferHours. waitlistPartialOffers: offer what's free even if it's
|
// them for waitlistOfferHours. waitlistPartialOffers: offer what's free even if it's
|
||||||
// fewer places than asked for (otherwise skip to the next person who fits).
|
// fewer places than asked for (otherwise skip to the next person who fits).
|
||||||
waitlistEnabled Boolean @default(false)
|
waitlistEnabled Boolean @default(false)
|
||||||
|
allowTicketTransfer Boolean @default(true)
|
||||||
|
collectGender Boolean @default(false)
|
||||||
|
// Sponsor a spot: public donations into a bursary pool for this event.
|
||||||
|
allowSponsorships Boolean @default(false)
|
||||||
|
sponsorshipGoalSpots Int?
|
||||||
|
showSponsorshipProgress Boolean @default(true)
|
||||||
|
feedbackForm FeedbackForm?
|
||||||
|
allocationSets AllocationSet[]
|
||||||
waitlistOfferHours Int @default(24)
|
waitlistOfferHours Int @default(24)
|
||||||
waitlistPartialOffers Boolean @default(true)
|
waitlistPartialOffers Boolean @default(true)
|
||||||
contactName String?
|
contactName String?
|
||||||
@@ -175,6 +191,7 @@ model Event {
|
|||||||
coupons CouponEvent[]
|
coupons CouponEvent[]
|
||||||
consentRequests ConsentRequest[]
|
consentRequests ConsentRequest[]
|
||||||
waitlistEntries WaitlistEntry[]
|
waitlistEntries WaitlistEntry[]
|
||||||
|
scanLocks ScanLock[]
|
||||||
|
|
||||||
@@index([createdById])
|
@@index([createdById])
|
||||||
@@index([closedById])
|
@@index([closedById])
|
||||||
@@ -320,6 +337,11 @@ model Payment {
|
|||||||
registrationId String?
|
registrationId String?
|
||||||
eventId String?
|
eventId String?
|
||||||
isDonation Boolean @default(false)
|
isDonation Boolean @default(false)
|
||||||
|
// A "sponsor a spot" donation (also isDonation): goes into the event's sponsorship pool.
|
||||||
|
isSponsorship Boolean @default(false)
|
||||||
|
sponsorName String?
|
||||||
|
sponsorMessage String?
|
||||||
|
sponsorAnonymous Boolean @default(false)
|
||||||
externalId String? @unique
|
externalId String? @unique
|
||||||
status String?
|
status String?
|
||||||
originalPaymentId String?
|
originalPaymentId String?
|
||||||
@@ -361,6 +383,7 @@ model Ticket {
|
|||||||
user User @relation(fields: [userId], references: [id], onDelete: Restrict)
|
user User @relation(fields: [userId], references: [id], onDelete: Restrict)
|
||||||
event Event @relation(fields: [eventId], references: [id], onDelete: Restrict)
|
event Event @relation(fields: [eventId], references: [id], onDelete: Restrict)
|
||||||
usages TicketUsage[]
|
usages TicketUsage[]
|
||||||
|
transfers TicketTransfer[]
|
||||||
|
|
||||||
@@index([holderUserId])
|
@@index([holderUserId])
|
||||||
@@index([eventId])
|
@@index([eventId])
|
||||||
@@ -370,13 +393,20 @@ model Ticket {
|
|||||||
}
|
}
|
||||||
|
|
||||||
model TicketUsage {
|
model TicketUsage {
|
||||||
id String @id @default(uuid())
|
id String @id @default(uuid())
|
||||||
ticketId String
|
ticketId String
|
||||||
scannedById String
|
scannedById String
|
||||||
scannedAt DateTime @default(now())
|
scannedAt DateTime @default(now())
|
||||||
quantityRedeemed Int @default(1)
|
quantityRedeemed Int @default(1)
|
||||||
ticket Ticket @relation(fields: [ticketId], references: [id], onDelete: Restrict)
|
// Offline scanning: the device's id for the scan (makes syncing idempotent), and
|
||||||
scannedBy User @relation(fields: [scannedById], references: [id], onDelete: Restrict)
|
// the offline lock it was made under.
|
||||||
|
clientScanId String? @unique
|
||||||
|
offline Boolean @default(false)
|
||||||
|
scanLockId String?
|
||||||
|
syncedAt DateTime?
|
||||||
|
ticket Ticket @relation(fields: [ticketId], references: [id], onDelete: Restrict)
|
||||||
|
scannedBy User @relation(fields: [scannedById], references: [id], onDelete: Restrict)
|
||||||
|
scanLock ScanLock? @relation(fields: [scanLockId], references: [id], onDelete: SetNull)
|
||||||
|
|
||||||
@@index([ticketId])
|
@@index([ticketId])
|
||||||
@@index([scannedAt])
|
@@index([scannedAt])
|
||||||
@@ -461,6 +491,11 @@ enum AdminAuditAction {
|
|||||||
consent_override
|
consent_override
|
||||||
consent_rerequested
|
consent_rerequested
|
||||||
medical_list_viewed
|
medical_list_viewed
|
||||||
|
scan_lock_acquired
|
||||||
|
scan_lock_released
|
||||||
|
scan_lock_force_released
|
||||||
|
offline_sync
|
||||||
|
ticket_transferred
|
||||||
}
|
}
|
||||||
|
|
||||||
// Append-only audit trail for admin/supervisor-initiated actions with money or
|
// Append-only audit trail for admin/supervisor-initiated actions with money or
|
||||||
@@ -506,6 +541,8 @@ enum FormFieldType {
|
|||||||
numeric
|
numeric
|
||||||
statement
|
statement
|
||||||
paragraph
|
paragraph
|
||||||
|
rating
|
||||||
|
multiple_choice
|
||||||
}
|
}
|
||||||
|
|
||||||
model EventForm {
|
model EventForm {
|
||||||
@@ -601,6 +638,7 @@ model Section {
|
|||||||
|
|
||||||
event Event @relation(fields: [eventId], references: [id], onDelete: Cascade)
|
event Event @relation(fields: [eventId], references: [id], onDelete: Cascade)
|
||||||
allowedOptions SectionOption[]
|
allowedOptions SectionOption[]
|
||||||
|
scanLocks ScanLock[]
|
||||||
|
|
||||||
@@index([eventId])
|
@@index([eventId])
|
||||||
}
|
}
|
||||||
@@ -713,167 +751,6 @@ model EventCashupPersonCountDenomination {
|
|||||||
@@index([countId])
|
@@index([countId])
|
||||||
}
|
}
|
||||||
|
|
||||||
// ─── Church Website Models (disabled — kept for reference, not active Prisma models) ──
|
|
||||||
//
|
|
||||||
// model Ministry {
|
|
||||||
// id String @id @default(uuid())
|
|
||||||
// slug String @unique
|
|
||||||
// title String
|
|
||||||
// description String?
|
|
||||||
// image String?
|
|
||||||
// isActive Boolean @default(true)
|
|
||||||
// order Int @default(0)
|
|
||||||
// leaderId String?
|
|
||||||
// leader TeamMember? @relation(fields: [leaderId], references: [id], onDelete: SetNull)
|
|
||||||
// interests MinistryInterest[]
|
|
||||||
// createdAt DateTime @default(now())
|
|
||||||
// updatedAt DateTime @updatedAt
|
|
||||||
//
|
|
||||||
// @@index([isActive, order])
|
|
||||||
// @@index([leaderId])
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// model TeamMember {
|
|
||||||
// id String @id @default(uuid())
|
|
||||||
// name String
|
|
||||||
// title String
|
|
||||||
// bio String?
|
|
||||||
// photo String?
|
|
||||||
// order Int @default(0)
|
|
||||||
// isActive Boolean @default(true)
|
|
||||||
// email String?
|
|
||||||
// createdAt DateTime @default(now())
|
|
||||||
// updatedAt DateTime @updatedAt
|
|
||||||
// ministries Ministry[]
|
|
||||||
//
|
|
||||||
// @@index([isActive, order])
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// model ContentBlock {
|
|
||||||
// id String @id @default(uuid())
|
|
||||||
// page String
|
|
||||||
// key String
|
|
||||||
// value String
|
|
||||||
// type String @default("text")
|
|
||||||
// updatedAt DateTime @updatedAt
|
|
||||||
//
|
|
||||||
// @@unique([page, key])
|
|
||||||
// @@index([page])
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// model ChurchDocument {
|
|
||||||
// id String @id @default(uuid())
|
|
||||||
// title String
|
|
||||||
// description String?
|
|
||||||
// fileUrl String
|
|
||||||
// category String @default("other")
|
|
||||||
// isPublic Boolean @default(true)
|
|
||||||
// uploadedAt DateTime @default(now())
|
|
||||||
// updatedAt DateTime @updatedAt
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// model FellowshipGroup {
|
|
||||||
// id String @id @default(uuid())
|
|
||||||
// name String
|
|
||||||
// description String?
|
|
||||||
// leader String?
|
|
||||||
// isActive Boolean @default(true)
|
|
||||||
// order Int @default(0)
|
|
||||||
// members ChurchMember[]
|
|
||||||
// createdAt DateTime @default(now())
|
|
||||||
// updatedAt DateTime @updatedAt
|
|
||||||
//
|
|
||||||
// @@index([isActive, order])
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// model ChurchMember {
|
|
||||||
// id String @id @default(uuid())
|
|
||||||
// status String @default("pending")
|
|
||||||
// mainName String
|
|
||||||
// mainEmail String
|
|
||||||
// mainPhone String?
|
|
||||||
// mainBirthday DateTime?
|
|
||||||
// mainOccupation String?
|
|
||||||
// mainEmploymentStatus String?
|
|
||||||
// mainDateOfSalvation DateTime?
|
|
||||||
// mainDateOfWaterBaptism DateTime?
|
|
||||||
// mainHolySpiritBaptism Boolean @default(false)
|
|
||||||
// spouseName String?
|
|
||||||
// spouseEmail String?
|
|
||||||
// spousePhone String?
|
|
||||||
// spouseBirthday DateTime?
|
|
||||||
// spouseOccupation String?
|
|
||||||
// spouseEmploymentStatus String?
|
|
||||||
// spouseDateOfSalvation DateTime?
|
|
||||||
// spouseDateOfWaterBaptism DateTime?
|
|
||||||
// spouseHolySpiritBaptism Boolean?
|
|
||||||
// homeAddress String?
|
|
||||||
// inFellowshipGroup Boolean @default(false)
|
|
||||||
// fellowshipGroupId String?
|
|
||||||
// fellowshipGroup FellowshipGroup? @relation(fields: [fellowshipGroupId], references: [id], onDelete: SetNull)
|
|
||||||
// membershipConfirmed Boolean @default(false)
|
|
||||||
// notes String?
|
|
||||||
// appliedAt DateTime @default(now())
|
|
||||||
// approvedAt DateTime?
|
|
||||||
// createdAt DateTime @default(now())
|
|
||||||
// updatedAt DateTime @updatedAt
|
|
||||||
// children ChurchChild[]
|
|
||||||
// ministryInterests MinistryInterest[]
|
|
||||||
// donations Donation[]
|
|
||||||
//
|
|
||||||
// @@index([status])
|
|
||||||
// @@index([mainEmail])
|
|
||||||
// @@index([fellowshipGroupId])
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// model ChurchChild {
|
|
||||||
// id String @id @default(uuid())
|
|
||||||
// memberId String
|
|
||||||
// name String
|
|
||||||
// birthday DateTime?
|
|
||||||
// member ChurchMember @relation(fields: [memberId], references: [id], onDelete: Cascade)
|
|
||||||
//
|
|
||||||
// @@index([memberId])
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// model MinistryInterest {
|
|
||||||
// id String @id @default(uuid())
|
|
||||||
// memberId String
|
|
||||||
// ministryId String
|
|
||||||
// forSpouse Boolean @default(false)
|
|
||||||
// member ChurchMember @relation(fields: [memberId], references: [id], onDelete: Cascade)
|
|
||||||
// ministry Ministry @relation(fields: [ministryId], references: [id], onDelete: Cascade)
|
|
||||||
//
|
|
||||||
// @@unique([memberId, ministryId, forSpouse])
|
|
||||||
// @@index([memberId])
|
|
||||||
// @@index([ministryId])
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// model Donation {
|
|
||||||
// id String @id @default(uuid())
|
|
||||||
// donorName String?
|
|
||||||
// donorEmail String?
|
|
||||||
// donorPhone String?
|
|
||||||
// amount Float
|
|
||||||
// method String
|
|
||||||
// reference String?
|
|
||||||
// note String?
|
|
||||||
// isAnonymous Boolean @default(false)
|
|
||||||
// linkedMemberId String?
|
|
||||||
// linkedMember ChurchMember? @relation(fields: [linkedMemberId], references: [id], onDelete: SetNull)
|
|
||||||
// createdAt DateTime @default(now())
|
|
||||||
// updatedAt DateTime @updatedAt
|
|
||||||
//
|
|
||||||
// @@index([linkedMemberId])
|
|
||||||
// @@index([createdAt])
|
|
||||||
// @@index([method])
|
|
||||||
// }
|
|
||||||
|
|
||||||
// ─── Coupon codes ─────────────────────────────────────────────────────────────
|
|
||||||
// A code gives a percentage, fixed-amount or 100% (comp) discount on a registration.
|
|
||||||
// The discount is locked into a CouponRedemption when applied, like early-bird
|
|
||||||
// tranches: later pricing refreshes never re-price it (see utils/coupons.js).
|
|
||||||
|
|
||||||
enum CouponType {
|
enum CouponType {
|
||||||
percent
|
percent
|
||||||
fixed
|
fixed
|
||||||
@@ -974,6 +851,151 @@ enum TicketDelivery {
|
|||||||
|
|
||||||
// One named person on a group registration, for one main-ticket place. Gets their
|
// One named person on a group registration, for one main-ticket place. Gets their
|
||||||
// own quantity-1 ticket and their own attendee form response.
|
// own quantity-1 ticket and their own attendee form response.
|
||||||
|
/// Post-event survey. Sent at sendAt to checked-in attendees (or everyone registered),
|
||||||
|
/// with one reminder 3 days later. anonymous responses aren't linked to a person.
|
||||||
|
model FeedbackForm {
|
||||||
|
id String @id @default(uuid())
|
||||||
|
eventId String @unique
|
||||||
|
sendAt DateTime?
|
||||||
|
audience String @default("checked_in") // 'checked_in' | 'all'
|
||||||
|
anonymous Boolean @default(false)
|
||||||
|
intro String?
|
||||||
|
sentAt DateTime?
|
||||||
|
reminderSentAt DateTime?
|
||||||
|
createdAt DateTime @default(now())
|
||||||
|
updatedAt DateTime @updatedAt
|
||||||
|
event Event @relation(fields: [eventId], references: [id], onDelete: Cascade)
|
||||||
|
fields FeedbackField[]
|
||||||
|
invites FeedbackInvite[]
|
||||||
|
responses FeedbackResponse[]
|
||||||
|
}
|
||||||
|
|
||||||
|
model FeedbackField {
|
||||||
|
id String @id @default(uuid())
|
||||||
|
formId String
|
||||||
|
type FormFieldType
|
||||||
|
label String
|
||||||
|
isRequired Boolean @default(false)
|
||||||
|
order Int @default(0)
|
||||||
|
helpText String?
|
||||||
|
options Json?
|
||||||
|
form FeedbackForm @relation(fields: [formId], references: [id], onDelete: Cascade)
|
||||||
|
answers FeedbackAnswer[]
|
||||||
|
|
||||||
|
@@index([formId])
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Who was asked. tokenHash is the HMAC of the link token (the token itself isn't stored).
|
||||||
|
model FeedbackInvite {
|
||||||
|
id String @id @default(uuid())
|
||||||
|
formId String
|
||||||
|
userId String
|
||||||
|
tokenHash String @unique
|
||||||
|
sentAt DateTime @default(now())
|
||||||
|
remindedAt DateTime?
|
||||||
|
respondedAt DateTime?
|
||||||
|
form FeedbackForm @relation(fields: [formId], references: [id], onDelete: Cascade)
|
||||||
|
user User @relation(fields: [userId], references: [id], onDelete: Cascade)
|
||||||
|
|
||||||
|
@@unique([formId, userId])
|
||||||
|
@@index([userId])
|
||||||
|
}
|
||||||
|
|
||||||
|
model FeedbackResponse {
|
||||||
|
id String @id @default(uuid())
|
||||||
|
formId String
|
||||||
|
userId String? // null when the form is anonymous
|
||||||
|
createdAt DateTime @default(now())
|
||||||
|
form FeedbackForm @relation(fields: [formId], references: [id], onDelete: Cascade)
|
||||||
|
user User? @relation(fields: [userId], references: [id], onDelete: SetNull)
|
||||||
|
answers FeedbackAnswer[]
|
||||||
|
|
||||||
|
@@index([formId])
|
||||||
|
}
|
||||||
|
|
||||||
|
model FeedbackAnswer {
|
||||||
|
id String @id @default(uuid())
|
||||||
|
responseId String
|
||||||
|
fieldId String
|
||||||
|
value String
|
||||||
|
response FeedbackResponse @relation(fields: [responseId], references: [id], onDelete: Cascade)
|
||||||
|
field FeedbackField @relation(fields: [fieldId], references: [id], onDelete: Cascade)
|
||||||
|
|
||||||
|
@@index([responseId])
|
||||||
|
@@index([fieldId])
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A way of splitting an event's attendees up: "Rooms", "Small groups", "Buses".
|
||||||
|
model AllocationSet {
|
||||||
|
id String @id @default(uuid())
|
||||||
|
eventId String
|
||||||
|
name String
|
||||||
|
showOnTicket Boolean @default(false)
|
||||||
|
order Int @default(0)
|
||||||
|
createdAt DateTime @default(now())
|
||||||
|
updatedAt DateTime @updatedAt
|
||||||
|
event Event @relation(fields: [eventId], references: [id], onDelete: Cascade)
|
||||||
|
groups AllocationGroup[]
|
||||||
|
assignments AllocationAssignment[]
|
||||||
|
|
||||||
|
@@index([eventId])
|
||||||
|
}
|
||||||
|
|
||||||
|
/// One room / group / bus in a set. gender ('male' | 'female') restricts who can join.
|
||||||
|
model AllocationGroup {
|
||||||
|
id String @id @default(uuid())
|
||||||
|
setId String
|
||||||
|
name String
|
||||||
|
capacity Int?
|
||||||
|
gender String?
|
||||||
|
leaderUserId String?
|
||||||
|
order Int @default(0)
|
||||||
|
createdAt DateTime @default(now())
|
||||||
|
updatedAt DateTime @updatedAt
|
||||||
|
set AllocationSet @relation(fields: [setId], references: [id], onDelete: Cascade)
|
||||||
|
leader User? @relation("AllocationGroupLeader", fields: [leaderUserId], references: [id], onDelete: SetNull)
|
||||||
|
assignments AllocationAssignment[]
|
||||||
|
|
||||||
|
@@index([setId])
|
||||||
|
@@index([leaderUserId])
|
||||||
|
}
|
||||||
|
|
||||||
|
/// An attendee placed in a group. One group per set.
|
||||||
|
model AllocationAssignment {
|
||||||
|
id String @id @default(uuid())
|
||||||
|
setId String
|
||||||
|
groupId String
|
||||||
|
attendeeId String
|
||||||
|
createdAt DateTime @default(now())
|
||||||
|
set AllocationSet @relation(fields: [setId], references: [id], onDelete: Cascade)
|
||||||
|
group AllocationGroup @relation(fields: [groupId], references: [id], onDelete: Cascade)
|
||||||
|
attendee Attendee @relation(fields: [attendeeId], references: [id], onDelete: Cascade)
|
||||||
|
|
||||||
|
@@unique([setId, attendeeId])
|
||||||
|
@@index([groupId])
|
||||||
|
@@index([attendeeId])
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A ticket handed to someone else. oldQrCode is the code that stopped working (null
|
||||||
|
/// when one place was split off a shared group ticket, whose code stays valid).
|
||||||
|
model TicketTransfer {
|
||||||
|
id String @id @default(uuid())
|
||||||
|
ticketId String
|
||||||
|
fromHolderName String
|
||||||
|
fromUserId String?
|
||||||
|
toName String
|
||||||
|
toUserId String?
|
||||||
|
byUserId String?
|
||||||
|
oldQrCode String?
|
||||||
|
createdAt DateTime @default(now())
|
||||||
|
ticket Ticket @relation(fields: [ticketId], references: [id], onDelete: Cascade)
|
||||||
|
toUser User? @relation("TransferRecipient", fields: [toUserId], references: [id], onDelete: SetNull)
|
||||||
|
byUser User? @relation("TransferActor", fields: [byUserId], references: [id], onDelete: SetNull)
|
||||||
|
|
||||||
|
@@index([ticketId])
|
||||||
|
@@index([oldQrCode])
|
||||||
|
}
|
||||||
|
|
||||||
model Attendee {
|
model Attendee {
|
||||||
id String @id @default(uuid())
|
id String @id @default(uuid())
|
||||||
registrationId String
|
registrationId String
|
||||||
@@ -998,6 +1020,7 @@ model Attendee {
|
|||||||
ticket Ticket?
|
ticket Ticket?
|
||||||
formResponses FormResponse[]
|
formResponses FormResponse[]
|
||||||
consentRequests ConsentRequest[]
|
consentRequests ConsentRequest[]
|
||||||
|
allocations AllocationAssignment[]
|
||||||
|
|
||||||
@@index([registrationId])
|
@@index([registrationId])
|
||||||
@@index([registrationOptionId])
|
@@index([registrationOptionId])
|
||||||
@@ -1085,3 +1108,51 @@ model WaitlistEntry {
|
|||||||
@@index([userId])
|
@@index([userId])
|
||||||
@@index([registrationId])
|
@@index([registrationId])
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ─── Offline scanning ─────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
// Locks a section (or the whole event, sectionId null) to one device for offline
|
||||||
|
// scanning, so two devices can never redeem the same ticket while offline.
|
||||||
|
// One active (releasedAt null) lock per scope — enforced in utils/scanLocks.js.
|
||||||
|
model ScanLock {
|
||||||
|
id String @id @default(uuid())
|
||||||
|
eventId String
|
||||||
|
sectionId String?
|
||||||
|
deviceId String
|
||||||
|
deviceName String?
|
||||||
|
userId String
|
||||||
|
lockedAt DateTime @default(now())
|
||||||
|
snapshotAt DateTime?
|
||||||
|
lastSyncAt DateTime?
|
||||||
|
releasedAt DateTime?
|
||||||
|
forceReleasedById String?
|
||||||
|
event Event @relation(fields: [eventId], references: [id], onDelete: Cascade)
|
||||||
|
section Section? @relation(fields: [sectionId], references: [id], onDelete: Cascade)
|
||||||
|
user User @relation("ScanLockOwner", fields: [userId], references: [id], onDelete: Cascade)
|
||||||
|
forceReleasedBy User? @relation("ScanLockForcedBy", fields: [forceReleasedById], references: [id], onDelete: SetNull)
|
||||||
|
usages TicketUsage[]
|
||||||
|
syncReports OfflineSyncReport[]
|
||||||
|
|
||||||
|
@@index([eventId, releasedAt])
|
||||||
|
@@index([userId])
|
||||||
|
@@index([sectionId])
|
||||||
|
@@index([forceReleasedById])
|
||||||
|
}
|
||||||
|
|
||||||
|
// One sync of queued offline scans; `conflicts` lists scans that needed a person to look.
|
||||||
|
model OfflineSyncReport {
|
||||||
|
id String @id @default(uuid())
|
||||||
|
scanLockId String
|
||||||
|
accepted Int @default(0)
|
||||||
|
duplicates Int @default(0)
|
||||||
|
conflicts Json @default("[]")
|
||||||
|
afterForceRelease Boolean @default(false)
|
||||||
|
createdAt DateTime @default(now())
|
||||||
|
reviewedAt DateTime?
|
||||||
|
reviewedById String?
|
||||||
|
scanLock ScanLock @relation(fields: [scanLockId], references: [id], onDelete: Cascade)
|
||||||
|
reviewedBy User? @relation("SyncReportReviewer", fields: [reviewedById], references: [id], onDelete: SetNull)
|
||||||
|
|
||||||
|
@@index([scanLockId])
|
||||||
|
@@index([reviewedById])
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,323 @@
|
|||||||
|
const prisma = require('../config/db');
|
||||||
|
const { safeErrorMessage } = require('../utils/errorUtils');
|
||||||
|
const { logAdminAction } = require('../utils/adminAudit');
|
||||||
|
const { getClientIp } = require('../utils/requestUtils');
|
||||||
|
const { allocationError, cleanGender, joinBlocker, autoAllocate } = require('../utils/allocation');
|
||||||
|
|
||||||
|
const SUPERVISORS = ['admin', 'supervisor'];
|
||||||
|
const fail = (res, error) => res.status(error.statusCode || (res.statusCode === 200 ? 400 : res.statusCode)).json({ message: safeErrorMessage(error) });
|
||||||
|
|
||||||
|
const cleanName = (v, what) => {
|
||||||
|
const name = String(v || '').trim();
|
||||||
|
if (!name) throw allocationError(`Enter a name for the ${what}.`);
|
||||||
|
return name.slice(0, 100);
|
||||||
|
};
|
||||||
|
const cleanCapacity = (v) => {
|
||||||
|
if (v === undefined || v === null || v === '') return null;
|
||||||
|
const n = parseInt(v, 10);
|
||||||
|
if (!Number.isFinite(n) || n < 1 || n > 10000) throw allocationError('Capacity must be a whole number of at least 1.');
|
||||||
|
return n;
|
||||||
|
};
|
||||||
|
|
||||||
|
/** Named attendees on the event's live registrations. */
|
||||||
|
async function eventAttendees(eventId) {
|
||||||
|
return prisma.attendee.findMany({
|
||||||
|
where: { registration: { eventId, status: { not: 'cancelled' } } },
|
||||||
|
select: {
|
||||||
|
id: true, name: true, gender: true, dateOfBirth: true, registrationId: true, email: true, phone: true,
|
||||||
|
registration: { select: { user: { select: { name: true } } } },
|
||||||
|
},
|
||||||
|
orderBy: [{ registrationId: 'asc' }, { order: 'asc' }],
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async function loadSet(id) {
|
||||||
|
const set = await prisma.allocationSet.findUnique({ where: { id }, include: { groups: { orderBy: { order: 'asc' } } } });
|
||||||
|
if (!set) throw allocationError('Allocation set not found', 404);
|
||||||
|
return set;
|
||||||
|
}
|
||||||
|
|
||||||
|
// @desc Everything the allocation board needs for an event
|
||||||
|
// @route GET /api/allocations/event/:eventId
|
||||||
|
// @access Private/Supervisor
|
||||||
|
const getBoard = async (req, res) => {
|
||||||
|
try {
|
||||||
|
const event = await prisma.event.findUnique({
|
||||||
|
where: { id: req.params.eventId },
|
||||||
|
select: { id: true, title: true, startDate: true, collectGender: true, allowNamedAttendees: true, requiresParentalConsent: true },
|
||||||
|
});
|
||||||
|
if (!event) throw allocationError('Event not found', 404);
|
||||||
|
const [sets, attendees, leaders, places] = await Promise.all([
|
||||||
|
prisma.allocationSet.findMany({
|
||||||
|
where: { eventId: event.id },
|
||||||
|
include: { groups: { orderBy: { order: 'asc' }, include: { leader: { select: { id: true, name: true } } } }, assignments: { select: { attendeeId: true, groupId: true } } },
|
||||||
|
orderBy: [{ order: 'asc' }, { createdAt: 'asc' }],
|
||||||
|
}),
|
||||||
|
eventAttendees(event.id),
|
||||||
|
prisma.user.findMany({ where: { role: { in: ['staff', 'supervisor', 'admin'] }, isActive: true }, select: { id: true, name: true }, orderBy: { name: 'asc' } }),
|
||||||
|
prisma.registrationOption.aggregate({
|
||||||
|
where: { registration: { eventId: event.id, status: { not: 'cancelled' } }, eventOption: { isMainTicket: true } },
|
||||||
|
_sum: { quantity: true },
|
||||||
|
}),
|
||||||
|
]);
|
||||||
|
res.json({
|
||||||
|
event,
|
||||||
|
sets,
|
||||||
|
attendees: attendees.map(a => ({ id: a.id, name: a.name, gender: a.gender, dateOfBirth: a.dateOfBirth, registrationId: a.registrationId, bookedBy: a.registration.user?.name || '' })),
|
||||||
|
leaders,
|
||||||
|
unnamedPlaces: Math.max(0, (places._sum.quantity || 0) - attendees.length),
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
fail(res, error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// @route POST /api/allocations/sets { eventId, name, showOnTicket? }
|
||||||
|
const createSet = async (req, res) => {
|
||||||
|
try {
|
||||||
|
const { eventId, name, showOnTicket } = req.body || {};
|
||||||
|
if (!(await prisma.event.findUnique({ where: { id: String(eventId || '') }, select: { id: true } }))) throw allocationError('Event not found', 404);
|
||||||
|
const order = await prisma.allocationSet.count({ where: { eventId } });
|
||||||
|
res.status(201).json(await prisma.allocationSet.create({ data: { eventId, name: cleanName(name, 'set'), showOnTicket: showOnTicket === true, order } }));
|
||||||
|
} catch (error) {
|
||||||
|
fail(res, error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// @route PUT /api/allocations/sets/:id { name?, showOnTicket? }
|
||||||
|
const updateSet = async (req, res) => {
|
||||||
|
try {
|
||||||
|
await loadSet(req.params.id);
|
||||||
|
const { name, showOnTicket } = req.body || {};
|
||||||
|
res.json(await prisma.allocationSet.update({
|
||||||
|
where: { id: req.params.id },
|
||||||
|
data: { ...(name !== undefined ? { name: cleanName(name, 'set') } : {}), ...(showOnTicket !== undefined ? { showOnTicket: showOnTicket === true } : {}) },
|
||||||
|
}));
|
||||||
|
} catch (error) {
|
||||||
|
fail(res, error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// @route DELETE /api/allocations/sets/:id
|
||||||
|
const deleteSet = async (req, res) => {
|
||||||
|
try {
|
||||||
|
await loadSet(req.params.id);
|
||||||
|
await prisma.allocationSet.delete({ where: { id: req.params.id } });
|
||||||
|
res.json({ message: 'Deleted' });
|
||||||
|
} catch (error) {
|
||||||
|
fail(res, error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
async function groupData(body, setId, existing = null) {
|
||||||
|
const { name, capacity, gender, leaderUserId } = body || {};
|
||||||
|
const data = {};
|
||||||
|
if (name !== undefined || !existing) data.name = cleanName(name, 'group');
|
||||||
|
if (capacity !== undefined) data.capacity = cleanCapacity(capacity);
|
||||||
|
if (gender !== undefined) data.gender = cleanGender(gender);
|
||||||
|
if (leaderUserId !== undefined) {
|
||||||
|
if (leaderUserId) {
|
||||||
|
const leader = await prisma.user.findUnique({ where: { id: String(leaderUserId) }, select: { role: true } });
|
||||||
|
if (!leader || !['staff', 'supervisor', 'admin'].includes(leader.role)) throw allocationError('A group leader must be a staff member.');
|
||||||
|
}
|
||||||
|
data.leaderUserId = leaderUserId || null;
|
||||||
|
}
|
||||||
|
// Changing capacity or gender mustn't leave the group over capacity or mixed.
|
||||||
|
if (existing && (data.capacity !== undefined || data.gender !== undefined)) {
|
||||||
|
const members = await prisma.allocationAssignment.findMany({ where: { groupId: existing.id }, include: { attendee: { select: { name: true, gender: true } } } });
|
||||||
|
const next = { ...existing, ...data };
|
||||||
|
const blocker = joinBlocker(next, 0, members.map(m => m.attendee));
|
||||||
|
if (blocker) throw allocationError(`${blocker} Move people out first.`);
|
||||||
|
}
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
|
// @route POST /api/allocations/sets/:id/groups { name, capacity?, gender?, leaderUserId? }
|
||||||
|
const createGroup = async (req, res) => {
|
||||||
|
try {
|
||||||
|
const set = await loadSet(req.params.id);
|
||||||
|
const data = await groupData(req.body, set.id);
|
||||||
|
res.status(201).json(await prisma.allocationGroup.create({ data: { ...data, setId: set.id, order: set.groups.length } }));
|
||||||
|
} catch (error) {
|
||||||
|
fail(res, error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// @route PUT /api/allocations/groups/:id
|
||||||
|
const updateGroup = async (req, res) => {
|
||||||
|
try {
|
||||||
|
const group = await prisma.allocationGroup.findUnique({ where: { id: req.params.id } });
|
||||||
|
if (!group) throw allocationError('Group not found', 404);
|
||||||
|
const data = await groupData(req.body, group.setId, group);
|
||||||
|
res.json(await prisma.allocationGroup.update({ where: { id: group.id }, data }));
|
||||||
|
} catch (error) {
|
||||||
|
fail(res, error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// @route DELETE /api/allocations/groups/:id (its people go back to unassigned)
|
||||||
|
const deleteGroup = async (req, res) => {
|
||||||
|
try {
|
||||||
|
await prisma.allocationGroup.delete({ where: { id: req.params.id } });
|
||||||
|
res.json({ message: 'Deleted' });
|
||||||
|
} catch (error) {
|
||||||
|
if (error.code === 'P2025') return res.status(404).json({ message: 'Group not found' });
|
||||||
|
fail(res, error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// @desc Put an attendee in a group (groupId null = unassign)
|
||||||
|
// @route PUT /api/allocations/sets/:id/assignments { attendeeId, groupId }
|
||||||
|
const assign = async (req, res) => {
|
||||||
|
try {
|
||||||
|
const set = await loadSet(req.params.id);
|
||||||
|
const { attendeeId, groupId } = req.body || {};
|
||||||
|
const attendee = await prisma.attendee.findFirst({
|
||||||
|
where: { id: String(attendeeId || ''), registration: { eventId: set.eventId, status: { not: 'cancelled' } } },
|
||||||
|
select: { id: true, name: true, gender: true },
|
||||||
|
});
|
||||||
|
if (!attendee) throw allocationError('Attendee not found for this event', 404);
|
||||||
|
if (!groupId) {
|
||||||
|
await prisma.allocationAssignment.deleteMany({ where: { setId: set.id, attendeeId: attendee.id } });
|
||||||
|
return res.json({ message: 'Unassigned' });
|
||||||
|
}
|
||||||
|
const group = set.groups.find(g => g.id === groupId);
|
||||||
|
if (!group) throw allocationError('Group not found in this set', 404);
|
||||||
|
await prisma.$transaction(async (tx) => {
|
||||||
|
await tx.$executeRaw`SELECT pg_advisory_xact_lock(hashtext(${'alloc:' + group.id}))`;
|
||||||
|
const count = await tx.allocationAssignment.count({ where: { groupId: group.id, NOT: { attendeeId: attendee.id } } });
|
||||||
|
const blocker = joinBlocker(group, count, [attendee]);
|
||||||
|
if (blocker) throw allocationError(blocker);
|
||||||
|
await tx.allocationAssignment.upsert({
|
||||||
|
where: { setId_attendeeId: { setId: set.id, attendeeId: attendee.id } },
|
||||||
|
update: { groupId: group.id },
|
||||||
|
create: { setId: set.id, groupId: group.id, attendeeId: attendee.id },
|
||||||
|
});
|
||||||
|
});
|
||||||
|
res.json({ message: `${attendee.name} → ${group.name}` });
|
||||||
|
} catch (error) {
|
||||||
|
fail(res, error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// @desc Place everyone not yet in a group
|
||||||
|
// @route POST /api/allocations/sets/:id/auto { mode: 'together' | 'split' }
|
||||||
|
const autoAssign = async (req, res) => {
|
||||||
|
try {
|
||||||
|
const set = await loadSet(req.params.id);
|
||||||
|
if (set.groups.length === 0) throw allocationError('Add some groups first.');
|
||||||
|
const mode = req.body?.mode === 'split' ? 'split' : 'together';
|
||||||
|
const result = await prisma.$transaction(async (tx) => {
|
||||||
|
await tx.$executeRaw`SELECT pg_advisory_xact_lock(hashtext(${'allocset:' + set.id}))`;
|
||||||
|
const [attendees, existing] = await Promise.all([
|
||||||
|
eventAttendees(set.eventId),
|
||||||
|
tx.allocationAssignment.findMany({ where: { setId: set.id } }),
|
||||||
|
]);
|
||||||
|
const r = autoAllocate({ groups: set.groups, attendees, assigned: new Map(existing.map(a => [a.attendeeId, a.groupId])), mode });
|
||||||
|
if (r.placements.length) {
|
||||||
|
await tx.allocationAssignment.createMany({ data: r.placements.map(p => ({ setId: set.id, groupId: p.groupId, attendeeId: p.attendeeId })), skipDuplicates: true });
|
||||||
|
}
|
||||||
|
return r;
|
||||||
|
});
|
||||||
|
res.json({
|
||||||
|
placed: result.placements.length,
|
||||||
|
unplaced: result.unplaced.length,
|
||||||
|
message: `${result.placements.length} placed${result.unplaced.length ? `; ${result.unplaced.length} couldn't be placed (groups full, or gender doesn't match)` : ''}.`,
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
fail(res, error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// @route DELETE /api/allocations/sets/:id/assignments (clear the whole set)
|
||||||
|
const clearAssignments = async (req, res) => {
|
||||||
|
try {
|
||||||
|
const set = await loadSet(req.params.id);
|
||||||
|
const { count } = await prisma.allocationAssignment.deleteMany({ where: { setId: set.id } });
|
||||||
|
res.json({ message: `${count} removed from groups.` });
|
||||||
|
} catch (error) {
|
||||||
|
fail(res, error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
/** Members of groups, with contact and (for supervisors) medical details. */
|
||||||
|
async function groupMembers(groupIds, { withMedical }) {
|
||||||
|
const assignments = await prisma.allocationAssignment.findMany({
|
||||||
|
where: { groupId: { in: groupIds } },
|
||||||
|
include: {
|
||||||
|
attendee: {
|
||||||
|
select: {
|
||||||
|
id: true, name: true, gender: true, dateOfBirth: true, phone: true, parentName: true, parentPhone: true,
|
||||||
|
registration: { select: { user: { select: { name: true, phoneNumber: true } } } },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
orderBy: { attendee: { name: 'asc' } },
|
||||||
|
});
|
||||||
|
let consent = new Map();
|
||||||
|
if (withMedical && assignments.length) {
|
||||||
|
const { latestRequestsFor, openJson } = require('../utils/consent');
|
||||||
|
const latest = await latestRequestsFor(assignments.map(a => a.attendeeId));
|
||||||
|
consent = new Map([...latest].map(([id, r]) => [id, r.status === 'given' ? { medical: openJson(r.medical), emergency: openJson(r.emergency) } : null]));
|
||||||
|
}
|
||||||
|
return assignments.map(a => ({
|
||||||
|
groupId: a.groupId,
|
||||||
|
id: a.attendee.id,
|
||||||
|
name: a.attendee.name,
|
||||||
|
gender: a.attendee.gender,
|
||||||
|
dateOfBirth: a.attendee.dateOfBirth,
|
||||||
|
phone: a.attendee.phone,
|
||||||
|
parentName: a.attendee.parentName,
|
||||||
|
parentPhone: a.attendee.parentPhone,
|
||||||
|
bookedBy: a.attendee.registration.user?.name || '',
|
||||||
|
bookedByPhone: a.attendee.registration.user?.phoneNumber || null,
|
||||||
|
...(withMedical ? consent.get(a.attendee.id) || {} : {}),
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
// @desc Lists for printing: every group of a set, with members
|
||||||
|
// @route GET /api/allocations/sets/:id/lists?medical=true
|
||||||
|
// @access Private/Supervisor
|
||||||
|
const getSetLists = async (req, res) => {
|
||||||
|
try {
|
||||||
|
const set = await prisma.allocationSet.findUnique({
|
||||||
|
where: { id: req.params.id },
|
||||||
|
include: { event: { select: { id: true, title: true, startDate: true } }, groups: { orderBy: { order: 'asc' }, include: { leader: { select: { name: true } } } } },
|
||||||
|
});
|
||||||
|
if (!set) throw allocationError('Allocation set not found', 404);
|
||||||
|
const withMedical = req.query.medical === 'true';
|
||||||
|
const members = await groupMembers(set.groups.map(g => g.id), { withMedical });
|
||||||
|
if (withMedical) {
|
||||||
|
logAdminAction({ actorId: req.user.id, actorRole: req.user.role, action: 'medical_list_viewed', targetType: 'AllocationSet', targetId: set.id, metadata: { eventId: set.eventId, attendees: members.length }, ip: getClientIp(req) });
|
||||||
|
}
|
||||||
|
res.json({ set: { id: set.id, name: set.name }, event: set.event, groups: set.groups.map(g => ({ id: g.id, name: g.name, capacity: g.capacity, gender: g.gender, leader: g.leader?.name || null, members: members.filter(m => m.groupId === g.id) })) });
|
||||||
|
} catch (error) {
|
||||||
|
fail(res, error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// @desc Groups the signed-in staff member leads, with their people
|
||||||
|
// @route GET /api/allocations/my-groups
|
||||||
|
// @access Private/Staff
|
||||||
|
const getMyGroups = async (req, res) => {
|
||||||
|
try {
|
||||||
|
const groups = await prisma.allocationGroup.findMany({
|
||||||
|
where: { leaderUserId: req.user.id, set: { event: { endDate: { gte: new Date(Date.now() - 7 * 864e5) } } } },
|
||||||
|
include: { set: { include: { event: { select: { id: true, title: true, startDate: true } } } } },
|
||||||
|
orderBy: [{ set: { event: { startDate: 'asc' } } }, { order: 'asc' }],
|
||||||
|
});
|
||||||
|
const withMedical = SUPERVISORS.includes(req.user.role);
|
||||||
|
const members = await groupMembers(groups.map(g => g.id), { withMedical });
|
||||||
|
if (withMedical && members.length) {
|
||||||
|
logAdminAction({ actorId: req.user.id, actorRole: req.user.role, action: 'medical_list_viewed', targetType: 'AllocationGroup', targetId: null, metadata: { groups: groups.length, attendees: members.length }, ip: getClientIp(req) });
|
||||||
|
}
|
||||||
|
res.json({
|
||||||
|
medicalShown: withMedical,
|
||||||
|
groups: groups.map(g => ({ id: g.id, name: g.name, capacity: g.capacity, gender: g.gender, setName: g.set.name, event: g.set.event, members: members.filter(m => m.groupId === g.id) })),
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
fail(res, error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
module.exports = { getBoard, createSet, updateSet, deleteSet, createGroup, updateGroup, deleteGroup, assign, autoAssign, clearAssignments, getSetLists, getMyGroups };
|
||||||
@@ -24,7 +24,7 @@ async function scheduleAutomations(req, res) {
|
|||||||
html: j.html ? String(j.html) : undefined,
|
html: j.html ? String(j.html) : undefined,
|
||||||
text: (!j.html && j.text) ? String(j.text) : (j.text ? String(j.text) : undefined),
|
text: (!j.html && j.text) ? String(j.text) : (j.text ? String(j.text) : undefined),
|
||||||
template: 'custom',
|
template: 'custom',
|
||||||
filter: { status: undefined, attendeeIds: undefined },
|
filter: { status: undefined, attendeeIds: undefined, ...(j.audience === 'sponsors' ? { audience: 'sponsors' } : {}) },
|
||||||
};
|
};
|
||||||
if (j.promoEventId && typeof j.promoEventId === 'string') {
|
if (j.promoEventId && typeof j.promoEventId === 'string') {
|
||||||
payload.promoEventId = j.promoEventId;
|
payload.promoEventId = j.promoEventId;
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ function toAbsoluteUrl(req, url) {
|
|||||||
// @access Private/Admin
|
// @access Private/Admin
|
||||||
const createEvent = async (req, res) => {
|
const createEvent = async (req, res) => {
|
||||||
try {
|
try {
|
||||||
const { title, description, startDate, endDate, registrationDeadline, goLiveAt, price, picture, redirectUrl, isHidden, requiresAuth, requiresRegistration, allowNamedAttendees, requiresParentalConsent, consentText, consentCollectMedical, consentCollectEmergency, consentCollectPhoto, waitlistEnabled, waitlistOfferHours, waitlistPartialOffers, contactName, contactPhone, contactEmail, location } = req.body;
|
const { title, description, startDate, endDate, registrationDeadline, goLiveAt, price, picture, redirectUrl, isHidden, requiresAuth, requiresRegistration, allowNamedAttendees, requiresParentalConsent, consentText, consentCollectMedical, consentCollectEmergency, consentCollectPhoto, waitlistEnabled, waitlistOfferHours, waitlistPartialOffers, allowTicketTransfer, collectGender, allowSponsorships, sponsorshipGoalSpots, showSponsorshipProgress, contactName, contactPhone, contactEmail, location } = req.body;
|
||||||
|
|
||||||
const data = {
|
const data = {
|
||||||
id: uuidv4(),
|
id: uuidv4(),
|
||||||
@@ -70,6 +70,11 @@ const createEvent = async (req, res) => {
|
|||||||
consentCollectEmergency: consentCollectEmergency === true,
|
consentCollectEmergency: consentCollectEmergency === true,
|
||||||
consentCollectPhoto: consentCollectPhoto === true,
|
consentCollectPhoto: consentCollectPhoto === true,
|
||||||
waitlistEnabled: waitlistEnabled === true,
|
waitlistEnabled: waitlistEnabled === true,
|
||||||
|
allowTicketTransfer: allowTicketTransfer !== false,
|
||||||
|
collectGender: collectGender === true,
|
||||||
|
allowSponsorships: allowSponsorships === true,
|
||||||
|
sponsorshipGoalSpots: sponsorshipGoalSpots ? Math.max(1, parseInt(sponsorshipGoalSpots, 10) || 0) || null : null,
|
||||||
|
showSponsorshipProgress: showSponsorshipProgress !== false,
|
||||||
waitlistOfferHours: Math.min(168, Math.max(1, parseInt(waitlistOfferHours, 10) || 24)),
|
waitlistOfferHours: Math.min(168, Math.max(1, parseInt(waitlistOfferHours, 10) || 24)),
|
||||||
waitlistPartialOffers: waitlistPartialOffers !== false,
|
waitlistPartialOffers: waitlistPartialOffers !== false,
|
||||||
contactName: contactName || null,
|
contactName: contactName || null,
|
||||||
@@ -536,7 +541,7 @@ const updateEvent = async (req, res) => {
|
|||||||
ip: getClientIp(req),
|
ip: getClientIp(req),
|
||||||
});
|
});
|
||||||
|
|
||||||
const { title, description, startDate, endDate, registrationDeadline, goLiveAt, price, picture, isActive, redirectUrl, isHidden, requiresAuth, requiresRegistration, allowNamedAttendees, requiresParentalConsent, consentText, consentCollectMedical, consentCollectEmergency, consentCollectPhoto, waitlistEnabled, waitlistOfferHours, waitlistPartialOffers, contactName, contactPhone, contactEmail, location } = req.body;
|
const { title, description, startDate, endDate, registrationDeadline, goLiveAt, price, picture, isActive, redirectUrl, isHidden, requiresAuth, requiresRegistration, allowNamedAttendees, requiresParentalConsent, consentText, consentCollectMedical, consentCollectEmergency, consentCollectPhoto, waitlistEnabled, waitlistOfferHours, waitlistPartialOffers, allowTicketTransfer, collectGender, allowSponsorships, sponsorshipGoalSpots, showSponsorshipProgress, contactName, contactPhone, contactEmail, location } = req.body;
|
||||||
|
|
||||||
const data = {
|
const data = {
|
||||||
title: title || event.title,
|
title: title || event.title,
|
||||||
@@ -559,6 +564,11 @@ const updateEvent = async (req, res) => {
|
|||||||
consentCollectEmergency: consentCollectEmergency !== undefined ? consentCollectEmergency === true : event.consentCollectEmergency,
|
consentCollectEmergency: consentCollectEmergency !== undefined ? consentCollectEmergency === true : event.consentCollectEmergency,
|
||||||
consentCollectPhoto: consentCollectPhoto !== undefined ? consentCollectPhoto === true : event.consentCollectPhoto,
|
consentCollectPhoto: consentCollectPhoto !== undefined ? consentCollectPhoto === true : event.consentCollectPhoto,
|
||||||
waitlistEnabled: waitlistEnabled !== undefined ? waitlistEnabled === true : event.waitlistEnabled,
|
waitlistEnabled: waitlistEnabled !== undefined ? waitlistEnabled === true : event.waitlistEnabled,
|
||||||
|
allowTicketTransfer: allowTicketTransfer !== undefined ? allowTicketTransfer !== false : event.allowTicketTransfer,
|
||||||
|
collectGender: collectGender !== undefined ? collectGender === true : event.collectGender,
|
||||||
|
allowSponsorships: allowSponsorships !== undefined ? allowSponsorships === true : event.allowSponsorships,
|
||||||
|
sponsorshipGoalSpots: sponsorshipGoalSpots !== undefined ? (sponsorshipGoalSpots ? Math.max(1, parseInt(sponsorshipGoalSpots, 10) || 0) || null : null) : event.sponsorshipGoalSpots,
|
||||||
|
showSponsorshipProgress: showSponsorshipProgress !== undefined ? showSponsorshipProgress !== false : event.showSponsorshipProgress,
|
||||||
waitlistOfferHours: waitlistOfferHours !== undefined ? Math.min(168, Math.max(1, parseInt(waitlistOfferHours, 10) || 24)) : event.waitlistOfferHours,
|
waitlistOfferHours: waitlistOfferHours !== undefined ? Math.min(168, Math.max(1, parseInt(waitlistOfferHours, 10) || 24)) : event.waitlistOfferHours,
|
||||||
waitlistPartialOffers: waitlistPartialOffers !== undefined ? waitlistPartialOffers !== false : event.waitlistPartialOffers,
|
waitlistPartialOffers: waitlistPartialOffers !== undefined ? waitlistPartialOffers !== false : event.waitlistPartialOffers,
|
||||||
// Editing the consent text starts a new version; parents who already agreed keep
|
// Editing the consent text starts a new version; parents who already agreed keep
|
||||||
@@ -1329,6 +1339,11 @@ const emailEventAttendees = async (req, res) => {
|
|||||||
where.status = 'cancelled';
|
where.status = 'cancelled';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Only registrations with someone in this allocation group ("everyone on Bus 2").
|
||||||
|
if (filter?.allocationGroupId) {
|
||||||
|
where.attendees = { some: { allocations: { some: { groupId: String(filter.allocationGroupId) } } } };
|
||||||
|
}
|
||||||
|
|
||||||
// Optional explicit attendee selection by userIds
|
// Optional explicit attendee selection by userIds
|
||||||
const attendeeIds = Array.isArray(filter?.attendeeIds) ? filter.attendeeIds.filter((x) => typeof x === 'string' && x.trim().length > 0) : [];
|
const attendeeIds = Array.isArray(filter?.attendeeIds) ? filter.attendeeIds.filter((x) => typeof x === 'string' && x.trim().length > 0) : [];
|
||||||
if (attendeeIds.length > 0) {
|
if (attendeeIds.length > 0) {
|
||||||
@@ -1379,6 +1394,24 @@ const emailEventAttendees = async (req, res) => {
|
|||||||
}
|
}
|
||||||
const recipients = Array.from(uniqMap.values());
|
const recipients = Array.from(uniqMap.values());
|
||||||
|
|
||||||
|
// Sponsors of this event instead of its attendees (e.g. the post-event thank-you).
|
||||||
|
if (filter?.audience === 'sponsors') {
|
||||||
|
recipients.length = 0;
|
||||||
|
registrations.length = 0;
|
||||||
|
const sponsorships = await prisma.payment.findMany({
|
||||||
|
where: { eventId, isDonation: true, isSponsorship: true, amount: { gt: 0 } },
|
||||||
|
include: { user: { select: { name: true, email: true, isActive: true } } },
|
||||||
|
orderBy: { createdAt: 'asc' },
|
||||||
|
});
|
||||||
|
const seen = new Set();
|
||||||
|
for (const s of sponsorships) {
|
||||||
|
const email = (s.user?.email || '').trim();
|
||||||
|
if (!email || email.endsWith('@guest.local') || email.endsWith('@deleted.invalid') || seen.has(email)) continue;
|
||||||
|
seen.add(email);
|
||||||
|
recipients.push({ email, name: s.sponsorName || s.user?.name || '' });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (dryRun) {
|
if (dryRun) {
|
||||||
return res.json({ eventId, matched: recipients.length, recipients: recipients.slice(0, 20) });
|
return res.json({ eventId, matched: recipients.length, recipients: recipients.slice(0, 20) });
|
||||||
}
|
}
|
||||||
@@ -1567,6 +1600,11 @@ const whatsappEventAttendees = async (req, res) => {
|
|||||||
where.status = 'cancelled';
|
where.status = 'cancelled';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Only registrations with someone in this allocation group ("everyone on Bus 2").
|
||||||
|
if (filter?.allocationGroupId) {
|
||||||
|
where.attendees = { some: { allocations: { some: { groupId: String(filter.allocationGroupId) } } } };
|
||||||
|
}
|
||||||
|
|
||||||
const attendeeIds = Array.isArray(filter?.attendeeIds) ? filter.attendeeIds.filter((x) => typeof x === 'string' && x.trim().length > 0) : [];
|
const attendeeIds = Array.isArray(filter?.attendeeIds) ? filter.attendeeIds.filter((x) => typeof x === 'string' && x.trim().length > 0) : [];
|
||||||
if (attendeeIds.length > 0) {
|
if (attendeeIds.length > 0) {
|
||||||
where.userId = { in: attendeeIds };
|
where.userId = { in: attendeeIds };
|
||||||
|
|||||||
@@ -0,0 +1,179 @@
|
|||||||
|
const prisma = require('../config/db');
|
||||||
|
const { safeErrorMessage } = require('../utils/errorUtils');
|
||||||
|
const { ANSWERABLE, feedbackError, cleanFields, cleanAnswer, summarise, sendFeedbackInvites, findInviteByToken } = require('../utils/feedback');
|
||||||
|
|
||||||
|
const fail = (res, error) => res.status(error.statusCode || (res.statusCode === 200 ? 400 : res.statusCode)).json({ message: safeErrorMessage(error) });
|
||||||
|
const shape = (fields) => JSON.stringify(fields.map(f => [f.type, f.label, f.isRequired, f.options || null, f.helpText || null]));
|
||||||
|
|
||||||
|
async function formWithStats(eventId) {
|
||||||
|
const form = await prisma.feedbackForm.findUnique({ where: { eventId }, include: { fields: { orderBy: { order: 'asc' } } } });
|
||||||
|
if (!form) return null;
|
||||||
|
const [invited, responses] = await Promise.all([
|
||||||
|
prisma.feedbackInvite.count({ where: { formId: form.id } }),
|
||||||
|
prisma.feedbackResponse.count({ where: { formId: form.id } }),
|
||||||
|
]);
|
||||||
|
return { ...form, invited, responses };
|
||||||
|
}
|
||||||
|
|
||||||
|
// @desc An event's feedback form (with invite/response counts)
|
||||||
|
// @route GET /api/feedback/event/:eventId
|
||||||
|
// @access Private/Supervisor
|
||||||
|
const getEventFeedback = async (req, res) => {
|
||||||
|
try {
|
||||||
|
res.json(await formWithStats(req.params.eventId));
|
||||||
|
} catch (error) {
|
||||||
|
fail(res, error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// @desc Create or update an event's feedback form
|
||||||
|
// @route PUT /api/feedback/event/:eventId { sendAt, audience, anonymous, intro, fields[] }
|
||||||
|
// @access Private/Supervisor
|
||||||
|
const saveEventFeedback = async (req, res) => {
|
||||||
|
try {
|
||||||
|
const event = await prisma.event.findUnique({ where: { id: req.params.eventId }, select: { id: true, endDate: true } });
|
||||||
|
if (!event) throw feedbackError('Event not found', 404);
|
||||||
|
const { sendAt, audience, anonymous, intro, fields } = req.body || {};
|
||||||
|
const clean = cleanFields(fields);
|
||||||
|
let when = null;
|
||||||
|
if (sendAt) {
|
||||||
|
when = new Date(sendAt);
|
||||||
|
if (isNaN(when.getTime())) throw feedbackError('Enter a valid send time.');
|
||||||
|
}
|
||||||
|
const data = {
|
||||||
|
sendAt: when,
|
||||||
|
audience: audience === 'all' ? 'all' : 'checked_in',
|
||||||
|
anonymous: anonymous === true,
|
||||||
|
intro: intro ? String(intro).slice(0, 2000) : null,
|
||||||
|
};
|
||||||
|
|
||||||
|
const existing = await prisma.feedbackForm.findUnique({ where: { eventId: event.id }, include: { fields: { orderBy: { order: 'asc' } } } });
|
||||||
|
if (!existing) {
|
||||||
|
await prisma.feedbackForm.create({ data: { ...data, eventId: event.id, fields: { create: clean } } });
|
||||||
|
} else {
|
||||||
|
const answered = await prisma.feedbackResponse.count({ where: { formId: existing.id } });
|
||||||
|
const changed = shape(existing.fields) !== shape(clean);
|
||||||
|
if (answered > 0 && changed) throw feedbackError('People have already answered this feedback form, so its questions can’t be changed.', 409);
|
||||||
|
await prisma.$transaction(async (tx) => {
|
||||||
|
await tx.feedbackForm.update({ where: { id: existing.id }, data: existing.sentAt ? { ...data, sendAt: existing.sendAt } : data });
|
||||||
|
if (changed) {
|
||||||
|
await tx.feedbackField.deleteMany({ where: { formId: existing.id } });
|
||||||
|
await tx.feedbackField.createMany({ data: clean.map(f => ({ ...f, formId: existing.id, options: f.options ?? undefined })) });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
res.json(await formWithStats(event.id));
|
||||||
|
} catch (error) {
|
||||||
|
fail(res, error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// @route DELETE /api/feedback/event/:eventId
|
||||||
|
const deleteEventFeedback = async (req, res) => {
|
||||||
|
try {
|
||||||
|
await prisma.feedbackForm.deleteMany({ where: { eventId: req.params.eventId } });
|
||||||
|
res.json({ message: 'Feedback form removed' });
|
||||||
|
} catch (error) {
|
||||||
|
fail(res, error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// @desc Send the feedback form now (instead of waiting for its send time)
|
||||||
|
// @route POST /api/feedback/event/:eventId/send-now
|
||||||
|
// @access Private/Supervisor
|
||||||
|
const sendNow = async (req, res) => {
|
||||||
|
try {
|
||||||
|
const form = await prisma.feedbackForm.findUnique({ where: { eventId: req.params.eventId } });
|
||||||
|
if (!form) throw feedbackError('This event has no feedback form.', 404);
|
||||||
|
if (!form.sentAt) await prisma.feedbackForm.update({ where: { id: form.id }, data: { sentAt: new Date(), sendAt: form.sendAt || new Date() } });
|
||||||
|
// Also invites anyone who checked in after the first send.
|
||||||
|
const invited = await sendFeedbackInvites(form.id);
|
||||||
|
res.json({ invited, message: invited ? `Feedback form sent to ${invited} ${invited === 1 ? 'person' : 'people'}.` : 'Everyone has already been sent the form.' });
|
||||||
|
} catch (error) {
|
||||||
|
fail(res, error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// @desc The form behind a personal feedback link
|
||||||
|
// @route GET /api/feedback/public/:token
|
||||||
|
// @access Public (link holder)
|
||||||
|
const getPublicForm = async (req, res) => {
|
||||||
|
try {
|
||||||
|
const invite = await findInviteByToken(req.params.token);
|
||||||
|
if (!invite) throw feedbackError('This feedback link isn’t valid (it may have been replaced by a newer one).', 404);
|
||||||
|
const { form } = invite;
|
||||||
|
res.json({
|
||||||
|
event: form.event,
|
||||||
|
name: invite.user?.name || '',
|
||||||
|
intro: form.intro,
|
||||||
|
anonymous: form.anonymous,
|
||||||
|
responded: !!invite.respondedAt,
|
||||||
|
fields: form.fields.map(f => ({ id: f.id, type: f.type, label: f.label, isRequired: f.isRequired, helpText: f.helpText, options: f.options })),
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
fail(res, error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// @desc Submit feedback (once per person)
|
||||||
|
// @route POST /api/feedback/public/:token { answers: { fieldId: value } }
|
||||||
|
// @access Public (link holder)
|
||||||
|
const submitPublicForm = async (req, res) => {
|
||||||
|
try {
|
||||||
|
const invite = await findInviteByToken(req.params.token);
|
||||||
|
if (!invite) throw feedbackError('This feedback link isn’t valid (it may have been replaced by a newer one).', 404);
|
||||||
|
if (invite.respondedAt) throw feedbackError('Thanks — you’ve already given feedback for this event.', 409);
|
||||||
|
const answers = req.body?.answers || {};
|
||||||
|
const rows = [];
|
||||||
|
for (const f of invite.form.fields.filter(x => ANSWERABLE.includes(x.type))) {
|
||||||
|
const value = cleanAnswer(f, answers[f.id]);
|
||||||
|
if (value !== null) rows.push({ fieldId: f.id, value });
|
||||||
|
}
|
||||||
|
if (rows.length === 0) throw feedbackError('Please answer at least one question.');
|
||||||
|
await prisma.$transaction(async (tx) => {
|
||||||
|
// Claim the invite first, so a double-submit can't create two responses.
|
||||||
|
const claimed = await tx.feedbackInvite.updateMany({ where: { id: invite.id, respondedAt: null }, data: { respondedAt: new Date() } });
|
||||||
|
if (claimed.count !== 1) throw feedbackError('Thanks — you’ve already given feedback for this event.', 409);
|
||||||
|
await tx.feedbackResponse.create({
|
||||||
|
data: { formId: invite.formId, userId: invite.form.anonymous ? null : invite.userId, answers: { create: rows } },
|
||||||
|
});
|
||||||
|
});
|
||||||
|
res.status(201).json({ message: 'Thank you for your feedback!' });
|
||||||
|
} catch (error) {
|
||||||
|
fail(res, error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// @desc Feedback summary for one or more events (for the report, and comparisons)
|
||||||
|
// @route GET /api/feedback/summary?eventIds=a,b
|
||||||
|
// @access Private/Supervisor
|
||||||
|
const getSummary = async (req, res) => {
|
||||||
|
try {
|
||||||
|
const ids = String(req.query.eventIds || '').split(',').map(s => s.trim()).filter(Boolean).slice(0, 50);
|
||||||
|
const forms = await prisma.feedbackForm.findMany({
|
||||||
|
where: { eventId: { in: ids } },
|
||||||
|
include: {
|
||||||
|
event: { select: { id: true, title: true, startDate: true } },
|
||||||
|
fields: { orderBy: { order: 'asc' } },
|
||||||
|
responses: { include: { answers: true, user: { select: { name: true } } } },
|
||||||
|
_count: { select: { invites: true } },
|
||||||
|
},
|
||||||
|
});
|
||||||
|
const out = forms.map(form => {
|
||||||
|
const answers = form.responses.flatMap(r => r.answers.map(a => ({ fieldId: a.fieldId, value: a.value, ...(form.anonymous ? {} : { name: r.user?.name || '' }) })));
|
||||||
|
const invited = form._count.invites;
|
||||||
|
return {
|
||||||
|
eventId: form.event.id, title: form.event.title, startDate: form.event.startDate,
|
||||||
|
anonymous: form.anonymous, sentAt: form.sentAt,
|
||||||
|
invited, responses: form.responses.length,
|
||||||
|
responseRate: invited ? Math.round((form.responses.length / invited) * 100) : null,
|
||||||
|
questions: summarise(form.fields, answers),
|
||||||
|
};
|
||||||
|
}).sort((a, b) => new Date(a.startDate) - new Date(b.startDate));
|
||||||
|
res.json(out);
|
||||||
|
} catch (error) {
|
||||||
|
fail(res, error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
module.exports = { getEventFeedback, saveEventFeedback, deleteEventFeedback, sendNow, getPublicForm, submitPublicForm, getSummary };
|
||||||
@@ -2220,7 +2220,7 @@ const updateAttendees = async (req, res) => {
|
|||||||
where: { id: a.id },
|
where: { id: a.id },
|
||||||
data: {
|
data: {
|
||||||
name: c.name, email: c.email, phone: c.phone,
|
name: c.name, email: c.email, phone: c.phone,
|
||||||
dateOfBirth: c.dateOfBirth, parentName: c.parentName, parentEmail: c.parentEmail, parentPhone: c.parentPhone,
|
dateOfBirth: c.dateOfBirth, gender: c.gender, parentName: c.parentName, parentEmail: c.parentEmail, parentPhone: c.parentPhone,
|
||||||
...(contactChanged ? { userId: match?.user?.id || null } : {}),
|
...(contactChanged ? { userId: match?.user?.id || null } : {}),
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -0,0 +1,151 @@
|
|||||||
|
const prisma = require('../config/db');
|
||||||
|
const { safeErrorMessage } = require('../utils/errorUtils');
|
||||||
|
const { logAdminAction } = require('../utils/adminAudit');
|
||||||
|
const { getClientIp } = require('../utils/requestUtils');
|
||||||
|
const { LOCK_INCLUDE, activeLocks, acquireLock, snapshotFor, syncScans } = require('../utils/scanLocks');
|
||||||
|
|
||||||
|
const SUPERVISORS = ['admin', 'supervisor'];
|
||||||
|
const fail = (res, error) => res.status(error.statusCode || (res.statusCode === 200 ? 400 : res.statusCode)).json({ message: safeErrorMessage(error) });
|
||||||
|
const audit = (req, action, lock, metadata = {}) => logAdminAction({
|
||||||
|
actorId: req.user.id, actorRole: req.user.role, action, targetType: 'ScanLock', targetId: lock.id,
|
||||||
|
metadata: { eventId: lock.eventId, sectionId: lock.sectionId, deviceName: lock.deviceName, ...metadata },
|
||||||
|
ip: getClientIp(req),
|
||||||
|
});
|
||||||
|
|
||||||
|
const lockView = (l) => ({
|
||||||
|
id: l.id, eventId: l.eventId, sectionId: l.sectionId, sectionName: l.section?.name || null,
|
||||||
|
deviceId: l.deviceId, deviceName: l.deviceName, user: l.user, lockedAt: l.lockedAt,
|
||||||
|
snapshotAt: l.snapshotAt, lastSyncAt: l.lastSyncAt, releasedAt: l.releasedAt,
|
||||||
|
});
|
||||||
|
|
||||||
|
/** The lock, if the caller is the person holding it on this device. */
|
||||||
|
async function ownLock(req, res) {
|
||||||
|
const lock = await prisma.scanLock.findUnique({ where: { id: req.params.id }, include: LOCK_INCLUDE });
|
||||||
|
if (!lock) { res.status(404); throw new Error('Offline lock not found'); }
|
||||||
|
const deviceId = req.body?.deviceId || req.query?.deviceId;
|
||||||
|
if (lock.userId !== req.user.id || lock.deviceId !== deviceId) { res.status(403); throw new Error('This offline lock belongs to another device.'); }
|
||||||
|
return lock;
|
||||||
|
}
|
||||||
|
|
||||||
|
// @desc Active offline locks for an event
|
||||||
|
// @route GET /api/scan-locks?eventId=
|
||||||
|
// @access Private/Staff
|
||||||
|
const listLocks = async (req, res) => {
|
||||||
|
try {
|
||||||
|
if (!req.query.eventId) { res.status(400); throw new Error('eventId is required'); }
|
||||||
|
res.json((await activeLocks(String(req.query.eventId))).map(lockView));
|
||||||
|
} catch (error) {
|
||||||
|
fail(res, error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// @desc Lock a section (or the whole event) to this device for offline scanning
|
||||||
|
// @route POST /api/scan-locks { eventId, sectionId?, deviceId, deviceName? }
|
||||||
|
// @access Private/Staff
|
||||||
|
const createLock = async (req, res) => {
|
||||||
|
try {
|
||||||
|
const { eventId, sectionId, deviceId, deviceName } = req.body || {};
|
||||||
|
if (!eventId) { res.status(400); throw new Error('eventId is required'); }
|
||||||
|
const lock = await acquireLock({ eventId, sectionId: sectionId || null, deviceId, deviceName, userId: req.user.id });
|
||||||
|
audit(req, 'scan_lock_acquired', lock);
|
||||||
|
res.status(201).json(lockView(lock));
|
||||||
|
} catch (error) {
|
||||||
|
fail(res, error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// @desc Download the tickets valid for this lock, for offline scanning
|
||||||
|
// @route GET /api/scan-locks/:id/snapshot?deviceId=
|
||||||
|
// @access Private/Staff (lock holder)
|
||||||
|
const getSnapshot = async (req, res) => {
|
||||||
|
try {
|
||||||
|
const lock = await ownLock(req, res);
|
||||||
|
if (lock.releasedAt) { res.status(410); throw new Error('This offline lock has been released.'); }
|
||||||
|
res.json({ lock: lockView(lock), ...(await snapshotFor(lock)) });
|
||||||
|
} catch (error) {
|
||||||
|
fail(res, error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// @desc Upload scans made offline
|
||||||
|
// @route POST /api/scan-locks/:id/sync { deviceId, scans: [{ clientScanId, qrCode, qty, scannedAt }] }
|
||||||
|
// @access Private/Staff (lock holder — also after a release, so nothing made offline is lost)
|
||||||
|
const syncLock = async (req, res) => {
|
||||||
|
try {
|
||||||
|
const lock = await ownLock(req, res);
|
||||||
|
const result = await syncScans(lock, req.body?.scans);
|
||||||
|
if (result.accepted || result.conflicts.length) {
|
||||||
|
audit(req, 'offline_sync', lock, { accepted: result.accepted, conflicts: result.conflicts.length, duplicates: result.duplicates, afterForceRelease: !!lock.forceReleasedById });
|
||||||
|
}
|
||||||
|
res.json({ accepted: result.accepted, duplicates: result.duplicates, conflicts: result.conflicts, reportId: result.report.id, released: !!lock.releasedAt });
|
||||||
|
} catch (error) {
|
||||||
|
fail(res, error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// @desc End offline mode (the device should sync first)
|
||||||
|
// @route DELETE /api/scan-locks/:id { deviceId }
|
||||||
|
// @access Private/Staff (lock holder)
|
||||||
|
const releaseLock = async (req, res) => {
|
||||||
|
try {
|
||||||
|
const lock = await ownLock(req, res);
|
||||||
|
if (!lock.releasedAt) {
|
||||||
|
await prisma.scanLock.update({ where: { id: lock.id }, data: { releasedAt: new Date() } });
|
||||||
|
audit(req, 'scan_lock_released', lock);
|
||||||
|
}
|
||||||
|
res.json({ message: 'Offline mode ended.' });
|
||||||
|
} catch (error) {
|
||||||
|
fail(res, error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// @desc Release someone else's lock (e.g. a lost or flat phone)
|
||||||
|
// @route POST /api/scan-locks/:id/force-release
|
||||||
|
// @access Private/Supervisor
|
||||||
|
const forceRelease = async (req, res) => {
|
||||||
|
try {
|
||||||
|
const lock = await prisma.scanLock.findUnique({ where: { id: req.params.id }, include: LOCK_INCLUDE });
|
||||||
|
if (!lock) { res.status(404); throw new Error('Offline lock not found'); }
|
||||||
|
if (lock.releasedAt) return res.json({ message: 'Already released.' });
|
||||||
|
await prisma.scanLock.update({ where: { id: lock.id }, data: { releasedAt: new Date(), forceReleasedById: req.user.id } });
|
||||||
|
audit(req, 'scan_lock_force_released', lock, { heldBy: lock.user?.name });
|
||||||
|
res.json({ message: `Released. If ${lock.user?.name || 'that device'} reconnects, its offline scans will still sync and be flagged for review.` });
|
||||||
|
} catch (error) {
|
||||||
|
fail(res, error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// @desc Offline sync reports for an event (with anything that needs review)
|
||||||
|
// @route GET /api/scan-locks/reports?eventId=&unreviewed=true
|
||||||
|
// @access Private/Supervisor
|
||||||
|
const listReports = async (req, res) => {
|
||||||
|
try {
|
||||||
|
const where = {
|
||||||
|
scanLock: { eventId: String(req.query.eventId || '') },
|
||||||
|
...(req.query.unreviewed === 'true' ? { reviewedAt: null } : {}),
|
||||||
|
};
|
||||||
|
const reports = await prisma.offlineSyncReport.findMany({
|
||||||
|
where,
|
||||||
|
include: { scanLock: { include: LOCK_INCLUDE }, reviewedBy: { select: { name: true } } },
|
||||||
|
orderBy: { createdAt: 'desc' },
|
||||||
|
take: 200,
|
||||||
|
});
|
||||||
|
res.json(reports.map(r => ({ ...r, scanLock: lockView(r.scanLock) })));
|
||||||
|
} catch (error) {
|
||||||
|
fail(res, error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// @desc Mark a sync report as reviewed
|
||||||
|
// @route POST /api/scan-locks/reports/:id/review
|
||||||
|
// @access Private/Supervisor
|
||||||
|
const reviewReport = async (req, res) => {
|
||||||
|
try {
|
||||||
|
const report = await prisma.offlineSyncReport.update({ where: { id: req.params.id }, data: { reviewedAt: new Date(), reviewedById: req.user.id } });
|
||||||
|
res.json(report);
|
||||||
|
} catch (error) {
|
||||||
|
fail(res, error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
module.exports = { SUPERVISORS, listLocks, createLock, getSnapshot, syncLock, releaseLock, forceRelease, listReports, reviewReport };
|
||||||
@@ -0,0 +1,112 @@
|
|||||||
|
const axios = require('axios');
|
||||||
|
const prisma = require('../config/db');
|
||||||
|
const { safeErrorMessage } = require('../utils/errorUtils');
|
||||||
|
const { sponsorshipError, spotPrice, sponsorshipCharge, poolSummary } = require('../utils/sponsorship');
|
||||||
|
|
||||||
|
const fail = (res, error) => res.status(error.statusCode || error.response?.status || 400).json({ message: safeErrorMessage(error) });
|
||||||
|
|
||||||
|
async function sponsorableEvent(eventId) {
|
||||||
|
const event = await prisma.event.findUnique({ where: { id: String(eventId || '') }, include: { eventOptions: { select: { isMainTicket: true, price: true } } } });
|
||||||
|
if (!event || !event.isActive) throw sponsorshipError('Event not found', 404);
|
||||||
|
if (!event.allowSponsorships) throw sponsorshipError('This event isn’t taking sponsorships.');
|
||||||
|
if (event.cashupStatus === 'closed' || new Date(event.endDate) < new Date()) throw sponsorshipError('This event has ended and is no longer taking sponsorships.');
|
||||||
|
return event;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function poolFor(event) {
|
||||||
|
const sponsorships = await prisma.payment.findMany({ where: { eventId: event.id, isDonation: true, isSponsorship: true, amount: { gt: 0 } }, select: { id: true, amount: true } });
|
||||||
|
const legs = sponsorships.length
|
||||||
|
? await prisma.payment.findMany({ where: { originalPaymentId: { in: sponsorships.map(s => s.id) }, isDonation: false }, select: { originalPaymentId: true, amount: true } })
|
||||||
|
: [];
|
||||||
|
return poolSummary(sponsorships, legs, spotPrice(event));
|
||||||
|
}
|
||||||
|
|
||||||
|
// @desc Public sponsorship progress for an event (never names who was helped)
|
||||||
|
// @route GET /api/sponsorships/event/:eventId
|
||||||
|
// @access Public
|
||||||
|
const getEventSponsorship = async (req, res) => {
|
||||||
|
try {
|
||||||
|
const event = await prisma.event.findUnique({ where: { id: req.params.eventId }, include: { eventOptions: { select: { isMainTicket: true, price: true } } } });
|
||||||
|
if (!event || !event.isActive || !event.allowSponsorships) return res.json({ enabled: false });
|
||||||
|
const pool = await poolFor(event);
|
||||||
|
const open = event.cashupStatus !== 'closed' && new Date(event.endDate) >= new Date();
|
||||||
|
res.json({
|
||||||
|
enabled: true,
|
||||||
|
open,
|
||||||
|
spotPrice: spotPrice(event),
|
||||||
|
showProgress: event.showSponsorshipProgress,
|
||||||
|
goalSpots: event.sponsorshipGoalSpots,
|
||||||
|
spotsFunded: event.showSponsorshipProgress ? pool.spotsFunded : null,
|
||||||
|
sponsors: event.showSponsorshipProgress ? pool.sponsors : null,
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
fail(res, error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// @desc Start a Yoco checkout to sponsor spots (or a custom amount) at an event
|
||||||
|
// @route POST /api/sponsorships/checkout { eventId, spots? | amount?, anonymous?, sponsorName?, message?, name?, email?, phone? }
|
||||||
|
// @access Public (guests give a name and email for the receipt)
|
||||||
|
const createSponsorCheckout = async (req, res) => {
|
||||||
|
try {
|
||||||
|
const { eventId, spots, amount, anonymous, sponsorName, message, name, email, phone } = req.body || {};
|
||||||
|
const event = await sponsorableEvent(eventId);
|
||||||
|
const charge = sponsorshipCharge({ spots, amount }, spotPrice(event));
|
||||||
|
|
||||||
|
let payer = req.user || null;
|
||||||
|
if (!payer) {
|
||||||
|
const { hasValidEmail, findOrCreateAccount } = require('../utils/accountMatch');
|
||||||
|
const cleanName = String(name || '').trim().slice(0, 100);
|
||||||
|
if (!cleanName) throw sponsorshipError('Enter your name.');
|
||||||
|
if (!hasValidEmail(email)) throw sponsorshipError('Enter your email address so we can send your receipt.');
|
||||||
|
// An existing account is reused; otherwise a quiet inactive one holds the receipt —
|
||||||
|
// no activation link is sent, since a sponsor doesn't need to log in.
|
||||||
|
payer = (await findOrCreateAccount({ name: cleanName, email: String(email).trim(), phone })).user;
|
||||||
|
}
|
||||||
|
const isAnonymous = anonymous === true;
|
||||||
|
const displayName = isAnonymous ? null : (String(sponsorName || '').trim() || payer.name || '').slice(0, 100) || null;
|
||||||
|
const note = String(message || '').trim().slice(0, 300) || null;
|
||||||
|
|
||||||
|
const base = (process.env.FRONTEND_URL || process.env.APP_BASE_URL || 'http://localhost:3001').replace(/\/$/, '');
|
||||||
|
const back = `${base}/events/${encodeURIComponent(event.id)}`;
|
||||||
|
const amountInCents = Math.round(charge.amount * 100);
|
||||||
|
const label = charge.spots ? `Sponsor ${charge.spots} spot${charge.spots > 1 ? 's' : ''} at ${event.title}` : `Sponsorship for ${event.title}`;
|
||||||
|
const checkoutData = {
|
||||||
|
amount: amountInCents,
|
||||||
|
currency: 'ZAR',
|
||||||
|
metadata: {
|
||||||
|
type: 'sponsorship', isDonation: true, eventId: event.id, eventTitle: event.title, userId: payer.id,
|
||||||
|
sponsorAnonymous: isAnonymous ? 'true' : 'false',
|
||||||
|
...(displayName ? { sponsorName: displayName } : {}),
|
||||||
|
...(note ? { sponsorMessage: note } : {}),
|
||||||
|
...(charge.spots ? { spots: String(charge.spots) } : {}),
|
||||||
|
},
|
||||||
|
successUrl: `${back}?sponsored=1`,
|
||||||
|
cancelUrl: back,
|
||||||
|
failureUrl: `${back}?sponsored=failed`,
|
||||||
|
lineItems: [{ displayName: label, quantity: 1, pricingDetails: { price: amountInCents } }],
|
||||||
|
};
|
||||||
|
const response = await axios.post('https://payments.yoco.com/api/checkouts', checkoutData, {
|
||||||
|
headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${process.env.YOCO_SECRET_KEY}`, 'Idempotency-Key': `spon_${event.id}_${payer.id}_${amountInCents}_${Date.now()}` },
|
||||||
|
});
|
||||||
|
res.json({ redirectUrl: response.data.redirectUrl, checkoutId: response.data.id, amount: charge.amount });
|
||||||
|
} catch (error) {
|
||||||
|
if (error.response) console.error('Sponsor checkout error:', error.response.data || error.message);
|
||||||
|
fail(res, error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// @desc The sponsorship pool for an event (supervisors)
|
||||||
|
// @route GET /api/sponsorships/event/:eventId/pool
|
||||||
|
// @access Private/Supervisor
|
||||||
|
const getPool = async (req, res) => {
|
||||||
|
try {
|
||||||
|
const event = await prisma.event.findUnique({ where: { id: req.params.eventId }, include: { eventOptions: { select: { isMainTicket: true, price: true } } } });
|
||||||
|
if (!event) throw sponsorshipError('Event not found', 404);
|
||||||
|
res.json({ eventId: event.id, spotPrice: spotPrice(event), goalSpots: event.sponsorshipGoalSpots, ...(await poolFor(event)) });
|
||||||
|
} catch (error) {
|
||||||
|
fail(res, error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
module.exports = { getEventSponsorship, createSponsorCheckout, getPool, poolFor };
|
||||||
@@ -95,7 +95,12 @@ const getUserTickets = async (req, res) => {
|
|||||||
registration: true
|
registration: true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
attendee: { select: { id: true, name: true } },
|
attendee: {
|
||||||
|
select: {
|
||||||
|
id: true, name: true,
|
||||||
|
allocations: { where: { set: { showOnTicket: true } }, select: { group: { select: { name: true } }, set: { select: { name: true, order: true } } } },
|
||||||
|
},
|
||||||
|
},
|
||||||
user: { select: { id: true, name: true } },
|
user: { select: { id: true, name: true } },
|
||||||
event: true,
|
event: true,
|
||||||
usages: {
|
usages: {
|
||||||
@@ -287,6 +292,9 @@ const getScanPreview = async (req, res) => {
|
|||||||
`;
|
`;
|
||||||
|
|
||||||
if (!rows || rows.length === 0) {
|
if (!rows || rows.length === 0) {
|
||||||
|
const { findTransferByOldCode, transferredMessage } = require('../utils/ticketTransfer');
|
||||||
|
const transfer = await findTransferByOldCode(req.params.qrCode);
|
||||||
|
if (transfer) return res.status(410).json({ message: transferredMessage(transfer), code: 'TICKET_TRANSFERRED' });
|
||||||
res.status(404);
|
res.status(404);
|
||||||
throw new Error('Ticket not found');
|
throw new Error('Ticket not found');
|
||||||
}
|
}
|
||||||
@@ -351,6 +359,9 @@ const scanTicket = async (req, res) => {
|
|||||||
`;
|
`;
|
||||||
|
|
||||||
if (!rows || rows.length === 0) {
|
if (!rows || rows.length === 0) {
|
||||||
|
const { findTransferByOldCode, transferredMessage } = require('../utils/ticketTransfer');
|
||||||
|
const transfer = await findTransferByOldCode(req.params.qrCode);
|
||||||
|
if (transfer) return res.status(410).json({ message: transferredMessage(transfer), code: 'TICKET_TRANSFERRED' });
|
||||||
res.status(404);
|
res.status(404);
|
||||||
throw new Error('Ticket not found');
|
throw new Error('Ticket not found');
|
||||||
}
|
}
|
||||||
@@ -372,6 +383,27 @@ const scanTicket = async (req, res) => {
|
|||||||
return res.status(400).json({ message: 'Ticket belongs to a different event', ticket });
|
return res.status(400).json({ message: 'Ticket belongs to a different event', ticket });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Section checks used to happen only in the browser; enforce them here too.
|
||||||
|
const sectionId = String((req.query?.sectionId || req.body?.sectionId) || '').trim() || null;
|
||||||
|
if (sectionId) {
|
||||||
|
const section = await prisma.section.findUnique({ where: { id: sectionId }, include: { allowedOptions: true } });
|
||||||
|
if (!section || section.eventId !== ticket.eventId) {
|
||||||
|
return res.status(400).json({ message: 'Section not found for this event', ticket });
|
||||||
|
}
|
||||||
|
if (!section.allowedOptions.some(o => o.eventOptionId === r.eventOptionId)) {
|
||||||
|
return res.status(400).json({ message: 'This ticket is not valid for this section', ticket });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A section (or the whole event) locked to another device for offline scanning
|
||||||
|
// can't be scanned online — those scans would be invisible to the offline device.
|
||||||
|
const { blockingLock } = require('../utils/scanLocks');
|
||||||
|
const lock = await blockingLock({ eventId: ticket.eventId, optionId: r.eventOptionId }, { sectionId, deviceId: req.body?.deviceId || null });
|
||||||
|
if (lock) {
|
||||||
|
const scope = lock.section ? `"${lock.section.name}"` : 'This event';
|
||||||
|
return res.status(423).json({ message: `${scope} is offline-locked by ${lock.user?.name || 'another device'}${lock.deviceName ? ` on ${lock.deviceName}` : ''}. Scan it on that device, or ask a supervisor to release the lock.`, code: 'SCAN_LOCKED' });
|
||||||
|
}
|
||||||
|
|
||||||
// Compute how many have already been redeemed
|
// Compute how many have already been redeemed
|
||||||
const totalRedeemed = (ticket.usages || []).reduce((s, u) => s + (u.quantityRedeemed || 1), 0);
|
const totalRedeemed = (ticket.usages || []).reduce((s, u) => s + (u.quantityRedeemed || 1), 0);
|
||||||
const remaining = (ticket.quantity || 1) - totalRedeemed;
|
const remaining = (ticket.quantity || 1) - totalRedeemed;
|
||||||
@@ -461,6 +493,7 @@ const getTicketsByEvent = async (req, res) => {
|
|||||||
registrationOption: { include: { eventOption: true, variant: true, registration: { select: { id: true } } } },
|
registrationOption: { include: { eventOption: true, variant: true, registration: { select: { id: true } } } },
|
||||||
user: { select: { id: true, name: true, email: true, phoneNumber: true } },
|
user: { select: { id: true, name: true, email: true, phoneNumber: true } },
|
||||||
attendee: { select: { id: true, name: true, email: true, phone: true } },
|
attendee: { select: { id: true, name: true, email: true, phone: true } },
|
||||||
|
event: { select: { id: true, title: true, startDate: true, requiresParentalConsent: true, allowTicketTransfer: true, collectGender: true } },
|
||||||
usages: { include: { scannedBy: { select: { id: true, name: true, email: true } } } }
|
usages: { include: { scannedBy: { select: { id: true, name: true, email: true } } } }
|
||||||
},
|
},
|
||||||
orderBy: { createdAt: 'desc' },
|
orderBy: { createdAt: 'desc' },
|
||||||
@@ -670,6 +703,83 @@ const sendTicketsTo = async (req, res) => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// @desc Transfer a ticket to someone else (new QR code; billing stays with the payer)
|
||||||
|
// @route POST /api/tickets/:id/transfer { name, email?, phone?, dateOfBirth?, parentName?, parentEmail?, parentPhone? }
|
||||||
|
// @access Private (payer or holder; supervisors always)
|
||||||
|
const transferTicketHandler = async (req, res) => {
|
||||||
|
try {
|
||||||
|
const { transferTicket } = require('../utils/ticketTransfer');
|
||||||
|
const { name, email, phone, dateOfBirth, gender, parentName, parentEmail, parentPhone } = req.body || {};
|
||||||
|
const r = await transferTicket({ ticketId: req.params.id, actor: req.user, name, email, phone, dateOfBirth, gender, parentName, parentEmail, parentPhone });
|
||||||
|
|
||||||
|
const { logAdminAction } = require('../utils/adminAudit');
|
||||||
|
const { getClientIp } = require('../utils/requestUtils');
|
||||||
|
logAdminAction({
|
||||||
|
actorId: req.user.id, actorRole: req.user.role, action: 'ticket_transferred', targetType: 'Ticket', targetId: r.target.id,
|
||||||
|
metadata: { eventId: r.event.id, registrationId: r.registrationId, from: r.fromHolderName, to: r.attendee.name, toUserId: r.toUser.id, split: !r.transfer.oldQrCode },
|
||||||
|
ip: getClientIp(req),
|
||||||
|
});
|
||||||
|
|
||||||
|
// Tell the new holder: activation link for a new account, their ticket, and
|
||||||
|
// anything they need to do themselves (consent, attendee form).
|
||||||
|
if (r.accountCreated) {
|
||||||
|
const { sendActivationLink } = require('./userController');
|
||||||
|
sendActivationLink(r.toUser);
|
||||||
|
}
|
||||||
|
const a = r.attendee;
|
||||||
|
const hasEmail = !!(a.email && a.email.includes('@'));
|
||||||
|
const recipient = { id: r.toUser.id, name: a.name, email: hasEmail ? a.email : null, phoneNumber: a.phone || null, notificationPreference: hasEmail && a.phone ? 'both' : hasEmail ? 'email' : 'whatsapp' };
|
||||||
|
const silent = { status: () => silent, json: () => silent };
|
||||||
|
emailTicketsInternal({ user: { id: r.target.userId }, body: { ticketIds: [r.target.id] }, _noSplit: true }, silent, recipient)
|
||||||
|
.catch(e => console.error('[transfer] ticket delivery failed:', e?.message || e));
|
||||||
|
if (r.needsConsent) {
|
||||||
|
const { createConsentRequest } = require('../utils/consent');
|
||||||
|
createConsentRequest(a, r.event).catch(e => console.error('[transfer] consent request failed:', e?.message || e));
|
||||||
|
}
|
||||||
|
const form = await prisma.eventForm.findUnique({ where: { eventId: r.event.id }, include: { fields: { select: { id: true } } } });
|
||||||
|
if (form && form.fields.length > 0) {
|
||||||
|
const { sendAttendeeFormLinkMessage } = require('../utils/notifications');
|
||||||
|
const full = await prisma.attendee.findUnique({ where: { id: a.id }, include: { registration: { include: { event: true, user: { select: { id: true, name: true } } } } } });
|
||||||
|
sendAttendeeFormLinkMessage(full).catch(() => {});
|
||||||
|
}
|
||||||
|
|
||||||
|
res.json({
|
||||||
|
message: `Ticket transferred to ${a.name}. We've sent them the new ticket${r.needsConsent ? ' and a parental consent request' : ''}. The old QR code no longer works.`,
|
||||||
|
ticketId: r.target.id,
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
res.status(error.statusCode || (res.statusCode === 200 ? 400 : res.statusCode)).json({ message: safeErrorMessage(error) });
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// @desc Transfer history of a ticket
|
||||||
|
// @route GET /api/tickets/:id/transfers
|
||||||
|
// @access Private (payer or holder; staff)
|
||||||
|
const getTicketTransfers = async (req, res) => {
|
||||||
|
try {
|
||||||
|
const ticket = await prisma.ticket.findUnique({ where: { id: req.params.id }, select: { userId: true, holderUserId: true } });
|
||||||
|
if (!ticket) { res.status(404); throw new Error('Ticket not found'); }
|
||||||
|
const staffRole = ['admin', 'supervisor', 'staff'].includes(req.user.role);
|
||||||
|
if (!staffRole && ticket.userId !== req.user.id && ticket.holderUserId !== req.user.id) { res.status(403); throw new Error('Not authorized'); }
|
||||||
|
const transfers = await prisma.ticketTransfer.findMany({
|
||||||
|
where: { ticketId: req.params.id },
|
||||||
|
select: { id: true, fromHolderName: true, toName: true, createdAt: true, byUser: { select: { name: true } } },
|
||||||
|
orderBy: { createdAt: 'desc' },
|
||||||
|
});
|
||||||
|
res.json(transfers);
|
||||||
|
} catch (error) {
|
||||||
|
res.status(res.statusCode === 200 ? 400 : res.statusCode).json({ message: safeErrorMessage(error) });
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
/** "Room: Cabin 3 · Bus: Bus 2" for the sets shown on tickets, or ''. */
|
||||||
|
function allocationLabel(attendee) {
|
||||||
|
return [...(attendee?.allocations || [])]
|
||||||
|
.sort((a, b) => (a.set?.order || 0) - (b.set?.order || 0))
|
||||||
|
.map(a => `${a.set.name}: ${a.group.name}`)
|
||||||
|
.join(' · ');
|
||||||
|
}
|
||||||
|
|
||||||
// Internal helper used by both emailTickets and sendTicketsTo
|
// Internal helper used by both emailTickets and sendTicketsTo
|
||||||
async function emailTicketsInternal(req, res, userOverride) {
|
async function emailTicketsInternal(req, res, userOverride) {
|
||||||
const { ticketIds, registrationId } = req.body;
|
const { ticketIds, registrationId } = req.body;
|
||||||
@@ -692,7 +802,7 @@ async function emailTicketsInternal(req, res, userOverride) {
|
|||||||
const ticketInclude = {
|
const ticketInclude = {
|
||||||
event: true,
|
event: true,
|
||||||
registrationOption: { include: { eventOption: true, variant: true, registration: { select: { ticketDelivery: true } } } },
|
registrationOption: { include: { eventOption: true, variant: true, registration: { select: { ticketDelivery: true } } } },
|
||||||
attendee: true,
|
attendee: { include: { allocations: { where: { set: { showOnTicket: true } }, include: { group: { select: { name: true } }, set: { select: { name: true, order: true } } } } } },
|
||||||
user: { select: { name: true } },
|
user: { select: { name: true } },
|
||||||
usages: true,
|
usages: true,
|
||||||
};
|
};
|
||||||
@@ -793,7 +903,8 @@ async function emailTicketsInternal(req, res, userOverride) {
|
|||||||
doc.font('Helvetica').fontSize(10);
|
doc.font('Helvetica').fontSize(10);
|
||||||
const variantSuffix = ticket.registrationOption.variant ? ` — ${ticket.registrationOption.variant.name}` : '';
|
const variantSuffix = ticket.registrationOption.variant ? ` — ${ticket.registrationOption.variant.name}` : '';
|
||||||
doc.text(`Ticket Type: ${ticket.registrationOption.eventOption.name}${variantSuffix}`, x + 10, y + 30, { width: ticketWidth - 20 });
|
doc.text(`Ticket Type: ${ticket.registrationOption.eventOption.name}${variantSuffix}`, x + 10, y + 30, { width: ticketWidth - 20 });
|
||||||
doc.text(ticket.attendee ? `Name: ${ticket.attendee.name}` : `Qty: ${ticket.quantity || 1}`, x + 10, y + 45, { width: ticketWidth - 20 });
|
const groupLabel = allocationLabel(ticket.attendee);
|
||||||
|
doc.text(ticket.attendee ? `Name: ${ticket.attendee.name}${groupLabel ? ` · ${groupLabel}` : ''}` : `Qty: ${ticket.quantity || 1}`, x + 10, y + 45, { width: ticketWidth - 20 });
|
||||||
const eventDate = new Date(ticket.event.startDate);
|
const eventDate = new Date(ticket.event.startDate);
|
||||||
doc.text(`Date: ${new Intl.DateTimeFormat('en-GB', { day: '2-digit', month: 'long', year: 'numeric' }).format(eventDate)}`, x + 10, y + 60, { width: ticketWidth - 20 });
|
doc.text(`Date: ${new Intl.DateTimeFormat('en-GB', { day: '2-digit', month: 'long', year: 'numeric' }).format(eventDate)}`, x + 10, y + 60, { width: ticketWidth - 20 });
|
||||||
doc.text(`Purchased by: ${ticket.user?.name || user.name}`, x + 10, y + 75, { width: ticketWidth - 20 });
|
doc.text(`Purchased by: ${ticket.user?.name || user.name}`, x + 10, y + 75, { width: ticketWidth - 20 });
|
||||||
@@ -867,5 +978,7 @@ module.exports = {
|
|||||||
emailTickets,
|
emailTickets,
|
||||||
sendTicketsTo,
|
sendTicketsTo,
|
||||||
getRecentScans,
|
getRecentScans,
|
||||||
getScanStats
|
getScanStats,
|
||||||
|
transferTicketHandler,
|
||||||
|
getTicketTransfers
|
||||||
};
|
};
|
||||||
@@ -325,7 +325,13 @@ const handlePaymentSucceeded = async (webhookData) => {
|
|||||||
userId: resolvedUserId,
|
userId: resolvedUserId,
|
||||||
recordedById: resolvedUserId, // self-service webhook payment — payer is the recorder
|
recordedById: resolvedUserId, // self-service webhook payment — payer is the recorder
|
||||||
eventId: registration?.eventId || metadata?.eventId || null,
|
eventId: registration?.eventId || metadata?.eventId || null,
|
||||||
isDonation: !registration?.id
|
isDonation: !registration?.id,
|
||||||
|
...(!registration?.id && metadata?.type === 'sponsorship' ? {
|
||||||
|
isSponsorship: true,
|
||||||
|
sponsorAnonymous: String(metadata.sponsorAnonymous) === 'true',
|
||||||
|
sponsorName: String(metadata.sponsorAnonymous) === 'true' ? null : (metadata.sponsorName ? String(metadata.sponsorName).slice(0, 100) : null),
|
||||||
|
sponsorMessage: metadata.sponsorMessage ? String(metadata.sponsorMessage).slice(0, 300) : null,
|
||||||
|
} : {})
|
||||||
},
|
},
|
||||||
include: {
|
include: {
|
||||||
user: {
|
user: {
|
||||||
|
|||||||
@@ -178,6 +178,10 @@ app.use('/api/admin', adminRoutes);
|
|||||||
app.use('/api/coupons', require('./routes/couponRoutes'));
|
app.use('/api/coupons', require('./routes/couponRoutes'));
|
||||||
app.use('/api/consent', require('./routes/consentRoutes'));
|
app.use('/api/consent', require('./routes/consentRoutes'));
|
||||||
app.use('/api/waitlist', require('./routes/waitlistRoutes'));
|
app.use('/api/waitlist', require('./routes/waitlistRoutes'));
|
||||||
|
app.use('/api/scan-locks', require('./routes/scanLockRoutes'));
|
||||||
|
app.use('/api/allocations', require('./routes/allocationRoutes'));
|
||||||
|
app.use('/api/sponsorships', require('./routes/sponsorshipRoutes'));
|
||||||
|
app.use('/api/feedback', require('./routes/feedbackRoutes'));
|
||||||
app.use('/api/backups', backupRoutes);
|
app.use('/api/backups', backupRoutes);
|
||||||
|
|
||||||
// Pre-warm the settings cache so synchronous helpers have DB values from startup
|
// Pre-warm the settings cache so synchronous helpers have DB values from startup
|
||||||
@@ -634,6 +638,58 @@ app.get('/docs', async (req, res) => {
|
|||||||
]},
|
]},
|
||||||
]},
|
]},
|
||||||
|
|
||||||
|
{ title: 'Post-event feedback', base: '/api/feedback', endpoints: [
|
||||||
|
{ method:'GET', path:'/api/feedback/event/:eventId', auth:'supervisor+', desc:'An event\'s feedback form, with invite and response counts' },
|
||||||
|
{ method:'PUT', path:'/api/feedback/event/:eventId', auth:'supervisor+', desc:'Create/update the feedback form (questions lock once answered)',
|
||||||
|
request:{ body:{ sendAt:'2025-07-13T09:00:00.000Z', audience:'checked_in', anonymous:false, intro:'Thanks for coming!', fields:[{ type:'rating', label:'Overall?', isRequired:true }, { type:'multiple_choice', label:'Best part', options:['Worship','Talks'] }] }}},
|
||||||
|
{ method:'DELETE', path:'/api/feedback/event/:eventId', auth:'supervisor+', desc:'Remove the feedback form' },
|
||||||
|
{ method:'POST', path:'/api/feedback/event/:eventId/send-now', auth:'supervisor+', desc:'Send the feedback form now' },
|
||||||
|
{ method:'GET', path:'/api/feedback/public/:token', auth:'Link holder', desc:'The form behind a personal feedback link' },
|
||||||
|
{ method:'POST', path:'/api/feedback/public/:token', auth:'Link holder', desc:'Submit feedback once', request:{ body:{ answers:{ 'field-uuid':'5' } }}},
|
||||||
|
{ method:'GET', path:'/api/feedback/summary', auth:'supervisor+', desc:'Feedback summary for ?eventIds=a,b (response rate, averages, breakdowns, comments)' },
|
||||||
|
]},
|
||||||
|
{ title: 'Sponsor a spot', base: '/api/sponsorships', endpoints: [
|
||||||
|
{ method:'GET', path:'/api/sponsorships/event/:eventId', auth:'Public', desc:'Sponsorship progress for an event (spots funded, goal) — never who was helped',
|
||||||
|
responses:[{ status:200, desc:'Progress', body:{ enabled:true, open:true, spotPrice:450, showProgress:true, goalSpots:20, spotsFunded:12, sponsors:9 }}]},
|
||||||
|
{ method:'POST', path:'/api/sponsorships/checkout', auth:'Public (optional login)', desc:'Start a Yoco checkout to sponsor spots or a custom amount; the money lands in the event sponsorship pool',
|
||||||
|
request:{ body:{ eventId:'ev-uuid-...', spots:2, anonymous:false, sponsorName:'The Smith family', message:'Have a great camp!', name:'Sam Smith', email:'sam@example.com' }},
|
||||||
|
responses:[{ status:200, desc:'Checkout created', body:{ redirectUrl:'https://pay.yoco.com/...', amount:900 }}]},
|
||||||
|
{ method:'GET', path:'/api/sponsorships/event/:eventId/pool', auth:'supervisor+', desc:'Sponsorship pool totals: received, assigned, remaining' },
|
||||||
|
]},
|
||||||
|
{ title: 'Rooms & groups', base: '/api/allocations', endpoints: [
|
||||||
|
{ method:'GET', path:'/api/allocations/event/:eventId', auth:'supervisor+', desc:'Allocation board: sets with groups and assignments, named attendees, possible leaders' },
|
||||||
|
{ method:'POST', path:'/api/allocations/sets', auth:'supervisor+', desc:'Create an allocation set', request:{ body:{ eventId:'ev-uuid-...', name:'Rooms', showOnTicket:true }}},
|
||||||
|
{ method:'PUT', path:'/api/allocations/sets/:id', auth:'supervisor+', desc:'Rename a set or show it on tickets' },
|
||||||
|
{ method:'DELETE', path:'/api/allocations/sets/:id', auth:'supervisor+', desc:'Delete a set and its groups' },
|
||||||
|
{ method:'POST', path:'/api/allocations/sets/:id/groups', auth:'supervisor+', desc:'Add a group', request:{ body:{ name:'Cabin 1', capacity:8, gender:'female', leaderUserId:'user-uuid-...' }}},
|
||||||
|
{ method:'PUT', path:'/api/allocations/groups/:id', auth:'supervisor+', desc:'Edit a group' },
|
||||||
|
{ method:'DELETE', path:'/api/allocations/groups/:id', auth:'supervisor+', desc:'Delete a group (its people become unassigned)' },
|
||||||
|
{ method:'PUT', path:'/api/allocations/sets/:id/assignments', auth:'supervisor+', desc:'Place (or with groupId null, unplace) an attendee; enforces capacity and gender', request:{ body:{ attendeeId:'att-uuid-...', groupId:'grp-uuid-...' }}},
|
||||||
|
{ method:'DELETE', path:'/api/allocations/sets/:id/assignments', auth:'supervisor+', desc:'Clear every assignment in a set' },
|
||||||
|
{ method:'POST', path:'/api/allocations/sets/:id/auto', auth:'supervisor+', desc:'Auto-allocate everyone not yet placed', request:{ body:{ mode:'together' }}, responses:[{ status:200, desc:'Done', body:{ placed:12, unplaced:1 }}]},
|
||||||
|
{ method:'GET', path:'/api/allocations/sets/:id/lists', auth:'supervisor+', desc:'Per-group lists for printing (?medical=true adds medical details; audited)' },
|
||||||
|
{ method:'GET', path:'/api/allocations/my-groups', auth:'staff+', desc:'Groups the signed-in leader leads, with their people' },
|
||||||
|
]},
|
||||||
|
{ title: 'Ticket transfer', base: '/api/tickets', endpoints: [
|
||||||
|
{ method:'POST', path:'/api/tickets/:id/transfer', auth:'payer, holder or supervisor+', desc:'Give a ticket to someone else before the event (new QR code; the old one stops working; billing stays with the payer)',
|
||||||
|
request:{ body:{ name:'Nia New', email:'nia@example.com', phone:'0821234567' }},
|
||||||
|
responses:[{ status:200, desc:'Transferred', body:{ message:'Ticket transferred to Nia New…', ticketId:'ticket-uuid-...' }}, { status:400, desc:'Not allowed', body:{ message:'This ticket has already been used (or partly used), so it can’t be transferred.' }}]},
|
||||||
|
{ method:'GET', path:'/api/tickets/:id/transfers', auth:'payer, holder or staff+', desc:'Transfer history of a ticket' },
|
||||||
|
]},
|
||||||
|
{ title: 'Offline scanning', base: '/api/scan-locks', endpoints: [
|
||||||
|
{ method:'GET', path:'/api/scan-locks', auth:'staff+', desc:'Active offline locks for an event (?eventId=)' },
|
||||||
|
{ method:'POST', path:'/api/scan-locks', auth:'staff+', desc:'Lock a section (or the whole event) to this device for offline scanning',
|
||||||
|
request:{ body:{ eventId:'ev-uuid-...', sectionId:'sec-uuid-...', deviceId:'device-uuid', deviceName:'Chrome on Android' }},
|
||||||
|
responses:[{ status:201, desc:'Locked', body:{ id:'lock-uuid-...', sectionName:'Main hall' }}, { status:409, desc:'Held elsewhere', body:{ message:'"Main hall" is offline-locked by Ann on Chrome on Android.' }}]},
|
||||||
|
{ method:'GET', path:'/api/scan-locks/:id/snapshot', auth:'staff+', desc:'Tickets valid in the lock scope, for the device to keep offline (lock holder, ?deviceId=)' },
|
||||||
|
{ method:'POST', path:'/api/scan-locks/:id/sync', auth:'staff+', desc:'Upload offline scans (idempotent by clientScanId; capped at what is left on each ticket)',
|
||||||
|
request:{ body:{ deviceId:'device-uuid', scans:[{ clientScanId:'scan-uuid', qrCode:'qr-uuid', qty:1, scannedAt:'2025-07-10T08:15:00.000Z' }] }},
|
||||||
|
responses:[{ status:200, desc:'Synced', body:{ accepted:1, duplicates:0, conflicts:[] }}]},
|
||||||
|
{ method:'DELETE', path:'/api/scan-locks/:id', auth:'staff+', desc:'End offline mode (lock holder)' },
|
||||||
|
{ method:'POST', path:'/api/scan-locks/:id/force-release', auth:'supervisor+', desc:'Release a lost device\'s lock' },
|
||||||
|
{ method:'GET', path:'/api/scan-locks/reports', auth:'supervisor+', desc:'Offline sync reports for an event' },
|
||||||
|
{ method:'POST', path:'/api/scan-locks/reports/:id/review', auth:'supervisor+', desc:'Mark a sync report reviewed' },
|
||||||
|
]},
|
||||||
{ title: 'Waitlist', base: '/api/waitlist', endpoints: [
|
{ title: 'Waitlist', base: '/api/waitlist', endpoints: [
|
||||||
{ method:'POST', path:'/api/waitlist', auth:'public', desc:'Join the waitlist for a sold-out line (login needed when the event requires it)',
|
{ method:'POST', path:'/api/waitlist', auth:'public', desc:'Join the waitlist for a sold-out line (login needed when the event requires it)',
|
||||||
request:{ body:{ eventId:'ev-uuid-...', eventOptionId:'opt-uuid-...', quantity:2 }},
|
request:{ body:{ eventId:'ev-uuid-...', eventOptionId:'opt-uuid-...', quantity:2 }},
|
||||||
@@ -1343,6 +1399,29 @@ app.listen(PORT, () => {
|
|||||||
console.warn('[waitlist] Not scheduled:', e?.message || e);
|
console.warn('[waitlist] Not scheduled:', e?.message || e);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Feedback job — send post-event feedback forms at their send time, and the one
|
||||||
|
// reminder 3 days later.
|
||||||
|
try {
|
||||||
|
const enabled = String(process.env.FEEDBACK_JOB_ENABLED || 'true').toLowerCase() !== 'false';
|
||||||
|
if (enabled) {
|
||||||
|
const { runFeedbackJob } = require('./utils/feedback');
|
||||||
|
const everyMs = parseInt(process.env.FEEDBACK_JOB_INTERVAL_MS || String(15 * 60 * 1000), 10);
|
||||||
|
setInterval(async () => {
|
||||||
|
try {
|
||||||
|
const r = await runFeedbackJob();
|
||||||
|
if (r.sent || r.reminded) console.log(`[feedback] ${r.sent} invite(s), ${r.reminded} reminder(s) sent.`);
|
||||||
|
} catch (e) {
|
||||||
|
console.warn('[feedback] Job failed:', e?.message || e);
|
||||||
|
}
|
||||||
|
}, everyMs);
|
||||||
|
console.log(`[feedback] Job every ${Math.round(everyMs / 60000)} min.`);
|
||||||
|
} else {
|
||||||
|
console.log('[feedback] Job disabled by env FEEDBACK_JOB_ENABLED=false');
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
console.warn('[feedback] Not scheduled:', e?.message || e);
|
||||||
|
}
|
||||||
|
|
||||||
// Daily parental-consent job — reminders for unanswered requests, and purging
|
// Daily parental-consent job — reminders for unanswered requests, and purging
|
||||||
// medical/emergency details a set number of days after each event.
|
// medical/emergency details a set number of days after each event.
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -0,0 +1,22 @@
|
|||||||
|
const express = require('express');
|
||||||
|
const router = express.Router();
|
||||||
|
const {
|
||||||
|
getBoard, createSet, updateSet, deleteSet, createGroup, updateGroup, deleteGroup,
|
||||||
|
assign, autoAssign, clearAssignments, getSetLists, getMyGroups,
|
||||||
|
} = require('../controllers/allocationController');
|
||||||
|
const { protect, staff, supervisor } = require('../middleware/authMiddleware');
|
||||||
|
|
||||||
|
router.get('/my-groups', protect, staff, getMyGroups);
|
||||||
|
router.get('/event/:eventId', protect, supervisor, getBoard);
|
||||||
|
router.post('/sets', protect, supervisor, createSet);
|
||||||
|
router.put('/sets/:id', protect, supervisor, updateSet);
|
||||||
|
router.delete('/sets/:id', protect, supervisor, deleteSet);
|
||||||
|
router.get('/sets/:id/lists', protect, supervisor, getSetLists);
|
||||||
|
router.post('/sets/:id/groups', protect, supervisor, createGroup);
|
||||||
|
router.put('/sets/:id/assignments', protect, supervisor, assign);
|
||||||
|
router.delete('/sets/:id/assignments', protect, supervisor, clearAssignments);
|
||||||
|
router.post('/sets/:id/auto', protect, supervisor, autoAssign);
|
||||||
|
router.put('/groups/:id', protect, supervisor, updateGroup);
|
||||||
|
router.delete('/groups/:id', protect, supervisor, deleteGroup);
|
||||||
|
|
||||||
|
module.exports = router;
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
const express = require('express');
|
||||||
|
const router = express.Router();
|
||||||
|
const { getEventFeedback, saveEventFeedback, deleteEventFeedback, sendNow, getPublicForm, submitPublicForm, getSummary } = require('../controllers/feedbackController');
|
||||||
|
const { protect, supervisor } = require('../middleware/authMiddleware');
|
||||||
|
|
||||||
|
router.get('/public/:token', getPublicForm);
|
||||||
|
router.post('/public/:token', submitPublicForm);
|
||||||
|
router.get('/summary', protect, supervisor, getSummary);
|
||||||
|
router.get('/event/:eventId', protect, supervisor, getEventFeedback);
|
||||||
|
router.put('/event/:eventId', protect, supervisor, saveEventFeedback);
|
||||||
|
router.delete('/event/:eventId', protect, supervisor, deleteEventFeedback);
|
||||||
|
router.post('/event/:eventId/send-now', protect, supervisor, sendNow);
|
||||||
|
|
||||||
|
module.exports = router;
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
const express = require('express');
|
||||||
|
const router = express.Router();
|
||||||
|
const { listLocks, createLock, getSnapshot, syncLock, releaseLock, forceRelease, listReports, reviewReport } = require('../controllers/scanLockController');
|
||||||
|
const { protect, staff, supervisor } = require('../middleware/authMiddleware');
|
||||||
|
|
||||||
|
router.get('/', protect, staff, listLocks);
|
||||||
|
router.post('/', protect, staff, createLock);
|
||||||
|
router.get('/reports', protect, supervisor, listReports);
|
||||||
|
router.post('/reports/:id/review', protect, supervisor, reviewReport);
|
||||||
|
router.get('/:id/snapshot', protect, staff, getSnapshot);
|
||||||
|
router.post('/:id/sync', protect, staff, syncLock);
|
||||||
|
router.post('/:id/force-release', protect, supervisor, forceRelease);
|
||||||
|
router.delete('/:id', protect, staff, releaseLock);
|
||||||
|
|
||||||
|
module.exports = router;
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
const express = require('express');
|
||||||
|
const router = express.Router();
|
||||||
|
const { getEventSponsorship, createSponsorCheckout, getPool } = require('../controllers/sponsorshipController');
|
||||||
|
const { protect, supervisor, optionalAuth } = require('../middleware/authMiddleware');
|
||||||
|
|
||||||
|
router.get('/event/:eventId', getEventSponsorship);
|
||||||
|
router.get('/event/:eventId/pool', protect, supervisor, getPool);
|
||||||
|
router.post('/checkout', optionalAuth, createSponsorCheckout);
|
||||||
|
|
||||||
|
module.exports = router;
|
||||||
@@ -13,7 +13,9 @@ const {
|
|||||||
emailTickets,
|
emailTickets,
|
||||||
sendTicketsTo,
|
sendTicketsTo,
|
||||||
getRecentScans,
|
getRecentScans,
|
||||||
getScanStats
|
getScanStats,
|
||||||
|
transferTicketHandler,
|
||||||
|
getTicketTransfers
|
||||||
} = require('../controllers/ticketController');
|
} = require('../controllers/ticketController');
|
||||||
const { protect, admin, supervisor, staff } = require('../middleware/authMiddleware');
|
const { protect, admin, supervisor, staff } = require('../middleware/authMiddleware');
|
||||||
|
|
||||||
@@ -21,6 +23,8 @@ const { protect, admin, supervisor, staff } = require('../middleware/authMiddlew
|
|||||||
router.get('/mytickets', protect, getUserTickets);
|
router.get('/mytickets', protect, getUserTickets);
|
||||||
router.get('/:id', protect, getTicketById);
|
router.get('/:id', protect, getTicketById);
|
||||||
router.post('/email', protect, emailTickets);
|
router.post('/email', protect, emailTickets);
|
||||||
|
router.post('/:id/transfer', protect, transferTicketHandler);
|
||||||
|
router.get('/:id/transfers', protect, getTicketTransfers);
|
||||||
|
|
||||||
// Staff routes
|
// Staff routes
|
||||||
router.post('/send-to', protect, staff, sendTicketsTo);
|
router.post('/send-to', protect, staff, sendTicketsTo);
|
||||||
|
|||||||
@@ -33,4 +33,35 @@ async function findAccountByContact({ email, phone: rawPhone }, db = prisma) {
|
|||||||
return { phone, emailUser, phoneUser, conflict, user: conflict ? null : (emailUser || phoneUser || null) };
|
return { phone, emailUser, phoneUser, conflict, user: conflict ? null : (emailUser || phoneUser || null) };
|
||||||
}
|
}
|
||||||
|
|
||||||
module.exports = { findAccountByContact, hasValidEmail };
|
/**
|
||||||
|
* The account for these contact details, or a new inactive one (same as guest
|
||||||
|
* registration: a placeholder email for phone-only people, a random password, and an
|
||||||
|
* activation link sent by the caller when `created` is true).
|
||||||
|
*/
|
||||||
|
async function findOrCreateAccount({ name, email, phone }, db = prisma) {
|
||||||
|
const match = await findAccountByContact({ email, phone }, db);
|
||||||
|
if (match.conflict) {
|
||||||
|
const err = new Error('That email address and phone number belong to two different accounts. Use just one of them.');
|
||||||
|
err.statusCode = 400;
|
||||||
|
throw err;
|
||||||
|
}
|
||||||
|
if (match.user) return { user: match.user, created: false };
|
||||||
|
const { v4: uuidv4 } = require('uuid');
|
||||||
|
const { hashPassword } = require('../config/auth');
|
||||||
|
const validEmail = hasValidEmail(email);
|
||||||
|
const user = await db.user.create({
|
||||||
|
data: {
|
||||||
|
id: uuidv4(),
|
||||||
|
name,
|
||||||
|
email: validEmail ? String(email).trim() : `guest+${uuidv4().slice(0, 8)}@guest.local`,
|
||||||
|
password: await hashPassword(uuidv4()),
|
||||||
|
phoneNumber: match.phone || null,
|
||||||
|
isActive: false,
|
||||||
|
notificationPreference: validEmail && match.phone ? 'both' : validEmail ? 'email' : 'whatsapp',
|
||||||
|
updatedAt: new Date(),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
return { user, created: true };
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = { findAccountByContact, findOrCreateAccount, hasValidEmail };
|
||||||
|
|||||||
@@ -0,0 +1,107 @@
|
|||||||
|
/**
|
||||||
|
* Group / room allocation — placing named attendees into the groups of an allocation
|
||||||
|
* set ("Rooms", "Buses"…). Groups can have a capacity and a gender restriction.
|
||||||
|
* The placement rules and auto-allocate are pure, so they're unit-tested.
|
||||||
|
*/
|
||||||
|
|
||||||
|
const GENDERS = ['male', 'female'];
|
||||||
|
|
||||||
|
function allocationError(message, statusCode = 400) {
|
||||||
|
const err = new Error(message);
|
||||||
|
err.statusCode = statusCode;
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Normalises a gender value ('male' | 'female' | null); throws on anything else. */
|
||||||
|
function cleanGender(value) {
|
||||||
|
if (value === undefined || value === null || value === '') return null;
|
||||||
|
const g = String(value).trim().toLowerCase();
|
||||||
|
if (!GENDERS.includes(g)) throw allocationError('Gender must be male or female.');
|
||||||
|
return g;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Why `attendees` can't all join `group` (which has `count` members already), or null. Pure.
|
||||||
|
* @param {object} group - { name, capacity?, gender? }
|
||||||
|
*/
|
||||||
|
function joinBlocker(group, count, attendees) {
|
||||||
|
if (group.capacity != null && count + attendees.length > group.capacity) {
|
||||||
|
return `${group.name} is full (${group.capacity} places).`;
|
||||||
|
}
|
||||||
|
if (group.gender) {
|
||||||
|
const wrong = attendees.find(a => a.gender !== group.gender);
|
||||||
|
if (wrong) return `${group.name} is for ${group.gender === 'male' ? 'males' : 'females'} only${wrong.gender ? '' : ` — ${wrong.name} has no gender recorded`}.`;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Places every unassigned attendee it can. Pure.
|
||||||
|
*
|
||||||
|
* Groups fill evenly (the emptiest group that fits goes first). With mode 'together',
|
||||||
|
* people on the same registration (siblings) stay in one group when a group can take
|
||||||
|
* them all, otherwise they're placed one by one. With mode 'split', people on the same
|
||||||
|
* registration (friends booking together) are spread across groups where possible.
|
||||||
|
*
|
||||||
|
* @param {object} p
|
||||||
|
* @param {Array} p.groups - [{ id, name, capacity?, gender?, order? }]
|
||||||
|
* @param {Array} p.attendees - [{ id, name, registrationId, gender? }]
|
||||||
|
* @param {Map} p.assigned - attendeeId → groupId for attendees already placed
|
||||||
|
* @param {'together'|'split'} [p.mode]
|
||||||
|
* @returns {{ placements: {attendeeId, groupId}[], unplaced: string[] }}
|
||||||
|
*/
|
||||||
|
function autoAllocate({ groups, attendees, assigned = new Map(), mode = 'together' }) {
|
||||||
|
const count = new Map(groups.map(g => [g.id, 0]));
|
||||||
|
const regInGroup = new Map(groups.map(g => [g.id, new Map()]));
|
||||||
|
const byId = new Map(attendees.map(a => [a.id, a]));
|
||||||
|
const place = (groupId, a) => {
|
||||||
|
count.set(groupId, count.get(groupId) + 1);
|
||||||
|
const regs = regInGroup.get(groupId);
|
||||||
|
regs.set(a.registrationId, (regs.get(a.registrationId) || 0) + 1);
|
||||||
|
};
|
||||||
|
for (const [attendeeId, groupId] of assigned) {
|
||||||
|
const a = byId.get(attendeeId);
|
||||||
|
if (a && count.has(groupId)) place(groupId, a);
|
||||||
|
}
|
||||||
|
|
||||||
|
const todo = attendees.filter(a => !assigned.has(a.id));
|
||||||
|
let units;
|
||||||
|
if (mode === 'together') {
|
||||||
|
const byReg = new Map();
|
||||||
|
for (const a of todo) byReg.set(a.registrationId, [...(byReg.get(a.registrationId) || []), a]);
|
||||||
|
units = [...byReg.values()].sort((x, y) => y.length - x.length);
|
||||||
|
} else {
|
||||||
|
units = todo.map(a => [a]);
|
||||||
|
}
|
||||||
|
|
||||||
|
const orderOf = new Map(groups.map((g, i) => [g.id, g.order ?? i]));
|
||||||
|
const best = (members) => {
|
||||||
|
const reg = members[0].registrationId;
|
||||||
|
const fitting = groups.filter(g => !joinBlocker(g, count.get(g.id), members));
|
||||||
|
if (fitting.length === 0) return null;
|
||||||
|
fitting.sort((x, y) =>
|
||||||
|
(mode === 'split' ? (regInGroup.get(x.id).get(reg) || 0) - (regInGroup.get(y.id).get(reg) || 0) : 0)
|
||||||
|
|| count.get(x.id) - count.get(y.id)
|
||||||
|
|| orderOf.get(x.id) - orderOf.get(y.id));
|
||||||
|
return fitting[0];
|
||||||
|
};
|
||||||
|
|
||||||
|
const placements = [];
|
||||||
|
const unplaced = [];
|
||||||
|
const queue = [...units];
|
||||||
|
while (queue.length) {
|
||||||
|
const unit = queue.shift();
|
||||||
|
const g = best(unit);
|
||||||
|
if (g) {
|
||||||
|
for (const a of unit) { place(g.id, a); placements.push({ attendeeId: a.id, groupId: g.id }); }
|
||||||
|
} else if (unit.length > 1) {
|
||||||
|
// Can't keep them together — place them one by one instead.
|
||||||
|
queue.unshift(...unit.map(a => [a]));
|
||||||
|
} else {
|
||||||
|
unplaced.push(unit[0].id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return { placements, unplaced };
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = { GENDERS, allocationError, cleanGender, joinBlocker, autoAllocate };
|
||||||
@@ -69,6 +69,13 @@ function validateAttendees(event, placesByKey, attendees, namedByKey = {}) {
|
|||||||
} else if (consent) {
|
} else if (consent) {
|
||||||
throw attendeeError(`${name}: enter a date of birth.`);
|
throw attendeeError(`${name}: enter a date of birth.`);
|
||||||
}
|
}
|
||||||
|
let gender = null;
|
||||||
|
if (a.gender) {
|
||||||
|
gender = String(a.gender).trim().toLowerCase();
|
||||||
|
if (!['male', 'female'].includes(gender)) throw attendeeError(`${name}: gender must be male or female.`);
|
||||||
|
} else if (event.collectGender) {
|
||||||
|
throw attendeeError(`${name}: choose a gender.`);
|
||||||
|
}
|
||||||
const parentName = String(a.parentName || '').trim() || null;
|
const parentName = String(a.parentName || '').trim() || null;
|
||||||
const parentEmail = String(a.parentEmail || '').trim() || null;
|
const parentEmail = String(a.parentEmail || '').trim() || null;
|
||||||
const parentPhone = String(a.parentPhone || '').trim() || null;
|
const parentPhone = String(a.parentPhone || '').trim() || null;
|
||||||
@@ -78,7 +85,7 @@ function validateAttendees(event, placesByKey, attendees, namedByKey = {}) {
|
|||||||
}
|
}
|
||||||
if (!EMAIL_RE.test(parentEmail)) throw attendeeError(`${name}: "${parentEmail}" isn't a valid parent email address.`);
|
if (!EMAIL_RE.test(parentEmail)) throw attendeeError(`${name}: "${parentEmail}" isn't a valid parent email address.`);
|
||||||
}
|
}
|
||||||
return { eventOptionId: a.eventOptionId, variantId: a.variantId || null, name, email, phone, dateOfBirth, parentName, parentEmail, parentPhone };
|
return { eventOptionId: a.eventOptionId, variantId: a.variantId || null, name, email, phone, dateOfBirth, gender, parentName, parentEmail, parentPhone };
|
||||||
});
|
});
|
||||||
|
|
||||||
// Youth events need every main place named (with a date of birth).
|
// Youth events need every main place named (with a date of birth).
|
||||||
@@ -187,6 +194,7 @@ async function createAttendees(registrationId, attendees, db = prisma) {
|
|||||||
email: a.email,
|
email: a.email,
|
||||||
phone: a.phone,
|
phone: a.phone,
|
||||||
dateOfBirth: a.dateOfBirth || null,
|
dateOfBirth: a.dateOfBirth || null,
|
||||||
|
gender: a.gender || null,
|
||||||
parentName: a.parentName || null,
|
parentName: a.parentName || null,
|
||||||
parentEmail: a.parentEmail || null,
|
parentEmail: a.parentEmail || null,
|
||||||
parentPhone: a.parentPhone || null,
|
parentPhone: a.parentPhone || null,
|
||||||
|
|||||||
@@ -0,0 +1,230 @@
|
|||||||
|
/**
|
||||||
|
* Post-event feedback.
|
||||||
|
*
|
||||||
|
* A FeedbackForm is sent once, at its sendAt, to everyone who checked in (or everyone
|
||||||
|
* registered), with one reminder 3 days later to those who haven't answered. Each person
|
||||||
|
* gets a personal link; only an HMAC of its token is stored, and a reminder issues a new
|
||||||
|
* link. Anonymous forms record who has answered (so reminders skip them) but never link
|
||||||
|
* the answers to the person.
|
||||||
|
*/
|
||||||
|
|
||||||
|
const crypto = require('crypto');
|
||||||
|
const prisma = require('../config/db');
|
||||||
|
|
||||||
|
const ANSWERABLE = ['text', 'numeric', 'date', 'yes_no', 'rating', 'multiple_choice'];
|
||||||
|
const ALL_TYPES = [...ANSWERABLE, 'statement', 'paragraph'];
|
||||||
|
const REMINDER_AFTER_MS = 3 * 864e5;
|
||||||
|
|
||||||
|
function feedbackError(message, statusCode = 400) {
|
||||||
|
const err = new Error(message);
|
||||||
|
err.statusCode = statusCode;
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
|
const hashToken = (token) => crypto.createHmac('sha256', process.env.JWT_SECRET || '').update(`feedback:${token}`).digest('hex');
|
||||||
|
const newToken = () => crypto.randomBytes(24).toString('hex');
|
||||||
|
function feedbackLink(token) {
|
||||||
|
const base = (process.env.FRONTEND_URL || process.env.APP_BASE_URL || 'http://localhost:3001').split(',')[0].trim().replace(/\/$/, '');
|
||||||
|
return `${base}/feedback/${token}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ─── Pure helpers ─────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
/** Checks and tidies the questions from the form builder. Pure. */
|
||||||
|
function cleanFields(fields) {
|
||||||
|
if (!Array.isArray(fields)) throw feedbackError('fields must be a list');
|
||||||
|
const out = fields.filter(f => f && String(f.label || '').trim()).map((f, i) => {
|
||||||
|
if (!ALL_TYPES.includes(f.type)) throw feedbackError(`Question ${i + 1}: unknown type "${f.type}".`);
|
||||||
|
const label = String(f.label).trim().slice(0, 500);
|
||||||
|
let options = null;
|
||||||
|
if (f.type === 'multiple_choice') {
|
||||||
|
options = [...new Set((Array.isArray(f.options) ? f.options : []).map(o => String(o || '').trim()).filter(Boolean))].slice(0, 20);
|
||||||
|
if (options.length < 2) throw feedbackError(`"${label}": a multiple-choice question needs at least two choices.`);
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
type: f.type, label, order: i, options,
|
||||||
|
isRequired: ANSWERABLE.includes(f.type) && !!f.isRequired,
|
||||||
|
helpText: f.helpText ? String(f.helpText).slice(0, 1000) : null,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
if (out.length > 50) throw feedbackError('A feedback form can have at most 50 questions.');
|
||||||
|
if (!out.some(f => ANSWERABLE.includes(f.type))) throw feedbackError('Add at least one question.');
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The stored value for one answer (null when blank); throws when it's invalid. Pure. */
|
||||||
|
function cleanAnswer(field, raw) {
|
||||||
|
if (raw === undefined || raw === null || String(raw).trim() === '') {
|
||||||
|
if (field.isRequired) throw feedbackError(`Please answer: ${field.label}`);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
const v = String(raw).trim();
|
||||||
|
switch (field.type) {
|
||||||
|
case 'rating': {
|
||||||
|
const n = Number(v);
|
||||||
|
if (!Number.isInteger(n) || n < 1 || n > 5) throw feedbackError(`"${field.label}": choose 1 to 5 stars.`);
|
||||||
|
return String(n);
|
||||||
|
}
|
||||||
|
case 'multiple_choice':
|
||||||
|
if (!(field.options || []).includes(v)) throw feedbackError(`"${field.label}": choose one of the options.`);
|
||||||
|
return v;
|
||||||
|
case 'yes_no':
|
||||||
|
if (!['yes', 'no'].includes(v.toLowerCase())) throw feedbackError(`"${field.label}": answer yes or no.`);
|
||||||
|
return v.toLowerCase();
|
||||||
|
case 'numeric':
|
||||||
|
if (!Number.isFinite(Number(v))) throw feedbackError(`"${field.label}": enter a number.`);
|
||||||
|
return v;
|
||||||
|
case 'date':
|
||||||
|
if (isNaN(new Date(v).getTime())) throw feedbackError(`"${field.label}": enter a valid date.`);
|
||||||
|
return v.slice(0, 10);
|
||||||
|
default:
|
||||||
|
return v.slice(0, 4000);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Per-question summary. Pure.
|
||||||
|
* @param {Array} fields - [{ id, type, label, options }]
|
||||||
|
* @param {Array} answers - [{ fieldId, value, name? }] (name: respondent, for named forms)
|
||||||
|
*/
|
||||||
|
function summarise(fields, answers) {
|
||||||
|
const by = new Map();
|
||||||
|
for (const a of answers) by.set(a.fieldId, [...(by.get(a.fieldId) || []), a]);
|
||||||
|
const round1 = (n) => Math.round(n * 10) / 10;
|
||||||
|
return fields.filter(f => ANSWERABLE.includes(f.type)).map(f => {
|
||||||
|
const list = by.get(f.id) || [];
|
||||||
|
const base = { fieldId: f.id, type: f.type, label: f.label, answered: list.length };
|
||||||
|
if (f.type === 'rating') {
|
||||||
|
const nums = list.map(a => Number(a.value)).filter(n => n >= 1 && n <= 5);
|
||||||
|
const distribution = [1, 2, 3, 4, 5].map(star => ({ label: `${star}★`, value: nums.filter(n => n === star).length }));
|
||||||
|
return { ...base, average: nums.length ? round1(nums.reduce((s, n) => s + n, 0) / nums.length) : null, distribution };
|
||||||
|
}
|
||||||
|
if (f.type === 'multiple_choice' || f.type === 'yes_no') {
|
||||||
|
const choices = f.type === 'yes_no' ? ['yes', 'no'] : (f.options || []);
|
||||||
|
return { ...base, counts: choices.map(c => ({ label: f.type === 'yes_no' ? (c === 'yes' ? 'Yes' : 'No') : c, value: list.filter(a => a.value === c).length })) };
|
||||||
|
}
|
||||||
|
if (f.type === 'numeric') {
|
||||||
|
const nums = list.map(a => Number(a.value)).filter(Number.isFinite);
|
||||||
|
return { ...base, average: nums.length ? round1(nums.reduce((s, n) => s + n, 0) / nums.length) : null };
|
||||||
|
}
|
||||||
|
return { ...base, texts: list.map(a => ({ value: a.value, ...(a.name ? { name: a.name } : {}) })) };
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// ─── Sending ──────────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
/** People to ask: those who checked in (a scan on their ticket), or everyone registered. */
|
||||||
|
async function feedbackRecipients(form) {
|
||||||
|
const tickets = await prisma.ticket.findMany({
|
||||||
|
where: {
|
||||||
|
eventId: form.eventId,
|
||||||
|
registrationOption: { registration: { status: { not: 'cancelled' } } },
|
||||||
|
...(form.audience === 'all' ? {} : { usages: { some: {} } }),
|
||||||
|
},
|
||||||
|
select: { userId: true, holderUserId: true, attendee: { select: { userId: true } } },
|
||||||
|
});
|
||||||
|
const ids = new Set(tickets.map(t => t.holderUserId || t.attendee?.userId || t.userId));
|
||||||
|
if (form.audience === 'all') {
|
||||||
|
const regs = await prisma.registration.findMany({ where: { eventId: form.eventId, status: { not: 'cancelled' } }, select: { userId: true } });
|
||||||
|
regs.forEach(r => ids.add(r.userId));
|
||||||
|
}
|
||||||
|
if (ids.size === 0) return [];
|
||||||
|
return prisma.user.findMany({ where: { id: { in: [...ids] } }, select: { id: true, name: true, email: true, phoneNumber: true, notificationPreference: true } });
|
||||||
|
}
|
||||||
|
|
||||||
|
async function sendFeedbackMessage(user, event, token, { reminder = false } = {}) {
|
||||||
|
const { sendMail, emailWrapper, ctaButton, fallbackLink } = require('./email');
|
||||||
|
const { waTextAny } = require('./notify');
|
||||||
|
const { isValidZAPhone } = require('./whatsapp');
|
||||||
|
const ff = `-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Helvetica,Arial,sans-serif`;
|
||||||
|
const link = feedbackLink(token);
|
||||||
|
const subject = `${reminder ? 'Reminder: ' : ''}How was ${event.title}?`;
|
||||||
|
const emailOk = !!(user.email && user.email.includes('@') && !user.email.endsWith('@guest.local') && !user.email.endsWith('@deleted.invalid'));
|
||||||
|
const sent = [];
|
||||||
|
if (emailOk) {
|
||||||
|
const html = emailWrapper(`
|
||||||
|
<p style="font-size:22px;font-weight:800;color:#0f172a;margin:0 0 8px 0">${reminder ? 'A quick reminder — ' : ''}How was ${event.title}?</p>
|
||||||
|
<p style="margin:0 0 8px 0;color:#374151;font-family:${ff}">Hi <strong>${user.name || 'there'}</strong>,</p>
|
||||||
|
<p style="margin:0 0 24px 0;color:#374151;font-family:${ff}">Thank you for coming to <strong>${event.title}</strong>. We'd love to hear what you thought — it only takes a minute.</p>
|
||||||
|
${ctaButton('Give feedback', link)}
|
||||||
|
${fallbackLink(link)}
|
||||||
|
`, { preheader: `Tell us about ${event.title}` });
|
||||||
|
try {
|
||||||
|
await sendMail({ to: user.email, subject, html, text: `Hi ${user.name || 'there'},\n\nThank you for coming to ${event.title}. We'd love to hear what you thought: ${link}` });
|
||||||
|
sent.push('email');
|
||||||
|
} catch (e) {
|
||||||
|
console.warn('[feedback] email failed:', e?.message || e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const wantsWA = ['whatsapp', 'both'].includes(user.notificationPreference) || !emailOk;
|
||||||
|
if (wantsWA && user.phoneNumber && isValidZAPhone(user.phoneNumber)) {
|
||||||
|
await waTextAny(user, `${reminder ? '⏰ ' : ''}Hi ${user.name || 'there'}, thank you for coming to *${event.title}*! We'd love your feedback — it only takes a minute: ${link}`);
|
||||||
|
sent.push('WhatsApp');
|
||||||
|
}
|
||||||
|
return sent;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Sends the form to everyone not yet invited. Returns how many were invited. */
|
||||||
|
async function sendFeedbackInvites(formId) {
|
||||||
|
const form = await prisma.feedbackForm.findUnique({ where: { id: formId }, include: { event: true, invites: { select: { userId: true } } } });
|
||||||
|
if (!form) return 0;
|
||||||
|
const already = new Set(form.invites.map(i => i.userId));
|
||||||
|
const people = (await feedbackRecipients(form)).filter(u => !already.has(u.id));
|
||||||
|
for (const user of people) {
|
||||||
|
const token = newToken();
|
||||||
|
try {
|
||||||
|
await prisma.feedbackInvite.create({ data: { formId: form.id, userId: user.id, tokenHash: hashToken(token) } });
|
||||||
|
} catch (e) {
|
||||||
|
if (e.code === 'P2002') continue; // invited by a concurrent run
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
|
await sendFeedbackMessage(user, form.event, token).catch(e => console.warn('[feedback] send failed:', e?.message || e));
|
||||||
|
}
|
||||||
|
return people.length;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The single reminder: a fresh link for everyone who hasn't answered. */
|
||||||
|
async function sendFeedbackReminders(formId) {
|
||||||
|
const form = await prisma.feedbackForm.findUnique({ where: { id: formId }, include: { event: true } });
|
||||||
|
const invites = await prisma.feedbackInvite.findMany({
|
||||||
|
where: { formId, respondedAt: null, remindedAt: null },
|
||||||
|
include: { user: { select: { id: true, name: true, email: true, phoneNumber: true, notificationPreference: true } } },
|
||||||
|
});
|
||||||
|
for (const inv of invites) {
|
||||||
|
const token = newToken();
|
||||||
|
await prisma.feedbackInvite.update({ where: { id: inv.id }, data: { tokenHash: hashToken(token), remindedAt: new Date() } });
|
||||||
|
await sendFeedbackMessage(inv.user, form.event, token, { reminder: true }).catch(e => console.warn('[feedback] reminder failed:', e?.message || e));
|
||||||
|
}
|
||||||
|
return invites.length;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Background job: send forms whose time has come, and reminders 3 days after. */
|
||||||
|
async function runFeedbackJob(now = new Date()) {
|
||||||
|
let sent = 0, reminded = 0;
|
||||||
|
const due = await prisma.feedbackForm.findMany({ where: { sentAt: null, sendAt: { lte: now } }, select: { id: true } });
|
||||||
|
for (const f of due) {
|
||||||
|
// Claim it first so two servers (or overlapping runs) never both send.
|
||||||
|
const claimed = await prisma.feedbackForm.updateMany({ where: { id: f.id, sentAt: null }, data: { sentAt: now } });
|
||||||
|
if (claimed.count === 1) sent += await sendFeedbackInvites(f.id);
|
||||||
|
}
|
||||||
|
const remind = await prisma.feedbackForm.findMany({ where: { reminderSentAt: null, sentAt: { lte: new Date(now.getTime() - REMINDER_AFTER_MS) } }, select: { id: true } });
|
||||||
|
for (const f of remind) {
|
||||||
|
const claimed = await prisma.feedbackForm.updateMany({ where: { id: f.id, reminderSentAt: null }, data: { reminderSentAt: now } });
|
||||||
|
if (claimed.count === 1) reminded += await sendFeedbackReminders(f.id);
|
||||||
|
}
|
||||||
|
return { sent, reminded };
|
||||||
|
}
|
||||||
|
|
||||||
|
async function findInviteByToken(token) {
|
||||||
|
if (!token || typeof token !== 'string' || token.length > 200) return null;
|
||||||
|
return prisma.feedbackInvite.findUnique({
|
||||||
|
where: { tokenHash: hashToken(token) },
|
||||||
|
include: { user: { select: { id: true, name: true } }, form: { include: { event: { select: { id: true, title: true, startDate: true, endDate: true } }, fields: { orderBy: { order: 'asc' } } } } },
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = {
|
||||||
|
ANSWERABLE, ALL_TYPES, REMINDER_AFTER_MS, feedbackError, hashToken, feedbackLink,
|
||||||
|
cleanFields, cleanAnswer, summarise,
|
||||||
|
feedbackRecipients, sendFeedbackInvites, sendFeedbackReminders, runFeedbackJob, findInviteByToken,
|
||||||
|
};
|
||||||
@@ -533,7 +533,7 @@ function buildPaymentReceipt(payment) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Donation receipt
|
// Donation receipt
|
||||||
const subject = `Donation received – ${eventTitle}`;
|
const subject = payment.isSponsorship ? `Thank you for sponsoring a spot – ${eventTitle}` : `Donation received – ${eventTitle}`;
|
||||||
const preheader = `Thank you for your donation of ${fmtAmount(payment.amount)} to ${eventTitle}.`;
|
const preheader = `Thank you for your donation of ${fmtAmount(payment.amount)} to ${eventTitle}.`;
|
||||||
const body = `
|
const body = `
|
||||||
<p style="font-size:22px;font-weight:800;color:#0f172a;margin:0 0 8px 0;letter-spacing:-0.3px">Thank you for your donation!</p>
|
<p style="font-size:22px;font-weight:800;color:#0f172a;margin:0 0 8px 0;letter-spacing:-0.3px">Thank you for your donation!</p>
|
||||||
@@ -541,7 +541,7 @@ function buildPaymentReceipt(payment) {
|
|||||||
|
|
||||||
<p style="margin:0 0 4px 0;color:#374151;font-family:${ff}">Hi <strong>${payment.user?.name || 'there'}</strong>,</p>
|
<p style="margin:0 0 4px 0;color:#374151;font-family:${ff}">Hi <strong>${payment.user?.name || 'there'}</strong>,</p>
|
||||||
<p style="margin:0 0 28px 0;color:#374151;font-family:${ff}">
|
<p style="margin:0 0 28px 0;color:#374151;font-family:${ff}">
|
||||||
We received your donation of <strong>${fmtAmount(payment.amount)}</strong> to <strong>${eventTitle}</strong>. Your support means the world to us.
|
We received your donation of <strong>${fmtAmount(payment.amount)}</strong> to <strong>${eventTitle}</strong>. Your support means the world to us.${payment.isSponsorship ? ' It goes into the sponsorship pool and helps someone attend who otherwise couldn’t.' : ''}
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
${callout(`<strong style="font-size:15px">${fmtAmount(payment.amount)} donated</strong><br/>
|
${callout(`<strong style="font-size:15px">${fmtAmount(payment.amount)} donated</strong><br/>
|
||||||
|
|||||||
@@ -0,0 +1,218 @@
|
|||||||
|
/**
|
||||||
|
* Offline scanning — locks, snapshots and syncing.
|
||||||
|
*
|
||||||
|
* Rules:
|
||||||
|
* - Offline mode is per section (or the whole event), and only one device may hold a
|
||||||
|
* scope at a time: while offline, devices can't see each other's scans, so two
|
||||||
|
* devices on the same scope could redeem one ticket twice. A whole-event lock clashes
|
||||||
|
* with every section of that event, and a section lock with the whole event.
|
||||||
|
* - While a scope is locked, other devices can't scan it online either.
|
||||||
|
* - The lock holder downloads a snapshot of valid tickets; scans made offline are
|
||||||
|
* queued on the device and synced later. Syncing is idempotent (each scan carries a
|
||||||
|
* clientScanId) and never redeems more than is left on a ticket.
|
||||||
|
* - Anything that needs a person to look — unknown ticket, cancelled registration, used
|
||||||
|
* up, outside the locked scope, consent not given — goes into an OfflineSyncReport.
|
||||||
|
* - A supervisor can force-release a lock (lost phone). If that device syncs later its
|
||||||
|
* scans are still recorded, and the report is flagged.
|
||||||
|
*/
|
||||||
|
|
||||||
|
const prisma = require('../config/db');
|
||||||
|
|
||||||
|
function lockError(message, statusCode = 400) {
|
||||||
|
const err = new Error(message);
|
||||||
|
err.statusCode = statusCode;
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ─── Pure helpers ─────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
/** Whether a new lock on `sectionId` (null = whole event) clashes with `existing`. */
|
||||||
|
function locksClash(existing, sectionId) {
|
||||||
|
if (!existing.sectionId || !sectionId) return true;
|
||||||
|
return existing.sectionId === sectionId;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Whether `lock` covers a scan of a ticket with option `optionId`. When the scanner has
|
||||||
|
* picked a section, only a lock on that section (or the whole event) covers it; with no
|
||||||
|
* section picked, any lock on a section that admits the ticket does.
|
||||||
|
* @param {object} lock - { sectionId, section?: { allowedOptions: [{ eventOptionId }] } }
|
||||||
|
*/
|
||||||
|
function lockCovers(lock, { sectionId = null, optionId }) {
|
||||||
|
if (!lock.sectionId) return true;
|
||||||
|
if (sectionId) return sectionId === lock.sectionId;
|
||||||
|
return (lock.section?.allowedOptions || []).some(o => o.eventOptionId === optionId);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* What to do with one synced scan, given the ticket as the server sees it now. Pure.
|
||||||
|
* @param {object|null} ticket - { remaining, cancelled, inScope, consentOk }
|
||||||
|
* @param {number} qty - quantity the device redeemed
|
||||||
|
* @returns {{ redeem: number, conflict: string|null }}
|
||||||
|
*/
|
||||||
|
function judgeSyncedScan(ticket, qty) {
|
||||||
|
if (!ticket) return { redeem: 0, conflict: 'not_found' };
|
||||||
|
if (ticket.transferred) return { redeem: 0, conflict: 'transferred' };
|
||||||
|
if (ticket.cancelled) return { redeem: 0, conflict: 'cancelled' };
|
||||||
|
if (!ticket.inScope) return { redeem: 0, conflict: 'wrong_scope' };
|
||||||
|
if (ticket.remaining <= 0) return { redeem: 0, conflict: 'already_used' };
|
||||||
|
const redeem = Math.min(Math.max(1, qty || 1), ticket.remaining);
|
||||||
|
if (!ticket.consentOk) return { redeem, conflict: 'consent' };
|
||||||
|
return { redeem, conflict: redeem < (qty || 1) ? 'partly_used' : null };
|
||||||
|
}
|
||||||
|
|
||||||
|
const CONFLICT_TEXT = {
|
||||||
|
not_found: 'Ticket not found',
|
||||||
|
transferred: 'Old QR code of a ticket that was transferred to someone else',
|
||||||
|
cancelled: 'Registration was cancelled',
|
||||||
|
wrong_scope: 'Ticket is not valid for this section',
|
||||||
|
already_used: 'Ticket had already been fully used',
|
||||||
|
partly_used: 'Fewer places were left than were checked in offline',
|
||||||
|
consent: 'Checked in without parental consent',
|
||||||
|
};
|
||||||
|
|
||||||
|
// ─── Database helpers ─────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
const LOCK_INCLUDE = {
|
||||||
|
section: { include: { allowedOptions: true } },
|
||||||
|
user: { select: { id: true, name: true } },
|
||||||
|
};
|
||||||
|
|
||||||
|
async function activeLocks(eventId, db = prisma) {
|
||||||
|
return db.scanLock.findMany({ where: { eventId, releasedAt: null }, include: LOCK_INCLUDE, orderBy: { lockedAt: 'asc' } });
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Locks a scope to this device. Re-locking by the same device and person returns the existing lock. */
|
||||||
|
async function acquireLock({ eventId, sectionId = null, deviceId, deviceName, userId }) {
|
||||||
|
if (!deviceId || typeof deviceId !== 'string' || deviceId.length > 100) throw lockError('A device id is required');
|
||||||
|
return prisma.$transaction(async (tx) => {
|
||||||
|
await tx.$executeRaw`SELECT pg_advisory_xact_lock(hashtext(${'scanlock:' + eventId}))`;
|
||||||
|
const event = await tx.event.findUnique({ where: { id: eventId } });
|
||||||
|
if (!event) throw lockError('Event not found', 404);
|
||||||
|
if (sectionId) {
|
||||||
|
const section = await tx.section.findUnique({ where: { id: sectionId } });
|
||||||
|
if (!section || section.eventId !== eventId) throw lockError('Section not found for this event', 404);
|
||||||
|
}
|
||||||
|
const existing = await activeLocks(eventId, tx);
|
||||||
|
const same = existing.find(l => (l.sectionId || null) === (sectionId || null) && l.deviceId === deviceId && l.userId === userId);
|
||||||
|
if (same) return same;
|
||||||
|
const clash = existing.find(l => locksClash(l, sectionId));
|
||||||
|
if (clash) {
|
||||||
|
const scope = clash.section ? `"${clash.section.name}"` : 'the whole event';
|
||||||
|
throw lockError(`${scope} is offline-locked by ${clash.user.name}${clash.deviceName ? ` on ${clash.deviceName}` : ''}.`, 409);
|
||||||
|
}
|
||||||
|
return tx.scanLock.create({ data: { eventId, sectionId: sectionId || null, deviceId, deviceName: deviceName ? String(deviceName).slice(0, 100) : null, userId }, include: LOCK_INCLUDE });
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The lock (other than the scanner's own device) that stops this online scan, or null.
|
||||||
|
* @param {object} ticket - { eventId, optionId }
|
||||||
|
*/
|
||||||
|
async function blockingLock(ticket, { sectionId = null, deviceId = null } = {}) {
|
||||||
|
const locks = await activeLocks(ticket.eventId);
|
||||||
|
return locks.find(l => l.deviceId !== deviceId && lockCovers(l, { sectionId, optionId: ticket.optionId })) || null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Tickets valid in a lock's scope, for the device to keep offline. */
|
||||||
|
async function snapshotFor(lock) {
|
||||||
|
const optionIds = lock.section ? lock.section.allowedOptions.map(o => o.eventOptionId) : null;
|
||||||
|
const tickets = await prisma.ticket.findMany({
|
||||||
|
where: {
|
||||||
|
eventId: lock.eventId,
|
||||||
|
registrationOption: { registration: { status: { not: 'cancelled' } }, ...(optionIds ? { eventOptionId: { in: optionIds } } : {}) },
|
||||||
|
},
|
||||||
|
include: {
|
||||||
|
usages: { select: { quantityRedeemed: true } },
|
||||||
|
attendee: { select: { name: true } },
|
||||||
|
user: { select: { name: true } },
|
||||||
|
registrationOption: { include: { eventOption: { select: { id: true, name: true, isMainTicket: true } }, variant: { select: { name: true } } } },
|
||||||
|
},
|
||||||
|
});
|
||||||
|
const { consentStatusForTickets } = require('./consent');
|
||||||
|
const consent = await consentStatusForTickets(tickets.map(t => t.id));
|
||||||
|
const snapshotAt = new Date();
|
||||||
|
await prisma.scanLock.update({ where: { id: lock.id }, data: { snapshotAt } });
|
||||||
|
return {
|
||||||
|
snapshotAt,
|
||||||
|
tickets: tickets.map(t => {
|
||||||
|
const redeemed = t.usages.reduce((s, u) => s + (u.quantityRedeemed || 1), 0);
|
||||||
|
return {
|
||||||
|
id: t.id,
|
||||||
|
qrCode: t.qrCode,
|
||||||
|
holder: t.attendee?.name || t.user?.name || '',
|
||||||
|
bookedBy: t.attendee ? t.user?.name || '' : '',
|
||||||
|
option: t.registrationOption.eventOption.name,
|
||||||
|
variant: t.registrationOption.variant?.name || null,
|
||||||
|
quantity: t.quantity || 1,
|
||||||
|
remaining: Math.max(0, (t.quantity || 1) - redeemed),
|
||||||
|
consentStatus: consent.get(t.id) || 'not_required',
|
||||||
|
};
|
||||||
|
}),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Records queued offline scans. Each scan: { clientScanId, qrCode, qty, scannedAt }.
|
||||||
|
* @returns {Promise<{ accepted, duplicates, conflicts, report }>}
|
||||||
|
*/
|
||||||
|
async function syncScans(lock, scans) {
|
||||||
|
const results = { accepted: 0, duplicates: 0, conflicts: [] };
|
||||||
|
const optionIds = lock.section ? new Set(lock.section.allowedOptions.map(o => o.eventOptionId)) : null;
|
||||||
|
const { consentStatusForTickets } = require('./consent');
|
||||||
|
const checkIns = [];
|
||||||
|
|
||||||
|
for (const scan of (scans || []).slice(0, 2000)) {
|
||||||
|
const clientScanId = String(scan?.clientScanId || '').slice(0, 100);
|
||||||
|
if (!clientScanId) continue;
|
||||||
|
if (await prisma.ticketUsage.findUnique({ where: { clientScanId } })) { results.duplicates += 1; continue; }
|
||||||
|
|
||||||
|
const qty = Math.max(1, parseInt(scan.qty, 10) || 1);
|
||||||
|
const scannedAt = scan.scannedAt && !isNaN(new Date(scan.scannedAt)) ? new Date(scan.scannedAt) : new Date();
|
||||||
|
const ticket = await prisma.ticket.findUnique({
|
||||||
|
where: { qrCode: String(scan.qrCode || '') },
|
||||||
|
include: { usages: true, registrationOption: { include: { registration: { select: { status: true } }, eventOption: { select: { isMainTicket: true } } } } },
|
||||||
|
});
|
||||||
|
let state = null;
|
||||||
|
if (!ticket) {
|
||||||
|
const { findTransferByOldCode } = require('./ticketTransfer');
|
||||||
|
if (await findTransferByOldCode(scan.qrCode)) state = { transferred: true };
|
||||||
|
} else if (ticket.eventId === lock.eventId) {
|
||||||
|
const redeemed = ticket.usages.reduce((s, u) => s + (u.quantityRedeemed || 1), 0);
|
||||||
|
const consent = (await consentStatusForTickets([ticket.id])).get(ticket.id);
|
||||||
|
state = {
|
||||||
|
remaining: (ticket.quantity || 1) - redeemed,
|
||||||
|
cancelled: ticket.registrationOption.registration.status === 'cancelled',
|
||||||
|
inScope: !optionIds || optionIds.has(ticket.registrationOption.eventOptionId),
|
||||||
|
consentOk: ['not_required', 'given'].includes(consent),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
const verdict = judgeSyncedScan(state, qty);
|
||||||
|
if (verdict.redeem > 0) {
|
||||||
|
await prisma.ticketUsage.create({
|
||||||
|
data: { ticketId: ticket.id, scannedById: lock.userId, scannedAt, quantityRedeemed: verdict.redeem, clientScanId, offline: true, scanLockId: lock.id, syncedAt: new Date() },
|
||||||
|
});
|
||||||
|
await prisma.ticket.update({ where: { id: ticket.id }, data: { isUsed: state.remaining - verdict.redeem <= 0, updatedAt: new Date() } });
|
||||||
|
results.accepted += 1;
|
||||||
|
if (ticket.registrationOption.eventOption.isMainTicket) {
|
||||||
|
checkIns.push({ ticketId: ticket.id, qty: verdict.redeem, total: (ticket.quantity || 1) - state.remaining + verdict.redeem, left: state.remaining - verdict.redeem });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (verdict.conflict) {
|
||||||
|
results.conflicts.push({ clientScanId, qrCode: scan.qrCode, ticketId: ticket?.id || null, qty, redeemed: verdict.redeem, scannedAt, reason: verdict.conflict, message: CONFLICT_TEXT[verdict.conflict] });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
await prisma.scanLock.update({ where: { id: lock.id }, data: { lastSyncAt: new Date() } });
|
||||||
|
const report = await prisma.offlineSyncReport.create({
|
||||||
|
data: { scanLockId: lock.id, accepted: results.accepted, duplicates: results.duplicates, conflicts: results.conflicts, afterForceRelease: !!lock.forceReleasedById },
|
||||||
|
});
|
||||||
|
|
||||||
|
// Check-in confirmations go out after sync, not at the moment of the offline scan.
|
||||||
|
const { sendCheckInEmails } = require('./notifications');
|
||||||
|
for (const c of checkIns) sendCheckInEmails(c.ticketId, c.qty, c.total, c.left).catch(() => {});
|
||||||
|
|
||||||
|
return { ...results, report };
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = { lockError, locksClash, lockCovers, judgeSyncedScan, CONFLICT_TEXT, LOCK_INCLUDE, activeLocks, acquireLock, blockingLock, snapshotFor, syncScans };
|
||||||
@@ -0,0 +1,72 @@
|
|||||||
|
/**
|
||||||
|
* Sponsor a spot — public donations into an event's bursary pool.
|
||||||
|
*
|
||||||
|
* A sponsorship is an ordinary event donation (isDonation) also flagged isSponsorship,
|
||||||
|
* so supervisors hand it out with the existing assign/unassign-donation flow. These
|
||||||
|
* helpers are pure: what one spot costs, what a sponsor is charged, and the pool totals.
|
||||||
|
*/
|
||||||
|
|
||||||
|
const { computeDonationRemaining } = require('./donationUtils');
|
||||||
|
|
||||||
|
const MIN_AMOUNT = 15; // Yoco's minimum charge, same as other donations
|
||||||
|
const MAX_SPOTS = 100;
|
||||||
|
const MAX_AMOUNT = 100000;
|
||||||
|
|
||||||
|
function sponsorshipError(message, statusCode = 400) {
|
||||||
|
const err = new Error(message);
|
||||||
|
err.statusCode = statusCode;
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The price of one spot: the cheapest paid main ticket (or the event price), or null if free. */
|
||||||
|
function spotPrice(event) {
|
||||||
|
const prices = (event.eventOptions || [])
|
||||||
|
.filter(o => o.isMainTicket && Number(o.price) > 0)
|
||||||
|
.map(o => Number(o.price));
|
||||||
|
if (prices.length) return Math.min(...prices);
|
||||||
|
return Number(event.price) > 0 ? Number(event.price) : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* What the sponsor pays: `spots` whole spots, or a custom `amount`.
|
||||||
|
* @returns {{ amount: number, spots: number|null }}
|
||||||
|
*/
|
||||||
|
function sponsorshipCharge({ spots, amount }, price) {
|
||||||
|
if (spots !== undefined && spots !== null && spots !== '') {
|
||||||
|
const n = Number(spots);
|
||||||
|
if (!Number.isInteger(n) || n < 1 || n > MAX_SPOTS) throw sponsorshipError(`Choose between 1 and ${MAX_SPOTS} spots.`);
|
||||||
|
if (!price) throw sponsorshipError('This event has no ticket price — enter an amount instead.');
|
||||||
|
return { amount: Math.round(n * price * 100) / 100, spots: n };
|
||||||
|
}
|
||||||
|
const a = Math.round(Number(amount) * 100) / 100;
|
||||||
|
if (!Number.isFinite(a) || a <= 0) throw sponsorshipError('Enter an amount, or choose a number of spots.');
|
||||||
|
if (a < MIN_AMOUNT) throw sponsorshipError(`The minimum is R${MIN_AMOUNT}.`);
|
||||||
|
if (a > MAX_AMOUNT) throw sponsorshipError(`For gifts over R${MAX_AMOUNT.toLocaleString('en-ZA')}, please contact us directly.`);
|
||||||
|
return { amount: a, spots: null };
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Pool totals for an event.
|
||||||
|
* @param {Array} sponsorships - sponsorship donation payments [{ id, amount }]
|
||||||
|
* @param {Array} legs - payments with originalPaymentId set (assignments, refunds)
|
||||||
|
* @param {number|null} price - one spot
|
||||||
|
*/
|
||||||
|
function poolSummary(sponsorships, legs, price) {
|
||||||
|
const legsBy = new Map();
|
||||||
|
for (const l of legs || []) legsBy.set(l.originalPaymentId, [...(legsBy.get(l.originalPaymentId) || []), l]);
|
||||||
|
let received = 0, remaining = 0;
|
||||||
|
for (const s of sponsorships || []) {
|
||||||
|
received += Number(s.amount) || 0;
|
||||||
|
remaining += Math.max(0, computeDonationRemaining(s.amount, legsBy.get(s.id) || []));
|
||||||
|
}
|
||||||
|
const round = (n) => Math.round(n * 100) / 100;
|
||||||
|
return {
|
||||||
|
received: round(received),
|
||||||
|
assigned: round(received - remaining),
|
||||||
|
remaining: round(remaining),
|
||||||
|
sponsors: (sponsorships || []).length,
|
||||||
|
spotsFunded: price ? Math.floor((received + 0.001) / price) : null,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = { MIN_AMOUNT, MAX_SPOTS, sponsorshipError, spotPrice, sponsorshipCharge, poolSummary };
|
||||||
@@ -0,0 +1,140 @@
|
|||||||
|
/**
|
||||||
|
* Ticket transfer — handing a ticket to someone else before the event.
|
||||||
|
*
|
||||||
|
* - The new holder becomes the ticket's attendee (name, contact details, account). The
|
||||||
|
* payer stays responsible for the registration; billing doesn't move.
|
||||||
|
* - The QR code is replaced, so screenshots of the old ticket stop working. The old code
|
||||||
|
* is kept on the TicketTransfer so scanners can say "transferred" instead of "not found".
|
||||||
|
* - A shared (unnamed) ticket for several places has one place split off into a new
|
||||||
|
* ticket for the new holder; the rest stay on the shared ticket and its code.
|
||||||
|
* - The previous holder's attendee form answers are removed, and on youth events the new
|
||||||
|
* holder needs their own parental consent.
|
||||||
|
*/
|
||||||
|
|
||||||
|
const { v4: uuidv4 } = require('uuid');
|
||||||
|
const prisma = require('../config/db');
|
||||||
|
const { validateAttendees } = require('./attendees');
|
||||||
|
const { isMinor } = require('./consent');
|
||||||
|
|
||||||
|
const SUPERVISORS = ['admin', 'supervisor'];
|
||||||
|
|
||||||
|
function transferError(message, statusCode = 400) {
|
||||||
|
const err = new Error(message);
|
||||||
|
err.statusCode = statusCode;
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Why this ticket can't be transferred by `actor`, or null when it can. Pure.
|
||||||
|
* @param {object} t - { userId, holderUserId, usages[], event: { startDate, allowTicketTransfer }, registrationStatus }
|
||||||
|
* @param {object} actor - { id, role }
|
||||||
|
*/
|
||||||
|
function transferBlocker(t, actor, now = new Date()) {
|
||||||
|
const supervisor = SUPERVISORS.includes(actor.role);
|
||||||
|
if (!supervisor && t.userId !== actor.id && t.holderUserId !== actor.id) return { status: 403, message: 'Only the person who booked or holds this ticket can transfer it.' };
|
||||||
|
if (t.registrationStatus === 'cancelled') return { status: 400, message: 'This registration was cancelled.' };
|
||||||
|
if (new Date(t.event.startDate) <= now) return { status: 400, message: 'Tickets can only be transferred before the event starts.' };
|
||||||
|
if ((t.usages || []).length > 0) return { status: 400, message: 'This ticket has already been used (or partly used), so it can’t be transferred.' };
|
||||||
|
if (t.event.allowTicketTransfer === false && !supervisor) return { status: 400, message: 'Ticket transfers are turned off for this event.' };
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Transfers a ticket. Returns what the caller needs to notify people afterwards.
|
||||||
|
* @param {object} input - { ticketId, actor, name, email?, phone?, dateOfBirth?, parentName?, parentEmail?, parentPhone? }
|
||||||
|
*/
|
||||||
|
async function transferTicket({ ticketId, actor, ...holder }) {
|
||||||
|
const { findOrCreateAccount } = require('./accountMatch');
|
||||||
|
const ticket = await prisma.ticket.findUnique({
|
||||||
|
where: { id: ticketId },
|
||||||
|
include: {
|
||||||
|
usages: { select: { id: true } },
|
||||||
|
attendee: true,
|
||||||
|
holder: { select: { id: true, name: true } },
|
||||||
|
user: { select: { id: true, name: true } },
|
||||||
|
event: { include: { eventOptions: true } },
|
||||||
|
registrationOption: { include: { registration: { select: { id: true, status: true } } } },
|
||||||
|
},
|
||||||
|
});
|
||||||
|
if (!ticket) throw transferError('Ticket not found', 404);
|
||||||
|
const blocker = transferBlocker({ ...ticket, registrationStatus: ticket.registrationOption.registration.status }, actor);
|
||||||
|
if (blocker) throw transferError(blocker.message, blocker.status);
|
||||||
|
|
||||||
|
const ro = ticket.registrationOption;
|
||||||
|
const event = ticket.event;
|
||||||
|
// Same rules as naming an attendee at registration (incl. date of birth and parent
|
||||||
|
// details on youth events), for exactly one place.
|
||||||
|
const [clean] = validateAttendees({ ...event, allowNamedAttendees: true }, { [`${ro.eventOptionId}::${ro.variantId || ''}`]: 1 }, [{
|
||||||
|
eventOptionId: ro.eventOptionId, variantId: ro.variantId, ...holder,
|
||||||
|
}]);
|
||||||
|
if (!clean.email && !clean.phone) throw transferError('Enter an email address or phone number for the new holder, so we can send them the ticket.');
|
||||||
|
|
||||||
|
const { user: toUser, created } = await findOrCreateAccount({ name: clean.name, email: clean.email, phone: clean.phone });
|
||||||
|
const currentHolderId = ticket.attendee ? ticket.attendee.userId || ticket.holderUserId : ticket.holderUserId || ticket.userId;
|
||||||
|
if (currentHolderId && currentHolderId === toUser.id) throw transferError(`${clean.name} already holds this ticket.`);
|
||||||
|
|
||||||
|
const fromHolderName = ticket.attendee?.name || ticket.holder?.name || ticket.user?.name || '';
|
||||||
|
const attendeeData = {
|
||||||
|
name: clean.name, email: clean.email, phone: clean.phone, userId: toUser.id,
|
||||||
|
dateOfBirth: clean.dateOfBirth, gender: clean.gender, parentName: clean.parentName, parentEmail: clean.parentEmail, parentPhone: clean.parentPhone,
|
||||||
|
};
|
||||||
|
|
||||||
|
const result = await prisma.$transaction(async (tx) => {
|
||||||
|
// Re-check inside the transaction: a scan or another transfer may have just happened.
|
||||||
|
const fresh = await tx.ticket.findUnique({ where: { id: ticket.id }, include: { usages: { select: { id: true } } } });
|
||||||
|
if (!fresh || fresh.qrCode !== ticket.qrCode || fresh.usages.length > 0) throw transferError('This ticket changed while you were transferring it. Please try again.', 409);
|
||||||
|
|
||||||
|
let target, attendee, oldQrCode;
|
||||||
|
if (ticket.attendeeId) {
|
||||||
|
attendee = await tx.attendee.update({ where: { id: ticket.attendeeId }, data: attendeeData });
|
||||||
|
// The previous holder's answers and medical details aren't the new holder's.
|
||||||
|
await tx.formResponse.deleteMany({ where: { attendeeId: attendee.id } });
|
||||||
|
await tx.consentRequest.updateMany({ where: { attendeeId: attendee.id }, data: { medical: null, emergency: null, medicalPurgedAt: new Date() } });
|
||||||
|
target = await tx.ticket.update({ where: { id: ticket.id }, data: { qrCode: uuidv4(), holderUserId: toUser.id, emailSent: false } });
|
||||||
|
oldQrCode = ticket.qrCode;
|
||||||
|
} else {
|
||||||
|
const order = await tx.attendee.count({ where: { registrationId: ro.registration.id } });
|
||||||
|
attendee = await tx.attendee.create({
|
||||||
|
data: { registrationId: ro.registration.id, registrationOptionId: ro.id, eventOptionId: ro.eventOptionId, variantId: ro.variantId, order, ...attendeeData },
|
||||||
|
});
|
||||||
|
if ((ticket.quantity || 1) > 1) {
|
||||||
|
// Split one place off the shared ticket; its code stays valid for the rest.
|
||||||
|
await tx.ticket.update({ where: { id: ticket.id }, data: { quantity: ticket.quantity - 1 } });
|
||||||
|
target = await tx.ticket.create({
|
||||||
|
data: { qrCode: uuidv4(), registrationOptionId: ro.id, userId: ticket.userId, eventId: ticket.eventId, quantity: 1, attendeeId: attendee.id, holderUserId: toUser.id },
|
||||||
|
});
|
||||||
|
oldQrCode = null;
|
||||||
|
} else {
|
||||||
|
target = await tx.ticket.update({ where: { id: ticket.id }, data: { qrCode: uuidv4(), attendeeId: attendee.id, holderUserId: toUser.id, emailSent: false } });
|
||||||
|
oldQrCode = ticket.qrCode;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const transfer = await tx.ticketTransfer.create({
|
||||||
|
data: { ticketId: target.id, fromHolderName, fromUserId: currentHolderId || null, toName: clean.name, toUserId: toUser.id, byUserId: actor.id, oldQrCode },
|
||||||
|
});
|
||||||
|
return { target, attendee, transfer };
|
||||||
|
});
|
||||||
|
|
||||||
|
return {
|
||||||
|
...result,
|
||||||
|
toUser,
|
||||||
|
accountCreated: created,
|
||||||
|
fromHolderName,
|
||||||
|
event,
|
||||||
|
registrationId: ro.registration.id,
|
||||||
|
needsConsent: !!event.requiresParentalConsent && isMinor(clean.dateOfBirth, event.startDate),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The transfer that retired this QR code, if any. */
|
||||||
|
async function findTransferByOldCode(qrCode) {
|
||||||
|
if (!qrCode) return null;
|
||||||
|
return prisma.ticketTransfer.findFirst({ where: { oldQrCode: String(qrCode) }, orderBy: { createdAt: 'desc' } });
|
||||||
|
}
|
||||||
|
|
||||||
|
function transferredMessage(transfer) {
|
||||||
|
const when = new Date(transfer.createdAt).toLocaleDateString('en-ZA', { day: 'numeric', month: 'short' });
|
||||||
|
return `This ticket was transferred to ${transfer.toName} on ${when}. The old QR code no longer works — ask for the new ticket.`;
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = { transferError, transferBlocker, transferTicket, findTransferByOldCode, transferredMessage };
|
||||||
@@ -0,0 +1,84 @@
|
|||||||
|
const { joinBlocker, autoAllocate, cleanGender } = require('../src/utils/allocation');
|
||||||
|
|
||||||
|
const person = (id, registrationId, gender = null) => ({ id, name: id, registrationId, gender });
|
||||||
|
const groupsOf = (result) => {
|
||||||
|
const out = {};
|
||||||
|
for (const p of result.placements) (out[p.groupId] = out[p.groupId] || []).push(p.attendeeId);
|
||||||
|
return out;
|
||||||
|
};
|
||||||
|
|
||||||
|
describe('cleanGender', () => {
|
||||||
|
test('accepts male/female in any case, blank as null', () => {
|
||||||
|
expect(cleanGender('Male')).toBe('male');
|
||||||
|
expect(cleanGender('')).toBeNull();
|
||||||
|
expect(() => cleanGender('other')).toThrow();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('joinBlocker', () => {
|
||||||
|
test('capacity', () => {
|
||||||
|
expect(joinBlocker({ name: 'Cabin 1', capacity: 2 }, 1, [person('a', 'r')])).toBeNull();
|
||||||
|
expect(joinBlocker({ name: 'Cabin 1', capacity: 2 }, 2, [person('a', 'r')])).toMatch(/full/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('gender', () => {
|
||||||
|
expect(joinBlocker({ name: 'Boys', gender: 'male' }, 0, [person('a', 'r', 'male')])).toBeNull();
|
||||||
|
expect(joinBlocker({ name: 'Boys', gender: 'male' }, 0, [person('a', 'r', 'female')])).toMatch(/males only/);
|
||||||
|
expect(joinBlocker({ name: 'Boys', gender: 'male' }, 0, [person('a', 'r')])).toMatch(/no gender recorded/);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('autoAllocate', () => {
|
||||||
|
test('fills groups evenly', () => {
|
||||||
|
const groups = [{ id: 'g1', name: 'A' }, { id: 'g2', name: 'B' }];
|
||||||
|
const attendees = ['a', 'b', 'c', 'd'].map(id => person(id, id));
|
||||||
|
const r = autoAllocate({ groups, attendees });
|
||||||
|
const g = groupsOf(r);
|
||||||
|
expect(g.g1.length).toBe(2);
|
||||||
|
expect(g.g2.length).toBe(2);
|
||||||
|
expect(r.unplaced).toEqual([]);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('respects capacity and reports who could not be placed', () => {
|
||||||
|
const groups = [{ id: 'g1', name: 'A', capacity: 1 }];
|
||||||
|
const r = autoAllocate({ groups, attendees: [person('a', 'r1'), person('b', 'r2')] });
|
||||||
|
expect(r.placements.length).toBe(1);
|
||||||
|
expect(r.unplaced.length).toBe(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('respects gender', () => {
|
||||||
|
const groups = [{ id: 'boys', name: 'Boys', gender: 'male' }, { id: 'girls', name: 'Girls', gender: 'female' }];
|
||||||
|
const r = autoAllocate({ groups, attendees: [person('a', 'r1', 'male'), person('b', 'r2', 'female'), person('c', 'r3')] });
|
||||||
|
expect(groupsOf(r)).toEqual({ boys: ['a'], girls: ['b'] });
|
||||||
|
expect(r.unplaced).toEqual(['c']);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('keeps a registration together when a group can take them all', () => {
|
||||||
|
const groups = [{ id: 'g1', name: 'A', capacity: 3 }, { id: 'g2', name: 'B', capacity: 3 }];
|
||||||
|
const attendees = [person('s1', 'fam'), person('s2', 'fam'), person('x', 'solo')];
|
||||||
|
const g = groupsOf(autoAllocate({ groups, attendees, mode: 'together' }));
|
||||||
|
const famGroup = Object.keys(g).find(k => g[k].includes('s1'));
|
||||||
|
expect(g[famGroup]).toContain('s2');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('places siblings one by one when no group fits them all', () => {
|
||||||
|
const groups = [{ id: 'boys', name: 'Boys', gender: 'male' }, { id: 'girls', name: 'Girls', gender: 'female' }];
|
||||||
|
const r = autoAllocate({ groups, attendees: [person('bro', 'fam', 'male'), person('sis', 'fam', 'female')], mode: 'together' });
|
||||||
|
expect(groupsOf(r)).toEqual({ boys: ['bro'], girls: ['sis'] });
|
||||||
|
});
|
||||||
|
|
||||||
|
test('split mode spreads a registration across groups', () => {
|
||||||
|
const groups = [{ id: 'g1', name: 'A' }, { id: 'g2', name: 'B' }];
|
||||||
|
const attendees = [person('f1', 'friends'), person('f2', 'friends')];
|
||||||
|
const g = groupsOf(autoAllocate({ groups, attendees, mode: 'split' }));
|
||||||
|
expect(g.g1.length).toBe(1);
|
||||||
|
expect(g.g2.length).toBe(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('counts people already placed and leaves them where they are', () => {
|
||||||
|
const groups = [{ id: 'g1', name: 'A', capacity: 2 }, { id: 'g2', name: 'B', capacity: 2 }];
|
||||||
|
const attendees = [person('a', 'r1'), person('b', 'r2'), person('c', 'r3')];
|
||||||
|
const r = autoAllocate({ groups, attendees, assigned: new Map([['a', 'g1'], ['b', 'g1']]) });
|
||||||
|
expect(r.placements).toEqual([{ attendeeId: 'c', groupId: 'g2' }]);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,68 @@
|
|||||||
|
const { cleanFields, cleanAnswer, summarise } = require('../src/utils/feedback');
|
||||||
|
|
||||||
|
describe('cleanFields', () => {
|
||||||
|
test('keeps labelled questions in order, tidying choices', () => {
|
||||||
|
const out = cleanFields([
|
||||||
|
{ type: 'rating', label: ' Overall ', isRequired: true },
|
||||||
|
{ type: 'text', label: '' },
|
||||||
|
{ type: 'multiple_choice', label: 'Best part', options: ['Worship', ' Talks ', 'Worship', ''] },
|
||||||
|
{ type: 'statement', label: 'Thanks!', isRequired: true },
|
||||||
|
]);
|
||||||
|
expect(out.map(f => [f.type, f.label, f.order])).toEqual([['rating', 'Overall', 0], ['multiple_choice', 'Best part', 1], ['statement', 'Thanks!', 2]]);
|
||||||
|
expect(out[1].options).toEqual(['Worship', 'Talks']);
|
||||||
|
expect(out[2].isRequired).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('rejects bad forms', () => {
|
||||||
|
expect(() => cleanFields([{ type: 'stars', label: 'X' }])).toThrow(/unknown type/);
|
||||||
|
expect(() => cleanFields([{ type: 'multiple_choice', label: 'X', options: ['only one'] }])).toThrow(/two choices/);
|
||||||
|
expect(() => cleanFields([{ type: 'statement', label: 'Hello' }])).toThrow(/at least one question/);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('cleanAnswer', () => {
|
||||||
|
test('ratings are whole stars from 1 to 5', () => {
|
||||||
|
expect(cleanAnswer({ type: 'rating', label: 'R' }, '4')).toBe('4');
|
||||||
|
expect(() => cleanAnswer({ type: 'rating', label: 'R' }, '6')).toThrow();
|
||||||
|
expect(() => cleanAnswer({ type: 'rating', label: 'R' }, '3.5')).toThrow();
|
||||||
|
});
|
||||||
|
|
||||||
|
test('multiple choice must be one of the options', () => {
|
||||||
|
const f = { type: 'multiple_choice', label: 'M', options: ['A', 'B'] };
|
||||||
|
expect(cleanAnswer(f, 'B')).toBe('B');
|
||||||
|
expect(() => cleanAnswer(f, 'C')).toThrow();
|
||||||
|
});
|
||||||
|
|
||||||
|
test('required questions need an answer; optional ones may be blank', () => {
|
||||||
|
expect(() => cleanAnswer({ type: 'text', label: 'Why?', isRequired: true }, ' ')).toThrow(/Please answer/);
|
||||||
|
expect(cleanAnswer({ type: 'text', label: 'Why?' }, '')).toBeNull();
|
||||||
|
expect(cleanAnswer({ type: 'yes_no', label: 'Again?' }, 'YES')).toBe('yes');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('summarise', () => {
|
||||||
|
const fields = [
|
||||||
|
{ id: 'r', type: 'rating', label: 'Overall' },
|
||||||
|
{ id: 'm', type: 'multiple_choice', label: 'Best part', options: ['Worship', 'Talks'] },
|
||||||
|
{ id: 't', type: 'text', label: 'Comments' },
|
||||||
|
{ id: 's', type: 'statement', label: 'Thanks' },
|
||||||
|
];
|
||||||
|
const answers = [
|
||||||
|
{ fieldId: 'r', value: '5' }, { fieldId: 'r', value: '4' }, { fieldId: 'r', value: '4' },
|
||||||
|
{ fieldId: 'm', value: 'Talks' }, { fieldId: 'm', value: 'Talks' }, { fieldId: 'm', value: 'Worship' },
|
||||||
|
{ fieldId: 't', value: 'Loved it', name: 'Ann' },
|
||||||
|
];
|
||||||
|
|
||||||
|
test('averages ratings with a star distribution', () => {
|
||||||
|
const [r] = summarise(fields, answers);
|
||||||
|
expect(r.average).toBe(4.3);
|
||||||
|
expect(r.distribution.map(d => d.value)).toEqual([0, 0, 0, 2, 1]);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('counts choices and lists text answers; skips statements', () => {
|
||||||
|
const out = summarise(fields, answers);
|
||||||
|
expect(out.length).toBe(3);
|
||||||
|
expect(out[1].counts).toEqual([{ label: 'Worship', value: 1 }, { label: 'Talks', value: 2 }]);
|
||||||
|
expect(out[2].texts).toEqual([{ value: 'Loved it', name: 'Ann' }]);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,54 @@
|
|||||||
|
const { locksClash, lockCovers, judgeSyncedScan } = require('../src/utils/scanLocks');
|
||||||
|
|
||||||
|
describe('locksClash', () => {
|
||||||
|
test('a whole-event lock clashes with everything', () => {
|
||||||
|
expect(locksClash({ sectionId: null }, 'hall')).toBe(true);
|
||||||
|
expect(locksClash({ sectionId: 'hall' }, null)).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('section locks only clash with the same section', () => {
|
||||||
|
expect(locksClash({ sectionId: 'hall' }, 'hall')).toBe(true);
|
||||||
|
expect(locksClash({ sectionId: 'hall' }, 'dinner')).toBe(false);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('lockCovers', () => {
|
||||||
|
const dinnerLock = { sectionId: 'dinner', section: { allowedOptions: [{ eventOptionId: 'meal' }] } };
|
||||||
|
|
||||||
|
test('a whole-event lock covers every scan', () => {
|
||||||
|
expect(lockCovers({ sectionId: null }, { sectionId: 'x', optionId: 'y' })).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('with a section picked, only that section is covered', () => {
|
||||||
|
expect(lockCovers(dinnerLock, { sectionId: 'dinner', optionId: 'meal' })).toBe(true);
|
||||||
|
expect(lockCovers(dinnerLock, { sectionId: 'hall', optionId: 'meal' })).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('with no section picked, tickets the locked section admits are covered', () => {
|
||||||
|
expect(lockCovers(dinnerLock, { optionId: 'meal' })).toBe(true);
|
||||||
|
expect(lockCovers(dinnerLock, { optionId: 'entry' })).toBe(false);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('judgeSyncedScan', () => {
|
||||||
|
const ok = { remaining: 2, cancelled: false, inScope: true, consentOk: true };
|
||||||
|
|
||||||
|
test('records a normal scan', () => {
|
||||||
|
expect(judgeSyncedScan(ok, 1)).toEqual({ redeem: 1, conflict: null });
|
||||||
|
});
|
||||||
|
|
||||||
|
test('never redeems more than is left', () => {
|
||||||
|
expect(judgeSyncedScan(ok, 3)).toEqual({ redeem: 2, conflict: 'partly_used' });
|
||||||
|
expect(judgeSyncedScan({ ...ok, remaining: 0 }, 1)).toEqual({ redeem: 0, conflict: 'already_used' });
|
||||||
|
});
|
||||||
|
|
||||||
|
test('flags unknown, cancelled and out-of-scope tickets without recording them', () => {
|
||||||
|
expect(judgeSyncedScan(null, 1)).toEqual({ redeem: 0, conflict: 'not_found' });
|
||||||
|
expect(judgeSyncedScan({ ...ok, cancelled: true }, 1)).toEqual({ redeem: 0, conflict: 'cancelled' });
|
||||||
|
expect(judgeSyncedScan({ ...ok, inScope: false }, 1)).toEqual({ redeem: 0, conflict: 'wrong_scope' });
|
||||||
|
});
|
||||||
|
|
||||||
|
test('records but flags a check-in without consent', () => {
|
||||||
|
expect(judgeSyncedScan({ ...ok, consentOk: false }, 1)).toEqual({ redeem: 1, conflict: 'consent' });
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
const { spotPrice, sponsorshipCharge, poolSummary } = require('../src/utils/sponsorship');
|
||||||
|
|
||||||
|
describe('spotPrice', () => {
|
||||||
|
test('is the cheapest paid main ticket', () => {
|
||||||
|
expect(spotPrice({ price: 0, eventOptions: [
|
||||||
|
{ isMainTicket: true, price: 450 }, { isMainTicket: true, price: 300 }, { isMainTicket: false, price: 50 }, { isMainTicket: true, price: 0 },
|
||||||
|
] })).toBe(300);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('falls back to the event price, or null for free events', () => {
|
||||||
|
expect(spotPrice({ price: 200, eventOptions: [] })).toBe(200);
|
||||||
|
expect(spotPrice({ price: 0, eventOptions: [{ isMainTicket: true, price: 0 }] })).toBeNull();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('sponsorshipCharge', () => {
|
||||||
|
test('whole spots cost the spot price each', () => {
|
||||||
|
expect(sponsorshipCharge({ spots: 3 }, 450)).toEqual({ amount: 1350, spots: 3 });
|
||||||
|
});
|
||||||
|
|
||||||
|
test('a custom amount is taken as given (2 decimals)', () => {
|
||||||
|
expect(sponsorshipCharge({ amount: '120.555' }, 450)).toEqual({ amount: 120.56, spots: null });
|
||||||
|
});
|
||||||
|
|
||||||
|
test('rejects bad input', () => {
|
||||||
|
expect(() => sponsorshipCharge({ spots: 0 }, 450)).toThrow(/between 1/);
|
||||||
|
expect(() => sponsorshipCharge({ spots: 1.5 }, 450)).toThrow();
|
||||||
|
expect(() => sponsorshipCharge({ spots: 1 }, null)).toThrow(/no ticket price/);
|
||||||
|
expect(() => sponsorshipCharge({ amount: 10 }, 450)).toThrow(/minimum/);
|
||||||
|
expect(() => sponsorshipCharge({}, 450)).toThrow();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('poolSummary', () => {
|
||||||
|
test('received, assigned and remaining, with spots funded', () => {
|
||||||
|
const sponsorships = [{ id: 'a', amount: 900 }, { id: 'b', amount: 300 }];
|
||||||
|
const legs = [{ originalPaymentId: 'a', amount: 450 }, { originalPaymentId: 'b', amount: -100 }];
|
||||||
|
expect(poolSummary(sponsorships, legs, 450)).toEqual({ received: 1200, assigned: 550, remaining: 650, sponsors: 2, spotsFunded: 2 });
|
||||||
|
});
|
||||||
|
|
||||||
|
test('no spot count for free events', () => {
|
||||||
|
expect(poolSummary([{ id: 'a', amount: 50 }], [], null).spotsFunded).toBeNull();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,46 @@
|
|||||||
|
const { transferBlocker } = require('../src/utils/ticketTransfer');
|
||||||
|
const { judgeSyncedScan } = require('../src/utils/scanLocks');
|
||||||
|
|
||||||
|
describe('transferBlocker', () => {
|
||||||
|
const now = new Date('2026-10-01T10:00:00Z');
|
||||||
|
const ticket = {
|
||||||
|
userId: 'payer', holderUserId: 'holder', usages: [], registrationStatus: 'paid',
|
||||||
|
event: { startDate: '2026-10-05T08:00:00Z', allowTicketTransfer: true },
|
||||||
|
};
|
||||||
|
const user = (id, role = 'user') => ({ id, role });
|
||||||
|
|
||||||
|
test('the payer and the holder can transfer', () => {
|
||||||
|
expect(transferBlocker(ticket, user('payer'), now)).toBeNull();
|
||||||
|
expect(transferBlocker(ticket, user('holder'), now)).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
test('anyone else needs to be a supervisor', () => {
|
||||||
|
expect(transferBlocker(ticket, user('someone'), now).status).toBe(403);
|
||||||
|
expect(transferBlocker(ticket, user('staffer', 'staff'), now).status).toBe(403);
|
||||||
|
expect(transferBlocker(ticket, user('sup', 'supervisor'), now)).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
test('not once the event has started', () => {
|
||||||
|
expect(transferBlocker({ ...ticket, event: { ...ticket.event, startDate: '2026-10-01T09:00:00Z' } }, user('sup', 'supervisor'), now).message).toMatch(/before the event starts/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('not once any of it has been scanned', () => {
|
||||||
|
expect(transferBlocker({ ...ticket, usages: [{ id: 'u1' }] }, user('payer'), now).message).toMatch(/already been used/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('not for a cancelled registration', () => {
|
||||||
|
expect(transferBlocker({ ...ticket, registrationStatus: 'cancelled' }, user('payer'), now)).not.toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
test('turned off per event, except for supervisors', () => {
|
||||||
|
const off = { ...ticket, event: { ...ticket.event, allowTicketTransfer: false } };
|
||||||
|
expect(transferBlocker(off, user('payer'), now).message).toMatch(/turned off/);
|
||||||
|
expect(transferBlocker(off, user('admin', 'admin'), now)).toBeNull();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('offline sync of a transferred code', () => {
|
||||||
|
test('is flagged and not recorded', () => {
|
||||||
|
expect(judgeSyncedScan({ transferred: true }, 1)).toEqual({ redeem: 0, conflict: 'transferred' });
|
||||||
|
});
|
||||||
|
});
|
||||||
Generated
+49
-62
@@ -1,13 +1,14 @@
|
|||||||
{
|
{
|
||||||
"name": "hope-events-frontend",
|
"name": "hope-events-frontend",
|
||||||
"version": "1.16.0",
|
"version": "1.21.0",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "hope-events-frontend",
|
"name": "hope-events-frontend",
|
||||||
"version": "1.16.0",
|
"version": "1.21.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"@dnd-kit/core": "^6.3.1",
|
||||||
"@hookform/resolvers": "^5.2.1",
|
"@hookform/resolvers": "^5.2.1",
|
||||||
"@radix-ui/react-accordion": "^1.2.11",
|
"@radix-ui/react-accordion": "^1.2.11",
|
||||||
"@radix-ui/react-alert-dialog": "^1.1.14",
|
"@radix-ui/react-alert-dialog": "^1.1.14",
|
||||||
@@ -31,6 +32,7 @@
|
|||||||
"class-variance-authority": "^0.7.1",
|
"class-variance-authority": "^0.7.1",
|
||||||
"clsx": "^2.1.1",
|
"clsx": "^2.1.1",
|
||||||
"date-fns": "^4.1.0",
|
"date-fns": "^4.1.0",
|
||||||
|
"idb": "^8.0.4",
|
||||||
"lucide-react": "^0.536.0",
|
"lucide-react": "^0.536.0",
|
||||||
"next": "^15.5.24",
|
"next": "^15.5.24",
|
||||||
"qrcode": "^1.5.4",
|
"qrcode": "^1.5.4",
|
||||||
@@ -342,6 +344,45 @@
|
|||||||
"integrity": "sha512-lwYN/vDPeNRULcepoE/LO2Pgx+7/RV+S9ARfbc9lr2DtGkOD7pAiruHvbR1RX3Qyf6ja47EWJDMsNK5vK08DJg==",
|
"integrity": "sha512-lwYN/vDPeNRULcepoE/LO2Pgx+7/RV+S9ARfbc9lr2DtGkOD7pAiruHvbR1RX3Qyf6ja47EWJDMsNK5vK08DJg==",
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
|
"node_modules/@dnd-kit/accessibility": {
|
||||||
|
"version": "3.1.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@dnd-kit/accessibility/-/accessibility-3.1.1.tgz",
|
||||||
|
"integrity": "sha512-2P+YgaXF+gRsIihwwY1gCsQSYnu9Zyj2py8kY5fFvUM1qm2WA2u639R6YNVfU4GWr+ZM5mqEsfHZZLoRONbemw==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"tslib": "^2.0.0"
|
||||||
|
},
|
||||||
|
"peerDependencies": {
|
||||||
|
"react": ">=16.8.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@dnd-kit/core": {
|
||||||
|
"version": "6.3.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@dnd-kit/core/-/core-6.3.1.tgz",
|
||||||
|
"integrity": "sha512-xkGBRQQab4RLwgXxoqETICr6S5JlogafbhNsidmrkVv2YRs5MLwpjoF2qpiGjQt8S9AoxtIV603s0GIUpY5eYQ==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@dnd-kit/accessibility": "^3.1.1",
|
||||||
|
"@dnd-kit/utilities": "^3.2.2",
|
||||||
|
"tslib": "^2.0.0"
|
||||||
|
},
|
||||||
|
"peerDependencies": {
|
||||||
|
"react": ">=16.8.0",
|
||||||
|
"react-dom": ">=16.8.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@dnd-kit/utilities": {
|
||||||
|
"version": "3.2.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/@dnd-kit/utilities/-/utilities-3.2.2.tgz",
|
||||||
|
"integrity": "sha512-+MKAJEOfaBe5SmV6t34p80MMKhjvUz0vRrvVJbPT0WElzaOJ/1xs+D+KDv+tD/NE5ujfrChEcshd4fLn0wpiqg==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"tslib": "^2.0.0"
|
||||||
|
},
|
||||||
|
"peerDependencies": {
|
||||||
|
"react": ">=16.8.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/@emnapi/core": {
|
"node_modules/@emnapi/core": {
|
||||||
"version": "1.10.0",
|
"version": "1.10.0",
|
||||||
"resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.10.0.tgz",
|
"resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.10.0.tgz",
|
||||||
@@ -869,9 +910,6 @@
|
|||||||
"cpu": [
|
"cpu": [
|
||||||
"arm"
|
"arm"
|
||||||
],
|
],
|
||||||
"libc": [
|
|
||||||
"glibc"
|
|
||||||
],
|
|
||||||
"license": "LGPL-3.0-or-later",
|
"license": "LGPL-3.0-or-later",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
@@ -888,9 +926,6 @@
|
|||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
"libc": [
|
|
||||||
"glibc"
|
|
||||||
],
|
|
||||||
"license": "LGPL-3.0-or-later",
|
"license": "LGPL-3.0-or-later",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
@@ -907,9 +942,6 @@
|
|||||||
"cpu": [
|
"cpu": [
|
||||||
"ppc64"
|
"ppc64"
|
||||||
],
|
],
|
||||||
"libc": [
|
|
||||||
"glibc"
|
|
||||||
],
|
|
||||||
"license": "LGPL-3.0-or-later",
|
"license": "LGPL-3.0-or-later",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
@@ -926,9 +958,6 @@
|
|||||||
"cpu": [
|
"cpu": [
|
||||||
"riscv64"
|
"riscv64"
|
||||||
],
|
],
|
||||||
"libc": [
|
|
||||||
"glibc"
|
|
||||||
],
|
|
||||||
"license": "LGPL-3.0-or-later",
|
"license": "LGPL-3.0-or-later",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
@@ -945,9 +974,6 @@
|
|||||||
"cpu": [
|
"cpu": [
|
||||||
"s390x"
|
"s390x"
|
||||||
],
|
],
|
||||||
"libc": [
|
|
||||||
"glibc"
|
|
||||||
],
|
|
||||||
"license": "LGPL-3.0-or-later",
|
"license": "LGPL-3.0-or-later",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
@@ -964,9 +990,6 @@
|
|||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
"libc": [
|
|
||||||
"glibc"
|
|
||||||
],
|
|
||||||
"license": "LGPL-3.0-or-later",
|
"license": "LGPL-3.0-or-later",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
@@ -983,9 +1006,6 @@
|
|||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
"libc": [
|
|
||||||
"musl"
|
|
||||||
],
|
|
||||||
"license": "LGPL-3.0-or-later",
|
"license": "LGPL-3.0-or-later",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
@@ -1002,9 +1022,6 @@
|
|||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
"libc": [
|
|
||||||
"musl"
|
|
||||||
],
|
|
||||||
"license": "LGPL-3.0-or-later",
|
"license": "LGPL-3.0-or-later",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
@@ -1021,9 +1038,6 @@
|
|||||||
"cpu": [
|
"cpu": [
|
||||||
"arm"
|
"arm"
|
||||||
],
|
],
|
||||||
"libc": [
|
|
||||||
"glibc"
|
|
||||||
],
|
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
@@ -1046,9 +1060,6 @@
|
|||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
"libc": [
|
|
||||||
"glibc"
|
|
||||||
],
|
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
@@ -1071,9 +1082,6 @@
|
|||||||
"cpu": [
|
"cpu": [
|
||||||
"ppc64"
|
"ppc64"
|
||||||
],
|
],
|
||||||
"libc": [
|
|
||||||
"glibc"
|
|
||||||
],
|
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
@@ -1096,9 +1104,6 @@
|
|||||||
"cpu": [
|
"cpu": [
|
||||||
"riscv64"
|
"riscv64"
|
||||||
],
|
],
|
||||||
"libc": [
|
|
||||||
"glibc"
|
|
||||||
],
|
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
@@ -1121,9 +1126,6 @@
|
|||||||
"cpu": [
|
"cpu": [
|
||||||
"s390x"
|
"s390x"
|
||||||
],
|
],
|
||||||
"libc": [
|
|
||||||
"glibc"
|
|
||||||
],
|
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
@@ -1146,9 +1148,6 @@
|
|||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
"libc": [
|
|
||||||
"glibc"
|
|
||||||
],
|
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
@@ -1171,9 +1170,6 @@
|
|||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
"libc": [
|
|
||||||
"musl"
|
|
||||||
],
|
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
@@ -1196,9 +1192,6 @@
|
|||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
"libc": [
|
|
||||||
"musl"
|
|
||||||
],
|
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
@@ -1455,9 +1448,6 @@
|
|||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
"libc": [
|
|
||||||
"glibc"
|
|
||||||
],
|
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
@@ -1474,9 +1464,6 @@
|
|||||||
"cpu": [
|
"cpu": [
|
||||||
"arm64"
|
"arm64"
|
||||||
],
|
],
|
||||||
"libc": [
|
|
||||||
"musl"
|
|
||||||
],
|
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
@@ -1493,9 +1480,6 @@
|
|||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
"libc": [
|
|
||||||
"glibc"
|
|
||||||
],
|
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
@@ -1512,9 +1496,6 @@
|
|||||||
"cpu": [
|
"cpu": [
|
||||||
"x64"
|
"x64"
|
||||||
],
|
],
|
||||||
"libc": [
|
|
||||||
"musl"
|
|
||||||
],
|
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"os": [
|
"os": [
|
||||||
@@ -6865,6 +6846,12 @@
|
|||||||
"node": ">= 6"
|
"node": ">= 6"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/idb": {
|
||||||
|
"version": "8.0.4",
|
||||||
|
"resolved": "https://registry.npmjs.org/idb/-/idb-8.0.4.tgz",
|
||||||
|
"integrity": "sha512-jd0ITCrN+Zah4J7R/Z2jnR3W7A4BXDAjmo62MwWuSjxCiueUAf7X5rbodEdidWzeknwXHmLpdZkoiiCppNi30Q==",
|
||||||
|
"license": "ISC"
|
||||||
|
},
|
||||||
"node_modules/ignore": {
|
"node_modules/ignore": {
|
||||||
"version": "5.3.2",
|
"version": "5.3.2",
|
||||||
"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
|
"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "hope-events-frontend",
|
"name": "hope-events-frontend",
|
||||||
"version": "1.16.0",
|
"version": "1.21.0",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "next dev --turbopack",
|
"dev": "next dev --turbopack",
|
||||||
@@ -9,6 +9,7 @@
|
|||||||
"lint": "next lint"
|
"lint": "next lint"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"@dnd-kit/core": "^6.3.1",
|
||||||
"@hookform/resolvers": "^5.2.1",
|
"@hookform/resolvers": "^5.2.1",
|
||||||
"@radix-ui/react-accordion": "^1.2.11",
|
"@radix-ui/react-accordion": "^1.2.11",
|
||||||
"@radix-ui/react-alert-dialog": "^1.1.14",
|
"@radix-ui/react-alert-dialog": "^1.1.14",
|
||||||
@@ -32,6 +33,7 @@
|
|||||||
"class-variance-authority": "^0.7.1",
|
"class-variance-authority": "^0.7.1",
|
||||||
"clsx": "^2.1.1",
|
"clsx": "^2.1.1",
|
||||||
"date-fns": "^4.1.0",
|
"date-fns": "^4.1.0",
|
||||||
|
"idb": "^8.0.4",
|
||||||
"lucide-react": "^0.536.0",
|
"lucide-react": "^0.536.0",
|
||||||
"next": "^15.5.24",
|
"next": "^15.5.24",
|
||||||
"qrcode": "^1.5.4",
|
"qrcode": "^1.5.4",
|
||||||
|
|||||||
@@ -0,0 +1,67 @@
|
|||||||
|
/*
|
||||||
|
* Service worker for offline ticket scanning.
|
||||||
|
*
|
||||||
|
* Only the scanner page and the static files it needs are cached:
|
||||||
|
* - /_next/static/* (hashed, never change): cache-first.
|
||||||
|
* - The scanner page itself: network-first, falling back to the cached copy offline.
|
||||||
|
* - The page can ask (postMessage { type: 'cache-urls', urls }) for the files it has
|
||||||
|
* loaded to be cached up front, so it works offline straight after "Enable offline mode".
|
||||||
|
* API calls are never cached — offline scans go through IndexedDB instead.
|
||||||
|
*/
|
||||||
|
const CACHE = 'hope-scanner-v1';
|
||||||
|
const SCANNER_PATH = '/dashboard/staff/ticket-scanning';
|
||||||
|
|
||||||
|
self.addEventListener('install', () => self.skipWaiting());
|
||||||
|
self.addEventListener('activate', (event) => {
|
||||||
|
event.waitUntil((async () => {
|
||||||
|
const keys = await caches.keys();
|
||||||
|
await Promise.all(keys.filter(k => k.startsWith('hope-scanner-') && k !== CACHE).map(k => caches.delete(k)));
|
||||||
|
await self.clients.claim();
|
||||||
|
})());
|
||||||
|
});
|
||||||
|
|
||||||
|
self.addEventListener('message', (event) => {
|
||||||
|
const data = event.data || {};
|
||||||
|
if (data.type !== 'cache-urls' || !Array.isArray(data.urls)) return;
|
||||||
|
event.waitUntil((async () => {
|
||||||
|
const cache = await caches.open(CACHE);
|
||||||
|
const sameOrigin = data.urls.filter(u => {
|
||||||
|
try { return new URL(u, self.location.origin).origin === self.location.origin; } catch { return false; }
|
||||||
|
});
|
||||||
|
await Promise.all(sameOrigin.map(u => cache.add(u).catch(() => {})));
|
||||||
|
})());
|
||||||
|
});
|
||||||
|
|
||||||
|
self.addEventListener('fetch', (event) => {
|
||||||
|
const req = event.request;
|
||||||
|
if (req.method !== 'GET') return;
|
||||||
|
const url = new URL(req.url);
|
||||||
|
if (url.origin !== self.location.origin) return;
|
||||||
|
|
||||||
|
if (url.pathname.startsWith('/_next/static/')) {
|
||||||
|
event.respondWith((async () => {
|
||||||
|
const cache = await caches.open(CACHE);
|
||||||
|
const hit = await cache.match(req);
|
||||||
|
if (hit) return hit;
|
||||||
|
const res = await fetch(req);
|
||||||
|
if (res.ok) cache.put(req, res.clone());
|
||||||
|
return res;
|
||||||
|
})());
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (url.pathname === SCANNER_PATH) {
|
||||||
|
event.respondWith((async () => {
|
||||||
|
const cache = await caches.open(CACHE);
|
||||||
|
try {
|
||||||
|
const res = await fetch(req);
|
||||||
|
if (res.ok) cache.put(SCANNER_PATH, res.clone());
|
||||||
|
return res;
|
||||||
|
} catch {
|
||||||
|
const hit = (await cache.match(req, { ignoreSearch: true })) || (await cache.match(SCANNER_PATH));
|
||||||
|
if (hit) return hit;
|
||||||
|
throw new Error('offline and not cached');
|
||||||
|
}
|
||||||
|
})());
|
||||||
|
}
|
||||||
|
});
|
||||||
@@ -25,6 +25,11 @@ const ACTIONS = [
|
|||||||
"consent_override",
|
"consent_override",
|
||||||
"consent_rerequested",
|
"consent_rerequested",
|
||||||
"medical_list_viewed",
|
"medical_list_viewed",
|
||||||
|
"scan_lock_acquired",
|
||||||
|
"scan_lock_released",
|
||||||
|
"scan_lock_force_released",
|
||||||
|
"offline_sync",
|
||||||
|
"ticket_transferred",
|
||||||
] as const;
|
] as const;
|
||||||
|
|
||||||
const ACTION_LABELS: Record<string, string> = {
|
const ACTION_LABELS: Record<string, string> = {
|
||||||
@@ -44,6 +49,11 @@ const ACTION_LABELS: Record<string, string> = {
|
|||||||
consent_override: "Consent overridden at check-in",
|
consent_override: "Consent overridden at check-in",
|
||||||
consent_rerequested: "Consent re-requested",
|
consent_rerequested: "Consent re-requested",
|
||||||
medical_list_viewed: "Medical list viewed",
|
medical_list_viewed: "Medical list viewed",
|
||||||
|
scan_lock_acquired: "Offline scanning started",
|
||||||
|
scan_lock_released: "Offline scanning ended",
|
||||||
|
scan_lock_force_released: "Offline lock force-released",
|
||||||
|
offline_sync: "Offline scans synced",
|
||||||
|
ticket_transferred: "Ticket transferred",
|
||||||
};
|
};
|
||||||
|
|
||||||
interface AuditLogEntry {
|
interface AuditLogEntry {
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import { useStableState } from "@/hooks/useStableState";
|
|||||||
import { useVisiblePolling } from "@/hooks/useVisiblePolling";
|
import { useVisiblePolling } from "@/hooks/useVisiblePolling";
|
||||||
import {
|
import {
|
||||||
Calendar, Banknote, Gift, Users, Ticket, QrCode, ClipboardList,
|
Calendar, Banknote, Gift, Users, Ticket, QrCode, ClipboardList,
|
||||||
UserPlus, FileText, MessageCircle, BarChart2, Mail, Wallet, DoorOpen, History, TicketPercent, ShieldCheck, ListChecks,
|
UserPlus, FileText, MessageCircle, BarChart2, Mail, Wallet, DoorOpen, History, TicketPercent, ShieldCheck, ListChecks, WifiOff, BedDouble,
|
||||||
} from "lucide-react";
|
} from "lucide-react";
|
||||||
import { StatCard, StatCardRow } from "@/components/shared/StatCard";
|
import { StatCard, StatCardRow } from "@/components/shared/StatCard";
|
||||||
import { QuickActionTile, QuickActionGrid } from "@/components/shared/QuickActionTile";
|
import { QuickActionTile, QuickActionGrid } from "@/components/shared/QuickActionTile";
|
||||||
@@ -27,6 +27,8 @@ const QUICK_ACTIONS = [
|
|||||||
{ href: "/dashboard/supervisor/manual", label: "Manual registration", description: "Register a guest and issue tickets", icon: UserPlus },
|
{ href: "/dashboard/supervisor/manual", label: "Manual registration", description: "Register a guest and issue tickets", icon: UserPlus },
|
||||||
{ href: "/dashboard/supervisor/at-the-door", label: "At the door", description: "Walk-ins, payments, ticket printing", icon: DoorOpen },
|
{ href: "/dashboard/supervisor/at-the-door", label: "At the door", description: "Walk-ins, payments, ticket printing", icon: DoorOpen },
|
||||||
{ href: "/dashboard/supervisor/payments", label: "Payments & donations", description: "Manual payments and assignment", icon: Wallet },
|
{ href: "/dashboard/supervisor/payments", label: "Payments & donations", description: "Manual payments and assignment", icon: Wallet },
|
||||||
|
{ href: "/dashboard/supervisor/allocations", label: "Rooms & groups", description: "Put attendees into rooms, groups or buses", icon: BedDouble },
|
||||||
|
{ href: "/dashboard/supervisor/offline-scans", label: "Offline scanning", description: "Devices scanning offline and their synced scans", icon: WifiOff },
|
||||||
{ href: "/dashboard/supervisor/waitlist", label: "Waitlist", description: "People waiting for sold-out tickets", icon: ListChecks },
|
{ href: "/dashboard/supervisor/waitlist", label: "Waitlist", description: "People waiting for sold-out tickets", icon: ListChecks },
|
||||||
{ href: "/dashboard/supervisor/consent", label: "Parental consent", description: "Youth events: consent status and medical list", icon: ShieldCheck },
|
{ href: "/dashboard/supervisor/consent", label: "Parental consent", description: "Youth events: consent status and medical list", icon: ShieldCheck },
|
||||||
{ href: "/dashboard/supervisor/coupons", label: "Coupon codes", description: "Discounts for staff, leaders and promotions", icon: TicketPercent },
|
{ href: "/dashboard/supervisor/coupons", label: "Coupon codes", description: "Discounts for staff, leaders and promotions", icon: TicketPercent },
|
||||||
|
|||||||
@@ -0,0 +1,96 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import React, { useEffect, useState } from "react";
|
||||||
|
import { useAuth } from "@/hooks/useAuth";
|
||||||
|
import { useRouter } from "next/navigation";
|
||||||
|
import { apiFetch } from "@/lib/api";
|
||||||
|
import { formatDate } from "@/lib/date";
|
||||||
|
import { Users } from "lucide-react";
|
||||||
|
|
||||||
|
type Member = {
|
||||||
|
id: string; name: string; gender: string | null; dateOfBirth: string | null; phone: string | null;
|
||||||
|
parentName: string | null; parentPhone: string | null; bookedBy: string; bookedByPhone: string | null;
|
||||||
|
medical?: Record<string, string> | null; emergency?: Record<string, string> | null;
|
||||||
|
};
|
||||||
|
type MyGroup = { id: string; name: string; capacity: number | null; setName: string; event: { id: string; title: string; startDate: string }; members: Member[] };
|
||||||
|
|
||||||
|
const ageOn = (dob: string | null, on: string) => {
|
||||||
|
if (!dob) return null;
|
||||||
|
const d = new Date(dob), e = new Date(on);
|
||||||
|
let age = e.getFullYear() - d.getFullYear();
|
||||||
|
if (e.getMonth() < d.getMonth() || (e.getMonth() === d.getMonth() && e.getDate() < d.getDate())) age -= 1;
|
||||||
|
return age;
|
||||||
|
};
|
||||||
|
|
||||||
|
/** Groups the signed-in staff member leads (rooms, small groups, buses) and who's in them. */
|
||||||
|
export default function MyGroupsPage() {
|
||||||
|
const { token } = useAuth();
|
||||||
|
const router = useRouter();
|
||||||
|
const [data, setData] = useState<{ medicalShown: boolean; groups: MyGroup[] } | null>(null);
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!token) return;
|
||||||
|
apiFetch<{ medicalShown: boolean; groups: MyGroup[] }>("/api/allocations/my-groups", { authToken: token })
|
||||||
|
.then(setData).catch(e => setError(e?.message || "Failed to load your groups"));
|
||||||
|
}, [token]);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="max-w-4xl mx-auto w-full p-6">
|
||||||
|
<div className="flex items-center gap-3 mb-4">
|
||||||
|
<div className="w-10 h-10 rounded-xl bg-brand-50 flex items-center justify-center shrink-0">
|
||||||
|
<Users className="w-5 h-5 text-brand-600" />
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<button className="text-xs text-brand-600 hover:underline" onClick={() => router.push("/dashboard")}>← Back to dashboard</button>
|
||||||
|
<h1 className="text-2xl font-semibold text-gray-900 mt-0.5">My groups</h1>
|
||||||
|
<p className="text-sm text-gray-500">Rooms, small groups and buses you lead</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{error && <div className="mb-3 p-3 border rounded bg-red-50 text-red-800 text-sm">{error}</div>}
|
||||||
|
{data && data.groups.length === 0 && <p className="text-sm text-gray-600">You aren't leading any groups for upcoming events.</p>}
|
||||||
|
<div className="space-y-4">
|
||||||
|
{data?.groups.map(g => (
|
||||||
|
<section key={g.id} className="border rounded-xl p-4 bg-white shadow-sm">
|
||||||
|
<div className="flex flex-wrap items-baseline justify-between gap-2 mb-2">
|
||||||
|
<h2 className="font-semibold">{g.name} <span className="text-sm font-normal text-gray-500">· {g.setName}</span></h2>
|
||||||
|
<span className="text-xs text-gray-500">{g.event.title} · {formatDate(new Date(g.event.startDate))} · {g.members.length}{g.capacity ? ` / ${g.capacity}` : ""} people</span>
|
||||||
|
</div>
|
||||||
|
{g.members.length === 0 ? <p className="text-sm text-gray-500">Nobody has been placed in this group yet.</p> : (
|
||||||
|
<div className="overflow-x-auto">
|
||||||
|
<table className="w-full text-sm">
|
||||||
|
<thead><tr className="text-left text-xs text-gray-500 border-b">
|
||||||
|
<th className="py-1 pr-3">Name</th><th className="py-1 pr-3">Age</th><th className="py-1 pr-3">Contact</th>
|
||||||
|
{data.medicalShown && <th className="py-1 pr-3">Medical</th>}
|
||||||
|
</tr></thead>
|
||||||
|
<tbody>
|
||||||
|
{g.members.map(m => {
|
||||||
|
const age = ageOn(m.dateOfBirth, g.event.startDate);
|
||||||
|
return (
|
||||||
|
<tr key={m.id} className="border-b last:border-0 align-top">
|
||||||
|
<td className="py-1.5 pr-3 font-medium">{m.name}</td>
|
||||||
|
<td className="py-1.5 pr-3">{age ?? "—"}</td>
|
||||||
|
<td className="py-1.5 pr-3 text-xs">
|
||||||
|
{m.phone && <div>{m.phone}</div>}
|
||||||
|
{m.parentName ? <div>Parent: {m.parentName}{m.parentPhone ? ` · ${m.parentPhone}` : ""}</div> : m.bookedBy && <div>Booked by {m.bookedBy}{m.bookedByPhone ? ` · ${m.bookedByPhone}` : ""}</div>}
|
||||||
|
</td>
|
||||||
|
{data.medicalShown && (
|
||||||
|
<td className="py-1.5 pr-3 text-xs">
|
||||||
|
{m.medical ? Object.values(m.medical).filter(Boolean).join("; ") || "—" : "—"}
|
||||||
|
{m.emergency && Object.values(m.emergency).some(Boolean) && <div className="text-gray-500">Emergency: {Object.values(m.emergency).filter(Boolean).join(", ")}</div>}
|
||||||
|
</td>
|
||||||
|
)}
|
||||||
|
</tr>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</section>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
{data && !data.medicalShown && data.groups.length > 0 && <p className="text-xs text-gray-500 mt-3">Medical details are only shown to supervisors. Ask one if you need them.</p>}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -6,13 +6,14 @@ import { useRouter } from "next/navigation";
|
|||||||
import { apiFetch } from "@/lib/api";
|
import { apiFetch } from "@/lib/api";
|
||||||
import { useStableState } from "@/hooks/useStableState";
|
import { useStableState } from "@/hooks/useStableState";
|
||||||
import { useVisiblePolling } from "@/hooks/useVisiblePolling";
|
import { useVisiblePolling } from "@/hooks/useVisiblePolling";
|
||||||
import { QrCode, Ticket, Activity, UserCheck, Clock } from "lucide-react";
|
import { QrCode, Ticket, Activity, UserCheck, Clock, Users } from "lucide-react";
|
||||||
import { StatCard, StatCardRow } from "@/components/shared/StatCard";
|
import { StatCard, StatCardRow } from "@/components/shared/StatCard";
|
||||||
import { QuickActionTile, QuickActionGrid } from "@/components/shared/QuickActionTile";
|
import { QuickActionTile, QuickActionGrid } from "@/components/shared/QuickActionTile";
|
||||||
|
|
||||||
const QUICK_ACTIONS = [
|
const QUICK_ACTIONS = [
|
||||||
{ href: "/dashboard/staff/ticket-scanning", label: "Scan tickets", description: "Use your device camera to validate tickets", icon: QrCode },
|
{ href: "/dashboard/staff/ticket-scanning", label: "Scan tickets", description: "Use your device camera to validate tickets", icon: QrCode },
|
||||||
{ href: "/dashboard/staff/event-tickets", label: "Event tickets & printing", description: "Browse event tickets and print lists", icon: Ticket },
|
{ href: "/dashboard/staff/event-tickets", label: "Event tickets & printing", description: "Browse event tickets and print lists", icon: Ticket },
|
||||||
|
{ href: "/dashboard/staff/my-groups", label: "My groups", description: "Rooms and groups you lead", icon: Users },
|
||||||
] as const;
|
] as const;
|
||||||
|
|
||||||
export default function StaffDashboardPage() {
|
export default function StaffDashboardPage() {
|
||||||
|
|||||||
@@ -7,6 +7,9 @@ import { apiFetch } from "@/lib/api";
|
|||||||
import { useDismissingState } from "@/hooks/useDismissingState";
|
import { useDismissingState } from "@/hooks/useDismissingState";
|
||||||
import { useRouter } from "next/navigation";
|
import { useRouter } from "next/navigation";
|
||||||
import { QrCode } from "lucide-react";
|
import { QrCode } from "lucide-react";
|
||||||
|
import { useOfflineScanning } from "@/components/scanner/useOfflineScanning";
|
||||||
|
import { OfflineScanPanel } from "@/components/scanner/OfflineScanPanel";
|
||||||
|
import type { SnapshotTicket } from "@/lib/offlineScan";
|
||||||
|
|
||||||
export default function TicketScanningPage() {
|
export default function TicketScanningPage() {
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
@@ -17,6 +20,7 @@ export default function TicketScanningPage() {
|
|||||||
const [alreadyUsedModal, setAlreadyUsedModal] = useState<{ message: string; ticket?: any } | null>(null);
|
const [alreadyUsedModal, setAlreadyUsedModal] = useState<{ message: string; ticket?: any } | null>(null);
|
||||||
const [errorModal, setErrorModal] = useState<string | null>(null);
|
const [errorModal, setErrorModal] = useState<string | null>(null);
|
||||||
const { token, user } = useAuth();
|
const { token, user } = useAuth();
|
||||||
|
const offline = useOfflineScanning(token);
|
||||||
const [recentScans, setRecentScans] = useState<any[]>([]);
|
const [recentScans, setRecentScans] = useState<any[]>([]);
|
||||||
const [stats, setStats] = useState<any | null>(null);
|
const [stats, setStats] = useState<any | null>(null);
|
||||||
const [loadingStats, setLoadingStats] = useState<boolean>(false);
|
const [loadingStats, setLoadingStats] = useState<boolean>(false);
|
||||||
@@ -34,6 +38,7 @@ export default function TicketScanningPage() {
|
|||||||
qrCode: string;
|
qrCode: string;
|
||||||
ticket: any;
|
ticket: any;
|
||||||
remaining: number;
|
remaining: number;
|
||||||
|
offlineTicket?: SnapshotTicket; // scanned against the downloaded list (offline mode)
|
||||||
} | null>(null);
|
} | null>(null);
|
||||||
const [confirmQty, setConfirmQty] = useState(1);
|
const [confirmQty, setConfirmQty] = useState(1);
|
||||||
// Youth events: the preview says whether parental consent allows check-in.
|
// Youth events: the preview says whether parental consent allows check-in.
|
||||||
@@ -96,6 +101,16 @@ export default function TicketScanningPage() {
|
|||||||
})();
|
})();
|
||||||
}, [selectedEventId, token]);
|
}, [selectedEventId, token]);
|
||||||
|
|
||||||
|
// In offline mode the event and section are fixed to the locked scope.
|
||||||
|
useEffect(() => {
|
||||||
|
if (!offline.lock) return;
|
||||||
|
setSelectedEventId(offline.lock.eventId);
|
||||||
|
}, [offline.lock]);
|
||||||
|
useEffect(() => {
|
||||||
|
if (!offline.lock) return;
|
||||||
|
setSelectedSectionId(offline.lock.sectionId || "all");
|
||||||
|
}, [offline.lock, sections]);
|
||||||
|
|
||||||
// Bug fix: stop the scanner when the event or section filter changes so stale scan
|
// Bug fix: stop the scanner when the event or section filter changes so stale scan
|
||||||
// context is never used. The user must press "Scan Ticket" again to resume.
|
// context is never used. The user must press "Scan Ticket" again to resume.
|
||||||
const isFirstFilterRender = useRef(true);
|
const isFirstFilterRender = useRef(true);
|
||||||
@@ -114,6 +129,32 @@ export default function TicketScanningPage() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Offline mode: check the ticket against the list downloaded to this device.
|
||||||
|
if (offline.lock) {
|
||||||
|
const t = await offline.findTicket(text);
|
||||||
|
if (!t) { setErrorModal("Not found in the offline ticket list. Check at the door desk."); return; }
|
||||||
|
if (t.remaining <= 0) { setAlreadyUsedModal({ message: "Ticket has already been fully used", ticket: { id: t.id } }); return; }
|
||||||
|
if (!["not_required", "given"].includes(t.consentStatus)) {
|
||||||
|
setErrorModal(t.consentStatus === "declined" ? "Parental consent was declined — this ticket can't be checked in." : "Parental consent is missing or pending — this ticket can't be checked in offline. Check at the door desk.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
setConfirmQty(t.remaining);
|
||||||
|
setConfirmQtyRaw(String(t.remaining));
|
||||||
|
setConfirmModal({
|
||||||
|
qrCode: text,
|
||||||
|
remaining: t.remaining,
|
||||||
|
offlineTicket: t,
|
||||||
|
ticket: {
|
||||||
|
id: t.id, quantity: t.quantity, consentStatus: t.consentStatus,
|
||||||
|
event: { title: offline.lock.eventTitle },
|
||||||
|
registrationOption: { eventOption: { name: t.option }, variant: t.variant ? { name: t.variant } : null },
|
||||||
|
attendee: t.bookedBy ? { name: t.holder } : null,
|
||||||
|
user: { name: t.bookedBy || t.holder },
|
||||||
|
},
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// Always preview first to validate the ticket before showing confirm step
|
// Always preview first to validate the ticket before showing confirm step
|
||||||
// Uses the lightweight scan-preview endpoint (only fetches fields needed for the confirm modal)
|
// Uses the lightweight scan-preview endpoint (only fetches fields needed for the confirm modal)
|
||||||
let preview: any;
|
let preview: any;
|
||||||
@@ -172,7 +213,7 @@ export default function TicketScanningPage() {
|
|||||||
if (!confirmModal || !token) return;
|
if (!confirmModal || !token) return;
|
||||||
|
|
||||||
// Capture everything before clearing modal state
|
// Capture everything before clearing modal state
|
||||||
const { qrCode, ticket, remaining } = confirmModal;
|
const { qrCode, ticket, remaining, offlineTicket } = confirmModal;
|
||||||
const qty = confirmQty;
|
const qty = confirmQty;
|
||||||
const baseName = ticket?.registrationOption?.eventOption?.name || "Ticket";
|
const baseName = ticket?.registrationOption?.eventOption?.name || "Ticket";
|
||||||
const variantName = ticket?.registrationOption?.variant?.name;
|
const variantName = ticket?.registrationOption?.variant?.name;
|
||||||
@@ -194,6 +235,17 @@ export default function TicketScanningPage() {
|
|||||||
total: ticket?.quantity || 1,
|
total: ticket?.quantity || 1,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Offline mode: saved on this device, synced when there's a connection.
|
||||||
|
if (offlineTicket) {
|
||||||
|
try {
|
||||||
|
await offline.scanLocally(offlineTicket, qty);
|
||||||
|
} catch (e: any) {
|
||||||
|
setSuccessModal(null);
|
||||||
|
setErrorModal(e?.message || "Couldn't save the scan on this device");
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// Background write — reverse the optimistic update on failure
|
// Background write — reverse the optimistic update on failure
|
||||||
try {
|
try {
|
||||||
const url = `/api/tickets/scan/${encodeURIComponent(qrCode)}${
|
const url = `/api/tickets/scan/${encodeURIComponent(qrCode)}${
|
||||||
@@ -202,7 +254,12 @@ export default function TicketScanningPage() {
|
|||||||
await apiFetch<any>(url, {
|
await apiFetch<any>(url, {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
authToken: token,
|
authToken: token,
|
||||||
body: { qty, ...(overrideConsent ? { overrideConsent: true } : {}) },
|
body: {
|
||||||
|
qty,
|
||||||
|
deviceId: offline.deviceId(),
|
||||||
|
...(selectedSectionId && selectedSectionId !== "all" ? { sectionId: selectedSectionId } : {}),
|
||||||
|
...(overrideConsent ? { overrideConsent: true } : {}),
|
||||||
|
},
|
||||||
});
|
});
|
||||||
refreshStatsAndRecent();
|
refreshStatsAndRecent();
|
||||||
} catch (e: any) {
|
} catch (e: any) {
|
||||||
@@ -270,8 +327,10 @@ export default function TicketScanningPage() {
|
|||||||
className="border rounded px-3 py-2 w-full sm:w-56 max-w-full"
|
className="border rounded px-3 py-2 w-full sm:w-56 max-w-full"
|
||||||
value={selectedEventId}
|
value={selectedEventId}
|
||||||
onChange={(e) => setSelectedEventId(e.target.value)}
|
onChange={(e) => setSelectedEventId(e.target.value)}
|
||||||
|
disabled={!!offline.lock}
|
||||||
>
|
>
|
||||||
<option value="all">All events</option>
|
<option value="all">All events</option>
|
||||||
|
{offline.lock && !events.some(ev => ev.id === offline.lock!.eventId) && <option value={offline.lock.eventId}>{offline.lock.eventTitle}</option>}
|
||||||
{events.map((ev) => (
|
{events.map((ev) => (
|
||||||
<option key={ev.id} value={ev.id}>{ev.title}</option>
|
<option key={ev.id} value={ev.id}>{ev.title}</option>
|
||||||
))}
|
))}
|
||||||
@@ -289,6 +348,7 @@ export default function TicketScanningPage() {
|
|||||||
className="border rounded px-3 py-2 w-full sm:w-56 max-w-full"
|
className="border rounded px-3 py-2 w-full sm:w-56 max-w-full"
|
||||||
value={selectedSectionId}
|
value={selectedSectionId}
|
||||||
onChange={(e) => setSelectedSectionId(e.target.value)}
|
onChange={(e) => setSelectedSectionId(e.target.value)}
|
||||||
|
disabled={!!offline.lock}
|
||||||
>
|
>
|
||||||
<option value="all">All sections</option>
|
<option value="all">All sections</option>
|
||||||
{sections.map(section => (
|
{sections.map(section => (
|
||||||
@@ -299,6 +359,16 @@ export default function TicketScanningPage() {
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
<OfflineScanPanel
|
||||||
|
offline={offline}
|
||||||
|
token={token}
|
||||||
|
eventId={selectedEventId}
|
||||||
|
eventTitle={events.find(ev => ev.id === selectedEventId)?.title || offline.lock?.eventTitle || ""}
|
||||||
|
sectionId={selectedSectionId !== "all" ? selectedSectionId : null}
|
||||||
|
sectionName={sections.find(s => s.id === selectedSectionId)?.name || null}
|
||||||
|
onError={setError}
|
||||||
|
onInfo={setScanInfo}
|
||||||
|
/>
|
||||||
<QRScanner
|
<QRScanner
|
||||||
ref={scannerRef}
|
ref={scannerRef}
|
||||||
onResult={handleResult}
|
onResult={handleResult}
|
||||||
|
|||||||
@@ -0,0 +1,314 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import React, { useCallback, useEffect, useMemo, useState } from "react";
|
||||||
|
import { useAuth } from "@/hooks/useAuth";
|
||||||
|
import { useRouter } from "next/navigation";
|
||||||
|
import { DndContext, DragEndEvent, PointerSensor, TouchSensor, useDraggable, useDroppable, useSensor, useSensors } from "@dnd-kit/core";
|
||||||
|
import { apiFetch } from "@/lib/api";
|
||||||
|
import { formatDate } from "@/lib/date";
|
||||||
|
import { useDismissingState } from "@/hooks/useDismissingState";
|
||||||
|
import { BedDouble, Plus, Wand2, Printer, Trash2, Pencil, Eraser } from "lucide-react";
|
||||||
|
|
||||||
|
type Group = { id: string; name: string; capacity: number | null; gender: "male" | "female" | null; leaderUserId: string | null; leader?: { id: string; name: string } | null };
|
||||||
|
type AllocSet = { id: string; name: string; showOnTicket: boolean; groups: Group[]; assignments: { attendeeId: string; groupId: string }[] };
|
||||||
|
type Person = { id: string; name: string; gender: string | null; dateOfBirth: string | null; registrationId: string; bookedBy: string };
|
||||||
|
type Board = { event: { id: string; title: string; startDate: string; collectGender: boolean; requiresParentalConsent: boolean }; sets: AllocSet[]; attendees: Person[]; leaders: { id: string; name: string }[]; unnamedPlaces: number };
|
||||||
|
|
||||||
|
const UNASSIGNED = "unassigned";
|
||||||
|
const esc = (s: unknown) => String(s ?? "").replace(/[&<>"']/g, c => ({ "&": "&", "<": "<", ">": ">", '"': """, "'": "'" }[c]!));
|
||||||
|
const genderLabel = (g: string | null) => (g === "male" ? "Male" : g === "female" ? "Female" : "");
|
||||||
|
const ageOn = (dob: string | null, on: string) => {
|
||||||
|
if (!dob) return null;
|
||||||
|
const d = new Date(dob), e = new Date(on);
|
||||||
|
let age = e.getFullYear() - d.getFullYear();
|
||||||
|
if (e.getMonth() < d.getMonth() || (e.getMonth() === d.getMonth() && e.getDate() < d.getDate())) age -= 1;
|
||||||
|
return age;
|
||||||
|
};
|
||||||
|
|
||||||
|
function PersonChip({ person, eventStart }: { person: Person; eventStart: string }) {
|
||||||
|
const { attributes, listeners, setNodeRef, transform, isDragging } = useDraggable({ id: person.id });
|
||||||
|
const age = ageOn(person.dateOfBirth, eventStart);
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
ref={setNodeRef}
|
||||||
|
{...listeners}
|
||||||
|
{...attributes}
|
||||||
|
style={transform ? { transform: `translate(${transform.x}px, ${transform.y}px)`, zIndex: 50 } : undefined}
|
||||||
|
className={`px-2 py-1.5 rounded-lg border bg-white text-sm cursor-grab active:cursor-grabbing select-none touch-none ${isDragging ? "shadow-lg ring-2 ring-brand-300" : "shadow-sm"}`}
|
||||||
|
title={person.bookedBy ? `Booked by ${person.bookedBy}` : undefined}
|
||||||
|
>
|
||||||
|
<span className="font-medium">{person.name}</span>
|
||||||
|
<span className="text-xs text-gray-500">
|
||||||
|
{[genderLabel(person.gender), age != null ? `${age}` : "", person.bookedBy ? `· ${person.bookedBy}` : ""].filter(Boolean).map(s => ` ${s}`).join("")}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function Column({ id, title, subtitle, full, children, actions }: { id: string; title: string; subtitle?: string; full?: boolean; children: React.ReactNode; actions?: React.ReactNode }) {
|
||||||
|
const { setNodeRef, isOver } = useDroppable({ id });
|
||||||
|
return (
|
||||||
|
<div ref={setNodeRef} className={`rounded-xl border p-3 min-h-[8rem] transition-colors ${isOver ? "bg-brand-50 border-brand-300" : full ? "bg-gray-50" : "bg-white"}`}>
|
||||||
|
<div className="flex items-start justify-between gap-2 mb-2">
|
||||||
|
<div>
|
||||||
|
<div className="font-semibold text-sm">{title}</div>
|
||||||
|
{subtitle && <div className={`text-xs ${full ? "text-amber-700" : "text-gray-500"}`}>{subtitle}</div>}
|
||||||
|
</div>
|
||||||
|
{actions}
|
||||||
|
</div>
|
||||||
|
<div className="space-y-1.5">{children}</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function AllocationsPage() {
|
||||||
|
const { user, loading, token } = useAuth();
|
||||||
|
const router = useRouter();
|
||||||
|
const canView = useMemo(() => user?.role === "admin" || user?.role === "supervisor", [user]);
|
||||||
|
useEffect(() => { if (!loading && !user) router.replace("/login"); }, [user, loading, router]);
|
||||||
|
|
||||||
|
const [events, setEvents] = useState<any[]>([]);
|
||||||
|
const [eventId, setEventId] = useState("");
|
||||||
|
const [board, setBoard] = useState<Board | null>(null);
|
||||||
|
const [setId, setSetId] = useState("");
|
||||||
|
const [busy, setBusy] = useState(false);
|
||||||
|
const [error, setError] = useDismissingState<string | null>(null);
|
||||||
|
const [info, setInfo] = useDismissingState<string | null>(null);
|
||||||
|
const [groupForm, setGroupForm] = useState<{ id?: string; name: string; capacity: string; gender: string; leaderUserId: string } | null>(null);
|
||||||
|
const [newSetName, setNewSetName] = useState("");
|
||||||
|
const sensors = useSensors(useSensor(PointerSensor, { activationConstraint: { distance: 5 } }), useSensor(TouchSensor, { activationConstraint: { delay: 150, tolerance: 5 } }));
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!token || !canView) return;
|
||||||
|
apiFetch<any[]>("/api/events/all?includePast=true", { authToken: token })
|
||||||
|
.then(evs => {
|
||||||
|
const upcoming = (evs || []).filter(e => new Date(e.endDate).getTime() > Date.now() - 7 * 864e5)
|
||||||
|
.sort((a, b) => new Date(a.startDate).getTime() - new Date(b.startDate).getTime());
|
||||||
|
setEvents(upcoming);
|
||||||
|
if (upcoming.length) setEventId(id => id || upcoming[0].id);
|
||||||
|
})
|
||||||
|
.catch(e => setError(e?.message || "Failed to load events"));
|
||||||
|
}, [token, canView, setError]);
|
||||||
|
|
||||||
|
const load = useCallback(async () => {
|
||||||
|
if (!token || !eventId) return;
|
||||||
|
try {
|
||||||
|
const b = await apiFetch<Board>(`/api/allocations/event/${encodeURIComponent(eventId)}`, { authToken: token });
|
||||||
|
setBoard(b);
|
||||||
|
setSetId(id => (b.sets.some(s => s.id === id) ? id : b.sets[0]?.id || ""));
|
||||||
|
} catch (e: any) {
|
||||||
|
setError(e?.message || "Failed to load allocations");
|
||||||
|
}
|
||||||
|
}, [token, eventId, setError]);
|
||||||
|
useEffect(() => { load(); }, [load]);
|
||||||
|
|
||||||
|
const current = board?.sets.find(s => s.id === setId) || null;
|
||||||
|
const groupOf = useMemo(() => new Map((current?.assignments || []).map(a => [a.attendeeId, a.groupId])), [current]);
|
||||||
|
const membersOf = (groupId: string) => (board?.attendees || []).filter(p => groupOf.get(p.id) === groupId);
|
||||||
|
const unassigned = (board?.attendees || []).filter(p => !groupOf.has(p.id));
|
||||||
|
|
||||||
|
const call = async <T,>(path: string, method: string, body?: unknown): Promise<T> =>
|
||||||
|
apiFetch<T>(path, { method, authToken: token!, ...(body !== undefined ? { body } : {}) });
|
||||||
|
|
||||||
|
const onDragEnd = async (e: DragEndEvent) => {
|
||||||
|
if (!current || !e.over) return;
|
||||||
|
const attendeeId = String(e.active.id);
|
||||||
|
const target = String(e.over.id);
|
||||||
|
const groupId = target === UNASSIGNED ? null : target;
|
||||||
|
if ((groupOf.get(attendeeId) || null) === groupId) return;
|
||||||
|
// Optimistic move; reload on failure.
|
||||||
|
setBoard(b => b && ({
|
||||||
|
...b,
|
||||||
|
sets: b.sets.map(s => s.id !== current.id ? s : {
|
||||||
|
...s,
|
||||||
|
assignments: [...s.assignments.filter(a => a.attendeeId !== attendeeId), ...(groupId ? [{ attendeeId, groupId }] : [])],
|
||||||
|
}),
|
||||||
|
}));
|
||||||
|
try {
|
||||||
|
await call(`/api/allocations/sets/${current.id}/assignments`, "PUT", { attendeeId, groupId });
|
||||||
|
} catch (err: any) {
|
||||||
|
setError(err?.message || "Couldn't move them");
|
||||||
|
load();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const run = async (fn: () => Promise<string | void>) => {
|
||||||
|
setBusy(true);
|
||||||
|
try {
|
||||||
|
const msg = await fn();
|
||||||
|
if (msg) setInfo(msg);
|
||||||
|
await load();
|
||||||
|
} catch (e: any) {
|
||||||
|
setError(e?.message || "Something went wrong");
|
||||||
|
} finally {
|
||||||
|
setBusy(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const addSet = () => run(async () => {
|
||||||
|
const s = await call<{ id: string }>("/api/allocations/sets", "POST", { eventId, name: newSetName || "Rooms" });
|
||||||
|
setNewSetName("");
|
||||||
|
setSetId(s.id);
|
||||||
|
});
|
||||||
|
const saveGroup = () => groupForm && current && run(async () => {
|
||||||
|
const body = { name: groupForm.name, capacity: groupForm.capacity || null, gender: groupForm.gender || null, leaderUserId: groupForm.leaderUserId || null };
|
||||||
|
if (groupForm.id) await call(`/api/allocations/groups/${groupForm.id}`, "PUT", body);
|
||||||
|
else await call(`/api/allocations/sets/${current.id}/groups`, "POST", body);
|
||||||
|
setGroupForm(null);
|
||||||
|
});
|
||||||
|
|
||||||
|
const printLists = async (master: boolean, medical: boolean) => {
|
||||||
|
if (!current || !board) return;
|
||||||
|
try {
|
||||||
|
const data = await apiFetch<any>(`/api/allocations/sets/${current.id}/lists${medical ? "?medical=true" : ""}`, { authToken: token! });
|
||||||
|
const w = window.open("", "_blank");
|
||||||
|
if (!w) return;
|
||||||
|
const row = (m: any) => `<tr><td>${esc(m.name)}</td><td>${esc(genderLabel(m.gender))}</td><td>${esc(ageOn(m.dateOfBirth, board.event.startDate) ?? "")}</td>`
|
||||||
|
+ `<td>${esc(m.phone || m.parentPhone || m.bookedByPhone || "")}</td><td>${esc(m.parentName || m.bookedBy || "")}</td>`
|
||||||
|
+ (medical ? `<td>${esc(m.medical ? Object.values(m.medical).filter(Boolean).join("; ") : "")}</td><td>${esc(m.emergency ? Object.values(m.emergency).filter(Boolean).join(", ") : "")}</td>` : "") + `</tr>`;
|
||||||
|
const head = `<tr><th>Name</th><th>Gender</th><th>Age</th><th>Phone</th><th>Parent / booked by</th>${medical ? "<th>Medical</th><th>Emergency contact</th>" : ""}</tr>`;
|
||||||
|
let body = "";
|
||||||
|
if (master) {
|
||||||
|
const all = data.groups.flatMap((g: any) => g.members.map((m: any) => ({ ...m, group: g.name }))).sort((a: any, b: any) => a.name.localeCompare(b.name));
|
||||||
|
body = `<h1>${esc(data.event.title)} — ${esc(data.set.name)} (master list)</h1><table><tr><th>${esc(data.set.name)}</th>${head.slice(4)}${all.map((m: any) => row(m).replace("<tr>", `<tr><td>${esc(m.group)}</td>`)).join("")}</table>`;
|
||||||
|
} else {
|
||||||
|
body = data.groups.map((g: any) => `<section><h1>${esc(data.event.title)} — ${esc(g.name)}</h1>`
|
||||||
|
+ `<p>${esc(data.set.name)}${g.leader ? ` · Leader: ${esc(g.leader)}` : ""} · ${g.members.length}${g.capacity ? ` / ${g.capacity}` : ""} people</p>`
|
||||||
|
+ `<table>${head}${g.members.map(row).join("")}</table></section>`).join("");
|
||||||
|
}
|
||||||
|
w.document.write(`<!doctype html><html><head><title>${esc(data.set.name)}</title><style>
|
||||||
|
body{font-family:Arial,sans-serif;font-size:11pt;margin:12mm} h1{font-size:15pt;margin:0 0 2mm} p{margin:0 0 3mm;color:#555}
|
||||||
|
table{border-collapse:collapse;width:100%;margin-bottom:6mm} th,td{border:1px solid #bbb;padding:3px 6px;text-align:left;vertical-align:top} th{background:#f1f1f1}
|
||||||
|
section{page-break-after:always} section:last-child{page-break-after:auto}
|
||||||
|
</style></head><body>${body}<script>window.onload=function(){window.print()}</script></body></html>`);
|
||||||
|
w.document.close();
|
||||||
|
} catch (e: any) {
|
||||||
|
setError(e?.message || "Couldn't load the lists");
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="max-w-7xl mx-auto w-full p-6">
|
||||||
|
<div className="flex items-center gap-3 mb-4">
|
||||||
|
<div className="w-10 h-10 rounded-xl bg-brand-50 flex items-center justify-center shrink-0">
|
||||||
|
<BedDouble className="w-5 h-5 text-brand-600" />
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<button className="text-xs text-brand-600 hover:underline" onClick={() => router.push("/dashboard")}>← Back to dashboard</button>
|
||||||
|
<h1 className="text-2xl font-semibold text-gray-900 mt-0.5">Rooms & groups</h1>
|
||||||
|
<p className="text-sm text-gray-500">Put attendees into rooms, small groups, teams or buses</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{!canView && <div className="p-3 border rounded bg-yellow-50 text-yellow-800 text-sm mb-4">You need supervisor access to manage allocations.</div>}
|
||||||
|
{error && <div className="mb-3 p-3 border rounded bg-red-50 text-red-800 text-sm">{error}</div>}
|
||||||
|
{info && <div className="mb-3 p-3 border rounded bg-green-50 text-green-800 text-sm">{info}</div>}
|
||||||
|
|
||||||
|
{canView && (
|
||||||
|
<div className="space-y-4">
|
||||||
|
<div className="flex flex-wrap items-end gap-3">
|
||||||
|
<div>
|
||||||
|
<label className="block text-xs text-gray-600 mb-1">Event</label>
|
||||||
|
<select className="border rounded-lg px-3 py-2 text-sm min-w-[16rem]" value={eventId} onChange={e => { setEventId(e.target.value); setSetId(""); }}>
|
||||||
|
{events.map(ev => <option key={ev.id} value={ev.id}>{ev.title} ({formatDate(new Date(ev.startDate))})</option>)}
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
{board && (
|
||||||
|
<div className="flex flex-wrap items-center gap-1">
|
||||||
|
{board.sets.map(s => (
|
||||||
|
<button key={s.id} onClick={() => setSetId(s.id)} className={`px-3 py-1.5 text-sm rounded-lg border ${s.id === setId ? "bg-brand-600 text-white border-brand-600" : "bg-white hover:bg-gray-50"}`}>{s.name}</button>
|
||||||
|
))}
|
||||||
|
<input className="border rounded-lg px-2 py-1.5 text-sm w-36" placeholder="New set, e.g. Buses" value={newSetName} onChange={e => setNewSetName(e.target.value)} onKeyDown={e => { if (e.key === "Enter") addSet(); }} />
|
||||||
|
<button onClick={addSet} disabled={busy} className="inline-flex items-center gap-1 px-2.5 py-1.5 text-sm rounded-lg border hover:bg-gray-50"><Plus className="w-4 h-4" /> Add set</button>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{board && board.attendees.length === 0 && (
|
||||||
|
<div className="p-3 border rounded bg-amber-50 text-amber-900 text-sm">
|
||||||
|
No named attendees yet. Allocation works per person, so it needs names — turn on "Named attendees" for the event{board.event.collectGender ? "" : " (and \"Ask each person's gender\" if rooms are split by gender)"}.
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{board && board.unnamedPlaces > 0 && (
|
||||||
|
<p className="text-xs text-gray-500">{board.unnamedPlaces} place(s) have no name yet, so they can't be placed until the person booking adds names.</p>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{current && board && (
|
||||||
|
<>
|
||||||
|
<div className="flex flex-wrap items-center gap-2 border rounded-xl p-3 bg-white">
|
||||||
|
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||||
|
<input type="checkbox" checked={current.showOnTicket} onChange={e => run(async () => { await call(`/api/allocations/sets/${current.id}`, "PUT", { showOnTicket: e.target.checked }); })} />
|
||||||
|
Show {current.name.toLowerCase()} on tickets and in My Events
|
||||||
|
</label>
|
||||||
|
<div className="ml-auto flex flex-wrap gap-2">
|
||||||
|
<button disabled={busy} onClick={() => run(async () => (await call<{ message: string }>(`/api/allocations/sets/${current.id}/auto`, "POST", { mode: "together" })).message)} className="inline-flex items-center gap-1 px-2.5 py-1.5 text-sm rounded-lg bg-brand-600 text-white hover:bg-brand-700 disabled:opacity-50" title="Fill groups evenly, keeping people on the same booking (e.g. siblings) together where possible"><Wand2 className="w-4 h-4" /> Auto-allocate (keep bookings together)</button>
|
||||||
|
<button disabled={busy} onClick={() => run(async () => (await call<{ message: string }>(`/api/allocations/sets/${current.id}/auto`, "POST", { mode: "split" })).message)} className="inline-flex items-center gap-1 px-2.5 py-1.5 text-sm rounded-lg border hover:bg-gray-50 disabled:opacity-50" title="Fill groups evenly, spreading people on the same booking across groups">Auto-allocate (split bookings)</button>
|
||||||
|
<button onClick={() => printLists(false, false)} className="inline-flex items-center gap-1 px-2.5 py-1.5 text-sm rounded-lg border hover:bg-gray-50"><Printer className="w-4 h-4" /> Group lists</button>
|
||||||
|
<button onClick={() => printLists(true, false)} className="inline-flex items-center gap-1 px-2.5 py-1.5 text-sm rounded-lg border hover:bg-gray-50"><Printer className="w-4 h-4" /> Master list</button>
|
||||||
|
{board.event.requiresParentalConsent && (
|
||||||
|
<button onClick={() => printLists(false, true)} className="inline-flex items-center gap-1 px-2.5 py-1.5 text-sm rounded-lg border hover:bg-gray-50" title="Includes medical details from consent forms. Viewing is recorded in the audit log."><Printer className="w-4 h-4" /> Lists with medical info</button>
|
||||||
|
)}
|
||||||
|
<button disabled={busy} onClick={() => run(async () => (await call<{ message: string }>(`/api/allocations/sets/${current.id}/assignments`, "DELETE")).message)} className="inline-flex items-center gap-1 px-2.5 py-1.5 text-sm rounded-lg border hover:bg-gray-50 disabled:opacity-50"><Eraser className="w-4 h-4" /> Clear</button>
|
||||||
|
<button disabled={busy} onClick={() => run(async () => { await call(`/api/allocations/sets/${current.id}`, "DELETE"); setSetId(""); return `Deleted ${current.name}.`; })} className="inline-flex items-center gap-1 px-2.5 py-1.5 text-sm rounded-lg border text-red-700 hover:bg-red-50 disabled:opacity-50"><Trash2 className="w-4 h-4" /> Delete set</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{groupForm ? (
|
||||||
|
<div className="border rounded-xl p-3 bg-white flex flex-wrap items-end gap-2">
|
||||||
|
<div><label className="block text-xs text-gray-600 mb-1">Name</label><input className="border rounded-lg px-2 py-1.5 text-sm" value={groupForm.name} onChange={e => setGroupForm({ ...groupForm, name: e.target.value })} placeholder="Cabin 1" autoFocus /></div>
|
||||||
|
<div><label className="block text-xs text-gray-600 mb-1">Capacity</label><input type="number" min="1" className="border rounded-lg px-2 py-1.5 text-sm w-24" value={groupForm.capacity} onChange={e => setGroupForm({ ...groupForm, capacity: e.target.value })} placeholder="No limit" /></div>
|
||||||
|
<div><label className="block text-xs text-gray-600 mb-1">Gender</label>
|
||||||
|
<select className="border rounded-lg px-2 py-1.5 text-sm" value={groupForm.gender} onChange={e => setGroupForm({ ...groupForm, gender: e.target.value })}>
|
||||||
|
<option value="">Anyone</option><option value="male">Males only</option><option value="female">Females only</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<div><label className="block text-xs text-gray-600 mb-1">Leader</label>
|
||||||
|
<select className="border rounded-lg px-2 py-1.5 text-sm" value={groupForm.leaderUserId} onChange={e => setGroupForm({ ...groupForm, leaderUserId: e.target.value })}>
|
||||||
|
<option value="">None</option>
|
||||||
|
{board.leaders.map(l => <option key={l.id} value={l.id}>{l.name}</option>)}
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<button disabled={busy || !groupForm.name.trim()} onClick={saveGroup} className="px-3 py-1.5 text-sm rounded-lg bg-brand-600 text-white disabled:opacity-50">{groupForm.id ? "Save" : "Add group"}</button>
|
||||||
|
<button onClick={() => setGroupForm(null)} className="px-3 py-1.5 text-sm rounded-lg bg-gray-100">Cancel</button>
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<button onClick={() => setGroupForm({ name: "", capacity: "", gender: "", leaderUserId: "" })} className="inline-flex items-center gap-1 px-2.5 py-1.5 text-sm rounded-lg border hover:bg-gray-50"><Plus className="w-4 h-4" /> Add a group to {current.name}</button>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<DndContext sensors={sensors} onDragEnd={onDragEnd}>
|
||||||
|
<div className="grid grid-cols-1 md:grid-cols-[minmax(14rem,1fr)_3fr] gap-4 items-start">
|
||||||
|
<div className="md:sticky md:top-4">
|
||||||
|
<Column id={UNASSIGNED} title="Not placed yet" subtitle={`${unassigned.length} people · drag them into a group`}>
|
||||||
|
{unassigned.map(p => <PersonChip key={p.id} person={p} eventStart={board.event.startDate} />)}
|
||||||
|
</Column>
|
||||||
|
</div>
|
||||||
|
<div className="grid grid-cols-1 sm:grid-cols-2 xl:grid-cols-3 gap-3">
|
||||||
|
{current.groups.length === 0 && <p className="text-sm text-gray-500">Add groups (rooms, cabins, buses…) to start placing people.</p>}
|
||||||
|
{current.groups.map(g => {
|
||||||
|
const members = membersOf(g.id);
|
||||||
|
const full = g.capacity != null && members.length >= g.capacity;
|
||||||
|
const subtitle = [`${members.length}${g.capacity ? ` / ${g.capacity}` : ""}${full ? " · full" : ""}`, g.gender ? (g.gender === "male" ? "males" : "females") : "", g.leader ? `leader ${g.leader.name}` : ""].filter(Boolean).join(" · ");
|
||||||
|
return (
|
||||||
|
<Column key={g.id} id={g.id} title={g.name} subtitle={subtitle} full={full} actions={
|
||||||
|
<div className="flex gap-1 shrink-0">
|
||||||
|
<button aria-label={`Edit ${g.name}`} onClick={() => setGroupForm({ id: g.id, name: g.name, capacity: g.capacity ? String(g.capacity) : "", gender: g.gender || "", leaderUserId: g.leaderUserId || "" })} className="p-1 rounded hover:bg-gray-100"><Pencil className="w-3.5 h-3.5" /></button>
|
||||||
|
<button aria-label={`Delete ${g.name}`} onClick={() => run(async () => { await call(`/api/allocations/groups/${g.id}`, "DELETE"); return `${g.name} deleted; its people are back in "Not placed yet".`; })} className="p-1 rounded hover:bg-red-50 text-red-700"><Trash2 className="w-3.5 h-3.5" /></button>
|
||||||
|
</div>
|
||||||
|
}>
|
||||||
|
{members.map(p => <PersonChip key={p.id} person={p} eventStart={board.event.startDate} />)}
|
||||||
|
</Column>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</DndContext>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
{board && board.sets.length === 0 && board.attendees.length > 0 && (
|
||||||
|
<p className="text-sm text-gray-600">Start by adding a set, e.g. "Rooms", "Small groups" or "Buses". An event can have several.</p>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -7,6 +7,7 @@ import { apiFetch } from "@/lib/api";
|
|||||||
import { scoreUser } from "@/lib/fuzzyMatch";
|
import { scoreUser } from "@/lib/fuzzyMatch";
|
||||||
import { useDismissingState } from "@/hooks/useDismissingState";
|
import { useDismissingState } from "@/hooks/useDismissingState";
|
||||||
import { CouponCodeField, AppliedCoupon } from "@/components/shared/CouponCodeField";
|
import { CouponCodeField, AppliedCoupon } from "@/components/shared/CouponCodeField";
|
||||||
|
import { TransferTicketModal, canOfferTransfer } from "@/components/shared/TransferTicketModal";
|
||||||
import { AttendeeNamesEditor, AttendeeEntries, TicketDelivery, attendeesPayload, consentDetailsMissing } from "@/components/shared/AttendeeNamesEditor";
|
import { AttendeeNamesEditor, AttendeeEntries, TicketDelivery, attendeesPayload, consentDetailsMissing } from "@/components/shared/AttendeeNamesEditor";
|
||||||
import { DoorOpen, UserPlus, CreditCard, CheckSquare, Ticket, RotateCcw, type LucideIcon } from "lucide-react";
|
import { DoorOpen, UserPlus, CreditCard, CheckSquare, Ticket, RotateCcw, type LucideIcon } from "lucide-react";
|
||||||
|
|
||||||
@@ -105,6 +106,7 @@ export default function AtTheDoorPage() {
|
|||||||
const [doorCoupon, setDoorCoupon] = useState<AppliedCoupon | null>(null);
|
const [doorCoupon, setDoorCoupon] = useState<AppliedCoupon | null>(null);
|
||||||
const [doorAllowsNames, setDoorAllowsNames] = useState(false);
|
const [doorAllowsNames, setDoorAllowsNames] = useState(false);
|
||||||
const [doorYouthStart, setDoorYouthStart] = useState<string | null>(null);
|
const [doorYouthStart, setDoorYouthStart] = useState<string | null>(null);
|
||||||
|
const [doorCollectGender, setDoorCollectGender] = useState(false);
|
||||||
const [doorNaming, setDoorNaming] = useState(false);
|
const [doorNaming, setDoorNaming] = useState(false);
|
||||||
const [doorEntries, setDoorEntries] = useState<AttendeeEntries>({});
|
const [doorEntries, setDoorEntries] = useState<AttendeeEntries>({});
|
||||||
const [doorDelivery, setDoorDelivery] = useState<TicketDelivery>("payer");
|
const [doorDelivery, setDoorDelivery] = useState<TicketDelivery>("payer");
|
||||||
@@ -163,6 +165,7 @@ export default function AtTheDoorPage() {
|
|||||||
setEventOptions(ev.options || ev.eventOptions || []);
|
setEventOptions(ev.options || ev.eventOptions || []);
|
||||||
setDoorAllowsNames(!!ev.allowNamedAttendees || !!ev.requiresParentalConsent);
|
setDoorAllowsNames(!!ev.allowNamedAttendees || !!ev.requiresParentalConsent);
|
||||||
setDoorYouthStart(ev.requiresParentalConsent ? ev.startDate : null);
|
setDoorYouthStart(ev.requiresParentalConsent ? ev.startDate : null);
|
||||||
|
setDoorCollectGender(!!ev.collectGender);
|
||||||
} catch {
|
} catch {
|
||||||
setEventOptions([]);
|
setEventOptions([]);
|
||||||
}
|
}
|
||||||
@@ -513,6 +516,7 @@ export default function AtTheDoorPage() {
|
|||||||
entries: doorEntries, onEntriesChange: setDoorEntries,
|
entries: doorEntries, onEntriesChange: setDoorEntries,
|
||||||
delivery: doorDelivery, onDeliveryChange: setDoorDelivery,
|
delivery: doorDelivery, onDeliveryChange: setDoorDelivery,
|
||||||
consentEventStart: doorYouthStart || undefined,
|
consentEventStart: doorYouthStart || undefined,
|
||||||
|
collectGender: doorCollectGender,
|
||||||
} : null}
|
} : null}
|
||||||
/>
|
/>
|
||||||
<DonationModal
|
<DonationModal
|
||||||
@@ -869,6 +873,8 @@ function DoorTicketsPanel({ token, eventId }: any) {
|
|||||||
const [allTickets, setAllTickets] = useState<any[]>([]);
|
const [allTickets, setAllTickets] = useState<any[]>([]);
|
||||||
const [loading, setLoading] = useState(false);
|
const [loading, setLoading] = useState(false);
|
||||||
const [sendTarget, setSendTarget] = useState<any | null>(null);
|
const [sendTarget, setSendTarget] = useState<any | null>(null);
|
||||||
|
const [transferTarget, setTransferTarget] = useState<any | null>(null);
|
||||||
|
const [notice, setNotice] = useState<string | null>(null);
|
||||||
|
|
||||||
// Load all tickets for the event once
|
// Load all tickets for the event once
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -1000,6 +1006,7 @@ function DoorTicketsPanel({ token, eventId }: any) {
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{notice && <div className="mt-2 p-2 rounded bg-green-50 text-green-800 text-sm">{notice}</div>}
|
||||||
<div className="mt-3 space-y-2 max-h-96 overflow-auto">
|
<div className="mt-3 space-y-2 max-h-96 overflow-auto">
|
||||||
{tickets.map(t => (
|
{tickets.map(t => (
|
||||||
<div
|
<div
|
||||||
@@ -1008,8 +1015,11 @@ function DoorTicketsPanel({ token, eventId }: any) {
|
|||||||
>
|
>
|
||||||
<div className="text-sm">
|
<div className="text-sm">
|
||||||
<div className="font-medium">
|
<div className="font-medium">
|
||||||
{t.user?.name || "Guest"}
|
{t.attendee?.name || t.user?.name || "Guest"}
|
||||||
</div>
|
</div>
|
||||||
|
{t.attendee?.name && t.user?.name && t.attendee.name !== t.user.name && (
|
||||||
|
<div className="text-xs text-gray-500">Booked by {t.user.name}</div>
|
||||||
|
)}
|
||||||
<div className="text-xs text-gray-500">
|
<div className="text-xs text-gray-500">
|
||||||
{ticketLabel(t)}
|
{ticketLabel(t)}
|
||||||
</div>
|
</div>
|
||||||
@@ -1028,6 +1038,14 @@ function DoorTicketsPanel({ token, eventId }: any) {
|
|||||||
>
|
>
|
||||||
Send
|
Send
|
||||||
</button>
|
</button>
|
||||||
|
{canOfferTransfer(t, t.event, true) && (
|
||||||
|
<button
|
||||||
|
onClick={() => setTransferTarget(t)}
|
||||||
|
className="px-3 py-1 text-xs rounded border hover:bg-gray-50"
|
||||||
|
>
|
||||||
|
Transfer
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
))}
|
))}
|
||||||
@@ -1039,6 +1057,15 @@ function DoorTicketsPanel({ token, eventId }: any) {
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{transferTarget && (
|
||||||
|
<TransferTicketModal
|
||||||
|
ticket={transferTarget}
|
||||||
|
event={transferTarget.event}
|
||||||
|
token={token}
|
||||||
|
onClose={() => setTransferTarget(null)}
|
||||||
|
onDone={(msg) => { setTransferTarget(null); setNotice(msg); load(); }}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
{sendTarget && (
|
{sendTarget && (
|
||||||
<SendTicketsModal
|
<SendTicketsModal
|
||||||
open={true}
|
open={true}
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import { useRouter, useSearchParams } from "next/navigation";
|
|||||||
import { apiFetch, fetchAllUsers } from "@/lib/api";
|
import { apiFetch, fetchAllUsers } from "@/lib/api";
|
||||||
import { useDismissingState } from "@/hooks/useDismissingState";
|
import { useDismissingState } from "@/hooks/useDismissingState";
|
||||||
import { Mail, Users, Zap, Clock } from "lucide-react";
|
import { Mail, Users, Zap, Clock } from "lucide-react";
|
||||||
|
import { AllocationGroupFilter } from "@/components/shared/AllocationGroupFilter";
|
||||||
|
|
||||||
type Attendee = { id: string; name: string; email: string; pref: string };
|
type Attendee = { id: string; name: string; email: string; pref: string };
|
||||||
|
|
||||||
@@ -336,6 +337,7 @@ function EmailAttendeesPageInner() {
|
|||||||
const [subjectDirty, setSubjectDirty] = useState(false);
|
const [subjectDirty, setSubjectDirty] = useState(false);
|
||||||
const [bodyDirty, setBodyDirty] = useState(false);
|
const [bodyDirty, setBodyDirty] = useState(false);
|
||||||
const [status, setStatus] = useState<'any'|'paid'|'unpaid'|'partial_paid'|'cancelled'>("any");
|
const [status, setStatus] = useState<'any'|'paid'|'unpaid'|'partial_paid'|'cancelled'>("any");
|
||||||
|
const [groupId, setGroupId] = useState("");
|
||||||
// Attendees list and selection
|
// Attendees list and selection
|
||||||
const [attendees, setAttendees] = useState<Attendee[]>([]);
|
const [attendees, setAttendees] = useState<Attendee[]>([]);
|
||||||
const [selectedAttendeeIds, setSelectedAttendeeIds] = useState<string[]>([]);
|
const [selectedAttendeeIds, setSelectedAttendeeIds] = useState<string[]>([]);
|
||||||
@@ -420,7 +422,7 @@ function EmailAttendeesPageInner() {
|
|||||||
}
|
}
|
||||||
const payload: any = {
|
const payload: any = {
|
||||||
subject: subject || "(no subject)",
|
subject: subject || "(no subject)",
|
||||||
filter: { status: status !== 'any' ? status : undefined, attendeeIds: selectedAttendeeIds && selectedAttendeeIds.length ? selectedAttendeeIds : undefined },
|
filter: { status: status !== 'any' ? status : undefined, attendeeIds: selectedAttendeeIds && selectedAttendeeIds.length ? selectedAttendeeIds : undefined, allocationGroupId: groupId || undefined },
|
||||||
dryRun: true,
|
dryRun: true,
|
||||||
template: templateKey,
|
template: templateKey,
|
||||||
};
|
};
|
||||||
@@ -460,7 +462,7 @@ function EmailAttendeesPageInner() {
|
|||||||
setSending(true);
|
setSending(true);
|
||||||
const payload: any = {
|
const payload: any = {
|
||||||
subject,
|
subject,
|
||||||
filter: { status: status !== 'any' ? status : undefined, attendeeIds: selectedAttendeeIds && selectedAttendeeIds.length ? selectedAttendeeIds : undefined },
|
filter: { status: status !== 'any' ? status : undefined, attendeeIds: selectedAttendeeIds && selectedAttendeeIds.length ? selectedAttendeeIds : undefined, allocationGroupId: groupId || undefined },
|
||||||
template: templateKey,
|
template: templateKey,
|
||||||
};
|
};
|
||||||
if (templateKey !== 'tickets') {
|
if (templateKey !== 'tickets') {
|
||||||
@@ -607,6 +609,7 @@ function EmailAttendeesPageInner() {
|
|||||||
<option value="cancelled">Cancelled</option>
|
<option value="cancelled">Cancelled</option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
|
<AllocationGroupFilter token={token} eventId={eventId} value={groupId} onChange={setGroupId} />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{templateKey !== 'tickets' ? (
|
{templateKey !== 'tickets' ? (
|
||||||
@@ -659,7 +662,7 @@ function EmailAttendeesPageInner() {
|
|||||||
const whenIso = new Date(scheduledAtLocal).toISOString();
|
const whenIso = new Date(scheduledAtLocal).toISOString();
|
||||||
const payload = {
|
const payload = {
|
||||||
subject,
|
subject,
|
||||||
filter: { status: status !== 'any' ? status : undefined, attendeeIds: selectedAttendeeIds && selectedAttendeeIds.length ? selectedAttendeeIds : undefined },
|
filter: { status: status !== 'any' ? status : undefined, attendeeIds: selectedAttendeeIds && selectedAttendeeIds.length ? selectedAttendeeIds : undefined, allocationGroupId: groupId || undefined },
|
||||||
template: templateKey,
|
template: templateKey,
|
||||||
scheduledAt: whenIso,
|
scheduledAt: whenIso,
|
||||||
} as any;
|
} as any;
|
||||||
@@ -986,6 +989,16 @@ function AutomationsPanel({ events, token, onInfo, onError }:{ events: any[]; to
|
|||||||
const [enablePre, setEnablePre] = React.useState(true);
|
const [enablePre, setEnablePre] = React.useState(true);
|
||||||
const [enableFinal, setEnableFinal] = React.useState(true);
|
const [enableFinal, setEnableFinal] = React.useState(true);
|
||||||
const [enableThanks, setEnableThanks] = React.useState(true);
|
const [enableThanks, setEnableThanks] = React.useState(true);
|
||||||
|
// Sponsors of "sponsor a spot" events get their own thank-you.
|
||||||
|
const [enableSponsors, setEnableSponsors] = React.useState(true);
|
||||||
|
const [sponsorSubject, setSponsorSubject] = React.useState('Thank you for sponsoring a spot at {{event.title}}');
|
||||||
|
const [sponsorBody, setSponsorBody] = React.useState(`Hi {{name}}
|
||||||
|
|
||||||
|
Thank you for sponsoring a spot at {{event.title}}. Because of you, someone was able to be there who otherwise couldn't.
|
||||||
|
|
||||||
|
[add a highlight or two]
|
||||||
|
|
||||||
|
With gratitude`);
|
||||||
const [enablePromo, setEnablePromo] = React.useState(false);
|
const [enablePromo, setEnablePromo] = React.useState(false);
|
||||||
|
|
||||||
// Subjects/Bodies
|
// Subjects/Bodies
|
||||||
@@ -1061,6 +1074,11 @@ function AutomationsPanel({ events, token, onInfo, onError }:{ events: any[]; to
|
|||||||
if (thanksBody.trim().startsWith('<')) payload.html = thanksBody; else payload.text = thanksBody;
|
if (thanksBody.trim().startsWith('<')) payload.html = thanksBody; else payload.text = thanksBody;
|
||||||
jobs.push(payload);
|
jobs.push(payload);
|
||||||
}
|
}
|
||||||
|
if (currentEvent?.allowSponsorships && enableSponsors && sponsorSubject.trim() && sponsorBody.trim() && thanksWhen) {
|
||||||
|
const payload: any = { subject: sponsorSubject, scheduledAt: new Date(thanksWhen).toISOString(), audience: 'sponsors' };
|
||||||
|
if (sponsorBody.trim().startsWith('<')) payload.html = sponsorBody; else payload.text = sponsorBody;
|
||||||
|
jobs.push(payload);
|
||||||
|
}
|
||||||
if (enablePromo && promoSubject.trim() && promoBody.trim() && promoWhen) {
|
if (enablePromo && promoSubject.trim() && promoBody.trim() && promoWhen) {
|
||||||
const payload: any = { subject: promoSubject, scheduledAt: new Date(promoWhen).toISOString(), promoEventId: promoEventId || undefined };
|
const payload: any = { subject: promoSubject, scheduledAt: new Date(promoWhen).toISOString(), promoEventId: promoEventId || undefined };
|
||||||
if (promoBody.trim().startsWith('<')) payload.html = promoBody; else payload.text = promoBody;
|
if (promoBody.trim().startsWith('<')) payload.html = promoBody; else payload.text = promoBody;
|
||||||
@@ -1157,6 +1175,20 @@ function AutomationsPanel({ events, token, onInfo, onError }:{ events: any[]; to
|
|||||||
<textarea className="w-full border rounded px-3 py-2 text-sm" rows={5} value={thanksBody} onChange={e => setThanksBody(e.target.value)} />
|
<textarea className="w-full border rounded px-3 py-2 text-sm" rows={5} value={thanksBody} onChange={e => setThanksBody(e.target.value)} />
|
||||||
</fieldset>
|
</fieldset>
|
||||||
|
|
||||||
|
{currentEvent?.allowSponsorships && (
|
||||||
|
<fieldset className="border rounded p-3">
|
||||||
|
<legend className="text-sm font-medium">Thank Your Sponsors</legend>
|
||||||
|
<label className="inline-flex items-center gap-2 text-sm mb-2">
|
||||||
|
<input type="checkbox" checked={enableSponsors} onChange={e => setEnableSponsors(e.target.checked)} /> Enable
|
||||||
|
</label>
|
||||||
|
<p className="text-xs text-gray-500 mb-2">Goes to everyone who sponsored a spot at this event, at the same time as the thank-you above.</p>
|
||||||
|
<label className="block text-xs text-gray-600 mb-1">Subject</label>
|
||||||
|
<input className="w-full border rounded px-3 py-2 text-sm" value={sponsorSubject} onChange={e => setSponsorSubject(e.target.value)} />
|
||||||
|
<label className="block text-xs text-gray-600 mb-1 mt-2">Message</label>
|
||||||
|
<textarea className="w-full border rounded px-3 py-2 text-sm" rows={5} value={sponsorBody} onChange={e => setSponsorBody(e.target.value)} />
|
||||||
|
</fieldset>
|
||||||
|
)}
|
||||||
|
|
||||||
<fieldset className="border rounded p-3">
|
<fieldset className="border rounded p-3">
|
||||||
<legend className="text-sm font-medium">Next Event Promo</legend>
|
<legend className="text-sm font-medium">Next Event Promo</legend>
|
||||||
<div className="flex items-center gap-4 mb-2">
|
<div className="flex items-center gap-4 mb-2">
|
||||||
|
|||||||
@@ -8,9 +8,12 @@ import { apiFetch, resolveToApiOrigin } from "@/lib/api";
|
|||||||
import { useDismissingState } from "@/hooks/useDismissingState";
|
import { useDismissingState } from "@/hooks/useDismissingState";
|
||||||
import { useSiteSettings } from "@/contexts/SiteSettingsContext";
|
import { useSiteSettings } from "@/contexts/SiteSettingsContext";
|
||||||
import { Calendar } from "lucide-react";
|
import { Calendar } from "lucide-react";
|
||||||
|
import { ChoicesEditor } from "@/components/shared/FormFieldExtras";
|
||||||
|
|
||||||
// ─── helpers ────────────────────────────────────────────────────────────────
|
// ─── helpers ────────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
const cleanChoices = (opts: unknown): string[] => (Array.isArray(opts) ? opts.map(o => String(o).trim()).filter(Boolean) : []);
|
||||||
|
|
||||||
function toLocalDT(input: string | Date | null | undefined): string {
|
function toLocalDT(input: string | Date | null | undefined): string {
|
||||||
if (!input) return "";
|
if (!input) return "";
|
||||||
const d = new Date(input);
|
const d = new Date(input);
|
||||||
@@ -40,7 +43,7 @@ function DTInput({ label, value, onChange, hint, required }: { label: string; va
|
|||||||
|
|
||||||
// ─── types ───────────────────────────────────────────────────────────────────
|
// ─── types ───────────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
type FormFieldType = "yes_no" | "text" | "date" | "numeric" | "statement" | "paragraph";
|
type FormFieldType = "yes_no" | "text" | "date" | "numeric" | "statement" | "paragraph" | "rating" | "multiple_choice";
|
||||||
type EventFormDef = { isRequired: boolean; fields: { id?: string; type: FormFieldType; label: string; isRequired?: boolean; order?: number; helpText?: string | null; options?: any }[] };
|
type EventFormDef = { isRequired: boolean; fields: { id?: string; type: FormFieldType; label: string; isRequired?: boolean; order?: number; helpText?: string | null; options?: any }[] };
|
||||||
|
|
||||||
type Tier = { id?: string; deadline: string; price: string; stockLimit: string; order?: number };
|
type Tier = { id?: string; deadline: string; price: string; stockLimit: string; order?: number };
|
||||||
@@ -97,7 +100,13 @@ function UploadImageButton({ onUploaded, label = "Upload image" }: { onUploaded:
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function FormBuilder({ value, onChange }: { value: EventFormDef; onChange: (v: EventFormDef) => void }) {
|
function FormBuilder({ value, onChange, title = "Registration Form Fields", gateLabel = "Required before tickets generate" }: {
|
||||||
|
value: EventFormDef;
|
||||||
|
onChange: (v: EventFormDef) => void;
|
||||||
|
title?: string;
|
||||||
|
/** Label of the "form must be filled in" switch; null hides it (feedback forms). */
|
||||||
|
gateLabel?: string | null;
|
||||||
|
}) {
|
||||||
const fields = value.fields || [];
|
const fields = value.fields || [];
|
||||||
const add = (type: FormFieldType) => onChange({ ...value, fields: [...fields, { type, label: "", isRequired: false, helpText: "" }] });
|
const add = (type: FormFieldType) => onChange({ ...value, fields: [...fields, { type, label: "", isRequired: false, helpText: "" }] });
|
||||||
const upd = (idx: number, patch: any) => { const c = fields.slice(); c[idx] = { ...c[idx], ...patch }; onChange({ ...value, fields: c }); };
|
const upd = (idx: number, patch: any) => { const c = fields.slice(); c[idx] = { ...c[idx], ...patch }; onChange({ ...value, fields: c }); };
|
||||||
@@ -107,15 +116,17 @@ function FormBuilder({ value, onChange }: { value: EventFormDef; onChange: (v: E
|
|||||||
if (t < 0 || t >= c.length) return;
|
if (t < 0 || t >= c.length) return;
|
||||||
[c[idx], c[t]] = [c[t], c[idx]]; onChange({ ...value, fields: c });
|
[c[idx], c[t]] = [c[t], c[idx]]; onChange({ ...value, fields: c });
|
||||||
};
|
};
|
||||||
const typeLabel = (t: FormFieldType) => ({ text: "Text", numeric: "Number", date: "Date", yes_no: "Yes/No", statement: "Statement", paragraph: "Heading" }[t] || t);
|
const typeLabel = (t: FormFieldType) => ({ text: "Text", numeric: "Number", date: "Date", yes_no: "Yes/No", statement: "Statement", paragraph: "Heading", rating: "Rating", multiple_choice: "Multiple choice" }[t] || t);
|
||||||
return (
|
return (
|
||||||
<div className="border rounded-lg p-3 bg-gray-50">
|
<div className="border rounded-lg p-3 bg-gray-50">
|
||||||
<div className="flex items-center justify-between mb-3">
|
<div className="flex items-center justify-between mb-3">
|
||||||
<div className="text-sm font-semibold">Registration Form Fields</div>
|
<div className="text-sm font-semibold">{title}</div>
|
||||||
<label className="text-xs flex items-center gap-1.5 cursor-pointer">
|
{gateLabel && (
|
||||||
<input type="checkbox" checked={!!value.isRequired} onChange={e => onChange({ ...value, isRequired: e.target.checked })} />
|
<label className="text-xs flex items-center gap-1.5 cursor-pointer">
|
||||||
Required before tickets generate
|
<input type="checkbox" checked={!!value.isRequired} onChange={e => onChange({ ...value, isRequired: e.target.checked })} />
|
||||||
</label>
|
{gateLabel}
|
||||||
|
</label>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
{fields.length === 0
|
{fields.length === 0
|
||||||
? <p className="text-xs text-gray-500 italic mb-3">No fields yet.</p>
|
? <p className="text-xs text-gray-500 italic mb-3">No fields yet.</p>
|
||||||
@@ -134,7 +145,8 @@ function FormBuilder({ value, onChange }: { value: EventFormDef; onChange: (v: E
|
|||||||
<div className="flex flex-wrap gap-2 mb-1.5">
|
<div className="flex flex-wrap gap-2 mb-1.5">
|
||||||
<select className="border rounded px-2 py-1 text-xs" value={f.type} onChange={e => upd(idx, { type: e.target.value })}>
|
<select className="border rounded px-2 py-1 text-xs" value={f.type} onChange={e => upd(idx, { type: e.target.value })}>
|
||||||
<option value="text">Text</option><option value="numeric">Number</option><option value="date">Date</option>
|
<option value="text">Text</option><option value="numeric">Number</option><option value="date">Date</option>
|
||||||
<option value="yes_no">Yes/No</option><option value="statement">Statement</option><option value="paragraph">Heading+para</option>
|
<option value="yes_no">Yes/No</option><option value="rating">Rating (1–5 stars)</option><option value="multiple_choice">Multiple choice</option>
|
||||||
|
<option value="statement">Statement</option><option value="paragraph">Heading+para</option>
|
||||||
</select>
|
</select>
|
||||||
{f.type !== "statement" && f.type !== "paragraph" && (
|
{f.type !== "statement" && f.type !== "paragraph" && (
|
||||||
<label className="text-xs flex items-center gap-1 cursor-pointer">
|
<label className="text-xs flex items-center gap-1 cursor-pointer">
|
||||||
@@ -143,6 +155,7 @@ function FormBuilder({ value, onChange }: { value: EventFormDef; onChange: (v: E
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
<input className="border rounded px-2 py-1 text-sm w-full mb-1" placeholder={f.type === "paragraph" ? "Heading text" : "Label"} value={f.label} onChange={e => upd(idx, { label: e.target.value })} />
|
<input className="border rounded px-2 py-1 text-sm w-full mb-1" placeholder={f.type === "paragraph" ? "Heading text" : "Label"} value={f.label} onChange={e => upd(idx, { label: e.target.value })} />
|
||||||
|
{f.type === "multiple_choice" && <ChoicesEditor options={f.options} onChange={opts => upd(idx, { options: opts })} />}
|
||||||
{f.type === "paragraph"
|
{f.type === "paragraph"
|
||||||
? <textarea className="border rounded px-2 py-1 text-xs w-full" rows={2} placeholder="Body text" value={f.helpText || ""} onChange={e => upd(idx, { helpText: e.target.value })} />
|
? <textarea className="border rounded px-2 py-1 text-xs w-full" rows={2} placeholder="Body text" value={f.helpText || ""} onChange={e => upd(idx, { helpText: e.target.value })} />
|
||||||
: f.type !== "statement"
|
: f.type !== "statement"
|
||||||
@@ -154,6 +167,8 @@ function FormBuilder({ value, onChange }: { value: EventFormDef; onChange: (v: E
|
|||||||
)}
|
)}
|
||||||
<div className="flex gap-2 flex-wrap">
|
<div className="flex gap-2 flex-wrap">
|
||||||
<button type="button" className="text-xs px-3 py-1.5 rounded bg-brand-600 text-white hover:bg-brand-700" onClick={() => add("text")}>+ Question</button>
|
<button type="button" className="text-xs px-3 py-1.5 rounded bg-brand-600 text-white hover:bg-brand-700" onClick={() => add("text")}>+ Question</button>
|
||||||
|
<button type="button" className="text-xs px-3 py-1.5 rounded bg-gray-200 text-gray-700" onClick={() => add("rating")}>+ Rating</button>
|
||||||
|
<button type="button" className="text-xs px-3 py-1.5 rounded bg-gray-200 text-gray-700" onClick={() => add("multiple_choice")}>+ Multiple choice</button>
|
||||||
<button type="button" className="text-xs px-3 py-1.5 rounded bg-gray-200 text-gray-700" onClick={() => add("statement")}>+ Statement</button>
|
<button type="button" className="text-xs px-3 py-1.5 rounded bg-gray-200 text-gray-700" onClick={() => add("statement")}>+ Statement</button>
|
||||||
<button type="button" className="text-xs px-3 py-1.5 rounded bg-gray-200 text-gray-700" onClick={() => add("paragraph")}>+ Heading</button>
|
<button type="button" className="text-xs px-3 py-1.5 rounded bg-gray-200 text-gray-700" onClick={() => add("paragraph")}>+ Heading</button>
|
||||||
</div>
|
</div>
|
||||||
@@ -759,8 +774,8 @@ function NotifyRecipientsManager({ eventId, creator, initialRecipients }: { even
|
|||||||
|
|
||||||
// ─── steps ───────────────────────────────────────────────────────────────────
|
// ─── steps ───────────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
const STEPS = ["Basic Details", "Items & Pricing", "Sections", "Form", "Visibility", "Notifications", "Attachments"] as const;
|
const STEPS = ["Basic Details", "Items & Pricing", "Sections", "Form", "Visibility", "Notifications", "Attachments", "Feedback"] as const;
|
||||||
type StepIdx = 0 | 1 | 2 | 3 | 4 | 5 | 6;
|
type StepIdx = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7;
|
||||||
const PRICING_SUBSTEPS = ["Options", "Variants", "Early Birds"] as const;
|
const PRICING_SUBSTEPS = ["Options", "Variants", "Early Birds"] as const;
|
||||||
type PricingSubstep = 0 | 1 | 2;
|
type PricingSubstep = 0 | 1 | 2;
|
||||||
|
|
||||||
@@ -773,6 +788,8 @@ interface EventDraft {
|
|||||||
requiresParentalConsent: boolean; consentText: string;
|
requiresParentalConsent: boolean; consentText: string;
|
||||||
consentCollectMedical: boolean; consentCollectEmergency: boolean; consentCollectPhoto: boolean;
|
consentCollectMedical: boolean; consentCollectEmergency: boolean; consentCollectPhoto: boolean;
|
||||||
waitlistEnabled: boolean; waitlistOfferHours: string; waitlistPartialOffers: boolean;
|
waitlistEnabled: boolean; waitlistOfferHours: string; waitlistPartialOffers: boolean;
|
||||||
|
allowTicketTransfer: boolean; collectGender: boolean;
|
||||||
|
allowSponsorships: boolean; sponsorshipGoalSpots: string; showSponsorshipProgress: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
const blankDraft = (location = ""): EventDraft => ({
|
const blankDraft = (location = ""): EventDraft => ({
|
||||||
@@ -784,6 +801,8 @@ const blankDraft = (location = ""): EventDraft => ({
|
|||||||
requiresParentalConsent: false, consentText: "",
|
requiresParentalConsent: false, consentText: "",
|
||||||
consentCollectMedical: true, consentCollectEmergency: true, consentCollectPhoto: true,
|
consentCollectMedical: true, consentCollectEmergency: true, consentCollectPhoto: true,
|
||||||
waitlistEnabled: false, waitlistOfferHours: "24", waitlistPartialOffers: true,
|
waitlistEnabled: false, waitlistOfferHours: "24", waitlistPartialOffers: true,
|
||||||
|
allowTicketTransfer: true, collectGender: false,
|
||||||
|
allowSponsorships: false, sponsorshipGoalSpots: "", showSponsorshipProgress: true,
|
||||||
});
|
});
|
||||||
|
|
||||||
const blankOptions = (): OptionDraft[] => [
|
const blankOptions = (): OptionDraft[] => [
|
||||||
@@ -822,6 +841,9 @@ function EventModal({ mode, event: ev, onClose, onSuccess }: EventModalProps) {
|
|||||||
requiresParentalConsent: !!ev.requiresParentalConsent, consentText: ev.consentText || "",
|
requiresParentalConsent: !!ev.requiresParentalConsent, consentText: ev.consentText || "",
|
||||||
consentCollectMedical: !!ev.consentCollectMedical, consentCollectEmergency: !!ev.consentCollectEmergency, consentCollectPhoto: !!ev.consentCollectPhoto,
|
consentCollectMedical: !!ev.consentCollectMedical, consentCollectEmergency: !!ev.consentCollectEmergency, consentCollectPhoto: !!ev.consentCollectPhoto,
|
||||||
waitlistEnabled: !!ev.waitlistEnabled, waitlistOfferHours: String(ev.waitlistOfferHours ?? 24), waitlistPartialOffers: ev.waitlistPartialOffers !== false,
|
waitlistEnabled: !!ev.waitlistEnabled, waitlistOfferHours: String(ev.waitlistOfferHours ?? 24), waitlistPartialOffers: ev.waitlistPartialOffers !== false,
|
||||||
|
allowTicketTransfer: ev.allowTicketTransfer !== false,
|
||||||
|
collectGender: !!ev.collectGender,
|
||||||
|
allowSponsorships: !!ev.allowSponsorships, sponsorshipGoalSpots: ev.sponsorshipGoalSpots ? String(ev.sponsorshipGoalSpots) : "", showSponsorshipProgress: ev.showSponsorshipProgress !== false,
|
||||||
contactName: ev.contactName || "", contactPhone: ev.contactPhone || "", contactEmail: ev.contactEmail || "",
|
contactName: ev.contactName || "", contactPhone: ev.contactPhone || "", contactEmail: ev.contactEmail || "",
|
||||||
location: ev.location || "",
|
location: ev.location || "",
|
||||||
} : blankDraft(settings.org_address || ""));
|
} : blankDraft(settings.org_address || ""));
|
||||||
@@ -872,10 +894,57 @@ function EventModal({ mode, event: ev, onClose, onSuccess }: EventModalProps) {
|
|||||||
if (mode !== "edit" || !ev?.id || formLoadedRef.current) return;
|
if (mode !== "edit" || !ev?.id || formLoadedRef.current) return;
|
||||||
apiFetch<any>(`/api/events/${ev.id}`).then(full => {
|
apiFetch<any>(`/api/events/${ev.id}`).then(full => {
|
||||||
const f = full?.form;
|
const f = full?.form;
|
||||||
if (f) setFormDef({ isRequired: !!f.isRequired, fields: (f.fields || []).map((x: any) => ({ id: x.id, type: x.type, label: x.label, isRequired: !!x.isRequired, helpText: x.helpText || "" })) });
|
if (f) setFormDef({ isRequired: !!f.isRequired, fields: (f.fields || []).map((x: any) => ({ id: x.id, type: x.type, label: x.label, isRequired: !!x.isRequired, helpText: x.helpText || "", options: x.options || undefined })) });
|
||||||
}).catch(() => {}).finally(() => { formLoadedRef.current = true; });
|
}).catch(() => {}).finally(() => { formLoadedRef.current = true; });
|
||||||
}, [mode, ev?.id]);
|
}, [mode, ev?.id]);
|
||||||
|
|
||||||
|
// ── post-event feedback ──
|
||||||
|
const [fbEnabled, setFbEnabled] = useState(false);
|
||||||
|
const [fbDef, setFbDef] = useState<EventFormDef>({ isRequired: false, fields: [] });
|
||||||
|
const [fbSettings, setFbSettings] = useState({ sendAt: "", audience: "checked_in", anonymous: false, intro: "" });
|
||||||
|
const [fbMeta, setFbMeta] = useState<{ sentAt: string | null; invited: number; responses: number } | null>(null);
|
||||||
|
useEffect(() => {
|
||||||
|
if (mode !== "edit" || !ev?.id || !token) return;
|
||||||
|
apiFetch<any>(`/api/feedback/event/${ev.id}`, { authToken: token }).then(f => {
|
||||||
|
if (!f) return;
|
||||||
|
setFbEnabled(true);
|
||||||
|
setFbDef({ isRequired: false, fields: (f.fields || []).map((x: any) => ({ id: x.id, type: x.type, label: x.label, isRequired: !!x.isRequired, helpText: x.helpText || "", options: x.options || undefined })) });
|
||||||
|
setFbSettings({ sendAt: toLocalDT(f.sendAt), audience: f.audience || "checked_in", anonymous: !!f.anonymous, intro: f.intro || "" });
|
||||||
|
setFbMeta({ sentAt: f.sentAt, invited: f.invited, responses: f.responses });
|
||||||
|
}).catch(() => {});
|
||||||
|
}, [mode, ev?.id, token]);
|
||||||
|
const enableFeedback = (on: boolean) => {
|
||||||
|
setFbEnabled(on);
|
||||||
|
if (on && fbDef.fields.length === 0) {
|
||||||
|
setFbDef({ isRequired: false, fields: [
|
||||||
|
{ type: "rating", label: "Overall, how would you rate the event?", isRequired: true, helpText: "" },
|
||||||
|
{ type: "rating", label: "How would you rate the organisation?", isRequired: false, helpText: "" },
|
||||||
|
{ type: "text", label: "What did you enjoy most?", isRequired: false, helpText: "" },
|
||||||
|
{ type: "text", label: "What could we do better?", isRequired: false, helpText: "" },
|
||||||
|
] });
|
||||||
|
}
|
||||||
|
if (on && !fbSettings.sendAt && draft.endDate) {
|
||||||
|
const next = new Date(draft.endDate);
|
||||||
|
next.setDate(next.getDate() + 1);
|
||||||
|
next.setHours(9, 0, 0, 0);
|
||||||
|
setFbSettings(s => ({ ...s, sendAt: toLocalDT(next) }));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
const saveFeedback = async (eventId: string) => {
|
||||||
|
if (fbEnabled) {
|
||||||
|
await apiFetch(`/api/feedback/event/${eventId}`, {
|
||||||
|
method: "PUT", authToken: token || undefined,
|
||||||
|
body: {
|
||||||
|
sendAt: fbSettings.sendAt ? new Date(fbSettings.sendAt).toISOString() : null,
|
||||||
|
audience: fbSettings.audience, anonymous: fbSettings.anonymous, intro: fbSettings.intro || null,
|
||||||
|
fields: fbDef.fields.filter(f => f.label?.trim()).map((f, i) => ({ type: f.type, label: f.label, isRequired: !!f.isRequired, order: i, helpText: f.helpText || null, options: f.type === "multiple_choice" ? cleanChoices(f.options) : undefined })),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
} else if (fbMeta) {
|
||||||
|
await apiFetch(`/api/feedback/event/${eventId}`, { method: "DELETE", authToken: token || undefined });
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
const upd = (patch: Partial<EventDraft>) => setDraft(d => ({ ...d, ...patch }));
|
const upd = (patch: Partial<EventDraft>) => setDraft(d => ({ ...d, ...patch }));
|
||||||
|
|
||||||
// ── auto-fill first option's price from the event base price (create mode only, until the
|
// ── auto-fill first option's price from the event base price (create mode only, until the
|
||||||
@@ -914,7 +983,7 @@ function EventModal({ mode, event: ev, onClose, onSuccess }: EventModalProps) {
|
|||||||
if (mode === "edit") {
|
if (mode === "edit") {
|
||||||
await apiFetch(`/api/events/${eventId}`, {
|
await apiFetch(`/api/events/${eventId}`, {
|
||||||
method: "PUT", authToken: token || undefined,
|
method: "PUT", authToken: token || undefined,
|
||||||
body: { form: { isRequired: !!formDef.isRequired, fields: formDef.fields.filter(f => f.label?.trim()).map((f, i) => ({ type: f.type, label: f.label, isRequired: !!f.isRequired, order: i, helpText: f.helpText || null })) } }
|
body: { form: { isRequired: !!formDef.isRequired, fields: formDef.fields.filter(f => f.label?.trim()).map((f, i) => ({ type: f.type, label: f.label, isRequired: !!f.isRequired, order: i, helpText: f.helpText || null, options: f.type === "multiple_choice" ? cleanChoices(f.options) : undefined })) } }
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
@@ -965,7 +1034,7 @@ function EventModal({ mode, event: ev, onClose, onSuccess }: EventModalProps) {
|
|||||||
// Handle form save (edit only)
|
// Handle form save (edit only)
|
||||||
await apiFetch(`/api/events/${eventId}`, {
|
await apiFetch(`/api/events/${eventId}`, {
|
||||||
method: "PUT", authToken: token || undefined,
|
method: "PUT", authToken: token || undefined,
|
||||||
body: { form: { isRequired: !!formDef.isRequired, fields: formDef.fields.filter(f => f.label?.trim()).map((f, i) => ({ type: f.type, label: f.label, isRequired: !!f.isRequired, order: i, helpText: f.helpText || null })) } }
|
body: { form: { isRequired: !!formDef.isRequired, fields: formDef.fields.filter(f => f.label?.trim()).map((f, i) => ({ type: f.type, label: f.label, isRequired: !!f.isRequired, order: i, helpText: f.helpText || null, options: f.type === "multiple_choice" ? cleanChoices(f.options) : undefined })) } }
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
// New option added during edit
|
// New option added during edit
|
||||||
@@ -1102,6 +1171,11 @@ function EventModal({ mode, event: ev, onClose, onSuccess }: EventModalProps) {
|
|||||||
consentCollectEmergency: draft.consentCollectEmergency,
|
consentCollectEmergency: draft.consentCollectEmergency,
|
||||||
consentCollectPhoto: draft.consentCollectPhoto,
|
consentCollectPhoto: draft.consentCollectPhoto,
|
||||||
waitlistEnabled: draft.waitlistEnabled,
|
waitlistEnabled: draft.waitlistEnabled,
|
||||||
|
allowTicketTransfer: draft.allowTicketTransfer,
|
||||||
|
collectGender: draft.collectGender,
|
||||||
|
allowSponsorships: draft.allowSponsorships,
|
||||||
|
sponsorshipGoalSpots: draft.allowSponsorships && draft.sponsorshipGoalSpots ? parseInt(draft.sponsorshipGoalSpots, 10) || null : null,
|
||||||
|
showSponsorshipProgress: draft.showSponsorshipProgress,
|
||||||
waitlistOfferHours: parseInt(draft.waitlistOfferHours, 10) || 24,
|
waitlistOfferHours: parseInt(draft.waitlistOfferHours, 10) || 24,
|
||||||
waitlistPartialOffers: draft.waitlistPartialOffers,
|
waitlistPartialOffers: draft.waitlistPartialOffers,
|
||||||
contactName: draft.contactName || undefined,
|
contactName: draft.contactName || undefined,
|
||||||
@@ -1115,13 +1189,15 @@ function EventModal({ mode, event: ev, onClose, onSuccess }: EventModalProps) {
|
|||||||
await apiFetch(`/api/events/${ev.id}`, { method: "PUT", authToken: token || undefined, body });
|
await apiFetch(`/api/events/${ev.id}`, { method: "PUT", authToken: token || undefined, body });
|
||||||
await saveOptions(ev.id);
|
await saveOptions(ev.id);
|
||||||
// Form is saved inside saveOptions for edit mode; avoid double call
|
// Form is saved inside saveOptions for edit mode; avoid double call
|
||||||
|
await saveFeedback(ev.id);
|
||||||
} else {
|
} else {
|
||||||
if (formDef.isRequired || formDef.fields.length > 0) {
|
if (formDef.isRequired || formDef.fields.length > 0) {
|
||||||
body.form = { isRequired: !!formDef.isRequired, fields: formDef.fields.filter(f => f.label?.trim()).map((f, i) => ({ type: f.type, label: f.label, isRequired: !!f.isRequired, order: i, helpText: f.helpText || null })) };
|
body.form = { isRequired: !!formDef.isRequired, fields: formDef.fields.filter(f => f.label?.trim()).map((f, i) => ({ type: f.type, label: f.label, isRequired: !!f.isRequired, order: i, helpText: f.helpText || null, options: f.type === "multiple_choice" ? cleanChoices(f.options) : undefined })) };
|
||||||
}
|
}
|
||||||
const created: any = await apiFetch("/api/events", { method: "POST", authToken: token || undefined, body });
|
const created: any = await apiFetch("/api/events", { method: "POST", authToken: token || undefined, body });
|
||||||
if (created?.id) {
|
if (created?.id) {
|
||||||
await saveOptions(created.id);
|
await saveOptions(created.id);
|
||||||
|
await saveFeedback(created.id);
|
||||||
// Fetch event to get final option IDs for sections
|
// Fetch event to get final option IDs for sections
|
||||||
const fullEvent: any = await apiFetch(`/api/events/${created.id}`).catch(() => null);
|
const fullEvent: any = await apiFetch(`/api/events/${created.id}`).catch(() => null);
|
||||||
const createdOptions = fullEvent?.eventOptions || [];
|
const createdOptions = fullEvent?.eventOptions || [];
|
||||||
@@ -1345,6 +1421,46 @@ function EventModal({ mode, event: ev, onClose, onSuccess }: EventModalProps) {
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{step === 7 && (
|
||||||
|
<div className="space-y-3">
|
||||||
|
<p className="text-xs text-gray-500">Ask people what they thought, automatically after the event. Responses appear in Reports → Feedback summary.</p>
|
||||||
|
<label className="flex items-start gap-2 text-sm cursor-pointer">
|
||||||
|
<input type="checkbox" className="mt-0.5" checked={fbEnabled} onChange={e => enableFeedback(e.target.checked)} />
|
||||||
|
<span><strong>Send a feedback form after the event</strong></span>
|
||||||
|
</label>
|
||||||
|
{fbEnabled && (
|
||||||
|
<>
|
||||||
|
{fbMeta?.sentAt && (
|
||||||
|
<div className="text-xs rounded bg-green-50 text-green-800 p-2">Sent {new Date(fbMeta.sentAt).toLocaleString()} to {fbMeta.invited} {fbMeta.invited === 1 ? "person" : "people"} · {fbMeta.responses} response(s).{fbMeta.responses > 0 ? " The questions can't be changed now that people have answered." : ""}</div>
|
||||||
|
)}
|
||||||
|
<div className="grid sm:grid-cols-2 gap-3">
|
||||||
|
<div>
|
||||||
|
<label className="block text-xs text-gray-600 mb-1">Send at</label>
|
||||||
|
<input type="datetime-local" className="border rounded px-2 py-1.5 text-sm w-full" value={fbSettings.sendAt} disabled={!!fbMeta?.sentAt} onChange={e => setFbSettings(s => ({ ...s, sendAt: e.target.value }))} />
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<label className="block text-xs text-gray-600 mb-1">Send to</label>
|
||||||
|
<select className="border rounded px-2 py-1.5 text-sm w-full" value={fbSettings.audience} onChange={e => setFbSettings(s => ({ ...s, audience: e.target.value }))}>
|
||||||
|
<option value="checked_in">Everyone who checked in</option>
|
||||||
|
<option value="all">Everyone registered</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<label className="flex items-start gap-2 text-sm cursor-pointer">
|
||||||
|
<input type="checkbox" className="mt-0.5" checked={fbSettings.anonymous} onChange={e => setFbSettings(s => ({ ...s, anonymous: e.target.checked }))} />
|
||||||
|
<span>Anonymous — answers aren't linked to people's names</span>
|
||||||
|
</label>
|
||||||
|
<div>
|
||||||
|
<label className="block text-xs text-gray-600 mb-1">Intro (optional)</label>
|
||||||
|
<textarea className="border rounded px-2 py-1.5 text-sm w-full" rows={2} value={fbSettings.intro} onChange={e => setFbSettings(s => ({ ...s, intro: e.target.value }))} placeholder="Thanks for coming! Tell us how it went." />
|
||||||
|
</div>
|
||||||
|
<p className="text-xs text-gray-500">Anyone who hasn't answered gets one reminder 3 days later.</p>
|
||||||
|
<FormBuilder value={fbDef} onChange={setFbDef} title="Feedback questions" gateLabel={null} />
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
{/* ── Step 4: Visibility ── */}
|
{/* ── Step 4: Visibility ── */}
|
||||||
{step === 4 && (
|
{step === 4 && (
|
||||||
<div className="space-y-3">
|
<div className="space-y-3">
|
||||||
@@ -1362,6 +1478,12 @@ function EventModal({ mode, event: ev, onClose, onSuccess }: EventModalProps) {
|
|||||||
<input type="checkbox" className="mt-0.5" checked={draft.allowNamedAttendees} onChange={e => upd({ allowNamedAttendees: e.target.checked })} />
|
<input type="checkbox" className="mt-0.5" checked={draft.allowNamedAttendees} onChange={e => upd({ allowNamedAttendees: e.target.checked })} />
|
||||||
<span><strong>Named attendees (group tickets)</strong> — someone registering several people can give each a name, so each gets their own ticket and attendee form</span>
|
<span><strong>Named attendees (group tickets)</strong> — someone registering several people can give each a name, so each gets their own ticket and attendee form</span>
|
||||||
</label>
|
</label>
|
||||||
|
{(draft.allowNamedAttendees || draft.requiresParentalConsent) && (
|
||||||
|
<label className="flex items-start gap-2 text-sm cursor-pointer ml-6">
|
||||||
|
<input type="checkbox" className="mt-0.5" checked={draft.collectGender} onChange={e => upd({ collectGender: e.target.checked })} />
|
||||||
|
<span><strong>Ask each person's gender</strong> — needed to split rooms or cabins by gender (Rooms & groups)</span>
|
||||||
|
</label>
|
||||||
|
)}
|
||||||
{mode === "edit" && (
|
{mode === "edit" && (
|
||||||
<label className="flex items-start gap-2 text-sm cursor-pointer">
|
<label className="flex items-start gap-2 text-sm cursor-pointer">
|
||||||
<input type="checkbox" className="mt-0.5" checked={draft.isActive} onChange={e => upd({ isActive: e.target.checked })} />
|
<input type="checkbox" className="mt-0.5" checked={draft.isActive} onChange={e => upd({ isActive: e.target.checked })} />
|
||||||
@@ -1391,6 +1513,35 @@ function EventModal({ mode, event: ev, onClose, onSuccess }: EventModalProps) {
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div className="border rounded-lg p-4 bg-gray-50 space-y-3">
|
||||||
|
<div className="text-xs font-semibold text-gray-500 uppercase tracking-wide mb-1">Sponsor a spot</div>
|
||||||
|
<label className="flex items-start gap-2 text-sm cursor-pointer">
|
||||||
|
<input type="checkbox" className="mt-0.5" checked={draft.allowSponsorships} onChange={e => upd({ allowSponsorships: e.target.checked })} />
|
||||||
|
<span><strong>Allow sponsorships</strong> — a "Sponsor a spot" button on the event page lets people pay for spots (or any amount) for those who can't afford to come. The money goes into a sponsorship pool you assign under Payments → Donations</span>
|
||||||
|
</label>
|
||||||
|
{draft.allowSponsorships && (
|
||||||
|
<>
|
||||||
|
<label className="flex items-center gap-2 text-sm">
|
||||||
|
Goal
|
||||||
|
<input type="number" min="1" className="border rounded px-2 py-1 text-sm w-20" value={draft.sponsorshipGoalSpots} onChange={e => upd({ sponsorshipGoalSpots: e.target.value })} placeholder="—" />
|
||||||
|
spots (optional)
|
||||||
|
</label>
|
||||||
|
<label className="flex items-start gap-2 text-sm cursor-pointer">
|
||||||
|
<input type="checkbox" className="mt-0.5" checked={draft.showSponsorshipProgress} onChange={e => upd({ showSponsorshipProgress: e.target.checked })} />
|
||||||
|
<span>Show progress on the event page ("12 of 20 spots sponsored")</span>
|
||||||
|
</label>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="border rounded-lg p-4 bg-gray-50 space-y-3">
|
||||||
|
<div className="text-xs font-semibold text-gray-500 uppercase tracking-wide mb-1">Ticket transfer</div>
|
||||||
|
<label className="flex items-start gap-2 text-sm cursor-pointer">
|
||||||
|
<input type="checkbox" className="mt-0.5" checked={draft.allowTicketTransfer} onChange={e => upd({ allowTicketTransfer: e.target.checked })} />
|
||||||
|
<span><strong>Let people transfer their tickets</strong> — before the event, a ticket that hasn't been scanned can be handed to someone else, who gets a new QR code (supervisors can always transfer)</span>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div className="border rounded-lg p-4 bg-gray-50 space-y-3">
|
<div className="border rounded-lg p-4 bg-gray-50 space-y-3">
|
||||||
<div className="text-xs font-semibold text-gray-500 uppercase tracking-wide mb-1">Youth event</div>
|
<div className="text-xs font-semibold text-gray-500 uppercase tracking-wide mb-1">Youth event</div>
|
||||||
<label className="flex items-start gap-2 text-sm cursor-pointer">
|
<label className="flex items-start gap-2 text-sm cursor-pointer">
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
import { ExtraFieldInput, isExtraFieldType, ChoicesEditor } from "@/components/shared/FormFieldExtras";
|
||||||
|
|
||||||
import React, { useEffect, useMemo, useState } from "react";
|
import React, { useEffect, useMemo, useState } from "react";
|
||||||
import { useAuth } from "@/hooks/useAuth";
|
import { useAuth } from "@/hooks/useAuth";
|
||||||
@@ -7,7 +8,7 @@ import { apiFetch, fetchAllUsers } from "@/lib/api";
|
|||||||
import { useDismissingState } from "@/hooks/useDismissingState";
|
import { useDismissingState } from "@/hooks/useDismissingState";
|
||||||
import { FileText } from "lucide-react";
|
import { FileText } from "lucide-react";
|
||||||
|
|
||||||
type FormFieldType = 'yes_no' | 'text' | 'date' | 'numeric' | 'statement' | 'paragraph';
|
type FormFieldType = 'yes_no' | 'text' | 'date' | 'numeric' | 'statement' | 'paragraph' | 'rating' | 'multiple_choice';
|
||||||
|
|
||||||
type EventFormDef = { isRequired: boolean; fields: { id?: string; type: FormFieldType; label: string; isRequired?: boolean; order?: number; helpText?: string|null; options?: any }[] };
|
type EventFormDef = { isRequired: boolean; fields: { id?: string; type: FormFieldType; label: string; isRequired?: boolean; order?: number; helpText?: string|null; options?: any }[] };
|
||||||
|
|
||||||
@@ -36,7 +37,7 @@ function FormBuilder({ value, onChange }: { value: EventFormDef; onChange: (v: E
|
|||||||
};
|
};
|
||||||
|
|
||||||
const typeLabel = (type: FormFieldType) => {
|
const typeLabel = (type: FormFieldType) => {
|
||||||
const labels: Record<FormFieldType, string> = { text: 'Text', numeric: 'Number', date: 'Date', yes_no: 'Yes/No', statement: 'Statement', paragraph: 'Heading' };
|
const labels: Record<FormFieldType, string> = { text: 'Text', numeric: 'Number', date: 'Date', yes_no: 'Yes/No', statement: 'Statement', paragraph: 'Heading', rating: 'Rating', multiple_choice: 'Multiple choice' };
|
||||||
return labels[type] || type;
|
return labels[type] || type;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -73,6 +74,8 @@ function FormBuilder({ value, onChange }: { value: EventFormDef; onChange: (v: E
|
|||||||
<option value="numeric">Number</option>
|
<option value="numeric">Number</option>
|
||||||
<option value="date">Date</option>
|
<option value="date">Date</option>
|
||||||
<option value="yes_no">Yes / No</option>
|
<option value="yes_no">Yes / No</option>
|
||||||
|
<option value="rating">Rating (1–5 stars)</option>
|
||||||
|
<option value="multiple_choice">Multiple choice</option>
|
||||||
<option value="statement">Statement (display text)</option>
|
<option value="statement">Statement (display text)</option>
|
||||||
<option value="paragraph">Heading + paragraph</option>
|
<option value="paragraph">Heading + paragraph</option>
|
||||||
</select>
|
</select>
|
||||||
@@ -89,6 +92,7 @@ function FormBuilder({ value, onChange }: { value: EventFormDef; onChange: (v: E
|
|||||||
value={f.label}
|
value={f.label}
|
||||||
onChange={e => updateField(idx, { label: e.target.value })}
|
onChange={e => updateField(idx, { label: e.target.value })}
|
||||||
/>
|
/>
|
||||||
|
{f.type === 'multiple_choice' && <ChoicesEditor options={f.options} onChange={opts => updateField(idx, { options: opts })} />}
|
||||||
{f.type === 'paragraph' ? (
|
{f.type === 'paragraph' ? (
|
||||||
<textarea
|
<textarea
|
||||||
className="border rounded px-2 py-1 text-xs w-full"
|
className="border rounded px-2 py-1 text-xs w-full"
|
||||||
@@ -288,7 +292,7 @@ export default function FormsBrowserPage() {
|
|||||||
const evFull = await apiFetch<any>(`/api/events/${encodeURIComponent(eventId)}`);
|
const evFull = await apiFetch<any>(`/api/events/${encodeURIComponent(eventId)}`);
|
||||||
const f = evFull?.form;
|
const f = evFull?.form;
|
||||||
if (f && Array.isArray(f.fields)) {
|
if (f && Array.isArray(f.fields)) {
|
||||||
setFormDef({ isRequired: !!f.isRequired, fields: f.fields.map((x: any) => ({ id: x.id, type: x.type, label: x.label, isRequired: !!x.isRequired, order: x.order, helpText: x.helpText || '' })) });
|
setFormDef({ isRequired: !!f.isRequired, fields: f.fields.map((x: any) => ({ id: x.id, type: x.type, label: x.label, isRequired: !!x.isRequired, order: x.order, helpText: x.helpText || '', options: x.options || undefined })) });
|
||||||
} else {
|
} else {
|
||||||
setFormDef({ isRequired: false, fields: [] });
|
setFormDef({ isRequired: false, fields: [] });
|
||||||
}
|
}
|
||||||
@@ -310,7 +314,7 @@ export default function FormsBrowserPage() {
|
|||||||
if (!token || !selectedEventId) return;
|
if (!token || !selectedEventId) return;
|
||||||
setError(null); setInfo(null);
|
setError(null); setInfo(null);
|
||||||
try {
|
try {
|
||||||
const fields = (formDef.fields || []).filter(f => (f.label || '').trim().length > 0).map((f, i) => ({ type: f.type, label: f.label, isRequired: !!f.isRequired && f.type !== 'statement' && f.type !== 'paragraph', order: i, helpText: f.helpText || null }));
|
const fields = (formDef.fields || []).filter(f => (f.label || '').trim().length > 0).map((f, i) => ({ type: f.type, label: f.label, isRequired: !!f.isRequired && f.type !== 'statement' && f.type !== 'paragraph', order: i, helpText: f.helpText || null, options: f.type === 'multiple_choice' && Array.isArray(f.options) ? f.options.map((o: any) => String(o).trim()).filter(Boolean) : undefined }));
|
||||||
await apiFetch(`/api/events/${encodeURIComponent(selectedEventId)}`, { method: 'PUT', authToken: token, body: { form: { isRequired: !!formDef.isRequired, fields } } });
|
await apiFetch(`/api/events/${encodeURIComponent(selectedEventId)}`, { method: 'PUT', authToken: token, body: { form: { isRequired: !!formDef.isRequired, fields } } });
|
||||||
setInfo('Form saved');
|
setInfo('Form saved');
|
||||||
} catch (e:any) {
|
} catch (e:any) {
|
||||||
@@ -362,7 +366,7 @@ export default function FormsBrowserPage() {
|
|||||||
const evFull = await apiFetch<any>(`/api/events/${encodeURIComponent(reg.event.id)}`);
|
const evFull = await apiFetch<any>(`/api/events/${encodeURIComponent(reg.event.id)}`);
|
||||||
const f = evFull?.form;
|
const f = evFull?.form;
|
||||||
if (f && Array.isArray(f.fields)) {
|
if (f && Array.isArray(f.fields)) {
|
||||||
setFillForm({ isRequired: !!f.isRequired, fields: f.fields.map((x:any)=>({ id:x.id, type:x.type, label:x.label, isRequired:!!x.isRequired, order:x.order, helpText:x.helpText||'' })) });
|
setFillForm({ isRequired: !!f.isRequired, fields: f.fields.map((x:any)=>({ id:x.id, type:x.type, label:x.label, isRequired:!!x.isRequired, order:x.order, helpText:x.helpText||'', options: x.options || undefined })) });
|
||||||
} else {
|
} else {
|
||||||
setFillForm({ isRequired: false, fields: [] });
|
setFillForm({ isRequired: false, fields: [] });
|
||||||
}
|
}
|
||||||
@@ -710,6 +714,9 @@ export default function FormsBrowserPage() {
|
|||||||
{f.type === 'date' && (
|
{f.type === 'date' && (
|
||||||
<input type="date" className="border rounded px-2 py-1 text-sm w-full" value={resp.answers[f.id]||''} onChange={e=> setAnswer(idx, f.id!, e.target.value)} />
|
<input type="date" className="border rounded px-2 py-1 text-sm w-full" value={resp.answers[f.id]||''} onChange={e=> setAnswer(idx, f.id!, e.target.value)} />
|
||||||
)}
|
)}
|
||||||
|
{isExtraFieldType(f.type) && (
|
||||||
|
<ExtraFieldInput field={f} idPrefix={`r${idx}`} value={resp.answers[f.id!]||''} onChange={v => setAnswer(idx, f.id!, v)} />
|
||||||
|
)}
|
||||||
{f.type === 'yes_no' && (
|
{f.type === 'yes_no' && (
|
||||||
<select className="border rounded px-2 py-1 text-sm w-full" value={resp.answers[f.id]||''} onChange={e=> setAnswer(idx, f.id!, e.target.value)}>
|
<select className="border rounded px-2 py-1 text-sm w-full" value={resp.answers[f.id]||''} onChange={e=> setAnswer(idx, f.id!, e.target.value)}>
|
||||||
<option value="">Select…</option>
|
<option value="">Select…</option>
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
import { ExtraFieldInput, isExtraFieldType } from "@/components/shared/FormFieldExtras";
|
||||||
|
|
||||||
import React, { useEffect, useState } from "react";
|
import React, { useEffect, useState } from "react";
|
||||||
import { useAuth } from "@/hooks/useAuth";
|
import { useAuth } from "@/hooks/useAuth";
|
||||||
@@ -7,7 +8,7 @@ import { apiFetch } from "@/lib/api";
|
|||||||
import { useDismissingState } from "@/hooks/useDismissingState";
|
import { useDismissingState } from "@/hooks/useDismissingState";
|
||||||
import { UserPlus } from "lucide-react";
|
import { UserPlus } from "lucide-react";
|
||||||
|
|
||||||
type FormField = { id: string; type: 'yes_no'|'text'|'date'|'numeric'|'statement'|'paragraph'; label: string; isRequired?: boolean; helpText?: string|null };
|
type FormField = { id: string; type: 'yes_no'|'text'|'date'|'numeric'|'statement'|'paragraph'|'rating'|'multiple_choice'; label: string; isRequired?: boolean; helpText?: string|null; options?: unknown };
|
||||||
|
|
||||||
export default function ManualRegistrationPage() {
|
export default function ManualRegistrationPage() {
|
||||||
const { user, token, loading } = useAuth();
|
const { user, token, loading } = useAuth();
|
||||||
@@ -178,7 +179,9 @@ function AttendeeFormsSection({ registration, form, formsData, setFormsData }: {
|
|||||||
) : (
|
) : (
|
||||||
<>
|
<>
|
||||||
<label className="block text-xs text-gray-600 mb-1">{f.label}{f.isRequired ? ' *' : ''}</label>
|
<label className="block text-xs text-gray-600 mb-1">{f.label}{f.isRequired ? ' *' : ''}</label>
|
||||||
{f.type === 'yes_no' ? (
|
{isExtraFieldType(f.type) ? (
|
||||||
|
<ExtraFieldInput field={f} idPrefix={`a${idx}`} value={formsData[idx]?.[f.id] || ''} onChange={v => update(idx, f.id, v)} />
|
||||||
|
) : f.type === 'yes_no' ? (
|
||||||
<select className="border rounded px-2 py-1 text-sm" value={formsData[idx]?.[f.id] || ''} onChange={e => update(idx, f.id, e.target.value)}>
|
<select className="border rounded px-2 py-1 text-sm" value={formsData[idx]?.[f.id] || ''} onChange={e => update(idx, f.id, e.target.value)}>
|
||||||
<option value="">Select</option>
|
<option value="">Select</option>
|
||||||
<option value="yes">Yes</option>
|
<option value="yes">Yes</option>
|
||||||
|
|||||||
@@ -624,6 +624,7 @@ export default function ManualRegistrationPage() {
|
|||||||
onDeliveryChange={setDelivery}
|
onDeliveryChange={setDelivery}
|
||||||
payerLabel="the person registering"
|
payerLabel="the person registering"
|
||||||
consentEventStart={selectedIsYouth ? selectedEv.startDate : undefined}
|
consentEventStart={selectedIsYouth ? selectedEv.startDate : undefined}
|
||||||
|
collectGender={!!selectedEv?.collectGender}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -0,0 +1,163 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import React, { useCallback, useEffect, useMemo, useState } from "react";
|
||||||
|
import { useAuth } from "@/hooks/useAuth";
|
||||||
|
import { useRouter } from "next/navigation";
|
||||||
|
import { apiFetch } from "@/lib/api";
|
||||||
|
import { formatDate } from "@/lib/date";
|
||||||
|
import { useDismissingState } from "@/hooks/useDismissingState";
|
||||||
|
import { WifiOff, Unlock, CheckCircle2 } from "lucide-react";
|
||||||
|
|
||||||
|
type Lock = { id: string; sectionName: string | null; deviceName: string | null; user: { name: string }; lockedAt: string; snapshotAt: string | null; lastSyncAt: string | null };
|
||||||
|
type Report = {
|
||||||
|
id: string; accepted: number; duplicates: number; afterForceRelease: boolean; createdAt: string; reviewedAt: string | null;
|
||||||
|
reviewedBy: { name: string } | null;
|
||||||
|
conflicts: { clientScanId: string; qrCode: string; qty: number; redeemed: number; scannedAt: string; reason: string; message: string }[];
|
||||||
|
scanLock: Lock;
|
||||||
|
};
|
||||||
|
|
||||||
|
const when = (iso: string | null) => (iso ? new Date(iso).toLocaleString() : "—");
|
||||||
|
|
||||||
|
export default function OfflineScansPage() {
|
||||||
|
const { user, loading, token } = useAuth();
|
||||||
|
const router = useRouter();
|
||||||
|
const canView = useMemo(() => user?.role === "admin" || user?.role === "supervisor", [user]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (loading) return;
|
||||||
|
if (!user) router.replace("/login");
|
||||||
|
}, [user, loading, router]);
|
||||||
|
|
||||||
|
const [events, setEvents] = useState<any[]>([]);
|
||||||
|
const [eventId, setEventId] = useState("");
|
||||||
|
const [locks, setLocks] = useState<Lock[]>([]);
|
||||||
|
const [reports, setReports] = useState<Report[]>([]);
|
||||||
|
const [onlyOpen, setOnlyOpen] = useState(true);
|
||||||
|
const [error, setError] = useDismissingState<string | null>(null);
|
||||||
|
const [info, setInfo] = useDismissingState<string | null>(null);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!token || !canView) return;
|
||||||
|
apiFetch<any[]>("/api/events/all?includePast=true", { authToken: token })
|
||||||
|
.then(evs => {
|
||||||
|
const recent = (evs || []).filter(e => new Date(e.endDate).getTime() > Date.now() - 14 * 864e5);
|
||||||
|
setEvents(recent);
|
||||||
|
if (recent.length && !eventId) setEventId(recent[0].id);
|
||||||
|
})
|
||||||
|
.catch(e => setError(e?.message || "Failed to load events"));
|
||||||
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||||
|
}, [token, canView]);
|
||||||
|
|
||||||
|
const load = useCallback(async () => {
|
||||||
|
if (!token || !eventId) return;
|
||||||
|
try {
|
||||||
|
const [l, r] = await Promise.all([
|
||||||
|
apiFetch<Lock[]>(`/api/scan-locks?eventId=${encodeURIComponent(eventId)}`, { authToken: token }),
|
||||||
|
apiFetch<Report[]>(`/api/scan-locks/reports?eventId=${encodeURIComponent(eventId)}${onlyOpen ? "&unreviewed=true" : ""}`, { authToken: token }),
|
||||||
|
]);
|
||||||
|
setLocks(l);
|
||||||
|
setReports(r.filter(x => !onlyOpen || x.conflicts.length > 0 || x.afterForceRelease));
|
||||||
|
} catch (e: any) {
|
||||||
|
setError(e?.message || "Failed to load offline scanning");
|
||||||
|
}
|
||||||
|
}, [token, eventId, onlyOpen, setError]);
|
||||||
|
useEffect(() => { load(); }, [load]);
|
||||||
|
|
||||||
|
const forceRelease = async (l: Lock) => {
|
||||||
|
try {
|
||||||
|
const res = await apiFetch<{ message: string }>(`/api/scan-locks/${l.id}/force-release`, { method: "POST", authToken: token! });
|
||||||
|
setInfo(res.message);
|
||||||
|
load();
|
||||||
|
} catch (e: any) { setError(e?.message || "Failed"); }
|
||||||
|
};
|
||||||
|
const review = async (r: Report) => {
|
||||||
|
try {
|
||||||
|
await apiFetch(`/api/scan-locks/reports/${r.id}/review`, { method: "POST", authToken: token! });
|
||||||
|
load();
|
||||||
|
} catch (e: any) { setError(e?.message || "Failed"); }
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="max-w-5xl mx-auto w-full p-6">
|
||||||
|
<div className="flex items-center gap-3 mb-4">
|
||||||
|
<div className="w-10 h-10 rounded-xl bg-brand-50 flex items-center justify-center shrink-0">
|
||||||
|
<WifiOff className="w-5 h-5 text-brand-600" />
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<button className="text-xs text-brand-600 hover:underline" onClick={() => router.push("/dashboard")}>← Back to dashboard</button>
|
||||||
|
<h1 className="text-2xl font-semibold text-gray-900 mt-0.5">Offline scanning</h1>
|
||||||
|
<p className="text-sm text-gray-500">Devices scanning without a connection, and their synced scans</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{!canView && <div className="p-3 border rounded bg-yellow-50 text-yellow-800 text-sm mb-4">You need supervisor access to manage offline scanning.</div>}
|
||||||
|
{error && <div className="mb-3 p-3 border rounded bg-red-50 text-red-800 text-sm">{error}</div>}
|
||||||
|
{info && <div className="mb-3 p-3 border rounded bg-green-50 text-green-800 text-sm">{info}</div>}
|
||||||
|
|
||||||
|
{canView && (
|
||||||
|
<div className="space-y-4">
|
||||||
|
<div className="flex flex-wrap items-end gap-3">
|
||||||
|
<div>
|
||||||
|
<label className="block text-xs text-gray-600 mb-1">Event</label>
|
||||||
|
<select className="border rounded-lg px-3 py-2 text-sm min-w-[16rem]" value={eventId} onChange={e => setEventId(e.target.value)}>
|
||||||
|
{events.map(ev => <option key={ev.id} value={ev.id}>{ev.title} ({formatDate(new Date(ev.startDate))})</option>)}
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<label className="flex items-center gap-2 text-sm text-gray-700 pb-2">
|
||||||
|
<input type="checkbox" checked={onlyOpen} onChange={e => setOnlyOpen(e.target.checked)} /> Only reports that need review
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<section className="border rounded-xl p-4 bg-white shadow-sm">
|
||||||
|
<h2 className="font-semibold mb-2">Locked sections</h2>
|
||||||
|
{locks.length === 0 ? <p className="text-sm text-gray-500">No device is scanning offline for this event.</p> : (
|
||||||
|
<ul className="divide-y">
|
||||||
|
{locks.map(l => (
|
||||||
|
<li key={l.id} className="py-2 flex items-center justify-between gap-3 text-sm">
|
||||||
|
<div>
|
||||||
|
<div className="font-medium">{l.sectionName || "Whole event"} — {l.user.name}{l.deviceName ? ` on ${l.deviceName}` : ""}</div>
|
||||||
|
<div className="text-xs text-gray-500">Locked {when(l.lockedAt)} · list downloaded {when(l.snapshotAt)} · last sync {when(l.lastSyncAt)}</div>
|
||||||
|
</div>
|
||||||
|
<button onClick={() => forceRelease(l)} className="inline-flex items-center gap-1 px-2.5 py-1 text-xs rounded border hover:bg-gray-50 shrink-0" title="For a lost or flat device. If it reconnects later, its scans still sync and are flagged here.">
|
||||||
|
<Unlock className="w-3.5 h-3.5" /> Force release
|
||||||
|
</button>
|
||||||
|
</li>
|
||||||
|
))}
|
||||||
|
</ul>
|
||||||
|
)}
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section className="border rounded-xl p-4 bg-white shadow-sm">
|
||||||
|
<h2 className="font-semibold mb-2">Sync reports</h2>
|
||||||
|
{reports.length === 0 ? <p className="text-sm text-gray-500">{onlyOpen ? "Nothing needs review." : "No offline scans have been synced for this event."}</p> : (
|
||||||
|
<div className="space-y-3">
|
||||||
|
{reports.map(r => (
|
||||||
|
<div key={r.id} className={`border rounded-lg p-3 ${r.reviewedAt ? "opacity-60" : ""}`}>
|
||||||
|
<div className="flex items-center justify-between gap-3 text-sm">
|
||||||
|
<div>
|
||||||
|
<span className="font-medium">{when(r.createdAt)}</span> — {r.scanLock.user?.name}{r.scanLock.deviceName ? ` on ${r.scanLock.deviceName}` : ""}{r.scanLock.sectionName ? `, ${r.scanLock.sectionName}` : ""}
|
||||||
|
<div className="text-xs text-gray-500">{r.accepted} scan(s) recorded{r.duplicates ? ` · ${r.duplicates} already synced` : ""}{r.afterForceRelease ? " · synced after the lock was force-released" : ""}</div>
|
||||||
|
</div>
|
||||||
|
{r.reviewedAt
|
||||||
|
? <span className="text-xs text-gray-500 inline-flex items-center gap-1"><CheckCircle2 className="w-3.5 h-3.5" /> Reviewed by {r.reviewedBy?.name}</span>
|
||||||
|
: <button onClick={() => review(r)} className="px-2.5 py-1 text-xs rounded bg-brand-600 text-white hover:bg-brand-700 shrink-0">Mark reviewed</button>}
|
||||||
|
</div>
|
||||||
|
{r.conflicts.length > 0 && (
|
||||||
|
<ul className="mt-2 text-xs space-y-1">
|
||||||
|
{r.conflicts.map(c => (
|
||||||
|
<li key={c.clientScanId} className="text-red-800">
|
||||||
|
{new Date(c.scannedAt).toLocaleTimeString()} · ticket {String(c.qrCode).slice(0, 8)}… · {c.message}{c.redeemed ? ` (recorded ${c.redeemed} of ${c.qty})` : " (not recorded)"}
|
||||||
|
</li>
|
||||||
|
))}
|
||||||
|
</ul>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</section>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -8,7 +8,7 @@ import { useStableState } from "@/hooks/useStableState";
|
|||||||
import { useVisiblePolling } from "@/hooks/useVisiblePolling";
|
import { useVisiblePolling } from "@/hooks/useVisiblePolling";
|
||||||
import {
|
import {
|
||||||
Calendar, Banknote, Gift, Users, Ticket, QrCode, DoorOpen, Wallet,
|
Calendar, Banknote, Gift, Users, Ticket, QrCode, DoorOpen, Wallet,
|
||||||
UserPlus, FileText, MessageCircle, BarChart2, Mail, TicketPercent, ShieldCheck, ListChecks,
|
UserPlus, FileText, MessageCircle, BarChart2, Mail, TicketPercent, ShieldCheck, ListChecks, WifiOff, BedDouble,
|
||||||
} from "lucide-react";
|
} from "lucide-react";
|
||||||
import { StatCard, StatCardRow } from "@/components/shared/StatCard";
|
import { StatCard, StatCardRow } from "@/components/shared/StatCard";
|
||||||
import { QuickActionTile, QuickActionGrid } from "@/components/shared/QuickActionTile";
|
import { QuickActionTile, QuickActionGrid } from "@/components/shared/QuickActionTile";
|
||||||
@@ -24,6 +24,8 @@ const QUICK_ACTIONS = [
|
|||||||
{ href: "/dashboard/supervisor/manual", label: "Manual registration", description: "Register a guest and issue tickets", icon: UserPlus },
|
{ href: "/dashboard/supervisor/manual", label: "Manual registration", description: "Register a guest and issue tickets", icon: UserPlus },
|
||||||
{ href: "/dashboard/supervisor/events", label: "Manage events", description: "Create, edit, and update ticket types", icon: Calendar },
|
{ href: "/dashboard/supervisor/events", label: "Manage events", description: "Create, edit, and update ticket types", icon: Calendar },
|
||||||
{ href: "/dashboard/supervisor/payments", label: "Payments & donations", description: "Manual payments and assignment", icon: Wallet },
|
{ href: "/dashboard/supervisor/payments", label: "Payments & donations", description: "Manual payments and assignment", icon: Wallet },
|
||||||
|
{ href: "/dashboard/supervisor/allocations", label: "Rooms & groups", description: "Put attendees into rooms, groups or buses", icon: BedDouble },
|
||||||
|
{ href: "/dashboard/supervisor/offline-scans", label: "Offline scanning", description: "Devices scanning offline and their synced scans", icon: WifiOff },
|
||||||
{ href: "/dashboard/supervisor/waitlist", label: "Waitlist", description: "People waiting for sold-out tickets", icon: ListChecks },
|
{ href: "/dashboard/supervisor/waitlist", label: "Waitlist", description: "People waiting for sold-out tickets", icon: ListChecks },
|
||||||
{ href: "/dashboard/supervisor/consent", label: "Parental consent", description: "Youth events: consent status and medical list", icon: ShieldCheck },
|
{ href: "/dashboard/supervisor/consent", label: "Parental consent", description: "Youth events: consent status and medical list", icon: ShieldCheck },
|
||||||
{ href: "/dashboard/supervisor/coupons", label: "Coupon codes", description: "Discounts for staff, leaders and promotions", icon: TicketPercent },
|
{ href: "/dashboard/supervisor/coupons", label: "Coupon codes", description: "Discounts for staff, leaders and promotions", icon: TicketPercent },
|
||||||
|
|||||||
@@ -832,7 +832,7 @@ function PaymentsContent() {
|
|||||||
return (
|
return (
|
||||||
<li key={p.id} className={`border rounded p-2 ${isRefund ? 'bg-red-50' : ''}`}>
|
<li key={p.id} className={`border rounded p-2 ${isRefund ? 'bg-red-50' : ''}`}>
|
||||||
<div className="flex justify-between">
|
<div className="flex justify-between">
|
||||||
<div className={`font-medium ${isRefund ? 'text-red-700' : ''}`}>{isRefund ? '-' : ''}R {Math.abs(amt).toFixed(2)} {p.isDonation ? <span className="text-xs text-emerald-700">(donation)</span> : null} {isRefund ? <span className="text-xs text-red-700">(refund)</span> : null}</div>
|
<div className={`font-medium ${isRefund ? 'text-red-700' : ''}`}>{isRefund ? '-' : ''}R {Math.abs(amt).toFixed(2)} {p.isDonation ? <span className="text-xs text-emerald-700">({p.isSponsorship ? 'sponsorship' : 'donation'})</span> : null} {isRefund ? <span className="text-xs text-red-700">(refund)</span> : null}</div>
|
||||||
<div className="text-xs text-gray-500">{new Date(p.createdAt).toLocaleString()}</div>
|
<div className="text-xs text-gray-500">{new Date(p.createdAt).toLocaleString()}</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="text-xs text-gray-600">Method: {p.method || 'payment'}</div>
|
<div className="text-xs text-gray-600">Method: {p.method || 'payment'}</div>
|
||||||
@@ -1171,6 +1171,7 @@ function DonationAssignSection({ payments, allUsers, registrations, regOutstandi
|
|||||||
const [paymentId, setPaymentId] = useState<string>("");
|
const [paymentId, setPaymentId] = useState<string>("");
|
||||||
const [amountStr, setAmountStr] = useState<string>("");
|
const [amountStr, setAmountStr] = useState<string>("");
|
||||||
const [assigning, setAssigning] = useState(false);
|
const [assigning, setAssigning] = useState(false);
|
||||||
|
const [sponsorshipsOnly, setSponsorshipsOnly] = useState(false);
|
||||||
const [err, setErr] = useState<string | null>(null);
|
const [err, setErr] = useState<string | null>(null);
|
||||||
|
|
||||||
useEffect(() => { setRegistrationId(""); setPaymentId(""); }, [userId]);
|
useEffect(() => { setRegistrationId(""); setPaymentId(""); }, [userId]);
|
||||||
@@ -1219,10 +1220,11 @@ function DonationAssignSection({ payments, allUsers, registrations, regOutstandi
|
|||||||
return payments.filter((p: any) => {
|
return payments.filter((p: any) => {
|
||||||
if (!p.isDonation || p.registrationId) return false;
|
if (!p.isDonation || p.registrationId) return false;
|
||||||
if (String(p.eventId) !== String(eventId)) return false;
|
if (String(p.eventId) !== String(eventId)) return false;
|
||||||
|
if (sponsorshipsOnly && !p.isSponsorship) return false;
|
||||||
const remaining = (p.amount || 0) - (legsById.get(p.id) || 0);
|
const remaining = (p.amount || 0) - (legsById.get(p.id) || 0);
|
||||||
return remaining > 0.000001;
|
return remaining > 0.000001;
|
||||||
});
|
});
|
||||||
}, [payments, selectedRegistration, legsById]);
|
}, [payments, selectedRegistration, legsById, sponsorshipsOnly]);
|
||||||
|
|
||||||
const selectedDonation = useMemo(
|
const selectedDonation = useMemo(
|
||||||
() => payments.find((p: any) => String(p.id) === String(paymentId)),
|
() => payments.find((p: any) => String(p.id) === String(paymentId)),
|
||||||
@@ -1306,12 +1308,19 @@ function DonationAssignSection({ payments, allUsers, registrations, regOutstandi
|
|||||||
<option value="">Select donation…</option>
|
<option value="">Select donation…</option>
|
||||||
{donationsForEvent.map((p: any) => {
|
{donationsForEvent.map((p: any) => {
|
||||||
const remaining = (p.amount || 0) - (legsById.get(p.id) || 0);
|
const remaining = (p.amount || 0) - (legsById.get(p.id) || 0);
|
||||||
const label = `R ${remaining.toFixed(2)} of R ${(p.amount || 0).toFixed(2)} left — ${p.user?.name || p.userId || 'Donor'} — #${String(p.id).slice(0,8)}`;
|
const donor = p.isSponsorship ? `Sponsorship: ${p.sponsorAnonymous ? 'anonymous' : (p.sponsorName || p.user?.name || 'sponsor')}` : (p.user?.name || p.userId || 'Donor');
|
||||||
|
const label = `R ${remaining.toFixed(2)} of R ${(p.amount || 0).toFixed(2)} left — ${donor} — #${String(p.id).slice(0,8)}`;
|
||||||
return <option key={p.id} value={p.id} title={label}>{label}</option>;
|
return <option key={p.id} value={p.id} title={label}>{label}</option>;
|
||||||
})}
|
})}
|
||||||
</select>
|
</select>
|
||||||
|
<label className="flex items-center gap-2 text-xs text-gray-600 cursor-pointer">
|
||||||
|
<input type="checkbox" checked={sponsorshipsOnly} onChange={e => { setSponsorshipsOnly(e.target.checked); setPaymentId(""); }} /> Only the sponsorship pool
|
||||||
|
</label>
|
||||||
{registrationId && donationsForEvent.length === 0 && (
|
{registrationId && donationsForEvent.length === 0 && (
|
||||||
<div className="text-xs text-gray-500">No donations with a remaining balance for this event.</div>
|
<div className="text-xs text-gray-500">No {sponsorshipsOnly ? "sponsorships" : "donations"} with a remaining balance for this event.</div>
|
||||||
|
)}
|
||||||
|
{selectedDonation?.isSponsorship && selectedDonation.sponsorMessage && (
|
||||||
|
<div className="text-xs text-rose-800 bg-rose-50 rounded p-2">Sponsor's message: “{selectedDonation.sponsorMessage}”</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{selectedDonation && (
|
{selectedDonation && (
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import { useRouter, useSearchParams } from "next/navigation";
|
|||||||
import { apiFetch, fetchAllUsers } from "@/lib/api";
|
import { apiFetch, fetchAllUsers } from "@/lib/api";
|
||||||
import { useDismissingState } from "@/hooks/useDismissingState";
|
import { useDismissingState } from "@/hooks/useDismissingState";
|
||||||
import { MessageCircle, Users, Zap, Send, Clock, type LucideIcon } from "lucide-react";
|
import { MessageCircle, Users, Zap, Send, Clock, type LucideIcon } from "lucide-react";
|
||||||
|
import { AllocationGroupFilter } from "@/components/shared/AllocationGroupFilter";
|
||||||
|
|
||||||
// Attendee with preference info
|
// Attendee with preference info
|
||||||
type Attendee = { id: string; name: string; phone: string; pref: string };
|
type Attendee = { id: string; name: string; phone: string; pref: string };
|
||||||
@@ -402,6 +403,7 @@ function WhatsAppAttendeesPageInner() {
|
|||||||
const [message, setMessage] = useState("");
|
const [message, setMessage] = useState("");
|
||||||
const [messageDirty, setMessageDirty] = useState(false);
|
const [messageDirty, setMessageDirty] = useState(false);
|
||||||
const [status, setStatus] = useState<"any" | "paid" | "unpaid" | "partial_paid" | "cancelled">("any");
|
const [status, setStatus] = useState<"any" | "paid" | "unpaid" | "partial_paid" | "cancelled">("any");
|
||||||
|
const [groupId, setGroupId] = useState("");
|
||||||
const [attendees, setAttendees] = useState<Attendee[]>([]);
|
const [attendees, setAttendees] = useState<Attendee[]>([]);
|
||||||
const [selectedAttendeeIds, setSelectedAttendeeIds] = useState<string[]>([]);
|
const [selectedAttendeeIds, setSelectedAttendeeIds] = useState<string[]>([]);
|
||||||
const [loadingAttendees, setLoadingAttendees] = useState(false);
|
const [loadingAttendees, setLoadingAttendees] = useState(false);
|
||||||
@@ -449,7 +451,7 @@ function WhatsAppAttendeesPageInner() {
|
|||||||
|
|
||||||
const buildPayload = (dryRun?: boolean) => {
|
const buildPayload = (dryRun?: boolean) => {
|
||||||
const payload: any = {
|
const payload: any = {
|
||||||
filter: { status: status !== "any" ? status : undefined, attendeeIds: selectedAttendeeIds.length ? selectedAttendeeIds : undefined },
|
filter: { status: status !== "any" ? status : undefined, attendeeIds: selectedAttendeeIds.length ? selectedAttendeeIds : undefined, allocationGroupId: groupId || undefined },
|
||||||
template: templateKey,
|
template: templateKey,
|
||||||
dryRun: dryRun || undefined,
|
dryRun: dryRun || undefined,
|
||||||
};
|
};
|
||||||
@@ -499,7 +501,7 @@ function WhatsAppAttendeesPageInner() {
|
|||||||
const whenIso = new Date(scheduledAtLocal).toISOString();
|
const whenIso = new Date(scheduledAtLocal).toISOString();
|
||||||
const payload: any = {
|
const payload: any = {
|
||||||
message: message || undefined,
|
message: message || undefined,
|
||||||
filter: { status: status !== "any" ? status : undefined, attendeeIds: selectedAttendeeIds.length ? selectedAttendeeIds : undefined },
|
filter: { status: status !== "any" ? status : undefined, attendeeIds: selectedAttendeeIds.length ? selectedAttendeeIds : undefined, allocationGroupId: groupId || undefined },
|
||||||
template: templateKey, scheduledAt: whenIso,
|
template: templateKey, scheduledAt: whenIso,
|
||||||
};
|
};
|
||||||
const res = await apiFetch(`/api/events/${encodeURIComponent(eventId)}/whatsapp-attendees/schedule`, { method: "POST", authToken: token, body: payload });
|
const res = await apiFetch(`/api/events/${encodeURIComponent(eventId)}/whatsapp-attendees/schedule`, { method: "POST", authToken: token, body: payload });
|
||||||
@@ -715,6 +717,7 @@ function WhatsAppAttendeesPageInner() {
|
|||||||
<option value="cancelled">Cancelled</option>
|
<option value="cancelled">Cancelled</option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
|
<AllocationGroupFilter token={token} eventId={eventId} value={groupId} onChange={setGroupId} />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{templateKey !== "tickets" ? (
|
{templateKey !== "tickets" ? (
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
import { ExtraFieldInput, isExtraFieldType } from "@/components/shared/FormFieldExtras";
|
||||||
import React, { Suspense, useEffect, useMemo, useState } from "react";
|
import React, { Suspense, useEffect, useMemo, useState } from "react";
|
||||||
import { useSearchParams, useRouter } from "next/navigation";
|
import { useSearchParams, useRouter } from "next/navigation";
|
||||||
import { useAuth } from "@/hooks/useAuth";
|
import { useAuth } from "@/hooks/useAuth";
|
||||||
@@ -7,7 +8,7 @@ import { useDismissingState } from "@/hooks/useDismissingState";
|
|||||||
import { FileText } from "lucide-react";
|
import { FileText } from "lucide-react";
|
||||||
|
|
||||||
// Types for form fields
|
// Types for form fields
|
||||||
type FormField = { id: string; type: 'yes_no'|'text'|'date'|'numeric'|'statement'|'paragraph'; label: string; isRequired?: boolean; helpText?: string|null };
|
type FormField = { id: string; type: 'yes_no'|'text'|'date'|'numeric'|'statement'|'paragraph'|'rating'|'multiple_choice'; label: string; isRequired?: boolean; helpText?: string|null; options?: unknown };
|
||||||
|
|
||||||
function FormsContent() {
|
function FormsContent() {
|
||||||
const search = useSearchParams();
|
const search = useSearchParams();
|
||||||
@@ -198,7 +199,9 @@ function FormsContent() {
|
|||||||
) : (
|
) : (
|
||||||
<>
|
<>
|
||||||
<label className="block text-xs text-gray-600 mb-1">{f.label}{f.isRequired ? ' *' : ''}</label>
|
<label className="block text-xs text-gray-600 mb-1">{f.label}{f.isRequired ? ' *' : ''}</label>
|
||||||
{f.type === 'yes_no' ? (
|
{isExtraFieldType(f.type) ? (
|
||||||
|
<ExtraFieldInput field={f} idPrefix={`a${idx}`} value={formsData[idx]?.[f.id] || ''} onChange={v => setFormsData(prev => ({ ...prev, [idx]: { ...(prev[idx]||{}), [f.id]: v } }))} />
|
||||||
|
) : f.type === 'yes_no' ? (
|
||||||
<select className="border rounded px-2 py-1 text-sm" value={formsData[idx]?.[f.id] || ''} onChange={e => setFormsData(prev => ({ ...prev, [idx]: { ...(prev[idx]||{}), [f.id]: e.target.value } }))}>
|
<select className="border rounded px-2 py-1 text-sm" value={formsData[idx]?.[f.id] || ''} onChange={e => setFormsData(prev => ({ ...prev, [idx]: { ...(prev[idx]||{}), [f.id]: e.target.value } }))}>
|
||||||
<option value="">Select</option>
|
<option value="">Select</option>
|
||||||
<option value="yes">Yes</option>
|
<option value="yes">Yes</option>
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import { ApiImage } from "@/components/shared/ApiImage";
|
|||||||
import { useDismissingState } from "@/hooks/useDismissingState";
|
import { useDismissingState } from "@/hooks/useDismissingState";
|
||||||
import { AttendeesPanel } from "@/components/shared/AttendeesPanel";
|
import { AttendeesPanel } from "@/components/shared/AttendeesPanel";
|
||||||
import { MyWaitlists } from "@/components/shared/MyWaitlists";
|
import { MyWaitlists } from "@/components/shared/MyWaitlists";
|
||||||
|
import { TransferTicketModal, canOfferTransfer } from "@/components/shared/TransferTicketModal";
|
||||||
import { ClipboardList, Calendar, Ticket, ChevronRight } from "lucide-react";
|
import { ClipboardList, Calendar, Ticket, ChevronRight } from "lucide-react";
|
||||||
|
|
||||||
// Helper formatters
|
// Helper formatters
|
||||||
@@ -534,6 +535,8 @@ export default function UserDashboardPage() {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const [transferTarget, setTransferTarget] = useState<any | null>(null);
|
||||||
|
|
||||||
// Re-fetch registrations and tickets after something on one changes (attendee names).
|
// Re-fetch registrations and tickets after something on one changes (attendee names).
|
||||||
const reloadAfterAttendees = async () => {
|
const reloadAfterAttendees = async () => {
|
||||||
if (!token) return;
|
if (!token) return;
|
||||||
@@ -992,6 +995,11 @@ export default function UserDashboardPage() {
|
|||||||
<div className="text-xs font-medium text-blue-700 bg-blue-50 rounded px-2 py-0.5 inline-block">
|
<div className="text-xs font-medium text-blue-700 bg-blue-50 rounded px-2 py-0.5 inline-block">
|
||||||
{t.attendee?.name ? <>For: {t.attendee.name}</> : <>Qty: {t.quantity || 1}</>}
|
{t.attendee?.name ? <>For: {t.attendee.name}</> : <>Qty: {t.quantity || 1}</>}
|
||||||
</div>
|
</div>
|
||||||
|
{(t.attendee?.allocations || []).length > 0 && (
|
||||||
|
<div className="text-xs text-violet-800 bg-violet-50 rounded px-2 py-0.5 inline-block ml-1">
|
||||||
|
{[...t.attendee.allocations].sort((a: any, b: any) => (a.set?.order || 0) - (b.set?.order || 0)).map((a: any) => `${a.set.name}: ${a.group.name}`).join(" · ")}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
{t.userId && user?.id && t.userId !== user.id && t.user?.name && (
|
{t.userId && user?.id && t.userId !== user.id && t.user?.name && (
|
||||||
<div className="text-xs text-gray-500">Booked by {t.user.name}</div>
|
<div className="text-xs text-gray-500">Booked by {t.user.name}</div>
|
||||||
)}
|
)}
|
||||||
@@ -1003,6 +1011,9 @@ export default function UserDashboardPage() {
|
|||||||
<button onClick={() => whatsappTickets([t.id])} className="px-3 py-1.5 text-sm bg-green-600 text-white rounded hover:bg-green-700 shadow-sm focus:outline-none focus:ring-2 focus:ring-green-500 focus:ring-offset-1">WhatsApp</button>
|
<button onClick={() => whatsappTickets([t.id])} className="px-3 py-1.5 text-sm bg-green-600 text-white rounded hover:bg-green-700 shadow-sm focus:outline-none focus:ring-2 focus:ring-green-500 focus:ring-offset-1">WhatsApp</button>
|
||||||
)}
|
)}
|
||||||
<button onClick={() => printTickets([t])} className="px-3 py-1.5 text-sm rounded bg-gray-100 hover:bg-gray-200 text-gray-800 shadow-sm focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-offset-1">Print</button>
|
<button onClick={() => printTickets([t])} className="px-3 py-1.5 text-sm rounded bg-gray-100 hover:bg-gray-200 text-gray-800 shadow-sm focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-offset-1">Print</button>
|
||||||
|
{canOfferTransfer(t, t.event) && (
|
||||||
|
<button onClick={() => setTransferTarget(t)} className="px-3 py-1.5 text-sm rounded border border-gray-300 hover:bg-gray-100 text-gray-800 shadow-sm focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-offset-1" title="Give this ticket to someone else">Transfer</button>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
);
|
);
|
||||||
@@ -1012,6 +1023,16 @@ export default function UserDashboardPage() {
|
|||||||
</section>
|
</section>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{transferTarget && token && (
|
||||||
|
<TransferTicketModal
|
||||||
|
ticket={transferTarget}
|
||||||
|
event={transferTarget.event}
|
||||||
|
token={token}
|
||||||
|
onClose={() => setTransferTarget(null)}
|
||||||
|
onDone={(msg) => { setTransferTarget(null); setInfo(msg); reloadAfterAttendees(); }}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
|
||||||
{activeReg && (
|
{activeReg && (
|
||||||
<div className="fixed inset-0 bg-black/40 flex items-center justify-center z-50" onClick={() => { setEditMode(false); setEditError(null); setShowCancelConfirm(false); setActiveRegId(null); }}>
|
<div className="fixed inset-0 bg-black/40 flex items-center justify-center z-50" onClick={() => { setEditMode(false); setEditError(null); setShowCancelConfirm(false); setActiveRegId(null); }}>
|
||||||
<div className="bg-white rounded-lg shadow-lg max-w-xl w-full mx-4 p-5 max-h-[90vh] overflow-y-auto" onClick={e => e.stopPropagation()}>
|
<div className="bg-white rounded-lg shadow-lg max-w-xl w-full mx-4 p-5 max-h-[90vh] overflow-y-auto" onClick={e => e.stopPropagation()}>
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import ClientActions from "@/app/events/[id]/ClientActions";
|
|||||||
import { ContactButton } from "@/components/events/ContactButton";
|
import { ContactButton } from "@/components/events/ContactButton";
|
||||||
import { LocationMap } from "@/components/events/LocationMap";
|
import { LocationMap } from "@/components/events/LocationMap";
|
||||||
import { JoinWaitlistButton, soldOutLines } from "@/components/events/JoinWaitlistButton";
|
import { JoinWaitlistButton, soldOutLines } from "@/components/events/JoinWaitlistButton";
|
||||||
|
import { SponsorSpot } from "@/components/events/SponsorSpot";
|
||||||
import { Calendar, Ticket, Paperclip, Sparkles } from "lucide-react";
|
import { Calendar, Ticket, Paperclip, Sparkles } from "lucide-react";
|
||||||
|
|
||||||
export const revalidate = 60;
|
export const revalidate = 60;
|
||||||
@@ -42,6 +43,7 @@ type Event = {
|
|||||||
contactEmail?: string | null;
|
contactEmail?: string | null;
|
||||||
location?: string | null;
|
location?: string | null;
|
||||||
waitlistEnabled?: boolean;
|
waitlistEnabled?: boolean;
|
||||||
|
allowSponsorships?: boolean;
|
||||||
};
|
};
|
||||||
|
|
||||||
import { apiFetch, ApiError, resolveToApiOrigin } from "@/lib/api";
|
import { apiFetch, ApiError, resolveToApiOrigin } from "@/lib/api";
|
||||||
@@ -222,6 +224,7 @@ export default async function EventDetailPage({ params }: { params: Promise<{ id
|
|||||||
<div className="mt-4">
|
<div className="mt-4">
|
||||||
<RegisterCta event={event} />
|
<RegisterCta event={event} />
|
||||||
</div>
|
</div>
|
||||||
|
{event.allowSponsorships && <SponsorSpot eventId={event.id} eventTitle={event.title} />}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -235,6 +238,7 @@ export default async function EventDetailPage({ params }: { params: Promise<{ id
|
|||||||
<div className="mt-4">
|
<div className="mt-4">
|
||||||
<RegisterCta event={event} />
|
<RegisterCta event={event} />
|
||||||
</div>
|
</div>
|
||||||
|
{event.allowSponsorships && <SponsorSpot eventId={event.id} eventTitle={event.title} />}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -0,0 +1,130 @@
|
|||||||
|
"use client";
|
||||||
|
import React, { useEffect, useState } from "react";
|
||||||
|
import { useParams } from "next/navigation";
|
||||||
|
import { Navbar } from "@/components/layout/Navbar";
|
||||||
|
import { Footer } from "@/components/layout/Footer";
|
||||||
|
import { apiFetch } from "@/lib/api";
|
||||||
|
import { formatDate } from "@/lib/date";
|
||||||
|
import { MessageSquareHeart, CheckCircle2 } from "lucide-react";
|
||||||
|
import { ExtraFieldInput, isExtraFieldType } from "@/components/shared/FormFieldExtras";
|
||||||
|
|
||||||
|
type Field = { id: string; type: string; label: string; isRequired: boolean; helpText: string | null; options: unknown };
|
||||||
|
type FeedbackInfo = {
|
||||||
|
event: { title: string; startDate: string };
|
||||||
|
name: string;
|
||||||
|
intro: string | null;
|
||||||
|
anonymous: boolean;
|
||||||
|
responded: boolean;
|
||||||
|
fields: Field[];
|
||||||
|
};
|
||||||
|
|
||||||
|
const inputCls = "w-full border rounded-lg px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-brand-400";
|
||||||
|
|
||||||
|
/** Public page an attendee opens from their post-event feedback email or WhatsApp. */
|
||||||
|
export default function FeedbackPage() {
|
||||||
|
const params = useParams<{ token: string }>();
|
||||||
|
const token = params?.token;
|
||||||
|
const [info, setInfo] = useState<FeedbackInfo | null>(null);
|
||||||
|
const [loadError, setLoadError] = useState<string | null>(null);
|
||||||
|
const [answers, setAnswers] = useState<Record<string, string>>({});
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
const [busy, setBusy] = useState(false);
|
||||||
|
const [done, setDone] = useState(false);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!token) return;
|
||||||
|
apiFetch<FeedbackInfo>(`/api/feedback/public/${encodeURIComponent(token)}`)
|
||||||
|
.then(setInfo)
|
||||||
|
.catch(e => setLoadError(e?.message || "This feedback link isn't valid."));
|
||||||
|
}, [token]);
|
||||||
|
|
||||||
|
const set = (id: string, v: string) => setAnswers(prev => ({ ...prev, [id]: v }));
|
||||||
|
const submit = async (e: React.FormEvent) => {
|
||||||
|
e.preventDefault();
|
||||||
|
setBusy(true);
|
||||||
|
setError(null);
|
||||||
|
try {
|
||||||
|
await apiFetch(`/api/feedback/public/${encodeURIComponent(token!)}`, { method: "POST", body: { answers } });
|
||||||
|
setDone(true);
|
||||||
|
} catch (err: any) {
|
||||||
|
setError(err?.message || "Couldn't send your feedback");
|
||||||
|
} finally {
|
||||||
|
setBusy(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="min-h-screen flex flex-col bg-gray-50">
|
||||||
|
<Navbar />
|
||||||
|
<main className="flex-1 max-w-2xl w-full mx-auto p-4 sm:p-6">
|
||||||
|
<div className="flex items-center gap-3 mb-4">
|
||||||
|
<div className="w-10 h-10 rounded-xl bg-brand-50 flex items-center justify-center shrink-0">
|
||||||
|
<MessageSquareHeart className="w-5 h-5 text-brand-600" />
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<h1 className="text-2xl font-semibold text-gray-900">{info ? `How was ${info.event.title}?` : "Feedback"}</h1>
|
||||||
|
{info && <p className="text-sm text-gray-500">{formatDate(new Date(info.event.startDate))}</p>}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{loadError && <div className="p-4 border rounded-xl bg-white text-sm text-gray-700">{loadError}</div>}
|
||||||
|
|
||||||
|
{info && (done || info.responded) && (
|
||||||
|
<div className="p-5 border rounded-xl bg-white shadow-sm flex items-start gap-3">
|
||||||
|
<CheckCircle2 className="w-6 h-6 text-green-600 shrink-0" />
|
||||||
|
<div>
|
||||||
|
<div className="font-semibold">Thank you{info.name ? `, ${info.name.split(" ")[0]}` : ""}!</div>
|
||||||
|
<p className="text-sm text-gray-600">{done ? "Your feedback has been sent." : "You've already given feedback for this event."} It really helps us plan the next one.</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{info && !done && !info.responded && (
|
||||||
|
<form onSubmit={submit} className="p-5 border rounded-xl bg-white shadow-sm space-y-5">
|
||||||
|
{info.intro && <p className="text-sm text-gray-700 whitespace-pre-line">{info.intro}</p>}
|
||||||
|
<p className="text-xs text-gray-500">{info.anonymous ? "Your answers are anonymous — they aren't linked to your name." : `Answering as ${info.name}.`}</p>
|
||||||
|
{info.fields.map(f => (
|
||||||
|
<div key={f.id}>
|
||||||
|
{f.type === "statement" ? (
|
||||||
|
<p className="text-sm text-gray-700 whitespace-pre-line">{f.label}</p>
|
||||||
|
) : f.type === "paragraph" ? (
|
||||||
|
<div className="text-sm text-gray-700">
|
||||||
|
<div className="font-medium mb-1">{f.label}</div>
|
||||||
|
{f.helpText && <div className="whitespace-pre-line">{f.helpText}</div>}
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<>
|
||||||
|
<label className="block text-sm font-medium text-gray-800 mb-1.5">{f.label}{f.isRequired && <span className="text-red-500"> *</span>}</label>
|
||||||
|
{isExtraFieldType(f.type) ? (
|
||||||
|
<ExtraFieldInput field={f} value={answers[f.id] || ""} onChange={v => set(f.id, v)} />
|
||||||
|
) : f.type === "yes_no" ? (
|
||||||
|
<div className="flex gap-4 text-sm">
|
||||||
|
{["yes", "no"].map(v => (
|
||||||
|
<label key={v} className="flex items-center gap-1.5 cursor-pointer">
|
||||||
|
<input type="radio" name={f.id} checked={answers[f.id] === v} onChange={() => set(f.id, v)} /> {v === "yes" ? "Yes" : "No"}
|
||||||
|
</label>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
) : f.type === "numeric" ? (
|
||||||
|
<input type="number" className={`${inputCls} sm:w-40`} value={answers[f.id] || ""} onChange={e => set(f.id, e.target.value)} />
|
||||||
|
) : f.type === "date" ? (
|
||||||
|
<input type="date" className={`${inputCls} sm:w-48`} value={answers[f.id] || ""} onChange={e => set(f.id, e.target.value)} />
|
||||||
|
) : (
|
||||||
|
<textarea className={inputCls} rows={3} value={answers[f.id] || ""} onChange={e => set(f.id, e.target.value)} maxLength={4000} />
|
||||||
|
)}
|
||||||
|
{f.helpText && <p className="text-xs text-gray-500 mt-1">{f.helpText}</p>}
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
{error && <div className="p-2 rounded bg-red-50 text-red-800 text-sm">{error}</div>}
|
||||||
|
<button type="submit" disabled={busy} className="px-4 py-2 rounded-lg bg-brand-600 text-white hover:bg-brand-700 disabled:opacity-50 font-medium">
|
||||||
|
{busy ? "Sending…" : "Send feedback"}
|
||||||
|
</button>
|
||||||
|
</form>
|
||||||
|
)}
|
||||||
|
</main>
|
||||||
|
<Footer />
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
import { ExtraFieldInput, isExtraFieldType } from "@/components/shared/FormFieldExtras";
|
||||||
import React, { Suspense, useEffect, useMemo, useState } from "react";
|
import React, { Suspense, useEffect, useMemo, useState } from "react";
|
||||||
import { useSearchParams, useRouter } from "next/navigation";
|
import { useSearchParams, useRouter } from "next/navigation";
|
||||||
import { useAuth } from "@/hooks/useAuth";
|
import { useAuth } from "@/hooks/useAuth";
|
||||||
@@ -8,7 +9,7 @@ import { Footer } from "@/components/layout/Footer";
|
|||||||
import { FileText } from "lucide-react";
|
import { FileText } from "lucide-react";
|
||||||
|
|
||||||
// Types for form fields
|
// Types for form fields
|
||||||
type FormField = { id: string; type: 'yes_no'|'text'|'date'|'numeric'|'statement'|'paragraph'; label: string; isRequired?: boolean; helpText?: string|null };
|
type FormField = { id: string; type: 'yes_no'|'text'|'date'|'numeric'|'statement'|'paragraph'|'rating'|'multiple_choice'; label: string; isRequired?: boolean; helpText?: string|null; options?: unknown };
|
||||||
|
|
||||||
function FormsContent() {
|
function FormsContent() {
|
||||||
const search = useSearchParams();
|
const search = useSearchParams();
|
||||||
@@ -249,7 +250,9 @@ function FormsContent() {
|
|||||||
) : (
|
) : (
|
||||||
<>
|
<>
|
||||||
<label className="block text-xs text-gray-600 mb-1">{f.label}{f.isRequired ? ' *' : ''}</label>
|
<label className="block text-xs text-gray-600 mb-1">{f.label}{f.isRequired ? ' *' : ''}</label>
|
||||||
{f.type === 'yes_no' ? (
|
{isExtraFieldType(f.type) ? (
|
||||||
|
<ExtraFieldInput field={f} idPrefix={`a${idx}`} value={formsData[idx]?.[f.id] || ''} onChange={v => setFormsData(prev => ({ ...prev, [idx]: { ...(prev[idx]||{}), [f.id]: v } }))} />
|
||||||
|
) : f.type === 'yes_no' ? (
|
||||||
<select className="border rounded px-2 py-1 text-sm" value={formsData[idx]?.[f.id] || ''} onChange={e => setFormsData(prev => ({ ...prev, [idx]: { ...(prev[idx]||{}), [f.id]: e.target.value } }))}>
|
<select className="border rounded px-2 py-1 text-sm" value={formsData[idx]?.[f.id] || ''} onChange={e => setFormsData(prev => ({ ...prev, [idx]: { ...(prev[idx]||{}), [f.id]: e.target.value } }))}>
|
||||||
<option value="">Select</option>
|
<option value="">Select</option>
|
||||||
<option value="yes">Yes</option>
|
<option value="yes">Yes</option>
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
import type { MetadataRoute } from "next";
|
||||||
|
|
||||||
|
// Lets staff "Add to home screen" and open the ticket scanner like an app (it also
|
||||||
|
// works offline once offline mode has been enabled — see public/sw.js).
|
||||||
|
export default function manifest(): MetadataRoute.Manifest {
|
||||||
|
return {
|
||||||
|
name: "Ticket scanner",
|
||||||
|
short_name: "Scanner",
|
||||||
|
description: "Scan event tickets, online or offline",
|
||||||
|
start_url: "/dashboard/staff/ticket-scanning",
|
||||||
|
scope: "/",
|
||||||
|
display: "standalone",
|
||||||
|
background_color: "#ffffff",
|
||||||
|
theme_color: "#4F46E5",
|
||||||
|
icons: [{ src: "/favicon.ico", sizes: "any", type: "image/x-icon" }],
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -44,6 +44,7 @@ type Event = {
|
|||||||
requiresAuth?: boolean;
|
requiresAuth?: boolean;
|
||||||
allowNamedAttendees?: boolean;
|
allowNamedAttendees?: boolean;
|
||||||
requiresParentalConsent?: boolean;
|
requiresParentalConsent?: boolean;
|
||||||
|
collectGender?: boolean;
|
||||||
waitlistEnabled?: boolean;
|
waitlistEnabled?: boolean;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -603,6 +604,7 @@ export default function RegisterForm({ event: baseEvent }: { event: Event }) {
|
|||||||
delivery={delivery}
|
delivery={delivery}
|
||||||
onDeliveryChange={setDelivery}
|
onDeliveryChange={setDelivery}
|
||||||
consentEventStart={isYouthEvent ? event.startDate : undefined}
|
consentEventStart={isYouthEvent ? event.startDate : undefined}
|
||||||
|
collectGender={!!event.collectGender}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
import { ExtraFieldInput, isExtraFieldType } from "@/components/shared/FormFieldExtras";
|
||||||
import React, { Suspense } from "react";
|
import React, { Suspense } from "react";
|
||||||
import { Navbar } from "@/components/layout/Navbar";
|
import { Navbar } from "@/components/layout/Navbar";
|
||||||
import { Footer } from "@/components/layout/Footer";
|
import { Footer } from "@/components/layout/Footer";
|
||||||
@@ -6,7 +7,7 @@ import { useSearchParams, useRouter } from "next/navigation";
|
|||||||
import { useAuth } from "@/hooks/useAuth";
|
import { useAuth } from "@/hooks/useAuth";
|
||||||
import { CheckCircle2 } from "lucide-react";
|
import { CheckCircle2 } from "lucide-react";
|
||||||
|
|
||||||
type FormField = { id: string; type: 'yes_no'|'text'|'date'|'numeric'|'statement'|'paragraph'; label: string; isRequired?: boolean; helpText?: string|null };
|
type FormField = { id: string; type: 'yes_no'|'text'|'date'|'numeric'|'statement'|'paragraph'|'rating'|'multiple_choice'; label: string; isRequired?: boolean; helpText?: string|null; options?: unknown };
|
||||||
|
|
||||||
function RegistrationSuccessContent() {
|
function RegistrationSuccessContent() {
|
||||||
const search = useSearchParams();
|
const search = useSearchParams();
|
||||||
@@ -242,7 +243,9 @@ function AttendeeForms({ reg, form, formsData, setFormsData, setError, setInfo }
|
|||||||
) : (
|
) : (
|
||||||
<>
|
<>
|
||||||
<label className="block text-xs text-gray-600 mb-1">{f.label}{f.isRequired ? ' *' : ''}</label>
|
<label className="block text-xs text-gray-600 mb-1">{f.label}{f.isRequired ? ' *' : ''}</label>
|
||||||
{f.type === 'yes_no' ? (
|
{isExtraFieldType(f.type) ? (
|
||||||
|
<ExtraFieldInput field={f} idPrefix={`a${idx}`} value={formsData[idx]?.[f.id] || ''} onChange={v => update(idx, f.id, v)} />
|
||||||
|
) : f.type === 'yes_no' ? (
|
||||||
<select className="border rounded px-2 py-1 text-sm" value={formsData[idx]?.[f.id] || ''} onChange={e => update(idx, f.id, e.target.value)}>
|
<select className="border rounded px-2 py-1 text-sm" value={formsData[idx]?.[f.id] || ''} onChange={e => update(idx, f.id, e.target.value)}>
|
||||||
<option value="">Select</option>
|
<option value="">Select</option>
|
||||||
<option value="yes">Yes</option>
|
<option value="yes">Yes</option>
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
import { ExtraFieldInput, isExtraFieldType } from "@/components/shared/FormFieldExtras";
|
||||||
|
|
||||||
import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
|
import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
|
||||||
import { apiFetch } from "@/lib/api";
|
import { apiFetch } from "@/lib/api";
|
||||||
@@ -42,6 +43,7 @@ type KioskEvent = {
|
|||||||
form?: EventForm | null;
|
form?: EventForm | null;
|
||||||
allowNamedAttendees?: boolean;
|
allowNamedAttendees?: boolean;
|
||||||
requiresParentalConsent?: boolean;
|
requiresParentalConsent?: boolean;
|
||||||
|
collectGender?: boolean;
|
||||||
};
|
};
|
||||||
|
|
||||||
type Screen = "setup" | "form" | "eventform" | "confirmation";
|
type Screen = "setup" | "form" | "eventform" | "confirmation";
|
||||||
@@ -1025,6 +1027,7 @@ export default function SelfServicePage() {
|
|||||||
delivery={delivery}
|
delivery={delivery}
|
||||||
onDeliveryChange={setDelivery}
|
onDeliveryChange={setDelivery}
|
||||||
consentEventStart={selectedEvent.requiresParentalConsent ? selectedEvent.startDate : undefined}
|
consentEventStart={selectedEvent.requiresParentalConsent ? selectedEvent.startDate : undefined}
|
||||||
|
collectGender={!!selectedEvent.collectGender}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
@@ -1190,7 +1193,9 @@ export default function SelfServicePage() {
|
|||||||
{field.helpText && (
|
{field.helpText && (
|
||||||
<p className="text-xs text-gray-500 mb-1">{field.helpText}</p>
|
<p className="text-xs text-gray-500 mb-1">{field.helpText}</p>
|
||||||
)}
|
)}
|
||||||
{field.type === "yes_no" ? (
|
{isExtraFieldType(field.type) ? (
|
||||||
|
<ExtraFieldInput field={field} value={currentTicketAnswers[field.id] || ""} onChange={v => setCurrentTicketAnswers(a => ({ ...a, [field.id]: v }))} />
|
||||||
|
) : field.type === "yes_no" ? (
|
||||||
<div className="flex gap-4">
|
<div className="flex gap-4">
|
||||||
{["Yes", "No"].map((opt) => (
|
{["Yes", "No"].map((opt) => (
|
||||||
<label key={opt} className="flex items-center gap-2 cursor-pointer">
|
<label key={opt} className="flex items-center gap-2 cursor-pointer">
|
||||||
|
|||||||
@@ -0,0 +1,146 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import React, { useEffect, useState } from "react";
|
||||||
|
import { HeartHandshake, X } from "lucide-react";
|
||||||
|
import { apiFetch } from "@/lib/api";
|
||||||
|
import { useAuth } from "@/hooks/useAuth";
|
||||||
|
|
||||||
|
type Sponsorship = { enabled: boolean; open?: boolean; spotPrice?: number | null; showProgress?: boolean; goalSpots?: number | null; spotsFunded?: number | null; sponsors?: number | null };
|
||||||
|
|
||||||
|
const inputCls = "w-full border rounded-lg px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-brand-400";
|
||||||
|
const rand = (n: number) => `R${n.toLocaleString("en-ZA", { minimumFractionDigits: n % 1 ? 2 : 0, maximumFractionDigits: 2 })}`;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* "Sponsor a spot": progress towards the event's sponsorship goal, and a form to fund
|
||||||
|
* one or more spots (or any amount) for people who can't afford to come. Payment is
|
||||||
|
* through Yoco; the money lands in the event's sponsorship pool.
|
||||||
|
*/
|
||||||
|
export function SponsorSpot({ eventId, eventTitle }: { eventId: string; eventTitle: string }) {
|
||||||
|
const { token, user } = useAuth();
|
||||||
|
const [data, setData] = useState<Sponsorship | null>(null);
|
||||||
|
const [open, setOpen] = useState(false);
|
||||||
|
const [mode, setMode] = useState<"spots" | "amount">("spots");
|
||||||
|
const [spots, setSpots] = useState(1);
|
||||||
|
const [amount, setAmount] = useState("");
|
||||||
|
const [anonymous, setAnonymous] = useState(false);
|
||||||
|
const [sponsorName, setSponsorName] = useState("");
|
||||||
|
const [message, setMessage] = useState("");
|
||||||
|
const [guest, setGuest] = useState({ name: "", email: "" });
|
||||||
|
const [busy, setBusy] = useState(false);
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
const [returned, setReturned] = useState<string | null>(null);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
apiFetch<Sponsorship>(`/api/sponsorships/event/${encodeURIComponent(eventId)}`).then(setData).catch(() => setData(null));
|
||||||
|
try {
|
||||||
|
const s = new URLSearchParams(window.location.search).get("sponsored");
|
||||||
|
if (s) setReturned(s);
|
||||||
|
} catch { /* no window */ }
|
||||||
|
}, [eventId]);
|
||||||
|
|
||||||
|
if (!data?.enabled) return null;
|
||||||
|
const price = data.spotPrice || null;
|
||||||
|
const loggedIn = !!(token && user);
|
||||||
|
const total = mode === "spots" && price ? spots * price : Number(amount) || 0;
|
||||||
|
const goal = data.goalSpots || 0;
|
||||||
|
const funded = data.spotsFunded ?? 0;
|
||||||
|
|
||||||
|
const submit = async (e: React.FormEvent) => {
|
||||||
|
e.preventDefault();
|
||||||
|
setBusy(true);
|
||||||
|
setError(null);
|
||||||
|
try {
|
||||||
|
const res = await apiFetch<{ redirectUrl: string }>("/api/sponsorships/checkout", {
|
||||||
|
method: "POST",
|
||||||
|
...(loggedIn ? { authToken: token! } : {}),
|
||||||
|
body: {
|
||||||
|
eventId,
|
||||||
|
...(mode === "spots" && price ? { spots } : { amount: Number(amount) }),
|
||||||
|
anonymous,
|
||||||
|
...(!anonymous && sponsorName.trim() ? { sponsorName: sponsorName.trim() } : {}),
|
||||||
|
...(message.trim() ? { message: message.trim() } : {}),
|
||||||
|
...(!loggedIn ? { name: guest.name, email: guest.email } : {}),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
window.location.href = res.redirectUrl;
|
||||||
|
} catch (err: any) {
|
||||||
|
setError(err?.message || "Couldn't start the payment");
|
||||||
|
setBusy(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="mt-4 border-t pt-4 space-y-2">
|
||||||
|
{returned === "1" && <div className="text-sm rounded-lg bg-green-50 text-green-800 p-2">Thank you for sponsoring! Your receipt is on its way.</div>}
|
||||||
|
{returned === "failed" && <div className="text-sm rounded-lg bg-red-50 text-red-800 p-2">The payment didn't go through. You can try again.</div>}
|
||||||
|
{data.showProgress && price && (goal > 0 || funded > 0) && (
|
||||||
|
<div>
|
||||||
|
<div className="flex justify-between text-xs text-gray-600 mb-1">
|
||||||
|
<span>{goal > 0 ? `${Math.min(funded, goal)} of ${goal} spots sponsored` : `${funded} spot${funded === 1 ? "" : "s"} sponsored`}</span>
|
||||||
|
{data.sponsors ? <span>{data.sponsors} sponsor{data.sponsors === 1 ? "" : "s"}</span> : null}
|
||||||
|
</div>
|
||||||
|
{goal > 0 && (
|
||||||
|
<div className="h-2 rounded-full bg-gray-100 overflow-hidden" role="progressbar" aria-valuemin={0} aria-valuemax={goal} aria-valuenow={Math.min(funded, goal)}>
|
||||||
|
<div className="h-full bg-rose-500" style={{ width: `${Math.min(100, (funded / goal) * 100)}%` }} />
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{data.open && (
|
||||||
|
<button onClick={() => setOpen(true)} className="w-full inline-flex items-center justify-center gap-2 border border-rose-300 text-rose-700 px-4 py-2 rounded-lg hover:bg-rose-50 font-medium text-sm">
|
||||||
|
<HeartHandshake className="w-4 h-4" /> Sponsor a spot
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{open && (
|
||||||
|
<div className="fixed inset-0 bg-black/40 flex items-center justify-center z-50" onClick={() => setOpen(false)}>
|
||||||
|
<form onSubmit={submit} className="bg-white rounded-xl shadow-lg max-w-md w-full mx-4 p-5 space-y-3 max-h-[90vh] overflow-y-auto" onClick={e => e.stopPropagation()}>
|
||||||
|
<div className="flex items-center justify-between">
|
||||||
|
<h3 className="text-lg font-semibold flex items-center gap-2"><HeartHandshake className="w-5 h-5 text-rose-600" /> Sponsor a spot</h3>
|
||||||
|
<button type="button" onClick={() => setOpen(false)} aria-label="Close" className="p-1 rounded hover:bg-gray-100"><X className="w-4 h-4" /></button>
|
||||||
|
</div>
|
||||||
|
<p className="text-sm text-gray-600">Help someone come to {eventTitle} who couldn't otherwise afford it. Your gift goes into a sponsorship pool that the organisers use to cover places.</p>
|
||||||
|
|
||||||
|
{price ? (
|
||||||
|
<div className="flex gap-2 text-sm">
|
||||||
|
<button type="button" onClick={() => setMode("spots")} className={`flex-1 px-3 py-1.5 rounded-lg border ${mode === "spots" ? "bg-rose-600 text-white border-rose-600" : "hover:bg-gray-50"}`}>Whole spots</button>
|
||||||
|
<button type="button" onClick={() => setMode("amount")} className={`flex-1 px-3 py-1.5 rounded-lg border ${mode === "amount" ? "bg-rose-600 text-white border-rose-600" : "hover:bg-gray-50"}`}>Any amount</button>
|
||||||
|
</div>
|
||||||
|
) : null}
|
||||||
|
{mode === "spots" && price ? (
|
||||||
|
<div className="flex items-center gap-2 text-sm">
|
||||||
|
<input type="number" min={1} max={100} className={`${inputCls} w-24`} value={spots} onChange={e => setSpots(Math.max(1, Math.min(100, parseInt(e.target.value, 10) || 1)))} aria-label="Number of spots" />
|
||||||
|
<span>spot{spots === 1 ? "" : "s"} × {rand(price)} = <strong>{rand(spots * price)}</strong></span>
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<div>
|
||||||
|
<label className="block text-xs text-gray-600 mb-1">Amount (R)</label>
|
||||||
|
<input type="number" min={15} step="0.01" className={inputCls} value={amount} onChange={e => setAmount(e.target.value)} placeholder="e.g. 200" required />
|
||||||
|
<p className="text-xs text-gray-500 mt-1">Minimum R15.</p>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{!loggedIn && (
|
||||||
|
<div className="grid grid-cols-1 sm:grid-cols-2 gap-2">
|
||||||
|
<input className={inputCls} placeholder="Your name" value={guest.name} onChange={e => setGuest({ ...guest, name: e.target.value })} required />
|
||||||
|
<input type="email" className={inputCls} placeholder="Email (for your receipt)" value={guest.email} onChange={e => setGuest({ ...guest, email: e.target.value })} required />
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||||
|
<input type="checkbox" checked={anonymous} onChange={e => setAnonymous(e.target.checked)} /> Give anonymously
|
||||||
|
</label>
|
||||||
|
{!anonymous && (
|
||||||
|
<input className={inputCls} placeholder={`Name to show the organisers (e.g. "The Smith family")`} value={sponsorName} onChange={e => setSponsorName(e.target.value)} maxLength={100} />
|
||||||
|
)}
|
||||||
|
<textarea className={inputCls} rows={2} placeholder="A message for the organisers (optional)" value={message} onChange={e => setMessage(e.target.value)} maxLength={300} />
|
||||||
|
<p className="text-xs text-gray-500">You'll get a receipt by email. We never share who is helped by sponsorships.</p>
|
||||||
|
{error && <div className="p-2 rounded bg-red-50 text-red-800 text-sm">{error}</div>}
|
||||||
|
<button type="submit" disabled={busy || !(total >= 15)} className="w-full px-4 py-2 rounded-lg bg-rose-600 text-white hover:bg-rose-700 disabled:opacity-50 font-medium">
|
||||||
|
{busy ? "Opening payment…" : `Pay ${total > 0 ? rand(total) : ""} securely`}
|
||||||
|
</button>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -16,6 +16,7 @@ import {
|
|||||||
TicketPercent,
|
TicketPercent,
|
||||||
ShieldCheck,
|
ShieldCheck,
|
||||||
HeartPulse,
|
HeartPulse,
|
||||||
|
MessageSquareHeart,
|
||||||
} from "lucide-react";
|
} from "lucide-react";
|
||||||
|
|
||||||
export type ReportCategory = "Financial" | "Registration" | "Ticketing" | "Donations" | "Cashup" | "Other";
|
export type ReportCategory = "Financial" | "Registration" | "Ticketing" | "Donations" | "Cashup" | "Other";
|
||||||
@@ -37,6 +38,7 @@ export const REPORTS = [
|
|||||||
{ key: "profitReport", label: "Profit report", description: "View profit report", category: "Financial", icon: BarChart3, fields: 5 },
|
{ key: "profitReport", label: "Profit report", description: "View profit report", category: "Financial", icon: BarChart3, fields: 5 },
|
||||||
{ key: "cashupAudit", label: "Cashup audit trail", description: "Audit trail of cashup actions", category: "Cashup", icon: ClipboardList, fields: 6 },
|
{ key: "cashupAudit", label: "Cashup audit trail", description: "Audit trail of cashup actions", category: "Cashup", icon: ClipboardList, fields: 6 },
|
||||||
{ key: "consentStatus", label: "Parental consent status", description: "Youth events: consent per attendee", category: "Registration", icon: ShieldCheck, fields: 5 },
|
{ key: "consentStatus", label: "Parental consent status", description: "Youth events: consent per attendee", category: "Registration", icon: ShieldCheck, fields: 5 },
|
||||||
|
{ key: "feedbackSummary", label: "Feedback summary", description: "Post-event feedback: ratings, choices and comments; compare events", category: "Registration", icon: MessageSquareHeart, fields: 4 },
|
||||||
{ key: "medicalList", label: "Medical & emergency list", description: "Youth events: confidential list for leaders (audited)", category: "Registration", icon: HeartPulse, fields: 5 },
|
{ key: "medicalList", label: "Medical & emergency list", description: "Youth events: confidential list for leaders (audited)", category: "Registration", icon: HeartPulse, fields: 5 },
|
||||||
{ key: "discounts", label: "Discounts (coupon codes)", description: "Uses and value given away per code and event", category: "Financial", icon: TicketPercent, fields: 4 },
|
{ key: "discounts", label: "Discounts (coupon codes)", description: "Uses and value given away per code and event", category: "Financial", icon: TicketPercent, fields: 4 },
|
||||||
] as const satisfies ReadonlyArray<{
|
] as const satisfies ReadonlyArray<{
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import { useSearchParams } from "next/navigation";
|
|||||||
import { useAuth } from "@/hooks/useAuth";
|
import { useAuth } from "@/hooks/useAuth";
|
||||||
import { apiFetch, API_BASE } from "@/lib/api";
|
import { apiFetch, API_BASE } from "@/lib/api";
|
||||||
import { downloadReportExcel, emailReportPdf, whatsappReportPdf, viewReportPdf, type ReportPdfPayload } from "@/lib/export";
|
import { downloadReportExcel, emailReportPdf, whatsappReportPdf, viewReportPdf, type ReportPdfPayload } from "@/lib/export";
|
||||||
import { Printer, Mail, FileSpreadsheet, MessageCircle, ShoppingCart, CreditCard, Gift, Clock, HandHeart, Search, TrendingUp, TicketPercent, ShieldCheck } from "lucide-react";
|
import { Printer, Mail, FileSpreadsheet, MessageCircle, ShoppingCart, CreditCard, Gift, Clock, HandHeart, Search, TrendingUp, TicketPercent, ShieldCheck, Star, MessageSquareHeart, Send } from "lucide-react";
|
||||||
import { REPORTS, type ReportKey } from "./ReportCatalog";
|
import { REPORTS, type ReportKey } from "./ReportCatalog";
|
||||||
import ReportsShell from "./ReportsShell";
|
import ReportsShell from "./ReportsShell";
|
||||||
import ReportViewerModal, { ReportActionButton } from "./ReportViewerModal";
|
import ReportViewerModal, { ReportActionButton } from "./ReportViewerModal";
|
||||||
@@ -177,6 +177,8 @@ export default function ReportsV2({ onBack }: { onBack?: () => void } = {}) {
|
|||||||
// Youth events (one row per attendee), each tagged with its event title.
|
// Youth events (one row per attendee), each tagged with its event title.
|
||||||
const [consentRows, setConsentRows] = useState<any[]>([]);
|
const [consentRows, setConsentRows] = useState<any[]>([]);
|
||||||
const [medicalRows, setMedicalRows] = useState<any[]>([]);
|
const [medicalRows, setMedicalRows] = useState<any[]>([]);
|
||||||
|
// Post-event feedback, one entry per event that had a feedback form.
|
||||||
|
const [feedbackRows, setFeedbackRows] = useState<any[]>([]);
|
||||||
|
|
||||||
// Deep-linking: dashboards link here with ?report=<key>&range=trailing_month to jump
|
// Deep-linking: dashboards link here with ?report=<key>&range=trailing_month to jump
|
||||||
// straight into a specific report, pre-filtered to every currently-visible event and the
|
// straight into a specific report, pre-filtered to every currently-visible event and the
|
||||||
@@ -286,6 +288,15 @@ export default function ReportsV2({ onBack }: { onBack?: () => void } = {}) {
|
|||||||
return byEv;
|
return byEv;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const loadFeedback = async (eventIds: string[]) => {
|
||||||
|
if (!token || !eventIds.length) return [] as any[];
|
||||||
|
try {
|
||||||
|
return await apiFetch<any[]>(`/api/feedback/summary?eventIds=${encodeURIComponent(eventIds.join(","))}`, { authToken: token });
|
||||||
|
} catch {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
// Coupon uses (active redemptions on non-cancelled registrations) for the Discounts report.
|
// Coupon uses (active redemptions on non-cancelled registrations) for the Discounts report.
|
||||||
const loadDiscounts = async (eventIds: string[]) => {
|
const loadDiscounts = async (eventIds: string[]) => {
|
||||||
if (!token || !eventIds.length) return [] as any[];
|
if (!token || !eventIds.length) return [] as any[];
|
||||||
@@ -352,6 +363,29 @@ export default function ReportsV2({ onBack }: { onBack?: () => void } = {}) {
|
|||||||
};
|
};
|
||||||
}, [discountRows]);
|
}, [discountRows]);
|
||||||
|
|
||||||
|
// Feedback summary: overall numbers, and the average star rating per event (for comparing events).
|
||||||
|
const feedbackSummary = useMemo(() => {
|
||||||
|
const invited = feedbackRows.reduce((s, f) => s + (f.invited || 0), 0);
|
||||||
|
const responses = feedbackRows.reduce((s, f) => s + (f.responses || 0), 0);
|
||||||
|
const ratingOf = (f: any) => {
|
||||||
|
const avgs = (f.questions || []).filter((q: any) => q.type === "rating" && q.average != null).map((q: any) => q.average);
|
||||||
|
return avgs.length ? Math.round((avgs.reduce((s: number, n: number) => s + n, 0) / avgs.length) * 10) / 10 : null;
|
||||||
|
};
|
||||||
|
const perEvent = feedbackRows.map(f => ({ ...f, rating: ratingOf(f) }));
|
||||||
|
const rated = perEvent.filter(f => f.rating != null);
|
||||||
|
return {
|
||||||
|
perEvent, invited, responses,
|
||||||
|
rate: invited ? Math.round((responses / invited) * 100) : null,
|
||||||
|
rating: rated.length ? Math.round((rated.reduce((s, f) => s + f.rating, 0) / rated.length) * 10) / 10 : null,
|
||||||
|
chart: rated.map(f => ({ label: f.title, value: f.rating })),
|
||||||
|
};
|
||||||
|
}, [feedbackRows]);
|
||||||
|
const feedbackResult = (q: any) =>
|
||||||
|
q.type === "rating" ? (q.average != null ? `${q.average} / 5` : "—")
|
||||||
|
: q.type === "numeric" ? (q.average != null ? `average ${q.average}` : "—")
|
||||||
|
: q.counts ? q.counts.map((c: any) => `${c.label}: ${c.value}`).join(" · ")
|
||||||
|
: `${(q.texts || []).length} answer(s)`;
|
||||||
|
|
||||||
// View handler according to selected report
|
// View handler according to selected report
|
||||||
const onView = async () => {
|
const onView = async () => {
|
||||||
setBusy(true);
|
setBusy(true);
|
||||||
@@ -409,6 +443,8 @@ export default function ReportsV2({ onBack }: { onBack?: () => void } = {}) {
|
|||||||
setDiscountRows(await loadDiscounts(selectedEventIds));
|
setDiscountRows(await loadDiscounts(selectedEventIds));
|
||||||
} else if (report === "consentStatus") {
|
} else if (report === "consentStatus") {
|
||||||
setConsentRows(await loadConsent(selectedEventIds, "status"));
|
setConsentRows(await loadConsent(selectedEventIds, "status"));
|
||||||
|
} else if (report === "feedbackSummary") {
|
||||||
|
setFeedbackRows(await loadFeedback(selectedEventIds));
|
||||||
} else if (report === "medicalList") {
|
} else if (report === "medicalList") {
|
||||||
setMedicalRows(await loadConsent(selectedEventIds, "medical"));
|
setMedicalRows(await loadConsent(selectedEventIds, "medical"));
|
||||||
}
|
}
|
||||||
@@ -970,7 +1006,10 @@ export default function ReportsV2({ onBack }: { onBack?: () => void } = {}) {
|
|||||||
const used = dons.reduce((s: number, p: any) => s + usedFor(evId, p.id), 0);
|
const used = dons.reduce((s: number, p: any) => s + usedFor(evId, p.id), 0);
|
||||||
const unused = Math.max(total - used, 0);
|
const unused = Math.max(total - used, 0);
|
||||||
grandTotal += total; grandUsed += used;
|
grandTotal += total; grandUsed += used;
|
||||||
rows.push([ev?.title || evId, Number(total.toFixed(2)), Number(used.toFixed(2)), Number(unused.toFixed(2)), dons.length]);
|
const pool = dons.filter((p: any) => p.isSponsorship);
|
||||||
|
const poolIn = pool.reduce((s: number, p: any) => s + (p.amount || 0), 0);
|
||||||
|
const poolUsed = pool.reduce((s: number, p: any) => s + usedFor(evId, p.id), 0);
|
||||||
|
rows.push([ev?.title || evId, Number(total.toFixed(2)), Number(used.toFixed(2)), Number(unused.toFixed(2)), dons.length, Number(poolIn.toFixed(2)), Number(poolUsed.toFixed(2)), Number(Math.max(poolIn - poolUsed, 0).toFixed(2))]);
|
||||||
});
|
});
|
||||||
const grandUnused = Math.max(grandTotal - grandUsed, 0);
|
const grandUnused = Math.max(grandTotal - grandUsed, 0);
|
||||||
return {
|
return {
|
||||||
@@ -981,7 +1020,7 @@ export default function ReportsV2({ onBack }: { onBack?: () => void } = {}) {
|
|||||||
{ label: 'Unused', value: `R ${grandUnused.toFixed(2)}`, tone: 'amber' },
|
{ label: 'Unused', value: `R ${grandUnused.toFixed(2)}`, tone: 'amber' },
|
||||||
],
|
],
|
||||||
chart: { title: 'Used vs. unused, across all selected events', data: [{ label: "Used", value: grandUsed, displayValue: `R ${grandUsed.toFixed(2)}` }, { label: "Unused", value: grandUnused, displayValue: `R ${grandUnused.toFixed(2)}` }] },
|
chart: { title: 'Used vs. unused, across all selected events', data: [{ label: "Used", value: grandUsed, displayValue: `R ${grandUsed.toFixed(2)}` }, { label: "Unused", value: grandUnused, displayValue: `R ${grandUnused.toFixed(2)}` }] },
|
||||||
table: { columns: ["Event", "Donations (R)", "Used (R)", "Unused (R)", "Count"], rows }
|
table: { columns: ["Event", "Donations (R)", "Used (R)", "Unused (R)", "Count", "Sponsorship pool (R)", "Pool assigned (R)", "Pool remaining (R)"], rows }
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
if (report === "consentStatus") {
|
if (report === "consentStatus") {
|
||||||
@@ -1001,6 +1040,25 @@ export default function ReportsV2({ onBack }: { onBack?: () => void } = {}) {
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
if (report === "feedbackSummary") {
|
||||||
|
const rows: (string | number)[][] = [];
|
||||||
|
for (const f of feedbackSummary.perEvent) {
|
||||||
|
for (const q of f.questions || []) {
|
||||||
|
rows.push([f.title, q.label, q.answered, feedbackResult(q)]);
|
||||||
|
for (const t of q.texts || []) rows.push(["", ` “${t.value}”`, "", t.name || ""]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
title: 'Feedback summary', subtitle, kind: 'table', orientation: 'landscape',
|
||||||
|
stats: [
|
||||||
|
{ label: 'Responses', value: String(feedbackSummary.responses), tone: 'violet' },
|
||||||
|
{ label: 'Response rate', value: feedbackSummary.rate != null ? `${feedbackSummary.rate}%` : '—', tone: 'blue' },
|
||||||
|
{ label: 'Average rating', value: feedbackSummary.rating != null ? `${feedbackSummary.rating} / 5` : '—', tone: 'amber' },
|
||||||
|
],
|
||||||
|
...(feedbackSummary.chart.length > 1 ? { chart: { title: 'Average rating, by event', data: feedbackSummary.chart.map(c => ({ ...c, displayValue: `${c.value} / 5` })) } } : {}),
|
||||||
|
table: { columns: ["Event", "Question", "Answered", "Result"], rows },
|
||||||
|
};
|
||||||
|
}
|
||||||
if (report === "medicalList") {
|
if (report === "medicalList") {
|
||||||
const fmt = (m: any) => m ? [m.allergies && `Allergies: ${m.allergies}`, m.medication && `Medication: ${m.medication}`, m.conditions && `Conditions: ${m.conditions}`, m.medicalAid && `Medical aid: ${m.medicalAid}`].filter(Boolean).join('; ') : '';
|
const fmt = (m: any) => m ? [m.allergies && `Allergies: ${m.allergies}`, m.medication && `Medication: ${m.medication}`, m.conditions && `Conditions: ${m.conditions}`, m.medicalAid && `Medical aid: ${m.medicalAid}`].filter(Boolean).join('; ') : '';
|
||||||
return {
|
return {
|
||||||
@@ -1669,6 +1727,61 @@ export default function ReportsV2({ onBack }: { onBack?: () => void } = {}) {
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
{report === "feedbackSummary" && (
|
||||||
|
<div>
|
||||||
|
{feedbackSummary.perEvent.length === 0 ? (
|
||||||
|
<div className="text-sm text-gray-500">None of the selected events has a feedback form. Add one in the event wizard's Feedback step.</div>
|
||||||
|
) : (
|
||||||
|
<>
|
||||||
|
<StatTileRow>
|
||||||
|
<StatTile icon={MessageSquareHeart} label="Responses" value={String(feedbackSummary.responses)} tone="violet" />
|
||||||
|
<StatTile icon={Send} label="Response rate" value={feedbackSummary.rate != null ? `${feedbackSummary.rate}%` : "—"} tone="blue" />
|
||||||
|
<StatTile icon={Star} label="Average rating" value={feedbackSummary.rating != null ? `${feedbackSummary.rating} / 5` : "—"} tone="amber" />
|
||||||
|
</StatTileRow>
|
||||||
|
{feedbackSummary.chart.length > 1 && (
|
||||||
|
<div className="mt-4 border border-gray-100 rounded-xl p-4">
|
||||||
|
<div className="text-xs text-gray-500 mb-3">Average rating, by event</div>
|
||||||
|
<HorizontalBarChart data={feedbackSummary.chart} valueFormatter={v => `${v} / 5`} />
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{feedbackSummary.perEvent.map((f: any) => (
|
||||||
|
<div key={f.eventId} className="mt-4 border border-gray-100 rounded-xl p-4">
|
||||||
|
<div className="flex flex-wrap items-baseline justify-between gap-2 mb-3">
|
||||||
|
<div className="font-semibold">{f.title}</div>
|
||||||
|
<div className="text-xs text-gray-500">
|
||||||
|
{f.sentAt ? `${f.responses} of ${f.invited} responded${f.responseRate != null ? ` (${f.responseRate}%)` : ""}` : "Not sent yet"}{f.anonymous ? " · anonymous" : ""}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="space-y-4">
|
||||||
|
{(f.questions || []).map((q: any) => (
|
||||||
|
<div key={q.fieldId}>
|
||||||
|
<div className="text-sm font-medium text-gray-800">{q.label} <span className="text-xs font-normal text-gray-500">· {q.answered} answer(s)</span></div>
|
||||||
|
{q.type === "rating" && (
|
||||||
|
<div className="mt-1">
|
||||||
|
<div className="text-sm"><span className="text-lg font-semibold">{q.average ?? "—"}</span> / 5</div>
|
||||||
|
<HorizontalBarChart data={q.distribution} valueFormatter={v => String(v)} />
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{q.counts && <div className="mt-1"><HorizontalBarChart data={q.counts} valueFormatter={v => String(v)} /></div>}
|
||||||
|
{q.type === "numeric" && <div className="text-sm mt-1">Average: {q.average ?? "—"}</div>}
|
||||||
|
{q.texts && (
|
||||||
|
q.texts.length === 0 ? <div className="text-xs text-gray-500 mt-1">No answers.</div> : (
|
||||||
|
<ul className="mt-1 space-y-1 max-h-64 overflow-auto">
|
||||||
|
{q.texts.map((t: any, i: number) => (
|
||||||
|
<li key={i} className="text-sm text-gray-700 border-l-2 border-gray-200 pl-2">{t.value}{t.name && <span className="text-xs text-gray-500"> — {t.name}</span>}</li>
|
||||||
|
))}
|
||||||
|
</ul>
|
||||||
|
)
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
{(report === "consentStatus" || report === "medicalList") && (() => {
|
{(report === "consentStatus" || report === "medicalList") && (() => {
|
||||||
const payload: any = buildReportPayload();
|
const payload: any = buildReportPayload();
|
||||||
const rows: any[] = payload?.table?.rows || [];
|
const rows: any[] = payload?.table?.rows || [];
|
||||||
@@ -1775,7 +1888,10 @@ export default function ReportsV2({ onBack }: { onBack?: () => void } = {}) {
|
|||||||
const used = dons.reduce((s: number, p: any) => s + usedFor(evId, p.id), 0);
|
const used = dons.reduce((s: number, p: any) => s + usedFor(evId, p.id), 0);
|
||||||
const unused = Math.max(total - used, 0);
|
const unused = Math.max(total - used, 0);
|
||||||
grandTotal += total; grandUsed += used; grandCount += dons.length;
|
grandTotal += total; grandUsed += used; grandCount += dons.length;
|
||||||
return { evId, title: ev?.title || evId, total, used, unused, count: dons.length };
|
const pool = dons.filter((p: any) => p.isSponsorship);
|
||||||
|
const poolIn = pool.reduce((s: number, p: any) => s + (p.amount || 0), 0);
|
||||||
|
const poolUsed = pool.reduce((s: number, p: any) => s + usedFor(evId, p.id), 0);
|
||||||
|
return { evId, title: ev?.title || evId, total, used, unused, count: dons.length, poolIn, poolUsed, poolLeft: Math.max(poolIn - poolUsed, 0) };
|
||||||
});
|
});
|
||||||
const grandUnused = Math.max(grandTotal - grandUsed, 0);
|
const grandUnused = Math.max(grandTotal - grandUsed, 0);
|
||||||
return (
|
return (
|
||||||
@@ -1799,6 +1915,9 @@ export default function ReportsV2({ onBack }: { onBack?: () => void } = {}) {
|
|||||||
<th className="py-2 px-3 text-right">Unused (R)</th>
|
<th className="py-2 px-3 text-right">Unused (R)</th>
|
||||||
<th className="py-2 px-3 text-right">Count</th>
|
<th className="py-2 px-3 text-right">Count</th>
|
||||||
<th className="py-2 px-3 text-right">Avg (R)</th>
|
<th className="py-2 px-3 text-right">Avg (R)</th>
|
||||||
|
<th className="py-2 px-3 text-right">Sponsorship pool (R)</th>
|
||||||
|
<th className="py-2 px-3 text-right">Pool assigned (R)</th>
|
||||||
|
<th className="py-2 px-3 text-right">Pool remaining (R)</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
@@ -1810,6 +1929,9 @@ export default function ReportsV2({ onBack }: { onBack?: () => void } = {}) {
|
|||||||
<td className="py-2 px-3 text-right">R {row.unused.toFixed(2)}</td>
|
<td className="py-2 px-3 text-right">R {row.unused.toFixed(2)}</td>
|
||||||
<td className="py-2 px-3 text-right">{row.count}</td>
|
<td className="py-2 px-3 text-right">{row.count}</td>
|
||||||
<td className="py-2 px-3 text-right">{row.count ? `R ${(row.total / row.count).toFixed(2)}` : '-'}</td>
|
<td className="py-2 px-3 text-right">{row.count ? `R ${(row.total / row.count).toFixed(2)}` : '-'}</td>
|
||||||
|
<td className="py-2 px-3 text-right">R {row.poolIn.toFixed(2)}</td>
|
||||||
|
<td className="py-2 px-3 text-right">R {row.poolUsed.toFixed(2)}</td>
|
||||||
|
<td className="py-2 px-3 text-right">R {row.poolLeft.toFixed(2)}</td>
|
||||||
</tr>
|
</tr>
|
||||||
))}
|
))}
|
||||||
<tr className="font-semibold bg-gray-50 border-t border-gray-200">
|
<tr className="font-semibold bg-gray-50 border-t border-gray-200">
|
||||||
@@ -1819,6 +1941,9 @@ export default function ReportsV2({ onBack }: { onBack?: () => void } = {}) {
|
|||||||
<td className="py-2 px-3 text-right">R {grandUnused.toFixed(2)}</td>
|
<td className="py-2 px-3 text-right">R {grandUnused.toFixed(2)}</td>
|
||||||
<td className="py-2 px-3 text-right">{grandCount}</td>
|
<td className="py-2 px-3 text-right">{grandCount}</td>
|
||||||
<td className="py-2 px-3"></td>
|
<td className="py-2 px-3"></td>
|
||||||
|
<td className="py-2 px-3 text-right">R {perEvent.reduce((s, r) => s + r.poolIn, 0).toFixed(2)}</td>
|
||||||
|
<td className="py-2 px-3 text-right">R {perEvent.reduce((s, r) => s + r.poolUsed, 0).toFixed(2)}</td>
|
||||||
|
<td className="py-2 px-3 text-right">R {perEvent.reduce((s, r) => s + r.poolLeft, 0).toFixed(2)}</td>
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
|||||||
@@ -0,0 +1,106 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import React, { useEffect, useState } from "react";
|
||||||
|
import { Wifi, WifiOff, CloudUpload, Lock } from "lucide-react";
|
||||||
|
import { apiFetch } from "@/lib/api";
|
||||||
|
import type { OtherLock } from "./useOfflineScanning";
|
||||||
|
|
||||||
|
type Offline = ReturnType<typeof import("./useOfflineScanning").useOfflineScanning>;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Offline-mode controls above the scanner: shows who holds which section, lets this
|
||||||
|
* device lock the selected section and download its tickets, and shows the sync queue.
|
||||||
|
*/
|
||||||
|
export function OfflineScanPanel({ offline, token, eventId, eventTitle, sectionId, sectionName, onError, onInfo }: {
|
||||||
|
offline: Offline;
|
||||||
|
token: string | null;
|
||||||
|
eventId: string;
|
||||||
|
eventTitle: string;
|
||||||
|
sectionId: string | null;
|
||||||
|
sectionName: string | null;
|
||||||
|
onError: (m: string) => void;
|
||||||
|
onInfo: (m: string) => void;
|
||||||
|
}) {
|
||||||
|
const [locks, setLocks] = useState<OtherLock[]>([]);
|
||||||
|
const [busy, setBusy] = useState(false);
|
||||||
|
const { lock, pending, online, syncing } = offline;
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!token || !eventId || eventId === "all" || !online) { setLocks([]); return; }
|
||||||
|
apiFetch<OtherLock[]>(`/api/scan-locks?eventId=${encodeURIComponent(eventId)}`, { authToken: token })
|
||||||
|
.then(setLocks).catch(() => setLocks([]));
|
||||||
|
}, [token, eventId, online, lock]);
|
||||||
|
|
||||||
|
const others = locks.filter(l => l.deviceId !== offline.deviceId());
|
||||||
|
|
||||||
|
const enable = async () => {
|
||||||
|
setBusy(true);
|
||||||
|
try {
|
||||||
|
const n = await offline.enable(eventId, eventTitle, sectionId, sectionName);
|
||||||
|
onInfo(`Offline mode on — ${n} ticket(s) downloaded. You can keep scanning without a connection.`);
|
||||||
|
} catch (e: any) {
|
||||||
|
onError(e?.message || "Couldn't turn on offline mode");
|
||||||
|
} finally {
|
||||||
|
setBusy(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
const release = async () => {
|
||||||
|
setBusy(true);
|
||||||
|
try {
|
||||||
|
await offline.release();
|
||||||
|
onInfo("Offline mode ended and the section is unlocked.");
|
||||||
|
} catch (e: any) {
|
||||||
|
onError(e?.message || "Couldn't end offline mode");
|
||||||
|
} finally {
|
||||||
|
setBusy(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
const syncNow = async () => {
|
||||||
|
try {
|
||||||
|
const r = await offline.sync();
|
||||||
|
if (r) onInfo(`Synced ${r.accepted} scan(s)${r.conflicts ? ` — ${r.conflicts} need a supervisor to review` : ""}.`);
|
||||||
|
} catch (e: any) {
|
||||||
|
onError(e?.message || "Sync failed — scans are kept on this device and will retry.");
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className={`rounded-xl border p-3 mb-4 text-sm ${lock ? "bg-amber-50 border-amber-200" : "bg-white"}`}>
|
||||||
|
<div className="flex flex-wrap items-center gap-2">
|
||||||
|
{online ? <Wifi className="w-4 h-4 text-green-600" /> : <WifiOff className="w-4 h-4 text-red-600" />}
|
||||||
|
<span className={online ? "text-green-700" : "text-red-700"}>{online ? "Online" : "Offline"}</span>
|
||||||
|
{lock ? (
|
||||||
|
<>
|
||||||
|
<span className="text-gray-400">·</span>
|
||||||
|
<span className="font-medium text-amber-900">Offline mode: {lock.eventTitle}{lock.sectionName ? ` — ${lock.sectionName}` : " — whole event"}</span>
|
||||||
|
<span className="text-xs text-gray-600">Ticket list downloaded at {new Date(lock.snapshotAt).toLocaleTimeString()}</span>
|
||||||
|
<span className="text-xs text-gray-600">· {pending} scan(s) waiting to sync</span>
|
||||||
|
<div className="ml-auto flex gap-2">
|
||||||
|
<button onClick={syncNow} disabled={!online || syncing || pending === 0} className="inline-flex items-center gap-1 px-2.5 py-1 rounded border bg-white text-xs disabled:opacity-50"><CloudUpload className="w-3.5 h-3.5" /> {syncing ? "Syncing…" : "Sync now"}</button>
|
||||||
|
<button onClick={release} disabled={!online || busy} className="px-2.5 py-1 rounded bg-amber-600 text-white text-xs disabled:opacity-50">Release section</button>
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
) : eventId && eventId !== "all" ? (
|
||||||
|
<div className="ml-auto">
|
||||||
|
<button onClick={enable} disabled={!online || busy || others.some(l => !l.sectionId || !sectionId || l.sectionId === sectionId)} className="px-2.5 py-1 rounded border border-brand-300 text-brand-700 text-xs hover:bg-brand-50 disabled:opacity-50" title="Lock this section to this device and download its tickets, so you can keep scanning if the connection drops">
|
||||||
|
{busy ? "Preparing…" : `Enable offline mode${sectionName ? ` for ${sectionName}` : " (whole event)"}`}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<span className="text-xs text-gray-500 ml-1">Pick an event to use offline mode.</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
{others.length > 0 && (
|
||||||
|
<ul className="mt-2 space-y-0.5">
|
||||||
|
{others.map(l => (
|
||||||
|
<li key={l.id} className="flex items-center gap-1.5 text-xs text-gray-700">
|
||||||
|
<Lock className="w-3.5 h-3.5 text-amber-600" />
|
||||||
|
{l.sectionName ? `"${l.sectionName}"` : "The whole event"} is offline-locked by {l.user.name}{l.deviceName ? ` on ${l.deviceName}` : ""} — scan it on that device.
|
||||||
|
</li>
|
||||||
|
))}
|
||||||
|
</ul>
|
||||||
|
)}
|
||||||
|
{lock && !online && <p className="mt-2 text-xs text-amber-900">Scans are saved on this device and will sync when the connection is back. Tickets bought after the download time won't be on the list.</p>}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,115 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useCallback, useEffect, useRef, useState } from "react";
|
||||||
|
import { apiFetch } from "@/lib/api";
|
||||||
|
import {
|
||||||
|
OfflineLock, SnapshotTicket, clearOffline, deviceId, deviceName, findTicket, getOfflineLock,
|
||||||
|
queuedScans, recordScan, removeQueued, startOffline,
|
||||||
|
} from "@/lib/offlineScan";
|
||||||
|
|
||||||
|
export type OtherLock = { id: string; sectionId: string | null; sectionName: string | null; deviceId: string; deviceName: string | null; user: { name: string } };
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Offline mode for the ticket scanner: lock a section to this device, download its
|
||||||
|
* tickets, scan against them with no connection, and sync the queued scans whenever
|
||||||
|
* the device is back online.
|
||||||
|
*/
|
||||||
|
export function useOfflineScanning(token: string | null) {
|
||||||
|
const [lock, setLock] = useState<OfflineLock | null>(null);
|
||||||
|
const [pending, setPending] = useState(0);
|
||||||
|
const [online, setOnline] = useState(true);
|
||||||
|
const [syncing, setSyncing] = useState(false);
|
||||||
|
const [lastSync, setLastSync] = useState<{ accepted: number; conflicts: number; at: string } | null>(null);
|
||||||
|
const syncingRef = useRef(false);
|
||||||
|
|
||||||
|
const refreshPending = useCallback(async () => {
|
||||||
|
try { setPending((await queuedScans()).length); } catch { setPending(0); }
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
setLock(getOfflineLock());
|
||||||
|
refreshPending();
|
||||||
|
setOnline(typeof navigator === "undefined" ? true : navigator.onLine);
|
||||||
|
const up = () => setOnline(true);
|
||||||
|
const down = () => setOnline(false);
|
||||||
|
window.addEventListener("online", up);
|
||||||
|
window.addEventListener("offline", down);
|
||||||
|
// Cache the scanner page and everything it has loaded, so it opens offline.
|
||||||
|
if ("serviceWorker" in navigator) {
|
||||||
|
navigator.serviceWorker.register("/sw.js").then(async () => {
|
||||||
|
const reg = await navigator.serviceWorker.ready;
|
||||||
|
const urls = [window.location.pathname, ...performance.getEntriesByType("resource").map(e => e.name)];
|
||||||
|
reg.active?.postMessage({ type: "cache-urls", urls });
|
||||||
|
}).catch(() => {});
|
||||||
|
}
|
||||||
|
return () => { window.removeEventListener("online", up); window.removeEventListener("offline", down); };
|
||||||
|
}, [refreshPending]);
|
||||||
|
|
||||||
|
/** Uploads queued scans. Returns the server's verdict, or null when nothing was sent. */
|
||||||
|
const sync = useCallback(async () => {
|
||||||
|
if (!token || syncingRef.current) return null;
|
||||||
|
const queue = await queuedScans();
|
||||||
|
if (queue.length === 0) return null;
|
||||||
|
syncingRef.current = true;
|
||||||
|
setSyncing(true);
|
||||||
|
try {
|
||||||
|
const byLock = new Map<string, typeof queue>();
|
||||||
|
queue.forEach(q => byLock.set(q.lockId, [...(byLock.get(q.lockId) || []), q]));
|
||||||
|
let accepted = 0, conflicts = 0;
|
||||||
|
for (const [lockId, scans] of byLock) {
|
||||||
|
const res = await apiFetch<{ accepted: number; duplicates: number; conflicts: any[] }>(`/api/scan-locks/${lockId}/sync`, {
|
||||||
|
method: "POST", authToken: token, body: { deviceId: deviceId(), scans },
|
||||||
|
});
|
||||||
|
accepted += res.accepted;
|
||||||
|
conflicts += res.conflicts.length;
|
||||||
|
// Synced (or already on the server) — either way they're done on this device.
|
||||||
|
await removeQueued(scans.map(s => s.clientScanId));
|
||||||
|
}
|
||||||
|
const result = { accepted, conflicts, at: new Date().toISOString() };
|
||||||
|
setLastSync(result);
|
||||||
|
return result;
|
||||||
|
} finally {
|
||||||
|
syncingRef.current = false;
|
||||||
|
setSyncing(false);
|
||||||
|
refreshPending();
|
||||||
|
}
|
||||||
|
}, [token, refreshPending]);
|
||||||
|
|
||||||
|
// Sync as soon as the connection is back, and every 30 seconds while online.
|
||||||
|
useEffect(() => {
|
||||||
|
if (!online || !token) return;
|
||||||
|
sync().catch(() => {});
|
||||||
|
const t = setInterval(() => { if (navigator.onLine) sync().catch(() => {}); }, 30000);
|
||||||
|
return () => clearInterval(t);
|
||||||
|
}, [online, token, sync]);
|
||||||
|
|
||||||
|
const enable = useCallback(async (eventId: string, eventTitle: string, sectionId: string | null, sectionName: string | null) => {
|
||||||
|
if (!token) throw new Error("Log in first.");
|
||||||
|
const created = await apiFetch<{ id: string }>("/api/scan-locks", {
|
||||||
|
method: "POST", authToken: token, body: { eventId, sectionId, deviceId: deviceId(), deviceName: deviceName() },
|
||||||
|
});
|
||||||
|
const snap = await apiFetch<{ snapshotAt: string; tickets: SnapshotTicket[] }>(`/api/scan-locks/${created.id}/snapshot?deviceId=${encodeURIComponent(deviceId())}`, { authToken: token });
|
||||||
|
const next: OfflineLock = { lockId: created.id, eventId, eventTitle, sectionId, sectionName, snapshotAt: snap.snapshotAt };
|
||||||
|
await startOffline(next, snap.tickets);
|
||||||
|
setLock(next);
|
||||||
|
return snap.tickets.length;
|
||||||
|
}, [token]);
|
||||||
|
|
||||||
|
const release = useCallback(async () => {
|
||||||
|
if (!lock || !token) return;
|
||||||
|
await sync();
|
||||||
|
if ((await queuedScans()).length > 0) throw new Error("Some scans haven't synced yet. Try again when you're online.");
|
||||||
|
await apiFetch(`/api/scan-locks/${lock.lockId}`, { method: "DELETE", authToken: token, body: { deviceId: deviceId() } });
|
||||||
|
await clearOffline();
|
||||||
|
setLock(null);
|
||||||
|
}, [lock, token, sync]);
|
||||||
|
|
||||||
|
const scanLocally = useCallback(async (ticket: SnapshotTicket, qty: number) => {
|
||||||
|
if (!lock) throw new Error("Offline mode is not on.");
|
||||||
|
await recordScan(lock.lockId, ticket, qty);
|
||||||
|
await refreshPending();
|
||||||
|
if (navigator.onLine) sync().catch(() => {});
|
||||||
|
}, [lock, refreshPending, sync]);
|
||||||
|
|
||||||
|
return { lock, pending, online, syncing, lastSync, enable, release, sync, scanLocally, findTicket, deviceId };
|
||||||
|
}
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import React, { useEffect, useState } from "react";
|
||||||
|
import { apiFetch } from "@/lib/api";
|
||||||
|
|
||||||
|
type SetWithGroups = { id: string; name: string; groups: { id: string; name: string }[] };
|
||||||
|
|
||||||
|
/**
|
||||||
|
* "Only people in…" a room / group / bus, for messaging attendees. Renders nothing when
|
||||||
|
* the event has no allocation sets.
|
||||||
|
*/
|
||||||
|
export function AllocationGroupFilter({ token, eventId, value, onChange }: {
|
||||||
|
token: string | null;
|
||||||
|
eventId: string;
|
||||||
|
value: string;
|
||||||
|
onChange: (groupId: string) => void;
|
||||||
|
}) {
|
||||||
|
const [sets, setSets] = useState<SetWithGroups[]>([]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
onChange("");
|
||||||
|
if (!token || !eventId) { setSets([]); return; }
|
||||||
|
apiFetch<{ sets: SetWithGroups[] }>(`/api/allocations/event/${encodeURIComponent(eventId)}`, { authToken: token })
|
||||||
|
.then(b => setSets((b.sets || []).filter(s => s.groups.length > 0)))
|
||||||
|
.catch(() => setSets([]));
|
||||||
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||||
|
}, [token, eventId]);
|
||||||
|
|
||||||
|
if (sets.length === 0) return null;
|
||||||
|
return (
|
||||||
|
<div>
|
||||||
|
<label className="block text-xs text-gray-600 mb-1">Room / group</label>
|
||||||
|
<select className="w-full border rounded px-3 py-2 text-sm" value={value} onChange={e => onChange(e.target.value)}>
|
||||||
|
<option value="">Everyone</option>
|
||||||
|
{sets.map(s => (
|
||||||
|
<optgroup key={s.id} label={s.name}>
|
||||||
|
{s.groups.map(g => <option key={g.id} value={g.id}>{g.name}</option>)}
|
||||||
|
</optgroup>
|
||||||
|
))}
|
||||||
|
</select>
|
||||||
|
{value && <p className="text-xs text-gray-500 mt-1">Sent to whoever booked for the people in this group.</p>}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -11,14 +11,14 @@ export type AttendeeOption = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
export type AttendeeEntry = {
|
export type AttendeeEntry = {
|
||||||
name: string; email: string; phone: string;
|
name: string; email: string; phone: string; gender?: string;
|
||||||
dateOfBirth?: string; parentName?: string; parentEmail?: string; parentPhone?: string;
|
dateOfBirth?: string; parentName?: string; parentEmail?: string; parentPhone?: string;
|
||||||
};
|
};
|
||||||
export type AttendeeEntries = Record<string, AttendeeEntry>;
|
export type AttendeeEntries = Record<string, AttendeeEntry>;
|
||||||
export type TicketDelivery = "payer" | "each";
|
export type TicketDelivery = "payer" | "each";
|
||||||
|
|
||||||
export type AttendeePayload = {
|
export type AttendeePayload = {
|
||||||
eventOptionId: string; variantId?: string | null; name: string; email?: string; phone?: string;
|
eventOptionId: string; variantId?: string | null; name: string; email?: string; phone?: string; gender?: string;
|
||||||
dateOfBirth?: string; parentName?: string; parentEmail?: string; parentPhone?: string;
|
dateOfBirth?: string; parentName?: string; parentEmail?: string; parentPhone?: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -67,6 +67,7 @@ export function attendeesPayload(options: AttendeeOption[], qtyFor: (optionId: s
|
|||||||
...(e.email.trim() ? { email: e.email.trim() } : {}),
|
...(e.email.trim() ? { email: e.email.trim() } : {}),
|
||||||
...(e.phone.trim() ? { phone: e.phone.trim() } : {}),
|
...(e.phone.trim() ? { phone: e.phone.trim() } : {}),
|
||||||
...(e.dateOfBirth ? { dateOfBirth: e.dateOfBirth } : {}),
|
...(e.dateOfBirth ? { dateOfBirth: e.dateOfBirth } : {}),
|
||||||
|
...(e.gender ? { gender: e.gender } : {}),
|
||||||
...(e.parentName?.trim() ? { parentName: e.parentName.trim() } : {}),
|
...(e.parentName?.trim() ? { parentName: e.parentName.trim() } : {}),
|
||||||
...(e.parentEmail?.trim() ? { parentEmail: e.parentEmail.trim() } : {}),
|
...(e.parentEmail?.trim() ? { parentEmail: e.parentEmail.trim() } : {}),
|
||||||
...(e.parentPhone?.trim() ? { parentPhone: e.parentPhone.trim() } : {}),
|
...(e.parentPhone?.trim() ? { parentPhone: e.parentPhone.trim() } : {}),
|
||||||
@@ -105,6 +106,7 @@ export function AttendeeNamesEditor({
|
|||||||
onDeliveryChange,
|
onDeliveryChange,
|
||||||
payerLabel = "me",
|
payerLabel = "me",
|
||||||
consentEventStart,
|
consentEventStart,
|
||||||
|
collectGender = false,
|
||||||
}: {
|
}: {
|
||||||
options: AttendeeOption[];
|
options: AttendeeOption[];
|
||||||
qtyFor: (optionId: string, variantId: string | null) => number;
|
qtyFor: (optionId: string, variantId: string | null) => number;
|
||||||
@@ -117,6 +119,8 @@ export function AttendeeNamesEditor({
|
|||||||
payerLabel?: string;
|
payerLabel?: string;
|
||||||
/** Set for youth events: names are required, with a date of birth, and parent details for minors. */
|
/** Set for youth events: names are required, with a date of birth, and parent details for minors. */
|
||||||
consentEventStart?: string;
|
consentEventStart?: string;
|
||||||
|
/** Ask each person's gender (for gender-split rooms). */
|
||||||
|
collectGender?: boolean;
|
||||||
}) {
|
}) {
|
||||||
const consent = !!consentEventStart;
|
const consent = !!consentEventStart;
|
||||||
const slots = slotsFor(options, qtyFor);
|
const slots = slotsFor(options, qtyFor);
|
||||||
@@ -159,6 +163,13 @@ export function AttendeeNamesEditor({
|
|||||||
<input type="email" className={inputCls} placeholder="Email (optional)" value={e.email} onChange={ev => set(s.key, "email", ev.target.value)} aria-label={`${s.label} email`} />
|
<input type="email" className={inputCls} placeholder="Email (optional)" value={e.email} onChange={ev => set(s.key, "email", ev.target.value)} aria-label={`${s.label} email`} />
|
||||||
<input type="tel" className={inputCls} placeholder="Phone (optional)" value={e.phone} onChange={ev => set(s.key, "phone", ev.target.value)} aria-label={`${s.label} phone`} />
|
<input type="tel" className={inputCls} placeholder="Phone (optional)" value={e.phone} onChange={ev => set(s.key, "phone", ev.target.value)} aria-label={`${s.label} phone`} />
|
||||||
</div>
|
</div>
|
||||||
|
{collectGender && (
|
||||||
|
<select className={`${inputCls} mt-2 sm:w-48`} value={e.gender || ""} onChange={ev => set(s.key, "gender", ev.target.value)} aria-label={`${s.label} gender`}>
|
||||||
|
<option value="">Gender…</option>
|
||||||
|
<option value="male">Male</option>
|
||||||
|
<option value="female">Female</option>
|
||||||
|
</select>
|
||||||
|
)}
|
||||||
{consent && (
|
{consent && (
|
||||||
<div className="mt-2">
|
<div className="mt-2">
|
||||||
<label className="block text-xs text-gray-600 mb-1">Date of birth</label>
|
<label className="block text-xs text-gray-600 mb-1">Date of birth</label>
|
||||||
|
|||||||
@@ -13,13 +13,13 @@ const CONSENT_LABEL: Record<string, { text: string; cls: string }> = {
|
|||||||
|
|
||||||
type Attendee = {
|
type Attendee = {
|
||||||
id: string; eventOptionId: string; variantId: string | null; name: string; email: string | null; phone: string | null;
|
id: string; eventOptionId: string; variantId: string | null; name: string; email: string | null; phone: string | null;
|
||||||
dateOfBirth?: string | null; parentName?: string | null; parentEmail?: string | null; parentPhone?: string | null;
|
dateOfBirth?: string | null; gender?: string | null; parentName?: string | null; parentEmail?: string | null; parentPhone?: string | null;
|
||||||
ticket?: { id: string; isUsed: boolean } | null;
|
ticket?: { id: string; isUsed: boolean } | null;
|
||||||
consentRequests?: { id: string; status: "pending" | "given" | "declined" }[];
|
consentRequests?: { id: string; status: "pending" | "given" | "declined" }[];
|
||||||
};
|
};
|
||||||
type Row = {
|
type Row = {
|
||||||
id?: string; eventOptionId: string; variantId: string | null; label: string; name: string; email: string; phone: string; locked: boolean;
|
id?: string; eventOptionId: string; variantId: string | null; label: string; name: string; email: string; phone: string; locked: boolean;
|
||||||
dateOfBirth: string; parentName: string; parentEmail: string; parentPhone: string;
|
dateOfBirth: string; gender: string; parentName: string; parentEmail: string; parentPhone: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -37,6 +37,7 @@ export function AttendeesPanel({ registration, token, canEdit, hasForm, onSaved,
|
|||||||
}) {
|
}) {
|
||||||
const attendees: Attendee[] = registration.attendees || [];
|
const attendees: Attendee[] = registration.attendees || [];
|
||||||
const youth = !!registration.event?.requiresParentalConsent;
|
const youth = !!registration.event?.requiresParentalConsent;
|
||||||
|
const collectGender = !!registration.event?.collectGender;
|
||||||
const eventStart: string | undefined = registration.event?.startDate;
|
const eventStart: string | undefined = registration.event?.startDate;
|
||||||
const [editing, setEditing] = useState(false);
|
const [editing, setEditing] = useState(false);
|
||||||
const [rows, setRows] = useState<Row[]>([]);
|
const [rows, setRows] = useState<Row[]>([]);
|
||||||
@@ -57,6 +58,7 @@ export function AttendeesPanel({ registration, token, canEdit, hasForm, onSaved,
|
|||||||
id: a?.id, eventOptionId: ro.eventOptionId, variantId: ro.variantId || null, label: `${label} ${i + 1}`,
|
id: a?.id, eventOptionId: ro.eventOptionId, variantId: ro.variantId || null, label: `${label} ${i + 1}`,
|
||||||
name: a?.name || "", email: a?.email || "", phone: a?.phone || "",
|
name: a?.name || "", email: a?.email || "", phone: a?.phone || "",
|
||||||
dateOfBirth: a?.dateOfBirth ? String(a.dateOfBirth).slice(0, 10) : "",
|
dateOfBirth: a?.dateOfBirth ? String(a.dateOfBirth).slice(0, 10) : "",
|
||||||
|
gender: a?.gender || "",
|
||||||
parentName: a?.parentName || "", parentEmail: a?.parentEmail || "", parentPhone: a?.parentPhone || "",
|
parentName: a?.parentName || "", parentEmail: a?.parentEmail || "", parentPhone: a?.parentPhone || "",
|
||||||
locked: !!a?.ticket?.isUsed,
|
locked: !!a?.ticket?.isUsed,
|
||||||
});
|
});
|
||||||
@@ -68,7 +70,7 @@ export function AttendeesPanel({ registration, token, canEdit, hasForm, onSaved,
|
|||||||
if (!registration.event?.allowNamedAttendees && !youth && attendees.length === 0) return null;
|
if (!registration.event?.allowNamedAttendees && !youth && attendees.length === 0) return null;
|
||||||
|
|
||||||
const startEdit = () => { setRows(buildRows()); setDelivery(registration.ticketDelivery || "payer"); setError(null); setEditing(true); };
|
const startEdit = () => { setRows(buildRows()); setDelivery(registration.ticketDelivery || "payer"); setError(null); setEditing(true); };
|
||||||
const update = (i: number, field: "name" | "email" | "phone" | "dateOfBirth" | "parentName" | "parentEmail" | "parentPhone", value: string) =>
|
const update = (i: number, field: "name" | "email" | "phone" | "dateOfBirth" | "gender" | "parentName" | "parentEmail" | "parentPhone", value: string) =>
|
||||||
setRows(prev => prev.map((r, j) => (j === i ? { ...r, [field]: value } : r)));
|
setRows(prev => prev.map((r, j) => (j === i ? { ...r, [field]: value } : r)));
|
||||||
|
|
||||||
const save = async () => {
|
const save = async () => {
|
||||||
@@ -88,6 +90,7 @@ export function AttendeesPanel({ registration, token, canEdit, hasForm, onSaved,
|
|||||||
email: r.email.trim() || undefined,
|
email: r.email.trim() || undefined,
|
||||||
phone: r.phone.trim() || undefined,
|
phone: r.phone.trim() || undefined,
|
||||||
...(r.dateOfBirth ? { dateOfBirth: r.dateOfBirth } : {}),
|
...(r.dateOfBirth ? { dateOfBirth: r.dateOfBirth } : {}),
|
||||||
|
...(r.gender ? { gender: r.gender } : {}),
|
||||||
...(r.parentName.trim() ? { parentName: r.parentName.trim() } : {}),
|
...(r.parentName.trim() ? { parentName: r.parentName.trim() } : {}),
|
||||||
...(r.parentEmail.trim() ? { parentEmail: r.parentEmail.trim() } : {}),
|
...(r.parentEmail.trim() ? { parentEmail: r.parentEmail.trim() } : {}),
|
||||||
...(r.parentPhone.trim() ? { parentPhone: r.parentPhone.trim() } : {}),
|
...(r.parentPhone.trim() ? { parentPhone: r.parentPhone.trim() } : {}),
|
||||||
@@ -171,6 +174,13 @@ export function AttendeesPanel({ registration, token, canEdit, hasForm, onSaved,
|
|||||||
<input className="border rounded px-2 py-1 text-sm" placeholder="Email (optional)" value={r.email} disabled={r.locked} onChange={e => update(i, "email", e.target.value)} aria-label={`${r.label} email`} />
|
<input className="border rounded px-2 py-1 text-sm" placeholder="Email (optional)" value={r.email} disabled={r.locked} onChange={e => update(i, "email", e.target.value)} aria-label={`${r.label} email`} />
|
||||||
<input className="border rounded px-2 py-1 text-sm" placeholder="Phone (optional)" value={r.phone} disabled={r.locked} onChange={e => update(i, "phone", e.target.value)} aria-label={`${r.label} phone`} />
|
<input className="border rounded px-2 py-1 text-sm" placeholder="Phone (optional)" value={r.phone} disabled={r.locked} onChange={e => update(i, "phone", e.target.value)} aria-label={`${r.label} phone`} />
|
||||||
</div>
|
</div>
|
||||||
|
{collectGender && (
|
||||||
|
<select className="mt-1 border rounded px-2 py-1 text-sm" value={r.gender} disabled={r.locked} onChange={e => update(i, "gender", e.target.value)} aria-label={`${r.label} gender`}>
|
||||||
|
<option value="">Gender…</option>
|
||||||
|
<option value="male">Male</option>
|
||||||
|
<option value="female">Female</option>
|
||||||
|
</select>
|
||||||
|
)}
|
||||||
{youth && (
|
{youth && (
|
||||||
<div className="mt-1 space-y-1">
|
<div className="mt-1 space-y-1">
|
||||||
<input type="date" className="border rounded px-2 py-1 text-sm" value={r.dateOfBirth} disabled={r.locked} onChange={e => update(i, "dateOfBirth", e.target.value)} aria-label={`${r.label} date of birth`} />
|
<input type="date" className="border rounded px-2 py-1 text-sm" value={r.dateOfBirth} disabled={r.locked} onChange={e => update(i, "dateOfBirth", e.target.value)} aria-label={`${r.label} date of birth`} />
|
||||||
|
|||||||
@@ -0,0 +1,71 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import React from "react";
|
||||||
|
import { Star } from "lucide-react";
|
||||||
|
|
||||||
|
/** Field types added for feedback (also usable on attendee forms). */
|
||||||
|
export const EXTRA_FIELD_TYPES = ["rating", "multiple_choice"] as const;
|
||||||
|
export const isExtraFieldType = (t: string) => (EXTRA_FIELD_TYPES as readonly string[]).includes(t);
|
||||||
|
|
||||||
|
/** The choices of a multiple-choice field (stored as a JSON array of strings). */
|
||||||
|
export const fieldChoices = (field: { options?: unknown }): string[] =>
|
||||||
|
Array.isArray(field.options) ? field.options.map(String).filter(Boolean) : [];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Input for a rating (1–5 stars) or multiple-choice field. Values are strings, like every
|
||||||
|
* other form answer: "1".."5" for a rating, the chosen option for multiple choice.
|
||||||
|
*/
|
||||||
|
export function ExtraFieldInput({ field, value, onChange, idPrefix = "f" }: {
|
||||||
|
field: { id?: string; type: string; label: string; options?: unknown };
|
||||||
|
value: string;
|
||||||
|
onChange: (v: string) => void;
|
||||||
|
idPrefix?: string;
|
||||||
|
}) {
|
||||||
|
if (field.type === "rating") {
|
||||||
|
const n = Number(value) || 0;
|
||||||
|
return (
|
||||||
|
<div className="flex items-center gap-1" role="radiogroup" aria-label={field.label}>
|
||||||
|
{[1, 2, 3, 4, 5].map(star => (
|
||||||
|
<button
|
||||||
|
key={star}
|
||||||
|
type="button"
|
||||||
|
role="radio"
|
||||||
|
aria-checked={n === star}
|
||||||
|
aria-label={`${star} star${star === 1 ? "" : "s"}`}
|
||||||
|
onClick={() => onChange(n === star ? "" : String(star))}
|
||||||
|
className="p-0.5 rounded focus:outline-none focus:ring-2 focus:ring-amber-300"
|
||||||
|
>
|
||||||
|
<Star className={`w-7 h-7 ${star <= n ? "fill-amber-400 text-amber-400" : "text-gray-300"}`} />
|
||||||
|
</button>
|
||||||
|
))}
|
||||||
|
{n > 0 && <span className="text-xs text-gray-500 ml-1">{n} of 5</span>}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
const choices = fieldChoices(field);
|
||||||
|
return (
|
||||||
|
<div className="space-y-1" role="radiogroup" aria-label={field.label}>
|
||||||
|
{choices.map(c => (
|
||||||
|
<label key={c} className="flex items-center gap-2 text-sm cursor-pointer">
|
||||||
|
<input type="radio" name={`${idPrefix}-${field.id || field.label}`} checked={value === c} onChange={() => onChange(c)} />
|
||||||
|
{c}
|
||||||
|
</label>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Builder controls for a multiple-choice field's options (one per line). */
|
||||||
|
export function ChoicesEditor({ options, onChange }: { options: unknown; onChange: (opts: string[]) => void }) {
|
||||||
|
const text = Array.isArray(options) ? options.join("\n") : "";
|
||||||
|
return (
|
||||||
|
<textarea
|
||||||
|
className="border rounded px-2 py-1 text-xs w-full mt-1"
|
||||||
|
rows={3}
|
||||||
|
placeholder={"One choice per line, e.g.\nWorship\nTalks\nFood"}
|
||||||
|
value={text}
|
||||||
|
onChange={e => onChange(e.target.value.split("\n"))}
|
||||||
|
onBlur={e => onChange(e.target.value.split("\n").map(s => s.trim()).filter(Boolean))}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,118 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import React, { useState } from "react";
|
||||||
|
import { ArrowRightLeft } from "lucide-react";
|
||||||
|
import { apiFetch } from "@/lib/api";
|
||||||
|
import { isMinorOn } from "@/components/shared/AttendeeNamesEditor";
|
||||||
|
|
||||||
|
/** Whether to offer "Transfer" on a ticket (the server checks the rules again). */
|
||||||
|
export function canOfferTransfer(ticket: any, event: any, isSupervisor = false): boolean {
|
||||||
|
if (!ticket || !event) return false;
|
||||||
|
if ((ticket.usages || []).length > 0 || ticket.isUsed) return false;
|
||||||
|
if (event.startDate && new Date(event.startDate) <= new Date()) return false;
|
||||||
|
return isSupervisor || event.allowTicketTransfer !== false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Hand a ticket to someone else: their name and email/phone (plus date of birth and a
|
||||||
|
* parent's details on youth events). They get a new QR code; the old one stops working.
|
||||||
|
*/
|
||||||
|
export function TransferTicketModal({ ticket, event, token, onClose, onDone }: {
|
||||||
|
ticket: any;
|
||||||
|
event: any;
|
||||||
|
token: string;
|
||||||
|
onClose: () => void;
|
||||||
|
onDone: (message: string) => void;
|
||||||
|
}) {
|
||||||
|
const youth = !!event?.requiresParentalConsent;
|
||||||
|
const [f, setF] = useState({ name: "", email: "", phone: "", gender: "", dateOfBirth: "", parentName: "", parentEmail: "", parentPhone: "" });
|
||||||
|
const [busy, setBusy] = useState(false);
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
const minor = youth && isMinorOn(f.dateOfBirth, event?.startDate);
|
||||||
|
const places = ticket.quantity || 1;
|
||||||
|
const set = (k: keyof typeof f) => (e: React.ChangeEvent<HTMLInputElement | HTMLSelectElement>) => setF(prev => ({ ...prev, [k]: e.target.value }));
|
||||||
|
|
||||||
|
const submit = async (e: React.FormEvent) => {
|
||||||
|
e.preventDefault();
|
||||||
|
setBusy(true);
|
||||||
|
setError(null);
|
||||||
|
try {
|
||||||
|
const body: Record<string, string> = { name: f.name, email: f.email, phone: f.phone, ...(f.gender ? { gender: f.gender } : {}) };
|
||||||
|
if (youth) Object.assign(body, { dateOfBirth: f.dateOfBirth, parentName: f.parentName, parentEmail: f.parentEmail, parentPhone: f.parentPhone });
|
||||||
|
const res = await apiFetch<{ message: string }>(`/api/tickets/${ticket.id}/transfer`, { method: "POST", authToken: token, body });
|
||||||
|
onDone(res.message);
|
||||||
|
} catch (err: any) {
|
||||||
|
setError(err?.message || "Couldn't transfer the ticket");
|
||||||
|
} finally {
|
||||||
|
setBusy(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const input = "w-full border rounded-lg px-3 py-2 text-sm";
|
||||||
|
return (
|
||||||
|
<div className="fixed inset-0 bg-black/40 flex items-center justify-center z-50" onClick={onClose}>
|
||||||
|
<form onSubmit={submit} className="bg-white rounded-xl shadow-lg max-w-md w-full mx-4 p-5 space-y-3 max-h-[90vh] overflow-y-auto" onClick={e => e.stopPropagation()}>
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<ArrowRightLeft className="w-5 h-5 text-brand-600" />
|
||||||
|
<h3 className="text-lg font-semibold">Transfer ticket</h3>
|
||||||
|
</div>
|
||||||
|
<p className="text-sm text-gray-600">
|
||||||
|
{places > 1
|
||||||
|
? `This ticket is for ${places} people. One place moves to the new holder on their own ticket; the other ${places - 1} stay on this one.`
|
||||||
|
: "The new holder gets their own ticket with a new QR code. The current QR code (including any screenshots of it) will stop working."}
|
||||||
|
{" "}The booking and payment stay with the person who booked.
|
||||||
|
</p>
|
||||||
|
<div>
|
||||||
|
<label className="block text-xs text-gray-600 mb-1">New holder's name</label>
|
||||||
|
<input className={input} value={f.name} onChange={set("name")} required maxLength={100} />
|
||||||
|
</div>
|
||||||
|
<div className="grid grid-cols-1 sm:grid-cols-2 gap-2">
|
||||||
|
<div>
|
||||||
|
<label className="block text-xs text-gray-600 mb-1">Email</label>
|
||||||
|
<input type="email" className={input} value={f.email} onChange={set("email")} />
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<label className="block text-xs text-gray-600 mb-1">Phone (WhatsApp)</label>
|
||||||
|
<input type="tel" className={input} value={f.phone} onChange={set("phone")} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{event?.collectGender && (
|
||||||
|
<div>
|
||||||
|
<label className="block text-xs text-gray-600 mb-1">Gender</label>
|
||||||
|
<select className={input} value={f.gender} onChange={set("gender")} required>
|
||||||
|
<option value="">Choose…</option>
|
||||||
|
<option value="male">Male</option>
|
||||||
|
<option value="female">Female</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
<p className="text-xs text-gray-500">An email or phone number is needed to send them the ticket. If they don't have an account yet, one is created and they get a link to activate it.</p>
|
||||||
|
{youth && (
|
||||||
|
<div className="space-y-2 border-t pt-3">
|
||||||
|
<div>
|
||||||
|
<label className="block text-xs text-gray-600 mb-1">Date of birth</label>
|
||||||
|
<input type="date" className={input} value={f.dateOfBirth} onChange={set("dateOfBirth")} required />
|
||||||
|
</div>
|
||||||
|
{minor && (
|
||||||
|
<>
|
||||||
|
<p className="text-xs text-amber-800 bg-amber-50 rounded p-2">They're under 18, so a parent or guardian will be asked for consent before they can check in.</p>
|
||||||
|
<input className={input} placeholder="Parent or guardian's name" value={f.parentName} onChange={set("parentName")} required />
|
||||||
|
<div className="grid grid-cols-1 sm:grid-cols-2 gap-2">
|
||||||
|
<input type="email" className={input} placeholder="Parent's email" value={f.parentEmail} onChange={set("parentEmail")} required />
|
||||||
|
<input type="tel" className={input} placeholder="Parent's phone" value={f.parentPhone} onChange={set("parentPhone")} required />
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{error && <div className="p-2 rounded bg-red-50 text-red-800 text-sm">{error}</div>}
|
||||||
|
<div className="flex justify-end gap-2 pt-1">
|
||||||
|
<button type="button" onClick={onClose} className="px-3 py-1.5 text-sm rounded bg-gray-100 hover:bg-gray-200">Cancel</button>
|
||||||
|
<button type="submit" disabled={busy || !f.name.trim() || (!f.email.trim() && !f.phone.trim())} className="px-3 py-1.5 text-sm rounded bg-brand-600 text-white hover:bg-brand-700 disabled:opacity-50">
|
||||||
|
{busy ? "Transferring…" : "Transfer"}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
import React from "react";
|
import React from "react";
|
||||||
import { Calendar, Ticket, CreditCard, HandHeart, Printer, CheckCircle2, ClipboardList, Clock, SquarePen, History, CheckSquare, Receipt, FileText, Users } from "lucide-react";
|
import { Calendar, Ticket, CreditCard, HandHeart, Printer, CheckCircle2, ClipboardList, Clock, SquarePen, History, CheckSquare, Receipt, FileText, Users, ArrowRightLeft } from "lucide-react";
|
||||||
import { GuideItem } from "@/components/shared/GuideItem";
|
import { GuideItem } from "@/components/shared/GuideItem";
|
||||||
import type { HelpContent } from "./types";
|
import type { HelpContent } from "./types";
|
||||||
|
|
||||||
@@ -60,6 +60,9 @@ export const dashboardUserHelpContent: HelpContent = {
|
|||||||
<GuideItem icon={Printer} title="Print, email, or WhatsApp" tone="green">
|
<GuideItem icon={Printer} title="Print, email, or WhatsApp" tone="green">
|
||||||
Get your selected tickets onto your phone or paper before the event — as a printed page, an email, or a WhatsApp message.
|
Get your selected tickets onto your phone or paper before the event — as a printed page, an email, or a WhatsApp message.
|
||||||
</GuideItem>
|
</GuideItem>
|
||||||
|
<GuideItem icon={ArrowRightLeft} title="Transfer a ticket" tone="violet">
|
||||||
|
Can't make it? Tap "Transfer" to give your ticket to someone else before the event. Enter their name and email or phone, and they get a new ticket with a new QR code. The old code (and any screenshots of it) stops working. For a ticket covering several people, one place moves to them. You stay responsible for the booking and payment. A ticket can't be transferred once it has been scanned.
|
||||||
|
</GuideItem>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import React from "react";
|
import React from "react";
|
||||||
import { Ticket, Tag, Share2, QrCode, Calendar, Users } from "lucide-react";
|
import { Ticket, Tag, Share2, QrCode, Calendar, Users, HeartHandshake } from "lucide-react";
|
||||||
import { GuideItem } from "@/components/shared/GuideItem";
|
import { GuideItem } from "@/components/shared/GuideItem";
|
||||||
import type { HelpContent } from "./types";
|
import type { HelpContent } from "./types";
|
||||||
|
|
||||||
@@ -25,6 +25,9 @@ export const eventDetailHelpContent: HelpContent = {
|
|||||||
<GuideItem icon={Ticket} title="Availability badges" tone="brand">
|
<GuideItem icon={Ticket} title="Availability badges" tone="brand">
|
||||||
"N remaining" appears once stock runs low, and "Sold out" once an option is fully booked. Some events have a waitlist: tap "Join waitlist" and you'll be emailed or WhatsApped a link to claim a place if one opens up (it's held for you for a limited time).
|
"N remaining" appears once stock runs low, and "Sold out" once an option is fully booked. Some events have a waitlist: tap "Join waitlist" and you'll be emailed or WhatsApped a link to claim a place if one opens up (it's held for you for a limited time).
|
||||||
</GuideItem>
|
</GuideItem>
|
||||||
|
<GuideItem icon={HeartHandshake} title="Sponsor a spot" tone="rose">
|
||||||
|
Some events let you pay for a place for someone who can't afford it. Tap "Sponsor a spot", choose one or more spots (or any amount), and pay securely with Yoco. You can give anonymously or add a name and a message for the organisers. You'll get a receipt, and who is helped is never shared.
|
||||||
|
</GuideItem>
|
||||||
<GuideItem icon={Users} title="Registering for other people?" tone="violet">
|
<GuideItem icon={Users} title="Registering for other people?" tone="violet">
|
||||||
Some events let you name each person you're booking for. Each named person gets their own ticket and their own attendee form, and you can choose to have every ticket sent to you or each person their own. On youth events, you'll give each person's date of birth; for anyone under 18, their parent or guardian is asked to give consent by email and WhatsApp before they can be checked in.
|
Some events let you name each person you're booking for. Each named person gets their own ticket and their own attendee form, and you can choose to have every ticket sent to you or each person their own. On youth events, you'll give each person's date of birth; for anyone under 18, their parent or guardian is asked to give consent by email and WhatsApp before they can be checked in.
|
||||||
</GuideItem>
|
</GuideItem>
|
||||||
|
|||||||
@@ -24,6 +24,8 @@ import { supervisorFormsHelpContent } from "./supervisor-forms";
|
|||||||
import { supervisorCouponsHelpContent } from "./supervisor-coupons";
|
import { supervisorCouponsHelpContent } from "./supervisor-coupons";
|
||||||
import { supervisorConsentHelpContent } from "./supervisor-consent";
|
import { supervisorConsentHelpContent } from "./supervisor-consent";
|
||||||
import { supervisorWaitlistHelpContent } from "./supervisor-waitlist";
|
import { supervisorWaitlistHelpContent } from "./supervisor-waitlist";
|
||||||
|
import { supervisorOfflineScansHelpContent } from "./supervisor-offline-scans";
|
||||||
|
import { supervisorAllocationsHelpContent, staffMyGroupsHelpContent } from "./supervisor-allocations";
|
||||||
import { supervisorEmailAttendeesHelpContent } from "./supervisor-email-attendees";
|
import { supervisorEmailAttendeesHelpContent } from "./supervisor-email-attendees";
|
||||||
import { supervisorWhatsappAttendeesHelpContent } from "./supervisor-whatsapp-attendees";
|
import { supervisorWhatsappAttendeesHelpContent } from "./supervisor-whatsapp-attendees";
|
||||||
import { staffEventTicketsHelpContent } from "./staff-event-tickets";
|
import { staffEventTicketsHelpContent } from "./staff-event-tickets";
|
||||||
@@ -150,6 +152,21 @@ const REGISTRY: HelpRegistryEntry[] = [
|
|||||||
matches: pathname => pathname === "/dashboard/supervisor/payments",
|
matches: pathname => pathname === "/dashboard/supervisor/payments",
|
||||||
content: supervisorPaymentsHelpContent,
|
content: supervisorPaymentsHelpContent,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
slug: "supervisor-allocations",
|
||||||
|
matches: pathname => pathname === "/dashboard/supervisor/allocations",
|
||||||
|
content: supervisorAllocationsHelpContent,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
slug: "staff-my-groups",
|
||||||
|
matches: pathname => pathname === "/dashboard/staff/my-groups",
|
||||||
|
content: staffMyGroupsHelpContent,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
slug: "supervisor-offline-scans",
|
||||||
|
matches: pathname => pathname === "/dashboard/supervisor/offline-scans",
|
||||||
|
content: supervisorOfflineScansHelpContent,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
slug: "supervisor-waitlist",
|
slug: "supervisor-waitlist",
|
||||||
matches: pathname => pathname === "/dashboard/supervisor/waitlist",
|
matches: pathname => pathname === "/dashboard/supervisor/waitlist",
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ export const reportsHelpContent: HelpContent = {
|
|||||||
Preview your report, adjust filters, and choose how you want the data to appear.
|
Preview your report, adjust filters, and choose how you want the data to appear.
|
||||||
</GuideItem>
|
</GuideItem>
|
||||||
<GuideItem icon={Download} title="Export or email" tone="amber">
|
<GuideItem icon={Download} title="Export or email" tone="amber">
|
||||||
Export your report to Excel, PDF, or send it by email or WhatsApp.
|
Export your report to Excel, PDF, or send it by email or WhatsApp. Tip: select several events in the Feedback summary to compare their ratings (e.g. Camp 2025 vs Camp 2026).
|
||||||
</GuideItem>
|
</GuideItem>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import React from "react";
|
import React from "react";
|
||||||
import { QrCode, Filter, CheckCircle2, ShieldAlert } from "lucide-react";
|
import { QrCode, Filter, CheckCircle2, ShieldAlert, WifiOff } from "lucide-react";
|
||||||
import { GuideItem } from "@/components/shared/GuideItem";
|
import { GuideItem } from "@/components/shared/GuideItem";
|
||||||
import type { HelpContent } from "./types";
|
import type { HelpContent } from "./types";
|
||||||
|
|
||||||
@@ -19,6 +19,9 @@ export const staffTicketScanningHelpContent: HelpContent = {
|
|||||||
<GuideItem icon={CheckCircle2} title="Outcomes" tone="green">
|
<GuideItem icon={CheckCircle2} title="Outcomes" tone="green">
|
||||||
You'll see Success (with redeemed/remaining counts), Already Used, or an Error if something's wrong with the ticket.
|
You'll see Success (with redeemed/remaining counts), Already Used, or an Error if something's wrong with the ticket.
|
||||||
</GuideItem>
|
</GuideItem>
|
||||||
|
<GuideItem icon={WifiOff} title="Offline mode" tone="amber">
|
||||||
|
Worried about the venue Wi-Fi? While you're online, pick the event and section and tap "Enable offline mode". The section is locked to your device and its tickets are downloaded, so you can keep scanning with no connection. Scans sync automatically when you're back online. Tickets bought after the download won't be on your list — send those people to the door desk. Tap "Release section" when you're done. Tip: add this page to your home screen so it opens offline.
|
||||||
|
</GuideItem>
|
||||||
<GuideItem icon={ShieldAlert} title="Parental consent" tone="rose">
|
<GuideItem icon={ShieldAlert} title="Parental consent" tone="rose">
|
||||||
On youth events, the confirm screen warns when a parent hasn't given consent yet (or declined). That person can't be checked in; a supervisor can override, and the override is recorded in the audit log.
|
On youth events, the confirm screen warns when a parent hasn't given consent yet (or declined). That person can't be checked in; a supervisor can override, and the override is recorded in the audit log.
|
||||||
</GuideItem>
|
</GuideItem>
|
||||||
|
|||||||
@@ -0,0 +1,61 @@
|
|||||||
|
import React from "react";
|
||||||
|
import { BedDouble, Layers, Move, Wand2, Printer, Ticket, Users } from "lucide-react";
|
||||||
|
import { GuideItem } from "@/components/shared/GuideItem";
|
||||||
|
import type { HelpContent } from "./types";
|
||||||
|
|
||||||
|
/** Help content for /dashboard/supervisor/allocations. */
|
||||||
|
export const supervisorAllocationsHelpContent: HelpContent = {
|
||||||
|
title: "Rooms & groups",
|
||||||
|
subtitle: "Put attendees into rooms, cabins, small groups, teams or buses.",
|
||||||
|
tabs: [
|
||||||
|
{
|
||||||
|
key: "page",
|
||||||
|
label: "This page",
|
||||||
|
icon: BedDouble,
|
||||||
|
content: (
|
||||||
|
<div className="space-y-4">
|
||||||
|
<div className="space-y-4">
|
||||||
|
<GuideItem icon={Layers} title="Sets and groups" tone="brand">
|
||||||
|
A set is one way of splitting people up, such as "Rooms", "Small groups" or "Buses". An event can have several sets, and each person can be in one group per set. Groups can have a capacity, be for males or females only, and have a leader (a staff member).
|
||||||
|
</GuideItem>
|
||||||
|
<GuideItem icon={Move} title="Drag and drop" tone="green">
|
||||||
|
Drag people from "Not placed yet" into a group, between groups, or back again. A full group, or one for the other gender, won't take them. Allocation works per named person, so the event needs named attendees. Turn on "Ask each person's gender" if rooms are split by gender.
|
||||||
|
</GuideItem>
|
||||||
|
<GuideItem icon={Wand2} title="Auto-allocate" tone="violet">
|
||||||
|
Fills groups evenly with everyone not placed yet, respecting capacity and gender. "Keep bookings together" keeps people on the same booking (siblings) in one group where possible; "Split bookings" spreads them out (friends). People already placed stay where they are.
|
||||||
|
</GuideItem>
|
||||||
|
<GuideItem icon={Printer} title="Lists" tone="amber">
|
||||||
|
Print a list per group (with its leader) or one master list. On youth events you can include medical and emergency details from consent forms. Viewing those is recorded in the audit log.
|
||||||
|
</GuideItem>
|
||||||
|
<GuideItem icon={Ticket} title="On tickets" tone="rose">
|
||||||
|
Tick "Show on tickets" to print the group on each person's ticket and show it in My Events. To message one group ("Bus 2 leaves at 07:30"), pick it under Room / group on Email or WhatsApp attendees.
|
||||||
|
</GuideItem>
|
||||||
|
<GuideItem icon={Users} title="Leaders" tone="gray">
|
||||||
|
Group leaders see their people (with ages and parent contacts) under Staff → My groups. Medical details are only shown to supervisors.
|
||||||
|
</GuideItem>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
),
|
||||||
|
},
|
||||||
|
],
|
||||||
|
};
|
||||||
|
|
||||||
|
/** Help content for /dashboard/staff/my-groups. */
|
||||||
|
export const staffMyGroupsHelpContent: HelpContent = {
|
||||||
|
title: "My groups",
|
||||||
|
subtitle: "Rooms, small groups and buses you lead.",
|
||||||
|
tabs: [
|
||||||
|
{
|
||||||
|
key: "page",
|
||||||
|
label: "This page",
|
||||||
|
icon: Users,
|
||||||
|
content: (
|
||||||
|
<div className="space-y-4">
|
||||||
|
<GuideItem icon={Users} title="Your people" tone="brand">
|
||||||
|
Everyone a supervisor has placed in a group you lead, with their age and a contact number (theirs, a parent's, or the person who booked). Supervisors also see medical details here.
|
||||||
|
</GuideItem>
|
||||||
|
</div>
|
||||||
|
),
|
||||||
|
},
|
||||||
|
],
|
||||||
|
};
|
||||||
@@ -25,7 +25,7 @@ export const supervisorAtTheDoorHelpContent: HelpContent = {
|
|||||||
Per ticket-type totals with a stepper to check attendees in against the scan record.
|
Per ticket-type totals with a stepper to check attendees in against the scan record.
|
||||||
</GuideItem>
|
</GuideItem>
|
||||||
<GuideItem icon={Ticket} title="Tickets" tone="amber">
|
<GuideItem icon={Ticket} title="Tickets" tone="amber">
|
||||||
Browse all tickets for the event; print or send (email/WhatsApp) any of them individually.
|
Browse all tickets for the event; print or send (email/WhatsApp) any of them individually, or transfer one to someone else before the event starts (supervisors can transfer even when transfers are turned off for the event). Scanning a transferred ticket's old QR code says who it went to.
|
||||||
</GuideItem>
|
</GuideItem>
|
||||||
<GuideItem icon={RotateCcw} title="Refund" tone="rose">
|
<GuideItem icon={RotateCcw} title="Refund" tone="rose">
|
||||||
Issue a refund against an existing payment for the selected registration.
|
Issue a refund against an existing payment for the selected registration.
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import React from "react";
|
import React from "react";
|
||||||
import { Calendar, ListChecks, Layers, FileText, Eye, Bell, Paperclip, Lock } from "lucide-react";
|
import { Calendar, ListChecks, Layers, FileText, Eye, Bell, Paperclip, Lock, MessageSquareHeart } from "lucide-react";
|
||||||
import { GuideItem } from "@/components/shared/GuideItem";
|
import { GuideItem } from "@/components/shared/GuideItem";
|
||||||
import type { HelpContent } from "./types";
|
import type { HelpContent } from "./types";
|
||||||
|
|
||||||
@@ -52,6 +52,9 @@ export const supervisorEventsHelpContent: HelpContent = {
|
|||||||
<GuideItem icon={Paperclip} title="Attachments" tone="rose">
|
<GuideItem icon={Paperclip} title="Attachments" tone="rose">
|
||||||
Upload downloadable files that appear on the public event page.
|
Upload downloadable files that appear on the public event page.
|
||||||
</GuideItem>
|
</GuideItem>
|
||||||
|
<GuideItem icon={MessageSquareHeart} title="Feedback" tone="violet">
|
||||||
|
Send a feedback form automatically after the event: pick when (e.g. the morning after) and whether it goes to everyone who checked in or everyone registered. Questions can be star ratings, multiple choice, yes/no or text. Answers can be anonymous. Anyone who hasn't answered gets one reminder 3 days later. Results are in Reports → Feedback summary. Rating and multiple-choice questions can also be used on the attendee form.
|
||||||
|
</GuideItem>
|
||||||
</div>
|
</div>
|
||||||
<p className="text-xs text-gray-500">When creating a new event, later steps unlock as you complete the ones before them; editing an existing event lets you jump to any step freely.</p>
|
<p className="text-xs text-gray-500">When creating a new event, later steps unlock as you complete the ones before them; editing an existing event lets you jump to any step freely.</p>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -0,0 +1,32 @@
|
|||||||
|
import React from "react";
|
||||||
|
import { WifiOff, Unlock, CheckCircle2, Lock } from "lucide-react";
|
||||||
|
import { GuideItem } from "@/components/shared/GuideItem";
|
||||||
|
import type { HelpContent } from "./types";
|
||||||
|
|
||||||
|
/** Help content for /dashboard/supervisor/offline-scans. */
|
||||||
|
export const supervisorOfflineScansHelpContent: HelpContent = {
|
||||||
|
title: "Offline scanning",
|
||||||
|
subtitle: "Devices scanning without a connection, and what they synced.",
|
||||||
|
tabs: [
|
||||||
|
{
|
||||||
|
key: "page",
|
||||||
|
label: "This page",
|
||||||
|
icon: WifiOff,
|
||||||
|
content: (
|
||||||
|
<div className="space-y-4">
|
||||||
|
<div className="space-y-4">
|
||||||
|
<GuideItem icon={Lock} title="Locked sections" tone="brand">
|
||||||
|
Each section (or the whole event) in offline mode is locked to one device, so two devices can never check in the same ticket while offline. You can see who holds each lock, when their ticket list was downloaded, and when they last synced.
|
||||||
|
</GuideItem>
|
||||||
|
<GuideItem icon={Unlock} title="Force release" tone="amber">
|
||||||
|
For a lost or flat device. The section is unlocked straight away. If the device reconnects later, its offline scans still sync and are flagged here.
|
||||||
|
</GuideItem>
|
||||||
|
<GuideItem icon={CheckCircle2} title="Sync reports" tone="rose">
|
||||||
|
Scans that need a person to look: tickets not found (e.g. transferred), cancelled registrations, tickets already used up, scans outside the locked section, or check-ins without parental consent. Mark each report reviewed once it's been dealt with.
|
||||||
|
</GuideItem>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
),
|
||||||
|
},
|
||||||
|
],
|
||||||
|
};
|
||||||
@@ -22,7 +22,7 @@ export const supervisorPaymentsHelpContent: HelpContent = {
|
|||||||
Refund a specific payment or a registration — pick the user, target, amount and method, and a reason.
|
Refund a specific payment or a registration — pick the user, target, amount and method, and a reason.
|
||||||
</GuideItem>
|
</GuideItem>
|
||||||
<GuideItem icon={HandHeart} title="Donations" tone="rose">
|
<GuideItem icon={HandHeart} title="Donations" tone="rose">
|
||||||
Assign an unassigned donation to a registration with an outstanding balance. Donations can be partially allocated, leaving the remainder available for another registration.
|
Assign an unassigned donation to a registration with an outstanding balance. Donations can be partially allocated, leaving the remainder available for another registration. Money from "Sponsor a spot" is marked as a sponsorship. Tick "Only the sponsorship pool" to assign just those, and you'll see the sponsor's message. The Donations breakdown report shows each event's pool: received, assigned and remaining.
|
||||||
</GuideItem>
|
</GuideItem>
|
||||||
<GuideItem icon={ScanLine} title="Reconcile" tone="green">
|
<GuideItem icon={ScanLine} title="Reconcile" tone="green">
|
||||||
Match unreconciled Yoco card transactions to a registration, log them as a donation, or ignore them.
|
Match unreconciled Yoco card transactions to a registration, log them as a donation, or ignore them.
|
||||||
|
|||||||
@@ -18,6 +18,25 @@ export type AuthContextValue = {
|
|||||||
|
|
||||||
const AuthContext = createContext<AuthContextValue | undefined>(undefined);
|
const AuthContext = createContext<AuthContextValue | undefined>(undefined);
|
||||||
|
|
||||||
|
// The last profile the server confirmed, so a page reloaded with no connection (e.g. the
|
||||||
|
// ticket scanner in offline mode) still knows who's signed in. The server checks the
|
||||||
|
// token on every API call regardless, so this never grants anything by itself.
|
||||||
|
const USER_CACHE_KEY = "hope_events_user_cache";
|
||||||
|
function cacheUser(u: AuthUser | null) {
|
||||||
|
try {
|
||||||
|
if (u) localStorage.setItem(USER_CACHE_KEY, JSON.stringify(u));
|
||||||
|
else localStorage.removeItem(USER_CACHE_KEY);
|
||||||
|
} catch { /* storage unavailable */ }
|
||||||
|
}
|
||||||
|
function cachedUser(): AuthUser | null {
|
||||||
|
try {
|
||||||
|
const raw = localStorage.getItem(USER_CACHE_KEY);
|
||||||
|
return raw ? JSON.parse(raw) : null;
|
||||||
|
} catch {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
export function AuthProvider({ children }: { children: React.ReactNode }) {
|
export function AuthProvider({ children }: { children: React.ReactNode }) {
|
||||||
const [token, setToken] = useState<string | null>(null);
|
const [token, setToken] = useState<string | null>(null);
|
||||||
const [user, setUser] = useState<AuthUser | null>(null);
|
const [user, setUser] = useState<AuthUser | null>(null);
|
||||||
@@ -34,6 +53,7 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
|
|||||||
const me = await apiFetch<AuthUser>("/api/users/profile", { authToken: t });
|
const me = await apiFetch<AuthUser>("/api/users/profile", { authToken: t });
|
||||||
setToken(t);
|
setToken(t);
|
||||||
setUser(me);
|
setUser(me);
|
||||||
|
cacheUser(me);
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
// Only wipe the stored token when the server explicitly rejects it (401).
|
// Only wipe the stored token when the server explicitly rejects it (401).
|
||||||
@@ -41,8 +61,17 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
|
|||||||
// token stays in localStorage so the next page load can retry.
|
// token stays in localStorage so the next page load can retry.
|
||||||
if (e instanceof ApiError && e.status === 401) {
|
if (e instanceof ApiError && e.status === 401) {
|
||||||
clearToken();
|
clearToken();
|
||||||
|
cacheUser(null);
|
||||||
setToken(null);
|
setToken(null);
|
||||||
setUser(null);
|
setUser(null);
|
||||||
|
} else {
|
||||||
|
// No connection: carry on as the last confirmed user.
|
||||||
|
const t = getToken();
|
||||||
|
const cached = cachedUser();
|
||||||
|
if (t && cached) {
|
||||||
|
setToken(t);
|
||||||
|
setUser(cached);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} finally {
|
} finally {
|
||||||
setLoading(false);
|
setLoading(false);
|
||||||
@@ -57,6 +86,7 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
|
|||||||
saveToken(token);
|
saveToken(token);
|
||||||
setToken(token);
|
setToken(token);
|
||||||
setUser(loggedInUser);
|
setUser(loggedInUser);
|
||||||
|
cacheUser(loggedInUser);
|
||||||
return loggedInUser;
|
return loggedInUser;
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
@@ -99,6 +129,7 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
|
|||||||
|
|
||||||
const logout = useCallback(() => {
|
const logout = useCallback(() => {
|
||||||
clearToken();
|
clearToken();
|
||||||
|
cacheUser(null);
|
||||||
setToken(null);
|
setToken(null);
|
||||||
setUser(null);
|
setUser(null);
|
||||||
}, []);
|
}, []);
|
||||||
|
|||||||
@@ -121,6 +121,7 @@ export async function apiFetch<T = any>(path: string, options: ApiOptions = {}):
|
|||||||
// end it and send them to log in, where they enrol.
|
// end it and send them to log in, where they enrol.
|
||||||
if (res.status === 401 && data?.code === "TWO_FACTOR_REQUIRED" && typeof window !== "undefined") {
|
if (res.status === 401 && data?.code === "TWO_FACTOR_REQUIRED" && typeof window !== "undefined") {
|
||||||
localStorage.removeItem("hope_events_token");
|
localStorage.removeItem("hope_events_token");
|
||||||
|
localStorage.removeItem("hope_events_user_cache");
|
||||||
if (!window.location.pathname.startsWith("/login")) {
|
if (!window.location.pathname.startsWith("/login")) {
|
||||||
const back = window.location.pathname + window.location.search;
|
const back = window.location.pathname + window.location.search;
|
||||||
window.location.href = `/login?reason=2fa&redirect=${encodeURIComponent(back)}`;
|
window.location.href = `/login?reason=2fa&redirect=${encodeURIComponent(back)}`;
|
||||||
|
|||||||
@@ -0,0 +1,130 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Offline scanning on this device: the ticket snapshot for a locked section and the
|
||||||
|
* queue of scans waiting to sync, both kept in IndexedDB (via `idb`). The active lock
|
||||||
|
* itself is in localStorage so the scanner page knows it's in offline mode after a
|
||||||
|
* reload with no connection.
|
||||||
|
*/
|
||||||
|
import { openDB, type IDBPDatabase } from "idb";
|
||||||
|
|
||||||
|
export type SnapshotTicket = {
|
||||||
|
id: string;
|
||||||
|
qrCode: string;
|
||||||
|
holder: string;
|
||||||
|
bookedBy: string;
|
||||||
|
option: string;
|
||||||
|
variant: string | null;
|
||||||
|
quantity: number;
|
||||||
|
remaining: number;
|
||||||
|
consentStatus: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type QueuedScan = { clientScanId: string; lockId: string; qrCode: string; qty: number; scannedAt: string };
|
||||||
|
|
||||||
|
export type OfflineLock = {
|
||||||
|
lockId: string;
|
||||||
|
eventId: string;
|
||||||
|
eventTitle: string;
|
||||||
|
sectionId: string | null;
|
||||||
|
sectionName: string | null;
|
||||||
|
snapshotAt: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
const DB_NAME = "hope-events-offline-scan";
|
||||||
|
const LOCK_KEY = "hope_events_offline_lock";
|
||||||
|
const DEVICE_KEY = "hope_events_scan_device";
|
||||||
|
|
||||||
|
let dbPromise: Promise<IDBPDatabase> | null = null;
|
||||||
|
function db() {
|
||||||
|
if (!dbPromise) {
|
||||||
|
dbPromise = openDB(DB_NAME, 1, {
|
||||||
|
upgrade(d) {
|
||||||
|
d.createObjectStore("tickets", { keyPath: "qrCode" });
|
||||||
|
d.createObjectStore("queue", { keyPath: "clientScanId" });
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return dbPromise;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** A stable id for this browser, used to tie an offline lock to one device. */
|
||||||
|
export function deviceId(): string {
|
||||||
|
try {
|
||||||
|
let id = localStorage.getItem(DEVICE_KEY);
|
||||||
|
if (!id) {
|
||||||
|
id = crypto.randomUUID();
|
||||||
|
localStorage.setItem(DEVICE_KEY, id);
|
||||||
|
}
|
||||||
|
return id;
|
||||||
|
} catch {
|
||||||
|
return "unknown-device";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** A short, human name for this device ("Chrome on Android"). */
|
||||||
|
export function deviceName(): string {
|
||||||
|
const ua = typeof navigator !== "undefined" ? navigator.userAgent : "";
|
||||||
|
const browser = /Edg\//.test(ua) ? "Edge" : /Chrome\//.test(ua) ? "Chrome" : /Firefox\//.test(ua) ? "Firefox" : /Safari\//.test(ua) ? "Safari" : "Browser";
|
||||||
|
const os = /Android/.test(ua) ? "Android" : /iPhone|iPad/.test(ua) ? "iOS" : /Windows/.test(ua) ? "Windows" : /Mac OS/.test(ua) ? "Mac" : "device";
|
||||||
|
return `${browser} on ${os}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function getOfflineLock(): OfflineLock | null {
|
||||||
|
try {
|
||||||
|
const raw = localStorage.getItem(LOCK_KEY);
|
||||||
|
return raw ? JSON.parse(raw) : null;
|
||||||
|
} catch {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function setOfflineLock(lock: OfflineLock | null) {
|
||||||
|
try {
|
||||||
|
if (lock) localStorage.setItem(LOCK_KEY, JSON.stringify(lock));
|
||||||
|
else localStorage.removeItem(LOCK_KEY);
|
||||||
|
} catch { /* storage unavailable */ }
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Keeps the downloaded ticket list and marks this device as in offline mode. */
|
||||||
|
export async function startOffline(lock: OfflineLock, tickets: SnapshotTicket[]) {
|
||||||
|
const d = await db();
|
||||||
|
const tx = d.transaction("tickets", "readwrite");
|
||||||
|
await tx.store.clear();
|
||||||
|
for (const t of tickets) await tx.store.put(t);
|
||||||
|
await tx.done;
|
||||||
|
setOfflineLock(lock);
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function findTicket(qrCode: string): Promise<SnapshotTicket | undefined> {
|
||||||
|
return (await db()).get("tickets", qrCode);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Records a scan locally: lowers the ticket's remaining count and queues it for sync. */
|
||||||
|
export async function recordScan(lockId: string, ticket: SnapshotTicket, qty: number): Promise<QueuedScan> {
|
||||||
|
const d = await db();
|
||||||
|
const scan: QueuedScan = { clientScanId: crypto.randomUUID(), lockId, qrCode: ticket.qrCode, qty, scannedAt: new Date().toISOString() };
|
||||||
|
const tx = d.transaction(["tickets", "queue"], "readwrite");
|
||||||
|
await tx.objectStore("tickets").put({ ...ticket, remaining: Math.max(0, ticket.remaining - qty) });
|
||||||
|
await tx.objectStore("queue").put(scan);
|
||||||
|
await tx.done;
|
||||||
|
return scan;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function queuedScans(): Promise<QueuedScan[]> {
|
||||||
|
return (await db()).getAll("queue");
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function removeQueued(ids: string[]) {
|
||||||
|
const d = await db();
|
||||||
|
const tx = d.transaction("queue", "readwrite");
|
||||||
|
for (const id of ids) await tx.store.delete(id);
|
||||||
|
await tx.done;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Ends offline mode on this device: the ticket list is deleted (the queue must be empty). */
|
||||||
|
export async function clearOffline() {
|
||||||
|
const d = await db();
|
||||||
|
await d.clear("tickets");
|
||||||
|
setOfflineLock(null);
|
||||||
|
}
|
||||||
@@ -30,6 +30,11 @@ It runs in any web browser — on a phone, tablet, or computer — with nothing
|
|||||||
### For staff on the day
|
### For staff on the day
|
||||||
|
|
||||||
- **QR code scanner** — check people in by scanning their ticket with any phone camera. A single ticket can cover a whole family and be checked in a few people at a time.
|
- **QR code scanner** — check people in by scanning their ticket with any phone camera. A single ticket can cover a whole family and be checked in a few people at a time.
|
||||||
|
- **Feedback after every event** — a short survey with star ratings goes out automatically the morning after, with one reminder. See response rates and compare this year's camp with last year's.
|
||||||
|
- **Sponsor a spot** — let your congregation fund places for people who can't afford to come, with an optional "12 of 20 spots sponsored" progress bar. You decide who receives the help; sponsors never see who.
|
||||||
|
- **Rooms & groups for camps** — drag campers into cabins, small groups or buses (or auto-fill by capacity and gender), print lists for leaders, and show the cabin on each ticket.
|
||||||
|
- **Ticket transfer** — can't make it? Pass your ticket on to a friend; they get a fresh QR code and the old one stops working.
|
||||||
|
- **Works without Wi-Fi** — lock a check-in point to a phone and keep scanning with no signal; scans sync automatically when the connection is back.
|
||||||
- **Scan points** — set up separate check-in points (e.g. main hall, dinner) that only accept the right tickets.
|
- **Scan points** — set up separate check-in points (e.g. main hall, dinner) that only accept the right tickets.
|
||||||
- **At-the-door desk** — search by name, phone, or ticket number; register walk-ins; take cash, card, or EFT payments; check people in; and print or resend tickets on the spot.
|
- **At-the-door desk** — search by name, phone, or ticket number; register walk-ins; take cash, card, or EFT payments; check people in; and print or resend tickets on the spot.
|
||||||
- **Self-service kiosk** — set up a tablet where visitors register themselves. Returning visitors are recognised by their email or phone number.
|
- **Self-service kiosk** — set up a tablet where visitors register themselves. Returning visitors are recognised by their email or phone number.
|
||||||
|
|||||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "hope-events",
|
"name": "hope-events",
|
||||||
"version": "1.16.0",
|
"version": "1.21.0",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "hope-events",
|
"name": "hope-events",
|
||||||
"version": "1.16.0",
|
"version": "1.21.0",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"concurrently": "^9.2.1"
|
"concurrently": "^9.2.1"
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "hope-events",
|
"name": "hope-events",
|
||||||
"version": "1.16.0",
|
"version": "1.21.0",
|
||||||
"main": "index.js",
|
"main": "index.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev:backend": "cd backend && npm run dev",
|
"dev:backend": "cd backend && npm run dev",
|
||||||
|
|||||||
Reference in New Issue
Block a user