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

refactor: Reorder DPM successful loading redirect #8

Merged
merged 4 commits into from
May 2, 2024
Merged

refactor: Reorder DPM successful loading redirect #8

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d0bb730
refactor: Reorder DPM succeeded loading to fix redirect to receipt
julianajlk May 1, 2024
30c45e6
refactor: handleRequestError DPM country not compatible
julianajlk May 1, 2024
eef052d
fix: Update comment on contry compatibility error
julianajlk May 2, 2024
7f2b372
fix: Remove postal code validation for DPM countries
julianajlk May 2, 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
26 changes: 13 additions & 13 deletions src/payment/PaymentPage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,19 @@ class PaymentPage extends React.Component {

const shouldRedirectToReceipt = paymentStatus === 'succeeded';

// If this is a redirect from Stripe Dynamic Payment Methods with a successful payment,
// redirect to the receipt page. PageLoading render is required first otherwise there is a
// lag between when the paymentStatus is no longer null but the redirect hasn't happened yet.
if (shouldRedirectToReceipt) {
return (
<PageLoading
srMessage={this.props.intl.formatMessage(messages['payment.loading.payment'])}
shouldRedirectToReceipt={shouldRedirectToReceipt}
orderNumber={orderNumber}
/>
);
}

// If this is a redirect from Stripe Dynamic Payment Methods, show loading icon until getPaymentStatus is done.
if (isPaymentRedirect && paymentStatus !== undefined && paymentStatus === null) {
return (
Expand All @@ -134,19 +147,6 @@ class PaymentPage extends React.Component {
);
}

// If this is a redirect from Stripe Dynamic Payment Methods with a successful payment,
// redirect to the receipt page. PageLoading render is required first otherwise there is a
// lag between when the paymentStatus is no longer null but the redirect hasn't happened yet.
if (shouldRedirectToReceipt) {
return (
<PageLoading
srMessage={this.props.intl.formatMessage(messages['payment.loading.payment'])}
shouldRedirectToReceipt={shouldRedirectToReceipt}
orderNumber={orderNumber}
/>
);
}

// In all other cases, we want to render the basket content. This is used before we've loaded
// anything, during loading, and after we've loaded a basket with a product in it.

Expand Down
10 changes: 7 additions & 3 deletions src/payment/data/handleRequestError.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,13 @@ export default function handleRequestError(error) {
}

// Country not DPM compatible
if (error.type === 'invalid_request_error' && (
error.param === 'payment_method_data[billing_details][address][country]' || error.param === 'billing_details[address][state]' || error.param === 'billing_details[address][postal_code]'
)) {
const billingAddressErrors = [
'payment_method_data[billing_details][address][country]',
'billing_details[address][state]',
'billing_details[address][postal_code]',
];

if (error.type === 'invalid_request_error' && billingAddressErrors.includes(error.param)) {
logInfo('Dynamic Payment Method Country Error', error.param);
handleApiErrors([
{
Expand Down
Loading