Rami Yushuvaev
65cf1bcb6f
Merge branch 'master' of https://github.com/ramiy/woocommerce into i18n/similar-strings
2016-10-11 21:14:56 +03:00
Mike Jolley
cfa2ee3605
Round the totals
...
Closes #11803
2016-10-11 15:56:18 +01:00
Rami Yushuvaev
83e938af1e
i18n: Merge similar translation strings to reduce the total strings count #11905
2016-10-11 04:39:13 +03:00
Aristeides Stathopoulos
9668247b95
WordPress.PHP.YodaConditions.NotYoda
2016-09-09 03:14:28 +03:00
Aristeides Stathopoulos
e07511502d
Additional coding-standards fixes.
2016-09-02 03:26:24 +03:00
Aristeides Stathopoulos
fde1037757
fix failing tests.
2016-09-01 23:50:14 +03:00
Aristeides Stathopoulos
a19848978a
WordPress.WhiteSpace.ControlStructureSpacing.NoSpaceAfterCloseParenthesis
2016-08-27 07:47:24 +03:00
Aristeides Stathopoulos
82f3cc221e
WordPress.WhiteSpace.ControlStructureSpacing.NoSpaceBeforeOpenParenthesis
2016-08-27 07:23:02 +03:00
Aristeides Stathopoulos
741f2b954a
Squiz.WhiteSpace.SuperfluousWhitespace.EndLine
2016-08-27 07:01:22 +03:00
Aristeides Stathopoulos
6c30f84fa2
WordPress.Arrays.ArrayKeySpacingRestrictions.SpacesAroundArrayKeys
2016-08-27 06:23:21 +03:00
Aristeides Stathopoulos
ec8a0b288b
PHPCS: WordPress.Arrays.ArrayDeclaration.NoCommaAfterLast
2016-08-27 05:08:49 +03:00
Aristeides Stathopoulos
b063bcfe4c
last item in a multiline-array should end in a comma
2016-08-27 04:46:45 +03:00
Mike Jolley
1bc9da3e91
Merge branch 'master' into WC-CRUD
...
# Conflicts:
# includes/class-wc-coupon.php
2016-08-04 12:10:04 +01:00
Claudio Sanches
8c5678f967
[2.6] Fixed shipping classes URLs, closes #11542
...
cc @mikejolley
2016-07-27 15:52:02 -03:00
Claudio Sanches
35c5a29cc2
Always remove commas while processing flat rate costs, closes #11346
2016-07-19 11:52:29 -03:00
Claudio Sanches
aa367efdf0
Fixed a typo
2016-07-19 09:37:42 -03:00
Claudio Sanches
70bf9bfcd6
Fixed show/hide free amount in modals
2016-07-19 09:33:56 -03:00
Claudio Sanches
19713f8bc7
Improved free shipping method and fixed missing filters
2016-07-19 09:05:25 -03:00
Claudio Sanches
7d9d091767
Fixed mixed tabs and spaces
2016-07-11 16:56:35 +02:00
Kathy Darling
f5cb48c76f
fix link to Shipping zones from deprecated free shipping method
2016-06-28 10:31:26 -05:00
Mike Jolley
2af5716b08
Revert price change - this breaks custom price logic
...
@claudiosmweb
2016-06-23 16:32:24 +01:00
Mike Jolley
2cae613212
Remove discount when checking free shipping min amount.
...
Fixes #11232
2016-06-23 13:45:50 +01:00
Mike Jolley
bc87f4a47e
Fix - Javascript show/hide of option in free shipping method.
2016-06-21 10:47:21 +01:00
Claudio Sanches
9e574ab4d4
[2.6] Fixed cost input type for flat rate and local pickup, closes #11199
2016-06-20 21:40:23 -03:00
Mike Jolley
b682c0550e
Allow max_fee in addition to min_fee in flat rate costs fields.
...
Closes #11151
2016-06-16 12:23:02 +01:00
Mike Jolley
78142a8ebb
Merge branch 'master' into WC-CRUD
...
# Conflicts:
# includes/class-wc-checkout.php
# includes/class-wc-coupon.php
# includes/class-wc-customer.php
# tests/unit-tests/cart/cart.php
# tests/unit-tests/cart/functions.php
# tests/unit-tests/coupon/coupon.php
# woocommerce.php
2016-06-13 15:01:58 +01:00
Mike Jolley
3fd15ad50f
Unused vars and code docs
2016-06-06 18:57:24 +01:00
Mike Jolley
bbc13009f8
Share eval math class
2016-06-06 17:06:26 +01:00
Mike Jolley
b2835720c3
unused code
2016-06-06 17:00:38 +01:00
Mike Jolley
95db35e1de
Don't recount stack
2016-06-06 16:59:09 +01:00
Mike Jolley
fbb73324d2
Simple local pickup cost
...
Closes #11045
2016-06-06 14:19:58 +01:00
Claudio Sanches
e39274e753
HTTPS for everybody
2016-05-26 22:48:49 -03:00
Mike Jolley
43af207558
Output buffering and redirects after turning off legacy
...
Closes #10806
2016-04-28 12:36:51 +01:00
Manos Psychogyiopoulos
a203c34474
fix undefined package notice in legacy flat rate method
2016-04-26 16:21:42 +03:00
Mike Jolley
2b1442c3f0
Added get_rate_id() method for consistent rate nams
2016-04-25 17:06:38 +01:00
Mike Jolley
0bad68f218
Fixed calculate_extra_shipping
2016-04-21 13:59:13 +01:00
Mike Jolley
412195905b
Pass package in all add_rate calls
2016-04-20 15:03:10 +01:00
Diego Zanella
e0c565da2d
Backward compatibility with WC 2.5 and earlier
...
* Restored signature of WC_Shipping_Method::add_rate() method, while maintaining the features added in WC 2.6 to handle shipping zones.
2016-04-20 08:59:19 +01:00
Mike Jolley
a77735432b
Use get_displayed_subtotal() to determine if conditions for coupons and free shipping is met.
...
@claudiosmweb
Closes #10711
2016-04-18 11:39:00 +01:00
Mike Jolley
8b53d1a618
Only load modal if supported
2016-03-24 18:31:39 +00:00
Mike Jolley
f73149feaf
Tweak variation display and reenable bulk editing
2016-03-22 17:13:39 +00:00
Justin Shreve
3eacb992bc
Address issues from Mike's Feedback:
...
* Rename individual use, free shipping, and exclude sale items to match their meta names closer.
* Sanitize emails when using set_email_restrictions
* Remove some unnecessary explict true checks
* Move ID into _data with the rest of the fields
* Fixed some spacing issues
2016-03-17 09:19:27 -07:00
Justin Shreve
d738dec05d
Coupon CRUD (WIP).
2016-03-17 09:19:27 -07:00
Mike Jolley
1549158981
Add 'is_enabled' column to instances table and allow toggle in zones screen
...
@allendav
2016-03-15 17:23:06 +00:00
Mike Jolley
23be868353
Enabled by default
2016-02-10 15:01:43 +00:00
Mike Jolley
fab8a871aa
Merge branch 'master' into shipping-zones
...
# Conflicts:
# assets/css/admin.css
# includes/admin/class-wc-admin-assets.php
2016-02-10 14:12:39 +00:00
Mike Jolley
a35c7d6aca
Hide min order amount field when not needed
...
Closes #10129
2016-02-08 11:44:08 +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
8064b35350
Add methods from zones screen
2016-01-13 15:04:10 +00:00
Diego Zanella
35d20f61a8
Added shipping class instance to woocommerce_evaluate_shipping_cost_args
...
The instance is going to be useful if any 3rd party needs to read any other property of the shipping class, which might not have been passed through the $args variable.
2016-01-13 13:35:24 +00:00
Mike Jolley
f70b0a9c23
Remove availability settings
2016-01-13 12:45:53 +00:00
Mike Jolley
934269f1e8
woocommerce_evaluate_shipping_cost_args
2016-01-11 15:51:37 +00:00
Diego Zanella
eb42c7b3e3
Added new woocommerce_evaluate_shipping_cost filter
...
* The filter will allow 3rd parties to pre-process the arguments used to evaluate a shipping cost formula.
2016-01-11 13:51:46 +00:00
Mike Jolley
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
Mike Jolley
7cfdf23aec
Note that legacy methods are no longer available once disabled
2016-01-08 12:01:01 +00:00
Mike Jolley
46481a49f7
Merge pull request #10014 from frozzare/docs/local-delivery
...
Improve docblock comments in WC_Shipping_Local_Delivery class
2016-01-07 10:42:04 +00:00
Mike Jolley
aeddd6b1a0
Merge pull request #10011 from frozzare/docs/flat-rate-shipping
...
Improve docblock comments in WC_Shipping_Flat_Rate classes
2016-01-07 10:41:47 +00:00
Mike Jolley
ce9ac48866
Merge pull request #10010 from frozzare/docs/free-shipping
...
Improve docblock comments for free shipping classes
2016-01-07 10:41:07 +00:00
Mike Jolley
17db4f31ed
Merge pull request #10009 from frozzare/docs/local-pickup
...
Improve docblock comments in WC_Shipping_Local_Pickup
2016-01-07 10:40:44 +00:00
Fredrik Forsmo
7570ac414f
Improve docblock comments in WC_Shipping_Local_Pickup
...
* Added comments to `init`, `calculate_shipping`, `clean` and
`init_form_fields`
2016-01-06 20:15:45 +01:00
Fredrik Forsmo
1288c18301
Improve docblock comments in WC_Shipping_Local_Delivery class
...
* Added comment to`calculate_shipping` and `init`
2016-01-06 20:13:44 +01:00
Fredrik Forsmo
0d2c6be073
Improve docblock comments WC_Shipping_International_Delivery class
...
* Added comment to `is_available`
* Fixed initialize typo
2016-01-06 20:12:02 +01:00
Fredrik Forsmo
093684c7e0
* Added comments to `init`, `is_available` and `calculate_shipping`
...
* Added better properties comments.
* Fixed initialize typo
2016-01-06 20:10:54 +01:00
Fredrik Forsmo
efdd927e36
Improve docblock comments in WC_Shipping_Flat_Rate classes
2016-01-06 20:08:43 +01:00
Mike Jolley
97d47fb576
Move zones to main settings
2016-01-05 11:23:15 +00: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
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
571469f44c
Add methods to zones
2015-12-16 15:16:52 +00:00
Mike Jolley
1a77563085
started on free shipping
2015-12-16 13:52:46 +00:00
Mike Jolley
a4f98902a3
Zone based free shipping
2015-12-15 16:23:46 +00:00
Mike Jolley
a0e0bb1e55
Load instance methods for calculations
2015-12-15 15:00:45 +00:00
Mike Jolley
3b81642eec
Instance and global level settings
2015-12-14 16:56:39 +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
Mike Jolley
7fef09dd87
Fix notice in flat rate
2015-11-30 12:15:49 +00:00
Mike Jolley
77a54fdd68
Use ids for flat rate shipping class costs and handle bw compat
...
Closes #9715
2015-11-30 11:15:19 +00:00
roykho
9078e30ea4
Fix acronym zip to be all capitals fixes #9641
2015-11-18 15:32:23 -08:00
Claudio Sanches
ee30b5b308
Fixed php docs standards
2015-11-03 11:31:20 -02:00
Mike Jolley
f03be47e86
Handle non standard decimals in flat rate costs.
2015-08-24 15:26:08 +01:00
Mike Jolley
d677be46ce
update example to show decimal
2015-08-21 17:01:25 +01:00
Caleb Burks
4bff967e40
Flat Rate Calculation - min_fee
...
The correct shortcode term to use is `min_fee`: https://github.com/woothemes/woocommerce/blob/master/includes/shipping/flat-rate/class-wc-shipping-flat-rate.php#L94
2015-08-20 16:55:00 -05:00
Claudio Sanches
13c34f6ba2
Fixed Allowed Zip description for Local Delivery, closes #8831
2015-08-14 15:28:34 -03:00
Mike Jolley
92043a19f2
Free shipping should not be on by default
...
Closes #8819
2015-08-13 22:02:44 +01:00
Mike Jolley
1cae64f448
eval maths - output errors only if WP_DEBUG is on
2015-08-11 11:23:53 +01:00
Mike Jolley
c1cd3f097c
Fix notices when calling get_shipping_classes().
2015-08-10 21:52:21 +01:00
Mike Jolley
318f399081
Small tidy for scruitinizer
2015-08-10 14:56:02 +01:00
Mike Jolley
41e8cf74fb
Unused vars
2015-08-10 14:40:14 +01:00
Manos Psychogyiopoulos
79516ad2b4
typo
2015-07-20 12:13:29 +03:00
Manos Psychogyiopoulos
504f646310
enable deprecated addon rates
2015-07-20 12:08:39 +03:00
Claudio Sanches
9e41552342
Removed all "@return void"
2015-07-16 16:55:48 -03:00
Claudio Sanches
8d2a98eab1
Improved some docblocks
2015-07-16 16:29:01 -03:00
Mike Jolley
38d0d0dcad
trim invalid chars from sum
2015-07-08 11:02:20 +01:00
Mike Jolley
85dcee63ae
Flat rate shipping costs should ignore virtual items.
...
Closes #8506
2015-07-07 10:41:56 +01:00
Mike Jolley
583e1fc284
Typo closes #8381
2015-06-16 14:08:46 +01:00
Mike Jolley
71fc6c207e
Free should only be used if costs set. If left blank, offer no rate
...
Closes #8380
2015-06-16 14:07:28 +01:00
Mike Jolley
2347418c5b
International shipping + legacy updater
2015-06-16 11:37:58 +01:00