woocommerce/woocommerce-paypal-payments
2
0
Fork 0
mirror of https://github.com/woocommerce/woocommerce-paypal-payments.git synced 2025-09-06 10:55:00 +08:00
Code Issues Projects Packages Wiki Activity Actions 7

Merge branch 'task/shared-apple-google' into PCP-1744-google-pay-integration

Browse source 
# Conflicts:
#	modules/ppcp-button/src/Assets/SmartButton.php
#	modules/ppcp-onboarding/src/Render/OnboardingOptionsRenderer.php
This commit is contained in:
Pedro Silva 2023-08-24 10:14:49 +01:00
commit e39e29aece
No known key found for this signature in database
GPG key ID: E2EE20C0669D24B3
6 changed files with 37 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/ppcp-button/src/Assets/SmartButton.php
View file

@ -1171,7 +1171,7 @@ class SmartButton implements SmartButtonInterface {
/**
* Filter to add further components from the extensions.
*
* @internal Matches filter name in GooglePay extension.
* @internal Matches filter name in APM extension.
* @since TODO
*
* @param array $components The array of components already registered.

11
modules/ppcp-subscription/src/RenewalHandler.php
View file

@ -9,6 +9,7 @@ declare(strict_types=1);
namespace WooCommerce\PayPalCommerce\Subscription;
use WC_Subscription;
use WooCommerce\PayPalCommerce\ApiClient\Endpoint\OrderEndpoint;
use WooCommerce\PayPalCommerce\ApiClient\Entity\Order;
use WooCommerce\PayPalCommerce\ApiClient\Entity\PaymentToken;
@ -139,8 +140,16 @@ class RenewalHandler {
*
* @param \WC_Order $wc_order The WooCommerce order.
*/
public function renew( \WC_Order $wc_order ) {
public function renew( \WC_Order $wc_order ): void {
try {
$subscription = wcs_get_subscription( $wc_order->get_id() );
if ( is_a( $subscription, WC_Subscription::class ) ) {
$subscription_id = $subscription->get_meta( 'ppcp_subscription' ) ?? '';
if ( $subscription_id ) {
return;
}
}
$this->process_order( $wc_order );
} catch ( \Exception $exception ) {
$error = $exception->getMessage();

5
modules/ppcp-subscription/src/SubscriptionModule.php
View file

@ -74,6 +74,11 @@ class SubscriptionModule implements ModuleInterface {
add_action(
'woocommerce_subscription_payment_complete',
function ( $subscription ) use ( $c ) {
$paypal_subscription_id = $subscription->get_meta( 'ppcp_subscription' ) ?? '';
if ( $paypal_subscription_id ) {
return;
}
$payment_token_repository = $c->get( 'vaulting.repository.payment-token' );
$logger = $c->get( 'woocommerce.logger.woocommerce' );

20
modules/ppcp-webhooks/src/Handler/PaymentSaleCompleted.php
View file

@ -92,10 +92,24 @@ class PaymentSaleCompleted implements RequestHandler {
);
$subscriptions = wcs_get_subscriptions( $args );
foreach ( $subscriptions as $subscription ) {
$parent_order = wc_get_order( $subscription->get_parent() );
$transaction_id = wc_clean( wp_unslash( $request['resource']['id'] ?? '' ) );
if ( $transaction_id && is_string( $transaction_id ) && is_a( $parent_order, WC_Order::class ) ) {
$this->update_transaction_id( $transaction_id, $parent_order, $this->logger );
if ( $transaction_id && is_string( $transaction_id ) ) {
$is_renewal = $subscription->get_meta( '_ppcp_is_subscription_renewal' ) ?? '';
if ( $is_renewal ) {
$renewal_order = wcs_create_renewal_order( $subscription );
if ( is_a( $renewal_order, WC_Order::class ) ) {
$renewal_order->payment_complete();
$this->update_transaction_id( $transaction_id, $renewal_order, $this->logger );
break;
}
}
$parent_order = wc_get_order( $subscription->get_parent() );
if ( is_a( $parent_order, WC_Order::class ) ) {
$subscription->update_meta_data( '_ppcp_is_subscription_renewal', 'true' );
$subscription->save_meta_data();
$this->update_transaction_id( $transaction_id, $parent_order, $this->logger );
}
}
}