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
8064b35350
Add methods from zones screen
2016-01-13 15:04:10 +00:00
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
f70b0a9c23
Remove availability settings
2016-01-13 12:45:53 +00:00
934269f1e8
woocommerce_evaluate_shipping_cost_args
2016-01-11 15:51:37 +00:00
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
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
7cfdf23aec
Note that legacy methods are no longer available once disabled
2016-01-08 12:01:01 +00:00
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
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
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
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
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
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
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
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
efdd927e36
Improve docblock comments in WC_Shipping_Flat_Rate classes
2016-01-06 20:08:43 +01:00
97d47fb576
Move zones to main settings
2016-01-05 11:23:15 +00:00
901db7b0f8
zone tweaks
2015-12-18 17:10:58 +00:00
f5bf764eec
Conflict with class
2015-12-18 14:26:10 +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
8ebba9cc68
"enabled" column
2015-12-16 16:24:58 +00:00
9aa34330ac
Fix sorting and saving for methods
2015-12-16 16:09:52 +00:00
571469f44c
Add methods to zones
2015-12-16 15:16:52 +00:00
1a77563085
started on free shipping
2015-12-16 13:52:46 +00:00
a4f98902a3
Zone based free shipping
2015-12-15 16:23:46 +00:00
a0e0bb1e55
Load instance methods for calculations
2015-12-15 15:00:45 +00:00
3b81642eec
Instance and global level settings
2015-12-14 16:56: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
7fef09dd87
Fix notice in flat rate
2015-11-30 12:15:49 +00:00
77a54fdd68
Use ids for flat rate shipping class costs and handle bw compat
...
Closes #9715
2015-11-30 11:15:19 +00:00
9078e30ea4
Fix acronym zip to be all capitals fixes #9641
2015-11-18 15:32:23 -08:00
ee30b5b308
Fixed php docs standards
2015-11-03 11:31:20 -02:00
f03be47e86
Handle non standard decimals in flat rate costs.
2015-08-24 15:26:08 +01:00
d677be46ce
update example to show decimal
2015-08-21 17:01:25 +01:00
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
13c34f6ba2
Fixed Allowed Zip description for Local Delivery, closes #8831
2015-08-14 15:28:34 -03:00
92043a19f2
Free shipping should not be on by default
...
Closes #8819
2015-08-13 22:02:44 +01:00
1cae64f448
eval maths - output errors only if WP_DEBUG is on
2015-08-11 11:23:53 +01:00
c1cd3f097c
Fix notices when calling get_shipping_classes().
2015-08-10 21:52:21 +01:00
318f399081
Small tidy for scruitinizer
2015-08-10 14:56:02 +01:00
41e8cf74fb
Unused vars
2015-08-10 14:40:14 +01:00
79516ad2b4
typo
2015-07-20 12:13:29 +03:00
504f646310
enable deprecated addon rates
2015-07-20 12:08:39 +03:00
9e41552342
Removed all "@return void"
2015-07-16 16:55:48 -03:00
8d2a98eab1
Improved some docblocks
2015-07-16 16:29:01 -03:00
38d0d0dcad
trim invalid chars from sum
2015-07-08 11:02:20 +01:00
85dcee63ae
Flat rate shipping costs should ignore virtual items.
...
Closes #8506
2015-07-07 10:41:56 +01:00
583e1fc284
Typo closes #8381
2015-06-16 14:08:46 +01:00
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
2347418c5b
International shipping + legacy updater
2015-06-16 11:37:58 +01:00
b3a161a744
Fix upgrade logic for per item type
2015-06-15 15:32:51 +01:00
de1d818d4c
remove functions and eval
2015-06-15 15:24:59 +01:00
6f90640ba3
Upgrade logic and option fallbacks
2015-06-15 15:24:51 +01:00
803714d088
BW compat for additional rates
2015-06-15 12:01:24 +01:00
d24461a9a5
Simplify flat rate shipping UI #8243
2015-06-12 16:19:43 +01:00
af41e4bcd4
Eval Math Class
2015-06-12 14:27:50 +01:00
0e72c5e699
Class tidy
2015-05-15 14:16:44 +01:00
96ca19d170
fixed flatrate per item and per class if no additional costs added, it doesn't correctly fallback to base cost closes #7851
2015-04-07 07:23:00 -07:00
568a0fe4fa
Tweak international delivery
...
Fixes #7651
2015-03-06 14:45:04 +00:00
8aa0e5ea24
Potential notice with preg_match wildcard search, if used incorrectly.
2015-02-12 10:53:53 +00:00
bce209c21d
Flat rate extra costs when costs are an array.
2015-02-11 22:24:13 +00:00
f57b26cbe6
is_available() check in local pickup.
2015-02-11 18:02:44 +00:00
037242a9a2
More docblock tweaks
2015-02-03 16:03:28 +00:00
f3cc45cfa9
Grammar corrections
...
Closes #7216
2015-01-28 17:15:48 +00:00
9a6dc0bf41
Added select2 for all settings fields
2015-01-12 15:45:47 -02:00
50c6e1e4a0
select2 settings
2015-01-12 16:29:01 +00:00
a5d51d040e
remove var keyword in WC_Shipping_International_Delivery
2014-12-16 18:43:05 +07:00
8eeb6fc204
Removed more some unused code
2014-11-19 22:43:09 -02:00
2b645ed293
Moved if statement in flat rate shipping
2014-11-19 23:28:23 +00:00
e630e64cb7
Flat rate shipping tweaks + inline instructions
2014-11-19 22:22:35 +00:00
d58400399a
Fix wildcard search and optimise local delivery + pickup Closes #6676
2014-11-11 15:46:57 +00:00
80cba5ee05
Adjust ZIP code UI in local pickup
...
Closes #6647
2014-10-30 16:11:02 +00:00
11a1be6b12
Absolute path and Indentation fix for includes/shipping/*.php :)
2014-09-21 01:29:32 +05:45
8b48fc4267
Fix duplication in Ship to Multiple Locations ext
...
This should solve the issues related to multiple locations getting
duplicated costs.
2014-09-12 11:11:40 -04:00
32bd50c379
Move TFOOT to after TBODY element throughout templates and classes
2014-07-10 21:50:51 -04:00
3ad8935b20
Removed ununsed global variables in local scopes
2014-06-08 22:33:11 +02:00
ffa1db6ae6
Add $package to is_available shipping method hooks
2014-05-06 09:34:25 +01:00
13caa07cc2
Sanitize, but decode. UTF-8 Friendly. Fixes #5401
...
Originally changed 34db5d68b6
2014-05-01 14:40:31 +01:00
34db5d68b6
Don't sanitise rate ID - breaks utf8 chars
...
Fixes #5376
2014-04-25 12:31:58 +01:00
324e17d85f
[2.2] Allow spaces and use formatted postcodes for wildcard in local pickup
...
Fixes #5250 . Should go in 2.2 since it could affect existing setup
codes.
2014-04-07 15:46:40 +01:00
02a1735674
Clean up labels and default cost to 0 for int shipping
...
Closes #5219
2014-04-07 10:07:13 +01:00
ceef4bc528
adding spaces after text for title in local delivery
2014-04-01 16:58:45 -05:00
fd28f81147
using spaces after text
2014-04-01 16:55:36 -05:00
c5656ee991
flat rate additional costs table
2014-03-25 13:59:30 +00:00
31ee45cf5c
Add context to strings #4986
2014-03-03 14:47:19 +00:00
61a175173e
merging upstream changes
2014-02-25 08:07:39 -06:00
b16f83804f
Merge pull request #4932 from BFTrick/flat-rate-costs-regex
...
Comment RegEx in Flat Rate Shipping
2014-02-25 10:47:29 +00:00
cf81e63b3c
adding new method to calculate percentage rate adjustment for flat rate shipping
2014-02-24 12:54:56 -06:00
0fd11ad509
commenting regex in flat rate shipping
2014-02-24 11:40:26 -06:00
3888af3559
using wordpress brace code style in flat rate shipping
2014-02-24 11:17:33 -06:00
03c0a3f7d0
Removed debug output
2014-01-14 14:30:42 +02:00
01c1afae59
Adding default shipping price to tooltips
2013-12-04 16:20:30 -06:00
cac9d12bf9
PhpDocs
2013-11-28 07:54:19 -05:00
4afbd0b556
Merge branch 'function-call-refactor'
...
Conflicts:
includes/admin/post-types/meta-boxes/class-wc-meta-box-order-data.php
includes/shortcodes/class-wc-shortcode-cart.php
includes/wc-template-functions.php
2013-11-25 15:42:26 +01:00
51ba9c393f
WC globals
2013-11-25 14:01:38 +00:00
c1a439eb99
Formatting functions woocommerce to wc refactor
2013-11-25 14:34:21 +01:00
922fa990a5
esc_attr() all the things.
2013-11-20 20:11:59 +01:00
eb91907db6
Make sure $matched is defined when calculating shipping totals and classes to avoid PHP variable undefined notices.
2013-11-13 20:53:31 -05:00
3fd02a57d0
Locales - store standardised values, and display using locale in admin #3862
2013-11-12 17:43:30 +00:00
cc79155f0d
making the local pickup tooltip more descriptive
2013-11-08 07:10:43 -06:00
e143d344e5
Constants
2013-10-24 19:36:22 +01:00
5d2e1ac031
Refactor coupon code so coupons get the actual discount amount, redone edit coupon screen with tabs, added coupon item limits which Closes #3902
2013-10-18 18:10:58 +01:00
3ccaae0962
Revert to previous logic, but fix tax total #3924
2013-10-16 18:06:14 +01:00
c68e93457d
#3924
2013-10-16 15:37:24 +01:00
0f1a8001cf
Use subtotal for free shipping, remove unused min_amount from abstract #3924
2013-10-15 17:19:30 +01:00
85e73c5e53
Typos #3908
2013-10-11 15:30:10 +01:00
d67c142070
Add data-placeholder Closes #3908 .
2013-10-11 15:27:04 +01:00
718093650f
Save fees
2013-10-02 12:58:26 +01:00
66c04b0f72
Check values are set before casting as floats
2013-10-02 12:50:03 +01:00
24a3e3e17b
Format decimals with single function, convert locale to standard form. #3862
2013-10-01 17:54:32 +01:00
b892815336
Remove html5 number inputs (unreliable at present, locale issues), add JS validation for price inputs. New price input type in settings API to make future changes easier to implement. Closes #3587
...
@coenjacobs hows this look?
2013-09-27 20:28:42 +01:00
9a98be6a15
WOOCOMMERCE_DELIMITER constant. Closes #3476 .
2013-09-24 12:24:26 +01:00
5c40d863e1
add pattern matching to local delivery postcodes
2013-09-14 16:08:17 +01:00
7e01086ad3
Merge pull request #3679 from dimitrov-adrian/patch-6
...
Adding support for percentage factor of additional costs.
2013-09-13 03:20:17 -07:00
14e27bb073
Fixes from .14
2013-09-04 14:32:16 +01:00
b797cdb672
Handle local pickup taxes when getting taxable address
2013-09-03 16:26:06 +01:00
a44ec58746
Adding support for percentage factor of additional costs.
2013-08-25 14:59:58 +03:00
fe8a81110b
Merge pull request #3634 from BFTrick/set-default-shipping-rates
...
Setting Default Shipping Rates for Flat Rate Shipping
2013-08-16 17:39:25 -07:00
e01df544ec
Reworked total templates to support coupon lines, and started support for multiple shipping methods per order.
...
@todo store shipping methods in the order
@todo test with PP shipping real world
cc @coe
2013-08-14 21:00:34 +01:00
69f45fb39b
setting default shipping rates
2013-08-14 10:42:43 -05:00
4d4645eee4
remove spaces in favor of tabs in shipping classes
2013-08-12 16:09:04 -05:00
03af136986
Separate ship to options from sell to. Closes #3215 .
2013-08-02 16:54:28 +01:00
7b2c232b9c
Prevent flat rate rows with no class set from saving. Closes #3312 .
2013-07-19 07:08:13 +01:00
c75ea04c1c
classes -> includes
2013-06-11 14:25:30 +01:00
Mike Jolley
Diego Zanella
Fredrik Forsmo
roykho
Claudio Sanches
Caleb Burks
Manos Psychogyiopoulos
Bryce
shivapoudel
75nineteen Media
Michael Silber
Coen Jacobs
Patrick Rauland
James Koster
Renkas
Gregory K
Scott Basgaard
Karen Naylor
Adrian Dimitrov