Commit Graph

4130 Commits

Author SHA1 Message Date
Claudio Sanches 0c6e079690 Simplify commerce default payment mode as standard 2015-02-13 12:04:05 -02:00
Mike Jolley 2f2acc6964 Update dashboard report to show gross, after refunds 2015-02-13 13:53:03 +00:00
Mike Jolley 50322801e5 Sales by date handling for refunds
- Exclude refunds from gross/net
- Correct order counts
- Display refunded order and item count, plot after refunds
- Combine query functions for legend and main chart
2015-02-13 13:42:09 +00:00
Mike Jolley 55969390f0 Taxes by date handling for partial and full refunds 2015-02-13 13:42:09 +00:00
Mike Jolley 8f5ac9417c Taxes by code handling for partial and full refunds 2015-02-13 13:42:09 +00:00
Mike Jolley 857a78c2fc Include posts without parent in join so combinations of orders + refunds can be queried at the same time 2015-02-13 13:42:09 +00:00
Claudio Sanches 2dbfadd9fa Improved the WC_Geo_IP removing some not useful const and vars 2015-02-13 10:28:51 -02:00
Nicola Mustone ca3deba1c7 getting wrong ID 2015-02-13 11:00:41 +01:00
Mike Jolley f0d0fa9394 Auto-generation of slug when adding new attribute. 2015-02-12 23:25:10 +00:00
Mike Jolley 323faed337 Taxes by code - include refunds Closes #7397 2015-02-12 22:58:19 +00:00
Mike Jolley 62cb430eaa Run coupon codes through html_entity_decode.
Closes #7395
2015-02-12 22:50:22 +00:00
Mike Jolley e99b3a9bf8 limit_usage_to_x_items option in coupons.
Closes #7396
2015-02-12 22:39:40 +00:00
Claudio Sanches 5772356eb2 Re-added the woocommerce_breadcrumb_home_url filter 2015-02-12 18:34:40 -02:00
Mike Jolley c71bff2844 Only apply product/cat coupon checks for cart to cart coupons.
Closes #7389
2015-02-12 16:15:28 +00:00
Mike Jolley 0ef336d97c Change hooks used to output post columns - fixes columns after quick edit. 2015-02-12 14:26:00 +00:00
Mike Jolley 61ef1662b2 Merge branch 'master' of https://github.com/woothemes/woocommerce
Conflicts:
	readme.txt
2015-02-12 13:20:56 +00:00
Mike Jolley 2347af7e73 Typo in get_from_name method.
Closes #7388
2015-02-12 13:20:23 +00:00
Claudio Sanches 07537878f0 Fixed the indentation in includes/libraries/class-emogrifier.php 2015-02-12 09:42:15 -02:00
Claudio Sanches 455b27e125 Added alternative to mb_convert_encoding in Emogrifier, closes #7378 2015-02-12 09:40:41 -02:00
Claudio Sanches 1845049665 Revert "Add code to check if mb_convert_encoding function is exsited then can called it for emogrifier lib" 2015-02-12 09:36:12 -02:00
Mike Jolley 16e14914d8 Enqueue tracking js when needed only 2015-02-12 11:35:12 +00:00
Mike Jolley 1eb29d0acf Merge pull request #7386 from woothemes/tracking-duplicate-optins
Tracking duplicate optins
2015-02-12 11:30:14 +00:00
Mike Jolley 891016df28 Merge pull request #7379 from a3rev/master
Add code to check if mb_convert_encoding function is exsited then can called it for emogrifier lib
2015-02-12 11:09:45 +00:00
Mike Jolley 2a472e64e8 Only run the uninstaller if the "Uninstall on Delete" option is checked in system status. 2015-02-12 11:09:13 +00:00
Mike Jolley 8aa0e5ea24 Potential notice with preg_match wildcard search, if used incorrectly. 2015-02-12 10:53:53 +00:00
Gerhard f0dbb72437 Add 10min buffer to override tracking calls. 2015-02-12 11:58:04 +02:00
Gerhard 1ac68adf20 Hide the tracker notice once clicked to avoid double clicks. 2015-02-12 11:41:04 +02:00
a3rev 0137249175 Add code to check if mb_convert_encoding function is exsited then can called it for emogrifier lib 2015-02-12 12:38:50 +07:00
Mike Jolley 77716b1c1f attribute_public option. 2015-02-12 00:31:32 +00:00
Mike Jolley 30abed2f9e Merge pull request #7375 from tamarazuk/rating-count-fix
Fix average product rating when ratings are not required
2015-02-12 00:04:26 +00:00
Mike Jolley 518cca7326 WC_TEMPLATE_DEBUG_MODE in admin.
Fixes #7336
2015-02-11 23:32:27 +00:00
Mike Jolley d2040eca4d When updating shipping in cart, keep shipping calculator in DOM. 2015-02-11 23:25:31 +00:00
Mike Jolley 1f9b9c0ae0 When ratings are required for reviews, ensure validation is performed if the rating element is removed from DOM.
Closes #7371
2015-02-11 23:06:18 +00:00
Tamara Zuk 7eaae2d561 Fix average product rating when ratings are not required
If ratings are not required, the total rating count was counting all
reviews which skewed the average rating. In other words, reviews with
no rating were counted as a “zero” rating in the average rating
calculation. This bug was introduced in
83a457b29c which provided a fix for #6839.

