Commit Graph

3070 Commits

Author SHA1 Message Date
doublesharp 8dae054e0c Update class-wc-addons-gateway-simplify-commerce.php
Use new $order->get_status() in lieu of legacy $order->status to support the new post_status format in WC 2.2
2014-10-18 01:04:40 -07:00
Mike Jolley fa38b34977 Merge pull request #6564 from krautnerds/rest-api-filter-by-product-cat
REST API 2.0: Add possibility to filter products by product_cat
2014-10-17 16:36:44 +01:00
Florian Ludwig 671fcde079 Changed filter name and some code style compliance 2014-10-17 17:34:26 +02:00
Mike Jolley bc0cb6fc53 Merge pull request #6566 from helgatheviking/add-to-cart-handler-2
add custom add to cart handler. update for #5923
2014-10-17 16:28:30 +01:00
Kathy Darling 41c5b18659 add custom add to cart handler. update for #5923 2014-10-17 17:26:50 +02:00
Mike Jolley 8766cfa6df Tweak woocommerce_get_price_html_from_to in #6455 2014-10-17 16:25:54 +01:00
Mike Jolley 2668f0b8dd Merge pull request #6455 from paulwilde/from-to-filters
Introduce filters to get_price_html_from_text() and get_price_html_from_to()
2014-10-17 16:25:16 +01:00
Mike Jolley 20279831e7 Tweak to naming in #6375 2014-10-17 16:24:21 +01:00
Kathy Darling 3d4a534e6a rename method to has_all_attributes_set 2014-10-17 17:24:04 +02:00
Mike Jolley 21784e80cd Merge pull request #6375 from dominic-p/settings-desc
Moved description and tip generation to a separate method
2014-10-17 16:19:02 +01:00
Florian Ludwig 29f152633b RESTAPI 2 Add possibility to filter by product_cat
For products it would be nice to be able to filter by product cat.

usage: filter[product_cat]=CATSLUG
2014-10-17 16:53:14 +02:00
James Koster e27d4afee1 data tabs tweaks. #6562 2014-10-17 14:50:23 +01:00
Mike Jolley ebea42f7ee Merge branch 'pr/6322'
Conflicts:
	.gitignore
2014-10-17 14:43:54 +01:00
Mike Jolley 10fc2f7321 Add separate meta box for wc endpoints 2014-10-17 14:42:35 +01:00
James Koster eb258950bd variations markup / css refactor. #6562 2014-10-17 12:17:30 +01:00
Mike Jolley 5ff8f65d1f Merge pull request #6507 from chrisnharvey/master
Pass cart item values to is_valid_for_product method in WC_Coupon
2014-10-17 12:09:23 +01:00
Mike Jolley d079a7a1a6 Merge pull request #6557 from SiR-DanieL/lost-psw
Fix lost password submitting twice
2014-10-17 11:54:46 +01:00
Tamara Zuk f34187d5d3 Allow for non-integer stock quantities
It looks like a3b522aff8 removed this
ability.
This would be very useful for extensions like Measurement Price
Calculator.
2014-10-17 00:52:56 -04:00
Nicola Mustone 6e9176a5bf Fix disable password submitting twice 2014-10-16 21:59:45 +02:00
Mike Jolley 0718aef09e wc_update_product_stock should update stock regardless, if the meta data doesn't currently exist
Fixes #6553
2014-10-16 17:15:10 +01:00
Mike Jolley 4234502265 Coupon API: Don't return current timestamp when expiry_date is not set
Fixes #6546
2014-10-16 16:59:51 +01:00
Mike Jolley dfa4f8b63a Merge pull request #6552 from Aaron3/patch-1
Fixed API create_order to allow setting line totals.
2014-10-16 16:53:18 +01:00
Mike Jolley 9fb4e1cee4 Merge pull request #6538 from krautnerds/rest-api-all-customer-fix
REST API 2.0 Add possibility to get all customers
2014-10-16 15:54:00 +01:00
Mike Jolley 1af90cd169 Only show integrations subnav when there are multiple integrations. 2014-10-16 15:53:12 +01:00
Mike Jolley 05d5849a67 Check mb_strtolower exists. 2014-10-16 15:53:12 +01:00
Mike Jolley 152105d334 Merge pull request #6548 from SiR-DanieL/patch-2
Fix potential bug
2014-10-16 12:15:17 +01:00
Aaron 0b557e175e Fixed API create_order to allow setting line totals.
$order->add_product expects totals without the `line_` prefix. See https://github.com/woothemes/woocommerce/blob/master/includes/abstracts/abstract-wc-order.php#L149

