Commit Graph

2375 Commits

Author SHA1 Message Date
Gerhard 63f8359491 preventDefault when dismissing store notice, this fixes jumping of page to top when clicking store notices at the bottom of the page. 2019-03-18 10:23:25 +02:00
JeroenSormani 5faab22c77 Merge remote-tracking branch 'upstream/master' into checkout-input-fields 2019-03-16 10:46:49 +01:00
JeroenSormani 772244d82f Recognize all :input checkout fields with ID, not just input (JS) 2019-03-16 10:46:18 +01:00
Kelly Dwan 3f5aaad117 Update @woocommerce/block-library to 2.0.0-rc1 2019-03-15 13:06:38 -04:00
Mike Jolley f90f0203b5 Grunt dev 2019-03-15 12:21:51 +00:00
haszari 657b78ada2 fix up built js & missing slug prop fix after rebase 2019-03-14 15:01:45 +13:00
haszari ca6bf0f18a reminify marketplace-suggestions.js to pick up upstream changes 2019-03-14 14:56:35 +13:00
haszari fef1b0f7e0 show nice marketplace linkout when there are no product metabox suggestions 2019-03-14 14:56:32 +13:00
haszari e3d891868d hide product metabox suggestions markup when there are no suggestions 2019-03-14 14:55:42 +13:00
haszari f02ba1d727 fix style for tracks prop `suggestion_slug` (lower_case not camelCase) 2019-03-14 14:08:46 +13:00
popala 023d9fe9ed
Fixed "e is null" error on checkout page
Fixed "e is null" on checkout page which caused the order panel to be disabled.
2019-03-13 19:37:14 +01:00
Mike Jolley b88d7109e7
Merge pull request #22966 from woocommerce/add/product-list-suggestions-hiatus-after-multi-dismiss
put products list suggestions on hiatus (month) after multiple dismissals
2019-03-13 14:32:23 +00:00
Rua Haszard 56ebaad549
Revert "prioritise targeted suggestions in products list:" 2019-03-13 14:50:06 +13:00
Mike Jolley a5e956e7bf
Merge pull request #22980 from woocommerce/fix/22968
Pass user ID when adding coupons via admin
2019-03-12 13:22:40 +00:00
Mike Jolley 53a7de5244
Merge pull request #22948 from woocommerce/fix/22940
Correctly show state fields after posting the edit address form
2019-03-12 13:20:32 +00:00
Gerhard Potgieter 269ab2dde0
Merge pull request #22967 from woocommerce/try/prioritise-extension-targeted-suggestions
prioritise targeted suggestions in products list:
2019-03-12 12:27:58 +02:00
Mike Jolley d8f665bb89
Merge pull request #22936 from woocommerce/fix/21814
Setup Wizard: Add keyboard events for custom input toggles
2019-03-12 09:28:37 +00:00
Mike Jolley 0877e7d8f7
Merge pull request #22954 from woocommerce/add/blocks-rest-api
Merge blocks branch: add 8 product blocks and related API endpoints
2019-03-11 15:18:20 +00:00
Mike Jolley a774a33ba7
Merge pull request #22891 from woocommerce/fix/22673
Loop attribute panels to disable options rather than look at values
2019-03-11 13:26:15 +00:00
Mike Jolley 143068332d Pass user ID when adding coupons via admin 2019-03-08 16:14:49 +00:00
haszari e4ea021907 prioritise targeted suggestions in products list:
- sort list so "targeted" (`show-if-active`) extensions are first
- don't randomly choose suggestion for product list, always choose
first one
2019-03-08 13:48:00 +13:00
haszari 8704a32302 put products list suggestions on hiatus (month) if user dismisses 5:
- track the number of dismissals of products list suggestions in a cookie
- if this exceeds 5, don't show any product list suggestions
- set that cookie to expire in one month – suggestions will resume then
2019-03-08 13:11:00 +13:00
Mike Jolley 5492369fe9
Merge pull request #22857 from woocommerce/feature/marketplace-suggestions
Feature/marketplace suggestions
2019-03-07 16:39:14 +00:00
Jeffrey Pearce 5155179d65 Refactors jQuery output of html elements to use selectors instead of strings. 2019-03-07 10:14:42 +00:00
Kelly Dwan dddbd29d87 Update @woocommerce/block-library to 2.0.0-beta 2019-03-06 18:33:06 -05:00
Kelly Dwan fdefe5feac Update with latest changes from block-library 2019-03-06 17:32:29 -05:00
Kelly Dwan 8555c415d2 Update with latest featured plugin block code 2019-03-06 17:28:52 -05:00
Kelly Dwan ea1b7d9730 Pull in changes from woo blocks PR 2019-03-06 17:28:51 -05:00
Kelly Dwan 148b605dbe Update copying process, copy over minified files 2019-03-06 17:28:49 -05:00
Kelly Dwan 3c57620520 Remove the `.min` renaming step 2019-03-06 17:28:47 -05:00
Kelly Dwan 2b5ab03a2d Add the built files 2019-03-06 17:28:46 -05:00
haszari 4676491c88 snooze product-list suggestions for 2 days after dismiss (was 1) 2019-03-07 10:06:52 +13:00
Mike Jolley 6f983fb4eb
Merge pull request #22802 from woocommerce/fix/22643
Use taxable address when adding/removing coupons
2019-03-06 16:49:34 +00:00
Mike Jolley 406364fefb Tidyup unused vars 2019-03-06 15:33:20 +00:00
Mike Jolley 023217c03d Remove required when changing to optional 2019-03-06 15:18:27 +00:00
Mike Jolley 9b6ded2cef Custom init event for state fields 2019-03-06 15:11:39 +00:00
Mike Jolley e1ff1bfae9 Update from master 2019-03-06 12:37:24 +00:00
Mike Jolley 2bb39a4c79 Update from master 2019-03-06 12:08:07 +00:00
haszari f944da3eac refresh products list suggestion colspan when screen options change 2019-03-06 14:44:58 +13:00
haszari d0fd15ea8c Ensure product list suggestion works with different screen options
- calculate product-table suggestion colspan using number of columns
- was previously hard-coded
2019-03-06 14:08:14 +13:00
haszari 37cff0c7ca fix jshint issue (const => var) + minify marketplace-suggestions 2019-03-06 13:57:18 +13: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 1adf9bd69d Handle enter/space keyboard events 2019-03-05 14:23:28 +00:00
Mike Jolley f707eeda3e Update from master 2019-03-05 13:31:14 +00:00
haszari 6caaf80fa6 add a tooltip (Dismiss this suggestion) to clarify dismiss button 2019-03-05 12:20:13 +13:00
haszari e441b4a279 minify marketplace-suggestions js file 2019-03-05 12:13:14 +13:00
haszari 1c53614297 fix jshint warnings 2019-03-05 10:54:06 +13:00
haszari 8b0672f6cf streamline product edit metabox when no suggestions are visible:
- hide title (animate slide up)
- trigger this after dismiss, so we're not left with a heading
and no content
2019-03-05 10:38:11 +13:00
haszari 06b5b89336 fade in product list table-row suggestions, so it's less jarring 2019-03-05 10:15:18 +13: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
haszari fb4e574511 remove unused function arg `slug` 2019-03-01 08:40:47 +13:00
Mike Jolley 5a48c41209 Loop panels to disable options rather than look at values 2019-02-27 14:38:11 +00:00
haszari 8ce8cdde6e update suggestions JS code to use `active` (WCCOM endpoint has updated schema) 2019-02-27 16:16:49 +13:00
haszari 243f885a13 randomly select suggestions to display, to improve visibility of each one 2019-02-27 12:29:45 +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 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
haszari dfae7cb9b5 automatically add utm params to suggestion urls, based on context 2019-02-26 15:48:35 +13:00
haszari 1446424ba4 hide product metabox suggestions tab (etc) when there are no suggestions 2019-02-25 16:27:49 +13:00
haszari 6a571dc353 fix regression introduced in merge - visibleSuggestions renamed 2019-02-25 16:06:50 +13:00
haszari 1aff17f0b9 Merge branch 'feature/marketplace-suggestions' into add/orders-list-suggestions 2019-02-25 16:05:04 +13:00
haszari c1a2821410 limit maximum of 5 suggestions displayed in any given context 2019-02-25 16:00:47 +13:00
haszari ae3f397855 allow suggestions in multiple contexts:
- fix regression when hiding footer
- rename `visibleSuggestions` for clarity
2019-02-25 15:59:11 +13:00
haszari 1df74d504e allow suggestions to target multiple contexts:
If an array of context strings is specified in json, the suggestion will
be available for display in all specified contexts.
2019-02-25 15:30:00 +13:00
haszari 27195c3834 hide footer, screen options when show suggestions in orders empty state 2019-02-25 13:46:43 +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 79e7699ccd JS code-style fixes 2019-02-22 12:54:51 +13:00
haszari 9ed6f591d3 use updated tracks API wcSettings.recordEvent => wcTracks.recordEvent 2019-02-22 11:38:55 +13:00
haszari a7dd094b3a frontload suggestion data as script data, remove ajax request 2019-02-22 11:23:09 +13:00
Mike Jolley e830bd739a Use taxable address when adding/removing coupons 2019-02-21 16:23:20 +00:00
haszari f2deef861e prefix AJAX actions to reduce chance of collision 2019-02-21 15:56:26 +13:00
haszari b4a36dc620 document all js methods 2019-02-21 15:51:41 +13:00
haszari eaa1108df6 fix client side data access after change to `wp_send_json_success` 2019-02-21 10:50:43 +13:00
haszari e37583bb2b remove dismissed suggestions from DOM so styling updates accordingly 2019-02-21 09:52:37 +13:00
Mike Jolley fc1a274fcb Check for hover after timeout 2019-02-20 17:22:43 +00:00
Mike Jolley 76b7a4facf cs 2019-02-20 16:37:40 +00:00
Mike Jolley 1caeb43baf Update photoswipe 2019-02-20 11:49:55 +00:00
haszari f6299cc512 send tracks events when suggestions are displayed, clicked or dismissed:
- Using temporary stand-in tracks API until PR is merged.
- Also fixed logic so table-view suggestion is not "displayed" if
  empty-state suggestions are shown.
