Commit Graph

9568 Commits

Author SHA1 Message Date
Barry Kooij b353c75d43 Display excluded categories in coupon error message.
Related #6400.
2014-10-14 16:18:31 +02:00
Barry Kooij 4371c661ec Codestyle. 2014-10-14 16:11:46 +02:00
Barry Kooij 6ea096ad42 Merge branches 'master' and 'master' of github.com:woothemes/woocommerce 2014-10-14 16:10:05 +02:00
Barry Kooij 389eae28c2 Display what products are excluded from using with a coupon.
Fixes #6400.
2014-10-14 16:09:56 +02:00
claudiosmweb 223957089e fixed the new WC_Order_Refund::init() 2014-10-14 10:46:30 -03:00
Mike Jolley 185021408d Merge pull request #6532 from woothemes/enhancement/6502
Added customer note to order details screen.
2014-10-14 14:40:08 +01:00
Mike Jolley 4954020877 Correct refund's init function 2014-10-14 14:31:31 +01:00
Mike Jolley e03cf9c204 Set order_type property, and move actual order loading to separate method to make it easier for sub-classes to handle just that process.
Closes #6513
2014-10-14 14:25:53 +01:00
Mike Jolley c2ce3b0d88 Tidy 2014-10-14 14:25:53 +01:00
Barry Kooij acf6644830 Confirm to user email is sent when sending email from within order edit screen.
Fixes #6461.
2014-10-14 15:18:09 +02:00
Barry Kooij 1af26ce928 Moved the wc-logs folder to the WP uploads folder.
Fixes #6509
2014-10-14 14:29:56 +02:00
Barry Kooij dadde1c1cf Merge branch 'master' of github.com:woothemes/woocommerce 2014-10-14 14:23:28 +02:00
Barry Kooij 19a68ee685 Changing the WC_LOG_DIR shouldn't fail the unit test. 2014-10-14 14:23:18 +02:00
Mike Jolley 3df2c39bf5 If order gets cancelled behind the scenes, don't clear user cart
#6524
2014-10-14 12:54:23 +01:00
Mike Jolley e90c634745 Code tidy 2014-10-14 12:54:10 +01:00
Mike Jolley e43285f677 [2.2] Fix /shop/ base URL Non Latin issue with url decode
Fixes #6512
2014-10-14 12:24:45 +01:00
Mike Jolley 4a2a2714f6 Make cart total consider taxes
Fixes #6522
2014-10-14 12:20:38 +01:00
Mike Jolley ea1d61b88e Use mb_strtolower to prevent issues with unicode chars
Fixes #6525
2014-10-14 11:58:28 +01:00
Mike Jolley 32c6ae37ed Fix $base notice in email template 2014-10-14 11:54:30 +01:00
Mike Jolley f2d668a6b6 Allow a delimiter to be set in $item_meta->display()
Fixes #6526
2014-10-14 11:54:20 +01:00
Mike Jolley 30edd0aa05 [2.2] Prevent notice if meta is not set Closes #6514 2014-10-14 11:26:14 +01:00
Barry Kooij 08f35b0e2f Added customer note to order details screen.
Fixes #6502
2014-10-14 11:13:24 +02:00
Mike Jolley 65d9fec4c8 Merge pull request #6520 from GeertDD/patch-1
Fix typo
2014-10-13 23:39:11 +01:00
Mike Jolley d68cab0eec In the US address format, use state code rather than the full state name. 2014-10-13 18:28:38 +01:00
Geert De Deckere b105a24cf8 Fix typo 2014-10-13 15:42:07 +02:00
Chris Harvey 4119e70b3c Setting values to an optional argument 2014-10-13 09:32:40 +01:00
claudiosmweb 61e96b0a8b Prevent warnings in WC_Shipping_Method::is_available() when exclude countries 2014-10-10 23:01:19 -03:00
claudiosmweb 86ef09970a Prevented warnings when countries is empty in shipping methods.
Stopped this erros:

