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

Add GooglePay shipping option

Browse source
This commit is contained in:
Pedro Silva 2023-09-28 18:04:46 +01:00
parent ad08480b67
commit eeaf38e4c4
No known key found for this signature in database
GPG key ID: E2EE20C0669D24B3
3 changed files with 26 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/ppcp-applepay/src/Assets/ApplePayButton.php
View file

@ -185,7 +185,7 @@ class ApplePayButton implements ButtonInterface {
'integration_method' => 'PAYPAL',
'integration_type' => 'THIRD_PARTY',
'third_party_details' => array(
'features' => array(
'features' => array(
'PAYMENT',
'REFUND',
),

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

@ -100,13 +100,18 @@ class GooglepayButton {
}
initClient() {
const callbacks = {
onPaymentAuthorized: this.onPaymentAuthorized.bind(this)
}
if ( this.buttonConfig.enable_shipping ) {
callbacks['onPaymentDataChanged'] = this.onPaymentDataChanged.bind(this);
}
this.paymentsClient = new google.payments.api.PaymentsClient({
environment: this.buttonConfig.environment,
// add merchant info maybe
paymentDataCallbacks: {
onPaymentDataChanged: this.onPaymentDataChanged.bind(this),
onPaymentAuthorized: this.onPaymentAuthorized.bind(this),
}
paymentDataCallbacks: callbacks
});
}
@ -186,14 +191,15 @@ class GooglepayButton {
paymentDataRequest.allowedPaymentMethods = googlePayConfig.allowedPaymentMethods;
paymentDataRequest.transactionInfo = await this.contextHandler.transactionInfo();
paymentDataRequest.merchantInfo = googlePayConfig.merchantInfo;
//paymentDataRequest.callbackIntents = ['PAYMENT_AUTHORIZATION'];
paymentDataRequest.callbackIntents = ["SHIPPING_ADDRESS", "SHIPPING_OPTION", "PAYMENT_AUTHORIZATION"];
paymentDataRequest.shippingAddressRequired = true;
paymentDataRequest.shippingAddressParameters = this.getGoogleShippingAddressParameters();
paymentDataRequest.shippingOptionRequired = true;
if ( this.buttonConfig.enable_shipping ) {
paymentDataRequest.callbackIntents = ["SHIPPING_ADDRESS", "SHIPPING_OPTION", "PAYMENT_AUTHORIZATION"];
paymentDataRequest.shippingAddressRequired = true;
paymentDataRequest.shippingAddressParameters = this.getGoogleShippingAddressParameters();
paymentDataRequest.shippingOptionRequired = true;
} else {
paymentDataRequest.callbackIntents = ['PAYMENT_AUTHORIZATION'];
}
return paymentDataRequest;
}

13
modules/ppcp-googlepay/src/Assets/Button.php
View file

@ -198,14 +198,14 @@ class Button implements ButtonInterface {
}
$data['capabilities'][] = 'GOOGLE_PAY';
$data['operations'][] = array(
$data['operations'][] = array(
'operation' => 'API_INTEGRATION',
'api_integration_preference' => array(
'rest_api_integration' => array(
'integration_method' => 'PAYPAL',
'integration_type' => 'THIRD_PARTY',
'third_party_details' => array(
'features' => array(
'features' => array(
'PAYMENT',
'REFUND',
),
@ -407,14 +407,17 @@ class Button implements ButtonInterface {
*/
public function script_data(): array {
return array(
'environment' => $this->environment->current_environment_is( Environment::SANDBOX ) ? 'TEST' : 'PRODUCTION',
'sdk_url' => $this->sdk_url,
'button' => array(
'environment' => $this->environment->current_environment_is( Environment::SANDBOX ) ? 'TEST' : 'PRODUCTION',
'sdk_url' => $this->sdk_url,
'button' => array(
'wrapper' => '#ppc-button-googlepay-container',
'style' => $this->button_styles_for_context( 'cart' ), // For now use cart. Pass the context if necessary.
'mini_cart_wrapper' => '#ppc-button-googlepay-container-minicart',
'mini_cart_style' => $this->button_styles_for_context( 'mini-cart' ),
),
'enable_shipping' => $this->settings->has( 'googlepay_button_shipping_enabled' )
? $this->settings->get( 'googlepay_button_shipping_enabled' )
: false,
);
}