Commit Graph

327 Commits

Author SHA1 Message Date
Aristeides Stathopoulos 0516e96843 PEAR.Functions.FunctionCallSignature.SpaceBeforeCloseBracket 2016-09-02 04:33:57 +03:00
Aristeides Stathopoulos d922d045a7 Squiz.Commenting.BlockComment.NoNewLine + indentation on class-wc-cart 2016-09-02 04:03:52 +03:00
Aristeides Stathopoulos fde1037757 fix failing tests. 2016-09-01 23:50:14 +03:00
Mike Jolley 1b2df3dd3b Merge branch 'pr/11797'
# Conflicts:
#	includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php
#	includes/api/class-wc-rest-coupons-controller.php
#	includes/class-wc-coupon.php
#	tests/unit-tests/api/coupons.php
#	tests/unit-tests/coupon/crud.php
2016-09-01 11:46:05 +01:00
Mike Jolley 047242515d Make API and CRUD use consistent keys and make use of data 2016-08-30 17:50:35 +01:00
Aristeides Stathopoulos e69fafbda7 WordPress.WhiteSpace.OperatorSpacing.NoSpaceAfter 2016-08-27 09:06:22 +03:00
Aristeides Stathopoulos f2730eea02 WordPress.WhiteSpace.ControlStructureSpacing.BlankLineAfterEnd 2016-08-27 08:57:05 +03:00
Aristeides Stathopoulos b063bcfe4c last item in a multiline-array should end in a comma 2016-08-27 04:46:45 +03:00
Mike Jolley 461ec4da16 Return false instead of throwing exception 2016-08-25 17:48:36 +01:00
Mike Jolley 3c13ce6fcd [2.6] Handle object when generate_cart_id is used.
Closes #11767
2016-08-25 10:58:11 +01:00
Mike Jolley 4ac4bcaa08 Merge branch 'master' into WC-CRUD
# Conflicts:
#	tests/unit-tests/cart/cart.php
2016-08-09 11:08:21 +01:00
Mike Jolley 54256c4123 Round prices being saved to DB 2016-08-05 14:06:51 +01:00
Mike Jolley 1bc9da3e91 Merge branch 'master' into WC-CRUD
# Conflicts:
#	includes/class-wc-coupon.php
2016-08-04 12:10:04 +01:00
Krzysztof Grabania 0276a3574b Removed unnecesary foreach loop 2016-07-22 14:55:51 +02:00
Kathy Darling cfafff192d add woocommerce_cart_id filter 2016-07-19 10:20:08 -05:00
Claudio Sanches 7778583340 Fixed wrong number of decimal precision, closes #11368 2016-07-11 17:26:54 +02:00
Mike Jolley 78142a8ebb Merge branch 'master' into WC-CRUD
# Conflicts:
#	includes/class-wc-checkout.php
#	includes/class-wc-coupon.php
#	includes/class-wc-customer.php
#	tests/unit-tests/cart/cart.php
#	tests/unit-tests/cart/functions.php
#	tests/unit-tests/coupon/coupon.php
#	woocommerce.php
2016-06-13 15:01:58 +01:00
Mike Jolley 730019ef18 scrutinizer best practice 2016-06-06 19:39:23 +01:00
Mike Jolley 3fd15ad50f Unused vars and code docs 2016-06-06 18:57:24 +01:00
Mike Jolley 2d2a5eb816 Hide empty taxes by default.
Closes #11050 @claudiosmweb
2016-06-06 13:50:21 +01:00
Mike Jolley c14993b90e No shipping methods = no shipping at checkout
#10987
2016-05-25 12:05:33 +01:00
Mike Jolley e00c3450c5 Discount rounding logic improvements
Instead of rounding the single item discount amount, this rounds the
line to the store DP setting before running tax logic.

Fixes #10963
Also works with #10573

Includes unit tests
2016-05-23 16:56:31 +01:00
James Golovich 96583d99c0 Pass $cart_item_key to 'woocommerce_get_undo_url' filter
I don't want users to automatically get an item re-added to their cart, I want to change the URL to send them back to the product page so they can re-add the item (if it is still available)
2016-05-19 13:46:22 -07:00
Ryder Ross 9a9dd7faf4 Fixing typo in comment 2016-05-10 09:17:28 -07:00
Fredrik Forsmo 4e19676acf Add `public` to `needs_shipping_address` method 2016-04-20 21:05:23 +02:00
Mike Jolley 6ae2fea045 Allow default address to be empty.
Fixes #10664
2016-04-18 14:51:39 +01:00
Mike Jolley a77735432b Use get_displayed_subtotal() to determine if conditions for coupons and free shipping is met.
@claudiosmweb