2019-02-20 15:33:57 +13:00
haszari 4c1caf9171 display icon images in suggestions + styling tweaks for header/footer 2019-02-20 11:46:06 +13: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 21b0be7ef6 share styles and markup for prpducts list suggestion 2019-02-19 16:31:14 +13:00
haszari 4f7145cf49 fix button regression in product table suggestion 2019-02-19 15:09:11 +13:00
haszari a03b9abcfb allow dismiss by default + hide products empty-state box if no suggestions 2019-02-19 13:56:49 +13:00
haszari 2b884861b7 add linkout icon to link-style suggestion CTAs (for empty products footer link) 2019-02-19 13:55:46 +13:00
haszari cc51dd4376 style products empty header/footer + support link style:
- added link-text to trigger link style for suggestion CTA, button is now opt-in
- made suggestion rendering more generic, should display something sensible if there are missing attribs
- all CTA links/buttons open in new tab via target attr
2019-02-19 12:22:06 +13: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 afe219d854 Select an option vs state 2019-02-18 11:49:46 +00:00
haszari 012da5da24 support dismissing empty-state suggestions + polish dismiss styling:\n- hover style for x\n- disable border/underline active state inherited from <a>\n- layout styling for empty-state suggestions, button on right\n- make test data more like mockup (no category recommendation in list) 2019-02-18 15:55:26 +13:00
haszari d395967019 hide suggestions immediately after user clicks x (using jQuery.fadeOut) 2019-02-18 11:48:18 +13:00
Mike Jolley 34998caa43 Add time to fragment request 2019-02-15 17:35:44 +00:00
Mike Jolley e830b42ba7 Remove old safari code 2019-02-15 17:10:17 +00:00
haszari bf9f14c0b6 ajax api for dismissing specific marketplace suggestions (first cut) 2019-02-15 14:52:24 +13:00
haszari 9a7a9ad045 update styling of products table suggestion + add dismiss button 2019-02-15 13:30:53 +13:00
haszari 4ad413ea83 move hard-coded suggestion data to woo API (WCCOM api coming soon) 2019-02-14 15:47:32 +13:00
haszari 64c71cb724 fill out products empty state suggestions:
- add back product suggestions data
- hide page admin elements, focus layout on onboarding
- bulk-fix indentation in admin.scss
- reinstate default BlankState styling (overrides are intended for products only, accidentally overwrote)
2019-02-14 14:05:07 +13:00
haszari 8db91f44c0 styling products empty state OBW style, including existing add/import + suggestions 2019-02-14 12:16:59 +13:00
haszari c9f9d01f4b ensure list suggestions render correctly with optional url/copy attributes 2019-02-14 11:21:58 +13:00
haszari aa31d6f708 use attributes + DOM (not html snippet) for products empty state suggestions 2019-02-14 11:16:39 +13:00