PHP Warning:  array_intersect(): Argument #1 is not an array in
wp-content/plugins/woocommerce/includes/abstracts/abstract-wc-shipping-method.php
on line 182
PHP Warning:  in_array() expects parameter 2 to be array, null given in
wp-content/plugins/woocommerce/includes/abstracts/abstract-wc-shipping-method.php
on line 194

@mikejolley
2014-10-10 22:46:19 -03:00
Chris Harvey 00c77d1716 Accept cart item values in is_valid_for_product method and pass these to the woocommerce_coupon_is_valid_for_product filter 2014-10-10 15:45:01 +01:00
Chris Harvey 504253c909 Pass cart values to is_valid_for_product method 2014-10-10 15:44:18 +01:00
Mike Jolley b340fd68ae Made tax importer expand postcode ranges.
Closes #4463
2014-10-10 15:18:47 +01:00
Mike Jolley 38000b1785 Define WC tables in wpmu_drop_tables
Closes #5396
2014-10-10 14:48:08 +01:00
Mike Jolley bf885f846e Refactor - get_product_search_form().
Also removed < 2.1 deprecated filter mapping.

Closes #4444
2014-10-10 12:48:05 +01:00
Mike Jolley 98361804e6 Merge pull request #5767 from IAmJulianAcosta/touch-compability
Price filter widget touch compability
2014-10-10 12:16:18 +01:00
Mike Jolley f36cb8b53c [2.2] Make updater set parent backorder status
Closes #6494
2014-10-10 11:28:24 +01:00
Claudio Sanches c960edb640 Merge pull request #6503 from maxrice/6501-fix-failing-tests
Register post types before each unit test
2014-10-09 16:30:04 -03:00
Max Rice b06e1982c9 Register post types before each unit test
Fixes #6501

see
https://core.trac.wordpress.org/changeset/29860/trunk/tests/phpunit/incl
udes/testcase.php, apparently we were #doingitwrong  🙈
2014-10-09 15:24:37 -04:00
claudiosmweb bc1ea4fdea woocommerce_ prefix in refund actions, related #6477 2014-10-09 13:15:42 -03:00
Mike Jolley 5e07ec0382 $cart_totals should be checked to see if its an array
Closes #6496
2014-10-09 16:50:42 +01:00
Mike Jolley 5c1b931438 [2.2] Fix refund date.
Fixes #6499
2014-10-09 16:43:26 +01:00
Mike Jolley 4d084ed7ae Merge pull request #6477 from 75nineteen/master
[Maybe 2.2] Added two hooks to support refund Followup Emails
2014-10-09 15:56:17 +01:00
Mike Jolley cb631793c5 Merge pull request #6489 from BFTrick/css-inliner-2
Adding CSS Inliner
2014-10-09 15:55:57 +01:00
Mike Jolley 728086d175 Merge pull request #6324 from SiR-DanieL/reports-currency
Fixing currency position in reports
2014-10-09 12:39:20 +01:00
Mike Jolley 02f5ed7542 Merge pull request #6327 from SiR-DanieL/order-notes
Fixing order notes date
2014-10-09 12:39:00 +01:00
Mike Jolley 26186f815a Fix potential error if variation doesn't exist 2014-10-09 11:20:46 +01:00
Mike Jolley dc822594fd Merge pull request #6483 from bekarice/email-typos
Fixes typos
2014-10-08 23:06:42 +01:00
Patrick Rauland fd9b3feb52 changelog for email css inliner. :) 2014-10-08 16:01:53 -06:00
Patrick Rauland 24551df08f removing straggler CSS styles from email header template 2014-10-08 15:56:03 -06:00
Patrick Rauland e1f0b406f7 updating email header version number 2014-10-08 15:54:28 -06:00
Patrick Rauland 4b30a2aed5 implementing emogrifier email css inliner 2014-10-08 15:34:31 -06:00