Commit Graph

12775 Commits

Author SHA1 Message Date
MindyPostoff 76061f1676 Update form-tracking.php 2014-12-03 13:30:13 -05:00
Mike Jolley 6a45f8f196 Merge branch 'master' of https://github.com/woothemes/woocommerce 2014-12-03 12:33:19 +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
Claudio Sanches 8fac703f97 Added missing textdomain
cc @bryceadams #fail
2014-12-03 10:30:32 -02:00
Mike Jolley 3348218bd7 Merge pull request #6893 from bryceadams/patch-6863
Add help tip for schedule sales info
2014-12-03 12:23:06 +00:00
Manos Psychogyiopoulos 4b04701cc8 add display_prices in variation data
The commit introduces 3 changes:
1. It adds 2 extra fields to the available_variations array,
display_price and display_regular_price, to be used by extensions in
cases like
https://github.com/woothemes/woocommerce-product-addons/issues/19
2. Introduces a get_display_price() function in WC_Product to retrieve
product prices incl or excl tax relative to the
woocommerce_tax_display_shop setting.
3. Fixes a minor issue where passing a 0 price to
get_price_including_tax() or get_price_excluding_tax() results in a
wrong output.
2014-12-03 11:28:04 +02:00
Bryce 80ccc7b09d Add help tip for schedule sales info
Closes #6863
2014-12-03 13:20:24 +07:00
Claudio Sanches 951c70de7e Allows custom directory for email templates
cc @SiR-DanieL
2014-12-03 01:30:28 -02:00
Claudio Sanches 6cd9faf79c Merge pull request #6892 from SiR-DanieL/patch-2
Introduced filters for copy/delete templates
2014-12-02 22:08:02 -02:00
Nicola Mustone 6b03da033d Introduced woocommerce_delete_from_theme_folder filter 2014-12-03 00:52:08 +01:00
Nicola Mustone fcc072abcc Added trim to avoid errors 2014-12-03 00:40:44 +01:00
Nicola Mustone d1ce8c00ac Introduced filter woocommerce_copy_to_theme_folder 2014-12-03 00:36:26 +01:00
James Koster 7bd6b7d009 remove frontend dashicons, tweak loader 2014-12-02 21:19:03 +00:00
Barry Kooij 36c98dae6d Merge branch 'master' of github.com:woothemes/woocommerce 2014-12-02 12:58:00 +01:00
Barry Kooij f105664805 Introduced 'woocommerce_ajax_calc_line_taxes' filter. 2014-12-02 12:57:53 +01:00
Barry Kooij b79a98bc87 Introduced 'woocommerce_find_rates' filter. 2014-12-02 12:57:01 +01:00
Mike Jolley 11af24902b [2.2] Ensure float is safely converted to string 2014-12-02 11:20:07 +00:00
Mike Jolley b852904e37 Merge pull request #6890 from bryceadams/patch-6888
Add style field to woocommerce_wp_xxxxx_input
2014-12-02 10:06:23 +00:00
Mike Jolley 9137fa49fb Merge pull request #6891 from antoscarface/master
Moved deprecated action inside IF
2014-12-02 09:58:59 +00:00
antoscarface 78047959f4 Moved do action of 'woocommerce_admin_css' to avoid possible add action from debug plugin as "Debug Bar" and "Debug Bar Slow Actions"
See screen: http://d.pr/i/1fYX1/7ZiItezr
2014-12-02 10:26:17 +01:00
Bryce f8d4fe64ad Fix annoying white space 2014-12-02 13:50:17 +07:00
Bryce cd76ae82e7 Add style field to woocommerce_wp_xxxxx_input
Closes #6888
2014-12-02 13:48:06 +07:00
claudiosmweb fc8b020c03 Added more time for scrutinizer wait for code coverage 2014-12-01 22:26:21 -02:00
claudiosmweb 676549b4ab Fixed docblock for WC_Product::get_categories() 2014-12-01 22:09:42 -02:00
claudiosmweb 5d9a1ad908 Merge branch 'master' of github.com:woothemes/woocommerce 2014-12-01 21:56:45 -02:00
claudiosmweb 3ce620e4f3 Removed eXtremeGoHorse practices from WC_AJAX::calc_line_taxes() and wc_save_order_items()
cc @barrykooij
2014-12-01 21:55:48 -02:00
James Koster af57cd0e30 sale schedule. closes #6865 2014-12-01 15:59:11 +00:00
Claudio Sanches 52cddae5e7 Merge pull request #6884 from helgatheviking/master
stray console.log
2014-12-01 13:57:40 -02:00
Kathy Darling 62db978078 stray console.log 2014-12-01 16:34:38 +01:00
Barry Kooij e1b81b3a23 Introduced 'woocommerce_reports_taxes_tax_rate' and 'woocommerce_reports_taxes_rate' filters. 2014-12-01 13:36:50 +01:00
claudiosmweb 780aca38a6 Fixed checkbox label in woocommerce_form_field() function, closes #6880 2014-12-01 10:13:41 -02:00
Gerhard 6f62e17fd0 Use get_bloginfo so it does not output. 2014-12-01 13:50:18 +02:00
Gerhard f90cf15adf Use correct theme_data variable. 2014-12-01 13:43:48 +02:00
Gerhard 77a09e3f85 Update to new tracker domain. 2014-12-01 13:28:18 +02:00
Claudio Sanches 6dac0be84e Merge pull request #6879 from bryceadams/patch-6878
check if offset exists in breadcrumb.php
2014-11-30 16:43:20 -02:00
Bryce cb7e06ba8b Change structure of check to appease claudio 2014-12-01 01:42:28 +07:00
Bryce df95a6f016 check if offset exists in breadcrumb.php
Closes #6878
2014-12-01 01:21:42 +07:00
Claudio Sanches 5260a01a9a Merge pull request #6874 from tamarazuk/bulk-edit-tag-suggest
Autosuggest product tags on bulk edit
2014-11-30 12:15:25 -02:00
Claudio Sanches 8de9492199 Merge pull request #6876 from tamarazuk/coding-standards-part-2
Code Standards Part 2
2014-11-30 12:14:33 -02:00
Barry Kooij 4c2adfda62 Doc return type update. 2014-11-30 14:16:40 +01:00
Tamara Zuk af442599b1 Code Standards: Finish up admin includes
* fixed indentation - swapped spaces for tabs at start of line, swapped
tabs for spaces min-line for alignment
* removed instances of `@return void` and `@access public`

