Skip to content

add checkoutOption to GooglePayRequest#1514

Merged
saralvasquez merged 14 commits intobraintree:mainfrom
Adore-Beauty:googleplay-checkoutOption
Apr 20, 2026
Merged

add checkoutOption to GooglePayRequest#1514
saralvasquez merged 14 commits intobraintree:mainfrom
Adore-Beauty:googleplay-checkoutOption

Conversation

@mrphilipandrews
Copy link
Copy Markdown
Contributor

@mrphilipandrews mrphilipandrews commented Jan 8, 2026

Summary of changes

add support checkoutOption param to GooglePayRequest

Checklist

  • Added a changelog entry
  • [ x] Relevant test coverage
  • [x ] Tested and confirmed payment flows affected by this change are functioning as expected

Authors

@fatlinesofcode

@mrphilipandrews mrphilipandrews requested a review from a team as a code owner January 8, 2026 04:49
Copy link
Copy Markdown
Contributor

@saralvasquez saralvasquez left a comment

Choose a reason for hiding this comment

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

Could you please include an entry in the CHANGELOG under the unreleased header detailing what changed in this PR? Look at other entries for an example

Copy link
Copy Markdown
Contributor

@saralvasquez saralvasquez left a comment

Choose a reason for hiding this comment

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

Looks really good but I have a couple small comments

Settings.isGooglePayShippingAddressRequired(activity));
googlePayRequest.setShippingAddressParameters(new GooglePayShippingAddressParameters(Settings.getGooglePayAllowedCountriesForShipping(requireContext())));

googlePayRequest.setCheckoutOption(GooglePayCheckoutOption.COMPLETE_IMMEDIATE_PURCHASE);
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
googlePayRequest.setCheckoutOption(GooglePayCheckoutOption.COMPLETE_IMMEDIATE_PURCHASE);
googlePayRequest.setCheckoutOption(GooglePayCheckoutOption.COMPLETE_IMMEDIATE_PURCHASE);

@jaxdesmarais
Copy link
Copy Markdown
Contributor

@fatlinesofcode - are you able to address the feedback above? If so, we would be happy to re-review this PR. If we do not hear back we will go ahead and close this.

@mrphilipandrews
Copy link
Copy Markdown
Contributor Author

updated now @jaxdesmarais

Copy link
Copy Markdown
Contributor

@saralvasquez saralvasquez left a comment

Choose a reason for hiding this comment

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

This semi colon is causing lint issues. Once it's removed this should be good to go in

coursgranja01-del

This comment was marked as spam.

Copy link
Copy Markdown
Contributor

@saralvasquez saralvasquez left a comment

Choose a reason for hiding this comment

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

🎉

@saralvasquez
Copy link
Copy Markdown
Contributor

Hi! Sorry this has been sitting for so long. We just got confirmation that this can be merged despite the security check permission issues. However, we don't have permissions on this fork to resolve some merge conflicts so could you please resolve those on your end? We'll go ahead and do one last check after that and then get this merged in

# Conflicts:
#	CHANGELOG.md
#	GooglePay/src/main/java/com/braintreepayments/api/googlepay/GooglePayRequest.kt
#	GooglePay/src/test/java/com/braintreepayments/api/googlepay/GooglePayRequestUnitTest.kt
@mrphilipandrews
Copy link
Copy Markdown
Contributor Author

Hi! Sorry this has been sitting for so long. We just got confirmation that this can be merged despite the security check permission issues. However, we don't have permissions on this fork to resolve some merge conflicts so could you please resolve those on your end? We'll go ahead and do one last check after that and then get this merged in

thats done now

Copy link
Copy Markdown
Contributor

@saralvasquez saralvasquez left a comment

Choose a reason for hiding this comment

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

This needs a couple small changes to the CHANGELOG entry

Comment thread CHANGELOG.md Outdated
Comment thread CHANGELOG.md Outdated
Co-authored-by: Sara Vasquez <98496950+saralvasquez@users.noreply.github.com>
Signed-off-by: Philip Andrews <phil@frontside.com.au>
Comment thread CHANGELOG.md
@braintree braintree deleted a comment from coursgranja01-del Apr 9, 2026
@braintree braintree deleted a comment from coursgranja91-hash Apr 9, 2026
mrphilipandrews and others added 2 commits April 10, 2026 09:34
Co-authored-by: Sara Vasquez <98496950+saralvasquez@users.noreply.github.com>
Signed-off-by: Philip Andrews <phil@frontside.com.au>
Co-authored-by: Sara Vasquez <98496950+saralvasquez@users.noreply.github.com>
Signed-off-by: Philip Andrews <phil@frontside.com.au>
@saralvasquez
Copy link
Copy Markdown
Contributor

There's more conflicts that we can't resolve from our side. Please resolve those. We'd also be happy to manage all of this if you change the permissions on this branch so that we can make commits

@mrphilipandrews
Copy link
Copy Markdown
Contributor Author

hi @saralvasquez those conflicts are resolved now. i dont believe i can give you access to our organisation's branch

*/
DEFAULT("DEFAULT"),

CONTINUE_TO_REVIEW("CONTINUE_TO_REVIEW"),
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This one is missing docstrings

Comment thread CHANGELOG.md Outdated
* GooglePay
* Add optional `DisplayItems` in GooglePay request
* Add support for `checkoutOption` to `GooglePayRequest` TransactionInfo params

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Remove extra space

@mrphilipandrews mrphilipandrews requested a review from a team April 17, 2026 00:44
@saralvasquez saralvasquez merged commit 319f4cd into braintree:main Apr 20, 2026
15 of 17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants