Commit Graph

14750 Commits

Author SHA1 Message Date
Mike Jolley 9db40dcda0 Merge remote-tracking branch 'origin/master' 2015-12-23 12:51:06 +00:00
Mike Jolley 717eaaa421 Merge branch 'pr/9890' 2015-12-23 12:50:44 +00:00
Mike Jolley 4bf40cedb1 Tweak logic 2015-12-23 12:50:28 +00:00
Mike Jolley 9a700f8b48 Merge pull request #9891 from capuderg/master
Added a filter for disabling automatic redirect to the setup wizard
2015-12-23 12:32:51 +00:00
Mike Jolley 606d9235b5 Merge pull request #9894 from WPprodigy/bug-shipping-tax-class
Sanitize the shipping tax class
2015-12-23 12:21:11 +00:00
Peter 00341a30b3 Revert "[API] Additional hooks in API Orders"
This reverts commit fb798aca49.
2015-12-22 23:55:03 +01:00
Peter fb798aca49 [API] Additional hooks in API Orders
Add some additional hooks to handle custom order data

The new hooks:
woocommerce_api_create_order_item
woocommerce_api_set_order_addresses
woocommerce_api_set_line_item

The new woocommerce_api_create_order_item action contains the id-s of the new items ($new_item_id). The following functions have to be returned the item id-s to be able to pass them to the filter:
* set_item(..) function - return $item_id; 
* set_line_item(..) function - return $item_id;
* set_shipping(..) function - return $shipping_id;
* set_fee(..) functuion - return $fee_id;
* set_coupon(..) functuion - return $coupon_id;
2015-12-22 23:49:01 +01:00
Caleb Burks bedcedcc3d Sanitize the shipping tax class 2015-12-22 08:59:42 -06:00
Gregor Capuder f785561f5f Added a filter for disabling automatic redirect to the setup wizard, after plugin activation. 2015-12-22 12:03:31 +01:00
Peter 458c755b5f Update abstract-wc-order.php
If the order has no shipping line, there must not generate an unnecessary shipping tax line with 0 value. It was happened if there is set a different tax class for shipping than tax classes of the actual product line items of the order, and the order has not got any shipping line.
The aim is to have the same tax calculation behavior if we create orders using the GUI (front end or back end), and the API.

This condition prevents to create the unnecessary tax line if there is no shipping methods of the order:

// Now calculate shipping tax
$matched_tax_rates = array();
$shipping_methods = $this->get_shipping_methods();
if ( ! empty( $shipping_methods ) ) {
	......
}


This conditional solution is similar than calc_line_taxes() in WC_AJAX class:

// Get shipping taxes
if ( isset( $items['shipping_method_id'] ) ) {
	.....
}
2015-12-21 23:42:59 +01:00
Claudio Sanches 997d1caa50 Fixed several new variations admin actions, closes #9886 2015-12-21 03:36:36 -02:00
Claudio Sanches a81f0f6eea Use blockui while saving taxes 2015-12-19 12:12:31 -02:00
Claudio Sanches 7adafc77c9 [API] Improved product attribute terms params 2015-12-18 21:39:30 -02:00
Claudio Sanches 19b4319ad4 Merge branch 'master' of github.com:woothemes/woocommerce 2015-12-18 20:46:42 -02:00
Claudio Sanches d85c643150 [API] Delete tax rates when deleting a tax class 2015-12-18 20:46:28 -02:00
Mike Jolley 89ede21ff2 Terms before button
@jameskoster any problem using that float?

