Commit Graph

23476 Commits

Author SHA1 Message Date
Gareth McCumskey adcf83441b Re-adjusted all other style changes to better match back to project style requirements 2017-10-16 09:16:43 +02:00
Gareth McCumskey 96032fc771 Adjusted the formatting to better match the if's and endif's 2017-10-13 08:47:48 +02:00
Mike Jolley 5985089d49 Merge pull request #17170 from woocommerce/fix/17165
Revert order detail header behavior
2017-10-12 23:47:55 +01:00
claudiulodro 660d663149 Revert order detail header behavior 2017-10-12 10:58:04 -07:00
Mike Jolley 2f6246fbc2 Merge pull request #17163 from woocommerce/fix/email-address
Add email to email address template
2017-10-12 18:11:34 +01:00
Claudiu Lodromanean 0f9bd218ed Merge pull request #17160 from woocommerce/fix/17138
Use city and postcode count to determine sort order
2017-10-12 09:27:30 -07:00
Claudiu Lodromanean cd0eb65852 Merge pull request #17162 from woocommerce/fix/17150
Fixed discount logic to also look at parent categories when validatiing coupons
2017-10-12 09:19:14 -07:00
Claudiu Lodromanean a63c822d2d Merge pull request #17161 from woocommerce/fix/17158
Remove rounding in wc_remove_number_precision
2017-10-12 08:48:32 -07:00
Claudiu Lodromanean fb763a6deb Merge pull request #17155 from woocommerce/fix/selectWoo-dependency
wc-admin-order-meta-boxes as a selectwoo dependency
2017-10-12 08:38:36 -07:00
claudiulodro 8acba76696 Add email to email address template 2017-10-12 08:07:10 -07:00
Mike Jolley 4379a47cd5 Fixed discount logic to also look at parent categories when validatiing coupons
Fixes #17150
2017-10-12 15:40:58 +01:00
Mike Jolley 5252d93465 Merge pull request #17154 from woocommerce/add/test-variation-totals
Update totals test to include a variation with parent tax class.
2017-10-12 15:34:59 +01:00
Mike Jolley 88ea1eaf7b Remove rounding in wc_remove_number_precision
Remove the rounding when removing precision so the cart can handle it.

For taxes, this means it can round down.

Fixes #17158

Tests are passing.
2017-10-12 15:16:48 +01:00
Mike Jolley b0631a040c Merge pull request #17157 from woocommerce/add/tests-variations-tax-classes
WC_Product_Variation::get_tax_class unit tests
2017-10-12 14:47:35 +01:00
Mike Jolley 878e4816fb Use city and postcode count to determine sort order 2017-10-12 14:04:10 +01:00
Gerhard Potgieter 8045596ed7 Add get_tax_class tests for WC_Product_Variation. Will ensure #17147 never happens again. 2017-10-12 14:46:28 +02:00
Gerhard Potgieter 9eee5afc2c Be sure to add the new product for cleanup later 2017-10-12 13:33:56 +02:00
Mike Jolley 2db0d1d4d6 Merge pull request #17151 from woocommerce/fix/shipping-rate-save
Fix tax rate save when only changing shipping checkbox
2017-10-12 12:33:46 +01:00
Mike Jolley cffcaaf773 wc-admin-order-meta-boxes as a selectwoo dependency 2017-10-12 12:32:36 +01:00
Gerhard Potgieter 91aa76a51b Update totals test to include a variation with parent tax class. 2017-10-12 13:30:08 +02:00
Mike Jolley 6aca58324a Merge pull request #17152 from woocommerce/fix/lazy-load-embeds
Load videos when the help tab is opened, not before.
2017-10-12 12:28:00 +01:00
Mike Jolley 47d69dad2d Load videos when the help tab is opened, not before.
Closes #17145
2017-10-12 12:18:37 +01:00
Mike Jolley 43f1938629 Merge pull request #17149 from woocommerce/fix/17147
Tax calculations should use `unfiltered` context for tax class
2017-10-12 11:38:35 +01:00
Mike Jolley 5a22c7fa97 Fix tax rate save when only changing shipping checkbox 2017-10-12 11:30:41 +01:00
Mike Jolley 0908bc0b13 phpcs 2017-10-12 11:26:55 +01:00
Mike Jolley 4f3393fc2f Tax calculations should use `unfiltered` context for tax class
This fixes variations which have a ‘parent’ tax class. It should
inherit from the parent.

