promote: uat → main (GRO-887/GRO-958 chart hygiene)

Merge main into uat to resolve PR #373 conflicts
2026-05-03 18:16:03 +00:00 · 2026-05-03 18:03:59 +00:00 · 2026-05-03 17:58:14 +00:00 · 2026-04-24 15:53:15 +00:00 · 2026-04-24 15:46:50 +00:00 · 2026-04-24 15:27:25 +00:00
2 changed files with 10 additions and 4 deletions
@@ -340,7 +340,7 @@ jobs:
    name: Update Infra Image Tags
    runs-on: ubuntu-latest
    needs: [docker]
-    if: github.ref == 'refs/heads/main' && github.event_name == 'push'
+    if: (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev') && github.event_name == 'push'
    permissions:
      contents: write
      pull-requests: write
@@ -883,6 +883,7 @@ async function seed() {
  let appointmentCount = 0;
  let invoiceCount = 0;
  let visitLogCount = 0;
  let paidInvoiceCounter = 0;
  // Process in batches per client to keep memory manageable
  const apptBatchSize = 100;
@@ -977,8 +978,11 @@ async function seed() {
        const invoiceStatus = rand() < 0.95 ? "paid" as const : "pending" as const;
        const paidAt = invoiceStatus === "paid" ? new Date(endTime.getTime() + randInt(5, 30) * 60 * 1000) : null;
        paidInvoiceCounter++;
        const stripePaymentIntentId = invoiceStatus === "paid"
          ? `pi_test_seed_${String(paidInvoiceCounter).padStart(6, "0")}`
          : null;
        const stripePaymentIntentId = invoiceStatus === "paid" && rand() < 0.2 ? `pi_test_${uuid().replace(/-/g, "").slice(0, 24)}` : null;
        invoiceBatch.push({
          id: invoiceId,
          appointmentId: apptId,
@@ -1094,14 +1098,16 @@ async function seed() {
      const taxCents = Math.round(effectivePrice * 0.08);
      const totalCents = effectivePrice + taxCents + tipCents;
      const paidAt = new Date(endTime.getTime() + randInt(5, 30) * 60 * 1000);
-      const stripePaymentIntentId = rand() < 0.2 ? `pi_test_${uuid().replace(/-/g, "").slice(0, 24)}` : null;
+      paidInvoiceCounter++;
      invoiceBatch.push({
        id: invoiceId, appointmentId: apptId, clientId,
        subtotalCents: effectivePrice, taxCents, tipCents, totalCents,
        status: "paid" as const,
        paymentMethod: pick(["cash", "card", "card", "card", "check"]) as "cash" | "card" | "check",
-        paidAt, stripePaymentIntentId, notes: null,
+        paidAt,
        stripePaymentIntentId: `pi_test_seed_${String(paidInvoiceCounter).padStart(6, "0")}`,
        notes: null,
      });
      lineItemBatch.push({
        id: uuid(), invoiceId, description: svc.name, quantity: 1,
Author	SHA1	Message	Date
scrubs-mcbarkley-ceo[bot]	53ab415713	promote: uat → main (GRO-887/GRO-958 chart hygiene) promote: uat → main (GRO-887/GRO-958 chart hygiene)	2026-05-03 18:16:03 +00:00
The Dogfather	a330e342e1	Merge main into uat to resolve PR #373 conflicts Conflicts: - apps/api/src/routes/invoices.ts — kept uat's stripeRefundId field (GRO-818) - packages/db/src/seed.ts — kept main's deterministic stripePaymentIntentId population (GRO-890); removed duplicate uat declaration that survived auto-merge Brings GRO-609 (refund/stats fixes), GRO-890 (seed stripe pi), GRO-898 (CI dev branch) and prior GRO-865 logo proxy promote from main into uat so the uat → main promote (GRO-958) becomes mergeable. Co-Authored-By: Paperclip <noreply@paperclip.ing>	2026-05-03 18:03:59 +00:00
the-dogfather-cto[bot]	0f841e27fc	Merge pull request #371 from groombook/dev chore(uat): promote dev → uat (includes GRO-887 chart hygiene)	2026-05-03 17:58:14 +00:00
the-dogfather-cto[bot]	cd25d98384	Merge pull request #366 from groombook/fix/gro-898-ci-dev-branch fix(GRO-898): update CI to deploy on dev branch pushes	2026-04-24 15:53:15 +00:00
Test User	e9fceb78b3	fix(GRO-898): update CI to deploy on dev branch pushes Update the Update Infra Image Tags job condition to also trigger on pushes to the dev branch, not just main. Co-Authored-By: Paperclip <noreply@paperclip.ing>	2026-04-24 15:46:50 +00:00
the-dogfather-cto[bot]	0cae8adef8	Merge pull request #365 from groombook/promote/dev-to-uat-gro876 promote: dev → uat (GRO-876 refund button fix)	2026-04-24 15:27:25 +00:00
Test User	674626ba1e	Merge remote-tracking branch 'origin/dev' into uat	2026-04-24 15:24:11 +00:00
the-dogfather-cto[bot]	903fbf55d5	promote: dev → uat (GRO-766 portal mobile overflow fix) promote: dev → uat (GRO-766 portal mobile overflow fix)	2026-04-24 15:02:13 +00:00
the-dogfather-cto[bot]	7bf9cf9734	Merge pull request #359 from groombook/fix/gro-890-seed-stripe-payment-intent fix(GRO-890): populate stripePaymentIntentId on paid seed invoices	2026-04-23 22:36:27 +00:00
groombook-engineer[bot]	bf159f8b1f	fix(GRO-890): populate stripePaymentIntentId on all paid seed invoices All paid invoices created by the seed script now get a deterministic stripePaymentIntentId of the form pi_test_seed_NNNNNN, unblocking the refund button conditional in Invoices.tsx:514 during UAT. Pending/draft invoices retain null as before. Co-Authored-By: Paperclip <noreply@paperclip.ing>	2026-04-23 19:29:45 +00:00
the-dogfather-cto[bot]	2f3d4d8d01	fix(gro-609): refund button, stats 5xx, dashboard payment stats (#357 ) fix(gro-609): include stripePaymentIntentId in invoice list and wrap stats endpoint in try/catch	2026-04-23 14:01:41 +00:00
Test User	db9bb31702	fix(gro-609): add payment stats to admin dashboard (AppointmentsPage) - Fetch /api/invoices/stats/summary on mount and display Revenue/Outstanding/Refunds summary cards above the calendar view on /admin - Mirrors the same stats section already on /admin/invoices - Gracefully handles errors via try/catch on the stats endpoint Parent: GRO-882 Grandparent: GRO-816 Co-Authored-By: Paperclip <noreply@paperclip.ing>	2026-04-23 13:51:15 +00:00
Test User	b38db65dde	fix(gro-609): include stripePaymentIntentId in invoice list and wrap stats endpoint in try/catch - Add stripePaymentIntentId to the GET /invoices list query so the refund button renders when seed data includes a payment intent ID - Wrap /api/invoices/stats/summary in try/catch so errors return 200 with zero defaults instead of 5xx, preventing the Invoices page from crashing on mount for groomer-role sessions Parent: GRO-882 Grandparent: GRO-816 Co-Authored-By: Paperclip <noreply@paperclip.ing>	2026-04-23 13:47:27 +00:00
scrubs-mcbarkley-ceo[bot]	3178f81b99	promote: uat → main (GRO-865 logo proxy mixed content fix) All SDLC gates cleared. Logo proxy fix ships to production. cc @cpfarhood	2026-04-22 03:50:15 +00:00
scrubs-mcbarkley-ceo[bot]	544d65959d	promote: dev → uat (GRO-867 + GRO-870 logo proxy fixes) Promoting logo proxy fixes to UAT. All SDLC gates passed. cc @cpfarhood	2026-04-22 03:49:30 +00:00
lint-roller-qa[bot]	f38bb244a4	Merge pull request #339 from groombook/dev Promote dev → uat	2026-04-20 14:06:22 +00:00
the-dogfather-cto[bot]	abee344ca4	Promote dev → uat: ARIA modal fix + tip split atomicity (#335 ) * feat(GRO-785): validate tip split totals before marking invoice paid - PATCH /invoices/:id returns 400 when tipCents > 0 but no tip splits exist or splits don't sum to 100% - POST /invoices/:id/tip-splits now returns 400 (not 422) on validation failure via router-level ZodError handler Co-Authored-By: Paperclip <noreply@paperclip.ing> * feat(GRO-786): add ARIA label attributes to Modal dialog component - Update Modal component to accept title and titleStyle props - Add role="dialog", aria-modal="true", and aria-labelledby attributes - Use useId() to generate stable ID for title heading association - Update all 4 Modal call sites (New/Edit Client, Add/Edit Pet, Log Grooming Visit, Permanently Delete Client) with title props - Delete modal passes titleStyle for red color on warning Co-Authored-By: Paperclip <noreply@paperclip.ing> * fix(GRO-786): remove duplicate dialog role and restore focus trap - Remove role="dialog" and aria-modal="true" from outer backdrop div - Keep ARIA attributes only on inner dialog div (the actual modal) - Restore useEffect focus management: auto-focus first element, Tab cycle wrapping, Escape key handler, focus restore on close Co-Authored-By: Paperclip <noreply@paperclip.ing> * fix(GRO-785): restore atomic tip split save in PATCH and fix error message - When body.tipSplits is provided in PATCH /invoices/:id, validate sum first then atomically replace existing splits (delete + insert) - When no incoming splits, validate existing DB splits with corrected message: "Tip splits are required when tip amount is greater than zero" (previously misleading "must sum to 100%" when no splits existed) Co-Authored-By: Paperclip <noreply@paperclip.ing> * fix(GRO-785): address invoice tip split regression - Use body.tipCents ?? current.tipCents for validation condition so that simultaneous status=paid + tipCents=0 skip split validation - Use body.tipCents (now aliased as tipCents) instead of current.tipCents inside the atomic transaction for shareCents calculation - Add explicit check for empty tipSplits array with appropriate error message ("Tip splits are required when tip amount is greater than zero") before the sum-to-100% check - Destructure tipSplits out of body before spreading into update object to prevent it from leaking into the invoices table SET clause Co-Authored-By: Paperclip <noreply@paperclip.ing> * fix(GRO-785): wrap tip split save + invoice update in single transaction Both tip split persistence (delete + insert) and the invoice PATCH update are now inside one db.transaction() block. If the invoice update fails after splits are written, the entire operation rolls back. Also removed unnecessary eslint-disable comment on _tipSplits. Co-Authored-By: Paperclip <noreply@paperclip.ing> * fix(GRO-785): restore eslint-disable for intentionally unused _tipSplits var Co-Authored-By: Paperclip <noreply@paperclip.ing> --------- Co-authored-by: Flea Flicker <fleaflicker@groombook.farh.net> Co-authored-by: Paperclip <noreply@paperclip.ing> Co-authored-by: the-dogfather-cto[bot] <269737991+the-dogfather-cto[bot]@users.noreply.github.com>	2026-04-17 22:58:00 +00:00