Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use amount_captured in the timeline for captured events #7923

Closed
wants to merge 6 commits into from
Closed

Use amount_captured in the timeline for captured events #7923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
23f50ea
Use amount_captured in the timeline for captured events
mgascam Dec 15, 2023
a2aa837
Merge branch 'develop' into 6721-spike-fees-show-theyre-applied-to-th…
mgascam Dec 19, 2023
2f241a9
Merge branch 'develop' into 6721-spike-fees-show-theyre-applied-to-th…
mgascam Dec 21, 2023
c9b8ad2
Merge remote-tracking branch 'origin/develop' into 6721-spike-fees-sh…
mgascam Jan 29, 2024
1d05ef5
WIP
mgascam Jan 30, 2024
7727aa0
Use captured amount to calculate net deposit
mgascam Jan 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions client/payment-details/timeline/map-events.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ const isBaseFeeOnly = ( event ) => {
const formatNetString = ( event ) => {
if ( ! isFXEvent( event ) ) {
return formatExplicitCurrency(
event.amount - event.fee,
event.amount_captured - event.fee,
event.currency
);
}
Expand Down Expand Up @@ -681,7 +681,7 @@ const mapEventToTimelineItems = ( event ) => {
'A payment of %s was successfully charged.',
'woocommerce-payments'
),
event.amount,
event.amount_captured,
true
),
<CheckmarkIcon className="is-success" />,
Expand Down
8 changes: 7 additions & 1 deletion includes/class-wc-payments-captured-event-note.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,13 @@ public function compose_fee_break_down() {
public function compose_net_string(): string {
$data = $this->captured_event['transaction_details'];

$net = WC_Payments_Utils::interpret_stripe_amount( (int) $data['store_amount'] - $data['store_fee'], $data['store_currency'] );
// Determine the gross amount: Use captured amount if it exists (for partial captures),
// otherwise default to 'store_amount'. This handles cases where the captured amount
// may differ from the initially authorized amount.
$gross_amount = isset( $data['customer_amount_captured'] ) ? $data['customer_amount_captured'] : $data['store_amount'];

// TODO: check here for the net deposit of the order note.
$net = WC_Payments_Utils::interpret_stripe_amount( (int) $gross_amount - $data['store_fee'], $data['store_currency'] );

return sprintf(
/* translators: %s is a monetary amount */
Expand Down
Loading