Commit Graph

18033 Commits

Author SHA1 Message Date
Mike Jolley 62ca37f651 Merge branch 'master' into shipping-zones
# Conflicts:
#	includes/admin/class-wc-admin-assets.php
#	includes/class-wc-install.php
2016-01-04 14:35:45 +00:00
Mike Jolley 61f8a92202 View/Edit icon hiding on edit 2016-01-04 14:34:10 +00:00
Claudio Sanches 312b7142c1 Merge pull request #9938 from frozzare/docs/abstract-wc-shipping-method
Improve phpdoc comments for methods in abstract WC_Shipping_Method class
2016-01-04 12:21:12 -02:00
Fredrik Forsmo 39f37b1e30 Improve phpdoc comments for methods in abstract WC_Shipping_Method class 2016-01-04 15:18:14 +01:00
Mike Jolley b95f472e1f Merge pull request #9937 from frozzare/docs/abstract-wc-product
Improve phpdoc comments and add missing param tags in abstract WC_Product class
2016-01-04 12:03:45 +00:00
Fredrik Forsmo 450ae6e7fd Improve phpdoc comments and add missing param tags 2016-01-04 12:43:56 +01:00
Mike Jolley 520f1de24b Merge pull request #9932 from frozzare/wc-order-phpdoc
Fix phpdoc tags for methods in abstract WC_Order class
2016-01-04 11:08:45 +00:00
Mike Jolley 68c2ffa475 Merge pull request #9933 from frozzare/docs/wc-payment-gateway
Add better phpdoc comments and missing param and return value
2016-01-04 11:07:10 +00:00
Mike Jolley a70f1d7852 Fix row selection in tax settings screen 2016-01-04 11:04:52 +00:00
Mike Jolley 1228ae348c Fix change event on tax settings screen 2016-01-04 10:54:34 +00:00
Mike Jolley 5aac7062e5 thumbnail size
Closes #9928
2016-01-04 10:46:11 +00:00
Mike Jolley 9890c18b5d Notice if called early.
Closes #9923
2016-01-04 10:43:51 +00:00
Fredrik Forsmo 9c8ef67249 Add better phpdoc comments and missing param and return value 2016-01-03 10:22:53 +01:00
Fredrik Forsmo b4a04a73ce Fix phpdoc tags for methods in abstract WC_Order class 2016-01-03 10:00:02 +01:00
Mike Jolley 8b9bdbb228 Product version storage to invalidate cache when needed
#9922 for @daigo75
2015-12-31 16:31:20 +00:00
Mike Jolley 7c7e21be50 Only use the 'function' portion when generating price hashes
Keeps hashes the same after page load when a plugin uses a class method
callback or anonymous function Closes #9922 @claudiosmweb
2015-12-31 16:21:12 +00:00
Mike Jolley 429fee1703 JSON instead of serialise should reduce storage size
#9922
2015-12-31 13:15:01 +00:00
Peter 41b6ae07ed Orders API tax exempt status
At this moment we cannot find a way how to create an order using the Orders API with tax exempt status. An additional “is_vat_exempt” API field could be used for this reason. If it is set and true then VAT is not calculated.
2015-12-30 15:30:40 +01:00
Peter 36b3fdcc68 VAT exempt and TAX enabled handling in back-end
Additional condition for checking if tax is enabled and there is not vat exempt. If this is true, then calculate taxes on front-end, otherwise not.
TAX exempt can be filtered by a new woocommerce_ajax_calc_line_taxes_is_vat_exempt filter.
2015-12-30 15:20:09 +01:00
Mike Jolley ce43fb9920 Merge pull request #9917 from ChromeOrange/master
Correct a to an
2015-12-30 13:57:53 +00:00
Peter 6a52817d39 Merge pull request #3 from woothemes/master
Update
2015-12-30 14:10:39 +01:00
Andrew Benbow d4f4e7625c Correct a to an
SSL is pronounced "es es el" and so requires an not a, see Use 6 here http://www.englishpage.com/articles/a-vs-an.htm
2015-12-29 20:35:13 +00:00
Mike Jolley 03ba8539f6 Stop coupon logic when 0 is hit so coupons can apply to other lines
Fixes #9870
2015-12-29 13:16:43 +00:00
Claudio Sanches 3cbe88082f Fixed simplify commerce admin notices position, closes #9911 2015-12-28 16:07:05 -02:00
Mike Jolley c1b8a20d39 Order attributes by name
Closes #9879
2015-12-27 21:32:55 +00:00
Mike Jolley 1eb9f83f77 Hide attributes and shipping classes from quick edit
Closes #9882
2015-12-24 12:16:02 +00:00
Peter 5463e18998 Merge pull request #1 from woothemes/master
Update to base
2015-12-23 18:06:34 +01:00
Mike Jolley 0b678ab2af Tweak save logic to set _price for variables/groups via sync functions only
Closes #9892
2015-12-23 13:08:45 +00:00
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