Commit Graph

17639 Commits

Author SHA1 Message Date
haszari 023579cc17 localise default CTA text + code-style improvements:
- else style, fix stale/presumptuous variable names
- localise default CTA text
- use `Learn More` for default, more in line with our latest content
- switch CTA default to button - link style is less common
2019-03-01 14:22:02 +13:00
Konstantin Kovshenin 9447afbc47 Update Marketplace suggestions endpoint URL 2019-02-27 12:26:14 +03:00
haszari d5287b3f07 switch in WCCOM new (versioned) suggestions host/URL 2019-02-27 16:12:38 +13:00
haszari 0dcc87110b Merge branch feature/marketplace-suggestions into add/product-edit-suggestions
# Conflicts:
#assets/css/admin-rtl.css
#assets/css/admin.css
#assets/css/marketplace-suggestions-rtl.css
#assets/css/marketplace-suggestions.css
#assets/css/marketplace-suggestions.scss
#assets/js/admin/marketplace-suggestions.js
#includes/admin/class-wc-admin-assets.php
#includes/admin/marketplace-suggestions/class-wc-marketplace-suggestions.php
2019-02-27 10:56:13 +13:00
haszari 8dbda1b9c9 revert suggestion-related changes in helper:
- no longer required, now using active plugins for suggestions
- get_local_woo_plugins needs to not be cached
- left plugin `slug` in get_local_woo_plugins values, may be useful
2019-02-27 10:19:56 +13:00
haszari 69e3856188 show/hide suggestions based on which extensions are active:
- was previously based on folder names of installed plugins
2019-02-27 10:13:48 +13:00
Gerhard Potgieter cc857be201
Merge pull request #22811 from woocommerce/add/orders-list-suggestions
Show marketplace suggestions in orders list empty state
2019-02-26 18:22:02 +02:00
Gerhard Potgieter 3455b2c1cb
Merge pull request #22830 from woocommerce/add/marketplace-updater-wc-queue
Update Marketplace suggestions data using WC_Queue
2019-02-26 17:55:33 +02:00
haszari c45a39676c use safe get for API request, linter fixes, doc comments 2019-02-26 10:07:42 +13:00
haszari 97524aab16 Merge branch 'feature/marketplace-suggestions' into add/product-edit-suggestions
# Conflicts:
#	includes/admin/marketplace-suggestions/class-wc-marketplace-suggestions.php

