Commit Graph

22228 Commits

Author SHA1 Message Date
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 e9f35febd0 Store cart item as part of items array 2017-07-26 11:26:35 +01:00
Mike Jolley 457a7c2a32 phpcs/tidy discounts class 2017-07-26 11:07:17 +01:00
Mike Jolley 58b54673d1 Merge pull request #16256 from woocommerce/feature/discounts-coupon-validation
Add coupon validation logic to WC_Discounts
2017-07-26 10:21:56 +01:00
Mike Jolley e29666949e Merge pull request #16255 from woocommerce/feature/discounts-class-cart-total
Integrate Totals class with Cart
2017-07-26 10:11:18 +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
claudiulodro dfee2c0cbe Maybe integrate cart and total classes 2017-07-25 14:44:54 -07:00
Claudiu Lodromanean a3ecdf338d Merge pull request #16239 from woocommerce/feature/discounts-class-totals-calc
WC_Totals class
2017-07-25 11:01:25 -07:00
Mike Jolley b68adf748b Tests pass 2017-07-25 17:25:06 +01:00
Mike Jolley 4960bf0ca4 Update discount tests 2017-07-25 16:27:57 +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 e8e200195f fees pass 2017-07-25 14:05:49 +01:00
Mike Jolley ee545e7793 Totals progress 2017-07-24 17:21:08 +01:00
Mike Jolley 45a9826a80 Totals class and tests files 2017-07-23 12:05:11 +01:00
Mike Jolley 45258a7e02 Started adding totals class from https://github.com/woocommerce/woocommerce/pull/11889/files 2017-07-21 16:49:52 +01:00
Mike Jolley 83b60573fa Framework for discount class 2017-07-21 14:22:40 +01:00
Mike Jolley 499519eaac WC_Discount class 2017-07-20 20:50:09 +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
Claudio Sanches cc233209f5 Merge pull request #16190 from woocommerce/feature/discounts-class-applied-coupon-counts
Ability to get applied coupon totals from discounts class
2017-07-19 12:24:43 -03:00
Mike Jolley 1b63749a68 Tests for other coupon types 2017-07-19 16:21:35 +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
Claudio Sanches b55b67994e Merge pull request #16182 from woocommerce/feature/discounts-class-apply-coupon
Feature/discounts class apply coupon
2017-07-19 11:08:45 -03:00
Mike Jolley 3c12a06c46 Limit to x 2017-07-19 13:49:22 +01:00
Mike Jolley baa7efcc30 Another test 2017-07-19 12:27:50 +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
Claudio Sanches b2757c1be4 Merge pull request #16166 from woocommerce/feature/discounts-class-set-items
Feature/discounts class set items
2017-07-18 11:49:09 -03:00
Mike Jolley 268628c09c Include cart item class 2017-07-18 15:42:54 +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 7f715e4776 WC_Cart_Item class 2017-07-18 15:42:29 +01:00
Mike Jolley 91dbdb0c4c Correct value 2017-07-18 14:29:14 +01:00
Mike Jolley efaa606894 Merge branch 'master' into feature/discounts-class 2017-07-18 14:27:20 +01:00
Claudio Sanches 5c67f0c665 Merge pull request #16161 from woocommerce/fix/importer-callbacks
Use class raw data, don't pass it
2017-07-18 10:26:12 -03:00
Mike Jolley dfd7aa78d5 Use class raw data, don't pass it
#16127 caused an issue with fields which don’t require passing args
e.g. esc_url_raw callback. This broke tests.
2017-07-18 14:20:14 +01:00
Mike Jolley 31d535c932 Methods and tests 2017-07-18 14:04:56 +01:00
Mike Jolley 96f0a6e375 DateTime docblocks 2017-07-18 11:46:11 +01:00
Claudio Sanches 8b1b8b6b28 Initial WC_Discounts class 2017-07-18 01:43:31 -03:00
Claudio Sanches 90691e881f Merge pull request #16140 from woocommerce/update/16136
Added `woocommerce_data_store_wp_{$this->meta_type}_read_meta` filter
2017-07-17 19:24:44 -03: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
Mike Jolley 3f1144cf06 Merge pull request #16115 from woocommerce/refactor/woocommerce-class
Moving WooCommerce class to a separate file and fixing coding standards
2017-07-17 11:09:45 +01:00