Commit Graph

1459 Commits

Author SHA1 Message Date
Shamali Sulakhe e5e9d440a4 Merge branch 'master' of https://github.com/shamalisulakhe/woocommerce into issue-24266-solution 2019-12-16 15:08:30 +05:30
Claudio Sanches 104f40c36e
Merge pull request #24281 from woocommerce/fix/24269
Handle multiple decimal points
2019-12-09 14:07:29 -03:00
Claudio Sanches 5dac360e8a
Merge pull request #24208 from woocommerce/fix/order-screen-tax-calculation-to-honor-rounding-setting
Honor tax rounding preference in edit item and refund flows
2019-12-05 20:52:48 -03:00
Gerhard Potgieter 7d39222334
Merge pull request #25162 from woocommerce/fix/24018
Hid variable parent products from "Add Products" search on order page
2019-12-05 14:22:43 +02:00
Christopher Allford d1e25c9118 Added support for excluding certain product types from AJAX product searches 2019-12-03 14:14:47 -08:00
Paul Dechov 7f65a33fe8 Honor tax rounding preference in edit item and refund flows
The default value ('no') of the setting to round taxes at subtotal was not being honored on the Edit Order screen, which resulted in off-by-one discrepancies between the checkout item total and the edited or refunded item total.

This change is to round to the proper precision (w.r.t. the 'woocommerce_tax_round_at_subtotal' setting) for the default value of the form, as well as when the values are dynamically recomputed.
2019-11-25 17:49:43 +05:30
Justin Shreve 18925f2218 Adds an a/b test for the new onboarding experience 2019-11-21 12:00:04 -05:00
Shamali Sulakhe 64fbb197d7 Removed patch file and merged changed with ver 3.9.0-dev 2019-11-15 17:58:54 +05:30
Mehidi Hassan 3f8e3fdb2d Add space before parentheses of if condition for JS consistency 2019-10-10 23:37:56 +06:00
Claudio Sanches 9851b1f0f3 DRY 2019-10-03 21:19:52 -03:00
Gerhard Potgieter ee1b438c3c
Merge pull request #24517 from woocommerce/fix/24511
Control categories export field based on export type
2019-09-30 15:39:21 +02:00
Justin Shreve 0c3fc315c5 Update tracking opt-in UI. 2019-09-24 14:26:21 -04:00
Claudio Sanches 08e9d0bdc9 Control categories export field based on export type 2019-08-27 16:11:05 -03:00
Claudio Sanches 2b0fc6f50a Added sanitization for number of decimal points in JS 2019-08-02 14:02:33 -03:00
Claudio Sanches 375b989322 Added validation for multiple decimal points 2019-08-02 13:58:02 -03:00
Gerhard 02f9c7c8ff Use strict checking 2019-08-02 14:55:17 +02:00
Gerhard 34e883ce81 Apply patch by @dtwist 2019-08-02 14:19:37 +02:00
Hardik Thakkar 27689ba0ca Fixed #23870 2019-08-02 14:10:39 +02:00
Gerhard Potgieter 7c0d0251ee
Merge pull request #23883 from woocommerce/add/new-edit-order-tracks
Track more events on the edit order screen for future design validation.
2019-07-15 09:36:01 +02:00
haszari 3e7da11c30 fix logic for new tab check on edit product page 2019-07-12 13:42:36 +12:00
haszari 5bac98fd80 open marketplace suggestions links in same tab to simplify experience:
- except when inconvenient - when editing a product
2019-07-12 13:42:36 +12:00
haszari 46f2b98bca add in-app-purchase url params to marketplace suggestions buttons 2019-07-12 13:42:35 +12:00
Claudio Sanches 5b8694e92a
Merge pull request #23915 from woocommerce/fix/23544
[Setup] Make PostCode optional as few countries don't use them
2019-07-10 15:45:32 -03:00
Claudio Sanches d18c3f8ed1
Merge pull request #24069 from woocommerce/add/coupon-code-generator
Add generate coupon code button
2019-07-09 16:50:24 -03:00
Claudio Sanches 18b876a95c Always load generate code button
Some improvements in the button label and names
2019-07-09 16:46:17 -03:00
vedanshujain e2577b3a06 [Setup] Make PostCode optional as few countries don't use them
Some countries like Hong Kong, UAE etc don't use post codes, in which case this commit will make the field optional.
If its not known whether a country uses postcode or not, it will be required.
2019-07-09 14:37:03 +05:30
Gerhard 7038c73ab4 Merge branch 'master' into update/exclude-compiled-assets-from-git 2019-07-09 10:57:40 +02:00
Rodrigo Primo a26f38f3a1
Merge pull request #23133 from woocommerce/update/23111
If variations are missing prices, show notice
2019-07-04 10:08:41 -03:00
Gerhard 5d604329fc Reword postfix to suffix 2019-07-04 09:07:02 +02:00
Gerhard 538edcaac0 Make button text translatable. 2019-07-03 22:57:08 +02:00
Gerhard 24fc4948c0 Add generate coupon code button for quick coupon code generation. 2019-07-03 22:48:30 +02:00
Peter Fabian 9671810159 Added event to track `Add item(s)` button click. 2019-06-27 13:22:19 +02:00
Peter Fabian 7b03fe62f3 Added event to track `Add fee` button click and Cancel in the prompt. 2019-06-27 13:21:37 +02:00
Peter Fabian 90c0954d21 Renamed add_fee event to added_fee.
Makes it consistent with e.g. coupon addition tracks.
2019-06-27 13:20:03 +02:00
Peter Fabian 7ef4cb637a Fixed spacing issue. 2019-06-27 13:19:24 +02:00
Peter Fabian 930fd983cb Merge branch 'add/new-edit-order-tracks' of https://github.com/woocommerce/woocommerce into add/new-edit-order-tracks 2019-06-07 14:59:11 +02:00
Peter Fabian 34c6933586 Added more params to the tracks. 2019-06-07 14:58:55 +02:00
Jeff Stieler 1bd9a7d9a7 Use a consistent tracks event naming scheme. 2019-06-07 12:31:42 +02:00
Peter Fabian 083c616f18 Added tracks to record when order note is added in edit order screen. 2019-06-07 12:04:38 +02:00
Peter Fabian b880159dbe Added tracks to record when products, fees, taxes or shipping are added to order in edit order screen. 2019-06-07 11:39:03 +02:00
Jeff Stieler 02785bc14c Track adding coupons to orders on edit screen. 2019-06-07 11:31:53 +02:00
Jeff Stieler 02a7654532 Fix eslint errors/warnings. 2019-06-07 11:25:39 +02:00
Jeff Stieler 05ad6b260f Track interaction with the order refund UI. 2019-06-06 18:18:46 +02:00
Peter Fabian b22c788081 Added tracks for Recalculate button and edit/remove/save line items. 2019-06-06 18:14:21 +02:00
Jeff Stieler a22c1dabf3 Track when billing or shipping address edit buttons are clicked. 2019-06-06 16:12:09 +02:00
Jeff Stieler 9776cbc2d8 Track order tax column deletion. 2019-06-06 13:18:29 +02:00
Rodrigo Primo 3d12ec4ae2 Remove extra comma to prevent issues with older versions of IE
This commit simply removes an extra comma that was added in
52fced8d7a to prevent issues with older
versions of IE. I found this when running grunt to prepare the 3.6.4
release:

