joshuaandClaude Sonnet 5
0de3f4be7d
Financial correctness (donation-leg model):
- Donations are no longer mutated when assigned to a registration; assignment now
creates an immutable "leg" record referencing the original donation instead.
- Fixed several places where money was double-counted once a donation was partially
or fully assigned (Payments, Revenue summary, Cashup reconciliation, Finance
report, Profit report, Master Orders, Revenue Detailed).
- Payments now record who recorded them (recordedBy), separate from who they're for.
Cashup:
- Per-user cash denomination counting (optional, any time) replaces the single
event-wide manual entry; the event's cash actual is the live sum of these counts.
- New "Payment accountability by staff member" breakdown across all methods, and a
read-only "Report" tab that opens automatically once an event is closed.
Reports page redesign:
- New shell: sidebar of universal filters (events, date range, past/inactive/closed
toggles), searchable/categorized report grid, and a popup viewer with
Print/Email/Excel/WhatsApp actions plus an in-app Reporting Guide.
- Visual pass: colored stat tiles and bar charts on most reports, matching mockups.
- PDF exports (download/Print/Email/WhatsApp) now share a branded design mirroring
the web report — colored header, stat tiles, bar chart, highlighted totals.
- Excel export now produces a styled .xlsx (via exceljs) instead of a plain CSV.
- Master Orders' "Donations made" table is now included in every export channel.
Bug fixes discovered while testing exports:
- Report emails now go through the shared, DB-configurable mail utility instead of
a one-off transporter that ignored Site Settings SMTP config.
- WhatsApp report sends now surface the actual WAWP API error and auto-recover a
disconnected session, instead of a bare axios status-code message.
Also: Admin-editable notification preference, richer Admin Registrations dashboard,
{{payment.link}} placeholder for Email/WhatsApp Attendees, and background
email/WhatsApp attendee sending.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
31 lines
1.3 KiB
JavaScript
31 lines
1.3 KiB
JavaScript
// Shared template placeholder substitution for bulk emails/WhatsApp messages and broadcasts.
|
|
// Async because {{payment.link}} needs to create a live Yoco checkout session per recipient —
|
|
// every other placeholder is a plain synchronous string replace.
|
|
async function replacePlaceholders(str, ctx = {}) {
|
|
if (!str) return str;
|
|
let out = String(str)
|
|
.replace(/\{\{\s*name\s*\}\}/g, ctx.name || '')
|
|
.replace(/\{\{\s*event\.title\s*\}\}/g, ctx.eventTitle || '')
|
|
.replace(/\{\{\s*event\.start\s*\}\}/g, ctx.eventStart || '')
|
|
.replace(/\{\{\s*event\.(link|url)\s*\}\}/g, (ctx.eventLinkHtml || ctx.eventLink || ''))
|
|
.replace(/\{\{\s*promo\.title\s*\}\}/g, ctx.promoTitle || '')
|
|
.replace(/\{\{\s*promo\.(link|url)\s*\}\}/g, (ctx.promoLinkHtml || ctx.promoLink || ''))
|
|
.replace(/\{\{\s*balance\s*\}\}/g, ctx.balanceFmt || '');
|
|
|
|
if (/\{\{\s*payment\.link\s*\}\}/.test(out) && typeof ctx.paymentLinkResolver === 'function') {
|
|
let link = '';
|
|
try {
|
|
link = (await ctx.paymentLinkResolver()) || '';
|
|
} catch (e) {
|
|
try { console.warn('[placeholders] payment.link resolution failed:', e?.message || e); } catch {}
|
|
}
|
|
out = out.replace(/\{\{\s*payment\.link\s*\}\}/g, link);
|
|
} else {
|
|
out = out.replace(/\{\{\s*payment\.link\s*\}\}/g, '');
|
|
}
|
|
|
|
return out;
|
|
}
|
|
|
|
module.exports = { replacePlaceholders };
|