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

Add support for warning messages for Payment Method items

Browse source
This commit is contained in:
Daniel Dudzic 2025-02-25 16:27:33 +01:00
parent 07e1e3b2d2
commit df8d21116c
No known key found for this signature in database
GPG key ID: 31B40D33E3465483
7 changed files with 103 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

15
modules/ppcp-axo/services.php
View file

@ -206,6 +206,13 @@ return array(
return $settings_notice_generator->generate_checkout_notice();
},
'axo.checkout-config-notice.raw' => static function ( ContainerInterface $container ) : string {
$settings_notice_generator = $container->get( 'axo.helpers.settings-notice-generator' );
assert( $settings_notice_generator instanceof SettingsNoticeGenerator );
return $settings_notice_generator->generate_checkout_notice( true );
},
'axo.incompatible-plugins-notice' => static function ( ContainerInterface $container ) : string {
$settings_notice_generator = $container->get( 'axo.helpers.settings-notice-generator' );
assert( $settings_notice_generator instanceof SettingsNoticeGenerator );
@ -213,6 +220,14 @@ return array(
return $settings_notice_generator->generate_incompatible_plugins_notice();
},
'axo.incompatible-plugins-notice.raw' => static function ( ContainerInterface $container ) : string {
$settings_notice_generator = new SettingsNoticeGenerator(
$container->get( 'axo.fastlane-incompatible-plugin-names' )
);
return $settings_notice_generator->generate_incompatible_plugins_notice( true );
},
'axo.smart-button-location-notice' => static function ( ContainerInterface $container ) : string {
$dcc_configuration = $container->get( 'wcgateway.configuration.dcc' );
assert( $dcc_configuration instanceof DCCGatewayConfiguration );

33
modules/ppcp-axo/src/Helper/SettingsNoticeGenerator.php
View file

@ -23,7 +23,7 @@ class SettingsNoticeGenerator {
*
* @var string[]
*/
protected $incompatible_plugin_names;
protected array $incompatible_plugin_names;
/**
* SettingsNoticeGenerator constructor.
@ -37,16 +37,21 @@ class SettingsNoticeGenerator {
/**
* Generates the full HTML of the notification.
*
* @param string $message HTML of the inner message contents.
* @param bool $is_error Whether the provided message is an error. Affects the notice color.
* @param string $message HTML of the inner message contents.
* @param bool $is_error Whether the provided message is an error. Affects the notice color.
* @param bool $raw_message Whether to return raw message without HTML wrappers.
*
* @return string The full HTML code of the notification, or an empty string.
* @return string The full HTML code of the notification, or an empty string, or raw message.
*/
private function render_notice( string $message, bool $is_error = false ) : string {
private function render_notice( string $message, bool $is_error = false, bool $raw_message = false ) : string {
if ( ! $message ) {
return '';
}
if ( $raw_message ) {
return $message;
}
return sprintf(
'<div class="ppcp-notice %1$s"><p>%2$s</p></div>',
$is_error ? 'ppcp-notice-error' : '',
@ -57,9 +62,10 @@ class SettingsNoticeGenerator {
/**
* Generates the checkout notice.
*
* @param bool $raw_message Whether to return raw message without HTML wrappers.
* @return string
*/
public function generate_checkout_notice(): string {
public function generate_checkout_notice( bool $raw_message = false ): string {
$checkout_page_link = esc_url( get_edit_post_link( wc_get_page_id( 'checkout' ) ) ?? '' );
$block_checkout_docs_link = __(
'https://woocommerce.com/document/woocommerce-store-editing/customizing-cart-and-checkout/#using-the-cart-and-checkout-blocks',
@ -90,15 +96,16 @@ class SettingsNoticeGenerator {
);
}
return $notice_content ? '<div class="ppcp-notice ppcp-notice-error"><p>' . $notice_content . '</p></div>' : '';
return $this->render_notice( $notice_content, true, $raw_message );
}
/**
* Generates the incompatible plugins notice.
*
* @param bool $raw_message Whether to return raw message without HTML wrappers.
* @return string
*/
public function generate_incompatible_plugins_notice(): string {
public function generate_incompatible_plugins_notice( bool $raw_message = false ): string {
if ( empty( $this->incompatible_plugin_names ) ) {
return '';
}
@ -114,17 +121,17 @@ class SettingsNoticeGenerator {
implode( '', $this->incompatible_plugin_names )
);
return '<div class="ppcp-notice"><p>' . $notice_content . '</p></div>';
return $this->render_notice( $notice_content, false, $raw_message );
}
/**
* Generates a warning notice with instructions on conflicting plugin-internal settings.
*
* @param Settings $settings The plugin settings container, which is checked for conflicting
* values.
* @param Settings $settings The plugin settings container, which is checked for conflicting values.
* @param bool $raw_message Whether to return raw message without HTML wrappers.
* @return string
*/
public function generate_settings_conflict_notice( Settings $settings ) : string {
public function generate_settings_conflict_notice( Settings $settings, bool $raw_message = false ) : string {
$notice_content = '';
$is_dcc_enabled = false;
@ -142,6 +149,6 @@ class SettingsNoticeGenerator {
);
}
return $this->render_notice( $notice_content, true );
return $this->render_notice( $notice_content, true, $raw_message );
}
}