Commit Graph

22640 Commits

Author SHA1 Message Date
claudiulodro ae80d12d80 Merge master 2017-08-14 11:12:09 -07:00
Claudiu Lodromanean f3bf4a8cb1 Merge pull request #16449 from woocommerce/apply-discount-todos
Calculate coupon taxes in order class
2017-08-14 11:08:05 -07:00
Claudiu Lodromanean 28c5af4922 Merge pull request #16440 from woocommerce/fix/16422
Adjust coupon user limit logic
2017-08-14 10:24:51 -07:00
Claudiu Lodromanean 1f2891cfd3 Merge pull request #16439 from woocommerce/fix/16432
Switch CLI tools command over to v2 API
2017-08-14 10:04:02 -07:00
Claudiu Lodromanean f0126852a5 Merge pull request #16438 from woocommerce/fix/16405
Add error handling for wp_insert_term
2017-08-14 10:01:22 -07:00
Rami Yushuvaev 17d10b3e9f i18n: Fix some translation strings (#16441)
* i18n: permissions -> permission

* i18n: permissions -> permission
2017-08-14 17:25:08 +01:00
Mike Jolley 33be0b5741 Remove todos 2017-08-14 16:44:59 +01:00
Mike Jolley be11c1089f Fix tests 2017-08-14 16:03:50 +01:00
Mike Jolley 7ddfe0703b Store coupon item taxes 2017-08-14 15:57:51 +01:00
Mike Jolley c74835ec31 Use WP_User_Query 2017-08-14 12:51:04 +01:00
Mike Jolley 40757ddf86 Search given email against all user fields for matches. 2017-08-14 12:28:19 +01:00
Mike Jolley 6f4fd61a4f Do not check if logged in 2017-08-14 12:28:03 +01:00
Mike Jolley 147a7f9419 Switch CLI tools command over to v2 API
Closes #16432
2017-08-14 10:45:44 +01:00
Mike Jolley 423d46f864 Merge pull request #16434 from ramiy/patch-1
Remove redundant CSS
2017-08-14 10:42:05 +01:00
Mike Jolley c63e94d299 Add error handling for wp_insert_term
Fixes #16405
2017-08-14 10:40:00 +01:00
Rami Yushuvaev f12ac58932 Remove redundant CSS
The `nav.woo-nav-tab-wrapper` CSS rule overrides WordPress core rule with the same CSS.

We can remove that from WooCommerce.
2017-08-13 22:38:54 +03:00
Mike Jolley a7f6d49f16 Merge pull request #16421 from bekarice/fix/shipping-availability-filters
Pass WC_Shipping_Method instance to availability filters
2017-08-13 11:19:42 +01:00
Nikolay Yordanov 96b4467179 Prevent infinite recursion in WC_Post_Data::variation_post_link()
If a variation's parent doesn't exist, WC_Product_Variation::get_parent_id()
will return 0, which causes WC_Post_Data::variation_post_link()
to enter into an infinite recursion trying to get the permalink
of the nonexistent parent
2017-08-12 11:26:32 +01:00
Claudio Sanches 4d87f94622 Merge pull request #16408 from woocommerce/fix/16398
CSV Import; correctly set stock props.
2017-08-11 21:49:20 -03:00
Claudio Sanches b8b9ae41f0 Fixed importer unit tests 2017-08-11 21:46:51 -03:00
Jeroen Sormani 607cd878e0 Settings parent construct (#16412)
* Miscellaneous cleanup of typos + change some return types for IDE helpers

* Call/use parent::__construct() to add filters for settings output, saving
2017-08-11 21:36:35 -03:00
Claudio Sanches 2ffc09de0d Merge pull request #16411 from woocommerce/fix/16306
Don't subtract negative taxes in net sales report
2017-08-11 21:30:25 -03:00
claudiulodro b99ed2228c No array_replace in WP or PHP 5.2 2017-08-11 14:11:46 -07:00
Beka Rice c54b0ecd9d Pass WC_Shipping_Method instance to availability filters 2017-08-11 16:36:18 -04:00
claudiulodro 837e7e1ed2 Use array_replace in order item apply_changes 2017-08-11 13:24:43 -07:00
Claudiu Lodromanean a9ecb7a2cc Merge pull request #16410 from woocommerce/fix/16409
Variation data store should remove product_type term on save
2017-08-11 12:07:05 -07:00
claudiulodro a0effafef9 Move discount row in frontend 2017-08-11 11:48:08 -07:00
Claudiu Lodromanean 15179b0e48 Merge pull request #16416 from woocommerce/manual-discounts-on-fees-shipping
Manual discounts on fees and shipping
2017-08-11 11:30:27 -07:00
claudiulodro 6fa0e7a8f5 Update test 2017-08-11 11:27:11 -07:00
claudiulodro 46e003d3c6 Remove shipping and discount lines 2017-08-11 11:10:44 -07:00
Mike Jolley b6fc6817be Icon alignment 2017-08-11 17:58:26 +01:00
Mike Jolley b826d02f9b Split tax across items for discounts 2017-08-11 17:53:49 +01:00
claudiulodro 1b7bc60ea2 Fix fatal errors in bulk order item delete 2017-08-11 08:40:13 -07:00
Mike Jolley d61a97cb57 Missing abstract methods 2017-08-11 16:17:24 +01:00
Mike Jolley 1545e46fd5 cache clearing 2017-08-11 16:17:13 +01:00
Mike Jolley def5e0cdee get_tax_class_counts_for_items 2017-08-11 16:17:00 +01:00
Mike Jolley 9eece1cb1e Include shipping and fee in total 2017-08-11 16:16:50 +01:00
Mike Jolley e20d886972 calculate_item_discounts for clarity 2017-08-11 16:16:36 +01:00
Mike Jolley 2accbdbd45 Load order after updating items 2017-08-11 16:16:22 +01:00
Mike Jolley 3496e8dca4 Match order of cart discount 2017-08-11 16:16:09 +01:00
Mike Jolley 2c5a5b9409 Discounts should be last 2017-08-11 16:15:53 +01:00
Mike Jolley 56726deb5a Fix recalculate_coupons 2017-08-11 13:52:40 +01:00
Mike Jolley 7620473fa5 Support callback for index 2017-08-11 13:52:28 +01:00
Mike Jolley c9ceb9c62c Icon alignment 2017-08-11 13:09:40 +01:00
Mike Jolley 5b4e5482dd Don't subtract negative taxes in net sales report
Fixes #16306
2017-08-11 12:38:09 +01:00
Mike Jolley 5587ff6874 Variation data store should remove product_type term on save
Closes #16409
2017-08-11 12:32:12 +01:00
Mike Jolley 0f54e57093 CSV Import; correctly set stock props.
Closes #16398
2017-08-11 11:07:12 +01:00
Mike Jolley 73a1fc21f1 Merge pull request #16407 from woocommerce/fix/16396
Remove figure margin/padding css
2017-08-11 10:50:40 +01:00
Mike Jolley fc0d729034 Remove figure margin/padding css
Closes #16396
2017-08-11 10:49:52 +01:00
Mike Jolley e124841cbf Merge pull request #16401 from woocommerce/fix/16378
Use new CRUD actions to trigger Webhooks
2017-08-11 10:35:23 +01:00