Commit Graph

16922 Commits

Author SHA1 Message Date
Mike Jolley f4b45001ec Merge conditonal 2016-08-09 11:17:47 +01:00
Mike Jolley b7dcd97572 Sanitize on set only 2016-08-09 11:16:54 +01:00
Mike Jolley 01a4c81094 Spacing 2016-08-09 11:16:13 +01:00
Mike Jolley 4ac4bcaa08 Merge branch 'master' into WC-CRUD
# Conflicts:
#	tests/unit-tests/cart/cart.php
2016-08-09 11:08:21 +01:00
Mike Jolley ddf90f6268 Merge pull request #11649 from woothemes/fix/batch-api-typo
Fix Error Typos/Make Errors Consistent
2016-08-09 10:19:10 +01:00
Justin Shreve 2d0aeec5c5 Fix customer batch error 2016-08-08 14:54:12 -07:00
Justin Shreve fe7e26d68d Error fixes:
* Typos
* Consistent edit error handles
* Consistent error messages
2016-08-08 14:52:46 -07:00
Mike Jolley ab721f2d4a Merge pull request #11643 from jobthomas/update-copy-help
Update copy help
2016-08-08 17:33:46 +01:00
Job f5e45d254e update woothemes > woocommerce
changes in the help tab

WooThemes Helpdesk > WooCommerce Helpdesk
2016-08-08 15:37:30 +02:00
Job 44ab9bde0d Merge remote-tracking branch 'woothemes/master' 2016-08-08 15:31:55 +02:00
Mike Jolley cfe28c9b25 Made WC_Logger pluggable via wc_get_logger function.
Closes #11474
2016-08-08 13:59:23 +01:00
Mike Jolley 87443763d8 Hook in the no products found template
Closes #11257

cc @jameskoster
2016-08-08 13:43:42 +01:00
Mike Jolley 40d395c16c Merge pull request #11629 from woothemes/price-inc-tax-hell-11626
Prices including taxes and what gets stored/presented.
2016-08-08 12:17:36 +01:00
Mike Jolley 48f52af35d Merge pull request #11632 from nathanielks/patch-1
Update class-wc-form-handler.php
2016-08-08 12:16:19 +01:00
Mike Jolley 5eaee825f1 Ensure page_object is valid
Closes #11641
2016-08-08 12:14:41 +01:00
Mike Jolley 4a8db96c91 [2.6][api] ID needs to be capitalized
Sorting won’t work with lowercase id

Fixes #11635

@claudiosmweb
2016-08-08 12:10:29 +01:00
Mike Jolley 61e2969b83 [2.6][API] Fix coupon description field
fixes #11633
2016-08-08 11:27:07 +01:00
Mike Jolley 92f7244c63 Merge pull request #11636 from kilbot/master
initialize $tax_rates variable
2016-08-08 10:37:01 +01:00
Paul Kilmurray 4484877481 initialize $tax_rates variable
There are situations where the $tax_rates may not be initialized in the conditional, which in turn throws an error later in the function.
2016-08-08 10:36:04 +07:00
Nathaniel 92b28baeb4 Update class-wc-form-handler.php
As a user, I would expect to be returned to the Edit Address page as opposed to the My Account page.
2016-08-06 11:54:44 -07:00
James Koster 122bcd5f9a Remove unnecessary `!important`s in css and explain ones that are necessary. closes #11415 2016-08-05 15:48:16 +01:00
Mike Jolley 3f93886cb9 Merge pull request #11628 from JeroenSormani/patch-1
Focus on modal, enable esc-close + init tooltips
2016-08-05 15:45:18 +01:00
Mike Jolley 1c592b3872 Merge pull request #11208 from woothemes/orders-crud-classes
Orders crud classes
2016-08-05 15:44:15 +01:00
Mike Jolley 0b04ee195c Over sanitization 2016-08-05 15:43:12 +01:00
Mike Jolley 63fb1304fd Readme 2016-08-05 15:07:14 +01:00
Mike Jolley c346a1b711 Merge pull request #11540 from woothemes/tax-rate-auto-ordering
Automatic Tax Rate Sorting
2016-08-05 15:06:03 +01:00
James Koster 8708273401 review meta template tidy up. closes #11417
* Adds class for ‘comment awaiting approval’ message
* Replaces ‘comment’ for ‘review’ in aforementioned message
* Adds class for author
* Adds class for review date
* Adds new-style class for verification notice
* Wraps dash in a span with new-style class
* Removes unnecessary colon
2016-08-05 14:41:02 +01:00
Mike Jolley 559e379faf Issues after audit 2016-08-05 14:23:01 +01:00
Mike Jolley 54256c4123 Round prices being saved to DB 2016-08-05 14:06:51 +01:00
Jeroen Sormani 052a277400 Focus on modal, enable esc-close + init tooltips
When opening the modal it doesn't allow you to close it with the ESC key unless you click on the modal first.
Focussing on the modal when its loaded resolves that.

