Commit Graph

8308 Commits

Author SHA1 Message Date
Mike Jolley 50a4c5bd23 Merge branch 'variation-stock-management'
Conflicts:
	includes/class-wc-product-variation.php
2014-06-27 11:15:42 +01:00
Mike Jolley 5dcd19f5fa Better handling of serialised settings Closes #4584 2014-06-25 16:30:47 +01:00
Mike Jolley 021431f012 Merge branch 'philmeadows-patch-1' 2014-06-25 13:57:36 +01:00
Mike Jolley 6390e387e2 Additional check for product coupons and sale product exclusion. Fixes #5697 2014-06-25 13:46:47 +01:00
Mike Jolley 0f6f04e017 Added wc_stock_amount() core function and replaced intval
#4612
2014-06-25 11:25:28 +01:00
Mike Jolley 1389dd2e86 Merge pull request #5738 from SiR-DanieL/patch-3
Improved woocommerce_placeholder_img filter
2014-06-25 11:12:26 +01:00
Mike Jolley c1dd3f2024 Allow endpoint use on the front page.
Fixes #5609 cc @claudiosmweb
2014-06-25 11:10:05 +01:00
Mike Jolley f1a10c2e70 Fix incorrect variable check when editing address 2014-06-25 11:06:42 +01:00
Nicola Mustone 46df7ba249 Added $size and $dimensions parameters
Added $size and $dimensions parameters to palceholder image filter to have a better custom management of the placeholder image.
2014-06-25 11:46:50 +02:00
Mike Jolley 6f87715832 Merge pull request #5663 from franticpsyx/filter_order_item_view_class
filter html-order-item template tr class
2014-06-25 10:42:55 +01:00
Manos Psychogyiopoulos 6ad8f0f718 fix conflicts 2014-06-25 10:36:11 +03:00
Mike Jolley 0e623e2c50 PESO Closes #5493 2014-06-24 16:08:04 +01:00
Mike Jolley 391b6cc6ae Merge pull request #5728 from darkrain/master
bugfix in get_related() - return trash posts
2014-06-24 15:55:22 +01:00
Mike Jolley 1a7120086a Merge pull request #5722 from BFTrick/email-header-ids
Adding IDs to Email Header Template
2014-06-24 15:52:35 +01:00
Mike Jolley 0596204c22 Merge pull request #5680 from helgatheviking/variation_is_purchasable
add filter to is_purchasable() for variations
2014-06-24 15:51:54 +01:00
Mike Jolley 9d5b1db0c2 Merge pull request #5730 from shoheitanaka/patch-4
Update class-wc-countries.php for Japanese State
2014-06-24 15:51:27 +01:00
Mike Jolley 03de576bfb Data update 2014-06-24 15:21:39 +01:00
Mike Jolley fb592a1a79 Variation class modifications (see details)
- Made it load data on the fly, rather than loading it all at once
- Pull some data from variation, some from parent
- Updated stock methods to use variation or parent depending on
manage_stock
- Ensure parent stays in sync on stock status change event
2014-06-24 13:05:13 +01:00
Mike Jolley 21d37e86c2 Handle stock for self and children, as well as syncing status with the children 2014-06-24 13:03:25 +01:00
Mike Jolley d65cb855bc Static is required 2014-06-24 13:02:58 +01:00
Mike Jolley f69e5fc4ee Only use a value for changes - allows automatic changes to stock status to take over 2014-06-24 13:02:48 +01:00
Mike Jolley d631f4acdc Hide status box for variables and handle save event 2014-06-24 13:02:09 +01:00
Mike Jolley 0315e48187 Only call the method to update stock when it changes 2014-06-24 13:01:47 +01:00
Mike Jolley 3ca70b30f5 Add sanity check to stock status change 2014-06-24 13:01:34 +01:00
Mike Jolley 63c0b75972 Conditional is no longer required 2014-06-24 13:00:21 +01:00
Shohei Tanaka 19b5d8073e Update class-wc-countries.php for Japanese State
I don't use the word of Province for the largest administrative divisions of Japan, like the state in USA.
Sometimes I use the word of State for 都道府県. But I search some site, It seems to say that "Prefecture"
 is formally. Perhaps Prefecture is best.

