fix(wallet): Fix wallet ongoing refresh with draft invoice #4677
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
groyoh
force-pushed
the
fix/wallet-draft-invoice
branch
from
b4a8410 to
612db53
Compare
vincent-pochet
approved these changes
Dec 4, 2025
Contributor
Author
|
Converting back to draft as it will conflict with "multiple wallets" initiative. So we'll merge "multiple wallets" first and then rebase this one. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Context
When a wallet has limitations (restricted to specific billable metrics or fee types), the ongoing balance calculation was incorrectly summing all draft invoice amounts instead of only the fees that match the wallet's limitations. This caused the ongoing balance to be understated, as it included fees that should not be applicable to the wallet.
Description
The wallet ongoing balance is calculated as:
balance - current_usage - draft_invoices_amount + already_billed_amount. Previously,draft_invoices_amountwas calculated usingcustomer.invoices.draft.sum(:total_amount_cents), which ignored wallet limitations entirely.This PR introduces
Wallets::Balance::CalculateApplicableFeesServicethat filters fees by billable metric limitations and fee type limitations when applicable.The service is now used by:
RefreshOngoingService- for real-time balance refreshRefreshOngoingUsageService- for clock job balance refreshAppliedPrepaidCreditsService- for applying prepaid credits to invoices