Commit Graph

3937 Commits

Author SHA1 Message Date
Rodrigo Primo 004e8390e4 Use jQuery.text() instead of jQuery.append() when displaying selected option in selectWoo 2019-04-16 14:33:22 +01:00
Mike Jolley 4e4e084e0f min 2019-04-16 14:33:09 +01:00
Mike Jolley 0602f45096 Add props using jquery when creating state fields 2019-04-16 14:32:50 +01:00
Mike Jolley 81ac8664a9 Avoid update cart on non-cart screens 2019-04-12 12:14:54 +01:00
Mike Jolley 2f9d6ac669 queue remove from cart 2019-04-12 12:05:07 +01:00
Mike Jolley e9836ef298 Add queue for add to cart requests 2019-04-12 11:58:49 +01:00
haszari 7ede25add7 use admin_url to generate manage suggestions url (support multisite etc) 2019-04-10 12:16:49 +12:00
haszari cd9101bb58 fix target url of 'Manage Suggestions', settings are now in 'Advanced' 2019-04-10 12:02:09 +12:00
haszari 164eca6270 reinstate `displayed` event for suggestions not displayed in metabox:
- add func defining which suggestions contexts are hidden/revealable
- reinstate tracks event when rendering suggestion (for non-hidden
suggestions)
- add check in (context-sensitive) tab click handler to abort if
that context has already fired displayed events
2019-04-10 09:40:06 +12:00
Jeff Stieler 742b3d6b66 Only track product page marketplace suggestions when visible. 2019-04-09 10:23:02 -06:00
Timmy Crawford 0061a21cea
Merge pull request #23242 from woocommerce/add/manage-suggestions-tracks-events
add tracks event for clicks on Manage suggestions link(s)
2019-04-09 07:55:07 -07:00
Mike Jolley 91e21644cf Style descriptions after select2 boxes 2019-04-09 15:02:05 +01:00
Timmy Crawford 19f74deb28
Merge pull request #23244 from woocommerce/update/block-library-rc3
Update @woocommerce/block-library to 2.0.0-rc3
2019-04-08 19:17:14 -07:00
haszari 884474d133 add tracks event for clicks on `marketplace-suggestion-manage-link` 2019-04-09 13:44:15 +12:00
Kelly Dwan 51b1281a5e Update @woocommerce/block-library to 2.0.0-rc3 2019-04-08 19:31:53 -04:00
haszari 0ad914f398 rebuild assets after rebase 2019-04-09 09:59:45 +12:00
haszari 35c1c930f0 ensure suggestions tab icon looks good on smaller screens:
- override line height for <900px consistent with other tabs
2019-04-09 09:58:11 +12:00
haszari ae729ffb80 add 'plugin' dashicon to metabox suggestions tab, for consistency 2019-04-09 09:57:54 +12:00
haszari 8b2d0aeb5d rebuild suggestions css after rebase 2019-04-09 09:13:17 +12:00
haszari 76b1e267ac add margin under the nosuggestions container & reduce top margin 2019-04-09 09:12:35 +12:00
haszari 06de62177c inject manage link into browse-all metabox footer suggestion 2019-04-08 10:00:25 +12:00
Mark Senff 98241d3c7d
Update admin.scss 2019-04-07 09:40:30 -04:00
Mark Senff 2613655854
Compiled admin.css 2019-04-07 09:39:05 -04:00
haszari 2bef464506 disable products list suggestions (rtl styles, almost forgot to commit) 2019-04-05 13:35:56 +13:00
haszari 16974a9409 disable products list suggestions (styles) 2019-04-05 11:46:29 +13:00
haszari e75dd2c5ac disable products list suggestions (js) 2019-04-05 11:41:15 +13:00
David Stone 65c4d7d37c Allow wc_product_gallery to be called without any arguments. 2019-04-01 22:56:54 -06:00
Timmy Crawford 7e17cbfb85
Merge pull request #23158 from woocommerce/fix/jshint-marketplace
Fixed JSHint warnings on marketplace suggestions script
2019-03-27 13:18:33 -07:00
Rodrigo Primo cbf6149cb9
Merge pull request #23069 from woocommerce/fix/23061
Variation stock status field handling (displaying/hiding when needed)
2019-03-27 14:51:26 -03:00
Claudio Sanches 08bb78a817 Fixed JSHint warnings on marketplace suggestions script
Fixes the follow error:

