Commit Graph

479 Commits

Author SHA1 Message Date
Mike Jolley 42f77950bd Make total recalc use unrounded tax values to fix test WC_Tests_Order_Coupons::test_add_coupon_to_order 2019-01-11 13:17:06 +00:00
Mike Jolley 28ac24d870 update_taxes can safely round all values, as lines would already be rounded if applicable 2019-01-11 13:12:31 +00:00
Mike Jolley 50ca24e5d9 set_coupon_discount_amounts should support woocommerce_tax_round_at_subtotal 2019-01-11 13:09:20 +00:00
Mike Jolley caffa319f4 set_item_discount_amounts should support woocommerce_tax_round_at_subtotal 2019-01-11 13:06:26 +00:00
Mike Jolley 11d14b30a4 PHPCS fixes 2019-01-11 12:28:52 +00:00
JeroenSormani f4775ccd90 Use shipping method instead of property through magic + doc return statements 2019-01-04 12:41:38 +00:00
Ewout Fernhout 9c411dc532
Fixes #21345 2018-09-13 15:23:00 +02:00
Mike Jolley ddb779e917 Check type correctly 2018-06-29 11:22:03 +01:00
Claudiu Lodromanean 4c47574d7c
Merge pull request #20533 from woocommerce/fix/20505
Round items for order total
2018-06-14 09:11:57 -07:00
Mike Jolley 893e6affb1 Revert this change - no issue, just keeping diff small 2018-06-14 12:56:21 +01:00
Mike Jolley 90c90591f3 Round items for order total 2018-06-14 12:52:13 +01:00
Mike Jolley aa4a89f92d Shipping tax may be a string, so cast it
Fixes #20519
2018-06-14 11:49:45 +01:00
Mike Jolley 813db4c7f1 Clear needs_processing transient when adding a product to an order 2018-06-05 11:28:45 +01:00
Diego Zanella 18731221fa Added order to "woocommerce_order_is_vat_exempt" filter arguments 2018-06-04 11:01:15 +01:00
Mike Jolley d25bd2dd33 Fix rounding of line items for orders 2018-05-15 23:18:39 +01:00
JeroenSormani 4e6b0dc500 Doc improvements (return types mostly) 2018-04-12 09:10:14 +02:00
Brian Henry b6f1f68a00
Documentation punctuation fixes: its = posessive 2018-04-05 19:45:14 -07:00
Claudio Sanches 0660a50e07 Removed obvious boolean results 2018-03-21 19:57:10 -03:00
Claudiu Lodromanean b6c1a9d2c1
Merge pull request #19220 from woocommerce/fix/19218
Only append tax label if taxes are enabled
2018-03-05 09:26:10 -08:00
Gerhard Potgieter 440358a4f2 PHPCS passing for abstract-wc-order.php 2018-03-05 13:41:04 +02:00
Mike Jolley 57cfa72d99 Only append tax label if taxes are enabled 2018-03-02 16:22:54 +00:00
Mike Jolley 69816b9854
Merge pull request #18538 from woocommerce/update/16366
Optimise saving of orders
2018-02-22 12:20:14 +00:00
Mike Jolley bdd4898946 Set status after order is created/updated. 2018-02-12 11:56:48 +00:00
Boro Sitnikovski e684afc5e6 Update name 2018-01-24 08:46:26 +01:00
Boro Sitnikovski af9441fea5 Add action to hook onto for order recalculation 2018-01-22 15:53:42 +01:00
Mike Jolley aa87aa0fbd phpcs 2018-01-19 15:42:48 +00:00
Mike Jolley d1269ce74f Add transient cache so we know if an order needs processing. 2018-01-19 15:14:00 +00:00
Mike Jolley 2c915ba961 Allow quantities less than 1, but not 0. 2018-01-05 12:48:24 +00:00
Mike Jolley 7da5780c00 Store unrounded, calc rounded. 2017-12-04 21:40:12 +00:00
urosmil 18e7b25eab Filter for line items in abstract-wc-order.php (#17759)
* Filter for line items in abstract-wc-order.php

When creating custom product class there are places where line items is only value that can be handled. This is one of that places causing subtotal values after checkout not to be calculated and displayed.

* Extension to woocommerce_order_get_items filter

This is extension to filter as get_items() is used for different classes and types. This way it would be possible to distinct which type is called for items.

* Removed filtering inside subtotal function

$types parameter is added as parameter for filter inside get_items() function so previous commit is reverted as there is no need for it.
2017-11-23 10:00:03 +00:00
Mike Jolley 128b826791 Merge branch 'master' into tweak/order-screens
# Conflicts:
#	assets/css/admin-rtl.css
#	assets/css/admin.css
#	includes/admin/class-wc-admin-post-types.php
2017-11-15 13:36:13 +00:00
Mike Jolley 93da46e66e phpcs 2017-11-08 12:20:49 +00:00
Mike Jolley 1f7ecd9fb9 Merge branch 'master' into tweak/order-screens
# Conflicts:
#	assets/js/frontend/checkout.min.js
2017-11-01 16:52:21 +00:00
Mike Jolley 7c74e77849 handle tax removal in order class 2017-10-31 13:37:57 +00:00
Mike Jolley bc7484f473 Merge branch 'master' into pr/16959
# Conflicts:
#	includes/abstracts/abstract-wc-order.php
2017-10-31 13:33:09 +00:00
Mike Jolley 9521a0ba1f Improve tax class check and handle non-taxable items 2017-10-30 13:23:15 +00:00
Ewout Fernhout 029e93fd4f
Use item tax class rather than product tax class for getter
Fixes #17449
2017-10-30 11:04:56 +01:00
Diego Zanella e93ad155df Added support for "is_vat_exempt" flag on orders
Added check for the presence of the "is_vat_exempt" meta against an order. When present, such information is used during tax calculation to remove the taxes applied to an order.
2017-09-27 18:56:11 +01:00
Mike Jolley 00b8e395f8 Unused variable 2017-09-27 17:12:50 +01:00
Diego Zanella 5e23770d74 Added actions before calculatins order totals and taxes 2017-09-27 16:07:02 +01:00
Mike Jolley 5dcde7b093 Use discounts class for validation logic 2017-09-27 12:54:04 +01:00
Mike Jolley d08bf4b489 Add option to disable validation when applying coupons
Closes #16720
2017-09-06 11:26:34 +01:00
Mike Jolley 2a71a66fc9 Order screen refinements and preview window 2017-09-04 17:42:31 +01:00
Mike Jolley fe847630b2 Tests when tax is not enabled 2017-08-29 12:38:35 +01:00
Mike Jolley 31a90bdd85 Handle prices including tax calcs 2017-08-25 18:21:27 +01:00
Mike Jolley 4ac1ed84cc Fallback no coupon data 2017-08-25 16:15:28 +01:00
Mike Jolley 2682d86660 Move comment 2017-08-25 16:09:56 +01:00
Boro Sitnikovski 3cd1bedade Set coupon virtual state on when initializing virtual coupons during recalculation 2017-08-25 17:07:07 +02:00
Mike Jolley 961c190985 Comments 2017-08-25 14:42:56 +01:00
Mike Jolley 1e65a918d5 Pull meta to apply coupons which do not exist 2017-08-24 17:08:45 +01:00
Claudiu Lodromanean 56e1207903 Merge pull request #16583 from woocommerce/update/apply-fees
Improved apply fees
2017-08-23 13:35:18 -07:00
Mike Jolley a7b697b679 type checks 2017-08-23 14:25:41 +01:00
Mike Jolley 714c4c672e unused prop 2017-08-23 14:21:42 +01:00
Mike Jolley be042ee8f3 Set to amount before calc 2017-08-23 12:24:33 +01:00
Mike Jolley 804feb9333 Store fee amount and prevent totals going negative 2017-08-23 12:15:06 +01:00
Mike Jolley e99471c0cd Removed manual discounts code 2017-08-18 10:36:10 +01:00
claudiulodro 9a47146716 Fix discounts rounding issues 2017-08-15 14:11:25 -07: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 b826d02f9b Split tax across items for discounts 2017-08-11 17:53:49 +01:00
Mike Jolley 3496e8dca4 Match order of cart discount 2017-08-11 16:16:09 +01:00
Mike Jolley 56726deb5a Fix recalculate_coupons 2017-08-11 13:52:40 +01:00
claudiulodro 28f0431c56 Coupon usage counts 2017-08-10 11:27:13 -07:00
claudiulodro f1e6fd53bd Prevent double coupons 2017-08-10 11:14:01 -07:00
Mike Jolley db87fc68b9 Fix refs 2017-08-10 16:33:21 +01:00
Mike Jolley 30c80c6ad5 Fix tax recalc 2017-08-10 16:22:17 +01:00
Mike Jolley 22d6c789ab herpa derpa 2017-08-10 15:57:34 +01:00
Mike Jolley e90fb6d54f fix discount apply and save 2017-08-10 15:33:01 +01:00
Mike Jolley cd8fb23884 Add ability to get local item rather than from DB 2017-08-10 14:38:02 +01:00
Mike Jolley e2599d83c8 Apply methods 2017-08-10 14:22:27 +01:00
Mike Jolley 3dc9f06f6a Remove fixed discounts correctly 2017-08-10 12:06:03 +01:00
Mike Jolley 06381f28bd Edit items rather than recreate 2017-08-10 11:38:09 +01:00
claudiulodro a416ebe09b It kind-of works. 2017-08-09 14:55:35 -07:00
Mike Jolley 5874fb8715 Type and sum fix 2017-08-09 19:11:02 +01:00
Mike Jolley c556facd41 Fix percent coupon and display 2017-08-09 19:02:10 +01:00
Mike Jolley f71dc64d35 Manual discounts and negative taxes 2017-08-09 18:53:10 +01:00
Mike Jolley 2def474421 Order calc 2017-08-09 16:19:10 +01:00
Mike Jolley e9c3ebebdc Merge branch 'master' into feature/discounts-class
# Conflicts:
#	includes/abstracts/abstract-wc-data.php
#	woocommerce.php
2017-08-08 15:49:59 +01:00
Mike Jolley 6af275da6e Only return tax classes if product is taxable.
Fixes #16241
2017-08-03 08:44:02 +02:00
Mike Jolley 306db69eaf Remove order subclass 2017-07-27 10:49:47 +01:00
Mike Jolley abdb325d83 Order items 2017-07-26 15:47:30 +01:00
Jaydeep Rami 3522857d23 Fix typo in WooCommerce plugin (#16135)
* Fixed typo

* Fixed more typo

* Fixed more typo

* Fix tyop

* Fix more typo

* Fix more typo

* Fix typo

* Fix typo

* Fix typo

* Fix typo datatime object

* Fix short name of compat

* Fix typo: update short name

* Fix typo "deactive" to "deactivate" and short BW - Compat

* Fix typo "Backwards compat"

* Fix typo 'parameters'

* Fix more typo 'pararmeters'

* Fix typo 'compund'

* FIx typo order

* Fix typo

* Fix typo 'incorrecly'

* Fix typo 'genarate'

* Fix typo 'reletive'

* Fix typo 'Handly'

* Fix typo 'rotatated'

* Fix typo

* Fix typo 'additonal'

* Fix typos
2017-07-17 11:10:52 +01:00
Brent Shepherd 1992d90d37 Revert "Merge pull request #14706 from crodas/make_get_item_consistent"
This reverts commit 56ffa3d2aa, reversing
changes made to 64a60de24f.
2017-06-27 22:28:23 -07:00
jgacuca567 4a9950b4c5 Changed their to there 2017-06-06 17:30:20 -04:00
Cesar Rodas c96c62f380 Improved how taxes are applied
If by default the taxes are based on the shipping address and the current order doesn't have any, it would use the billing address rather than using the Shopping base location.

It's basically what WooCommerce is [doing already in Javascript](https://github.com/woocommerce/woocommerce/blob/master/assets/js/admin/meta-boxes-order.js#L526-L575). This kind of checks should be done in the backend, never in the client side.
2017-06-01 15:51:55 -04:00
Mike Jolley 56ffa3d2aa Merge pull request #14706 from crodas/make_get_item_consistent
Make get item consistent
2017-05-31 11:10:09 +01:00
Cesar Rodas 8c67ae6a7a Make `get_item` to rely no `get_items` 2017-05-29 12:38:25 -04:00
Cesar Rodas 563aa887f7 Apply woocommerce_order_get_items filter to get_item 2017-05-24 17:30:14 -04:00
Cesar Rodas ea9c573f2c Improved WC_Order::get_item()
Do not load all items, just load the items with a given order_item_type.
2017-05-23 20:12:47 -04:00
Cesar Rodas b612bab38b Fixed coding styles 2017-05-23 19:18:31 -04:00
Mike Jolley 6dfdc86111 Merge branch 'pr/14678' 2017-05-23 19:16:37 +01:00
Mike Jolley 109e951de3 Renamed filters and actions 2017-05-23 19:16:30 +01:00
Mike Jolley c16acc6b51 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	assets/css/wc-setup-rtl.css
#	assets/css/wc-setup.css
2017-05-23 19:00:24 +01:00
Mike Jolley d3666738d8 Merge branch 'pr/15069' 2017-05-23 18:56:58 +01:00
Mike Jolley 00e5189a05 Merge pull request #15070 from rasmusbe/phpdoc-missing-return-throws
Phpdoc: Add missing return and throws
2017-05-23 18:50:58 +01:00
Mike Jolley dd798d219e Make calculate tax function clear taxes if disabled on recalculation
Fixes #15057
2017-05-15 14:55:39 +01:00
Rasmus Bengtsson 185934fad9 Fix phpdoc to include params and correct types 2017-05-15 13:50:52 +02:00
Rasmus Bengtsson 4f00d7e5e3 PHPDoc: Add missing return statement 2017-05-15 13:37:59 +02:00
Claudio Sanches 257594a67c Merge pull request #14945 from woocommerce/pr/14875
Pr/14875
2017-05-08 13:56:12 -03:00
Mike Jolley 03a69e1d44 Prepend new item keys with `$items_key` to make them unique.
Fixes #14875
2017-05-08 17:44:10 +01:00