Without this, setting product coupons doesn't work correctly. (The coupon is saved to the order but no discounts are added to the product.)
2014-10-16 13:56:08 +03:00
Nicola Mustone 437e041d3d Fix potential bug
Added `default` to prevent notices and reordered the code.
2014-10-16 08:56:28 +02:00
Florian Ludwig e1039c127f Reworked code to be Wordpress code style compliant 2014-10-15 19:43:13 +02:00
mgiulio 8567f2f1fd Fix comment 2014-10-15 14:51:15 +02:00
Kathy Darling 0304778f18 add variation class method is_all_defined() which tests if all the attributes are set 2014-10-15 09:11:41 +02:00
Florian Ludwig 3a4cc14f62 Fixed intendation 2014-10-15 00:31:56 +02:00
Florian Ludwig 846c24d119 REST API 2.0 Add possibility to get all customers
usage similar to products and orders: filter[limit]=-1
2014-10-15 00:24:16 +02:00
Mike Jolley 44ad43216e Turn caching back on 2014-10-14 17:01:15 +01:00
Mike Jolley c01bc63020 Correct report handling for full and partial refunds.
Fixes #6530

@claudiosmweb look good?
2014-10-14 16:39:57 +01:00
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 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
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 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
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
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 4b30a2aed5 implementing emogrifier email css inliner 2014-10-08 15:34:31 -06:00
Patrick Rauland b5fb174697 adding emogrifier class for inlining email styles 2014-10-08 15:32:46 -06:00
Mike Jolley 666b25b352 Removed save_post remove_action call which breaks 3rd party plugins.
Fixes #6485, but means #6376 needs another solution.
2014-10-08 21:30:52 +01:00
Beka Rice de0e01f05b Fixes typos 2014-10-08 12:21:23 -04:00
Mike Jolley b041093194 [2.2] Added woocommerce_product_subcategories_hide_empty filter
Use add_filter( ‘woocommerce_product_subcategories_hide_empty’,
‘__return_true’ ); to enable. Fixes #6482
2014-10-08 15:19:54 +01:00
Mike Jolley 853e17d28f [2.2] Prevent address fields being empty when editing an address within an order
Fixes #6476
2014-10-08 15:13:26 +01:00
Mike Jolley 8d38401d64 [2.2] Product attribute shortcode should return columns class
Fixes #6481
2014-10-08 15:07:03 +01:00
Mike Jolley e9393ddaf7 Settings API should use h3 rather than h4 when outputting titles 2014-10-08 15:06:38 +01:00
75nineteen Media f57de2cf9a Added two hooks to support refund Followup Emails 2014-10-07 15:58:21 -07:00
Mike Jolley c6c5265493 Conflict 2014-10-07 11:10:29 +01:00
Mike Jolley 3f6e6309be define $view 2014-10-07 11:09:42 +01:00
Mike Jolley 80716fbd46 Corrected get_return_url docblock 2014-10-07 11:09:38 +01:00
Mike Jolley 8c3d142002 define $transients_to_clear 2014-10-07 11:09:35 +01:00
Mike Jolley 615ebc3916 is_GB_postcode define array 2014-10-07 11:09:32 +01:00
Mike Jolley 742594e207 Tweaks to order class 2014-10-07 11:09:29 +01:00
Mike Jolley 58904fcf83 Removed deprecated get_product() calls 2014-10-07 11:09:25 +01:00
Mike Jolley 090ab4a56d Tweaks to report class 2014-10-07 11:09:22 +01:00
Mike Jolley ac14427c32 get_order_report_data should return string 2014-10-07 11:09:19 +01:00
Mike Jolley 1de3b8a034 Set default $query 2014-10-07 11:09:16 +01:00
Mike Jolley d52664d738 Tweak report debug output - add pre 2014-10-07 11:09:12 +01:00
Mike Jolley 98ec3da5ac Merge pull request #6472 from thenbrent/edit_order_currency
Display order & item totals with correct currency on Edit Order screen
2014-10-07 10:16:16 +01:00
thenbrent 66cbf9f3a3 Tabs & spaces 2014-10-07 15:16:59 +10:00
thenbrent 6869403a39 Disable autosave for all order types w/ meta boxes 2014-10-07 15:13:56 +10:00
thenbrent 94355b73dc Display order & item totals with correct currency
If a store changes currency or is using an extension which allows for
purchasing in multiple currencies, the currency symbol displayed on the
Edit Order admin screen may be incorrect for previous orders because
it uses the `wc_price()` fallback, which is the site wide currency
rather than the currency for that specific order. This fixes that.
2014-10-07 09:59:52 +10:00
Mike Jolley 589da28f42 Small tweak on text in #6457 2014-10-06 14:31:32 +01:00
Mike Jolley 83d8eb7fd8 Merge pull request #6457 from bryceadams/master
Re-do coupon free shipping option desc issue #6391
2014-10-06 14:29:16 +01:00
Mike Jolley 46a753cb74 [2.2] Unhook save_meta_boxes after first successful run to prevent race conditions
Fixes #6376
2014-10-06 14:26:22 +01:00