Commit Graph

460 Commits

Author SHA1 Message Date
Mike Jolley d394dec5f2
Merge pull request #20591 from yratof/tweak/issue-20590
Wrapped 'FREE' with a filter to allow different use cases
2018-06-26 13:43:44 +01:00
Andrew Lazarus d9c031d8c6
Removed whitespace to pass travis check 2018-06-25 13:24:07 +02:00
Andrew Lazarus c9e0055bdd
Refactored get_cart_shipping_total()
Refactored to pass all routes through filter, renamed the filter to match the function.
2018-06-25 11:17:08 +02:00
Andrew Lazarus 7eac354d3b
Added $this to the FREE filter to allow interaction with cart object 2018-06-22 16:03:57 +02:00
Andrew Lazarus b29036c08d
Updated filter naming convention for Free! 2018-06-22 16:00:28 +02:00
Rodrigo Primo e6c1ab38a8 Fix PHPCS error 2018-06-22 10:31:42 -03:00
Andrew Lazarus 38b904a09a Wrapped 'FREE' with a filter to allow different use cases for no shipping rate returning 2018-06-20 15:12:27 +02:00
Mike Jolley 5e6405b650 Merge branch 'master' into update/13359 2018-06-15 15:12:12 +01:00
Mike Jolley e92463632b Held stock qty check for pay page 2018-06-08 16:58:33 +01:00
Mike Jolley d76474789d variable name 2018-06-08 16:30:58 +01:00
Mike Jolley e38eccf828 Check pending orders even when hold stock is disabled 2018-06-07 17:42:23 +01:00
Mike Jolley 67dc3ea80a Hide rates when there are no rates and calculator is off 2018-06-01 21:28:21 +01:00
Mike Jolley 87b077e57a Check billing email is posted before using
Closes #20178
2018-05-23 15:04:03 +01:00
Mike Jolley 9c2edf4983 Moves around some includes so they are included before the autoloader needs to find them 2018-05-22 12:57:48 +01:00
Claudio Sanches 84c047dad1 Fixed includes/class-wc-cart.php PHPCS violations 2018-03-16 15:08:52 -03:00
Mike Jolley 1b905b2975
Merge pull request #19331 from woocommerce/add/coupon-wildcard-email
Add wildcard email support for coupons.
2018-03-13 10:05:06 +00:00
Gerhard Potgieter 01775a4443 Missing space 2018-03-13 07:34:47 +02:00
Claudio Sanches 768a21e788 Check if product has weight before calculate weigth total in cart
Closes #19347
2018-03-12 12:54:00 -03:00
Gerhard Potgieter 3910fbc270 Update method name 2018-03-09 11:00:57 +02:00
Gerhard Potgieter 1840d594ee Add wildcard email support for coupons.
Co-authored-by: l4ll3x
2018-03-09 10:57:12 +02:00
Mike Jolley 46862deb17 wc_get_cart_item_data_hash function 2018-03-05 19:57:57 +00:00
Mike Jolley 1901493eee Should be pulic. 2017-12-15 15:18:17 +00:00
Mike Jolley 01871fd2c8 Add getter for tax_display_cart variable, with filter 2017-12-15 13:39:35 +00:00
James Allan 82c282e83a Clone the child objects rather than instantiating new objects.
When cloning the cart, the current fees and session objects should
remain the same but have new pointers.
2017-12-08 21:15:45 +10:00
James Allan 83de162adb Only remove fees which belong to the cart which is being emptied/reset
If there are multiple instances of WC_Cart and therefore multiple
instances of WC_Cart_Fees, if 1 cart is emptied and
woocommerce_cart_emptied is triggered, all instances of WC_Cart_Fees
will trigger remove_all_fees, removing all the fees from all the carts.
2017-12-08 21:15:08 +10:00
Boro Sitnikovski d0f9aaa99a Merge branch 'master' into tweak/decouple-cart-template-methods 2017-12-07 20:16:08 +01:00
Boro Sitnikovski 588c5f3779 Change method name 2017-12-07 15:53:16 +01:00
Boro Sitnikovski 145d47c580 Decouple cart templating methods from WC_Cart class 2017-12-05 13:00:21 +01:00
Mike Jolley 17095a4011 Totals should be set to store DP setting. 2017-12-04 20:38:14 +00:00
JeroenSormani b96fea3e47 Add quantity arg to woocommerce_add_cart_item_data filter 2017-11-21 16:01:23 +01:00
Mike Jolley 8b02185596
Merge pull request #17817 from JeroenSormani/exclude-virtual-from-shipping-tax
Exclude virtual tax classes from calcluation for shipping taxes
2017-11-21 13:21:13 +00:00
JeroenSormani 14e5bcd51d Exclude virtual tax classes from calcluation for shipping taxes 2017-11-20 20:14:23 +01:00
Mike Jolley 78466a6665
Merge pull request #17599 from JPry/allow_clone_cart
Allow for cloning the WC_Cart object
2017-11-10 12:02:59 +00:00
Claudio Sanches 9979e4b3e5
Merge pull request #17589 from woocommerce/fix/17585
get_total_ex_tax should exclude fee taxes
2017-11-08 19:05:23 -02:00
Jeremy Pry 0e43551535 Move inline comment into the docblock 2017-11-08 10:18:08 -05:00
Jeremy Pry cf5bd606c6 Rename register_hooks() to init() 2017-11-08 10:17:52 -05:00
Mike Jolley 827d133cb2 Improve tests 2017-11-08 13:54:33 +00:00
claudiulodro 0e983c4fe9 Allow removing coupons even if coupons disabled 2017-11-07 10:33:11 -08:00
Mike Jolley c6c6a1e4b3 Grab all taxes individually 2017-11-06 16:34:45 +00:00
Mike Jolley 1b49e9a568 get_total_ex_tax should exclude fee taxes
Closes #17585
2017-11-06 16:18:21 +00:00
Jeremy Pry 9eee3805c0 Allow for cloning the cart object
This handles creating new instances of the `$session` and `$fees_api` properties.
2017-11-03 15:50:43 -04:00
Jeremy Pry 0cca83ff83 Add separate methods to register hooks
This facilitates cloning the cart without registering additonal hooks unnecessarily.
2017-11-03 15:49:45 -04:00
Dan Wyman 4c16aeac6d Coupon user limit check fix
Fixes a where clause problem. Fixes #17235 .
2017-10-16 18:40:46 +01:00
Mike Jolley 803b31a18c Switched to property_exists and moved deprecation notice to avoid errors and setting fees unnecessarily. 2017-10-13 13:46:49 +01:00
Boro Sitnikovski b11ed6e3db Fix direct access to props on checkout 2017-09-27 16:25:45 +02:00
Brent Shepherd 89e932c338 Fix shipping tax when calling calculate_shipping()
The $shipping_taxes is a multidimensional array so array_sum() does not
correctly sum the values. The $merged_taxes is a single level array with
all other taxes set, so array_sum() can be safely used on it.
2017-09-21 16:48:32 -07:00
Claudiu Lodromanean e713b5beb3 Merge pull request #16869 from woocommerce/fix/16861
Fix legacy access to array props (fees, taxes, coupon totals + taxes)
2017-09-21 09:47:29 -07:00
Brent Shepherd 470c5f7a1d Use __FUNCTION__ for filter hook name
To avoid including the WC_Cart class name and a double colon.