+ fix linter errors / warnings
2019-02-25 16:12:24 +13:00
haszari 1aff17f0b9 Merge branch 'feature/marketplace-suggestions' into add/orders-list-suggestions 2019-02-25 16:05:04 +13:00
haszari 556bd1b372 remove hard-coded test suggestion data 2019-02-25 13:34:59 +13:00
haszari 764926f30c rename product edit suggestions contexts for consistency 2019-02-25 10:21:22 +13:00
haszari 041068a705 use full path when including container template, rename folder 'views' 2019-02-24 09:37:33 +13:00
Konstantin Kovshenin 1dad53d5e0 Update Marketplace suggestions data using WC_Queue
Schedules an update task to run as soon as possible to fetch the
suggestions data, and cache it for a week. Failures are cached for
a day.
2019-02-22 22:34:18 +03:00
Konstantin Kovshenin a0af355a45 Change marketplace suggestions label to "Get more options" 2019-02-22 21:16:13 +03:00
Konstantin Kovshenin 86d8065f3b Remove debug code 2019-02-22 12:11:54 +03:00
Konstantin Kovshenin 25a72cc5f3 Add missing HTML template that renders the product data panel content 2019-02-22 12:03:58 +03:00
Konstantin Kovshenin 559409bccb Remove hard-coded JSON test data 2019-02-22 11:55:56 +03:00
Konstantin Kovshenin 901d41bdfa Marketplace suggestions in Edit Product screen
Adds a new tab to Woo's product data metabox and renders the
appropriate containers for JS to inject some Marketplace
suggestions.
2019-02-22 11:52:17 +03:00
haszari 4af4ce5783 allow suggestions on orders list + move logic into suggestions class 2019-02-22 10:55:37 +03:00
haszari 07a1ac7868 (temporary) add hard-coded fake orders-list suggestion data 2019-02-22 10:55:19 +03:00
haszari 3fcdc65283 style orders list suggestions + remove debug code 2019-02-22 20:55:03 +13:00
haszari 4e42021578 render suggestions containers (& unstyled suggestions) in orders list 2019-02-22 16:13:37 +13:00
haszari 24bbb9267e allow suggestions on orders list + move logic into suggestions class 2019-02-22 16:11:34 +13:00
haszari 124e1a7b4a (temporary) add hard-coded fake orders-list suggestion data 2019-02-22 16:06:18 +13:00
haszari 37578aa5d4 Merge branch master into feature/marketplace-suggestions
# Conflicts:
#assets/css/admin.scss
2019-02-22 14:17:20 +13:00
haszari 163af89ab3 MIA suggestions data should be cached as a real array, not text 2019-02-22 12:34:43 +13:00
haszari 62d4b5e395 Improve clarity and logic for disabling suggestions:
- Use a filter rather than option
- Use return-early style in function for clarity
- Ensure user has 'install_plugins' capability
2019-02-22 12:31:02 +13:00
haszari 48946b3cc6 Cache local woo plugins info rather than slugs-only subset:
- cache woo_plugins object for more general use
- streamline get_local_woo_plugin_slugs using pluck
2019-02-22 12:17:38 +13:00
haszari 20c039d946 removed redundant `get_plugin_slug` 2019-02-22 12:04:22 +13:00
haszari 9a07c70cfc only enqueue marketplace suggestions styles if they are enabled 2019-02-22 12:02:17 +13:00
haszari a7dd094b3a frontload suggestion data as script data, remove ajax request 2019-02-22 11:23:09 +13:00
haszari f2deef861e prefix AJAX actions to reduce chance of collision 2019-02-21 15:56:26 +13:00
haszari 950b873583 only display suggestions for Englishish locales 2019-02-21 15:20:16 +13:00
haszari ea5d3870ba support global opt-out of suggestions via user option 'woocommerce_allow_marketplace_suggestions' 2019-02-21 15:04:38 +13:00
haszari a9b7bfc513 move products list suggestions container render into module behind hook + move template near module, don't use wc_get_template to render 2019-02-21 14:38:04 +13:00
haszari 4c8436122f move suggestions class into admin/ and require from admin::includes 2019-02-21 12:44:21 +13:00
haszari 71250c30a2 tidy up main marketplace suggestions module, make it a real class +
+ require it for admin only
+ fix issue with retrieving dismissed suggestions user meta value
2019-02-21 12:37:10 +13:00
haszari 5c1e20c7d1 store dismissed suggestions in user meta, don't manually json-encode 2019-02-21 11:50:03 +13:00
haszari e53f92ae0d move woo-plugin slugs into a helper routine + cache installed woo plugins in a transient 2019-02-21 11:27:53 +13:00
haszari 9986c4482c remove some extra whitespace 2019-02-21 10:21:23 +13:00
haszari dd27bf278b cache empty suggestions if API fails, to reduce congestion/thrashing +
+ don't use wp_remote_safe_get – overkill
+ use wp_send_json_success to streamline/simplify API data ajax handler
2019-02-21 10:20:58 +13:00
Mike Jolley b65f93c756 Merge branch 'master' of https://github.com/woocommerce/woocommerce 2019-02-20 12:45:34 +00:00
Mike Jolley 6b41041883
Merge pull request #22777 from woocommerce/fix/22730
check low_stock for empty string vs isset
2019-02-20 12:44:17 +00:00
Mike Jolley 7def966e4f Impoved JSON handling 2019-02-20 12:00:47 +00:00
Mike Jolley ffa230de90 Escape html entities before passing to WP/photoswipe 2019-02-20 11:49:55 +00:00
haszari 6b8366eef9 pull real suggestions data from S3, remove hard-coded test data 2019-02-20 20:24:05 +13:00
haszari 4c1caf9171 display icon images in suggestions + styling tweaks for header/footer 2019-02-20 11:46:06 +13:00
Ron Rennick e9a98ce4ae fixes from review 2019-02-19 15:37:45 -04:00