Commit Graph

3977 Commits

Author SHA1 Message Date
Mike Jolley fb67343611 Tweak content. Closes #2311 2013-01-29 13:58:57 +00:00
Mike Jolley 1cded83298 Merge pull request #2313 from aj-adl/master
#2311 fix for "Exclude sale items from coupons"
2013-01-29 05:31:35 -08:00
aj-adl a766771740 removed unnecessary line 2013-01-29 05:23:52 -08: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
Mike Jolley b2d084af7f dump 2013-01-29 13:03:29 +00:00
Mike Jolley 4c7812ebb2 Shortcode fix Closes #2299. 2013-01-29 13:01:09 +00:00
Mike Jolley eb1469a2ab min 2013-01-29 12:37:09 +00:00
Mike Jolley 91180d4c03 Fix sale query Closes #2308. 2013-01-29 12:36:55 +00:00
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
James Koster 4119f00b0c links to other free themes in readme 2013-01-28 15:22:01 +00:00
James Koster 8469819fb8 retina'd validation icons on checkout 2013-01-28 14:31:12 +00:00
Mike Jolley d6c96f21e3 Merge pull request #2301 from GeertDD/checkoutjs
Small optimisation for postcode/city field reordering
2013-01-28 06:00:38 -08:00
Geert De Deckere 891d8f9bdb Small optimisation for postcode/city field reordering 2013-01-28 14:28:32 +01:00
Mike Jolley 484f1e4192 Restore fields after postcode before city. Closes #2293. 2013-01-28 12:28:27 +00:00
Mike Jolley c21ca1a68c fragment tweak 2013-01-28 12:02:21 +00:00
Mike Jolley fdfa0d6efb QTY Closes #2280. 2013-01-28 11:42:03 +00:00
Mike Jolley c51613910b Fix bulk edit. Closes #2283. 2013-01-28 11:18:14 +00:00
Mike Jolley 0226e41ca3 Merge pull request #2297 from kloon/master
Change on sale meta query from NUMERIC to DECIMAL
2013-01-28 03:01:47 -08:00
Mike Jolley 79eec982d1 Merge pull request #2298 from sbrajesh/master
Allow reusing virtual/downlodable option
2013-01-28 03:01:28 -08:00
Mike Jolley b211894d3c Get cart from ajax or local storage to prevent cache 2013-01-28 10:59:24 +00:00
Gerhard 85aba3620b Change meta query type for on sale products to DECIMAL to match on 0.xx prices as NUMERIC only matches sale prices >= 1 2013-01-28 08:21:50 +02:00
Mike Jolley 10c8e8d501 Merge pull request #2282 from thenbrent/js_fixes
Fix delete tax row for dynamically inserted tax rows
2013-01-27 11:02:41 -08:00
Mike Jolley 59a25af0d9 Merge pull request #2287 from WooCommerceEU/master
nl_NL Admin Po improvement
2013-01-27 11:02:28 -08:00
Mike Jolley cef308b7ab Merge pull request #2290 from GeertDD/post_class_stock
Added class with stock status to product
2013-01-27 11:01:24 -08:00
Mike Jolley 23952237da Merge pull request #2292 from GeertDD/address_fields_filter
Also pass on the country to the address fields filters
2013-01-27 11:01:17 -08:00
Mike Jolley 0c523d30b1 @coenjacobs See this. Custom ajax handler and cart refresh per page load to get around cache issues. Custom handler foes *feel* a little wrong but since it doesn't load admin, it loads 100% faster. 2013-01-27 18:55:30 +00:00
Mike Jolley 4f0d7f55c6 Cleaned up session classes 2013-01-27 18:55:29 +00:00
Mike Jolley 77c1218410 Merge pull request #2291 from GeertDD/be_nl_state_label
In Belgium and the Netherlands we have provinces
2013-01-27 05:37:06 -08:00
Geert De Deckere 4a33b00c15 In Belgium and the Netherlands we have provinces 2013-01-27 12:26:26 +01:00
Geert De Deckere 5233900283 Also pass on the country to the address fields filters 2013-01-27 12:22:06 +01:00
Geert De Deckere e65cf3c904 Added class with stock status to product 2013-01-27 09:31:38 +01:00
Brajesh Singh 410a9d1813 Fix the write-panel.js to show_hide any panel depending on product type 2013-01-27 07:11:38 +05:30
James Koster 2801c963d9 Further optimised pngs using http://pngmini.com/ 2013-01-26 14:06:05 +00:00
Ramon van Belzen f2b5b02b15 nl_NL Admin Po improvement
added a path to refresh within PoEdit, added authors
2013-01-26 10:48:05 +01:00
Brent Shepherd ca6b96e96d Declare var & add missing semicolon 2013-01-25 13:26:16 +10:00
Brent Shepherd 1a9ca48422 Use delegated event handler to delete tax rows
When a tax row is dynamically inserted, it can not be dynamically
deleted until the page is refreshed (becasue the event handler is
bound to only on page load). This commit delegates the event handler
from an element which is guaranteed to exist on page load, so that
dynamically inserted tax rows can also be dynamically deleted.
2013-01-25 13:22:44 +10:00
Coen Jacobs 5c3c54d3ff Merge branch 'master' of https://github.com/woothemes/woocommerce 2013-01-24 16:27:41 +01:00
Coen Jacobs 764d9655e5 Hello WooCommerce 2.0 beta 3! 2013-01-24 16:26:50 +01:00
James Koster d8b11b533a Image optimisation 2013-01-24 15:25:06 +00:00
Mike Jolley f680ec4256 spaces 2013-01-23 20:04:01 +00:00
Mike Jolley 650a6d95ec Merge pull request #2277 from maxrice/patch-2
Use is_readable() for autoloading
2013-01-23 12:03:12 -08:00