Closes #10711
2016-04-18 11:39:00 +01:00
JeroenSormani b77445787e Fix few typos and small docblock changes 2016-03-30 18:23:44 +02:00
Mike Jolley 1238a37124 Merge pull request #10576 from justinshreve/coupon-crud
Coupon CRUD
2016-03-18 11:12:32 +00:00
Justin Shreve ffc80ccd15 Start updating some usage, and start implementing the actual CRUD functions, and some new get/setters for username, email, etc. 2016-03-17 09:41:12 -07:00
Justin Shreve 3eacb992bc Address issues from Mike's Feedback:
* Rename individual use, free shipping, and exclude sale items to match their meta names closer.
* Sanitize emails when using set_email_restrictions
* Remove some unnecessary explict true checks
* Move ID into _data with the rest of the fields
* Fixed some spacing issues
2016-03-17 09:19:27 -07:00
Justin Shreve d738dec05d Coupon CRUD (WIP). 2016-03-17 09:19:27 -07:00
Mike Jolley 726728071b [2.5] Hide shipping row when calculator is disabled, and shipping costs are hidden
Fixes #10519
2016-03-10 12:26:52 +00:00
Mike Jolley 3dba3378c2 Merge pull request #10315 from woothemes/layered-nav-wp-query
Layered Nav Improvements
2016-02-12 11:59:40 +00:00
Mike Jolley 8fd336cb0e Prime cache to reduce queries per cart item 2016-02-09 23:36:15 +00:00
Mike Jolley 854bc5d744 Don't auto load options for cart - reduce queries 2016-02-09 23:14:38 +00:00
Mike Jolley 352184cc06 Merge branch 'master' into shipping-zones
# Conflicts:
#	assets/css/admin.css
#	i18n/languages/woocommerce.pot
#	includes/abstracts/abstract-wc-payment-gateway.php
#	includes/abstracts/abstract-wc-shipping-method.php
#	includes/admin/settings/class-wc-settings-shipping.php
#	includes/wc-core-functions.php
#	uninstall.php
2016-02-05 14:58:48 +00:00
Mike Jolley e0c10e9be3 Allow has_coupon to detect any coupon applied
Closes #10251
2016-02-05 11:39:31 +00:00
Mike Jolley 1076854608 Merge branch 'master' into shipping-zones
# Conflicts:
#	assets/css/admin.css
#	includes/abstracts/abstract-wc-shipping-method.php
#	includes/class-wc-shipping.php
#	includes/shipping/flat-rate/class-wc-shipping-flat-rate.php
#	includes/shipping/flat-rate/includes/class-wc-eval-math.php
#	includes/shipping/free-shipping/class-wc-shipping-free-shipping.php
#
includes/shipping/legacy-international-delivery/class-wc-shipping-legacy
-international-delivery.php
#
includes/shipping/legacy-local-delivery/class-wc-shipping-legacy-local-d
elivery.php
2016-01-11 11:48:18 +00:00
Mike Jolley d13fb8f482 Let check_cart_item_validity remove multiple items during check
Fixes #10050
2016-01-11 10:32:46 +00:00
Fredrik Forsmo 560dd06b1f Improve docblock comments in WC_Cart class
* Added comments to properties that don’t have any.
* Added comments to `remove_taxes` and `get_fees`
* Renamed boolean to bool
* Renamed integer to int
2016-01-06 15:47:16 +01:00
Mike Jolley 97d47fb576 Move zones to main settings 2016-01-05 11:23:15 +00:00
Mike Jolley 03ba8539f6 Stop coupon logic when 0 is hit so coupons can apply to other lines
Fixes #9870
2015-12-29 13:16:43 +00:00
Mike Jolley fd9dac0f20 Revised get_cart_contents_weight and get_cart_contents_count
Closes #9656
2015-11-30 13:12:12 +00:00
Nicola Mustone c9da4f928a check if ABSPATH is defined 2015-11-06 10:22:19 +01:00
Claudio Sanches 5893875b0c Removed period for file headers 2015-11-03 11:53:50 -02:00
Claudio Sanches ee30b5b308 Fixed php docs standards 2015-11-03 11:31:20 -02:00
Claudio Sanches 0ff88deb98 Improved wc_coupons_enabled() name and description 2015-10-29 17:23:10 -02:00
Claudio Sanches f64ea948f1 Replaced WC()->cart->ship_to_billing_address_only() to wc_ship_to_billing_address_only() 2015-10-28 16:03:24 -02:00
Claudio Sanches 29229ada45 Added deprecated description to WC_Cart methods 2015-10-28 16:01:03 -02:00
Claudio Sanches 1caaea7b33 Moved methods from WC_Cart to single functions
Changes:

