Commit Graph

11737 Commits

Author SHA1 Message Date
Konstantin Kovshenin 74da37890f Helper: Fix undefined notices on button label and URL. 2017-06-22 11:26:26 +03:00
Claudio Sanches 8deca3b368 Merge pull request #15718 from woocommerce/update/noindex-cart
Disable search engines indexing core, dynamic, cart/checkout pages.
2017-06-21 16:35:26 -03:00
claudiulodro fcd5460ec0 Check filetype in CSV upload 2017-06-21 11:50:03 -07:00
Claudiu Lodromanean 69d3234907 Merge pull request #15717 from woocommerce/fix/15715
Exclude sale products from category checks in coupon class
2017-06-21 11:00:01 -07:00
Mike Jolley e06aa6f60a Prime term cache before read 2017-06-21 17:09:39 +01:00
Konstantin Kovshenin 5b7070d2ea Helper: Sort subscriptions by name. 2017-06-21 18:43:19 +03:00
Konstantin Kovshenin e67babf77a Helper: Fix download button class for expiring subscriptions. 2017-06-21 18:15:45 +03:00
Gerhard Potgieter 6d3e3fd5e5 Merge branch 'feature/helper' of github.com:woocommerce/woocommerce into feature/helper 2017-06-21 16:58:26 +02:00
Gerhard Potgieter e08df8d2aa Adjust messaging and display information for collaborator accounts on woocommerce.com subscription page. 2017-06-21 16:57:16 +02:00
Konstantin Kovshenin 346b446283 Helper: Fix label for maxed out subscriptions. 2017-06-21 17:50:34 +03:00
Frédéric Demarle d563842126 CSV Importer: Add action before a row is parsed 2017-06-21 16:49:21 +02:00
Konstantin Kovshenin 41ea3f3f43 Helper: Pass a migrate flag if migrating during token exchange 2017-06-21 16:23:57 +03:00
Konstantin Kovshenin 16f2541e9b Helper: Set helper compat screen slug to woothemes-helper.
Previously the helper compat screen used a different slug, but
since updates can be done without refreshing the screen via AJAX
the old menu item doesn't disappear until a full refresh. This fix
allows users to navigate to that same menu item and not get an
error.
2017-06-21 15:28:30 +03:00
Mike Jolley dbe9705e4b Disable search engines indexing core, dynamic, cart/checkout pages. 2017-06-21 12:52:52 +01:00
Mike Jolley 5ffff712e7 Merge pull request #15705 from woocommerce/update/cache-helper
Compare page IDs rather than URIs in the cache helper
2017-06-21 12:11:16 +01:00
Mike Jolley 31fccea25c Exclude sale products from category checks in coupon class
Fixes #15715
2017-06-21 11:55:12 +01:00
Caleb Burks f13c4c3b30 Hide Cross-sells for external products 2017-06-20 20:56:54 -05:00
Claudiu Lodromanean aab401c8f8 Merge pull request #15703 from woocommerce/fix/15689
Filter out non-visible products when outputting grouped products + prices
2017-06-20 14:50:50 -07:00
Claudiu Lodromanean 9399a8dca2 Merge pull request #15702 from woocommerce/fix/15697
Correctly map attribute labels to names
2017-06-20 14:46:45 -07:00
Mike Jolley 91511bd92a Merge pull request #15631 from woocommerce/update/13738
Create a way to 'resend order details'
2017-06-20 15:09:10 +01:00
Mike Jolley e4be09f6e2 Filter visible children when outputting grouped product prices 2017-06-20 15:01:23 +01:00
Mike Jolley 98684233dc Filter visible children when outputting grouped products 2017-06-20 15:01:14 +01:00
Mike Jolley ae0e03ef53 wc_products_array_filter_visible_grouped method 2017-06-20 15:00:58 +01:00
Mike Jolley 6a6aca4132 Correctly map attribute labels to names
Fixes #15697
2017-06-20 14:15:35 +01:00
Frédéric Demarle 4960af34aa Add an action before importing a row 2017-06-20 14:25:23 +02:00
Mike Jolley 6cea4e87cc Compare page IDs rather than URIs in the cache helper 2017-06-20 12:09:46 +01:00
Mike Jolley 22c79b2ba2 Merge pull request #15682 from 1do/master
Changed misspelled filter name
2017-06-20 08:49:05 +01:00
1do ff98b72463 Replaced deprecated wocommerce_credit_card_type_labels in favor of woocommerce_credit_card_type_labels filter. 2017-06-19 21:24:53 +03:00
Claudiu Lodromanean f879317f44 Merge pull request #15678 from woocommerce/fix/15676
Normalise emails on set
2017-06-19 10:26:31 -07:00
Claudiu Lodromanean 139ed8e994 Merge pull request #15680 from woocommerce/fix/15669
Update description for exclude_sale_items
2017-06-19 10:22:42 -07:00
claudiulodro d0266938bf Recompile css 2017-06-19 10:13:27 -07:00
Mike Jolley 712c281fb7 Add tax class and status to export
Fixes #15663
2017-06-19 14:01:52 +01:00
Mike Jolley a1940f2da3 Grunt dev 2017-06-19 12:49:34 +01:00
1do 344807bd15 changed misspelled filter name 2017-06-19 14:22:31 +03:00
Mike Jolley acf0026834 Update description for exclude_sale_items 2017-06-19 11:56:04 +01:00
Mike Jolley d9e34d4e86 Normalise emails on set 2017-06-19 10:48:00 +01:00
Mike Jolley 55ca1899ad Merge pull request #15660 from woocommerce/fix/cli-ids
Fix issues with CLI IDs
2017-06-19 10:24:46 +01:00
Mike Jolley 1f7b0265c1 Merge pull request #15628 from woocommerce/update/15623
woocommerce_format_localized_decimal + woocommerce_format_localized_price filters
2017-06-19 10:13:02 +01:00
Claudiu Lodromanean 1b04963f27 Merge pull request #15659 from woocommerce/fix/15642
Fix webhook saving and ping only once
2017-06-16 11:01:08 -07:00
Claudiu Lodromanean 4d25ec6296 Merge pull request #15652 from woocommerce/fix/15632
Allow state field to have the correct country set by passing it through
2017-06-16 10:58:40 -07:00
Claudiu Lodromanean fac4114bae Merge pull request #15654 from woocommerce/fix/15640
Add missing nonce to product sales report
2017-06-16 10:43:10 -07:00
Claudiu Lodromanean 5c8b32a6fb Merge pull request #15627 from woocommerce/fix/15624
Rating fixes
2017-06-16 10:30:39 -07:00
Claudiu Lodromanean 487d1b8461 Merge pull request #15626 from jobthomas/login-update
Login update
2017-06-16 09:56:36 -07:00
Justin Shreve dd80f25f90 Fix issues with CLI IDs 2017-06-16 06:29:57 -07:00
Mike Jolley 42ebde73cd Fix is_webhook_settings_page 2017-06-16 13:58:28 +01:00
Mike Jolley 1e7b83b813 Cleanup meta after ping 2017-06-16 13:56:50 +01:00
Mike Jolley b4ea8bb94f clean up comparison operators 2017-06-16 13:53:57 +01:00
Mike Jolley f8ca27f32e Add missing nonce to product sales report
Fixes #15640
2017-06-16 11:51:00 +01:00
Mike Jolley ccad987bac Allow state field to have the correct country set by passing it through
Fixes #15632
2017-06-16 11:45:53 +01:00
Mike Jolley b8eafe985e Set defaults to avoid error if too few args passed 2017-06-15 15:43:32 +01:00
Mike Jolley 3c6635a0f6 Remove all emails except for the invoice email 2017-06-15 15:14:10 +01:00
Mike Jolley b3fcbc56ba Tweak sent message 2017-06-15 15:13:59 +01:00
Job 8b48accc01 Upsell/up-sell
We had a few different usages of up-sells and upsells in the copy -
“Upsells” were used more and also seems to be more correct English so
I’ve updated the “up-sells”
2017-06-15 15:56:01 +02:00
Mike Jolley 75041b6dca Remove email based actions from order screen 2017-06-15 14:19:05 +01:00
Mike Jolley de825ad5b6 woocommerce_format_localized_decimal + woocommerce_format_localized_price filters 2017-06-15 12:07:52 +01:00
Mike Jolley db3b230ff6 Add filter to control rating HTML in widget
Closes #15624
2017-06-15 11:33:09 +01:00
Mike Jolley 0ce2ff2249 Fix update of terms after new rating 2017-06-15 11:29:18 +01:00
Mike Jolley fba428efed Fix visibility of rating widgets 2017-06-15 11:29:10 +01:00
Job 9ca5556067 Login > Log in spelling
“Log in” is the verb, not “login”
2017-06-15 11:53:59 +02:00
claudiulodro 1d3c4ebb4d Add flag for timeout checking 2017-06-14 11:35:22 -07:00
Claudiu Lodromanean b9842b6f21 Merge pull request #15615 from woocommerce/update/15576
Prevent memory and time limits in importer
2017-06-14 10:20:29 -07:00
Mike Jolley 4dea3ece8a Fix memory limit detection on some systems 2017-06-14 18:16:39 +01:00
Claudio Sanches e9b64aec7b Merge branch 'master' into fix/15574 2017-06-14 14:05:01 -03:00
Claudio Sanches 7a4b68f551 It's clear that is a subject for an email 2017-06-14 14:01:12 -03:00
Claudiu Lodromanean 7dd1cdca0a Merge pull request #15618 from woocommerce/fix/15614
Importer; create placeholders when importing products with IDs
2017-06-14 09:59:13 -07:00
claudiulodro 57c5bab731 Space 2017-06-14 09:58:15 -07:00
Mike Jolley c3ee9a77f5 Tweak tips and placeholders for all emails 2017-06-14 17:50:17 +01:00
Claudio Sanches e3b7e4e566 Use placeholders and description to inform the default values 2017-06-14 13:13:43 -03:00
Mike Jolley 0de65b3a8d Start time 2017-06-14 17:04:47 +01:00
Claudiu Lodromanean 4f5f04ec79 Merge pull request #15611 from woocommerce/fix/15606
More strict COD method matching
2017-06-14 09:04:46 -07:00
Claudiu Lodromanean bdb7194b2e Merge pull request #15612 from woocommerce/fix/15592
Recalculate totals after local pickup selection
2017-06-14 08:55:50 -07:00
Mike Jolley 8bd7f89f73 Clear placeholder data after import 2017-06-14 16:38:07 +01:00
Mike Jolley 907b986d4f Tweak wording 2017-06-14 16:37:53 +01:00
Mike Jolley cb34cb8d81 Made variations more lenient so that they can be created whilst a parent does not yet exist 2017-06-14 16:37:46 +01:00
Mike Jolley fdc6c46e80 Clear slug for placeholder products 2017-06-14 16:37:21 +01:00
Mike Jolley 8603e75b5e Create placeholders when importing products with an ID column and not updating 2017-06-14 16:37:07 +01:00
Konstantin Kovshenin 247e13e2ca Helper: Various Improvements (#15519)
* Helper: Improve messaging and CTAs

* Helper: Update copy on connect flow

* Helper: Improve messaging around plugins without a subscription

* removes toggle from extensions that cannot be activated

* Helper: Add new `WC_Helper_Compat` class for legacy helper compat

This new class removes some of the actions from the legacy helper
(updater) plugin, attempts to migrate an existing legacy connection
to a new one, attempts to deactivate the old helper plugin.

* Helper: Improve messaging around maxed out subscriptions

* Helper: Enable `WC_Tracker` when connected to WooCommerce.com

* Helper: adds styles for manual licence form row and other visual improvements

* Helper: removes disabled toggles

* Helper: adds styles for connection component

* Helper: redesigned connection module

* Helper: rotates the connection module chevron on mouse hover

* Helper: adds some fixes to the key form on mobile and other updates to meet coding standards

* Helper: Only mark action as primary if there's a CTA button.

* Helper: Better handling for woothemes_updater_notice

Remove the updater notice built into extensions and themes, even
if the legacy Helper plugin is deactivated.

* Helper: Navigate existing Helper users to the new place.

Adds a Dashboard menu item and direct users of the old helper
plugin to the new Extensions screen.

* Helper: Do not show the back-compat menu item for new users

* Helper: Avoid notice in API authentication if credentials are missing

* Helper: Hide the back-compat menu item when users see the new screen

Also sets the user_id for the connection if one was not previously set.
2017-06-14 14:12:53 +01:00
Mike Jolley 77cee56ae8 Prevent memory and time limits 2017-06-14 14:02:47 +01:00
Mike Jolley 9fb8fa4761 Merge pull request #15610 from woocommerce/update/15604
Copy tweaks for catalog visibility
2017-06-14 13:08:36 +01:00
Mike Jolley 3132d641e3 Merge pull request #15600 from woocommerce/improvement/15596
Add checks in get_orders_generate_customer_meta_query
2017-06-14 13:04:03 +01:00
Mike Jolley 66c7c20844 Should work in reverse 2017-06-14 12:57:26 +01:00
Mike Jolley 985f7e043f Update totals if local pickup is selected 2017-06-14 12:46:59 +01:00
Mike Jolley 55e9add8e5 More strict COD method matching
Fixes #15606
2017-06-14 12:17:28 +01:00
Mike Jolley 4a4e201888 Copy tweaks for catalog visibility
Ref #15604
2017-06-14 12:07:20 +01:00
Valerie K 66259ebff1 Update WooCommerce Services copy (#15598)
* Remove excess explanation from wizard shipping step

* Remove distracting link from shipping wizard page

* Update copy on extensions WCS banner

* Update copy on WCS extensions banner for Canada

* Fix extensions WCS banner when read from json

* Add Canada copy on wizard shipping step

* Use strict array comparison in WCS shipping tout

* Add service logos to WCS extension banner

* Use strict array comparison in WCS banner

* Remove related extensions when showing WCS banner

- when store is based in Canada remove Canada Post
extension from shipping page
- when store is based in US remove USPS
extension from shipping page

* Add image alt for logos on WCS banners

* Update WCS banner and wizard content
2017-06-14 11:24:45 +01:00
Claudio Sanches 62c65e778b Restored emails settings default values
Closes #15574
2017-06-13 20:00:50 -03:00
claudiulodro 62064d56f8 Add edge case test 2017-06-13 14:00:12 -07:00
claudiulodro 489e67dbe1 Remove unnecessary checks 2017-06-13 13:37:40 -07:00
claudiulodro f1a9dbc69e Extra checks and tests 2017-06-13 13:32:21 -07:00
Claudio Sanches 6d1c133a3e Merge pull request #15594 from woocommerce/fix/15561
Remove escape to fix saving of Special characters in attributes
2017-06-13 14:28:39 -03:00
Mike Jolley ba2bf67bb9 Use hash_equals where needed 2017-06-13 13:54:02 +01:00
Mike Jolley e24ca9d3bc Merge remote-tracking branch 'origin/master' 2017-06-13 13:35:17 +01:00
Mike Jolley 598982ef70 Standards 2017-06-13 13:34:46 +01:00
Mike Jolley c4c3d37101 Remove escape 2017-06-13 13:30:00 +01:00
Mike Jolley 393f1be092 Merge pull request #15580 from woocommerce/refactore/improve-importer-mapping-options
Better importer mapping options
2017-06-13 12:15:33 +01:00
Mike Jolley 1a6e477c83 Merge pull request #15579 from woocommerce/fix/importer-delimiter
Start handle importer delimiter
2017-06-13 11:57:10 +01:00
Mike Jolley 3d50d1468c Merge pull request #15590 from woocommerce/fix/15584
Prevent error in wc_get_product_term_ids
2017-06-13 11:43:00 +01:00
Mike Jolley 282bf0fd68 Cleanup 2017-06-13 11:41:44 +01:00
nishitlangaliya efea26d8fa Fixed Login Issue when the username is an email ref #15577 2017-06-13 16:09:54 +05:30
Mike Jolley 5b1af1b75f Merge pull request #15550 from ughimire/product-import
Fixed - Directory separator issue on windows for product import file …
2017-06-13 11:35:40 +01:00