Commit Graph

9344 Commits

Author SHA1 Message Date
Mike Jolley a46ddc5dd2 Merge branch 'pr/12710' 2017-01-03 11:24:41 +00:00
Mike Jolley e149509f55 Products can have parents too 2017-01-03 11:24:36 +00:00
Mike Jolley 96876777ef Merge pull request #12712 from Dartui/master
Added email ID to locate core template for email
2017-01-03 11:01:01 +00:00
Mike Jolley 3e10368ad6 Merge pull request #12720 from franticpsyx/delete-vs-trash-object-hooks
[2.7] Separate trash and delete CRUD object hooks
2017-01-03 11:00:34 +00:00
Claudio Sanches c79b4f1fd5 Fixed case for #12645 2017-01-03 00:26:34 -02:00
Claudio Sanches 6d45e531fd Merge pull request #12734 from corsonr/fix_wizard_tracking_name
Updated WooThemes to WooCommerce
2017-01-02 17:09:22 -02:00
corsonr 62c881b3c2 Updated WooThemes to WooCommerce 2017-01-02 17:56:19 +01:00
akashsonic 202458a1f3 Dynamic add 2 attribute.
Add dynamic 2 attributes rows & cols in woocommerce_wp_textarea_input function. User can add dynamic this attributes in text-area field.
2017-01-02 18:01:52 +05:30
Manos Psychogyiopoulos d250d3f149 distinguish between trash and delete object hooks 2016-12-30 00:22:12 +02:00
Krzysztof Grabania 3a54b24fa1 Added email ID to locate core template for email
This PR adds email id to `woocommerce_locate_core_template` filter. It would be useful for custom emails created by plugins, which have got default email templates.
2016-12-28 20:38:51 +01:00
Manos Psychogyiopoulos 96d7272065 include parent if entering variation id and variations excluded 2016-12-28 16:44:57 +02:00
Manos Psychogyiopoulos 5fa4846f5e fix inclusion of variation included in product search 2016-12-28 16:41:21 +02:00
Manos Psychogyiopoulos b5c56737c5 merge branch 'master' into fix-product-search-get-post-parent-fatal-error 2016-12-27 10:57:52 +02:00
Manos Psychogyiopoulos be436b629d fix include field typo 2016-12-27 10:36:44 +02:00
Manos Psychogyiopoulos ae9f4eacc4 fix get_post_parent fatal error 2016-12-27 10:34:32 +02:00
Claudio Sanches 539099c7d7 Include $endpoint in woocommerce_endpoint_X_title filter #12676 2016-12-25 20:43:25 -02:00
Mike Jolley daea231ab7 Merge pull request #12666 from woocommerce/select2-4
Upgrade Select2 to V4
2016-12-24 14:40:09 +00:00
Mike Jolley 6b511e84be Sorting 2016-12-23 15:14:27 +00:00
Mike Jolley e9be3a425a Handle search params in filters
Closes #12685
2016-12-23 14:45:58 +00:00
Mike Jolley a3f8ffb101 Ensure price is set 2016-12-23 14:30:47 +00:00
Mike Jolley a2a16a2ec0 Merge pull request #12683 from franticpsyx/shipping-rate-taxes-array-not-saved
[2.7] Shipping order item taxes array not saved on checkout
2016-12-23 14:19:43 +00:00
Mike Jolley 859727d462 Merge pull request #12678 from franticpsyx/rest-api-set-order-item-action
[2.7] Add 'woocommerce_rest_set_order_item' REST API hook
2016-12-23 14:18:31 +00:00
Mike Jolley e8b1fe1bf2 Merge pull request #12679 from franticpsyx/rest-api-totals-excl-tax
[2.7] Calculate REST order item totals excluding tax if undefined (?)
2016-12-23 14:17:07 +00:00
Mike Jolley 99527e8013 Merge pull request #12680 from franticpsyx/remaining-incorrect-inline-comments
[2.7] Remaining inline comments about pointers
2016-12-22 22:37:33 +00:00
Mike Jolley 364d4bd82c Merge pull request #12675 from maciekkus/feature/make-tax-includes-text-consistient
Make 'includes tax' text wrapping with <small> tag consistient across order and cart table
2016-12-22 22:37:06 +00:00
Maciej Kuś e5bae8b7af space preserved before "included_tax" small element 2016-12-22 20:05:46 +01:00
Manos Psychogyiopoulos d7afab3930 fix saving of shipping order item taxes on checkout 2016-12-22 20:49:42 +02:00
Manos Psychogyiopoulos 40bf6afc29 fix incorrect inline comments
Ref: 01aba1fd2b
2016-12-22 19:41:23 +02:00
Manos Psychogyiopoulos 42e09eac32 make rest api order item totals - always excl tax 2016-12-22 19:23:07 +02:00
Manos Psychogyiopoulos 0d6eae5fca add 'woocommerce_rest_set_order_item' hook 2016-12-22 17:56:14 +02:00
Mike Jolley 01aba1fd2b Incorrect inline comments 2016-12-22 15:06:10 +00:00
Mike Jolley 03b581f72e Refunds API/get_data() missing ID
Fixes #12672
2016-12-22 14:52:37 +00:00
Mike Jolley f3dc355632 Check post data is set
Closes #12670
2016-12-22 14:41:39 +00:00
Mike Jolley 8f49724b17 Merge pull request #12674 from franticpsyx/rest-api-set-order-item-meta
[2.7] REST order item meta not intercepted
2016-12-22 14:38:39 +00:00
Mike Jolley 8f43bb2a6c Merge pull request #12676 from widoz/master
Move the 'woocommerce_endpoint_' . $endpoint . '_title' filter
2016-12-22 14:34:27 +00:00
Mike Jolley 6861131d8f Fix version check 2016-12-22 14:30:47 +00:00
Mike Jolley d5b346fc40 Variation specific backwards compatibility 2016-12-22 14:30:47 +00:00
Guido Scialfa 440d407ce5 Move the 'woocommerce_endpoint_' . $endpoint . '_title' filter outside of the default condition, let's filter the titles regardless of the endpoint 2016-12-22 15:25:22 +01:00
Mike Jolley fd45160439 Merge pull request #12667 from franticpsyx/product-variation-hook-prefix
[2.7] Fix product variation hook prefix for consistency
2016-12-22 13:50:38 +00:00
Mike Jolley c0dd1146ab Merge pull request #12668 from franticpsyx/woocommerce-get-product-from-item-order-arg
[2.7] Use get_order instead of creating object in woocommerce_get_product_from_item args
2016-12-22 13:29:12 +00:00
Maciej Kuś 53c7c4025f includes tax wrapping <small> consistient across order and cart table 2016-12-22 13:56:29 +01:00
Manos Psychogyiopoulos dae45b8a29 fix paren position 2016-12-22 14:10:36 +02:00
Manos Psychogyiopoulos 6fc59cf2dc set REST order item meta 2016-12-22 12:29:57 +02:00
Manos Psychogyiopoulos 02abc9b9eb use get_order instead of creating new object when applying woocommerce_get_product_from_item 2016-12-21 21:01:47 +02:00
Manos Psychogyiopoulos 63a4cf41d0 fix product variation hook prefix for consistency 2016-12-21 18:06:42 +02:00
Mike Jolley 92968492a0 Customer search 2016-12-21 14:18:33 +00:00
Mike Jolley 96877dbb25 Fix product search inputs 2016-12-21 13:23:26 +00:00
Mike Jolley 56fef5b4f6 More styling settings tweaks 2016-12-21 11:36:48 +00:00
Manos Psychogyiopoulos 1b65b793d2 fix non-object error when clearing transients 2016-12-20 22:29:17 +02:00
Mike Jolley badf8d7d55 Add select2 script and CSS 2016-12-20 16:45:22 +00:00