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

Hide shipping step for stores without physical products (https://github.com/woocommerce/woocommerce-admin/pull/3005)

This commit is contained in:
Joshua T Flowers 2019-10-08 06:42:57 +08:00 committed by GitHub
parent 1563971836
commit 431e465893
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/woocommerce-admin/client/dashboard/task-list/index.js
View File

@ -27,9 +27,16 @@ import Payments from './tasks/payments';
import withSelect from 'wc-api/with-select';
import { recordEvent } from 'lib/tracks';
const { customLogo, hasHomepage, hasProducts, shippingZonesCount } = getSetting( 'onboarding', {
const {
customLogo,
hasHomepage,
hasPhysicalProducts,
hasProducts,
shippingZonesCount,
} = getSetting( 'onboarding', {
customLogo: '',
hasHomePage: false,
hasPhysicalProducts: false,
hasProducts: false,
shippingZonesCount: 0,
} );
@ -119,7 +126,7 @@ class TaskDashboard extends Component {
onClick: () => updateQueryString( { task: 'shipping' } ),
container: <Shipping />,
className: shippingZonesCount > 0 ? 'is-complete' : null,
visible: true,
visible: profileItems.product_types.includes( 'physical' ) || hasPhysicalProducts,
},
{
key: 'tax',

16
plugins/woocommerce-admin/src/Features/OnboardingTasks.php
View File

@ -41,10 +41,10 @@ class OnboardingTasks {
*/
public function __construct() {
add_action( 'admin_enqueue_scripts', array( $this, 'add_media_scripts' ) );
// old settings injection
// Old settings injection.
// Run after Onboarding.
add_filter( 'woocommerce_components_settings', array( $this, 'component_settings' ), 30 );
// new settings injection
// New settings injection.
add_filter( 'woocommerce_shared_settings', array( $this, 'component_settings' ), 30 );
add_action( 'admin_init', array( $this, 'set_active_task' ), 20 );
add_action( 'current_screen', array( $this, 'check_active_task_completion' ), 1000 );
@ -70,6 +70,14 @@ class OnboardingTasks {
$settings['onboarding']['automatedTaxSupportedCountries'] = self::get_automated_tax_supported_countries();
$settings['onboarding']['customLogo'] = get_theme_mod( 'custom_logo', false );
$settings['onboarding']['hasHomepage'] = self::check_task_completion( 'homepage' );
$settings['onboarding']['hasPhysicalProducts'] = count(
wc_get_products(
array(
'virtual' => false,
'limit' => 1,
)
)
) > 0;
$settings['onboarding']['hasProducts'] = self::check_task_completion( 'products' );
$settings['onboarding']['shippingZonesCount'] = count( \WC_Shipping_Zones::get_zones() );
@ -133,8 +141,8 @@ class OnboardingTasks {
return false;
}
$post = get_post( $homepage_id );
$completed = $post && 'publish' === $post->post_status;
$post = get_post( $homepage_id );
$completed = $post && 'publish' === $post->post_status;
if ( $completed ) {
update_option( 'show_on_front', 'page' );
update_option( 'page_on_front', $homepage_id );