Commit Graph

27573 Commits

Author SHA1 Message Date
Mike Jolley c9d90353ef
Merge pull request #18633 from woocommerce/update/git-attributes
Exclude CODE_OF_CONDUCT.md and package-lock.json from the release .zip files
2018-01-29 13:53:28 +00:00
Mechiel Couvaras 8d6f434ba0
Update Klarna URL to relevant versions
Updating Klarna URL to point to the relevant product page (region specific) on WooCommerce.com
2018-01-29 15:40:53 +02:00
Rodrigo Primo e368a4e541 Exclude CODE_OF_CONDUCT.md and package-lock.json from the release .zip files 2018-01-29 10:18:57 -02:00
Patrick Garman fd3a39345f
Return amount refunded as a float
An amount refunded should be numeric, I was receiving pHP notices that a non numeric value was encountered. Seems this is something potentially new as of PHP 7.1? Is there any reason we should **not** return a float here? Any null or empty response from the SQL query would be 0, which would still be accurate for the total that was refunded for that order.

```2018/01/27 16:50:50 [error] 46797#0: *2930 FastCGI sent in stderr: "PHP message: PHP Warning:  A non-numeric value encountered in /wp-content/plugins/woocommerce/includes/admin/meta-boxes/views/html-order-items.php on line 212
PHP message: PHP Stack trace:
PHP message: PHP   1. include() /cms/wp-admin/post.php:174
PHP message: PHP   2. do_meta_boxes() /cms/wp-admin/edit-form-advanced.php:714
PHP message: PHP   3. WC_Meta_Box_Order_Items::output() /cms/wp-admin/includes/template.php:1063
PHP message: PHP   4. include() /wp-content/plugins/woocommerce/includes/admin/meta-boxes/class-wc-meta-box-order-items.php:41```
2018-01-27 17:07:20 -06:00
Chunkford e831406d9f
Display zero value when using shipping classes
When offering free shipping on certain products via a shipping class, the price (albeit zero value) isn't shown to the end user.
https://www.screencast.com/t/8oT7maIftTZo

It makes for a better user experience to actually show the 0.00 price to ensure there isn't any doubt.
https://www.screencast.com/t/mkrKWNItrI5r
2018-01-27 13:25:24 +00:00
Rodrigo Primo 9c4c006baa Fix: set orderby and order when calling WC_Customer_Download_Data_Store::get_downloads()
This commit fixes a bug in WC_Customer_Download_Data_Store::get_downloads() that made impossible to change the order in which the query returned the results. This method accepts the arguments `order_by` and `order` but it was ignoring them and always using the default values ('permission_id' and 'ASC' respectively).

One of the assertions of the WC_Customer_Download_Data_Store::get_downloads() test method was modified to make sure the code now works.

