Commit Graph

12183 Commits

Author SHA1 Message Date
Mike Jolley fdcf16bb60 Merge branch 'master' into update/15563
# Conflicts:
#	assets/css/admin-rtl.css
#	assets/css/admin.css
#	assets/css/helper-rtl.css
#	assets/css/helper.css
#	assets/css/wc-setup-rtl.css
#	assets/css/wc-setup.css
#	assets/css/woocommerce-rtl.css
#	assets/css/woocommerce.css
2017-07-12 16:18:13 +01:00
Claudiu Lodromanean bce6e927bb Merge pull request #16091 from woocommerce/fix/15763
Adjust variation name logic
2017-07-12 08:13:49 -07:00
Claudiu Lodromanean de21898b70 Merge pull request #16090 from woocommerce/fix/16084
Sanitize keys in reports class
2017-07-12 08:05:11 -07:00
Mike Jolley b3e0804462 Check we have an object before using product props
Fixes #15256
2017-07-12 15:58:54 +01:00
claudiulodro 0f134d2b6f Begin product query 2017-07-12 07:44:53 -07:00
Mike Jolley 022c528b3e Remove value renaming code 2017-07-12 15:18:05 +01:00
Mike Jolley 6421b2a0be Fix rtrim for non - separators 2017-07-12 15:17:48 +01:00
webspecnick 49ba871795 Add enclosure and escape arguments to importer. Introduce filter to change importer arguments (#16053)
* Introduce woocommerce_product_csv_importer_args filter.

* Add extra args to WC_Product_CSV_Importer. Have fgetcsv use extra args

* Update to follow coding standards.
2017-07-12 12:11:44 +01:00
Mike Jolley 58338354e5 Merge pull request #16085 from woocommerce/add-cross-sells-filter
Add cross-sells filter
2017-07-12 11:24:28 +01:00
Mike Jolley 25cbd4ada8 Sanitize keys in reports class 2017-07-12 10:53:39 +01:00
claudiulodro 4c4526424a Remove race condition 2017-07-11 13:21:42 -07:00
Caleb Burks 572cf3813f Spacing/typo fix
Should really combine all three of these filters into one as well.
2017-07-11 13:37:43 -05:00
Caleb Burks 03d71cd8ee Add filter for cart cross-sells 2017-07-11 13:33:51 -05:00
Claudio Sanches fd1cb2d67f Merge pull request #16052 from woocommerce/feature/13189-refactored
Add select2 to layered nav
2017-07-11 12:39:33 -03:00
Claudio Sanches 2335b5edf5 Merge pull request #16065 from mjangstadt/patch-1
Explicitly set include path
2017-07-11 12:30:01 -03:00
Mike Jolley ca54ae0068 Merge pull request #16077 from woocommerce/fix/16072-2
[REST API] Check if is a valid instance of WC_Product before load data
2017-07-11 16:29:21 +01:00
Claudio Sanches 4262e83187 [REST API] Check if is a valid instance of WC_Product before load data
Closes #16072
2017-07-11 12:27:56 -03:00
Claudio Sanches fa850ecfb4 Removed PayPal legacy code 2017-07-11 12:09:57 -03:00
Mike Jolley b6847ebe60 remove exit 2017-07-11 16:09:31 +01:00
Mike Jolley 94b32e644a HTML emails 2017-07-11 14:52:30 +01:00
Mike Angstadt 00e8c9a505 removed leading slashes
removed leading slashes
2017-07-11 08:45:06 -05:00
Mike Angstadt 2239ad6dcb updated based on reviewer feedback
Updated based on reviewer feedback.
2017-07-11 08:43:55 -05:00
Mike Jolley 3939f50ced Download display in account/checkout 2017-07-11 13:45:35 +01:00
Mike Jolley 70420db6fd Spacing 2017-07-11 11:31:02 +01:00
Mike Jolley ba2063efa4 Merge pull request #15961 from electrokit/order_again_merge_option
Feature: Add option for merging when using 'Order Again'
2017-07-11 11:23:33 +01:00
Mike Jolley bb39053211 Merge pull request #16066 from woocommerce/fix/rest-of-the-world-zone-copy-change
Change the "Rest of the World" zone name to "Locations not covered by your other zones" everywhere
2017-07-11 10:51:44 +01:00
Mike Jolley 5c32abfe6b Merge pull request #16054 from woocommerce/fix/16043
Fix styling and connect button in non-english languages
2017-07-11 10:49:09 +01:00
Mike Jolley be4a3fc99a Typo in set_instance_id() method
Closes #16067
2017-07-11 10:38:50 +01:00
Terence O'Donoghue 43eaa8356a Fixed template reference spacing 2017-07-11 09:53:50 +01:00
Daniel Rey Lopez 04a83b0faa Change the "Rest of the World" zone name to "Locations not covered by your other zones" everywhere 2017-07-11 08:19:42 +01:00
Mike Angstadt fa4e4e40fd Explicitly set include path
If you override include_path and are including this file from outside this directory's context, performance will degrade as both those locations are incorrectly checked first getting an EOF before include() falls back to looking in this directory.

Explicitly setting the include path checks this directory first regardless of calling context location or include_path override so is ideal.
2017-07-10 21:33:42 -05:00
Claudiu Lodromanean 1699a9769f Merge pull request #16020 from woocommerce/feature/12273
New attribute helper functions
2017-07-10 13:20:59 -07:00
Claudio Sanches a7582d50da Merge pull request #16050 from woocommerce/update/15985
Use select2 in cart
2017-07-10 15:40:56 -03:00
Claudio Sanches 1c18a458be Merge pull request #15994 from woocommerce/fix/15964
Correct embed code
2017-07-10 15:30:25 -03:00
claudiulodro 03403b2c44 Allow times in date fields 2017-07-10 09:19:59 -07:00
Claudiu Lodromanean d850ca235a Merge pull request #16044 from woocommerce/fix/16027
Pass correct value to woocommerce_shipping_classes_save_class when inserting a new term
2017-07-10 08:32:15 -07:00
Mike Jolley e432d2d0ad Fix styling and connect button in non-english languages 2017-07-10 16:29:06 +01:00
Mike Jolley 872dca636f Feedback 2017-07-10 14:48:42 +01:00
Mike Jolley a6967d69d4 Normalise state keys 2017-07-10 14:48:42 +01:00
Mike Jolley a527a9566b Add select2 to layered nav 2017-07-10 14:36:47 +01:00
Mike Jolley 0a3856c5cb Merge branch 'master' into feature-13189 2017-07-10 13:24:42 +01:00
Mike Jolley 555f093ac3 Use select2 in cart
Fixes #15985
2017-07-10 13:14:27 +01:00
Gustaf Folin ead5f208fa Add hook around empty_cart() 2017-07-10 12:13:38 +02:00
Mike Jolley 6685a4199c Pass correct value to woocommerce_shipping_classes_save_class when inserting a new term
Fixes #16027
2017-07-10 10:03:46 +01:00
Akeda Bagus 53807185a8
Fixed typos.
These typos are catched by `misspell` program.

```
find . -type f | grep -v assets | grep -v dummy-data | grep -v i18n | grep -v node_modules | grep -v .git | grep -v apigen |  xargs misspell -w
```

Some results were excluded because of 3rd party ownership and non-english
sentences.
2017-07-10 12:56:28 +07:00
Claudio Sanches a7c4eb3eb7 Improved error handler for wc_delete_attribute() 2017-07-07 18:49:46 -03:00
Claudio Sanches 66895afb38 Added comment to remember about CloudFlare email obfuscation 2017-07-07 18:26:53 -03:00
Claudio Sanches fe1d54b360 Added missing global $wpdb in wc_delete_attribute() 2017-07-07 18:15:59 -03:00
Claudio Sanches e235984e75 Fixed inserted data and clear transients after save attributes 2017-07-07 17:52:13 -03:00
Claudio Sanches 1600edee95 Delete attribute helper 2017-07-07 17:44:31 -03:00
Claudio Sanches b02fc2f516 Updated and create attribute helpers 2017-07-07 17:40:40 -03:00
Claudio Sanches 1f039280aa Added function to get attribute 2017-07-07 17:40:19 -03:00
Claudio Sanches 86d09b0c6a Avoid CloudFlare email obfuscation.
Closes #15082
2017-07-07 15:45:05 -03:00
Claudio Sanches 4ea14a35e2 Merge pull request #16012 from woocommerce/update/14837
Refactor shipping rate to include instance IDs
2017-07-07 12:23:27 -03:00
Claudio Sanches 24864ef6ca Merge pull request #16010 from woocommerce/update/16006
Revise where context is added.
2017-07-07 12:20:15 -03:00
Claudiu Lodromanean 07c9a2de3d Merge pull request #16011 from woocommerce/update/16002
Set allow one slide to false for flexslider
2017-07-07 08:17:33 -07:00
Mike Jolley f79f5bb5cb Simply enables drag and drop sorting on the grouped product field
Fixes #14560
2017-07-07 14:20:30 +01:00
Mike Jolley e539d3125a Refactor shipping rate to include instance IDs 2017-07-07 14:14:29 +01:00
Mike Jolley 79e3bbd0bf Set allow one slide to false for flexslider
Closes #16002
2017-07-07 11:37:10 +01:00
Mike Jolley d7ed343178 Revise where context is added. 2017-07-07 11:20:34 +01:00
Claudio Sanches fe9dd86482 Merge pull request #16001 from woocommerce/fix/format
Fix code formatting
2017-07-06 18:29:53 -03:00
Claudiu Lodromanean 74d6c2378b Merge pull request #16000 from woocommerce/fix/csv-mapping
Change how mapping is posted
2017-07-06 11:37:24 -07:00
claudiulodro 863193bd34 Fix linting problems 2017-07-06 11:12:02 -07:00
Mike Jolley b91da6f021 Change how mapping is posted 2017-07-06 18:51:36 +01:00
claudiulodro be2bbd3d3d Update missed select2 2017-07-06 10:43:10 -07:00
claudiulodro 8a8daabf26 Update with master and recompile assets 2017-07-06 09:06:30 -07:00
claudiulodro a2867fae6a Set up select2 and selectWoo 2017-07-06 08:43:10 -07:00
Claudiu Lodromanean d2fffea591 Merge pull request #15988 from rellect/activation_rtl
Add rtl support for activation.css
2017-07-06 08:22:48 -07:00
Farook Ibrahim d0489206a7 minor typo fix 2017-07-06 17:24:28 +05:30
Mike Jolley ec9a380143 Correct embed code 2017-07-06 12:32:28 +01:00
Refael Iliaguyev 40ef76c12b Add rtl support for activation.css 2017-07-06 09:03:15 +03:00
Claudio Sanches 7e7194ce47 Merge pull request #15974 from woocommerce/fix/15965
Update customer with CRUD and set session data at the same time.
2017-07-05 15:58:21 -03:00
Claudio Sanches 10f039ad79 Merge pull request #15827 from woocommerce/fix/15818
If stock changes between page load and editing, reject stock changes
2017-07-05 15:49:58 -03:00
Mike Jolley beba2757ee feedback 2017-07-05 17:11:34 +01:00
Mike Jolley 57ee9f58cf Update customer with CRUD and set session data at the same time.
Fixes #15965
2017-07-05 12:21:46 +01:00
Mike Jolley d03982bea1 Merge pull request #15966 from woocommerce/fix/15960
[REST API] Allow unset product shipping_class
2017-07-05 11:24:12 +01:00
Mike Jolley f1a19b1424 Merge pull request #15971 from woocommerce/hotfix-fatal-error
Prevent fatal error on order page
2017-07-05 11:10:42 +01:00
Mike Jolley 4c6a6516c0 Merge pull request #15970 from woocommerce/fix/extra-refund-classes
Removed non-existing classes from refunds form on admin
2017-07-05 11:05:32 +01:00
Nicola Mustone cd5c24d7c3 Prevent fatal error on order page
Prevents a fatal error on order pages when variable products are purchased.
2017-07-05 08:20:08 +03:00
Claudio Sanches 6ad9987e0d Merge pull request #15658 from woocommerce/update/15643
get_filtered_term_product_counts performance
2017-07-04 17:30:09 -03:00
Claudio Sanches 0a8a64f10c Merge pull request #15679 from woocommerce/update/coupon-cart-logic
Use the product object rather than function wc_get_product_ids_on_sale
2017-07-04 17:29:30 -03:00
Claudio Sanches d2f9211ffb Removed non-existing classes from refunds form on admin 2017-07-04 17:27:25 -03:00
Claudio Sanches 2d8902c91f Hide Cross-sells if external, removed in #15692 2017-07-04 16:44:08 -03:00
Claudio Sanches 74cba6f863 Merge branch 'master' into grouped-products-settings-improvement 2017-07-04 16:41:33 -03:00
Claudio Sanches ee87024d82 Merge pull request #15956 from woocommerce/add-cart-readdition-notice
Use ajax when restoring an item in the cart
2017-07-04 16:35:23 -03:00
Claudio Sanches bf91127682 Merge pull request #15788 from woocommerce/fix/13353
Clean up user is_paying_customer after deleting an order
2017-07-04 16:26:45 -03:00
Claudio Sanches 78a6585f19 [REST API] Allow unset product shipping_class
Closes #15960
2017-07-04 14:01:17 -03:00
Claudio Sanches cb58142c02 Merge pull request #15963 from woocommerce/fix/slashes-on-objects
leave objects alone rather than slashing in the meta api
2017-07-04 12:45:29 -03:00
Claudio Sanches 00237a6de9 Merge pull request #15959 from woocommerce/update/15949
Extra error checking in terms page content
2017-07-04 12:25:44 -03:00
Claudio Sanches cf12271398 Merge pull request #15934 from woocommerce/fix/15917
Convert data to UTF-8 on import
2017-07-04 12:20:17 -03:00
Mike Jolley b9757cca00 leave objects alone rather than slashing in the meta api
Has tests. Prevents notices when you pass an object to add_meta_data.
2017-07-04 16:09:21 +01:00
Claudio Sanches 888498deb0 Merge pull request #15939 from woocommerce/fix/15911
Use wp_get_raw_referer in my account redirect, and validate all falling back to my account
2017-07-04 12:04:41 -03:00
Mike Jolley 93a98ea91c Merge pull request #15954 from woocommerce/fix-15946
Add `cart_subtotal` to the shipping package
2017-07-04 12:59:24 +01:00
Job f67bf6892e Coupon help (#15958)
* Solves #15945

Change description of help tip to be accurate for current coupon system

* update caps use on PR
2017-07-04 12:07:26 +01:00
Mike Jolley 6f6f410ce1 Use wc_get_raw_referer 2017-07-04 12:05:21 +01:00
Mike Jolley b0a9c5a9c2 Merge pull request #15952 from woocommerce/add-filter-parameter-15923
Pass $column_id into export filter
2017-07-04 11:28:33 +01:00
Mike Jolley 05a328cd33 Merge pull request #15948 from woocommerce/fix/15947
Remove side-effects
2017-07-04 11:27:20 +01:00
Mike Jolley 6bc1c16d77 Merge pull request #15900 from JustinSainton/patch-4
Add search_customers() filter
2017-07-04 10:54:50 +01:00
Caleb Burks 2d52e6e398 Use ajax when restoring an item in the cart 2017-07-04 04:01:59 -05:00
Caleb Burks 5af560e32a Add `cart_subtotal` to the shipping package 2017-07-04 03:05:39 -05:00
Caleb Burks 02ffdaf8f5 Remove unnecessary variable
Don’t this change any longer. Got rid of a foreach loop that was using it.
2017-07-04 01:44:10 -05:00
Caleb Burks c7693b201d Require T&Cs be a different page than checkout 2017-07-04 01:36:34 -05:00
Caleb Burks 817efb551c Pass $column_id into export filter 2017-07-03 23:32:44 -05:00
claudiulodro fe09b4cf54 Remove side-effects 2017-07-03 13:57:32 -07:00
Justin Sainton 31d8a4a6d7 Add additional parenthesis.
Maybe don't throw fatal errors.
2017-07-03 10:19:57 -07:00
Claudiu Lodromanean 7046b480a0 Merge pull request #15907 from tractus/fix-order-date-query
Fixes major issue with wc_get_orders with both date_before and date_after specified
2017-07-03 09:32:24 -07:00
Claudiu Lodromanean 204c13fe8c Merge pull request #15936 from woocommerce/fix/15930
WP_Query expects paged, not page
2017-07-03 09:01:55 -07:00
Claudio Sanches 87e4e7241d Merge pull request #15933 from woocommerce/remove/sandbox-fix
Remove sandbox status forcing in PayPal gateway
2017-07-03 12:52:45 -03:00
Claudio Sanches 4b716ce269 Merge pull request #15943 from woocommerce/update/15926
Added method to escape commas in CSV values
2017-07-03 11:33:43 -03:00
Claudio Sanches 8f4dc81596 Merge pull request #15944 from woocommerce/update/12477
Remove use of protocol relative URls. Filter can be used if needed.
2017-07-03 11:30:07 -03:00
Mike Jolley 432a665a2b Remove use of protocol relative URls. Filter can be used if needed. 2017-07-03 14:58:53 +01:00
Mike Jolley eb5c6d688b Added method to escape commas in CSV values 2017-07-03 14:47:48 +01:00
Mike Jolley f9d1bbba73 Use wp_get_raw_referer in my account redirect, and validate all falling back to my account
Fixes #15911
Closes #15912
2017-07-03 13:30:32 +01:00
Mike Jolley 8ab1ef459c WP_Query expects paged, not page
Fixes #15930
2017-07-03 12:24:30 +01:00
Mike Jolley 655fc002ed Convert data to UTF-8 on import
Fixes #15917
2017-07-03 12:07:07 +01:00
Mike Jolley 59a4f3b0d9 Remove sandbox status forcing in PayPal gateway
Closes #15899

@californiakat Should we add
https://stackoverflow.com/questions/4298117/paypal-ipn-always-return-pay
ment-status-pending-on-sandbox to the docs when 3.2 launches?
2017-07-03 10:46:32 +01:00
Mike Jolley 280a9a625c Merge pull request #15931 from woocommerce/update/skip-meta-filter
Update/skip meta filter
2017-07-03 10:41:40 +01:00
Mike Jolley ccba0a665e Rename function and include less args 2017-07-03 10:38:29 +01:00
Mike Jolley 748c39d966 Add note about #15904 2017-07-03 10:26:26 +01:00
Mike Jolley ffc468af06 Merge pull request #15921 from woocommerce/fix-15920
Export metadata along with custom columns
2017-07-03 10:24:13 +01:00
Caleb Burks b127a67ed8 Add filter to skip metas from being exported 2017-07-02 03:14:24 -05:00
Caleb Burks b7ad5e18fc Export metadata along with custom columns 2017-07-02 02:21:58 -05:00
Trey Richards fb0924b652 Use filtered args in get_orders function. 2017-06-30 17:42:04 -07:00
Trey Richards f019070307 Fixed major issue with getting orders when both before_date and after_date args are set.
Modified unit tests to prevent from happening again.
2017-06-30 17:30:16 -07:00
Justin Sainton 29c9fa55d8 Add search_customers() filter
Includes each of the parameters passed to the method, as well as a context parameter for each query.

Our specific use case for this is for a custom wholesale ordering system, where we're wanting to limit the search to a specific role - so customizing the arguments here would be really helpful.

Ironically, proposed the same thing three years ago and the committed filter no longer exists: e91ca49b6d
2017-06-30 13:52:24 -07:00
Dale Phurrough 25ec8e4985 fixes woocommerce/woocommerce#15896 2017-06-30 21:20:23 +02:00
Claudiu Lodromanean 3fc26b7e24 Merge pull request #15890 from woocommerce/fix/15870
7day should start from midnight, not current time
2017-06-30 09:19:45 -07:00
Claudiu Lodromanean 2aaa0003d4 Merge pull request #15891 from woocommerce/fix/15874
Admin status update should be marked as a manual status transition
2017-06-30 09:13:16 -07:00
Claudiu Lodromanean 318be9db8d Merge pull request #15888 from woocommerce/update/12477
Added woocommerce_get_asset_url filter
2017-06-30 08:49:39 -07:00
Claudiu Lodromanean 5206535b62 Merge pull request #15887 from woocommerce/fix/15872
Use wc_float_to_string on item prices sent to paypal
2017-06-30 08:48:14 -07:00
Claudiu Lodromanean 4c818d584d Merge pull request #15879 from woocommerce/fix/15868
Prevent extra slashes on meta values
2017-06-30 08:36:56 -07:00
Mike Jolley c7e4be8f34 Update flexslider 2017-06-30 15:19:47 +01:00
Mike Jolley 77c938202f Merge branch 'add/15602-store-street-level-address'
# Conflicts:
#	assets/css/admin-rtl.css
#	assets/css/admin.css
2017-06-30 15:00:51 +01:00
Mike Jolley d6131f3a74 Field styling 2017-06-30 14:59:45 +01:00
Mike Jolley 58593a154d Admin status update should be marked as a manual status transition
Closes #15874
2017-06-30 11:40:52 +01:00
Mike Jolley 472b983498 7day should start from midnight, not current time
Fixes #15870
2017-06-30 11:34:07 +01:00
Mike Jolley dde62ef475 Added woocommerce_get_asset_url filter
Closes #12477
2017-06-30 11:05:18 +01:00
Mike Jolley 5d20b2f646 Merge pull request #15854 from woocommerce/fix/15853
Add tool for populating order address indexes.
2017-06-30 10:43:36 +01:00
Mike Jolley bf6c39fbf2 Use wc_float_to_string on item prices sent to paypal
Fixes #15872
2017-06-30 10:28:21 +01:00
Mike Jolley 277ccf0ad7 Merge pull request #15677 from ughimire/no-std
Tweak - Added remove icon on my account page dropdown of account page
2017-06-29 22:55:10 +01:00
Mike Jolley 3aa406fdf6 Merge pull request #15875 from woocommerce/fix/15873
Add important line of code back into structured data generation.
2017-06-29 22:53:55 +01:00
Mike Jolley 4f66d214fa Merge pull request #15829 from woocommerce/fix/15725
Use type check in coupon constructor
2017-06-29 22:42:43 +01:00
Mike Jolley 3bfd2bab48 Prevent extra slashes on meta values
by_mid functions do not expect slashes

Fixes #15868
2017-06-29 22:41:11 +01:00
claudiulodro 6706da6d45 Move to prevent undefined errors 2017-06-29 11:46:30 -07:00
claudiulodro 0db60b56c9 Re-add removed line. 2017-06-29 11:43:30 -07:00
Claudiu Lodromanean 62800a68f9 Merge pull request #15862 from woocommerce/fix/exclude-comment-where
Comment feed where clauses should be appended
2017-06-29 11:23:08 -07:00
claudiulodro 587dc56d9a Formatting 2017-06-29 11:16:26 -07:00
claudiulodro 2948e46cb4 Add tool for adding address indexes. 2017-06-29 11:14:09 -07:00
Mike Jolley ac32384a74 Merge pull request #15835 from woocommerce/display-wc-page-post-states
Add post states for WC pages
2017-06-29 12:42:10 +01:00
Mike Jolley ad48fd8069 Comment feed where clauses should be appended
Applies to both exclude_order_comments_from_feed_where and
exclude_webhook_comments_from_feed_where

They need to append the additonal where clause to avoid SQL errors on
the feed URL.
2017-06-29 11:29:54 +01:00
claudiulodro d19de0364c Revert "Add billing+shipping indices to old orders"
This reverts commit 2d48099f20.
2017-06-28 13:40:55 -07:00
claudiulodro 2d48099f20 Add billing+shipping indices to old orders 2017-06-28 12:03:18 -07:00
Claudio Sanches 6228e356b1 Merge pull request #15842 from woocommerce/fix/15840
Skip non existing rows on merge
2017-06-28 11:19:21 -03:00
Claudio Sanches 41cd12c123 Merge pull request #15844 from woocommerce/update/15839
Update MX states and MX state data
2017-06-28 11:14:48 -03:00
Claudio Sanches 70ae880f29 Merge pull request #15843 from woocommerce/fix/15834
Force date created on update if not set.
2017-06-28 11:11:40 -03:00
Mike Jolley 429e4bfed1 Merge pull request #15837 from thenbrent/revert_pr_14706
Revert pull request #14706 with changes to Abstract_WC_Order::get_item() to avoid critical fatal errors
2017-06-28 13:31:57 +01:00
Mike Jolley b83f3cb9af handle MX state updates 2017-06-28 12:57:37 +01:00
Mike Jolley 49f2dae450 Merge pull request #15823 from ChaseWiseman/fix-checkout-shipping-calculator
Don't output the shipping calculator markup on the Checkout page
2017-06-28 12:30:47 +01:00
Mike Jolley 8dcbf9aa8d Force date created on update if not set.
Closes #15834
2017-06-28 12:25:23 +01:00
Mike Jolley e937047d04 Skip non existing rows on merge 2017-06-28 12:06:33 +01:00
Brent Shepherd 1992d90d37 Revert "Merge pull request #14706 from crodas/make_get_item_consistent"
This reverts commit 56ffa3d2aa, reversing
changes made to 64a60de24f.
2017-06-27 22:28:23 -07:00
Caleb Burks 029c28a462 Fix copy/paste fail 2017-06-27 23:55:14 -05:00
Caleb Burks 290a90c8f8 Add post states for WC pages 2017-06-27 23:38:09 -05:00
claudiulodro 506c01f56a Fix codesniffer violations 2017-06-27 14:19:59 -07:00
claudiulodro 4e7d3333cf Use type check in coupon constructor 2017-06-27 13:53:56 -07:00
Mike Jolley 1265633286 If stock changes between page load and editing, reject stock changes
Fixes #15818
2017-06-27 21:22:46 +01:00
Claudio Sanches b9c76c568b Prefer "live rates form" 2017-06-27 17:00:48 -03:00
Claudio Sanches a0425ad1b9 Remove Canada Post duplicated description
Duplicated with description from
includes/admin/class-wc-admin-setup-wizard.php:506
2017-06-27 16:57:46 -03:00
Chase Wiseman f8a040ad04 Only output the shipping calculator markup on the cart page 2017-06-27 11:37:55 -07:00
Claudio Sanches 5bc03b41cf Redirect ?customer-logout=true to the correct endpoint
Checking also for `'true' === $wp->query_vars['customer-logout']` to avoid infite loops when permalinks are deactivated and "My account" is the front page.

Closes #15789
2017-06-27 14:10:20 -03:00
Claudio Sanches be0fc10bfe Merge pull request #15817 from woocommerce/fix/15795
Only set default if no value is set in API settings
2017-06-27 13:05:58 -03:00
Claudio Sanches fe542d4d4e Merge pull request #15816 from woocommerce/fix/15808
Add slashes to meta value in data store before passing to WP functions
2017-06-27 13:03:13 -03:00
Claudio Sanches fbd92c8105 Merge pull request #15815 from woocommerce/fix/15794
Prevent duplicate sections in tax and api endpoints
2017-06-27 13:01:05 -03:00
Claudiu Lodromanean 5bbe82571f Merge pull request #15814 from woocommerce/fix/15804
Fix notice and missing terms in importer
2017-06-27 08:45:52 -07:00
Mike Jolley afcfb4eb35 Only set default if no value is set in API settings 2017-06-27 15:29:31 +01:00
Mike Jolley d568069c37 Add slashes to meta value in data store before passing to WP functions
Fixes #15808
2017-06-27 15:11:32 +01:00
Mike Jolley 33a4e74697 Prevent duplicate sections in tax and api endpoints 2017-06-27 14:58:33 +01:00
Mike Jolley 26b98bc3df Fix notice and return correct attribute ID 2017-06-27 14:39:30 +01:00
Mike Jolley 591cac37d1 Increased batch size 2017-06-27 14:39:18 +01:00
Daniel Hüsken d6377c9609 will improve #15806 2017-06-27 14:43:51 +02:00
Daniel Hüsken 84881c3e36 Importer fix file type detection on local path 2017-06-27 14:21:05 +02:00
Manos Psychogyiopoulos c8e166f706 Add woocommerce_product_importer_formatting_callbacks filter 2017-06-27 01:49:18 +03:00
Manos Psychogyiopoulos 7778bf894e Allow DRY product importer integration 2017-06-26 23:49:48 +03:00
Claudiu Lodromanean a05252753f Merge pull request #15790 from woocommerce/fix/15781-2
Remove BOM signature from imported results
2017-06-26 12:49:59 -07:00
Claudio Sanches ec1500d1b7 Remove BOM signature from imported results
Fix missing mapping for ID column
2017-06-26 16:08:05 -03:00
Claudio Sanches ab9c331a8d Merge pull request #15785 from woocommerce/fix/15781
Importer tweaks and fixes
2017-06-26 16:07:19 -03:00
claudiulodro ee9c762bdc Enqueue selectWoo 2017-06-26 11:50:08 -07:00
Mike Jolley afd43b3b78 Look for mapped ID when parsing ID field 2017-06-26 18:41:51 +01:00
Mike Jolley dd25736d64 Clean up user is_paying_customer after deleting an order 2017-06-26 18:32:36 +01:00
Claudio Sanches 1fb11d0be7 Merge pull request #15783 from woocommerce/fix/15770
After duplicating variations, ensure the duplicated object is current
2017-06-26 13:41:17 -03:00
Mike Jolley 496b741d1c Create placeholder when mapping relative ids 2017-06-26 17:40:20 +01:00
Mike Jolley 04a27389ef Clean up failed imports 2017-06-26 14:11:27 +01:00
Mike Jolley a907fd8627 get_catalog_ordering_args should cast orderby to string
Fixes #15769
2017-06-26 13:38:57 +01:00
Mike Jolley 372d7f6077 After duplicating variations, ensure the duplicated object is current
Fixes #15770
2017-06-26 12:54:46 +01:00
Mike Jolley 4972e83e51 Merge pull request #15775 from dixitadusara/issue/15772
issue solved Pass more params to woocommerce_duplicate_product_exclude_children filter
2017-06-26 12:24:37 +01:00
dixitadusara f77d2184ca issue solved Pass more params to woocommerce_duplicate_product_exclude_children filter 2017-06-26 12:34:20 +05:30
Claudio Sanches 783f2318c4 Fixed undefined variable for importer default mapping 2017-06-23 15:33:37 -03:00
Mike Jolley 5c2a69c668 Add BOM for excel 2017-06-23 17:19:50 +01:00
Mike Jolley 13d7be2422 Merge pull request #15755 from woocommerce/fix/15754
Fix method title escaping in zones
2017-06-23 16:17:54 +01:00
Mike Jolley 1d9148241c Merge pull request #15751 from woocommerce/feature/helper
Helper copy update
2017-06-23 16:17:24 +01:00
Mike Jolley 43dc9ec823 Fix method title escaping in zones
Closes #15754
2017-06-23 12:50:32 +01:00
José Marques 22da32bd9c Helper: removes unnecessary caps in copy 2017-06-23 12:49:05 +01:00
José Marques f0f6495dc5 Helper: updates conpy and button class on connection screen 2017-06-23 09:29:20 +01:00
Claudio Sanches 25a2ee0ca8 Use default English mapping when English is not the current language 2017-06-22 18:07:12 -03:00
Claudio Sanches 1806590e71 Invert special importer mapping options to allow multiple keys 2017-06-22 18:06:10 -03:00
claudiulodro 7bb5dffc2f Flip param count and priority 2017-06-22 09:10:52 -07:00
Claudiu Lodromanean 5ebc4a4010 Merge pull request #15740 from woocommerce/update/prime-term-caches
Update/prime term caches for product queries
2017-06-22 08:18:55 -07:00
Mike Jolley d1ad5a92d2 Merge pull request #15721 from woocommerce/feature/helper
Helper Bug Fixes
2017-06-22 16:17:56 +01:00
Claudiu Lodromanean a77a7c02c0 Merge pull request #15739 from woocommerce/fix/importer-15735
Minor importer fixes
2017-06-22 08:11:15 -07:00
Konstantin Kovshenin 29c000207a Helper: Escape sites_active and sites_max on subscription output. 2017-06-22 17:17:49 +03:00
Konstantin Kovshenin 45a6c45b8f Helper: Better code readability for primary/secondary classes. 2017-06-22 16:59:39 +03:00
Konstantin Kovshenin 0786c31d15 Helper: Escape `master_user_email` on output. 2017-06-22 16:49:10 +03:00
Konstantin Kovshenin 0cd10a12ef Helper: Move subscription sorting into methods for PHP 5.2 compat. 2017-06-22 16:47:07 +03:00
Mike Jolley 67bc729ea5 update_post_caches for all posts at once 2017-06-22 13:39:17 +01:00
Mike Jolley ccc3da9c17 Merge branch 'pr/15728' 2017-06-22 12:19:49 +01:00
Mike Jolley 8f70ebc1b5 woocommerce_product_importer_before_set_parsed_data 2017-06-22 12:19:19 +01:00
Mike Jolley 74cb2965b3 Ensure we have a parent
Fixes #15737
2017-06-22 12:06:10 +01:00
Gerhard Potgieter b15e576f5b Use !empty instead of isset for checking master_user_email 2017-06-22 11:10:33 +02:00
Konstantin Kovshenin 4cb1c8f7ce Helper: Add missing period at the end of a sentence. 2017-06-22 11:28:28 +03:00
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 cfbd56c04a Remove some settings for grouped products
Purchase notes and Cross-sells aren’t needing as you can never add a grouped product to your cart or purchase it.
2017-06-20 21:04:56 -05: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
Caleb Burks ae6a5e34f2 Move “Grouped products” setting to the top 2017-06-19 21:59:42 -05:00
Allen Snook 0f311f0cba Add address, address 2, city and postcode to setup wizard 2017-06-19 12:22:05 -07:00
Allen Snook 61a8d858b5 Update address labels in settings to better match customer address labelling 2017-06-19 11:28:42 -07: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 b47e1ee728 Use the product object rather than function wc_get_product_ids_on_sale 2017-06-19 11:53:26 +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
Umesh Ghimire 3f2742fd6f Tweak - Add remove icon on Account page my account page dropdown 2017-06-19 12:59:12 +05:45
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 67d13874ab Add transient caching to get_filtered_term_product_counts to reduce large queries 2017-06-16 13:35:31 +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
Allen Snook 0d1a1d1dbd Update WC_Countries to include new store address helpers 2017-06-15 10:54:24 -07:00
Allen Snook 21d2bee658 Add store street, city and postcode fields to settings > general 2017-06-15 09:56:52 -07: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