Hi ${user.name || ''},
Here's your payment link for ${event?.title || 'your registration'}:
` - }); + }).catch(e => console.error('Failed to send payment link email:', e)); } else { const { isValidZAPhone } = require('../utils/whatsapp'); if (!isValidZAPhone(user.phoneNumber)) { res.status(400); throw new Error('This user has no valid WhatsApp number on file'); } const { waTextAny } = require('../utils/notify'); - await waTextAny(user, message); + waTextAny(user, message).catch(e => console.error('Failed to send payment link via WhatsApp:', e)); } return res.status(200).json({ sent: true, channel }); @@ -1299,6 +1424,7 @@ module.exports = { getPaymentsByRegistration, getPaymentsByEvent, assignDonationToRegistration, + unassignDonationFromRegistration, createYocoCheckout, createRegistrationCheckoutInternal, sendPaymentLink, diff --git a/backend/src/controllers/registrationController.js b/backend/src/controllers/registrationController.js index ed783a2..e21b738 100644 --- a/backend/src/controllers/registrationController.js +++ b/backend/src/controllers/registrationController.js @@ -136,16 +136,16 @@ const createRegistration = async (req, res) => { throw new Error('At least one option must be selected'); } - // Validate each option and resolve prices / check stock - const resolvedOptions = []; - for (const option of options) { + // Validate each option and resolve prices / check stock. + // Options are independent of each other, so resolve them concurrently. Errors are marked + // with `.isStockError` rather than relying on shared `res.statusCode` (which would race + // across concurrent iterations) — the outer catch always responds 400 regardless. + const resolvedOptions = await Promise.all(options.map(async (option) => { const eventOption = event.eventOptions.find(eo => eo.id === option.eventOptionId); if (!eventOption) { - res.status(400); throw new Error(`Option with ID ${option.eventOptionId} not found for this event`); } if (!option.quantity || option.quantity < 1) { - res.status(400); throw new Error('Quantity must be at least 1'); } @@ -155,11 +155,12 @@ const createRegistration = async (req, res) => { try { const stockCheck = await checkOptionStock(eventOption, qty); if (!stockCheck.available) { - res.status(400); - throw new Error(`"${eventOption.name}" is sold out or does not have enough stock (${stockCheck.remaining ?? 0} remaining).`); + const err = new Error(`"${eventOption.name}" is sold out or does not have enough stock (${stockCheck.remaining ?? 0} remaining).`); + err.isStockError = true; + throw err; } } catch (e) { - if (res.statusCode !== 200) throw e; // propagate stock errors + if (e.isStockError) throw e; // propagate stock errors // If stock check function fails (pre-migration), continue without stock check } @@ -169,17 +170,17 @@ const createRegistration = async (req, res) => { if (variantId && canIncludeVariants) { const variant = (eventOption.variants || []).find(v => v.id === variantId); if (!variant) { - res.status(400); throw new Error(`Variant not found for option "${eventOption.name}"`); } try { const vStock = await checkVariantStock(variant, qty); if (!vStock.available) { - res.status(400); - throw new Error(`Variant "${variant.name}" is sold out (${vStock.remaining ?? 0} remaining).`); + const err = new Error(`Variant "${variant.name}" is sold out (${vStock.remaining ?? 0} remaining).`); + err.isStockError = true; + throw err; } } catch (e) { - if (res.statusCode !== 200) throw e; + if (e.isStockError) throw e; } variantPrice = variant.price; // null = use option price } @@ -213,8 +214,8 @@ const createRegistration = async (req, res) => { } if (priceSnapshot === null) priceSnapshot = eventOption.price; - resolvedOptions.push({ ...option, variantId, appliedTierId, priceSnapshot }); - } + return { ...option, variantId, appliedTierId, priceSnapshot }; + })); // Check for existing non-cancelled registration for this user+event → merge instead const existingReg = await prisma.registration.findFirst({ @@ -378,28 +379,43 @@ const createRegistration = async (req, res) => { // @access Private/Admin const getRegistrations = async (req, res) => { try { - const registrations = await prisma.registration.findMany({ - include: { - payments: { include: { recordedBy: { select: { id: true, name: true, email: true } } } }, - registrationOptions: { - include: { - eventOption: { include: { earlyBirdTiers: true } }, - variant: { select: { id: true, name: true, price: true } }, - } - }, - event: true, - user: { - select: { - id: true, - name: true, - email: true, - phoneNumber: true - } + const include = { + payments: { include: { recordedBy: { select: { id: true, name: true, email: true } } } }, + registrationOptions: { + include: { + eventOption: { include: { earlyBirdTiers: true } }, + variant: { select: { id: true, name: true, price: true } }, + } + }, + event: true, + user: { + select: { + id: true, + name: true, + email: true, + phoneNumber: true } } - }); + }; - res.json(registrations); + // Pagination is opt-in via ?page/?limit to keep existing callers (which expect a plain + // array of every registration) working unchanged; callers that pass either param get back + // the { data, total, page, limit, pages } shape used by /api/payments and /api/users. + if (typeof req.query.page === 'undefined' && typeof req.query.limit === 'undefined') { + const registrations = await prisma.registration.findMany({ include }); + return res.json(registrations); + } + + const page = Math.max(1, parseInt(req.query.page) || 1); + const limit = Math.min(200, Math.max(1, parseInt(req.query.limit) || 100)); + const skip = (page - 1) * limit; + + const [registrations, total] = await prisma.$transaction([ + prisma.registration.findMany({ include, orderBy: { createdAt: 'desc' }, skip, take: limit }), + prisma.registration.count() + ]); + + res.json({ data: registrations, total, page, limit, pages: Math.ceil(total / limit) }); } catch (error) { res.status(400).json({ message: error.message }); } diff --git a/backend/src/controllers/yocoTransactionsController.js b/backend/src/controllers/yocoTransactionsController.js index dab5d71..618add6 100644 --- a/backend/src/controllers/yocoTransactionsController.js +++ b/backend/src/controllers/yocoTransactionsController.js @@ -164,7 +164,10 @@ const reconcileYocoTransaction = async (req, res) => { const createdAt = ytx.createdDate || ytx.createdAt || new Date(); const payment = await prisma.payment.create({ data: { ...paymentData, createdAt } }); - // Optionally update registration status when applicable and generate/email tickets if paid + // Optionally update registration status when applicable and generate tickets if paid. + // Ticket generation stays synchronous so `generatedTickets` can be included in the response; + // emailing/WhatsApp-ing the tickets and payment confirmation are backgrounded below since + // they involve slow PDF rendering + SMTP/WAWP round trips that shouldn't block this request. let generatedTickets = []; if (registration) { try { @@ -172,15 +175,6 @@ const reconcileYocoTransaction = async (req, res) => { if (updatedReg && updatedReg.status === 'paid') { try { generatedTickets = await generateTicketsForRegistration(registration.id); - if (Array.isArray(generatedTickets) && generatedTickets.length > 0) { - try { - const mockReq = { user: { id: registration.userId }, body: { registrationId: registration.id } }; - const mockRes = { status: () => mockRes, json: () => {} }; - await emailTickets(mockReq, mockRes); - } catch (emailErr) { - console.error('Error emailing tickets after Yoco reconciliation:', emailErr); - } - } } catch (genErr) { console.error('Error generating tickets after Yoco reconciliation:', genErr); } @@ -191,13 +185,20 @@ const reconcileYocoTransaction = async (req, res) => { } } - // Send emails for the reconciled payment - try { - const { sendPaymentEmails } = require('../utils/notifications'); - await sendPaymentEmails(payment.id); - } catch (e) { - console.error('Failed to send payment emails after reconciliation:', e); - } + // Fire-and-forget: payment confirmation email, then ticket email/WhatsApp (guarantees order) + const { sendPaymentEmails } = require('../utils/notifications'); + const _rxPaymentId = payment.id; + const _rxUserId = registration?.userId; + const _rxRegId = registration?.id; + const _rxShouldEmailTickets = Array.isArray(generatedTickets) && generatedTickets.length > 0; + (async () => { + try { await sendPaymentEmails(_rxPaymentId); } catch (e) { console.error('Failed to send payment emails after reconciliation:', e); } + if (_rxShouldEmailTickets && _rxUserId) { + const mockReq = { user: { id: _rxUserId }, body: { registrationId: _rxRegId } }; + const mockRes = { status: () => mockRes, json: () => {} }; + try { await emailTickets(mockReq, mockRes); } catch (e) { console.error('Error emailing tickets after Yoco reconciliation:', e); } + } + })(); // Update yoco transaction as reconciled const updatedTx = await Yoco.update({ diff --git a/backend/src/routes/paymentRoutes.js b/backend/src/routes/paymentRoutes.js index 1774b47..67f761a 100644 --- a/backend/src/routes/paymentRoutes.js +++ b/backend/src/routes/paymentRoutes.js @@ -8,6 +8,7 @@ const { getPaymentsByRegistration, getPaymentsByEvent, assignDonationToRegistration, + unassignDonationFromRegistration, createYocoCheckout, sendPaymentLink, createRefund, @@ -27,6 +28,7 @@ router.get('/registration/:registrationId', protect, getPaymentsByRegistration); router.get('/', protect, supervisor, getPayments); router.get('/event/:eventId', protect, staff, getPaymentsByEvent); router.put('/assign-donation', protect, supervisor, assignDonationToRegistration); +router.post('/unassign-donation', protect, supervisor, unassignDonationFromRegistration); router.post('/refund', protect, supervisor, createRefund); router.get('/admin/stats', protect, admin, getPaymentStats); diff --git a/backend/src/utils/notifications.js b/backend/src/utils/notifications.js index 3776a90..44f7c1c 100644 --- a/backend/src/utils/notifications.js +++ b/backend/src/utils/notifications.js @@ -639,6 +639,109 @@ function buildPaymentAdminNotice(payment) { return { to, subject, text, html: emailWrapper(body) }; } +// ─── Donation unassignment ───────────────────────────────────────────────────── +// +// Sent when staff reverse a previous donation-assignment. Distinct from +// buildDonationAppliedToRegistrant: the leg payment no longer exists by the time this runs +// (it's hard-deleted before the notification fires), so callers pass a synthetic payment-shaped +// object — { amount, createdAt, registration } — built from the leg's captured values plus a +// freshly re-fetched registration so the balance table reflects the post-removal total. +// Kept anonymous (no donor name), same reasoning as the "applied" email. + +function buildDonationUnassignedFromRegistrant(payment) { + const org = getOrg(); + const reg = payment.registration; + const eventTitle = reg?.event?.title || 'the event'; + const totalDue = computeRegistrationTotalDue(reg, new Date()); + const totalPaid = (reg?.payments || []).reduce((s, p) => s + (p.amount || 0), 0); + const balance = Math.max(totalDue - totalPaid, 0); + const isUserActive = reg?.user?.isActive; + const subject = `A donation was removed from your registration – ${eventTitle}`; + const preheader = `A donation of ${fmtAmount(payment.amount)} was removed from your registration for ${eventTitle}.`; + + const body = ` +A donation was removed from your registration
+Your balance has changed
+ +Hi ${reg?.user?.name || 'there'},
++ A donation of ${fmtAmount(payment.amount)} previously applied to your registration for ${eventTitle} has been removed by our team. +
+ + ${callout(`${fmtAmount(payment.amount)} removed| Total due | +${fmtAmount(totalDue)} | +
| Total paid | +${fmtAmount(totalPaid)} | +
| ${balance <= 0 ? 'Fully paid ✓' : 'Balance remaining'} | +${fmtAmount(balance)} | +