fix(sponsor-reports): make Purchase Details describe itself on every view

src/actions/__tests__/sponsor-reports-actions.test.js

@@ -1233,7 +1233,7 @@ describe("sponsor-reports-actions", () => {
     const rowC = { item_code: "C1", quantity: 3 };
     const page1Summary = { total_orders: 11 };
 
-    it("records the active filters on REQUEST and hits the lines endpoint without paymentMethod", async () => {
+    it("records the active filters on REQUEST and hits the lines endpoint with paymentMethod", async () => {
       const store = mockStore(MOCK_STATE);
       const filters = { sponsorIds: [17], paymentMethod: "Card" };
       await store.dispatch(getPurchaseDetailsByItemRows(filters));
@@ -1250,11 +1250,12 @@ describe("sponsor-reports-actions", () => {
       expect(capturedUrl).toContain(
         "/summits/42/reports/purchase-details/lines"
       );
-      // buildPurchaseLinesQuery drops paymentMethod (order-level attribute).
+      // buildPurchaseLinesQuery now carries paymentMethod through (declared on
+      // the lines filter set via the parent hop).
       const filterClauses = capturedParams["filter[]"] || [];
       expect(
         filterClauses.some((c) => String(c).includes("payment_method"))
-      ).toBe(false);
+      ).toBe(true);
     });
 
     it("bulk-loads all pages (page 1, then the rest in parallel) into one atomic RECEIVE_PURCHASE_DETAILS_BY_ITEM_ROWS", async () => {

src/actions/__tests__/sponsor-reports-query.test.js

@@ -51,6 +51,42 @@ describe("buildReportQuery", () => {
     });
   });
 
+  it("sets include_cancelled from showCanceled with no status clause", () => {
+    // The point of the separate axis: `status==Canceled` resolves to the parent
+    // order's status at line grain, so deriving include_cancelled from the status
+    // value alone can never surface a canceled line inside a Paid order. The
+    // checkbox must open the flag WITHOUT emitting a status filter.
+    expect(buildReportQuery({ showCanceled: true })).toStrictEqual({
+      include_cancelled: "true"
+    });
+  });
+
+  it("keeps the status coupling when only the status is Canceled", () => {
+    // Guard against "fixing" this by replacing the coupling with the checkbox:
+    // the orders endpoint excludes Canceled by default, so a Canceled selection
+    // without the flag returns zero rows and the dropdown option goes dead.
+    expect(buildReportQuery({ status: "Canceled" }).include_cancelled).toBe(
+      "true"
+    );
+  });
+
+  it("emits include_cancelled once when both axes are on", () => {
+    expect(
+      buildReportQuery({ status: "Canceled", showCanceled: true })
+    ).toStrictEqual({
+      "filter[]": ["status==Canceled"],
+      include_cancelled: "true"
+    });
+  });
+
+  it("omits include_cancelled when showCanceled is false", () => {
+    expect(
+      buildReportQuery({ status: "Paid", showCanceled: false })
+    ).toStrictEqual({
+      "filter[]": ["status==Paid"]
+    });
+  });
+
   it("passes through search/order/pagination", () => {
     expect(
       buildReportQuery({
@@ -132,13 +168,19 @@ describe("buildPurchaseLinesQuery", () => {
     expect(q).not.toHaveProperty("order");
   });
 
-  it("drops payment_method — the lines filter set does not support it", () => {
-    const q = buildPurchaseLinesQuery(
-      { status: "Paid", paymentMethod: "Invoice" },
-      { page: 1, perPage: 10 }
-    );
-    expect(q["filter[]"]).toEqual(["status==Paid"]);
-    expect(q["filter[]"]).not.toContain("payment_method==Invoice");
+  it("carries paymentMethod through to the lines query", () => {
+    const query = buildPurchaseLinesQuery({ paymentMethod: "invoice" });
+    expect(query["filter[]"]).toContain("payment_method==invoice");
+  });
+
+  it("builds the same payment_method clause at both grains", () => {
+    // the regression: applying a filter and switching grain must not change the set
+    const orders = buildPurchaseQuery({ paymentMethod: "invoice" })["filter[]"];
+    const lines = buildPurchaseLinesQuery({ paymentMethod: "invoice" })[
+      "filter[]"
+    ];
+    const clause = (f) => f.find((c) => c.startsWith("payment_method"));
+    expect(clause(lines)).toEqual(clause(orders));
   });
 });
 

src/actions/sponsor-reports-actions.js

@@ -180,6 +180,7 @@ export const buildReportQuery = (filters = {}) => {
     mediaRequestType,
     dateFrom,
     dateTo,
+    showCanceled,
     search,
     order,
     page,
@@ -222,8 +223,14 @@ export const buildReportQuery = (filters = {}) => {
   if (order) query.order = order;
   if (page != null) query.page = page;
   if (perPage != null) query.per_page = perPage;
-  // Canceled is excluded server-side by default.
-  if (status === "Canceled") query.include_cancelled = "true";
+  // Canceled is excluded server-side by default, on TWO independent axes: the
+  // order's status, and a line's own canceled_at (a soft-canceled line leaves its
+  // parent order Paid). Selecting the Canceled status must keep implying this, or
+  // that option would return nothing at order grain -- but it can't be the only
+  // way in, because `status==Canceled` resolves to `purchase__status` at line
+  // grain, which excludes the soft-canceled-line rows it is meant to reveal.
+  // Hence the OR: the checkbox opens the second axis without closing the first.
+  if (status === "Canceled" || showCanceled) query.include_cancelled = "true";
 
   return query;
 };
@@ -259,13 +266,11 @@ export const buildPurchaseQuery = (
 
 // Lines grain: same date expansion, NO order (manifest relies on backend default
 // ordering). Used by the on-screen lines fetch AND exportPurchaseDetailsLinesCsv.
-// The lines endpoint's filter set omits payment_method (it's an order-level
-// attribute), so drop it here rather than emit a clause BaseFilter silently
-// ignores. The UI also hides the Payment Method control in the Line Items view.
-export const buildPurchaseLinesQuery = (
-  { paymentMethod: _paymentMethod, ...filters } = {},
-  { page, perPage } = {}
-) => buildReportQuery({ ...expandDates(filters), page, perPage });
+// payment_method IS supported at line grain (declared on PurchaseLineDetailsFilter
+// via the parent hop). It used to be dropped here, which is why applying it and
+// switching grain silently widened the result set instead of narrowing it.
+export const buildPurchaseLinesQuery = (filters = {}, { page, perPage } = {}) =>
+  buildReportQuery({ ...expandDates(filters), page, perPage });
 
 export const getPurchaseDetailsReport =
   (filters = {}, pagination = {}) =>
@@ -516,7 +521,7 @@ export const getPurchaseDetailsByItemRows =
     guardedDispatch(
       createAction(REQUEST_PURCHASE_DETAILS_BY_ITEM)({ filters })
     );
-    // Lines-grain query (drops paymentMethod); one arg → no page/per_page emitted.
+    // Lines-grain query (carries paymentMethod through); one arg → no page/per_page emitted.
     const baseQuery = buildPurchaseLinesQuery(filters);
     const url = `${base(currentSummit.id)}/purchase-details/lines`;
     const fetchPage = (page) =>

src/components/sponsors/reports/ByItemView.js

@@ -116,10 +116,14 @@ const accumulateRow = (itemMap, row) => {
     sponsorBooth: row.sponsor_booth ?? null,
     checkoutAt: row.purchase?.checkout_at ?? null,
     rateName: row.rate_name ?? "",
-    status: row.purchase?.status ?? "",
+    // the line's own state: a soft-canceled line leaves its parent order Paid
+    status: row.is_canceled ? "Canceled" : row.purchase?.status ?? "",
     qty: row.quantity ?? 0,
     lineTotalCents: row.line_total ?? null,
-    isCanceled: Boolean(row.is_canceled)
+    isCanceled: Boolean(row.is_canceled),
+    // line-grain freshness (decision 1): the contributor row IS a line
+    syncedAt: row.synced_at ?? null,
+    sourceUpdatedAt: row.source_updated_at ?? null
   });
 };
 
@@ -250,7 +254,9 @@ const CONTRIB_HEADERS = [
   { key: "col_used_rate" },
   { key: "col_status" },
   { key: "col_quantity", align: "right" },
-  { key: "col_line_total", align: "right" }
+  { key: "col_line_total", align: "right" },
+  { key: "col_synced_at" },
+  { key: "col_source_updated" }
 ];
 
 // One expansion key per (sponsor, item) so the same item code under two
@@ -468,6 +474,12 @@ const ItemTable = ({
                                   ? "—"
                                   : currencyAmountFromCents(c.lineTotalCents)}
                               </TableCell>
+                              <TableCell>
+                                {formatCheckoutTime(c.syncedAt)}
+                              </TableCell>
+                              <TableCell>
+                                {formatCheckoutTime(c.sourceUpdatedAt)}
+                              </TableCell>
                             </TableRow>
                           ))}
                         </TableBody>

src/components/sponsors/reports/LinesManifestView.js

@@ -83,10 +83,16 @@ const bucketLinesBySponsor = (rows = []) => {
       groups.push({
         sponsorId: id,
         sponsorName: row.sponsor?.name ?? "",
-        lines: []
+        lines: [],
+        // Canceled lines still RENDER (struck through) but must not be counted —
+        // the chip means live lines, matching the By Item units chip on the same
+        // screen, which already excludes them.
+        liveLineCount: 0
       });
     }
-    groups[indexByKey.get(key)].lines.push(row);
+    const group = groups[indexByKey.get(key)];
+    group.lines.push(row);
+    if (!row.is_canceled) group.liveLineCount += 1;
   });
   return groups;
 };
@@ -102,7 +108,9 @@ const HEADERS = [
   { key: "col_quantity", align: "right" },
   { key: "col_used_rate" },
   { key: "col_status" },
-  { key: "col_line_total", align: "right" }
+  { key: "col_line_total", align: "right" },
+  { key: "col_synced_at" },
+  { key: "col_source_updated" }
 ];
 
 const LinesManifestView = ({
@@ -126,7 +134,7 @@ const LinesManifestView = ({
               size="small"
               sx={{ ml: 1.5 }}
               label={T.translate("sponsor_reports_page.lines_count", {
-                count: group.lines.length
+                count: group.liveLineCount
               })}
             />
           </AccordionSummary>
@@ -178,16 +186,35 @@ const LinesManifestView = ({
                       <TableCell align="right">{line.quantity}</TableCell>
                       <TableCell>{line.rate_name}</TableCell>
                       <TableCell>
-                        <StatusPill
-                          status={line.purchase?.status}
-                          label={line.purchase?.status}
-                        />
+                        {/* The LINE's state, not the parent order's. A soft-canceled
+                            line leaves its order Paid, so rendering purchase.status
+                            printed "Paid" on a dead row — and the strikethrough that
+                            was the only other signal does not survive CSV export. */}
+                        {line.is_canceled ? (
+                          <StatusPill
+                            status="Canceled"
+                            label={T.translate(
+                              "sponsor_reports_page.status_canceled"
+                            )}
+                          />
+                        ) : (
+                          <StatusPill
+                            status={line.purchase?.status}
+                            label={line.purchase?.status}
+                          />
+                        )}
                       </TableCell>
                       <TableCell align="right">
                         {line.line_total == null
                           ? "—"
                           : currencyAmountFromCents(line.line_total)}
                       </TableCell>
+                      <TableCell>
+                        {formatCheckoutTime(line.synced_at)}
+                      </TableCell>
+                      <TableCell>
+                        {formatCheckoutTime(line.source_updated_at)}
+                      </TableCell>
                     </TableRow>
                   ))}
                 </TableBody>

src/components/sponsors/reports/OrdersTable.js

@@ -135,6 +135,30 @@ const columns = [
     header: T.translate("sponsor_reports_page.col_sponsor_note"),
     sortable: false // not a backend ordering field
     // No render — MuiTable fallback reads row["sponsor_note"] directly.
+  },
+  {
+    columnKey: "refunded_amount",
+    header: T.translate("sponsor_reports_page.col_refunded"),
+    sortable: false, // not a backend ordering field
+    align: "right",
+    // Refunds never touch purchase status — a fully refunded order reads Paid
+    // forever, so this column is the only on-screen signal. The CSV already had it.
+    render: (row) =>
+      row.refunded_amount == null
+        ? "—"
+        : currencyAmountFromCents(row.refunded_amount)
+  },
+  {
+    columnKey: "synced_at",
+    header: T.translate("sponsor_reports_page.col_synced_at"),
+    sortable: false, // not a backend ordering field
+    render: (row) => formatCheckoutTime(row.synced_at)
+  },
+  {
+    columnKey: "source_updated_at",
+    header: T.translate("sponsor_reports_page.col_source_updated"),
+    sortable: false, // not a backend ordering field
+    render: (row) => formatCheckoutTime(row.source_updated_at)
   }
 ];