Example hook from WC_Cart::get_total():
 * Before this PR: woocommerce_cart_WC_Cart::get_total
 * After this PR: woocommerce_cart_get_total
2017-09-20 14:45:37 -07:00
Mike Jolley eb79566985 Fix legacy access to array props (fees, taxes, coupon totals + taxes)
Closes #16861
2017-09-20 15:39:05 +01:00
Gabor Javorszky d3ade84852 Add cart object to filters with quantity updates
No issue.

Other filters (remove cart item, restore cart item) have the cart object passed as well. These ones should be too.
2017-09-05 16:40:44 +01:00
claudiulodro 734ed70462 Fall back to defaults if not set in cart 2017-08-28 14:12:35 -07:00
Mike Jolley 22813663d7 Merge pull request #16569 from woocommerce/update/fees-api-class
WC_Cart_fees and negative fee calculations
2017-08-23 10:59:19 +01:00
Mike Jolley 00cb48a5fe Pass through to order 2017-08-22 16:20:23 +01:00
Mike Jolley 57865204aa Cart fees class and legacy 2017-08-22 15:17:58 +01:00
Umangvaghela 5794a9cb34 Update condition 2017-08-22 15:23:34 +05:30
Mike Jolley 3d002f842f Fix get totals method 2017-08-18 17:18:41 +01:00
Mike Jolley 4567169aa9 Fix remove from cart 2017-08-18 16:37:24 +01:00
Mike Jolley 1c8ad67a9e Fix tests and tax merges 2017-08-18 15:05:01 +01:00
Mike Jolley 302512e51f Combine taxes correctly 2017-08-18 13:48:53 +01:00
Mike Jolley a2858245fe Remove call - it's hooked 2017-08-18 12:52:29 +01:00
Mike Jolley d2e3839d99 Use getters and setters in cart class 2017-08-18 12:51:45 +01:00
Mike Jolley a190dc79c3 Legacy getters/setters 2017-08-18 12:24:17 +01:00
Mike Jolley b9fea8419b getters and setters for totals 2017-08-18 12:05:18 +01:00
Mike Jolley 0c751087f9 Cast to arrays 2017-08-18 11:44:07 +01:00
Mike Jolley aefb9c4705 Moved magic method to legacy 2017-08-18 11:37:22 +01:00
Mike Jolley c0368362ce First pass 2017-08-18 11:29:26 +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 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 6dc67ee133 phpcs 2017-08-08 10:51:35 +01:00
Mike Jolley 6af275da6e Only return tax classes if product is taxable.
Fixes #16241
2017-08-03 08:44:02 +02:00
claudiulodro 43cbcd04ef Remove extra calcs and populate item totals 2017-07-31 11:48:34 -07:00
Claudiu Lodromanean 95ffa441e0 Merge pull request #16290 from woocommerce/feature/15500-1
Soft deprecated WC_Cart->coupon_applied_count
2017-07-31 09:16:33 -07:00
Claudio Sanches 77855f9d07 Soft deprecated WC_Cart->coupon_applied_count 2017-07-28 18:12:56 -03:00
Claudio Sanches b8305f150e Use WC_Cart_Totals to calculate totals 2017-07-28 17:41:46 -03:00
Mike Jolley 51fbb1aec3 set_items_from_cart 2017-07-28 13:02:39 +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 d24faebea8 Split fixed cart from other discounts in class. 2017-07-18 20:42:47 +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
Caleb Burks 03d71cd8ee Add filter for cart cross-sells 2017-07-11 13:33:51 -05:00
Caleb Burks 5af560e32a Add `cart_subtotal` to the shipping package 2017-07-04 03:05:39 -05:00
Mike Jolley 748c39d966 Add note about #15904 2017-07-03 10:26:26 +01:00
claudiulodro 4e7d3333cf Use type check in coupon constructor 2017-06-27 13:53:56 -07:00
Mike Jolley 66c7c20844 Should work in reverse 2017-06-14 12:57:26 +01:00
Mike Jolley 985f7e043f Update totals if local pickup is selected 2017-06-14 12:46:59 +01:00
Mike Jolley 6eacecfeb6 Append blog ID on persistent cart user meta 2017-06-08 13:47:23 +01:00
Beka Rice 494fa0974c Filter quantity being added to the cart 2017-06-02 00:07:06 -04:00
Rasmus Bengtsson 185934fad9 Fix phpdoc to include params and correct types 2017-05-15 13:50:52 +02:00
Mike Jolley 0d89250b3f Merge pull request #14748 from woocommerce/fix/stock-in-cart-notice
Correct the stock display notice when a variable product manages stock for it's children
2017-04-27 17:38:59 +01:00
Mike Jolley aacb01d1e7 Merge branch 'pr/13503'
# Conflicts:
#	assets/css/twenty-seventeen.css
#	assets/css/woocommerce-layout.css
#	assets/css/woocommerce-layout.scss
#	assets/css/woocommerce.css
2017-04-27 12:46:05 +01:00
Mike Jolley 60a5ecf775 Merge pull request #13761 from franticpsyx/sold-individually-found-in-cart
[3.1] Add woocommerce_add_to_cart_sold_individually_found_in_cart hook
2017-04-27 11:32:33 +01:00
Mike Jolley dac36505c2 Correct the stock display notice when a variable product manages stock for it's children 2017-04-27 11:03:56 +01:00
Mike Jolley f9dd3310b2 Unfiltered context rather than true 2017-04-13 12:38:54 +01:00
Claudiu Lodromanean 715656921d wc_is_attribute_in_product_name 2017-04-10 14:35:16 -07:00
Mike Jolley 95397188d5 Make get_cross_sells unique.
Fixes #14158
2017-04-10 15:20:41 +01:00
Manos Psychogyiopoulos 24a2ff1960 Add woocommerce_add_to_cart_sold_individually_found_in_cart hook
Makes it easy for 3p code to change the condition that identifies whether a "sold individually" product is in the cart. For example, 3p code may use this hook to identify whether a product with the same ID already exists in the cart (instead of relying on finding the same hash/key).
2017-03-24 10:41:27 +02:00
Claudio Sanches 59c2849736 Changed version 2.7 to 3.0 2017-03-15 13:36:53 -03:00
JeroenSormani 91ce342e7c Type cast ->get_weight() on WC_Cart::get_cart_contents_weight calculation 2017-03-11 19:01:58 +01:00
Claudiu Lodromanean 28f8380ab6 Sprinkle some periods 2017-03-07 15:00:14 -08:00
Claudiu Lodromanean d0f47a7980 Revert to original behavior 2017-03-07 13:17:36 -08:00