Commit Graph

44 Commits

Author SHA1 Message Date
Mike Jolley d7d609d85a Remove comment 2016-02-25 14:13:56 +00:00
Mike Jolley 75c264837f Justins feedback/code tidy 2016-02-10 13:21:16 +00:00
Mike Jolley 352184cc06 Merge branch 'master' into shipping-zones
# Conflicts:
#	assets/css/admin.css
#	i18n/languages/woocommerce.pot
#	includes/abstracts/abstract-wc-payment-gateway.php
#	includes/abstracts/abstract-wc-shipping-method.php
#	includes/admin/settings/class-wc-settings-shipping.php
#	includes/wc-core-functions.php
#	uninstall.php
2016-02-05 14:58:48 +00:00
Mike Jolley 64d4bb5172 [2.5] Round shipping after tax calc
#10076 and
https://wordpress.org/support/topic/when-calculating-shipping-total-forc
e-rounding?replies=6#post-7972623
2016-02-02 11:09:02 +00:00
Mike Jolley 9ca216310d [2.5] When totalling up shipping, force round
Closes #10076
2016-01-27 11:06:08 +00:00
Mike Jolley 007abbc98e Shipping meta data
Closes #9094
2016-01-08 11:42:32 +00: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 901db7b0f8 zone tweaks 2015-12-18 17:10:58 +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 1a77563085 started on free shipping 2015-12-16 13:52:46 +00:00
Mike Jolley e25d876779 List and sort methods within zones 2015-12-15 17:48:03 +00:00
Mike Jolley b47423ff2b Moved rate calc logic into shipping class 2015-12-15 16:22:32 +00:00
Mike Jolley a0e0bb1e55 Load instance methods for calculations 2015-12-15 15:00:45 +00:00
Mike Jolley 091a8a7641 Zone matching functions 2015-12-15 12:39:52 +00:00
Mike Jolley 3b81642eec Instance and global level settings 2015-12-14 16:56:39 +00:00
Mike Jolley b27aed5753 Settings api 2015-12-14 14:03:46 +00:00
Mike Jolley 63f8eebd6a Started on refactoring settings for instances 2015-12-11 16:41:38 +00:00
Mike Jolley 6cea054fca Method list screen and method screen with breadcrumbs 2015-12-11 14:11:12 +00:00
Claudio Sanches efa19f799d Fixed some coding standards for docblocks 2015-11-03 10:28:01 -02:00
Mike Jolley 358f3f79fa Don't use extract() in add_rate
#9057
2015-09-07 16:02:23 +01:00
Mike Jolley 9f65d2a1fc Added priorities for shipping methods to give more control over defaults.
Closes #7871
2015-04-13 15:32:57 +01:00
Mike Jolley 06f2ac2f09 [2.3] Remove rounding from shipping cost to greater precision with taxes 2015-03-31 13:59:17 +01:00
Mike Jolley 568a0fe4fa Tweak international delivery
Fixes #7651
2015-03-06 14:45:04 +00:00
Mike Jolley 2584041700 wc_price enhancements
- Renamed some 2.3 methods for consistency
- Allow more args to be passed to wc_price to control output
- Filter wc_price args which Closes #7188
- wc_get_price_decimal_separator function
- wc_get_price_thousand_separator function
- wc_get_price_decimals function
2015-01-23 11:50:32 +00:00
Bryce 1c31af94f5 remove var keyword in WC_Shipping_Method 2014-12-16 18:38:58 +07:00
claudiosmweb f34cead914 Removed old code in favor of wc_tax_enabled() and wc_prices_include_tax() 2014-11-18 14:45:29 -02:00
Mike Jolley e6a5825f8c Some shipping class tidyup 2014-11-17 16:30:18 +00:00
claudiosmweb 61e96b0a8b Prevent warnings in WC_Shipping_Method::is_available() when exclude countries 2014-10-10 23:01:19 -03:00
claudiosmweb 86ef09970a Prevented warnings when countries is empty in shipping methods.
Stopped this erros:

PHP Warning:  array_intersect(): Argument #1 is not an array in
wp-content/plugins/woocommerce/includes/abstracts/abstract-wc-shipping-method.php
on line 182
PHP Warning:  in_array() expects parameter 2 to be array, null given in
wp-content/plugins/woocommerce/includes/abstracts/abstract-wc-shipping-method.php
on line 194

@mikejolley
2014-10-10 22:46:19 -03:00
shivapoudel 303a5b28d0 Absolute path fix for abstract classes :) 2014-09-21 00:24:49 +05:45
Tamara Zuk 9c7826319c Coding Standards: Abstract classes
* 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`
* improved readability

@see http://make.wordpress.org/core/handbook/coding-standards/php/
2014-08-31 01:49:58 -04:00
Mike Jolley 368e6b9412 Round shipping quote totals to store DP setting
Fixes #5888
2014-07-30 11:04:01 +01:00
Mike Jolley 375a0e2652 static WC_Tax class - no need for a constructor in this 2014-06-12 16:47:43 +01:00
bolderelements fb80f6ba09 Update abstract-wc-shipping-method.php
The order is backward so if you use the default 'is_available' function for your extensions, the 'excluding' option will always deny every country because this line returns an empty array.
2014-05-03 15:59:01 -04:00
Mike Jolley 566a9c4dc6 Set countries as an array by default in the shipping abstract 2014-02-13 11:54:54 +00:00
Coen Jacobs 5291f2eec6 Code changes as suggested in #4238 2013-11-28 14:12:08 +01:00
Gregory K cac9d12bf9 PhpDocs 2013-11-28 07:54:19 -05:00
Mike Jolley 51ba9c393f WC globals 2013-11-25 14:01:38 +00:00
Mike Jolley 5eafe2065b ake shipping methods check if taxable, so when customer is VAT excempt taxes are not included in price. Closes #3888 2013-10-16 14:31:31 +01:00
Mike Jolley 0f1a8001cf Use subtotal for free shipping, remove unused min_amount from abstract #3924 2013-10-15 17:19:30 +01:00
Mike Jolley 3d078397b3 Merge branch 'Re-organise-settings'
Moves settings together. Fixes #3497
2013-08-22 11:58:03 +01:00
Mike Jolley 03af136986 Separate ship to options from sell to. Closes #3215. 2013-08-02 16:54:28 +01:00
Mike Jolley c75ea04c1c classes -> includes 2013-06-11 14:25:30 +01:00