Closes #17147
2017-10-12 10:12:20 +01:00
Claudio Sanches 8ead48fc64 Merge pull request #17144 from woocommerce/fix/grouped-menu-order
Remove menu-ordering sorting
2017-10-11 17:59:26 -03:00
Mike Jolley a6059ea759 Remove menu-ordering sorting 2017-10-11 21:36:13 +01:00
Mike Jolley ce47fa65c2 Changelog + grunt 2017-10-11 10:50:39 +01:00
Mike Jolley 12d93803ee Merge pull request #17121 from woocommerce/update/wizard-payments-copy
Update payment step copy for Stripe, and fixes margins/spacing
2017-10-11 10:17:57 +01:00
Mike Jolley ec9385a148 Merge pull request #17130 from woocommerce/rodrigoprimo-patch-1
Quote code in the tests README.md file
2017-10-11 10:04:04 +01:00
Rodrigo Primo d862aaf29d Quote code in the tests README.md file
Use triple backticks to quote code in the tests README.md file. Without this change all the parameters of the script `tests/bin/install.sh` that are surrounded by `<>` are not displayed.
2017-10-10 15:07:24 -03:00
Marcin Bot 17e4f2a609 Merge pull request #17127 from woocommerce/fix/17122-setup-required-shipping-fields
Setup wizard - made the shipping cost fields required
2017-10-10 18:50:20 +02:00
Marcin Bot 01578d55c9 Wrapped the class name in esc_attr 2017-10-10 17:49:04 +01:00
Mike Jolley ae4838c073 Merge pull request #17128 from woocommerce/fix/gruntfile
Fixed extra comma in Gruntfile.js
2017-10-10 17:20:41 +01:00
Claudio Sanches 5244340bae Fixed extra comma in Gruntfile.js 2017-10-10 13:08:23 -03:00
Marcin Bot eaf8a09e82 Setup wizard - made the shipping cost fields required 2017-10-10 16:59:08 +01:00
Mike Jolley 31367a72b8 Merge pull request #17123 from woocommerce/update/wizard-extras-copy
Setup wizard: add “powered by” to automated taxes description.
2017-10-10 16:39:45 +01:00
Mike Jolley c6d0a6e0be Merge pull request #17124 from cliffordp/patch-1
Correct docblock @return
2017-10-10 16:38:26 +01:00
Clifford 1474350f0f Correct docblock @return
From incorrect `string` to correct `array`
2017-10-10 10:31:16 -05:00
Jeff Stieler 24599524ba Setup wizard: add “powered by” to automated taxes description. 2017-10-10 09:24:13 -06:00
Mike Jolley 6b357bcfdc Updates the payment step copy and fixes margins 2017-10-10 15:40:03 +01:00
Mike Jolley d4965e9df4 Merge pull request #17112 from woocommerce/fix/product-variations-tax-classes
Add 'parent' to the list of valid tax classes for product variations
2017-10-10 12:32:29 +01:00
Jack 24efd36126 set query_vars (#17105)
* query_vars is set

* add changes
2017-10-10 12:14:35 +01:00
Mike Jolley 6098e25c9a Merge pull request #17102 from woocommerce/fix/thanks-page-classname
Classname was using total instead of email
2017-10-10 11:43:47 +01:00
Jeff Stieler 974f402017 Fix duplicate plugin install from wizard. (#17114)
* Setup wizard: avoid duplicate plugin installs.
* Setup wizard: use background flag to determine if Jetpack is being installed.
* Setup wizard: use wc_set_time_limit() instead of set_time_limit() to avoid potential warnings/errors.
2017-10-09 16:45:33 -06:00
Claudio Sanches 87cf8f4809 Merge pull request #17106 from woocommerce/fix/activate-step-when-returning-from-wpcom
Setup wizard: activate step shouldn't be hidden after a successful WPCOM connection.
2017-10-09 16:59:53 -03:00
Rodrigo Primo fa0e5569f8 Add 'parent' to the list of valid tax classes for product variations
Commit d9f9e74bd added a check to `WC_Product::set_tax_class()` to only accept valid tax classes, but this created a bug for product variations as this type of product has an extra tax class called 'parent'.

This commit fixes this problem by adding a new method to `WC_Product` that returns a list of valid tax classes. `WC_Product_Variation` then override this method, returning another list including the tax class 'parent'.

Fixes #17024
2017-10-09 16:20:03 -03:00
Rodrigo Primo d769ef24f2 Coding standards fixes 2017-10-09 16:19:24 -03:00
Mike Jolley 6d7522d864 Merge pull request #17075 from woocommerce/fix/phpunit-excluded-files
Updated tests exclusion list
2017-10-09 19:46:34 +01:00