Commit Graph

152 Commits

Author SHA1 Message Date
Mike Jolley c752ba4a9f Merge taxes by CODE so totals are displayed clearer. Also added additonal function for getting merged tax totals, and to keep compatibility with themes. #2815 2013-03-27 18:21:06 +00:00
Mike Jolley c9b6b4a302 Refresh totals on field change, and format tax price if numeric. 2013-03-25 11:41:43 +00:00
Mike Jolley 5393fc7ddb Santize custom attributes. #2587 2013-03-07 19:34:29 +00:00
Pascal Borreli ae7899c67b Fixed typos 2013-03-03 17:07:31 +00:00
David Garcia Watkins 38a2aac997 Apply filters to custom attribute option names for translation 2013-02-27 15:14:05 +01:00
Mike Jolley 59ff162e5a Coupon amounts for after tax discount. Closes #2485. 2013-02-20 22:09:57 +00:00
Mike Jolley 35d5e2997a Work with 4dp for discounts so totals add up. Closes #2476. 2013-02-20 18:50:28 +00:00
Mike Jolley f5f01c497e Changes for API Docs 2013-02-20 17:14:51 +00:00
Mike Jolley 807ec3a106 Prepend constants, renamed functions, split messages from errors. #2456 2013-02-18 12:29:10 +00:00
Mike Jolley 79b273f87c Merge pull request #2456 from krbvroc1/coupon_naming
Add ability to filter 'coupon code'
2013-02-18 03:19:13 -08:00
Mike Jolley 018259b41f Record all discounts. Closes #2455. 2013-02-15 10:27:09 +00:00
Ken Bass fe8a34a069 A different attempt 2013-02-14 23:18:58 -05:00
Ken Bass b0a5402f11 Add ability to filter 'coupon code' 2013-02-14 19:29:55 -05:00
Mike Jolley bc51d5652b Put back coupon option. 2013-02-11 13:53:24 +00:00
Mike Jolley 7a84ddd6c1 Tidied up settings, removed some un-needed settings, and made some settings automatic e.g. coupons disabled if no coupons exist 2013-02-10 23:02:52 +00:00
Mike Jolley 62a2575d2b tax class 2013-02-05 16:43:28 +00:00
Mike Jolley e83d4c3274 Tweak session set and calc totals + add woocommerce_cart_loaded_from_session hook 2013-01-31 14:42:50 +00:00
Mike Jolley b6fa2e72fc escape Closes #2314. 2013-01-31 11:48:04 +00:00
Mike Jolley fb67343611 Tweak content. Closes #2311 2013-01-29 13:58:57 +00:00
Alex Bishop 793a143432 #2311 Fix for 'Exclude sale items from coupon'
included a checkbox on the coupon writepanel for the option

Had issues originally, worked out the in_array() needed to be a strict
type as woocommerce_get_product_ids_on_sale() has a '0' string in it.

Tested using 3.5.1 + git clone of WooCommerce
2013-01-29 23:47:52 +10:30
Alex Bishop f78d3a0e13 Revert "Added 'Exclude Sale Products' option to coupons"
This reverts commit b763c7449a.
2013-01-29 23:41:58 +10:30
Alex Bishop 64641a6239 Revert "idiotic missed semicolon"
This reverts commit 4c1f80b23d.
2013-01-29 23:41:58 +10:30
Alex Bishop 75187073a9 Revert "ditto"
This reverts commit 0818bb055e.
2013-01-29 23:41:57 +10:30
Alex Bishop b391e66cf7 Revert "Updated everything so it actually works rather than fails hard"
This reverts commit 2379a3a1bb.
2013-01-29 23:41:57 +10:30
Alex Bishop 13de8d9203 Revert "Reset, please ignore"
This reverts commit 3e59e64da3.
2013-01-29 23:41:57 +10:30
Alex Bishop 3e59e64da3 Reset, please ignore
Long Story.
2013-01-29 23:41:00 +10:30
Alex Bishop 2379a3a1bb Updated everything so it actually works rather than fails hard
I messed up badly on the original with inheritance of variables, and
after a lot of issues realised that strict matching was necessary due
to the '0' string in woocommerce_get_products_on_sale()

