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
384c07b367
Merge pull request #10262 from Spreeuw/issue-10252
...
default order to processing for non-catalog products
2016-02-05 12:21:43 +00:00
787d36dee4
Merge pull request #10232 from marcusds/master
...
Add filter to is_in_stock
2016-02-05 12:01:10 +00:00
a3634028fa
default order to processing for non-catalog products
...
fixes #10252
2016-02-03 14:48:19 +01:00
a742861cda
minor typo
...
Found this error while trying to understand how gateways are built on WooCommerce
2016-02-02 15:35:01 +01:00
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
780614b14e
Add filter to is_in_stock
2016-02-01 11:09:12 -08:00
657521ffa4
[2.5] Don't show purchase note to admin
2016-01-27 15:30:07 +00:00
f8df682f34
Hide stock amount when children are involved
...
Closes #10172
2016-01-27 13:00:50 +00:00
9ca216310d
[2.5] When totalling up shipping, force round
...
Closes #10076
2016-01-27 11:06:08 +00:00
2790307489
Changed allbuttons to select_buttons for multiselect #10079
2016-01-21 19:33:49 -02:00
f4fddf2252
Merge pull request #10079 from woothemes/add/select-all-buttons-multiselect-field
...
Settings API: add optional "select all"/"select none" buttons to multiselect fields
2016-01-21 19:30:12 -02:00
4cfd8ff214
[2.5] Don't show downloads in admin email
2016-01-20 16:58:58 +00:00
ddd5f9fb9b
Fixed attribute check for PHP 7 compatibility
2016-01-20 15:53:51 +01:00
a772457a32
remove unnecessary use of ternary operator
2016-01-20 12:30:56 +13:00
7bb99af123
Settings API: enhance multiselect fileds
...
Add optional "select all"/"select none" buttons to multiselect fields,
similarly to what already exists for the country field.
2016-01-14 22:07:31 -08:00
a322b05f24
Avoid confusion between fields and field keys
2016-01-11 12:04:37 +00:00
1076854608
Merge branch 'master' into shipping-zones
...
# Conflicts:
# assets/css/admin.css
# includes/abstracts/abstract-wc-shipping-method.php
# includes/class-wc-shipping.php
# includes/shipping/flat-rate/class-wc-shipping-flat-rate.php
# includes/shipping/flat-rate/includes/class-wc-eval-math.php
# includes/shipping/free-shipping/class-wc-shipping-free-shipping.php
#
includes/shipping/legacy-international-delivery/class-wc-shipping-legacy
-international-delivery.php
#
includes/shipping/legacy-local-delivery/class-wc-shipping-legacy-local-d
elivery.php
2016-01-11 11:48:18 +00:00
a33b9b9750
Unit tests for shipping zones
2016-01-08 13:56:01 +00:00
007abbc98e
Shipping meta data
...
Closes #9094
2016-01-08 11:42:32 +00:00
7ece70a6ae
Update _transaction_id
...
Closes #9970
2016-01-05 15:59:57 +00:00
97d47fb576
Move zones to main settings
2016-01-05 11:23:15 +00:00
40d76ddc55
Merge pull request #9939 from frozzare/docs/abstract-wc-widget
...
Improve phpdoc comments for methods in abstract WC_Widget class
2016-01-04 12:59:32 -02:00
513db93bd4
Improve phpdoc comments for methods in abstract WC_Widget class
2016-01-04 15:37:12 +01:00
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
39f37b1e30
Improve phpdoc comments for methods in abstract WC_Shipping_Method class
2016-01-04 15:18:14 +01:00
450ae6e7fd
Improve phpdoc comments and add missing param tags
2016-01-04 12:43:56 +01:00
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
9c8ef67249
Add better phpdoc comments and missing param and return value
2016-01-03 10:22:53 +01:00
b4a04a73ce
Fix phpdoc tags for methods in abstract WC_Order class
2016-01-03 10:00:02 +01:00
4bf40cedb1
Tweak logic
2015-12-23 12:50:28 +00:00
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
901db7b0f8
zone tweaks
2015-12-18 17:10:58 +00:00
119f19a5c1
Include and conditionally load legacy shipping methods
2015-12-18 14:24:34 +00:00
77f0e9d72a
has settings handling
2015-12-18 13:12:20 +00:00
bf06b6d7c3
Filter non-images from gallery
...
Fixes #9875
2015-12-18 11:55:51 +00:00
1a77563085
started on free shipping
2015-12-16 13:52:46 +00:00
e25d876779
List and sort methods within zones
2015-12-15 17:48:03 +00:00
b47423ff2b
Moved rate calc logic into shipping class
2015-12-15 16:22:32 +00:00
a0e0bb1e55
Load instance methods for calculations
2015-12-15 15:00:45 +00:00
091a8a7641
Zone matching functions
2015-12-15 12:39:52 +00:00
3b81642eec
Instance and global level settings
2015-12-14 16:56:39 +00:00
2f97b16a91
Fix notice
2015-12-14 14:05:00 +00:00
b27aed5753
Settings api
2015-12-14 14:03:46 +00:00
f992f98b39
Merge branch 'pr/9790'
2015-12-14 12:48:11 +00:00
4b45812bac
Only one sanitise hook is needed
2015-12-14 12:48:03 +00:00
f3d6ce3c94
Round total discount to precision
...
Fixes #9834
2015-12-14 12:06:39 +00:00
63f8eebd6a
Started on refactoring settings for instances
2015-12-11 16:41:38 +00:00
6cea054fca
Method list screen and method screen with breadcrumbs
2015-12-11 14:11:12 +00:00
afd3aa2fc7
Let the additional third party widgets create and sanitize form fields
2015-12-08 16:19:49 +05:45
Mike Jolley
Ewout Fernhout
Agbonghama Collins
Marcus
Claudio Sanches
Florian Ludwig
Brett
Joey Kudish
Fredrik Forsmo
Peter
Shiva Poudel