```
Running "jshint:all" (jshint) task

   assets/js/admin/meta-boxes-order.js
    413 |                    user_email : user_email,
                                                    ^ Extra comma. (it breaks older versions of IE)
```

We might want to add jshint to the pre-commit hook and to Travis.
2019-05-27 14:38:54 -03:00
Gerhard Potgieter b2ed079520 Manual orders coupon usage limits by email (#23775)
* Add functionality to wp-admin order to check for coupon usage based on email addresses, similar to how WC_Cart handles this seperately, included unit tests.

* Only do the coupon by email usage check if order is from a guest. Fix issue with unit test.
2019-05-27 11:45:29 -03:00
Claudio Sanches 17da960abe
Merge pull request #23137 from woocommerce/fix/23051
Change coupon amount field type based on coupon type
2019-05-22 21:19:03 -03:00
Gerhard Potgieter 229675c96a
Merge pull request #23603 from Chirag3119/23602
#23602 - I have fixed issue.
2019-05-16 14:05:45 +02:00
Gerhard b79c02658d Fix eslint for meta-boxes-product-variation.js 2019-05-13 13:36:21 +02:00
Gerhard b77c7fbbd8 Trigger input_changed function when download files removed for variations. 2019-05-13 13:32:30 +02:00
Gerhard Potgieter 984357fb41
Merge pull request #23597 from woocommerce/fix/23509
Added confirmation before saving empty list of countries to sell to.
2019-05-10 10:56:13 +02:00
Gerhard 411e963b00 Remove all admin minified js files 2019-05-07 10:19:02 +02:00
Chirag3119 58c3374276 #23602 - I have fixed issue. 2019-05-03 15:02:55 +05:30
Claudio Sanches eba7940228 Fixed jshint errors 2019-05-02 19:20:33 -03:00
Peter Fabian 98edbd2f78 Added confirmation before saving an empty list of countries to sell to in general WC settings. 2019-05-02 21:26:29 +02:00
Peter Fabian e647e4143a Fixed linter problem. 2019-05-02 21:22:36 +02:00
Hardik Thakkar be40faba61 Fixes #23440 : # symbol in Product Category name breaks Reports CSV export 2019-04-23 18:19:17 +05:30
Mike Jolley 6579972fd3 Minify 2019-04-16 14:36:37 +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
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
haszari 884474d133 add tracks event for clicks on `marketplace-suggestion-manage-link` 2019-04-09 13:44:15 +12:00
haszari 06de62177c inject manage link into browse-all metabox footer suggestion 2019-04-08 10:00:25 +12:00
haszari e75dd2c5ac disable products list suggestions (js) 2019-04-05 11:41:15 +13: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 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 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
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
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 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
haszari 4676491c88 snooze product-list suggestions for 2 days after dismiss (was 1) 2019-03-07 10:06:52 +13: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
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
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
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
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
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