```
assets/js/admin/marketplace-suggestions.js
278 | return ! _.contains( marketplace_suggestions.active_plugins, promo['product'] );
^ ['product'] is better written in dot notation.
```
2019-03-27 13:21:54 -03:00
haszari 6294dd14e2 send empty string instead of "undefined" for optional suggestions props 2019-03-26 09:59:28 +13:00
Mike Jolley 1e0ed1d20c Target only percent 2019-03-25 14:56:27 +00:00
Mike Jolley 86fb87c7d1 Change coupon amount type based on coupon type 2019-03-25 14:55:14 +00:00
Mike Jolley 9907a25ff6 Append notice if variations are invalid 2019-03-25 13:30:04 +00:00
haszari cc78cf040f send additional properties with suggestions tracks events:
- send the context/area
- details about what's promoted (product or otherwise)
- target url
2019-03-22 15:42:30 +13:00
Mike Jolley 308d08f97e Run grunt tasks
Fixes warnings from grunt so files are minified correctly. Copied fixes that went into release branch but not master earlier this week.
2019-03-20 20:08:52 +00:00
Mike Jolley 7c42ac0a29 Also remove hardcoding of attributes on frontend state fields 2019-03-19 16:59:22 +00:00
Mike Jolley f2ca110a46 Add default text using .text() 2019-03-19 16:59:16 +00:00
Mike Jolley 5bb58cc14b Add props via jquery, not direct 2019-03-19 16:59:08 +00:00
Mike Jolley 97f30e7f5c Variation stock status handling 2019-03-18 12:56:49 +00:00
Mike Jolley 81a4b81e7c
Merge pull request #23066 from woocommerce/fix/23055
preventDefault when dismissing store notices
2019-03-18 11:12:26 +00:00
Gerhard 2b90cf845e Pass event as parameter. 2019-03-18 13:09:38 +02:00
Mike Jolley 3070961783 Merge branch 'pr/23047' 2019-03-18 11:02:33 +00:00
Mike Jolley 5d22b3a2eb data check 2019-03-18 11:02:26 +00:00
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 6329f61d08 Show refunded items in customer facing screens 2019-03-15 12:54:40 +00:00
Mike Jolley f90f0203b5 Grunt dev 2019-03-15 12:21:51 +00:00
Mike Jolley ff3292cd8e Mobile styles 2019-03-14 18:22:56 +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 a04d23ae88 Order checkboxes last 2019-03-05 14:23:17 +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 4154ae55a0 increase margin under empty-state suggestions so they aren't hard-aligned to bottom 2019-03-02 09:29:21 +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
Rua Haszard 57cb4b2beb
Merge pull request #22871 from woocommerce/add/marketplace-suggestions-wccom-endpoint
Add/marketplace suggestions wccom endpoint
2019-03-01 07:17:27 +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 a01ae4d0d6 Compress images 2019-02-28 16:32:50 +00:00
Mike Jolley a43a873a13 Update placeholders 2019-02-28 16:27:57 +00:00
haszari 56ab6d231e improve margins & line-spacing in metabox copy 2019-02-28 11:08:25 +13:00
haszari 49aaa9f08b align product metabox `Get more options` with other tab image labels (regressed)
- fix css selector
- also removed redundant margin-top rule
2019-02-28 10:58:30 +13:00
haszari dbe80f826a fix margins & ensmallen heading in product table suggestion 2019-02-28 10:52:16 +13:00
haszari 3eaba598dc remove outer border in metabox suggestions, lighten separators 2019-02-28 10:14:00 +13:00
haszari ef31fcf012 align product metabox `Get more options` with other tab image labels 2019-02-28 10:05:02 +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 467f8cd1dc marketplace suggestions styling polish:
- opt-in to shared CTA/button styles for orders empty state
- tweak table banner icon margin for perfect centering
- ensure CTA div doesn't get squished and break layout \(product metabox\)
- ensure title+copy is vertically centered in table banner \(remove last margin\)
2019-02-27 11:40:24 +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 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 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 d89b38cb3f fix up products empty state styles now row-padding is balanced 2019-02-25 11:49:08 +13:00
haszari e68ee17121 tweak layout of product edit suggestions to match designs 2019-02-25 11:12:05 +13:00
haszari e5940a845c opt-in to standard styles for product edit metabox suggestions 2019-02-25 10:24:38 +13:00
haszari cf88165e51 remove icon from marketplace suggestions product edit tab 2019-02-25 10:17:37 +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 3fcdc65283 style orders list suggestions + remove debug code 2019-02-22 20:55:03 +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 cda28ceb3a hide empty-state suggestions for mobile too – focus on desktop for v1 2019-02-22 11:57:19 +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 b3ca321669 fix size of products empty state icon in IE - use pixel sizing 2019-02-20 14:49:38 +13:00
haszari 4c1caf9171 display icon images in suggestions + styling tweaks for header/footer 2019-02-20 11:46:06 +13:00
haszari 42e026140a hide inline products list suggestion on mobile (can't get the styling right) 2019-02-20 10:29:41 +13:00
Mike Jolley a37d8ae385 SCSS mailchimp color change missing 2019-02-19 11:22:13 +00: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