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 CardNotice component for authorization notification in transaction details page #7891

Merged
merged 8 commits into from
Dec 14, 2023
Merged

Use CardNotice component for authorization notification in transaction details page #7891

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5fa499f
Use CardNotice component for authorization notification
mgascam Dec 12, 2023
fc23371
Add changelog
mgascam Dec 13, 2023
e598971
Merge branch 'develop' into fix/7748-capture-notification-styles-are-…
mgascam Dec 13, 2023
21c57d7
Update snapshots
mgascam Dec 13, 2023
026a310
Merge branch 'fix/7748-capture-notification-styles-are-broken' of git…
mgascam Dec 13, 2023
303e1e2
Merge branch 'develop' into fix/7748-capture-notification-styles-are-…
mgascam Dec 14, 2023
ddb61df
Merge branch 'develop' into fix/7748-capture-notification-styles-are-…
kalessil Dec 14, 2023
b381cb6
Merge branch 'develop' into fix/7748-capture-notification-styles-are-…
mgascam Dec 14, 2023
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
133 changes: 62 additions & 71 deletions client/payment-details/summary/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,7 @@
*/
import { __ } from '@wordpress/i18n';
import { dateI18n } from '@wordpress/date';
import {
Card,
CardBody,
CardFooter,
CardDivider,
Flex,
} from '@wordpress/components';
import { Card, CardBody, CardDivider, Flex } from '@wordpress/components';
import moment from 'moment';
import React, { useContext } from 'react';
import { createInterpolateElement } from '@wordpress/element';
Expand Down Expand Up @@ -55,6 +49,7 @@ import MissingOrderNotice from 'wcpay/payment-details/summary/missing-order-noti
import DisputeAwaitingResponseDetails from '../dispute-details/dispute-awaiting-response-details';
import DisputeResolutionFooter from '../dispute-details/dispute-resolution-footer';
import ErrorBoundary from 'components/error-boundary';
import CardNotice from 'wcpay/components/card-notice';

declare const window: any;

Expand Down Expand Up @@ -508,73 +503,69 @@ const PaymentDetailsSummary: React.FC< PaymentDetailsSummaryProps > = ( {
authorization &&
! authorization.captured && (
<Loadable isLoading={ isLoading } placeholder="">
<CardFooter className="payment-details-capture-notice">
<div className="payment-details-capture-notice__section">
<div className="payment-details-capture-notice__text">
{ createInterpolateElement(
__(
'You must <a>capture</a> this charge within the next',
'woocommerce-payments'
),
{
a: (
// eslint-disable-next-line jsx-a11y/anchor-has-content, react/jsx-no-target-blank
<a
href="https://woo.com/document/woopayments/settings-guide/authorize-and-capture/#capturing-authorized-orders"
target="_blank"
rel="noreferer"
/>
),
<CardNotice
actions={
! isFraudOutcomeReview ? (
<CaptureAuthorizationButton
orderId={ charge.order?.number || 0 }
paymentIntentId={
charge.payment_intent || ''
}
) }{ ' ' }
<abbr
title={ dateI18n(
'M j, Y / g:iA',
moment
.utc( authorization.created )
.add( 7, 'days' ),
'UTC'
) }
>
<b>
{ moment
.utc( authorization.created )
.add( 7, 'days' )
.fromNow( true ) }
</b>
</abbr>
{ isFraudOutcomeReview &&
`. ${ __(
'Approving this transaction will capture the charge.',
'woocommerce-payments'
) }` }
</div>

{ ! isFraudOutcomeReview && (
<div className="payment-details-capture-notice__button">
<CaptureAuthorizationButton
orderId={
charge.order?.number || 0
}
paymentIntentId={
charge.payment_intent || ''
}
buttonIsPrimary={ true }
buttonIsSmall={ false }
onClick={ () => {
wcpayTracks.recordEvent(
'payments_transactions_details_capture_charge_button_click',
{
payment_intent_id:
charge.payment_intent,
}
);
} }
buttonIsPrimary={ true }
buttonIsSmall={ false }
onClick={ () => {
wcpayTracks.recordEvent(
'payments_transactions_details_capture_charge_button_click',
{
payment_intent_id:
charge.payment_intent,
}
);
} }
/>
) : (
<></>
)
}
>
{ createInterpolateElement(
__(
'You must <a>capture</a> this charge within the next',
'woocommerce-payments'
),
{
a: (
// eslint-disable-next-line jsx-a11y/anchor-has-content, react/jsx-no-target-blank
<a
href="https://woo.com/document/woopayments/settings-guide/authorize-and-capture/#capturing-authorized-orders"
target="_blank"
rel="noreferer"
/>
</div>
),
}
) }{ ' ' }
<abbr
title={ dateI18n(
'M j, Y / g:iA',
moment
.utc( authorization.created )
.add( 7, 'days' ),
'UTC'
) }
</div>
</CardFooter>
>
<b>
{ moment
.utc( authorization.created )
.add( 7, 'days' )
.fromNow( true ) }
</b>
</abbr>
{ isFraudOutcomeReview &&
`. ${ __(
'Approving this transaction will capture the charge.',
'woocommerce-payments'
) }` }
</CardNotice>
</Loadable>
) }
</Card>
Expand Down
Loading