Merge branch 'trunk'

# Conflicts:
#	modules/ppcp-button/resources/js/modules/OnApproveHandler/onApproveForContinue.js
This commit is contained in:
Philipp Stracker 2024-08-26 14:59:54 +02:00
commit 010f5fbdf1
No known key found for this signature in database
101 changed files with 10063 additions and 2015 deletions

View file

@ -166,7 +166,7 @@ return array(
'classes' => array( 'ppcp-field-indent' ),
'class' => array(),
'input_class' => array( 'wc-enhanced-select' ),
'default' => 'pay',
'default' => 'plain',
'options' => PropertiesDictionary::button_types(),
'screens' => array( State::STATE_ONBOARDED ),
'gateway' => 'dcc',

View file

@ -92,6 +92,11 @@ class GooglePayGateway extends WC_Payment_Gateway {
) {
$this->id = self::ID;
$this->supports = array(
'refunds',
'products',
);
$this->method_title = __( 'Google Pay (via PayPal) ', 'woocommerce-paypal-payments' );
$this->method_description = __( 'The separate payment gateway with the Google Pay button. If disabled, the button is included in the PayPal gateway.', 'woocommerce-paypal-payments' );