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

♻️ Flatten processPayment to functon body

Browse source 
This makes the flow easier to understand and debug
This commit is contained in:
Philipp Stracker 2025-02-26 18:01:13 +01:00
parent 672641ba82
commit 5a5074df8c
No known key found for this signature in database
1 changed files with 13 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

30
modules/ppcp-googlepay/resources/js/GooglepayButton.js
View file

@ -870,22 +870,6 @@ class GooglepayButton extends PaymentButton {
return isApproved;
};
const processPaymentPromise = async ( id ) => {
const isApprovedByPayPal = await checkPayPalApproval( id );
if ( ! isApprovedByPayPal ) {
return paymentError( 'TRANSACTION FAILED' );
}
// This must be the last step in the process, as it initiates a redirect.
const success = await approveOrderServerSide( id );
if ( success ) {
return this.processPaymentResponse( 'SUCCESS' );
}
return paymentError( 'FAILED TO APPROVE' );
};
// Add billing data to session.
moduleStorage.setPayer( payer );
setPayerData( payer );
@ -894,7 +878,19 @@ class GooglepayButton extends PaymentButton {
const orderId = await this.contextHandler.createOrder();
this.log( 'createOrder', orderId );
result = await processPaymentPromise( orderId );
const isApprovedByPayPal = await checkPayPalApproval( orderId );
if ( ! isApprovedByPayPal ) {
result = paymentError( 'TRANSACTION FAILED' );
} else {
const success = await approveOrderServerSide( orderId );
if ( success ) {
result = this.processPaymentResponse( 'SUCCESS' );
} else {
result = paymentError( 'FAILED TO APPROVE' );
}
}
} catch ( err ) {
result = paymentError( err.message );
}