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

Update check for TOS accepted in tax step (https://github.com/woocommerce/woocommerce-admin/pull/3245)

This commit is contained in:
Joshua T Flowers 2019-12-09 11:50:54 +07:00 committed by GitHub
parent fe0aaaa8ab
commit 2fe5f99977
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/woocommerce-admin/client/dashboard/task-list/tasks/tax.js
View File

@ -108,12 +108,12 @@ class Tax extends Component {
}
isTaxJarSupported() {
const { countryCode, wc_connect_options } = this.props;
const { countryCode, tosAccepted } = this.props;
const { automatedTaxSupportedCountries = [], taxJarActivated } = getSetting( 'onboarding', {} );
return (
! taxJarActivated && // WCS integration doesn't work with the official TaxJar plugin.
wc_connect_options.tos_accepted &&
tosAccepted &&
automatedTaxSupportedCountries.includes( countryCode )
);
}
@ -377,11 +377,10 @@ export default compose(
const countryCode = getCountryCode( generalSettings.woocommerce_default_country );
const activePlugins = getActivePlugins();
const pluginsToActivate = difference( [ 'jetpack', 'woocommerce-services' ], activePlugins );
const wc_connect_options = get(
getOptions( [ 'wc_connect_options' ] ),
'wc_connect_options',
{}
);
const options = getOptions( [ 'wc_connect_options', 'woocommerce_setup_jetpack_opted_in' ] );
const wc_connect_options = get( options, 'wc_connect_options', {} );
const tosAccepted =
wc_connect_options.tos_accepted || options.woocommerce_setup_jetpack_opted_in;
return {
countryCode,
@ -393,7 +392,7 @@ export default compose(
taxSettings,
isJetpackConnected: isJetpackConnected(),
pluginsToActivate,
wc_connect_options,
tosAccepted,
};
} ),
withDispatch( dispatch => {