Commit Graph

22960 Commits

Author SHA1 Message Date
Mike Jolley e9c3ebebdc Merge branch 'master' into feature/discounts-class
# Conflicts:
#	includes/abstracts/abstract-wc-data.php
#	woocommerce.php
2017-08-08 15:49:59 +01:00
Claudiu Lodromanean 591dbd5a82 Merge pull request #16303 from woocommerce/feature/discount-cart-integration
Integrate WC_Cart_Totals with Cart
2017-08-08 07:34:36 -07:00
Mike Jolley fe143df02c Merge branch 'pr/14751' 2017-08-08 15:30:00 +01:00
Mike Jolley 3778918a0a Merge branch 'master' into pr/14751
# Conflicts:
#	includes/class-wc-structured-data.php
2017-08-08 15:28:31 +01:00
Mike Jolley 396faa19d7 phpcs 2017-08-08 15:25:32 +01:00
Mike Jolley 90f0a835b1 Fix filename image handling 2017-08-08 15:00:03 +01:00
Mike Jolley 93f93e3d5e Merge branch 'pr/16191' 2017-08-08 13:20:28 +01:00
Mike Jolley 866f1cd818 Merge branch 'master' into pr/16191
# Conflicts:
#	includes/wc-account-functions.php
2017-08-08 13:20:17 +01:00
Mike Jolley 81e3ce63b7 Merge branch 'pr/16164' 2017-08-08 13:12:45 +01:00
Mike Jolley a97d3470db Merge branch 'master' into pr/16164
# Conflicts:
#	includes/class-wc-cache-helper.php
2017-08-08 13:12:37 +01:00
Mike Jolley 73eb086696 Merge branch 'pr/16165' 2017-08-08 13:10:16 +01:00
Mike Jolley 2f6aaa85bb Avoid using meta directly 2017-08-08 13:04:27 +01:00
Mike Jolley 63d82cea71 Merge branch 'pr/16108' 2017-08-08 12:44:50 +01:00
Mike Jolley 735a277e52 initial state 2017-08-08 12:44:36 +01:00
Mike Jolley 19d0841b70 Merge pull request #16340 from grey-rsi/wc-emails-filters
Add filters to make possible send emails in language different from d…
2017-08-08 11:53:36 +01:00
Mike Jolley 202498298e Merge pull request #16374 from woocommerce/fix/12273-4
Product attributes helper functions implementation
2017-08-08 11:51:38 +01:00
Emil Kjær Eriksen ee830d19b4 Store status_transition in a local variable and reset it before firing hooks 2017-08-08 12:47:16 +02:00
Mike Jolley a4b81c2a22 Merge pull request #16252 from helgatheviking/issues-16221-settings-save-order
Move settings init/save to load-$settings hook. Closes #16221
2017-08-08 11:40:17 +01:00
Mike Jolley 38d9499c76 Merge branch '12273-3' 2017-08-08 11:07:43 +01:00
Mike Jolley 684a2b22ed typo 2017-08-08 11:07:36 +01:00
Mike Jolley e7ff4186eb remove include 2017-08-08 10:52:54 +01:00
Mike Jolley ceb191e73e The world is not ready for WC_Cart_Item 2017-08-08 10:52:31 +01:00
Mike Jolley 6dc67ee133 phpcs 2017-08-08 10:51:35 +01:00
Mike Jolley ce93599b5c Test correction 2017-08-08 09:30:11 +01:00
Mike Jolley 81806617d7 Fix total and rounding logic for tests 2017-08-08 09:24:26 +01:00
Mike Jolley f7c4cf82d8 Fix subtotal unit tests 2017-08-08 09:24:03 +01:00
Claudio Sanches 1a9b499be8 Apply attribute helper functions to importers and REST API 2017-08-07 22:34:25 -03:00
Claudio Sanches 70e0ab857e Implement attributes functions to admin 2017-08-07 22:34:20 -03:00
Claudio Sanches a3a3d7c242 Initial implementation of product attribute helper functions 2017-08-07 22:33:57 -03:00
Claudio Sanches 2796615054 Flush rewrite rules after delete attributes 2017-08-07 22:30:14 -03:00
Claudio Sanches 6dfcf95b5e Properly update and delete attributes
- Now keep all the original hooks without deprecated anything,
- Update product metadata and terms metadata while changing slugs.
- Delete terms while deleting attributes
2017-08-07 22:29:37 -03:00
Claudio Sanches 29e73d27f4 Introduced woocommerce_attribute_created
And flush rewrite rules when created attribute.
2017-08-07 22:26:46 -03:00
Claudio Sanches dd36ae87d3 Improved wc_create_attribute() inline doc 2017-08-07 22:26:42 -03:00
claudiulodro c8a7ac8940 Unit tests 2017-08-07 14:31:58 -07:00
Claudio Sanches 58302b117f Merge pull request #16361 from woocommerce/fix/16347
Add payment method API improvements
2017-08-07 16:37:10 -03:00
Claudio Sanches 53ea3c8b96 Merge branch 'master' into fix/16347 2017-08-07 16:36:36 -03:00
Claudiu Lodromanean 0286023878 Merge pull request #16367 from woocommerce/fix/16287
Fix variable stock status setting by using CRUD methods
2017-08-07 11:31:10 -07:00
Claudiu Lodromanean dd094088b0 Merge pull request #16336 from woocommerce/fix/16241
Only return tax classes if product is taxable.
2017-08-07 10:02:02 -07:00
Mike Jolley 7a829036c2 Fix tests 2017-08-07 17:49:46 +01:00
Mike Jolley c4bafa7228 Merge pull request #16345 from woocommerce/selectwoo-update
selectWoo accessibility improvements
2017-08-07 17:23:34 +01:00
Mike Jolley f20081c33c Merge pull request #16334 from woocommerce/fix/16253
Add precision to price filter
2017-08-07 17:19:44 +01:00
Mike Jolley 5e2ce54530 update tests 2017-08-07 17:19:19 +01:00
Mike Jolley 299fcc327c Merge remote-tracking branch 'origin/master'
# Conflicts:
#	includes/class-wc-cache-helper.php
2017-08-07 17:11:26 +01:00
Mike Jolley e4fd620214 Merge branch 'pr/16301' 2017-08-07 17:10:44 +01:00
Mike Jolley 622b4b35d6 Remove white space 2017-08-07 17:10:36 +01:00
Mike Jolley baa5da8e6e Merge branch 'master' into pr/16301 2017-08-07 17:10:18 +01:00
Claudiu Lodromanean f7ef7588b9 Merge pull request #16360 from woocommerce/fix/16337
nocache headers during form actions
2017-08-07 08:59:34 -07:00
Mike Jolley 43b78bac02 Merge pull request #16339 from ragulka/modal-content-focus
Focus on modal content instead of container
2017-08-07 16:46:05 +01:00
Mike Jolley 8db31eefe2 Fix variable stock status setting by using CRUD methods
Closes #16287
2017-08-07 15:16:38 +01:00
Mike Jolley 4445fc8191 Merge pull request #16364 from woocommerce/fix/cache-issue-for-get-items
Fix cache issue.
2017-08-07 14:45:59 +01:00