Skip to content

PM-6783 / PM-6784: goods-sold controls and calculator challenge fee - #2650

Merged
jmgasper merged 3 commits into
devfrom
fix/pm-6783-pm-6784
Nov 18, 2026
Merged

jmgasper merged 3 commits into
devfrom
fix/pm-6783-pm-6784

Conversation

@jmgasper

@jmgasper jmgasper commented Nov 18, 2026 •

Copy link
Copy Markdown
Collaborator

Related JIRA Ticket:

https://topcoder.atlassian.net/browse/PM-6783
https://topcoder.atlassian.net/browse/PM-6784

What's in this PR?

The calculator now shows Challenge fee = Booking Cost − Total Member Cost instead of the actual-cost hourly rate in the Member Cost summary. Referral fees are included in Total Member Cost; missing inputs remain unavailable, and zero/negative differences are preserved.

Goods Sold Customer-Wise gains inclusive From/To dates, multiple offering selections, Apply/Reset controls, and Member Payment / Booking Cost measures. Applied filters load independently of the other dashboards. Dates become half-open UTC API bounds and respect the API's 24-month limit; filtered totals are labeled Period total. Requests support cancellation and retry, and both measures retain monthly/quarterly aggregation and customer-table sorting/expansion. Quarter headers include years when needed to distinguish repeated quarters.

Companion API and rollout

reports-api-v6 #221 supplies filterOptions.offeringType, customerBookingCosts, and filtering before payment aggregation. Deploy the API before this UI. No database migration is required. Missing booking costs display an unavailable message rather than member-payment totals.

The Reports development Salesforce OAuth configuration currently returns invalid_client_id; the deployment environment needs working existing Salesforce configuration/read permissions for offering lookups. The API retains unfiltered amounts with an explicit notice if Salesforce is unavailable. Deployed credentials were not changed.

The calculator fix is isolated in commit 04ea9a732 and has no API dependency.

Validation

  • Sales/calculator suites: 204 tests passed initially; the final dashboard follow-up passed all 51 tests, including 2 new date-range/quarter-label cases (206 unique tests verified).
  • TypeScript: tsc --noEmit passed on the final code.
  • ESLint passed for all changed TypeScript/TSX files.
  • git diff --check passed.
  • Coverage includes leap/year boundaries, multiple offerings, measure totals, quarterly aggregation, invalid/oversized ranges, reset, retry/refresh/cancellation, missing booking data, and calculator fees with referral/zero/negative/missing values.

@jmgasper
jmgasper marked this pull request as ready for review November 18, 2026 22:00
@jmgasper
jmgasper requested a review from kkartunov as a code owner November 18, 2026 22:00
@jmgasper
jmgasper merged commit e3161ec into dev Nov 18, 2026
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant