Add/5669 add further payment metadata #7091
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Test the buildOption 1. Jetpack Beta
Option 2. Jurassic Ninja - available for logged-in A12s🚀 Launch a JN site with this branch 🚀 ℹ️ Install this Tampermonkey script to get more options. Build info:
Note: the build is updated when a new commit is pushed to this PR. |
|
Size Change: 0 B Total Size: 1.4 MB ℹ️ View Unchanged
|
| $gateway_type = 'classic'; | ||
| } | ||
|
|
||
| switch ( $order->get_created_via() ) { |
There was a problem hiding this comment.
Is this switch statement really needed? Sending checkout and store-api to the server doesn't seem bad by itself. Also, even if something else happens, we'd never see unknown.
There was a problem hiding this comment.
Good point. Fixed here: 8f1b3dd
| @@ -1500,12 +1526,12 @@ protected function get_metadata_from_order( $order, $payment_type ) { | |||
|
|
|||
| foreach ( $subscriptions as $subscription ) { | |||
| if ( WC_Payments_Subscription_Service::is_wcpay_subscription( $subscription ) ) { | |||
| $metadata['payment_context'] = 'wcpay_subscription'; | |||
| $metadata['payment_context'] = 'wcpay_subscription'; | |||
There was a problem hiding this comment.
Notice how is_wcpay_subscription is called here, and the whole section is only entered if ! $this->is_subscriptions_plugin_active(). We need a separate block for standard subscriptions, one where 'recurring' === (string) $payment_type && $this->is_subscriptions_plugin_active().
There was a problem hiding this comment.
Addressed here: d1996ca
RadoslavGeorgiev
requested changes
Aug 30, 2023
Co-authored-by: Radoslav Georgiev <[email protected]>
Co-authored-by: Radoslav Georgiev <[email protected]>
Thank you for the comments. All comments have been addressed. |
| $metadata['payment_context'] = 'regular_subscription'; | ||
|
|
||
| // If the order belongs to a WCPay Subscription, set the payment context to 'wcpay_subscription' (this helps with associating which fees belong to orders). | ||
| if ( $this->is_subscriptions_plugin_active() ) { |
There was a problem hiding this comment.
It's important to understand that WCPay/WooPayments subscriptions only work when the Subscriptions plugin is not active. When it is active, it's just regular subscriptions.
There was a problem hiding this comment.
Good point. Addressed here: d7d5636
RadoslavGeorgiev
requested changes
Aug 31, 2023
Co-authored-by: Radoslav Georgiev <[email protected]>
RadoslavGeorgiev
added
pr: ready to merge
and removed
pr: needs review
status: has pr
htdat
reviewed
Sep 7, 2023
Comment on lines
+1485
to
+1491
| if ( $this instanceof UPE_Split_Payment_Gateway ) { | ||
| $gateway_type = 'split_upe'; | ||
| } elseif ( $this instanceof UPE_Payment_Gateway ) { | ||
| $gateway_type = 'upe'; | ||
| } else { | ||
| $gateway_type = 'classic'; | ||
| } |
There was a problem hiding this comment.
Late here, but I think we would consider another type of gateway called the Split-UPE-with-Deferred-Intent.
Context: paJDYF-9xf-p2
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #5669
Changes proposed in this Pull Request
This PR adds more payment metadata for easier tracking, debugging, ... More info about what needs to be added can be found here: p1684514680519539-slack-C0208C3BXHP
Testing instructions
Test the following flow with on UPE, Split UPE and classic checkout
checkout_typefield is set toshortcode,subscription_paymentis set to 'no',client_versionmatches the current plugin version, andgateway_typematched with the current payment gateway.checkout_typefield is set toshortcode,subscription_paymentis set to 'initial' or 'renewal' (depends is subscription on renewal or brand new one),client_versionmatches the current plugin version, andgateway_typematched with the current payment gateway.checkout_typefield is set toblock,subscription_paymentis set to 'no',client_versionmatches the current plugin version, andgateway_typematched with the current payment gateway.checkout_typefield is set toblock,subscription_paymentis set to 'initial' or 'renewal' (depends is subscription on renewal or brand new one),client_versionmatches the current plugin version, andgateway_typematched with the current payment gateway.npm run changelogto add a changelog file, choosepatchto leave it empty if the change is not significant. You can add multiple changelog files in one PR by running this command a few times.Post merge