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

use the plugins notice module to render the notice

Browse source
This commit is contained in:
David Remer 2020-10-02 12:09:23 +03:00
parent 6683617d2b
commit 2a882487a7
2 changed files with 35 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

41
modules/ppcp-wc-gateway/src/Settings/class-settingsrenderer.php
View file

@ -9,6 +9,8 @@ declare(strict_types=1);
namespace WooCommerce\PayPalCommerce\WcGateway\Settings; namespace WooCommerce\PayPalCommerce\WcGateway\Settings;
use WooCommerce\PayPalCommerce\AdminNotices\Entity\Message;
use WooCommerce\PayPalCommerce\AdminNotices\Repository\Repository;
use WooCommerce\PayPalCommerce\ApiClient\Helper\DccApplies; use WooCommerce\PayPalCommerce\ApiClient\Helper\DccApplies;
use WooCommerce\PayPalCommerce\Button\Helper\MessagesApply; use WooCommerce\PayPalCommerce\Button\Helper\MessagesApply;
use WooCommerce\PayPalCommerce\Onboarding\State; use WooCommerce\PayPalCommerce\Onboarding\State;
@ -90,6 +92,30 @@ class SettingsRenderer {
$this->dcc_product_status = $dcc_product_status; $this->dcc_product_status = $dcc_product_status;
} }
/**
* Returns the notice, when onboarding failed.
*
* @return array
*/
public function messages() : array {
//phpcs:ignore WordPress.Security.NonceVerification.Recommended
if ( ! isset( $_GET['ppcp-onboarding-error'] ) ) {
return array();
}
$messages = array(
new Message(
__(
'We could not complete the onboarding process. Some features, such as card processing, will not be available. To fix this, please try again.',
'paypal-payments-for-woocommerce'
),
'error',
false
),
);
return $messages;
}
/** /**
* Renders the multiselect field. * Renders the multiselect field.
* *
@ -224,21 +250,6 @@ class SettingsRenderer {
*/ */
public function render() { public function render() {
//phpcs:ignore WordPress.Security.NonceVerification.Recommended
if ( isset( $_GET['ppcp-onboarding-error'] ) ) :
?>
<div class="notice notice-error">
<p><strong>
<?php
esc_html_e(
'We could not properly fetch the necessary credentials. Please try again.',
'paypal-payments-for-woocommerce'
);
?>
</strong></p>
</div>
<?php
endif;
//phpcs:ignore WordPress.Security.NonceVerification.Recommended //phpcs:ignore WordPress.Security.NonceVerification.Recommended
$is_dcc = isset( $_GET[ SectionsRenderer::KEY ] ) && CreditCardGateway::ID === sanitize_text_field( wp_unslash( $_GET[ SectionsRenderer::KEY ] ) ); $is_dcc = isset( $_GET[ SectionsRenderer::KEY ] ) && CreditCardGateway::ID === sanitize_text_field( wp_unslash( $_GET[ SectionsRenderer::KEY ] ) );
$nonce = wp_create_nonce( SettingsListener::NONCE ); $nonce = wp_create_nonce( SettingsListener::NONCE );

9
modules/ppcp-wc-gateway/src/class-wcgatewaymodule.php
View file

@ -91,6 +91,15 @@ class WcGatewayModule implements ModuleInterface {
$notices[] = $authorized_message; $notices[] = $authorized_message;
} }
$settings_renderer = $container->get( 'wcgateway.settings.render' );
/**
* The settings renderer.
*
* @var SettingsRenderer $settings_renderer
*/
$messages = $settings_renderer->messages();
$notices = array_merge( $notices, $messages );
return $notices; return $notices;
} }
); );