Commit Graph

17806 Commits

Author SHA1 Message Date
Aristeides Stathopoulos d922d045a7 Squiz.Commenting.BlockComment.NoNewLine + indentation on class-wc-cart 2016-09-02 04:03:52 +03:00
Aristeides Stathopoulos f648657432 enabling more tests 2016-09-02 03:50:48 +03:00
Aristeides Stathopoulos bea25afacd Squiz.Commenting.FunctionComment.SpacingAfter 2016-09-02 03:31:26 +03:00
Aristeides Stathopoulos e07511502d Additional coding-standards fixes. 2016-09-02 03:26:24 +03:00
Aristeides Stathopoulos c823236098 Fix failing tests. 2016-09-02 00:33:36 +03:00
Aristeides Stathopoulos fde1037757 fix failing tests. 2016-09-01 23:50:14 +03:00
Aristeides Stathopoulos 5b2761d1ff Merge pull request #2 from woothemes/master
sync
2016-09-01 20:47:31 +03:00
opportus 53a257bb91 improved structured data - merge conflict fix 2016-09-01 14:15:15 +02:00
Mike Jolley ee7b5938ac simplify svg 2016-09-01 12:20:21 +01:00
Mike Jolley 70e5655627 Update mastercard assets
Closes #11438
2016-09-01 12:17:02 +01:00
Mike Jolley 1b2df3dd3b Merge branch 'pr/11797'
# Conflicts:
#	includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php
#	includes/api/class-wc-rest-coupons-controller.php
#	includes/class-wc-coupon.php
#	tests/unit-tests/api/coupons.php
#	tests/unit-tests/coupon/crud.php
2016-09-01 11:46:05 +01:00
Mike Jolley 402d0ff077 Merge branch 'master' into pr/11797
# Conflicts:
#	includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php
#	includes/api/class-wc-rest-coupons-controller.php
#	includes/class-wc-coupon.php
#	tests/unit-tests/api/coupons.php
#	tests/unit-tests/coupon/crud.php
2016-09-01 11:43:31 +01:00
Mike Jolley 4e14c4abeb Merge pull request #11821 from woothemes/customer-exceptions
Customer CRUD/API exceptions
2016-09-01 10:58:35 +01:00
Claudio Sanches f6d20eb324 [REST API] Fixed products query by SKU 2016-08-31 19:36:55 -03:00
Claudio Sanches 6def1188ab Force post_type in products controller 2016-08-31 19:22:27 -03:00
Claudio Sanches 0539476c28 Merge pull request #11823 from woothemes/fix/product-api-filter-wp-query
Fix products API WP_Query filtering with post_status
2016-08-31 19:20:28 -03:00
Justin Shreve 43e55c3336 Instead of catching just the post_status, don't overwrite any filter args. 2016-08-31 15:15:28 -07:00
Justin Shreve 6cb9e1b613 Since we support WP_Query filtering via the API, make sure post_status filtering works too. 2016-08-31 14:39:37 -07:00
Claudio Sanches 06280a7003 HTTPS for google maps 2016-08-31 14:18:55 -03:00
Mike Jolley d30c54ef84 Fix coupon notice in cart. 2016-08-31 18:11:41 +01:00
Mike Jolley 4da955923c [2.6] Handle info notices in cart
Fixes #11808
2016-08-31 18:07:21 +01:00
Mike Jolley e7493b33cb Merge branch 'pr/11817' 2016-08-31 17:52:10 +01:00
Mike Jolley 0a3506777b Inline comments to make this clearer 2016-08-31 17:52:03 +01:00
Gabor Javorszky 219480b329 Save the version on the property too 2016-08-31 16:21:17 +01:00
Mike Jolley 8624156144 Merge pull request #11802 from corsonr/issue_11801
Fixes #11801
2016-08-31 15:50:32 +01:00
Mike Jolley 19f051c7ff Merge branch 'master' into customer-exceptions 2016-08-31 15:45:27 +01:00
Mike Jolley d9a0d0988b Handle meta data and fix unit tests 2016-08-31 15:43:34 +01:00
Mike Jolley 1595cc5767 remove changed 2016-08-31 13:25:13 +01:00
Gabor Javorszky 9cfa231167 Fixes reset cache and version assignment for variable product prices
Fixes #11812

$this->array was only used to return to the user. Comparison was done with $prices_array, which did not contain the version information because it was never saved in the transient.
2016-08-31 11:12:49 +01:00
Mike Jolley 335a5e262a use switch in read_manual_coupon 2016-08-30 18:58:28 +01:00
Mike Jolley 62d0619b1a Avoid legacy keys 2016-08-30 18:03:00 +01:00
Mike Jolley 7439f6d79f Use set_props 2016-08-30 17:59:41 +01:00
Mike Jolley 047242515d Make API and CRUD use consistent keys and make use of data 2016-08-30 17:50:35 +01:00
Mike Jolley b82415dfa3 Handle exceptions in API 2016-08-30 15:57:45 +01:00
Mike Jolley 9b805670d1 Exclude 5.3 2016-08-30 14:50:33 +01:00
Mike Jolley 1d7c8d8370 Handle read with set_props 2016-08-30 14:48:29 +01:00
Mike Jolley ee356d2f29 Add WC_Data_Exception 2016-08-30 14:34:58 +01:00
corsonr f5bc298bae Merge branch 'master' into issue_11801
solve branch sync issue
2016-08-30 14:57:22 +02:00
corsonr 2967b7763b Merge remote-tracking branch 'upstream/master'
fix branch sync issue
2016-08-30 14:48:03 +02:00
corsonr 18b1fe5c2c branch sync fix 2016-08-30 14:47:54 +02:00
corsonr 81ead1d282 sync branch fix 2016-08-30 14:46:08 +02:00
Mike Jolley 6fad572eb7 Attempt to stop travis error
cc @gedex
2016-08-30 13:37:39 +01:00
corsonr 512fea5841 Merge branch 'corsonr-issue_11801'
sync branch fix
2016-08-30 14:34:46 +02:00
corsonr 94eee2e6ee branch sync fix 2016-08-30 14:34:03 +02:00
corsonr 8cb17c1923 branch conflict fix 2016-08-30 14:30:05 +02:00
Mike Jolley c4c863ffb0 Merge pull request #11792 from WPprodigy/price-filter-fix
Cast as decimal when querying prices
2016-08-30 11:48:51 +01:00
Mike Jolley 499e190efb Merge pull request #11785 from woothemes/coupon-exceptions
Coupon Exceptions and REST/CRUD improvements
2016-08-30 11:44:19 +01:00
Mike Jolley df35845d4d wc_get_coupon_id_by_code 2016-08-30 11:43:53 +01:00
Claudio Sanches f54ada22ba Merge pull request #11796 from webmandesign/patch-1
Making sure `wc_get_screen_ids` function exists
2016-08-29 14:48:06 -03:00
Claudio Sanches 81dd58e7c1 Merge pull request #11805 from woothemes/fix/misc-api-issues
Add some missing API pieces (settings & shipping zone endpoints)
2016-08-29 14:25:38 -03:00