Not hard to tell I am new to php.

Regardless this now functions as intended, stopping discount from being
applied to products with active sale prices or carts with items on sale
inside them.
2013-01-29 22:55:03 +10:30
Alex Bishop 0818bb055e ditto 2013-01-29 14:06:08 +10:30
Alex Bishop 4c1f80b23d idiotic missed semicolon
I cannot brain today, I has the dumb.
2013-01-29 14:04:31 +10:30
Alex Bishop b763c7449a Added 'Exclude Sale Products' option to coupons
Added exclude sale products functionality based of the 'exclude product
ids' functionality in wc-coupon/wc-cart.

Compares product ID's in cart vs ID's in the array
'woocommerce_get_product_ids_on_sale'
2013-01-29 13:54:54 +10:30
Mike Jolley 9e72c6a879 Pevent error if no fragments are returned 2013-01-22 14:30:21 +00:00
Mike Jolley 2a462edc33 Support desc_tip in settings api Closes #2251. 2013-01-18 12:10:25 +00:00
Mike Jolley 314ba3e2f6 Hooks for individual use overriding on the frontend 2013-01-16 10:42:49 +00:00
gw0 [http://gw.tnode.com/] 7ff704eabf Corrected bug if a product variation does not exist anymore. 2013-01-07 20:33:44 +01:00
Ken Bass e1ad11e2f7 Fix spelling errors in action/hook names 2013-01-02 11:34:23 -05:00
Mike Jolley e0a67b3387 rounding fixes for #2020 2012-12-20 15:10:27 +00:00
Mike Jolley d877086ffe get price, not ex price 2012-12-20 12:44:11 +00:00
Coen Jacobs 944ea5df3d Use returned coupon error message in cart. Closes #1994 2012-12-19 15:57:46 +01:00
Coen Jacobs 314af74f3d Have all WC_Coupon calls use is_valid() method to check #1994 2012-12-19 15:52:16 +01:00
Steven Mathias 9387ca6acf Updated to include coupon on woocommerce_item_is_discounted filter. Filters should always include all information used to arrive at the default filtered value. 2012-12-18 11:35:56 -07:00
Coen Jacobs 60152139a7 Removed double spaces in WC_Cart class methods 2012-12-15 13:01:42 +01:00
Coen Jacobs 9a92fb48a1 Merge branch 'master' of https://github.com/woothemes/woocommerce
Conflicts:
	classes/class-wc-query.php
	classes/class-wc-tax.php
2012-12-15 13:00:34 +01:00
Coen Jacobs 7b5e74626a Remove pass by reference for objects
Done all files except for external libaries: shareyourcart, cssmin,
lessc

@mikejolley Should we update those libraries as well?
2012-12-15 12:53:32 +01:00
Warren Holmes afa53b4e26 Correct scope, remove use of var.
- class-wc-cart.php
2012-12-14 23:26:07 +02:00
Mike Jolley aa3afb7a85 Tax display tweaks. Default customer address option. 2012-12-13 16:38:47 +00:00
Mike Jolley 0f0512c8fd rounding filters. Closes #1964. 2012-12-13 01:23:35 +00:00
Mike Jolley 3af034755b Put holds on stock until orders are cancelled. Closes #1977. 2012-12-12 21:14:19 +00:00
Mike Jolley a697ffbeb6 Coupon rework, reports, and styles. Closes #1862. 2012-12-11 17:02:48 +00:00
Mike Jolley e3698f99ed Rounding fixes, and link tax rows to tax rates by ID.
Also closes #1869 as it allows us to use 'codes' for tax rates instead
of their label. E.g. code US-AL-Tax-1. This lets users filter taxes in
reports easier.
2012-12-06 19:49:04 +00:00
Mike Jolley 60626d25f9 The display options for taxes 2012-12-03 16:37:08 +00:00