Mike Jolley
c929b35f4f
$discount_total deprecated to prevent errors.
2014-12-12 16:39:24 +00:00
Mike Jolley
76ec750dbb
[2.2] remove_taxes needs to clear line_tax_data
2014-12-09 12:58:25 +00:00
Mike Jolley
76898699cd
Clarify variable comment #6830
2014-12-09 11:00:41 +00:00
Mike Jolley
eba8206540
Merge branch 'tax-coupon-handling' Closes #6830
...
Conflicts:
assets/js/admin/meta-boxes-order.min.js
includes/api/class-wc-api-coupons.php
includes/class-wc-cart.php
templates/checkout/review-order.php
2014-12-03 12:33:15 +00:00
Barry Kooij
23b38f9490
Typos
2014-11-29 12:35:36 +01:00
Barry Kooij
0ccf153227
Merge branch 'master' of github.com:woothemes/woocommerce
2014-11-29 12:33:43 +01:00
Barry Kooij
21b7fe60f6
Codestandards
2014-11-29 12:33:36 +01:00
Barry Kooij
c2321aeb94
Code standards.
2014-11-27 22:38:36 +01:00
Barry Kooij
d990daed57
Typo.
2014-11-27 22:36:46 +01:00
Nicola Mustone
b074f63a7e
Typo itme -> item
2014-11-26 19:07:13 +01:00
Mike Jolley
3c82331a8b
Store discount 'tax' to show discounts on prices including tax more accuratly
...
Also deprecated some functions named after having 2 levels of discounts.
2014-11-25 13:05:03 +00:00
Mike Jolley
549d7ab2c0
Removed 'apply before tax' options for coupons - this should be the default core behaviour
2014-11-24 17:24:25 +00:00
Mike Jolley
8b4332a037
Refactors to shipping tax rate methods
2014-11-21 13:06:33 +00:00
claudiosmweb
dbcf4de41f
Fixed WC_Cart::get_cart_item() return type
2014-11-19 09:46:40 -02:00
Claudio Sanches
c7dc0947c4
Merge pull request #6788 from SiR-DanieL/undo_cart
...
Undo cart removal
2014-11-19 09:31:09 -02:00
Nicola Mustone
37ea3faf0a
Added missing get_cart_item
2014-11-18 20:48:45 +01:00
claudiosmweb
f34cead914
Removed old code in favor of wc_tax_enabled() and wc_prices_include_tax()
2014-11-18 14:45:29 -02:00
Nicola Mustone
7eecb87d34
Added get_undo_url
2014-11-18 17:30:52 +01:00
Mike Jolley
f600c5ec05
Limit coupons to X needs to persist across lines during calc
...
Fixes #6745
2014-11-14 16:38:33 +00:00
Mike Jolley
1d3b8db754
Move formatting logic
2014-11-14 16:22:01 +00:00
Mike Jolley
668e5ffb5c
Some refactoring of the coupon class to load data with less code
2014-11-14 16:22:01 +00:00
ThomasSultana
d3542a2192
#6740 Expose Previous Item Quantity
...
woocommerce_after_cart_item_quantity_update will now also pass the old quantity. #6740
2014-11-13 12:11:24 +01:00
Mike Jolley
18ebded7c5
Make check_cart_items consistantly placed
...
Closes #6708
2014-11-12 15:47:27 +00:00
Mike Jolley
cb8fe34b4c
get_base_tax_rates() + filter. Closes #6668
2014-11-11 11:56:17 +00:00
Marin Atanasov
8892b1aeb0
fixing a typo in comments in WC_Cart and its tests
2014-11-09 17:42:49 +02:00
Barry Kooij
6312683eec
Small codestyle fix to add_discount method.
2014-10-28 11:51:33 +01:00
claudiosmweb
dfde3f0028
Prevents adding trashed products in the cart
2014-10-24 20:12:55 -02:00
Barry Kooij
80dc739ef0
Add return statement to check_cart_items
2014-10-24 20:56:06 +02:00
Barry Kooij
fbff5936d9
Added return statement to set_quantity
2014-10-24 16:02:31 +02:00
Barry Kooij
25d9b9e54a
WC cart codestyle
2014-10-24 15:35:45 +02:00
Barry Kooij
77521f699b
Optimized cart get_checkout_url method.
2014-10-21 15:08:51 +02:00
Chris Harvey
504253c909
Pass cart values to is_valid_for_product method
2014-10-10 15:44:18 +01:00
justinstern
26806660d4
include original $quantity with
...
woocommerce_add_to_cart_solid_individually_quantity filter
2014-09-24 16:54:15 -04:00
justinstern
b1c9db3282
Adds a woocommerce_add_to_cart_sold_individually_quantity filter
...
Additional control over the quantity added when a product is "sold
individually"
2014-09-24 16:38:52 -04:00
Shiva Poudel
0b58d335b8
Reverted access public
...
Thanks! @tamarazuk
2014-09-15 08:17:19 +05:45
Shiva Poudel
6e58c45196
@access public in docblock
2014-09-15 01:40:24 +05:45
Shiva Poudel
40fe9ffd2f
check_cart_item_validity() should have have public
2014-09-15 01:37:51 +05:45
Shiva Poudel
40ec40a411
Found and fix docblock comment
2014-09-15 01:35:22 +05:45
Shiva Poudel
8e09892064
better at get_option() @ L91
2014-09-15 01:33:13 +05:45
Shiva Poudel
a4f6b0f9f9
Converted Indentations to tabs
2014-09-15 01:29:56 +05:45
Shiva Poudel
f829e53a96
New line for docblock
2014-09-15 01:24:50 +05:45
Shiva Poudel
ccf15ff06b
Better docblock ;)
2014-09-15 01:22:48 +05:45
Shiva Poudel
cf421b1c12
OOPS! again time constant
2014-09-15 01:18:46 +05:45
Shiva Poudel
a2ab230efb
Use of time constant
2014-09-15 01:17:14 +05:45
Shiva Poudel
1e7a3ae6d3
indendation Improvement for WC_Cart
2014-09-15 01:14:32 +05:45
Mike Jolley
27a20dd80e
Docblock changes
2014-09-08 16:35:40 +01:00
Mike Jolley
c4ef86d44e
scrutinizer patches
2014-09-08 00:37:55 +01:00
Mike Jolley
602254851a
Reset fees before calculating/adding them again
...
Fixes #6090
@claudiosmweb Do you see any issues with this?
2014-08-26 15:39:19 +01:00
Barry Kooij
94365791af
Changed all use of get_product to wc_get_product
2014-08-19 12:09:29 +02:00
Nicola Mustone
e49fe4c713
Added parenthesis
...
WP coding standard says to add always parenthesis
2014-08-07 18:26:48 +02:00
claudiosmweb
0617d53353
fixed undefined offset when added products in cart
2014-08-04 16:37:42 -03:00
Mike Jolley
e02d94d305
Fix stock logic in 2.2 for variations with parents which manage stock
...
Closes #5957 @claudiosmweb can you review this change?
2014-08-04 10:51:54 +01:00
Mike Jolley
3f906b1ffa
Change shutdown hook priority
...
Fixes #5860
2014-07-31 07:26:49 +01:00
Mike Jolley
c465c7235d
Merge branch 'credit-notes'
...
Conflicts:
includes/abstracts/abstract-wc-order.php
includes/class-wc-order-factory.php
includes/class-wc-post-types.php
includes/wc-formatting-functions.php
includes/wc-order-functions.php
2014-07-29 12:09:52 +01:00
Mike Jolley
134f31abb9
Taxes were stored backwards
...
cc @claudiosmweb
2014-07-23 11:37:02 +01:00
Mike Jolley
ab36ec12d5
Merge pull request #5822 from helgatheviking/fix/add-to-cart
...
add_to_cart() return $cart_item_key
2014-07-22 18:32:55 +01:00
Kathy Darling
7e0121a0d9
update docblock for add_to_cart() method
2014-07-22 12:25:12 -04:00
claudiosmweb
5152457d9d
improved the saving the new tax data
2014-07-20 01:28:16 -03:00
claudiosmweb
93cf3c88bd
initial implementation of order items taxes
2014-07-19 01:08:02 -03:00
Mike Jolley
9e6caec3a2
set cookies on shutdown in case of redirect.
2014-07-11 15:40:18 +01:00
Mike Jolley
755001f19b
Use order types where required
2014-07-11 12:43:42 +01:00
Kathy Darling
5a88e77959
add_to_cart() return $cart_item_key
2014-07-09 16:33:40 -04:00
Mike Jolley
137bf945ab
Defer cart cookie being set
2014-06-30 15:14:32 +01:00
Mike Jolley
ef3e728855
Setters + wc_create_order + wc_update_order for #4169
2014-06-11 15:10:03 +01:00
Mike Jolley
f30e95663b
Prefixes for queries
2014-06-03 11:29:01 +01:00
Mike Jolley
543ed6f207
Optimise cart class
2014-05-30 16:17:51 +01:00
Mike Jolley
42f9eab1bc
[2.1] Fix coupon limit checks and enhance to check ID by provided email (if logged out)
...
Fixes #5535
2014-05-22 16:23:01 +01:00
Mike Jolley
8ccfd3a2ae
Merge pull request #4618 from leewillis77/add_user_id_to_packages
...
[2.2] Add user ID to shipping packages
2014-05-15 10:44:14 +01:00
Mike Jolley
ffb6dcee4a
Brackets
2014-05-08 10:35:51 +01:00
Mike Jolley
55ad5bb0ad
Remove title from product not purchasable message
2014-04-30 10:04:16 +01:00
Mike Jolley
a6a65a2a9d
typecast $used_by to array in case its not set. Closes #5350
2014-04-24 15:26:38 +01:00
Akeda Bagus
2a97f07d47
Typo fix.
2014-04-15 22:56:35 +07:00
Mike Jolley
937db45913
[2.2] Merge ship to billing and billing only options
...
+ update options, update files to use new option + function Closes #5284
2014-04-08 16:28:27 +01:00
Mike Jolley
c981bb56ca
Merge pull request #5230 from ChromeOrange/master
...
show shipping form filter
2014-03-31 11:56:57 +01:00
Mike Jolley
24c2c845b7
When removing base taxes, round to precision.
2014-03-31 11:12:12 +01:00
Andrew Benbow
b3fc8cbdf6
Update class-wc-cart.php
2014-03-28 14:40:56 +00:00
Andrew Benbow
a8e941513c
Update class-wc-cart.php
2014-03-28 14:10:53 +00:00
Andrew Benbow
290043b108
Update class-wc-cart.php
2014-03-28 10:41:17 +00:00
Mike Jolley
9c913de1f2
Brackets
2014-03-25 11:36:35 +00:00
Brent Shepherd
49be7992e6
Add 'woocommerce_cart_taxes_total' filter
2014-03-20 17:54:18 -07:00
Mike Jolley
7bce58e9a1
URL decode not needed for custom text attribute names Closes #5155
2014-03-18 11:36:38 +00:00
Mike Jolley
6fcdccd73b
Ensure attributes exist
2014-02-28 15:42:16 +00:00
Mike Jolley
2e8c2e7396
Fix after tax coupon amounts
2014-02-27 14:14:17 +00:00
Mike Jolley
5062de9767
Fix display of fee_taxes when spanning multiple tax classes Closes #4803
2014-02-20 16:39:57 +00:00
Mike Jolley
3be6664f05
Handle get_rate_code when no matching rate is found. Prevents notices.
2014-02-17 15:11:50 +00:00
Mike Jolley
ca782212de
define cart_session_data in constructor Closes #4822
2014-02-17 10:16:06 +00:00
Mike Jolley
551ca62c3d
Fix saving of fee tax total Closes #4774
2014-02-13 15:42:17 +00:00
Mike Jolley
ca09b0a8bc
When add_to_cart is called, ensure the correct product_id is set for variations. Closes #4650
2014-02-12 13:05:20 +00:00
Mike Jolley
e713fc68b8
return a string for get_cart_url and get_remove_url Closes #4724
2014-02-12 12:33:02 +00:00
Mike Jolley
875694e2eb
Fix array sum and out of base subtotals
2014-02-05 11:45:26 +00:00
Coen Jacobs
60f04ee3b4
Merge pull request #4638 from woothemes/simple_fee_tax_calculation
...
Tax total for fees added to total fees
2014-02-05 12:32:25 +01:00
Coen Jacobs
b5ad68ff2a
Remove unused total fee tax variable
2014-02-05 12:31:23 +01:00
Coen Jacobs
3d7c2fc297
Tax fees should respect tax rates too
2014-02-05 12:30:47 +01:00
Coen Jacobs
c9d39bcc8b
Tax total for fees are already flattened
2014-02-05 12:03:56 +01:00
Mike Jolley
e453e6f17d
After tax coupons * qty Closes #4625
2014-02-04 13:35:04 +00:00
Mike Jolley
ad84eea2f7
Ensure coupons get totalled when prices exclude tax. Closes #4604
2014-02-03 15:29:44 +00:00
Lee Willis
8446e73c49
Add user ID to shipping packages
2014-02-02 22:30:17 +00:00
Mike Jolley
8f2b9afe93
Check for the term object
2014-01-28 12:13:19 +00:00
Mike Jolley
e04fafcba9
Correctly total and loop fee taxes Closes #4559
2014-01-22 14:10:11 +00:00
Geert De Deckere
d563ff543d
Improved notices in the add_to_cart() method
...
- Moved the button markup out of the translation strings.
- Used get_cart_url() instead of get_permalink( wc_get_page_id( 'cart' ) ).
- Added some newlines to improve code readability.
2014-01-04 23:46:43 +01:00
Mike Jolley
0c9962cf93
Get correct name Fixes #4385
2013-12-24 14:28:25 +00:00
thenbrent
8ad3326016
Only allow a fee to be added once
2013-12-13 13:10:25 -08:00
Coen Jacobs
61a783886d
Suggested code changes in #4266
2013-12-03 15:03:25 +01:00
Gregory K
f937c36250
Inconsistent return types: TODOs
2013-12-03 14:53:49 +01:00
Coen Jacobs
1cb8aa1724
Code styling fixes and return values for #4244
2013-11-29 10:15:58 +01:00
Gregory K
43ca01badc
PhpDocs and TODO comments
2013-11-28 12:59:09 -05:00
Gregory K
5caf292456
PhpDoc fix in class-wc-cart
2013-11-25 10:06:06 -05:00
Coen Jacobs
c800d83182
Merge pull request #4197 from tivnet/master
...
Corrected some PhpDocs in class-wc-cart
2013-11-25 06:43:38 -08:00
Coen Jacobs
47ae00be28
Page functions woocommerce to wc refactor
2013-11-25 15:07:22 +01:00
Coen Jacobs
c1a439eb99
Formatting functions woocommerce to wc refactor
2013-11-25 14:34:21 +01:00
Coen Jacobs
aaa14894ca
Core functions woocommerce to wc refactor
2013-11-25 13:45:04 +01:00
Gregory K
f2e34496d0
Corrected some PhpDocs in class-wc-cart
2013-11-25 07:40:16 -05:00
thenbrent
1ce5500b06
Add WC_Cart::get_cart_for_session()
2013-11-22 15:30:24 -08:00
thenbrent
bb14495064
Check products are purchasable when restoring cart
...
If WC_Product::is_purchasable() is only called when adding a product to the cart,
it's possible to purchase products that aren't purchasable (but were when they were
added to the cart).
2013-11-22 15:14:08 -08:00
Mike Jolley
6ea8cad430
Related display fixes for attributes #4123
2013-11-18 14:11:40 +00:00
Coen Jacobs
90008d7143
Merge remote-tracking branch 'thenbrent/new_notice_api'
...
Conflicts:
includes/shortcodes/class-wc-shortcode-cart.php
includes/wc-message-functions.php
woocommerce-ajax.php
2013-11-18 12:44:22 +01:00
Mike Jolley
197c0c76cc
Only unset cookie if it exists #3513
2013-11-13 14:55:15 +00:00
Mike Jolley
b116d7619d
Ex tax calcs Closes #4100
2013-11-13 12:12:27 +00:00
thenbrent
0d45e19fcf
Update calls to wc_add_error() function
...
Part of #4034
2013-11-12 20:59:39 -08:00
Mike Jolley
3fd02a57d0
Locales - store standardised values, and display using locale in admin #3862
2013-11-12 17:43:30 +00:00
Mike Jolley
95c0a67fdf
Merge pull request #4017 from scottbasgaard/master
...
Define line_subtotal and line_subtotal_tax to avoid PHP notice in cart.
2013-10-29 09:49:55 -07:00
James Koster
1fbb6249ff
Replaced → / ← on frontend with icons from our font. closes #4009
2013-10-28 09:45:59 +00:00
Scott Basgaard
5676c8d919
Define line_subtotal and line_subtotal_tax to avoid PHP notice in cart.
2013-10-26 16:22:09 +02:00
Mike Jolley
a099f3f37c
Put back old coupon storage logic so plugins can add amounts later than construct. Also streamlined get/set session data.
2013-10-25 19:28:09 +01:00
Mike Jolley
19c3ab7172
calc_tax functions
2013-10-24 16:16:39 +01:00
Mike Jolley
6d32dafa79
debug
2013-10-24 14:55:23 +01:00
Mike Jolley
e4ff61f475
You know when you've been benbowed
2013-10-24 14:53:01 +01:00
Mike Jolley
0d8d95e8e6
total calcs
2013-10-24 13:41:42 +01:00
Mike Jolley
51aba21d76
Rounding + precision for taxes. Store unrounded. Round down (for the moment) for taxes
2013-10-24 13:15:42 +01:00
Mike Jolley
5d2e1ac031
Refactor coupon code so coupons get the actual discount amount, redone edit coupon screen with tabs, added coupon item limits which Closes #3902
2013-10-18 18:10:58 +01:00
Mike Jolley
f56edb66e4
Unused vars Closes #3937
2013-10-17 15:32:45 +01:00
Mike Jolley
47df526518
Prepend main WC Session cookie with 'wp' so batcache doesn't cache pages, and set cookie only when cart has contents. #3513
2013-10-17 15:29:53 +01:00
Gregory K
5f65586167
get_product_subtotal() PHPDoc fix
2013-10-16 09:29:48 -04:00
Gregory K
571500930f
get_product_price() : PHPDoc fix
2013-10-16 08:24:46 -04:00
Mike Jolley
40c85ec09a
Merge pull request #3881 from Gator92/tax_totals
...
Add tax_rate_id to objects returned from cart->tax_totals
2013-10-04 15:04:05 -07:00
Mike Jolley
b7a752ecc1
find_product_in_cart tweak Closes #3863
2013-10-04 12:30:07 +01:00
Mike Jolley
1b91c75039
Tweak add to cart message. Closes #3876 .
2013-10-04 12:26:11 +01:00
Schuyler Langdon
7f71fae0a3
Add tax_rate_id to the tax total objects returned from the cart tax_totals method
2013-10-03 21:48:47 -04:00
Mike Jolley
c20a44c423
Coupon usage limits per user (using email + ID). Closes #3314
2013-10-01 11:48:27 +01:00
Mike Jolley
5954619e02
Set session when removing last item. Closes #3739
2013-09-23 14:01:17 +01:00
Mike Jolley
71cb94ebfa
Simpler tax rate check which Closes #3813
...
Could do with some more testing @ChromeOrange, and applying to .15 if
ok @coen
2013-09-23 12:44:15 +01:00
thenbrent
fb548d145e
Fix logic on coupon check
2013-09-18 17:02:56 -07:00
thenbrent
13e337b82d
Fix coupon checks in cart
2013-09-18 16:49:29 -07:00
Mike Jolley
355dd16962
Removed @coenjacobs helpers and cleaned up main clas
2013-09-12 14:41:02 +01:00
Mike Jolley
c501b1b59a
Remove taxes from cart with a zero-rate.
2013-09-10 11:04:29 +01:00
Mike Jolley
75f9dfabc6
Remove round for percent discounts. Closes #3717
2013-09-03 13:45:38 +01:00
Mike Jolley
54b3d53a1b
Flag a refresh when creating an account to prevent nonce issues. Fixes #3612 .
...
@coenjacobs Might be for .14? Part of it anyway, can't cherry pick this
one.
2013-09-02 17:43:57 +01:00
Mike Jolley
44b9c72651
Improve cart update performance. Closes #3495 .
2013-08-19 15:19:51 +01:00
Mike Jolley
e01df544ec
Reworked total templates to support coupon lines, and started support for multiple shipping methods per order.
...
@todo store shipping methods in the order
@todo test with PP shipping real world
cc @coe
2013-08-14 21:00:34 +01:00
Mike Jolley
64e1b091a0
Add a dedicated hook for adding fees. Closes #3611 . Fixes #3352
...
@coenjacobs we might want this in .14 for some extensions in audit.
2013-08-13 17:19:20 +01:00
Mike Jolley
2b31cdb360
Cart item data templates Closes #3216 .
2013-08-13 14:14:24 +01:00
Mike Jolley
03af136986
Separate ship to options from sell to. Closes #3215 .
2013-08-02 16:54:28 +01:00
Mike Jolley
d0fd42ab1a
US Spelling of fulfil Closes #3570 .
2013-08-02 11:18:05 +01:00
Mike Jolley
b2e3df20e3
Remove trashed and non-existant products from the cart. Closes #3457 .
2013-07-30 11:51:50 +01:00
Coen Jacobs
9bcf44106c
Also apply #3405 to master branch
2013-06-28 13:10:44 +02:00
Mike Jolley
a9569ccd6f
Only allow those who can edit the post to add drafts to cart. For testing. Closes #3381
2013-06-28 11:14:21 +01:00
Mike Jolley
e6db7d2c0c
Set session after removing item. Closes #3382 .
2013-06-28 11:03:12 +01:00
Mike Jolley
3b5d8b7d41
Futher standardisation of cart and order loops. Closes #3348 .
2013-06-17 12:21:24 +01:00
Mike Jolley
f87505b445
Rounding tweaks
2013-06-13 17:01:47 +01:00
Mike Jolley
c72ae714f7
Removed nonce helper
...
@coe
2013-06-11 17:55:55 +01:00
Mike Jolley
646a8a008c
Make use of new functions
2013-06-11 15:59:54 +01:00
Mike Jolley
c75ea04c1c
classes -> includes
2013-06-11 14:25:30 +01:00