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

Setup wizard: ensure that the current user can install plugins for any setup feature that requires it.

This commit is contained in:
Jeff Stieler 2017-09-11 14:37:35 -07:00
parent e19db10be8
commit 592508fc49
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
includes/admin/class-wc-admin-setup-wizard.php
View File

@ -61,9 +61,16 @@ class WC_Admin_Setup_Wizard {
} }
/** /**
* https://developers.taxjar.com/api/reference/#countries * The "automated tax" extra should only be shown if the current user can
* install plugins and the store is in a supported coutnry
*/ */
protected function is_automated_tax_supported_country( $country_code ) { protected function should_show_automated_tax_extra() {
if ( ! current_user_can( 'install_plugins' ) ) {
return false;
}
$country_code = WC()->countries->get_base_country();
// https://developers.taxjar.com/api/reference/#countries
$tax_supported_countries = array_merge( $tax_supported_countries = array_merge(
array( 'US', 'CA', 'AU' ), array( 'US', 'CA', 'AU' ),
WC()->countries->get_european_union_countries() WC()->countries->get_european_union_countries()
@ -112,10 +119,8 @@ class WC_Admin_Setup_Wizard {
), ),
); );
$country = WC()->countries->get_base_country();
// Hide the extras step if this store/user isn't eligible for them // Hide the extras step if this store/user isn't eligible for them
if ( ! $this->should_show_theme_extra() && ! $this->is_automated_tax_supported_country( $country ) ) { if ( ! $this->should_show_theme_extra() && ! $this->should_show_automated_tax_extra() ) {
unset( $default_steps['extras'] ); unset( $default_steps['extras'] );
} }
@ -539,7 +544,7 @@ class WC_Admin_Setup_Wizard {
$live_rate_carrier = $this->get_wcs_shipping_carrier( $country_code ); $live_rate_carrier = $this->get_wcs_shipping_carrier( $country_code );
if ( false === $live_rate_carrier ) { if ( false === $live_rate_carrier || ! current_user_can('install_plugins') ) {
unset( $shipping_methods['live_rates'] ); unset( $shipping_methods['live_rates'] );
} }
@ -1067,7 +1072,6 @@ class WC_Admin_Setup_Wizard {
* Extras. * Extras.
*/ */
public function wc_setup_extras() { public function wc_setup_extras() {
$country = WC()->countries->get_base_country();
?> ?>
<h1><?php esc_html_e( 'Extras', 'woocommerce' ); ?></h1> <h1><?php esc_html_e( 'Extras', 'woocommerce' ); ?></h1>
<p><?php esc_html_e( 'Enhance your store with these extra features and themes.', 'woocommerce' ); ?></p> <p><?php esc_html_e( 'Enhance your store with these extra features and themes.', 'woocommerce' ); ?></p>
@ -1091,7 +1095,7 @@ class WC_Admin_Setup_Wizard {
</li> </li>
</ul> </ul>
<?php endif; ?> <?php endif; ?>
<?php if ( $this->is_automated_tax_supported_country( $country ) ) : ?> <?php if ( $this->should_show_automated_tax_extra() ) : ?>
<ul class="wc-wizard-services featured"> <ul class="wc-wizard-services featured">
<li class="wc-wizard-service-item"> <li class="wc-wizard-service-item">
<div class="wc-wizard-service-description"> <div class="wc-wizard-service-description">