@see http://make.wordpress.org/core/handbook/coding-standards/php/

@see part 1: #6157
2014-11-30 01:52:32 -05:00
Tamara Zuk f63c5e8c8f Execute `woocommerce_order_action_{$action}` only once
Prevents a “Maximum function nesting level reached” fatal error in
certain cases.

Since this ends up running on `’save_post’`, updating something like
the order status while hooked onto to
`woocommerce_order_action_{$action}` causes a fun recursion :)
2014-11-30 00:14:22 -05:00
Tamara Zuk 551159510c Autosuggest product tags on bulk edit
This tiny change helps users quickly add tags to products using bulk
edit.
2014-11-29 23:59:58 -05: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
claudiosmweb 80ea5420c3 [API] Fixed the action parameters in the methods to create and edit orders, closes #6845 2014-11-28 10:22:35 -02:00
Claudio Sanches 8e929c1ee8 Merge pull request #6859 from SiR-DanieL/master
Edit link for WC Pages
2014-11-28 09:40:32 -02:00
Claudio Sanches 1afa04e7f6 Merge pull request #6857 from splashingpixels/product-gallery-images
undefined index when product image gallery side meta box is removed fixe...
2014-11-28 09:40:10 -02:00
Claudio Sanches ac98f678c0 Merge pull request #6856 from JustinSainton/patch-3
Update grunt-wp-i18n dev dependency
2014-11-28 09:39:11 -02:00