Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
39,390 Commits 1,109 Branches 778 Tags 943 MiB
Commit Graph

145 Commits

Author SHA1 Message Date
Mikalai Okun 2e2e5d60e5
Updated strval() to round() 2018-01-11 08:49:54 -05:00
Mikalai Okun cd8c09769d
Workaround for precision on floating values. 2018-01-11 01:38:36 -05:00
Mike Jolley da281d21ab Keep product check 2018-01-02 11:57:29 +00:00
Jason Kytros a21ada68cd Fix coupon 'Excluded Categories' restriction evaluation 2017-12-22 11:21:47 +02:00
Mike Jolley 8e851d834f Rounding and price should match the cart. 2017-12-04 20:38:29 +00:00
Mike Jolley 72b3b5055b FIx variable in get_object_subtotal 2017-11-16 12:03:02 +00:00
Mike Jolley 541dde95b3
Merge pull request #17710 from woocommerce/fix/17697-coupon-spend-incl-taxes 
Coupon min/max spend based on displayed subtotal
 2017-11-16 10:59:43 +00:00
Gerhard Potgieter a59f325f41 Add get_object_subtotal helper method, remove subtotal variable in favor of helper method 2017-11-16 12:43:50 +02:00
Gerhard Potgieter 4521011219 Adjust discount on min/max spend to work based on the displayed subtotal. 2017-11-15 13:44:07 +02:00
Mike Jolley 9e2786a0a3 Today up logic 2017-11-15 10:31:31 +00:00
Gerhard Potgieter 0436e9afcb Rework tax calculations to work with inclusive and exclusive pricing 2017-11-15 12:23:52 +02:00
Gerhard Potgieter 8cbca4d9d9 Include taxes in minimum and maximum coupon validation checks. 2017-11-15 12:04:02 +02:00
soft79 b74eaba287
Update class-wc-discounts.php 
'woocommerce_coupon_get_apply_quantity' => ( $apply_quantity, $item, $coupon, $discounts )
 2017-11-11 20:33:19 +01:00
Mike Jolley 624c1a9516 Allow items to be sent directly to the discounts class 2017-11-02 16:18:17 +00:00
Mike Jolley 87c6ca5ae0 Merge pull request #17368 from james-allan/fix_thirdparty_coupon_calculations 
Fix coupon discount calculations for third party coupon types
 2017-10-26 14:23:31 +01:00
James Allan c0e3ac8ce6 fix coupon discount calculations for thirdparty coupon types 2017-10-25 16:33:59 +10:00
Mike Jolley 1a08afeab2 Don't apply remainder logic when discount amount is changed via a filter 
Closes #17330
 2017-10-24 18:07:23 +01:00
Mike Jolley 8ca76e84cd Add test for #17330 2017-10-24 17:53:51 +01:00
Mike Jolley 6223ffb684 Adjust item limiting logic to work with multiple coupons 
Fixes #17275
 2017-10-22 09:13:12 -07:00
Mike Jolley 1278c84c11 Revert "WIP" 
This reverts commit 2255066c0f.
 2017-10-22 07:13:46 -07:00
Mike Jolley 2255066c0f WIP 2017-10-22 07:13:31 -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 40040f534b These classes require WC_Cart objects 2017-09-27 17:12:45 +01:00
Claudiu Lodromanean 5e24b86d61 Merge pull request #16866 from woocommerce/fix/16840 
Add subtotal to min and max spend code
 2017-09-21 09:08:34 -07:00
Mike Jolley 9c63da78c4 Fixed limit to x by avoiding changing the original item (uses clone) 2017-09-20 18:42:10 +01:00
Mike Jolley 2c70444123 Add subtotal to min and max spend code 
Closes #16840
 2017-09-20 13:51:41 +01:00
Mike Jolley bac98218f3 Merge pull request #16782 from hjoelr/bugfix-discounts-wrong-var 
Bugfix: Discounts not using the right variable
 2017-09-14 11:32:27 -07:00
Joel Rowley 458a6c87c7 Resolve 'non-numeric value encountered' error in PHP 7.1 when freeshipping coupon used 2017-09-12 21:33:43 -04:00
Joel Rowley bb5cb38832 Bugfix: Discounts not using the right variable 2017-09-11 15:56:49 -04:00
Mike Jolley 0337293e39 Merge pull request #16753 from hjoelr/bugfix-calc-disc-sequentially 
Bugfix: woocommerce_calc_discounts_sequentially checks were doing the opposite of the WC setting
 2017-09-08 11:44:43 +01:00
Joel Rowley 3b166b6a44 Bugfix: woocommerce_calc_discounts_sequentially checks were doing the opposite of the WC setting 2017-09-07 21:43:27 -04:00
Joel Rowley e6530a3555 Bugfix: wc_remove_number_precision() indirectly called twice from get_discount() 2017-09-07 21:34:58 -04:00
Mike Jolley 199eb78304 Support numeric coupon errors in is_coupon_valid 2017-09-07 11:14:05 +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 31a90bdd85 Handle prices including tax calcs 2017-08-25 18:21:27 +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 8ce583889a Apply filters to carts only, and add is_virtual helper 2017-08-24 17:07:31 +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 129eae141a Fix custom discount amounts not multiplying by qty 2017-08-15 16:25:39 +01:00
Mike Jolley 3c18d5e849 Adjust total discount for ex.tax 2017-08-15 16:25:39 +01:00
Mike Jolley de35d9ba02 Apply woocommerce_coupon_get_discount_amount without cents 
cc @claudiulodro
 2017-08-15 15:29:22 +01:00
