Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'trunk' into hotfix/info-trailing-semi-colon

This commit is contained in:
Marco Cannon 2023-10-19 14:45:37 +02:00
parent f3e2353d7c e25cbb1f87
commit ca92093f30
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/woocommerce/changelog/add-40794-active-theme-label Normal file
View File

@ -0,0 +1,4 @@
Significance: minor
Type: update
Add active theme label for CYS intro screen

10
plugins/woocommerce/src/Admin/API/OnboardingThemes.php
View File

@ -249,6 +249,8 @@ class OnboardingThemes extends \WC_REST_Data_Controller {
); );
} }
$current_theme_slug = wp_get_theme()->get_stylesheet();
// To be implemented: 1. Fetch themes from the marketplace API. 2. Convert prices to the requested currency. // To be implemented: 1. Fetch themes from the marketplace API. 2. Convert prices to the requested currency.
// These are Dotcom themes. // These are Dotcom themes.
$themes = array( $themes = array(
@ -258,7 +260,7 @@ class OnboardingThemes extends \WC_REST_Data_Controller {
'color_palettes' => array(), 'color_palettes' => array(),
'total_palettes' => 0, 'total_palettes' => 0,
'slug' => 'tsubaki', 'slug' => 'tsubaki',
'is_active' => false, 'is_active' => 'tsubaki' === $current_theme_slug,
'thumbnail_url' => 'https://i0.wp.com/s2.wp.com/wp-content/themes/premium/tsubaki/screenshot.png', 'thumbnail_url' => 'https://i0.wp.com/s2.wp.com/wp-content/themes/premium/tsubaki/screenshot.png',
'link_url' => 'https://wordpress.com/theme/tsubaki/', 'link_url' => 'https://wordpress.com/theme/tsubaki/',
), ),
@ -268,7 +270,7 @@ class OnboardingThemes extends \WC_REST_Data_Controller {
'color_palettes' => array(), 'color_palettes' => array(),
'total_palettes' => 0, 'total_palettes' => 0,
'slug' => 'tazza', 'slug' => 'tazza',
'is_active' => false, 'is_active' => 'tazza' === $current_theme_slug,
'thumbnail_url' => 'https://i0.wp.com/s2.wp.com/wp-content/themes/premium/tazza/screenshot.png', 'thumbnail_url' => 'https://i0.wp.com/s2.wp.com/wp-content/themes/premium/tazza/screenshot.png',
'link_url' => 'https://wordpress.com/theme/tazza/', 'link_url' => 'https://wordpress.com/theme/tazza/',
'total_palettes' => 0, 'total_palettes' => 0,
@ -300,7 +302,7 @@ class OnboardingThemes extends \WC_REST_Data_Controller {
), ),
'total_palettes' => 5, 'total_palettes' => 5,
'slug' => 'amulet', 'slug' => 'amulet',
'is_active' => false, 'is_active' => 'amulet' === $current_theme_slug,
'thumbnail_url' => 'https://i0.wp.com/s2.wp.com/wp-content/themes/premium/amulet/screenshot.png', 'thumbnail_url' => 'https://i0.wp.com/s2.wp.com/wp-content/themes/premium/amulet/screenshot.png',
'link_url' => 'https://wordpress.com/theme/amulet/', 'link_url' => 'https://wordpress.com/theme/amulet/',
), ),
@ -331,7 +333,7 @@ class OnboardingThemes extends \WC_REST_Data_Controller {
), ),
'total_palettes' => 11, 'total_palettes' => 11,
'slug' => 'zaino', 'slug' => 'zaino',
'is_active' => false, 'is_active' => 'zaino' === $current_theme_slug,
'thumbnail_url' => 'https://i0.wp.com/s2.wp.com/wp-content/themes/premium/zaino/screenshot.png', 'thumbnail_url' => 'https://i0.wp.com/s2.wp.com/wp-content/themes/premium/zaino/screenshot.png',
'link_url' => 'https://wordpress.com/theme/zaino/', 'link_url' => 'https://wordpress.com/theme/zaino/',
), ),