Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fall back to site logo when no custom WooPay logo defined #7103

Merged
merged 2 commits into from
Aug 31, 2023
Merged

Fall back to site logo when no custom WooPay logo defined #7103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29be31d
fall back to site logo when custom woopay logo not available
reykjalin Aug 31, 2023
f188a38
add changelog entry
reykjalin Aug 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions changelog/add-use-site-logo-when-no-woopay-logo-defined
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: add

Fall back to site logo when a custom WooPay logo has not been defined
11 changes: 9 additions & 2 deletions includes/woopay/class-woopay-session.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,14 @@ private static function get_init_session_request() {

$account_id = WC_Payments::get_account_service()->get_stripe_account_id();

$store_logo = WC_Payments::get_gateway()->get_option( 'platform_checkout_store_logo' );
$site_logo_id = get_theme_mod( 'custom_logo' );
$site_logo_url = $site_logo_id ? ( wp_get_attachment_image_src( $site_logo_id, 'full' )[0] ?? '' ) : '';
$woopay_store_logo = WC_Payments::get_gateway()->get_option( 'platform_checkout_store_logo' );

$store_logo = $site_logo_url;
if ( ! empty( $woopay_store_logo ) ) {
$store_logo = get_rest_url( null, 'wc/v3/payments/file/' . $woopay_store_logo );
}

include_once WCPAY_ABSPATH . 'includes/compat/blocks/class-blocks-data-extractor.php';
$blocks_data_extractor = new Blocks_Data_Extractor();
Expand All @@ -361,7 +368,7 @@ private static function get_init_session_request() {
'email' => '',
'store_data' => [
'store_name' => get_bloginfo( 'name' ),
'store_logo' => ! empty( $store_logo ) ? get_rest_url( null, 'wc/v3/payments/file/' . $store_logo ) : '',
'store_logo' => $store_logo,
'custom_message' => self::get_formatted_custom_message(),
'blog_id' => Jetpack_Options::get_option( 'id' ),
'blog_url' => get_site_url(),
Expand Down