Please check following site.
1. One of Most Popular Japanese to English dictionary site:
http://ejje.weblio.jp/content/%E9%83%BD%E9%81%93%E5%BA%9C%E7%9C%8C

2. Official Japanese law Translation site(Please click 都道府県)
http://www.japaneselawtranslation.go.jp/dict/list?re=02&ft=1&dn=1&ky=%E9%83%BD%E9%81%93%E5%BA%9C%E7%9C%8C&x=63&y=8&co=1
2014-06-24 19:00:03 +09:00
darkrain 8f530a156c bugfix in get_related() - return trash posts 2014-06-24 13:11:10 +07:00
Mike Jolley cd5bd97c2d Merge pull request #5608 from ragulka/checkout-form-multipart
Make checkout form multipart
2014-06-23 16:54:05 +01:00
Mike Jolley b46507ca13 Merge pull request #5639 from tamarazuk/master
[product_category] shortcode: Remove ordering query args
2014-06-23 16:36:43 +01:00
Mike Jolley edd655d4d9 WC_TEMPLATE_PATH filter was renamed by accident in a previous version. Should be woocommerce_template_path
https://github.com/woothemes/woocommerce/commit/e143d344e582c688cd0e4562
86bfe50c690077c9
2014-06-23 16:31:49 +01:00
Mike Jolley 8f6c4cbeb4 WC_TEMPLATE_PATH after setup theme
Closes #5495
2014-06-23 16:29:15 +01:00
Mike Jolley 34c614373e Merge pull request #5701 from afurculita/master
Deprecate WP_TEMPLATE_PATH
2014-06-23 16:18:29 +01:00
Kathy Darling 7b201aad58 change is_purchasable() args to match regular product 2014-06-23 10:04:03 -05:00
Patrick Rauland a7a0baea4f adding divs w/ ids to email header template 2014-06-23 08:59:50 -05:00
Mike Jolley 84163615d3 Merge pull request #5650 from bernattorras/patch-1
Update class-wc-query.php
2014-06-23 13:07:13 +01:00
Mike Jolley fb1b6af309 Merge pull request #5662 from franticpsyx/order_item_count
order item count is wrong
2014-06-23 13:05:30 +01:00
Mike Jolley 474c5aafcf Merge pull request #5702 from darkrain/master
add filter to method get_sku()
2014-06-23 12:59:52 +01:00
Mike Jolley 85befad283 Use max() to prevent division by zero Closes #5696 2014-06-23 12:56:11 +01:00
Mike Jolley feb3088dfc Merge pull request #5644 from franticpsyx/overrides_scan_table_format
table format in Status report, template overrides
2014-06-23 12:24:47 +01:00
Mike Jolley 707b0b66cd Merge pull request #5713 from coenjacobs/dont-assume-log-action
Status page log title should not assume action for title
2014-06-23 12:05:11 +01:00
Mike Jolley 02ccef615b Merge pull request #5708 from JDGrimes/docs-fixes
Update copy-pasted docs for class instance() methods
2014-06-23 12:02:59 +01:00
Andrew Benbow 2fcda12ea1 Update mini-cart.php
$_product->is_visible()
2014-06-22 13:39:10 +01:00
Coen Jacobs 71ae6f874a Status page log title should not assume action 2014-06-21 10:27:40 +02:00
Mike Jolley b86b4c91c6 Simplify get_children and use stock status rather than stock level 2014-06-20 10:50:31 +01:00
Mike Jolley 8834679d93 Don't validate empty fields 2014-06-20 10:28:04 +01:00
JDGrimes 0d472cead5 Update copy-pasted docs
Fixes #5707
2014-06-19 15:43:05 -04:00
Mike Jolley 49cf935906 Merge pull request #5698 from coenjacobs/fix-contributors-list
Time to say goodbye from contributors list
2014-06-19 16:50:32 +01:00
Mike Jolley f6636b9e71 Merge pull request #5700 from bryceadams/master
Stop people accessing wrapper-end.php directly
2014-06-19 16:50:04 +01:00
Mike Jolley 37117409f8 Merge pull request #5704 from JDGrimes/wpdb-prefix-table
Don't assume the database prefix is wp_
2014-06-19 16:49:08 +01:00
Mike Jolley f7904d7e1c Merge pull request #5706 from JDGrimes/static-method-notice
Avoid a "method should not be called statically" notice
2014-06-19 16:48:01 +01:00