Closes #9880
2015-12-18 22:11:45 +00:00
Claudio Sanches b8a6090d05 [API] Fixed tax rate id type 2015-12-18 19:15:56 -02:00
Claudio Sanches 032265b1ed [API] Fixed build taxes return 2015-12-18 19:08:09 -02:00
Claudio Sanches 89581d1541 Setup Wizard and no Onboarding Wizard 2015-12-18 17:05:16 -02:00
Claudio Sanches be55385204 POT 2015-12-18 16:19:23 -02:00
Claudio Sanches 44612f8174 Merge branch 'master' of github.com:woothemes/woocommerce 2015-12-18 16:18:45 -02:00
Claudio Sanches b86741ea75 POT 2015-12-18 16:18:27 -02:00
Mike Jolley 901db7b0f8 zone tweaks 2015-12-18 17:10:58 +00:00
Mike Jolley f5bf764eec Conflict with class 2015-12-18 14:26:10 +00:00
Mike Jolley 119f19a5c1 Include and conditionally load legacy shipping methods 2015-12-18 14:24:34 +00:00
Mike Jolley 77f0e9d72a has settings handling 2015-12-18 13:12:20 +00:00
Mike Jolley 8cde0cbcb1 Merge pull request #9876 from reigelgallarde/patch-1
adding $loop_name to woocommerce_shortcode_products_query filter
2015-12-18 11:57:01 +00:00
Mike Jolley bf06b6d7c3 Filter non-images from gallery
Fixes #9875
2015-12-18 11:55:51 +00:00
Mike Jolley ea8e671459 Rename some MY states 2015-12-18 10:49:40 +00:00
Reigel Gallarde f8dd887001 Update class-wc-shortcodes.php
adding $loop_name to woocommerce_shortcode_products_query filter.. so that we have a way to add a filter to a specific shortcode that uses product_loop.
2015-12-18 13:43:03 +09:00
Mike Jolley c7e104115f unused code 2015-12-17 12:58:02 +00:00
Claudio Sanches dcdfc3f2aa Fixed typo in readme.txt, closes #9869 2015-12-17 08:48:46 -02:00
Claudio Sanches c04443c2d3 Added upgrade script for #9868
cc @mikejolley
2015-12-17 08:30:06 -02:00
Mike Jolley 792dd9d7d1 Merge remote-tracking branch 'origin/master' 2015-12-17 10:16:09 +00:00
Mike Jolley a7817682e9 Merge branch 'shipping-methods' 2015-12-17 10:16:05 +00:00
Mike Jolley 90d472a0fe set $method 2015-12-17 10:15:58 +00:00
Claudio Sanches b2712d6ae8 Merge pull request #9868 from shivapoudel/lao-kip-symbol
Updated the currency code for 'Lao Kip'
2015-12-17 08:13:32 -02:00
Claudio Sanches b03280e230 [API] Manage product order_menu, closes #9866 2015-12-17 08:08:17 -02:00
Nicola Mustone 7ed6eb2cb9 typo 2015-12-17 08:23:58 +01:00
Shiva Poudel 4146558fd6 Updated the currency code for 'Lao Kip'
See: https://en.wikipedia.org/wiki/ISO_4217
2015-12-17 11:52:38 +05:45
roykho 0825b5001e Fix undefined variable when there is only one available method 2015-12-16 18:23:56 -08:00
Claudio Sanches 6db9e74f1b Merge pull request #9865 from macbookandrew/patch-1
update grammar on checkout page
2015-12-16 17:45:17 -02:00
Andrew Minion b296962ca8 update grammar 2015-12-16 13:14:18 -06:00
Claudio Sanches f7ef9c0cec [API] Stop unset things in API 2015-12-16 16:46:31 -02:00
Claudio Sanches 55e4ef50b9 [API] Fixed errors and improved edit product categories endpoint 2015-12-16 16:44:41 -02:00
Claudio Sanches ee990de153 [API] Fixed errors and improved create product category endpoint 2015-12-16 16:35:46 -02:00
Claudio Sanches e097ff7b56 Oops 2015-12-16 14:25:11 -02:00
Mike Jolley 8ebba9cc68 "enabled" column 2015-12-16 16:24:58 +00:00
Mike Jolley 9aa34330ac Fix sorting and saving for methods 2015-12-16 16:09:52 +00:00
Mike Jolley e13ba4f029 Empty states 2015-12-16 15:37:40 +00:00