claudiulodro ae80d12d80 Merge master 2017-08-14 11:12:09 -07:00
Mike Jolley 6f4fd61a4f Do not check if logged in 2017-08-14 12:28:03 +01:00
Mike Jolley 9eece1cb1e Include shipping and fee in total 2017-08-11 16:16:50 +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
Mike Jolley f71dc64d35 Manual discounts and negative taxes 2017-08-09 18:53:10 +01:00
claudiulodro 1328e17069 Fix logic 2017-08-09 10:10:46 -07:00
Mike Jolley 722ac5ad78 Load order items 2017-08-09 16:16:36 +01:00
Mike Jolley 81806617d7 Fix total and rounding logic for tests 2017-08-08 09:24:26 +01:00
claudiulodro 80708255ee Fix inc tax price calculation 2017-08-02 11:07:33 -07:00
claudiulodro 036d709b19 Use item subtotal for discount item price 2017-07-31 14:44:51 -07:00
Mike Jolley 0839f5716b phpcs 2017-07-28 17:49:39 +01:00
Mike Jolley 14717d4ebb fix call to apply_coupon_fixed_cart_remainder 2017-07-28 16:33:02 +01:00
Mike Jolley c7cb46a524 Fix array shift usage 2017-07-28 16:31:11 +01:00
Mike Jolley 9170b61a1c fix in cents logic direction. 2017-07-28 16:17:57 +01:00
Mike Jolley e23e55bb27 Methods for getting specific totals and discounts whilst keeping storage in a single array 2017-07-28 15:35:41 +01:00
Mike Jolley 51fbb1aec3 set_items_from_cart 2017-07-28 13:02:39 +01:00
Mike Jolley 5ed2f147a7 woocommerce_coupon_is_valid 2017-07-28 11:51:57 +01:00
claudiulodro b56b87c97b Good progress on wc_discount and manual discount handling 2017-07-27 14:08:38 -07:00
claudiulodro 3a11e345a6 Fix some things and hook up discount class 2017-07-27 11:08:22 -07:00
claudiulodro 409320482a Get everything working again 2017-07-27 10:37:20 -07:00
claudiulodro 0aa9894bae Merge remote-tracking branch 'origin/feature/discounts-class' into HEAD 2017-07-27 09:32:08 -07:00
Mike Jolley 795d8fa2fd Tests 2017-07-27 15:46:02 +01:00
Mike Jolley ded2be8d28 Legacy filters 2017-07-27 15:31:10 +01:00
Mike Jolley 6054519605 Discount taxes 2017-07-27 13:48:58 +01:00
Mike Jolley b9b4336c1b Removed some duplicate keys 2017-07-26 16:50:34 +01:00
Mike Jolley 1faae6a7aa Order subclass 2017-07-26 14:32:43 +01:00
Mike Jolley 250dabaf41 WC_Cart_Totals subclass 2017-07-26 12:44:06 +01:00
Mike Jolley 052be04ee7 Use passed through cart item, rather than try to generate a custom one 2017-07-26 11:26:50 +01:00
Mike Jolley 457a7c2a32 phpcs/tidy discounts class 2017-07-26 11:07:17 +01:00
Claudio Sanches f0dfff4a86 Sync with feature/discounts-class 2017-07-25 22:41:18 -03:00
Claudio Sanches 2573adedd5 Moved coupon validation logic to WC_Discounts 2017-07-25 22:36:41 -03:00
Mike Jolley b68adf748b Tests pass 2017-07-25 17:25:06 +01:00
Mike Jolley 474799889f Disable discounts tests until rewritten 2017-07-25 15:57:58 +01:00
Mike Jolley 40cb2c9cb0 phpcs 2017-07-25 15:24:00 +01:00
Mike Jolley 4c4f26ff41 Changes to allow shipping to be calculated from totals class 
Moved some items from
https://github.com/woocommerce/woocommerce/pull/11889/files to support
this.
 2017-07-25 15:11:32 +01:00
Mike Jolley ee545e7793 Totals progress 2017-07-24 17:21:08 +01:00
Mike Jolley e5ec0e66e3 fixed discount 2017-07-20 20:33:27 +01:00
Mike Jolley 0e96bd8a93 Discount rows 2017-07-20 17:34:30 +01:00
Mike Jolley 06c1a2ad8d apply discount 2017-07-20 14:33:38 +01:00
Mike Jolley f77fc21785 test_get_applied_coupons 2017-07-19 16:17:58 +01:00
Mike Jolley 24fcf52c59 Store applied_coupons 2017-07-19 15:55:56 +01:00
Mike Jolley 3c12a06c46 Limit to x 2017-07-19 13:49:22 +01:00
Mike Jolley dd7fe5f158 More tests and precision fixes 2017-07-19 12:26:01 +01:00
Mike Jolley 3a76e4492e todos 2017-07-18 20:48:19 +01:00
Mike Jolley d24faebea8 Split fixed cart from other discounts in class. 2017-07-18 20:42:47 +01:00
Mike Jolley 37fbd96de8 Small tidyup 2017-07-18 18:52:50 +01:00
Mike Jolley 2b9e3aafdd fix endless loop of death 2017-07-18 18:47:05 +01:00
Mike Jolley 6a9e612a83 Some progress on actual discounts 2017-07-18 18:07:46 +01:00
Mike Jolley cc8eb28724 Set items based on cart or an order, with tests 2017-07-18 15:42:46 +01:00
Mike Jolley 91dbdb0c4c Correct value 2017-07-18 14:29:14 +01:00
Mike Jolley 31d535c932 Methods and tests 2017-07-18 14:04:56 +01:00
Claudio Sanches 8b1b8b6b28 Initial WC_Discounts class 2017-07-18 01:43:31 -03:00