Commit Graph

4796 Commits

Author SHA1 Message Date
Mike Jolley 38816eb2ce Update wording and presentation of discount amount 2019-03-06 16:39:28 +00:00
Mike Jolley 0f3be9fce4 phpcs 2019-03-06 16:17:33 +00:00
Mike Jolley b07f3e21db Merge branch 'master' into experiment/product-sorting-index 2019-03-06 12:54:40 +00:00
Mike Jolley 99455cfe34 update text 2019-03-06 12:00:54 +00:00
haszari 1ed027bb09 snooze suggestions in product list (for 24 hours) after a suggestion is dismissed 2019-03-06 10:50:22 +13:00
Mike Jolley 16a0a3e27e Update from master 2019-03-05 19:03:01 +00:00
Mike Jolley cc6ca5bdbd Add deprecated 2019-03-05 19:00:37 +00:00
Mike Jolley a5e72cfc02 Re-order elements and add tabindex 2019-03-05 14:22:59 +00:00
Mike Jolley ac6763d0d0
Merge pull request #22820 from woocommerce/fix/22496
Make 'refund amount' read-only
2019-03-05 12:56:59 +00:00
haszari 6caaf80fa6 add a tooltip (Dismiss this suggestion) to clarify dismiss button 2019-03-05 12:20:13 +13:00
Paul Sealock d968b95b53 Add opt in/out to settings page 2019-03-05 11:06:45 +13:00
Jeff Stieler 22c20b0d32 Where possible, render Tracks pixels in the page footer instead of making a blocking HTTP request from the server. 2019-03-04 08:59:21 -07:00
Joshua Flowers 10826c7bf0 Change wc_ prefix to woocommerce_ 2019-03-04 14:16:05 +08:00
Joshua Flowers 9128e8c4f5 Add scripts to wc setup footer 2019-03-04 14:14:45 +08:00
Mike Jolley 5af9d968e5 Update from master 2019-03-01 10:29:17 +00:00
Joshua T Flowers e53724832d
Tracks: Add tracking event when OBW is started (#22877)
* Check if current step matches event before firing

* Move step check to switch statement

* Track when the OBW has started

* Rename Jetpack activation tracking method

* Remove duplicate tracking optin check

* Track when option to track is udpated in OBW

* Check if tracking is actively being opted into in is_tracking_enabled()

* Move tracking start check into WC_Admin_Setup_Wizard_Tracking

* Clean up tracking opt-in check logic
2019-03-01 11:12:30 +08:00
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
Mike Jolley caf3ff61e7
Merge pull request #22218 from woocommerce/add/fb-in-obw
Add Facebook to Recommended Step in OBW
2019-02-28 16:45:41 +00:00
Mike Jolley 611bf3b1dd Price filter + stock widget requires lookup table 2019-02-28 14:24:05 +00:00
Mike Jolley b903086251 Fix callbacks and remove logging 2019-02-28 11:52:56 +00:00
Mike Jolley 71afa5e590 Update notice wording 2019-02-28 11:16:09 +00:00
Mike Jolley d59b1c39d7 Remove force link - it can be done in AS 2019-02-28 11:15:58 +00:00
Mike Jolley d990b5192f Switch to action scheduler 2019-02-28 11:11:08 +00:00
Mike Jolley f81791dab9 Update notice text + docs links 2019-02-28 10:45:38 +00:00
Joshua T Flowers a91adfa087
Tracks: Add selected payment gateways in OBW (#22872)
* Check if current step matches event before firing

* Move step check to switch statement

* Track payment gateways in OBW

* Combine arrays into comma separate strings
2019-02-28 11:58:08 +08:00
Mike Jolley 2e4bcebfb8 Ignore specific rules 2019-02-27 15:33:51 +00:00
Mike Jolley a89caf0b89 Add wrapper for is_plugin_active 2019-02-27 15:25:27 +00:00
Mike Jolley 0b3a57c96f Avoid changing tracking preferences when disconnecting helper 2019-02-27 14:04:50 +00:00
Mike Jolley 0469bbe8b0
Merge pull request #22884 from woocommerce/fix/22861
Remember tracking setting when going through the OWB again
2019-02-27 13:46:31 +00:00
Gerhard 5cfa6fc3db PHPCS fixes 2019-02-27 15:24:50 +02:00
Gerhard 497d082b03 Refine Dropin and MU Plugin report functionality a bit. Added option to show if connected to WooCommerce.com. 2019-02-27 15:19:12 +02:00
Gerhard 70f4935236 Fix logic to avoid setting to no again 2019-02-27 14:30:00 +02:00
Gerhard bf57a037c6 First go at adding dropins and mu plugins to system status report 2019-02-27 14:27:53 +02:00
Gerhard 72ea7b05e7 Move tracking check to the if statement to avoid writing to the DB when it already has a value stored. 2019-02-27 13:38:36 +02:00
Gerhard a1c3048318 Keep tracking enabled if already enabled when saving the wizard. 2019-02-27 12:55:49 +02: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
Krzysztof Grabania 946b1e2469 Remove whitespace characters from Select2 option title 2019-02-25 20:12:54 +01: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
Valerie 8a796138ef OBW: Add Facebook to recommended step
The end date for the Facebook recommendation
is October 8, 2019.

When the option is checked, this will install the extension
'Facebook for WooCommerce' on the user's site.
2019-02-23 17:40:37 -05:00
haszari 041068a705 use full path when including container template, rename folder 'views' 2019-02-24 09:37:33 +13:00
Valerie ca316d8933 OBW: Remove customized blurb on recommended step 2019-02-22 21:14:22 -05: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
Mike Jolley 27ac2e1577 phpcs 2019-02-22 13:33:41 +00:00
Mike Jolley d07d1cf0b0 If taxes are enabled, make the refund box readonly 2019-02-22 13:30:49 +00: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
Jeff Stieler e41b0985f3
Track Subscriptions connection actions (#22805)
* Track when the Helper connection process is started.

* Track when the Helper connection process is cancelled.

* Track when the Helper connection process has completed successfully.

* Track when the Helper has been disconnected.

* Track when the Helper refreshes subscriptions.
2019-02-21 16:28:15 -07: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 e53f92ae0d move woo-plugin slugs into a helper routine + cache installed woo plugins in a transient 2019-02-21 11:27:53 +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
Paul Sealock 1b62228faf Tracks: Add a PHP client 2019-02-20 11:15:33 +13:00
Ron Rennick e9a98ce4ae fixes from review 2019-02-19 15:37:45 -04:00
Ron Rennick 4c7f61e123 phpcs except for ignore use of $_POST 2019-02-19 13:41:14 -04:00
Ron Rennick a2abe8783e check low_stock for empty string vs isset 2019-02-19 11:08:14 -04:00
Mike Jolley 5397e4ec1a
Merge pull request #22329 from woocommerce/enhancement-manual-stock-changes/21754
Product stock adjustments with manual order line item changes
2019-02-19 10:00:49 +00:00
haszari 9cd81c371e add header & footer to products empty suggestions box 2019-02-19 11:54:58 +13:00
haszari c7b630b1f8 update products list empty state (incl. suggestions) to latest designs 2019-02-19 10:46:44 +13:00
Mike Jolley 5bb5ae6265 Update from master 2019-02-18 16:54:24 +00:00
Mike Jolley ad12ddd2c2 wc_maybe_adjust_line_item_product_stock should return false if nothing happens 2019-02-18 16:45:55 +00:00
Mike Jolley 4fd2a9f77e Update from master 2019-02-18 15:04:58 +00:00
Mike Jolley 71d3121872 Performance: Support pagination to avoid double queries to search webhooks 2019-02-18 14:58:32 +00:00
Mike Jolley 14149e4d54 phpcs 2019-02-18 13:41:06 +00:00
Mike Jolley 3a4ef0a1d8 Avoid getting all webhook ids 2019-02-18 13:19:12 +00:00
haszari 4ea4e6591a ensure suggestion dismiss API / nonce is provided to js (missed in last commit) 2019-02-18 11:46:22 +13:00
Chris Kreidl 63492aa98b added IDs to other input fields for consistency 2019-02-16 22:59:33 -05:00
Mike Jolley 3d8c58e110 status_widget_stock_rows lookups 2019-02-15 13:37:51 +00:00
haszari 1fdc013525 products blank state - OBW style suggestions (missed in previous commit) 2019-02-14 15:44:28 +13:00