JITM: Detect when WooCommerce Services is installed, but not active#6382
Merged
JITM: Detect when WooCommerce Services is installed, but not active#6382
Conversation
added 2 commits
February 13, 2017 11:44
…es/.bin/something" is not needed in NPM scripts.
…ted, and change the copy & behaviour of the JITM to activate only instead of install & activate
DanReyLop
commented
Feb 13, 2017
| "build-client": "./node_modules/.bin/gulp", | ||
| "build-production": "yarn clean-client && yarn build-languages && ./node_modules/.bin/gulp languages:extract && NODE_ENV=production BABEL_ENV=production yarn build", | ||
| "build-languages": "./node_modules/.bin/gulp languages", | ||
| "build-client": "gulp", |
Contributor
Author
There was a problem hiding this comment.
Unrelated with this issue, but I had yarn build-client failing for me (Windows 10) because ./node_modules/... is not valid CMD syntax. On the context of NPM scripts, that full path is redundant, since all executables from ./node_modules/.bin/* are included to the $PATH automatically.
dereksmart
reviewed
Feb 13, 2017
class.jetpack-jitm.php
Outdated
| $install_url = wp_nonce_url( add_query_arg( array( 'wc-services-action' => 'install' ) ), 'wc-services-install' ); | ||
| // If plugin dir exists, means it's installed but not activated | ||
| $all_plugins = get_plugins(); | ||
| $already_installed = isset( $all_plugins[ 'woocommerce-services/woocommerce-services.php' ] ); |
Contributor
There was a problem hiding this comment.
Could we use validate_plugin() here instead?
Contributor
Author
There was a problem hiding this comment.
Oh, didn't know about that one, thanks!
dereksmart
reviewed
Feb 13, 2017
class.jetpack-jitm.php
Outdated
| </p> | ||
| <p> | ||
| <a href="<?php echo esc_url( $install_url ); ?>" title="<?php esc_attr_e( 'Install WooCommerce Services', 'jetpack' ); ?>" data-module="wooservices" class="button button-jetpack show-after-enable"><?php esc_html_e( 'Install WooCommerce Services', 'jetpack' ); ?></a> | ||
| <a href="<?php echo esc_url( $install_url ); ?>" title="<?php esc_attr_e( 'Install WooCommerce Services', 'jetpack' ); ?>" data-module="wooservices" class="button button-jetpack show-after-enable"> |
Contributor
There was a problem hiding this comment.
the title attr value doesn't account for the conditional
Contributor
Author
There was a problem hiding this comment.
Oops, good catch! Fixed it.
…Fixed the title attr for the JITM when the action is "activate plugin"
dereksmart
approved these changes
Feb 20, 2017
Contributor
dereksmart
left a comment
There was a problem hiding this comment.
Changes look good and tests well 👍
Contributor
|
Merged! |
jeherve
added a commit
that referenced
this pull request
Feb 21, 2017
dereksmart
pushed a commit
that referenced
this pull request
Feb 28, 2017
* Changelog: update stable tag and move changelog to changelog.txt Also remove old releases from readme.txt to keep the changelog tab short. * Changelog: add #5883 Also update the filter's docblock to match new version. * Changelog: add #5938 * Changelog: add #6298 * Changelog: add #3405 * Changelog: add #5941 * Changelog: add #6239 * Changelog: add #6281 * Changelog: add #6303 * Changelog: add #6018 * Changelog: add #6300 * Changelog: add #6296 * Changelog: add #6130 * Changelog: add #6292 * Readme: remove extra "on". * Changelog: add #6307 * Changelog: add #3297 * Changelog: add #6275 * Changelog: add #6321 * Changelog: add #6297 * Readme: update the support forum link anchor. Anchor changed when WordPress.org forums were updated to bbPress 2 * Readme: update list of a12s, it wasn't up to date anymore! * Changelog: add #6338 * Changelog: add #6337 * Changelog: add #6335 * Changelog: add #6333 * Testing List: first version of the 4.7 testing list. * Changelog: add #6332 * Changelog: add #6325 * Changelog: add #6326 * Changelog: add #6339 * Changelog: add #6342 * Changelog: add #6343 * Changelog: add #6346 * Changelog: add #6347 * Changelog: add #6279 * Changelog: add #6306 * Changelog: add #6312 * Changelog: add #6316 * Changelog: add #6171 * Changelog: add #6317 * Changelog: add #6246 * Changelog: add #6263 * Changelog: add #4220 * Changelog: add #5888 * Changelog: add #3406 * Changelog: add #3637 * Changelog: add #6320 * Changelog: add #5992 * Changelog: add #6322 * Changelog: add #6324 * Changelog: add #6352 * Changelog: add #6355 * Changelog: add #6360 * Changelog: add #6362 * Changelog: add #6369, #6382 * Changelog: add #6370 * Changelog: add #6375 * Changelog: add #6383 * Changelog: add #6384 * Changelog: add #6386 * Changelog: add #6395 * Changelog: add #6403 * Changelog: add #6406 * Changelog: add #6418 * Changelog: add #6419 * Changelog: add #6434 * Changelog: add #6446 * Changelog: add #6006 * Changelog: add #6096 * Changelog: add #6399 * Changelog: fix typo. @see #6331 (comment) * Changelog: add #6440 * Changelog: add #6443 * Changelog: add #6445 * Changelog: add #6463 * Changelog: add #6468 * Changelog: add #6471 * Changelog: add #6474 * Changelog: add #6480 * Changelog: add #6497 * Changelog: add #6499 * Changelog: add #6514 * Changelog: add #6267 * Changelog: add #5940 * Changelog: add #6492 * Changelog: add #5281 * Changelog: add #6327 * Changelog: add #6451 * Changelog: add #6525 * Changelog: add #6530
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #6283
Changes proposed in this Pull Request:
When the WooCommerce Services JITM is displayed and the user already has the plugin installed (but deactivated):
wooservices-activate-$versionas opposed to the regularwooservices-install-$version). I expect this use case to be very rare, but I don't want unexplained discrepancies in our numbers :)Testing instructions:
WooCommerce -> Settingsor any of the other pages that show the JITM.