- WC_Cart::coupons_enabled() to wc_is_coupons_enabled()
- WC_Cart::get_cart_url() to wc_get_cart_url()
- WC_Cart::get_checkout_url() to wc_get_checkout_url()

This methods can be used in any place, but WC_Cart() is present only on
the frontend.
2015-10-28 15:43:31 -02:00
Mike Jolley b27635409c New Session Handler
This merges and adapts
https://github.com/kloon/woocommerce-large-sessions for core. Closes
#6846.

Differences:
- Rather than delete each cache key individually, this invalidates all
at once (idea from https://core.trac.wordpress.org/ticket/4476)
- Removes ‘replace’ which increments session_id keys unnecessarily.
- Fixes remove/restore cart sessions from making it dirty each page load

Kudos to @kloon for the bulk of the work and testing on Woo.com.

cc @claudiosmweb
2015-10-07 14:47:29 +01:00
Mike Jolley 1defb3fb4f Explain the fees method in more detail.
Closes #9231 Closes #9193
2015-10-01 10:05:16 +02:00
Mike Jolley 3e55364e3a Merge pull request #8940 from woothemes/issues/8482
Tidy up how we're dealing with coupon postmeta around `_used_by` which can get big.
2015-09-15 16:42:51 +01:00
Mike Jolley 0830543c4f Add disclaimer to woocommerce_adjust_non_base_location_prices 2015-09-15 16:01:11 +01:00
Mike Jolley 4959937689 Merge branch 'universal-pricing-test' 2015-09-15 15:57:04 +01:00
Mike Jolley 1c68137cf9 Only run maybe_set_cart_cookies if cart was loaded 2015-09-07 11:38:24 +01:00
Mike Jolley e08f8d8902 Apply woocommerce_adjust_non_base_location_prices to all prices 2015-09-04 10:48:50 +01:00
Mike Jolley 31ed6c2531 woocommerce_adjust_non_base_location_prices test (false for now, should be true for current behavior) 2015-09-04 10:33:51 +01:00
Mike Jolley 91ac7fc974 To prevent discounts being applied in 'random' order (based on order added to cart), sort cart items based on subtotal during calculate_totals.
Closes #8987

@claudiosmweb @georgestephanis does this change look sane to you folks?
2015-09-01 13:16:55 +01:00
George Stephanis a17addae0a Migrate the actual querying of the underlying data structure.
Move it into the relative class for tidiness, and have it be called via
an access function.
2015-08-24 14:30:13 -04:00
Mike Jolley 7d27707043 Tax inclusive prices rounding issue
Remove rounding on cart_contents_total so total is calculated correctly.

Prevents issues with half rounded taxes and half rounded items.

Fixes #8776
2015-08-11 14:17:52 +01:00
Mike Jolley 257010695e Readme, versions, develop blog links 2015-08-10 10:39:08 +01:00
Claudio Sanches 050d073678 Removed double ;; #8629 2015-07-21 19:49:05 -03:00
Claudio Sanches 409dd81ab9 Fixed unit tests for WC_Cart::get_remove_url() 2015-07-14 12:02:32 -03:00
Vignesh 0588c9fe1c get_permalink to wc_get_page_permalink
changed get_permalink to wc_get_page_permalink on class-wc-cart.php
2015-07-14 17:49:29 +05:30
Mike Jolley 53916e38bb Just return the URL 2015-07-13 11:00:10 +01:00
Vignesh e063d068d7 get_permalink to wc_get_page_permalink
Changed get_permalink to wc_get_page_permalink.
2015-07-13 15:01:52 +05:30
Mike Jolley 45d89438c7 Ensure cart item key is set 2015-07-04 15:25:08 +01:00
Mike Jolley 049c95e724 Filter all item data
Closes #8361
2015-06-30 13:40:32 +01:00
Mike Jolley 1e5d508675 woocommerce_removed_coupon
since the other action is ‘woocommerce_applied_coupon’ Closes #8404
2015-06-19 13:50:59 +01:00
Mike Jolley 71673684fb [2.3] get_discounted_price needs to check if taxes are enabled
Closes #8267
2015-06-05 11:24:59 +01:00
Mike Jolley 5920b88d5d Add classes to tax and shipping labels/notices
Closes #8189
2015-05-27 16:17:36 +01:00
Nikki DelRosso 536d3096f2 Replaced missing end parenthesis 2015-05-14 14:37:17 -07:00
Nikki DelRosso 940c2369b0 Added method to check if cart is empty 2015-05-14 14:18:53 -07:00
Mike Jolley 02c346eb87 Filter before and after unsetting cart items
Closes #8110
2015-05-08 10:26:04 -07:00
Mike Jolley 8bb7a8c934 [2.3] Move action to prevent infinite recursion on login/restoring saved cart
Thanks @roykho. Follow up to #7852
2015-05-01 15:33:24 +01:00
Mike Jolley 5b1ea0dea1 Remove comments 2015-04-10 10:44:13 +01:00
Mike Jolley 68194bf0ed Round discount totals 2015-04-10 10:28:46 +01:00
Mike Jolley 1f3365f206 Prevent infinite recursion by calling get_cart_from_session once
Closes #7852

A check was aded to prevent get_cart() usage before wp_loaded so all WC
components have a chance to load prior to the cart.

This should solve the edge-case recursion bug by first checking if the
woocommerce_cart_loaded_from_session action has already run. This is
triggered when loading the cart for the first time.
2015-04-09 12:49:20 +01:00
Mike Jolley 557a304326 Merge branch 'coupon-calc' 2015-03-24 15:52:38 +00:00
Mike Jolley aed8ae36cf woocommerce_calc_discounts_sequentially option to keep backwards compatible 2015-03-24 15:51:53 +00:00
Mike Jolley b35e7f7d4a Cast product IDs to int when adding to cart
Closes #7245
2015-03-24 12:56:13 +00:00
Mike Jolley 5e538b88e7 Use undiscounted price for coupons 2015-03-24 12:55:28 +00:00
Mike Jolley ea910f7d4f Merge branch 'wc-ajax-endpoint' 2015-03-23 12:53:53 +00:00
Mike Jolley 17fb3874e6 [2.3] Ensure coupon taxes are reset when calculating totals.
Fixes #7780
2015-03-20 15:03:50 +00:00
Mike Jolley b729480838 Prevent cart hash becoming invalidated due to product/post data 2015-03-20 13:00:05 +00:00
Mike Jolley 70d125ae96 [2.3] Fix - get_total_discount() function with certain tax setups.
Revised how discounts/discount taxes are stored for consistency. Always
store ex. tax to make data retrieval easier, and to ensure totals are
correct after settings changes. Backwards compatibility maintained
through use of order versioning.

#7728
2015-03-16 12:17:09 +00:00
Mike Jolley 9f269f765d Load persistent cart when empty, and Prevent cart being cleared when accessing the login page.
Closes #7636
2015-03-06 12:02:02 +00:00
Mike Jolley 4c411a69e7 * Fix - Saving an order needs to save the discount amount ex. tax like
the cart.
* Tweak - Show discounts inc. tax when showing order totals inc. tax.

Closes #7532

@barrykooij @claudiosmweb How does this look? Looks like we were saving
order discounts inconsistent with the cart/checkout
2015-02-23 17:39:57 +00:00
Piotr Bogdan 9d75ad17e8 Fix backward compatibility for WC_Cart::$tax. 2015-02-11 17:06:17 +00:00
Mike Jolley 9afa2848d7 woocommerce_remove_cart_item_from_session with $key and $values
@helgatheviking

$this isn’t needed - WC()->cart to access cart class.
2015-02-11 12:30:54 +00:00
Kathy Darling 39fcc19ff6 trigger an action if an item is dropped from the cart session 2015-02-11 12:12:27 +01:00
Mike Jolley 0300ce2768 Undefined and dead variables in cart class 2015-02-03 15:23:25 +00:00
Manos Psychogyiopoulos f8567680da added remove/restore cart item hooks 2015-02-02 16:01:43 +02:00
Mike Jolley e810672430 Remove reference to deprecated property
Closes #7249
Closes #7248
2015-02-02 12:38:37 +00:00
Mike Jolley 59359ef9b4 Try catch block in add_to_cart to allow plugins to abort the add to cart event
cc @claudiosmweb @barrykooij
2015-01-27 16:02:57 +00:00
Mike Jolley 2e38fc9041 Removed ID check - $the_coupon->is_valid() checks for existance 2015-01-27 12:11:58 +00:00
Mike Jolley 0b252d03f4 Added conditional to unset session itself
Closes #7182
2015-01-26 11:42:24 +00:00
Scrutinizer Auto-Fixer 19f660171e Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-01-23 14:37:20 +00:00