Also adding tooltip initialisation so tooltips will show if they are present. I don't believe core is using tooltips in there right now, but I guess its useful for the future / 3rd party devs that may have a use for it (like me)
2016-08-05 14:15:38 +02:00
Mike Jolley 152134ed5e Add unit test for #11626 2016-08-05 12:11:35 +01:00
Mike Jolley ccad4d2df3 Merge pull request #11561 from woothemes/add/product-reviews-create-and-update
Add tests, create, update, delete, and batch to the Product Reviews API
2016-08-05 11:16:42 +01:00
Justin Shreve 59a68e11e3 Remove test for number of meta, since we don't delete extra meta bits anymore. The test for content is enough. 2016-08-04 13:17:53 -07:00
Justin Shreve e3b1f6dbc9 A few fixes to customer CRUD:
* Implement some missing legacy functions
* Stop calling legacy functions from some pages
* Prevent extra meta from being deleted, unless requested by the CRUD (was causing problems with user/customer)
* Prevent save when loading from session AND logged out
2016-08-04 13:13:07 -07:00
Justin Shreve f4353f6aa9 Don't save to the database if we are working with sessions, save to the session when save() is called instead. 2016-08-04 11:39:34 -07:00
Justin Shreve 47c299583d Merge pull request #11618 from woothemes/update/wp-admin-system-status
Update wp-admin's system status page to share backend code with the API
2016-08-04 10:55:19 -07:00
Mike Jolley 8867368b97 Fix unit tests 2016-08-04 17:24:23 +01:00
Mike Jolley a3ae757106 Make set/get_order_id methods private 2016-08-04 17:05:05 +01:00
Mike Jolley b0963ddb0d Merge pull request #11176 from woothemes/add/10954-shipping-zones-api
Add Shipping Zones API Endpoints.
2016-08-04 15:45:23 +01:00
Mike Jolley 387cd745c2 Add missing textdomains 2016-08-04 14:43:34 +01:00
Mike Jolley c61c08f405 Merge branch 'master' into tax-rate-auto-ordering
# Conflicts:
#	assets/css/admin.css
2016-08-04 14:06:52 +01:00
Mike Jolley 644cf79866 Move all query string vars to form in price widget using wc_query_string_form_fields
Closes #11593

@claudiosmweb @justinshreve look fine to you?
2016-08-04 13:37:39 +01:00
Mike Jolley 75895f71f9 made comparison strict
#11326
2016-08-04 13:09:21 +01:00
Mike Jolley 1bc9da3e91 Merge branch 'master' into WC-CRUD
# Conflicts:
#	includes/class-wc-coupon.php
2016-08-04 12:10:04 +01:00
Mike Jolley 8e6ca3effe Merge pull request #11107 from helgatheviking/sortable-select2
add drag and drop support to select2 inputs. closes #11106
2016-08-04 11:32:46 +01:00
Mike Jolley 1b71c1b0e7 Merge pull request #11619 from woothemes/fix/product-bulk-edit-webhook
Make sure product update webhook fires on bulk and quick edit.
2016-08-04 11:31:12 +01:00
Mike Jolley 475d8fc5ed [2.6] More password check to else block
Closes #11623
2016-08-04 11:27:41 +01:00
Mike Jolley c416a6d2d1 Merge pull request #11622 from WPprodigy/fix-responsive-category-images
Add responsive image markup for category thumbnails
2016-08-04 11:19:40 +01:00
Mike Jolley fea9a3bce8 Merge pull request #11615 from woothemes/variable-weight-display-10621
Show variable weights/dimensions even when parent values are not set.
2016-08-04 11:12:30 +01:00
Mike Jolley b0064bddf6 Remove boolval 2016-08-04 11:12:14 +01:00