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

Remove URL params from woopay_source_url #7924

Merged
merged 9 commits into from
Jan 2, 2024
Merged

Remove URL params from woopay_source_url #7924

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cd26441
Remove URL params from woopay_source_url
malithsen Dec 15, 2023
a5359a5
Add changelog entry
malithsen Dec 15, 2023
abbd2a4
Get URL from wcSettings
malithsen Dec 15, 2023
b85428d
Update URL passed via query params
malithsen Dec 15, 2023
b608537
Add optional chains
malithsen Dec 15, 2023
3eb7f48
Merge branch 'develop' into fix/trim-woopay-source-url
malithsen Dec 15, 2023
22d74de
Merge branch 'develop' into fix/trim-woopay-source-url
malithsen Dec 20, 2023
f8fab34
Merge branch 'develop' into fix/trim-woopay-source-url
malithsen Jan 2, 2024
d155a51
Fix unit test
malithsen Jan 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
4 changes: 4 additions & 0 deletions changelog/fix-trim-woopay-source-url
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: fix

Checkout error when page URL is too long
6 changes: 4 additions & 2 deletions client/components/woopay/save-user/checkout-page-save-user.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,9 @@ const CheckoutPageSaveUser = ( { isBlocksCheckout } ) => {
? {}
: {
save_user_in_woopay: isSaveDetailsChecked,
woopay_source_url: window.location.href,
woopay_source_url: window.location.href.split(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would not work with plain permalinks, maybe we can change it to wcSettings.storePages.checkout.permalink.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great catch! Updated in abbd2a4

I wasn't sure if storePages would be available on all sites. Then realized that it's set in Blocks. Since Blocks is packaged with WooPayments we should be good.

'?'
)[ 0 ],
woopay_is_blocks: true,
woopay_viewport: `${ viewportWidth }x${ viewportHeight }`,
woopay_user_phone_field: {
Expand Down Expand Up @@ -291,7 +293,7 @@ const CheckoutPageSaveUser = ( { isBlocksCheckout } ) => {
<input
type="hidden"
name="woopay_source_url"
value={ window.location.href }
value={ window.location.href.split( '?' )[ 0 ] }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated in abbd2a4

/>
<input
type="hidden"
Expand Down