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

Support place order button mode in block

Browse source
This commit is contained in:
Alex P 2023-11-15 09:45:15 +02:00
parent c71e312f18
commit 33ed474ae1
No known key found for this signature in database
GPG key ID: 54487A734A204D71
3 changed files with 45 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

47
modules/ppcp-blocks/resources/js/checkout-block.js
View file

@ -316,20 +316,35 @@ const PayPalComponent = ({
}
const features = ['products'];
let registerMethod = registerExpressPaymentMethod;
if (config.scriptData.continuation) {
features.push('ppcp_continuation');
registerMethod = registerPaymentMethod;
}
registerMethod({
name: config.id,
label: <div dangerouslySetInnerHTML={{__html: config.title}}/>,
content: <PayPalComponent isEditing={false}/>,
edit: <PayPalComponent isEditing={true}/>,
ariaLabel: config.title,
canMakePayment: () => config.enabled,
supports: {
features: features,
},
});
if (config.usePlaceOrder && !config.scriptData.continuation) {
registerPaymentMethod({
name: config.id,
label: <div dangerouslySetInnerHTML={{__html: config.title}}/>,
content: <div dangerouslySetInnerHTML={{__html: config.description}}/>,
edit: <div dangerouslySetInnerHTML={{__html: config.description}}/>,
ariaLabel: config.title,
canMakePayment: () => config.enabled,
supports: {
features: features,
},
});
} else {
let registerMethod = registerExpressPaymentMethod;
if (config.scriptData.continuation) {
features.push('ppcp_continuation');
registerMethod = registerPaymentMethod;
}
registerMethod({
name: config.id,
label: <div dangerouslySetInnerHTML={{__html: config.title}}/>,
content: <PayPalComponent isEditing={false}/>,
edit: <PayPalComponent isEditing={true}/>,
ariaLabel: config.title,
canMakePayment: () => config.enabled,
supports: {
features: features,
},
});
}

3
modules/ppcp-blocks/services.php
View file

@ -34,7 +34,8 @@ return array(
$container->get( 'wcgateway.paypal-gateway' ),
$container->get( 'blocks.settings.final_review_enabled' ),
$container->get( 'session.cancellation.view' ),
$container->get( 'session.handler' )
$container->get( 'session.handler' ),
$container->get( 'wcgateway.use-place-order-button' )
);
},
'blocks.settings.final_review_enabled' => static function ( ContainerInterface $container ): bool {

13
modules/ppcp-blocks/src/PayPalPaymentMethod.php
View file

@ -87,6 +87,13 @@ class PayPalPaymentMethod extends AbstractPaymentMethodType {
*/
private $session_handler;
/**
* Whether to use the standard "Place order" button.
*
* @var bool
*/
protected $use_place_order;
/**
* Assets constructor.
*
@ -99,6 +106,7 @@ class PayPalPaymentMethod extends AbstractPaymentMethodType {
* @param bool $final_review_enabled Whether the final review is enabled.
* @param CancelView $cancellation_view The cancellation view.
* @param SessionHandler $session_handler The Session handler.
* @param bool $use_place_order Whether to use the standard "Place order" button.
*/
public function __construct(
string $module_url,
@ -109,7 +117,8 @@ class PayPalPaymentMethod extends AbstractPaymentMethodType {
PayPalGateway $gateway,
bool $final_review_enabled,
CancelView $cancellation_view,
SessionHandler $session_handler
SessionHandler $session_handler,
bool $use_place_order
) {
$this->name = PayPalGateway::ID;
$this->module_url = $module_url;
@ -121,6 +130,7 @@ class PayPalPaymentMethod extends AbstractPaymentMethodType {
$this->final_review_enabled = $final_review_enabled;
$this->cancellation_view = $cancellation_view;
$this->session_handler = $session_handler;
$this->use_place_order = $use_place_order;
}
/**
@ -181,6 +191,7 @@ class PayPalPaymentMethod extends AbstractPaymentMethodType {
'enabled' => $this->settings_status->is_smart_button_enabled_for_location( $script_data['context'] ),
'fundingSource' => $this->session_handler->funding_source(),
'finalReviewEnabled' => $this->final_review_enabled,
'usePlaceOrder' => $this->use_place_order,
'ajax' => array(
'update_shipping' => array(
'endpoint' => WC_AJAX::get_endpoint( UpdateShippingEndpoint::ENDPOINT ),