This bug was introduced by commit a443419.
2018-01-26 15:55:13 -02:00
Rodrigo Primo 07d00fc58e Make WC_Customer_Download() tests a bit faster
This commit simplifies WC_Customer_Download() tests by using hardcoded values for customer ID and e-mail instead of touching the database and creating a real customer for each test.
2018-01-26 15:44:23 -02:00
Claudiu Lodromanean 021734d97b
Merge pull request #18619 from woocommerce/fix/18607
Correctly sanitize posted attributes when JS is off.
2018-01-26 08:24:21 -08:00
Mike Jolley e56b007af1 Correctly sanitize posted attributes when JS is off. 2018-01-26 16:11:53 +00:00
Claudiu Lodromanean 1627cbd8eb
Merge pull request #18618 from woocommerce/fix/18613
Cast min, max, and value to int
2018-01-26 07:58:30 -08:00
Claudiu Lodromanean 3f5d82b4c4
Merge pull request #18617 from woocommerce/fix/18615
Enforce columns in shortcodes
2018-01-26 07:56:32 -08:00
Mike Jolley 2d952b1597 base 10 2018-01-26 15:54:34 +00:00
Mike Jolley 36bce5f939 Cast min, max, and value to int
Fixes #18613
2018-01-26 15:53:23 +00:00
Claudiu Lodromanean 18f9bb408f
Merge pull request #18604 from woocommerce/update/thumbnails
Tweak thumbnails + intermediate sizes
2018-01-26 07:47:56 -08:00
Mike Jolley 4378bd6df1 Enforce columns in shortcodes 2018-01-26 15:15:06 +00:00
Mike Jolley 29760cfdb8
Merge pull request #18612 from woocommerce/fix/18610-coupon-user-limit-admin-area
Coupon usage check against customer not logged in user in admin
2018-01-26 15:03:01 +00:00
Mike Jolley a5a3f2149b Regen missing images 2018-01-26 14:54:26 +00:00
Mike Jolley 4edd65c124 1 resize per batch 2018-01-26 14:31:27 +00:00
Mike Jolley 06e84b7af3 Merge image meta data 2018-01-26 13:35:11 +00:00
Mike Jolley 4a3124ba46 Update batch per task 2018-01-26 12:36:07 +00:00
Mike Jolley 626b8baebc MAGICK_THREAD_LIMIT fix for timeouts 2018-01-26 12:17:41 +00:00
Gerhard Potgieter 97ca671efa Validating user usage limit should check that of customer and not logged in user when applying coupons in admin area. 2018-01-26 12:37:23 +02:00
Gerhard Potgieter 057c87c457 Add missing woocommerce_update_options_ action for settings classes save methods overridden from parent. 2018-01-26 11:22:09 +02:00
Claudiu Lodromanean be7ad7f234
Merge pull request #18599 from woocommerce/fix/18573
[REST API] Refund line items are read-only
2018-01-25 11:34:30 -08:00
Rodrigo Primo 52eb803e81 Serve WC core copy of the WC logo instead of WC.com copy
This commit changes the URL of the WC logo displayed in the WooCommerce.com Subscriptions page inside WooCommerce admin to use an image served from WC core instead of WC.com.
2018-01-25 16:46:31 -02:00
Rodrigo Primo 526db5faf8 PHPCS fixes 2018-01-25 16:43:07 -02:00
Mike Jolley 3bc3e4038a
Merge pull request #18603 from woocommerce/fix/woothemes-font-url
Fixes URL in Font SVG
2018-01-25 17:30:14 +00:00
Mike Jolley 674145a2e7 Tweak intermediate sizes 2018-01-25 17:27:50 +00:00
Jonathan Belcher c4d5dd9d55
Fixes URL in Font SVG 2018-01-25 12:15:06 -05:00
Mike Jolley 21dd70f6be
Merge pull request #18602 from woocommerce/fix/woothemes-link
Update WooThemes to WooCommerce
2018-01-25 17:10:26 +00:00
Jonathan Belcher eef5fa527e
Update WooThemes to WooCommerce 2018-01-25 12:09:34 -05:00
Mike Jolley ebde2d64fb phpcs 2018-01-25 17:03:54 +00:00
Mike Jolley 6e83fcec50 Sizes for 3 cols default 2018-01-25 17:03:01 +00:00
Stanislav Mazur c692c0a869 Make 'woocommerce_email_downloads_column_' hook format aware (#18598) 2018-01-25 18:04:17 +02:00
Claudio Sanches 47883d89ab Coding standards 2018-01-25 14:04:11 -02:00
Claudio Sanches e8b8e87cae [REST API] Refund line items are read-only
Closes #18573
2018-01-25 14:02:31 -02:00
Claudiu Lodromanean eade481164
Merge pull request #18592 from woocommerce/update/18586
Customizer tweaks
2018-01-25 07:54:38 -08:00
Mike Jolley 76a37fa0d2 Feedback 2018-01-25 15:14:02 +00:00
Mike Jolley de4ff9742c Revert debug code 2018-01-25 15:06:12 +00:00
Mike Jolley e0f8ff8f39 Revert "Prevent timeouts with option + reduce number of thumbnails generated by script"
This reverts commit a4b6110990.
2018-01-25 15:05:04 +00:00
Mike Jolley a4b6110990 Prevent timeouts with option + reduce number of thumbnails generated by script 2018-01-25 15:04:55 +00:00
Mike Jolley c7ccc93a69 Prevent timeouts with option + reduce number of thumbnails generated by script 2018-01-25 15:02:33 +00:00
Manos Psychogyiopoulos e5fe92778c Close optgroup :) 2018-01-25 16:56:16 +02:00
Manos Psychogyiopoulos 690c7a9753 Check if paying for an existing order before looking at cart contents
Resolves a bug causing this logic to ignore the `order-pay` query var presence if the cart is populated with items.
2018-01-25 16:42:54 +02:00
Manos Psychogyiopoulos d10987d813 Match saved (canonical) rate IDs against chosen rates
Generates canonical rate IDs (`method_id:instance_id`) from package rates and order shipping line items.

Requires https://github.com/woocommerce/woocommerce/pull/18483
2018-01-25 16:40:31 +02:00
Manos Psychogyiopoulos d86a948f04 Add method instances in COD, grouped by method 2018-01-25 16:37:10 +02:00
Manos Psychogyiopoulos 3dc5f2a277 Allow optgroup in settings multiselect fields 2018-01-25 16:35:30 +02:00
Alexander Minza 519bfadc63 Added support for additional HTML5 input types 2018-01-25 15:14:30 +02:00
Mike Jolley e2d553fb61
Merge pull request #18588 from woocommerce/fix/setup-wizard-copy-and-style-tweaks-for-wc-3-3
Setup wizard: various style and copy tweaks
2018-01-25 12:59:52 +00:00
Mike Jolley e85338d8d3 Import ratio from old settings 2018-01-25 12:34:28 +00:00