This change introduces a new product method `get_review_count()` which
can be used to accurately calculate the total number of reviews for a
product. Some instances of `get_rating_count()` were replaced with
`get_review_count()` where appropriate. Additionally, the
`single-product/rating.php` template was adjusted to display the
correct number of customer reviews and ratings in rich snippets. I’ve
also included the `bestRating` rich snippet detailed
[here](http://schema.org/AggregateRating). The version number was
adjusted to 2.3.2 on that template as I think this is a larger change.
2015-02-11 17:55:16 -05:00
Mike Jolley bce209c21d Flat rate extra costs when costs are an array. 2015-02-11 22:24:13 +00:00
Mike Jolley afff86c033 Pass correct shipping cost to PayPal. 2015-02-11 22:17:58 +00:00
Mike Jolley 43c24feffd Item meta removal query in order class. 2015-02-11 22:14:24 +00:00
Claudio Sanches 3593df34b3 Merge pull request #7367 from woothemes/wc-geo-ip
WC_Geo_IP class
2015-02-11 16:04:56 -02:00
Claudio Sanches caed859f99 Removed the old geoip class 2015-02-11 16:03:54 -02:00
Mike Jolley f57b26cbe6 is_available() check in local pickup. 2015-02-11 18:02:44 +00:00
Claudio Sanches 3a9e459b2c Created WC_Geo_IP_Record class 2015-02-11 15:57:16 -02:00
Claudio Sanches 5389dc3812 Created WC_Geo_IP class 2015-02-11 15:51:50 -02:00
Mike Jolley bcb3e82567 Merge pull request #7366 from pbogdan/fix-wc-cart-tax-back-compat
Fix backward compatibility for $tax intance variable of WC_Cart.
2015-02-11 17:46:23 +00:00
Mike Jolley 7c28ea2e2d Merge pull request #7364 from SiR-DanieL/patch-4
Target _blank to the Storefront read more button
2015-02-11 17:23:04 +00:00
Mike Jolley 334ee4c108 Fix - [products] ids and sku args.
Closes #7365
2015-02-11 17:21:53 +00:00
Nicola Mustone 78bd357f56 missing _e 2015-02-11 18:15:00 +01:00
Nicola Mustone 5cab9f5f2a escape & 2015-02-11 18:14:03 +01:00
Nicola Mustone 2e6b571f09 added target _blank to the Storefront read more button 2015-02-11 18:12:18 +01:00
Piotr Bogdan 9d75ad17e8 Fix backward compatibility for WC_Cart::$tax. 2015-02-11 17:06:17 +00:00
Mike Jolley 44aa8339b2 Fix - attribute_public notice before DB upgrade. 2015-02-11 17:01:14 +00:00
Mike Jolley 4c7297c3b1 Merge pull request #7363 from tamarazuk/master
[2.3] Avoid a notice if select has no options
2015-02-11 16:50:51 +00:00
Mike Jolley c46f7f236d When the geolocation database cannot download, ensure the correct method is used to log the error. 2015-02-11 16:47:52 +00:00
Tamara Zuk bd8a57eb32 Avoid a fatal error if select has no options 2015-02-11 11:30:52 -05:00
Mike Jolley bc2af10cc6 Update languages and geolocation when installed 2015-02-11 14:38:55 +00:00
Barry Kooij 14598bfd40 Typos 2015-02-11 15:16:36 +01:00
Barry Kooij 6cd77ea3b1 Typo fix 2015-02-11 15:14:42 +01:00
Mike Jolley 9afa2848d7 woocommerce_remove_cart_item_from_session with $key and $values
@helgatheviking

$this isn’t needed - WC()->cart to access cart class.
2015-02-11 12:30:54 +00:00
Claudio Sanches 050286add6 Updated the changelog for 1452bde 2015-02-11 10:13:36 -02:00
Guillermo Gette a95591502e #7359 filter api results by a list of ids 2015-02-11 22:51:56 +11:00
Mike Jolley b7750e6e6b Merge pull request #7358 from helgatheviking/fix/action-on-remove-from-cart-session
trigger an action if an item is dropped from the cart session
2015-02-11 11:26:02 +00:00
Mike Jolley 19b6350afc Changelog code should ignore WC core 2015-02-11 11:21:31 +00:00
Kathy Darling 39fcc19ff6 trigger an action if an item is dropped from the cart session 2015-02-11 12:12:27 +01:00
Mike Jolley 124dac4a24 Merge pull request #7355 from woothemes/better-ip-check
Better proxy server support for get_ip_address
2015-02-11 10:41:44 +00:00
Gerhard 2339f5aee9 Better proxy server support for get_ip_address 2015-02-11 12:07:12 +02:00
Brent Shepherd f1fa927f57 Fix WC_Order::payment_complete() on back-end
SHA: c038001eab changed `WC_Abstract_Order::payment_complete()` to use
WC()->session->set( 'order_awaiting_payment' ) instead of
`WC()->session->order_awaiting_payment`, but `WC()->session` is only
set on front-end requests, meaning any extension that tries to complete
payment on an order from the back-end would cause a fatal error.
2015-02-10 16:55:47 -08:00
Mike Jolley 3a4e9c0d7f Report should include refunded status orders
Fixes #7343
2015-02-10 18:24:46 +00:00
Claudio Sanches 7fd1c539a7 Merge branch 'master' of github.com:woothemes/woocommerce 2015-02-10 14:44:40 -02:00
Claudio Sanches 22c4f02bbf Used filtered comment for woocommerce_new_customer_note action, closes #7349 2015-02-10 14:44:28 -02:00
Claudio Sanches 9f7683e81b Merge pull request #7348 from RistoNiinemets/master
add input_class to all form field types
2015-02-10 14:38:36 -02:00
Claudio Sanches 736ed330c8 Fixed a typo in the frontend colors notice 2015-02-10 14:08:05 -02:00
Claudio Sanches af99be8ffc Improved the tracking notice 2015-02-10 14:01:51 -02:00
Risto Niinemets 215bb8841d add input_class to all form field types 2015-02-10 17:41:34 +02:00
Claudio Sanches 0558c3c286 Added woocommerce_product_get_rating_html filter for WC_Product class, closes #7337 2015-02-10 13:01:04 -02:00
Claudio Sanches edac0b00c7 Fixed the remote post and get messages in status report 2015-02-10 12:16:25 -02:00
Claudio Sanches 6ca681ce86 Added new filters to help translation plugins, closes #7338 2015-02-10 10:51:44 -02:00
Mike Jolley 840efcaa00 is_on_sale should compare type Fixes #7344 2015-02-10 12:34:53 +00:00
Mike Jolley d93d00271d Use WP hook so we have access to query vars
Fixes #7341
2015-02-10 12:23:15 +00:00
Mike Jolley 78be4ad128 Upgrade routine for woocommerce_default_customer_address
Closes #7334
2015-02-10 11:49:09 +00:00
Mike Jolley 893babaaef woocommerce_product_get_weight filter Closes #7319 2015-02-10 11:18:38 +00:00
James Collins 7e20fb9a3d Use wc_clean to trim and sanitize external IP
As per suggestion from @claudiosmweb, wc_clean() is more full featured than trim().

See #7335
2015-02-10 07:54:26 +08:00
James Collins 9c79a18edd Merge branch 'master' into geolocation-external-ip-fix 2015-02-10 07:40:32 +08:00
James Collins b5cc22e8f5 Geolocation: strip whitespace when obtaining external IP
The "ip.appspot" service returns an IP address plus a  new line character in its response.

An example response from "ip.appspot" is:

```123.123.123.123\n```

This fix strip whitespace from the response before proceeding.
2015-02-09 14:00:05 +08:00
James Collins 0bbb4464ab Fix 2 undefined index notices when editing/saving a product
Fixes:

Notice: Undefined index: upsell_ids in /wp-content/plugins/woocommerce/includes/admin/meta-boxes/class-wc-meta-box-product-data.php on line 1202
Call Stack
#	Time	Memory	Function	Location
1	0.0110	486692	{main}( )	../post.php:0
2	4.7790	60047856	edit_post( ??? )	../post.php:229
3	4.7917	60075016	wp_update_post( ???, ??? )	../post.php:321
4	4.7930	60089156	wp_insert_post( ???, ??? )	../post.php:3572
5	4.9212	60223012	do_action( ???, ???, ???, ??? )	../post.php:3499
6	4.9213	60224380	call_user_func_array ( ???, ??? )	../plugin.php:496
7	4.9213	60224412	WC_Admin_Meta_Boxes->save_meta_boxes( ???, ??? )	../plugin.php:0
8	7.2460	60224516	do_action( ???, ???, ??? )	../class-wc-admin-meta-boxes.php:207
9	7.2539	60199340	call_user_func_array ( ???, ??? )	../plugin.php:496
10	7.2890	60735660	WC_Meta_Box_Product_Data::save( ???, ??? )	../plugin.php:0

( ! ) Notice: Undefined index: crosssell_ids in /wp-content/plugins/woocommerce/includes/admin/meta-boxes/class-wc-meta-box-product-data.php on line 1203
Call Stack
#	Time	Memory	Function	Location
1	0.0110	486692	{main}( )	../post.php:0
2	4.7790	60047856	edit_post( ??? )	../post.php:229
3	4.7917	60075016	wp_update_post( ???, ??? )	../post.php:321
4	4.7930	60089156	wp_insert_post( ???, ??? )	../post.php:3572
5	4.9212	60223012	do_action( ???, ???, ???, ??? )	../post.php:3499
6	4.9213	60224380	call_user_func_array ( ???, ??? )	../plugin.php:496
7	4.9213	60224412	WC_Admin_Meta_Boxes->save_meta_boxes( ???, ??? )	../plugin.php:0
8	7.2460	60224516	do_action( ???, ???, ??? )	../class-wc-admin-meta-boxes.php:207
9	7.2539	60199340	call_user_func_array ( ???, ??? )	../plugin.php:496
10	7.2890	60735660	WC_Meta_Box_Product_Data::save( ???, ??? )	../plugin.php:0
2015-02-09 11:51:33 +08:00
Bryce deb4acd5a2 Return (first) role of user in customer API endpoint 2015-02-07 13:08:48 +07:00
Mike Jolley 0939cf0e01 Fix product cats notice Closes #7298 2015-02-05 11:36:33 +00:00
Mike Jolley f5ff10711d Merge pull request #7297 from shivapoudel/docblocks
Docblocks Fixes
2015-02-05 11:23:06 +00:00
Claudio Sanches 1a38cecb8c Merge pull request #7305 from bryceadams/patch-7302
Fix notice when invalid order id / email used
2015-02-05 06:49:20 -02:00
Claudio Sanches 0749fe752d Merge pull request #7304 from bryceadams/patch-7301
Fix fatal error on /my-account/view-order/ endpoint
2015-02-05 06:48:37 -02:00
Claudio Sanches 00916b9e29 Merge pull request #7303 from mattallan/matt/wc-api-orders-tweaks
WC_API_Orders: pass data var to new wrappable api function.
2015-02-05 06:46:34 -02:00
Bryce d36af4b721 Fix notice when invalid order id / email used
We also need to check if the $order object exists. Closes #7302
2015-02-05 13:03:13 +07:00
Bryce 888622a621 Fix fatal error on /my-account/view-order/ endpoint
When no order number is set this causes a fatal error. This check for
the $order object should be sufficient.

Closes #7301
2015-02-05 12:55:33 +07:00
matttallan 6531eb0373 pass data var to wrappable api function. 2015-02-05 15:43:05 +10:00
shivapoudel dcdf00e06f Cleanup WC_Admin_Permalink_Settings 2015-02-04 22:12:06 +05:45
shivapoudel d6b44d9369 Docblocks cleanup for WC_Post_types 2015-02-04 21:59:14 +05:45
shivapoudel fa6a99bd1d Docblocks cleanup for WC_Frontend_Scripts 2015-02-04 21:52:33 +05:45
shivapoudel cb57c7e709 Docblocks cleanup for WC_Comments 2015-02-04 21:44:42 +05:45
Mike Jolley 782aa34808 Merge pull request #7291 from bryceadams/patch-7289
Allow people to override roles when querying customers API
2015-02-04 15:20:48 +00:00
Mike Jolley 7795f69f51 Update wording to include refunds
Closes #7290
2015-02-04 15:14:02 +00:00
Mike Jolley 3154b08d3e Replace CDN select2 with local copy
Closes #7287
2015-02-04 15:00:14 +00:00
Mike Jolley 2a877eb562 Do a db query to flush spent and count which may be incorrect/outdated
Closes #7286
2015-02-04 14:22:15 +00:00
Mike Jolley 3691a8fdfb Fix thumbnail notice
Closes #7292
2015-02-04 14:04:02 +00:00
Mike Jolley 5bb4b7739f Fix IDS param Closes #7288 2015-02-04 12:44:30 +00:00
Bryce 1e9349a585 Remove $wpdb and $blog_id 2015-02-04 19:33:25 +07:00
Bryce d0e0a6be6b Change so only single role can be set in role param 2015-02-04 19:31:14 +07:00
Bryce 0f927acdd3 Allow people to override roles when querying customers API
Just fixing core
and closes #7289
2015-02-04 18:59:25 +07:00
Mike Jolley 6af80f8e60 Merge pull request #7280 from mattallan/matt/wc-api-orders-tweaks
Some more tweaks to WC API Orders
2015-02-04 11:46:33 +00:00
Mike Jolley 7b294c7cbf Prevent meta boxes being saved multiple times 2015-02-04 11:35:02 +00:00
matttallan e5c3385d3b Change private wc-api method to protected.
Mainly so that it can be used in the new Subscriptions API :)
2015-02-04 11:38:38 +10:00
matttallan f3fbbdeecc Use validate_request() to avoid duplicate code. 2015-02-04 11:38:36 +10:00
matttallan cd085f2adc add an overrideable function to a create custom post.
Especially handy for WC Subscriptions seeing as they extend the Abstract
Order Class.
2015-02-04 11:16:11 +10:00
matttallan c2520a528b changes to avoid writing duplicated code 2015-02-04 09:59:02 +10:00
Mike Jolley b2e979640c Removed unused vars 2015-02-03 16:24:01 +00:00
Mike Jolley ffd512a55e Why assign $the_product to itself? 2015-02-03 16:14:56 +00:00
Mike Jolley 037242a9a2 More docblock tweaks 2015-02-03 16:03:28 +00:00
Mike Jolley 55baf7b60a Missing properties 2015-02-03 15:55:51 +00:00
Mike Jolley 35f006d282 This can return a bool 2015-02-03 15:55:40 +00:00
Mike Jolley 9bc1b09fc5 Undefined and dead variables in checkout class 2015-02-03 15:27:40 +00:00
Mike Jolley 0300ce2768 Undefined and dead variables in cart class 2015-02-03 15:23:25 +00:00
Mike Jolley 133e85560f Dead var 2015-02-03 15:08:54 +00:00
Mike Jolley 27a7a58e8c Can return wp_error 2015-02-03 15:08:36 +00:00
Mike Jolley c01fe87d69 Cast to array 2015-02-03 15:06:15 +00:00
Mike Jolley 74abdf27c9 Cast to array 2015-02-03 15:06:08 +00:00
Mike Jolley 03cf7fa572 Fix potential notice 2015-02-03 14:57:04 +00:00
Mike Jolley 2809986fcf Dead var 2015-02-03 14:56:01 +00:00
Mike Jolley c814a9fa23 docblock corrections 2015-02-03 14:44:57 +00:00
Mike Jolley 1ef8a24ec9 These should be default_attr, not attribute 2015-02-03 14:44:57 +00:00
Mike Jolley 84fad56258 No return needed 2015-02-03 14:44:57 +00:00
Mike Jolley f032a9c7dd Missing props 2015-02-03 14:44:57 +00:00
Mike Jolley caff5c3a66 Remove dead var api_class 2015-02-03 14:44:57 +00:00
Mike Jolley 10a819bd45 Use coupon_amount in api 2015-02-03 14:44:57 +00:00
Scrutinizer Auto-Fixer de06d17c6d Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-02-03 14:32:10 +00:00
Mike Jolley a54b9c61e2 Define coupon magic props 2015-02-03 14:20:46 +00:00
Mike Jolley 81515fddbe Incorrect api docblock 2015-02-03 14:17:49 +00:00
Mike Jolley 4c3a58c957 Undefined product_ids_titles 2015-02-03 14:12:48 +00:00
Mike Jolley fc826de960 Dead vars in category report 2015-02-03 14:12:04 +00:00
Mike Jolley ff2b0db69b Undefined var customers 2015-02-03 14:10:03 +00:00
Mike Jolley 7acfc0b7f2 Dead var 2015-02-03 14:09:54 +00:00
Mike Jolley 7694f8039c Dead vars when saving variations 2015-02-03 14:08:43 +00:00
Mike Jolley f93e027b09 validate_multiselect_field had dead var 2015-02-03 14:05:09 +00:00
Mike Jolley 447ee6e7bb Docblocks 2015-02-03 14:02:38 +00:00
Mike Jolley c11d283ddc Still trying to get scruit to pick up these variables. Testing a few variations. 2015-02-03 13:49:04 +00:00
Mike Jolley f711ef32ce Missing bracket in previous commit #copypastefail 2015-02-03 13:16:41 +00:00
Mike Jolley 7c019c0c50 More docblocks; the check for WP_POST isn't needed as the second case (isset) runs regardless and is true for posts 2015-02-03 13:13:07 +00:00
Mike Jolley c038001eab Docblocks for order/product 2015-02-03 12:57:08 +00:00
Mike Jolley dc5b8d9710 @var 2015-02-03 12:28:15 +00:00
Mike Jolley 52c84f407c Fix download save after adding with ajax 2015-02-03 10:57:43 +00:00
Mike Jolley 086d0195ce Download should expire at midnight Fixes #7269 2015-02-03 10:57:43 +00:00
Mike Jolley d68dc3c6e0 Merge pull request #7272 from bryceadams/patch-7270
Fix 5.2 func_args issue
2015-02-03 10:22:07 +00:00
Mike Jolley d46158cc8a Merge pull request #7271 from michaeltieso/patch-1
Customer New Account message clarification
2015-02-03 10:06:52 +00:00
Bryce e6038486d9 Fix 5.2 func_args issue 2015-02-03 11:06:50 +07:00