6e4376511d
Fixed incompatibility with PHP 5.4 and earlier
2016-02-10 19:47:16 +00:00
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
a3634028fa
default order to processing for non-catalog products
...
fixes #10252
2016-02-03 14:48:19 +01:00
657521ffa4
[2.5] Don't show purchase note to admin
2016-01-27 15:30:07 +00:00
4cfd8ff214
[2.5] Don't show downloads in admin email
2016-01-20 16:58:58 +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
007abbc98e
Shipping meta data
...
Closes #9094
2016-01-08 11:42:32 +00:00
c5e3e018c3
is_vat_exempt and wc_tax_enabled handling in abstract-wc-order
...
If is_vat_exempt is 'yes', or wc_tax_enabled is false, then do not calculate tax.
2016-01-05 21:36:06 +01: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
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
f3d6ce3c94
Round total discount to precision
...
Fixes #9834
2015-12-14 12:06:39 +00:00
ff637abb7b
Removed duplicated argument for PHP 7, closes #9788
2015-12-07 17:36:18 -02:00
dd2fe6ff49
Make WC_Abstract_Order::update_status() return boolean
...
closes #9777
2015-12-07 10:12:17 +00:00
2e553cf220
Show order refunds in totals
...
Fixes #9589 @claudiosmweb
2015-11-30 15:25:48 +00:00
b5a2c2a9d5
Unify all order email tables to use a single template
...
Closes #9587
@claudiosmweb @jameskoster
2015-11-30 15:16:23 +00:00
753014da5a
Merge pull request #9631 from woothemes/transient-tweaks
...
Transient tweaks
2015-11-21 22:48:14 -02:00
d91dfb6fe6
Introduce woocommerce_recorded_sales action hook
2015-11-19 18:07:04 +02:00
851fc2a442
Use get_cache_prefix in orders class
2015-11-13 23:11:05 +00:00
4e5baf23aa
Cache get_item_meta_array for better performance
...
Closes #8810 @claudiosmweb
2015-11-05 15:21:28 +00:00
5893875b0c
Removed period for file headers
2015-11-03 11:53:50 -02:00
efa19f799d
Fixed some coding standards for docblocks
2015-11-03 10:28:01 -02:00
5b6e16682c
Handle partial/full refund for orders containing free items
...
Also adds helper method to determine if such as free item exists or
not. Closes #9460
2015-10-29 15:34:33 +00:00
d4fbe0e45c
Use SKU for stock order notes
...
Fixes #9133
2015-10-01 18:13:37 +02:00
1522a4d87b
Added download-url class in WC_Abstract_Order::display_item_downloads(), closes #9158
2015-09-21 18:28:03 -03:00
f7d035e739
Merge pull request #9084 from rchq/patch-1
...
Added an action for notifications
2015-09-15 19:59:16 -03:00
9f1a5e3c26
Remove unused arg
2015-09-15 12:51:45 +01:00
0164584aaf
Reduce stock once and record in _order_stock_reduced meta
...
Also clears up the payment_complete method
2015-09-15 12:39:16 +01:00
332c1bdf9c
Update abstract-wc-order.php
...
Created an action to be able to hook into and add additional notification triggers.
2015-09-08 11:00:22 -07:00
fad48bf800
Add filters to control shipped via text
2015-09-03 15:05:10 +01:00
fdb25fa0c3
Pass through tax_display
...
Fixes #8951
2015-08-26 13:05:52 +01:00
57bb0ebe25
Record manual order status change
2015-08-18 16:33:38 +01:00
1999dbe92d
Improve display_item_downloads numbering and use same function in emails.
2015-08-17 12:17:56 +01:00
a826330ad0
Reinstate default value for $items
...
That was (accidentally?) removed with SHA: 877e39064
2015-08-07 12:12:08 -07:00
877e390646
Remove $type from prepare
2015-08-07 14:06:19 +01:00
4c8ef3ff33
Use esc_sql on item type instead of esc_attr
2015-08-07 11:37:19 +01:00
7f3c2a78c5
Get total functions should respect rounding settings.
...
Closes #8707
2015-08-05 14:33:53 +01:00
d6bd46c55d
Move expand_item_meta to own method
...
Fixes notices in some extensions (deposits)
2015-08-03 13:21:44 +01:00
ef798921aa
woocommerce_can_reduce_order_stock filter
...
Needed for extension (deposits)
2015-08-03 10:37:58 +01:00
7b2aec4791
Take item qty into consideration when refunding orders
...
Fixes #8675
2015-07-29 13:13:41 +01:00
eb19532165
Show 'fee' label is empty
2015-07-28 11:32:53 +01:00
7285ce74e6
Tax display notice
2015-07-16 10:15:45 +01:00
db473cc369
Move refund logic into main order class.
...
These methods are not defined in the abstract.
2015-07-15 16:02:26 +01:00
506b5ef3f6
Set total after update_shipping
...
Based on add_shipping code Closes #8475
2015-07-09 16:48:34 +01:00
91faacb4c9
Return the output directly
...
Return the output directly instead of variable.
2015-07-09 13:39:29 +05:30
89cef9ff02
Introduces methods to WC_Abstract_Order for get customer full name
...
New methods:
WC_Abstract_Order::get_formatted_billing_full_name()
WC_Abstract_Order::get_formatted_shipping_full_name()
closes #8535
cc: @mikejolley
2015-07-08 18:00:19 -03:00
9094bb0662
Do not FATAL on $product->has_file
2015-06-29 09:08:16 -04:00
71f2c25da4
Calc totals should not calc tax if disabled
2015-06-23 13:29:38 +01:00
e08e123988
Note version since
2015-06-19 13:43:18 +01:00
1dfb27f928
Adds WC_Abstract_Order->get_address
...
Adds a function to retrieve order address in non-localized, raw, non-formatted way.
2015-06-19 01:43:31 +01:00
e535e005b7
Add a filter to override needs_shipping_address order method.
...
If an order doesn't have any shipping methods it's not possible to set needs_shipping_address to true. When 'woocommerce_cart_needs_shipping_address' is set to true the address needs to be shown on the front end and in confirmation emails.
2015-05-28 15:48:37 +01:00
5920b88d5d
Add classes to tax and shipping labels/notices
...
Closes #8189
2015-05-27 16:17:36 +01:00
d6604cb668
Split order details into customer + item templates. Tidied up codebase/template based logic.
...
cc @jameskoster
2015-05-01 14:50:18 +01:00
77941a57c5
New way to gather item meta with bw compatibility on item meta class
...
#7210
This also includes a new template file for order item details.
@jameskoster Version bumping the order details template. Splitting it
up some more in next commit.
2015-05-01 12:42:29 +01:00
30d2ab8af8
Avoid setting is_customer_note when 0
...
Closes #7995
2015-04-23 11:50:09 +01:00
9f57025a1e
Remove unnecessary stock notice
...
Closes #7990
2015-04-23 11:04:16 +01:00
9debd84a7f
Merge pull request #7978 from InoPlugs/patch-3
...
[2.3] Update abstract-wc-order.php
2015-04-20 11:12:25 +01:00
520282ff16
Update abstract-wc-order.php
...
Using a wrong key name -> 'cart_discount_tax' is calculated wrong a few lines below (= $cart_subtotal_tax)
2015-04-18 14:44:39 +02:00
1e2d0775c4
tax text for negative shipping (refunds)
2015-04-17 12:45:32 +02:00
3f0b589797
Make get_shipping_to_display compatible with refunds
2015-04-17 12:38:08 +02:00
467a269175
Only set author for user added notes so system notes can be distinguished
2015-04-17 11:23:09 +01:00
c410771de2
[2.3] Calculate taxes should save _line_tax_data
2015-03-31 13:21:10 +01:00
c6dae2b286
Merge pull request #7834 from SiR-DanieL/scrutinizer-issues
...
Small tweaks and style fixes
2015-03-30 10:33:27 +01:00
d2af01df5b
scrutinizer suggested tweaks
2015-03-27 16:15:40 +01:00
23932dbfca
Default calculate_taxes to base
...
Closes #7765
2015-03-27 10:42:26 +00:00
70bf6fc842
[2.3] prices_include_tax boolean fix
...
Closes #7788
2015-03-23 13:35:40 +00:00
70d125ae96
[2.3] Fix - get_total_discount() function with certain tax setups.
...
Revised how discounts/discount taxes are stored for consistency. Always
store ex. tax to make data retrieval easier, and to ensure totals are
correct after settings changes. Backwards compatibility maintained
through use of order versioning.
#7728
2015-03-16 12:17:09 +00:00
d49b5eb182
pass args to order amount filters
...
Closes #7718
2015-03-13 10:03:08 +00:00
8554796c4b
Show calculate total when shipping is needed, but shipping is hidden.
...
Closes #7650
2015-03-10 16:57:43 +00:00
44d8bee22c
Use round instead of number_format
2015-03-09 18:10:49 +01:00
245a2cf4e7
Added the option to not round the line total.
2015-03-09 18:06:31 +01:00
3fc7a0ae65
Allow wc_attribute_label to support product-level attribute names.
...
Closes #7662
2015-03-09 13:40:07 +00:00
d4b08daa64
Avoid 'division by zero' warnings
...
SHA 85befad283
2015-03-06 17:46:31 -05:00
c45c4fd1a2
optimize PR#7605
2015-03-06 15:06:24 +01:00
0e4cea8e85
Introduce `WC_Order::get_cancel_order_url_raw()` method
2015-03-03 02:01:17 -05:00
d98569327d
Check payment title exists before output.
2015-03-02 10:03:30 +00:00
ffc436957b
Removed double @property comment
2015-02-26 17:14:06 +01:00
4c411a69e7
* Fix - Saving an order needs to save the discount amount ex. tax like
...
the cart.
* Tweak - Show discounts inc. tax when showing order totals inc. tax.
Closes #7532
@barrykooij @claudiosmweb How does this look? Looks like we were saving
order discounts inconsistent with the cart/checkout
2015-02-23 17:39:57 +00:00
c913316f8b
Introduce wc_get_page_permalink.
2015-02-15 19:13:22 +00:00
43c24feffd
Item meta removal query in order class.
2015-02-11 22:14:24 +00:00
f1fa927f57
Fix WC_Order::payment_complete() on back-end
...
SHA: c038001eab
2015-02-10 16:55:47 -08:00
22c4f02bbf
Used filtered comment for woocommerce_new_customer_note action, closes #7349
2015-02-10 14:44:28 -02:00
f032a9c7dd
Missing props
2015-02-03 14:44:57 +00:00
f711ef32ce
Missing bracket in previous commit #copypastefail
2015-02-03 13:16:41 +00:00
7c019c0c50
More docblocks; the check for WP_POST isn't needed as the second case (isset) runs regardless and is true for posts
2015-02-03 13:13:07 +00:00
c038001eab
Docblocks for order/product
2015-02-03 12:57:08 +00:00
dc5b8d9710
@var
2015-02-03 12:28:15 +00:00
6bc269858a
tweak docblock
2015-01-30 14:30:10 +00:00
d6023818fd
Fixed the increase and decreate of coupons usage count
2015-01-30 12:14:34 -02:00
def250e912
Display taxes labels in order totals when order has refunded, closes #7229
2015-01-29 18:50:08 -02:00
c995f23354
Fixed WC_Abstract_Order coupon methods
...
@mikejolley
2015-01-26 16:48:03 -02:00
8ff08e70af
Fixed the WC_Abstract_Order::get_user_id() return type and fixed the orders customer_id
2015-01-26 14:41:19 -02:00
54e025939b
Use get_post_status to avoid out of date order data.
...
Partly related to #7208
2015-01-26 13:07:29 +00:00
19f660171e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-01-23 14:37:20 +00:00
7f2a943075
Docblocks
2015-01-23 14:35:17 +00:00
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
91de767442
Product constructor setting post incorrectly
2015-01-20 14:00:30 +00:00
5404006b29
MAP Url method
2015-01-20 13:31:02 +00:00
de4129f9b2
WP_POST docs
2015-01-20 13:20:22 +00:00
5ab35bf212
Protected variables
2015-01-20 13:01:19 +00:00
b941636068
Deprecate unused and pointless get_billing_address() get_shipping_address() methods
...
@claudiosmweb
2015-01-20 12:39:21 +00:00
df66e0bcc8
Docblocks and code fixes in order class
2015-01-20 12:34:40 +00:00
2e624995b4
More magic properties and variable declarations in order class
2015-01-20 12:07:33 +00:00
ea13b90340
Define magic properties for address data
2015-01-20 11:23:17 +00:00
c0bea39c95
Seeing if magic properties are recognised
2015-01-20 11:06:15 +00:00
3716329b16
Prevent error when user does not exist
2015-01-19 14:50:06 +00:00
fef41c149c
@uses WP_POST
2015-01-15 15:03:12 +00:00
fa8aeb605c
Update abstract-wc-order.php
2015-01-12 12:34:53 +00:00
cab9e14fcd
Use number format instead of round in get_item_subtotal()
...
Closes #6913
2015-01-05 11:42:10 +00:00
f847b92a0f
Merge branch 'wc-geolocation'
2015-01-05 10:18:25 +00:00
6800ee0ec3
Base vs default
2014-12-23 17:34:05 +00:00
d6bf1e81f9
added variation ID in order stock notes
2014-12-23 12:01:11 +01:00
fd15ac4c64
Allow a cancelled order to be marked paid, if there is a payment delay
...
Closes #6810
2014-12-10 16:54:08 +00:00
3c82331a8b
Store discount 'tax' to show discounts on prices including tax more accuratly
...
Also deprecated some functions named after having 2 levels of discounts.
2014-11-25 13:05:03 +00:00
4a8c541fbf
Remove 'order' discounts from classes
2014-11-25 11:05:14 +00:00
f8a161c406
Documentation improvement.
2014-11-21 22:16:15 +01:00
ae1ed2b7f6
Added missing param docblock.
2014-11-21 22:14:13 +01:00
b131f250b6
Added missing docblock return statement.
2014-11-21 22:12:37 +01:00
64227fe9d8
Added missing docblock
2014-11-21 22:12:03 +01:00
33b53c30b5
Updated docblock and added return statement.
2014-11-21 22:09:46 +01:00
fa42c9d397
Change remove_order_items subqueries to inner joins.
...
Closes #6804
Hat tip Jason @ WPEngine
2014-11-21 09:18:31 +02:00
f34cead914
Removed old code in favor of wc_tax_enabled() and wc_prices_include_tax()
2014-11-18 14:45:29 -02:00
e476a3f76b
Merge pull request #6785 from SiR-DanieL/make_clickable
...
Automatically creates clickable links in item metas
2014-11-18 16:21:29 +00:00
da43955416
Introduces the wc_get_default_location() function
2014-11-18 12:56:13 -02:00
913cc42c06
Fixes https://github.com/woothemes/woocommerce-product-addons/issues/24
2014-11-18 14:22:21 +01:00
6077a10e44
Removed some dead variables
2014-11-18 10:42:54 -02:00
2e2ce3c286
[2.2] During refunds, correctly set shipping tax totals
...
Fixes #6691
2014-11-14 12:52:43 +00:00
7c5be1ebde
fixing small typo
2014-11-11 22:32:06 +02:00
2b8be95360
Remove # (hash) from get_order_number and add to strings instead as needed.
...
Most places use Order #X
Some places use Order Number: X
Both are now valid.
Fixes #6518
2014-10-24 14:53:43 +01:00
1922b377e8
Corrected comment
2014-10-20 16:10:39 +01:00
e03cf9c204
Set order_type property, and move actual order loading to separate method to make it easier for sub-classes to handle just that process.
...
Closes #6513
2014-10-14 14:25:53 +01:00
30edd0aa05
[2.2] Prevent notice if meta is not set Closes #6514
2014-10-14 11:26:14 +01:00
742594e207
Tweaks to order class
2014-10-07 11:09:29 +01:00
700369c386
Refund report changes
...
1. Ensure refund order_total is negative and reflects the full amount,
not just line items
2. Ensure transients are cleared when doing refunds
3. sales-reports order types so we can exclude refunds from pure
‘sales’ reporting
4. Tweak placement of refunds in legend.
Closes #6411
2014-10-06 13:39:53 +01:00
56c2e5838d
Fix get_cart_tax() comment
2014-09-29 17:11:34 +02:00
493285f101
When updating order status, ensure its a valid WC order status.
...
Fixes #6285
2014-09-17 12:24:10 +01:00
066eb3c5b0
fixed wc_get_order_status_name() appear as wc 2.1 order status
2014-09-12 10:01:49 -03:00
591d3dc3be
added methods to dynamically get the address fields in WC_Checkout::create_order(), closes #6226
2014-09-11 17:12:17 -03:00
7ae41bb4ed
Fix - Ensure shipping address gets displayed - fixes needs_shipping_address() method.
2014-09-11 11:11:22 +01:00
55d3ba0d9d
Fix warnings with WC_Order::get_item_total()
...
When calling WC_Order::get_item_total() for a fee, $item[‘qty’] is not
set which causes a notice and warning.
2014-09-09 21:23:46 -04:00
2f1533ff94
created the wc_get_order_status_label() function
2014-09-09 14:14:10 -03:00
c85a71dcee
fixed the order status label
2014-09-09 14:00:37 -03:00
c4ef86d44e
scrutinizer patches
2014-09-08 00:37:55 +01:00
1d13f767b3
Merge pull request #6157 from tamarazuk/coding-standards
...
Coding standards Part 1
2014-09-03 17:05:42 +01:00
349c85b639
Remove redundant wc_order_can_be_edited filter
...
#6154
2014-09-03 10:09:31 +01:00
3acfb14214
Store order's editable status in property
...
To save overhead of a function call
2014-09-02 12:27:26 -07:00
4dea71314f
Add 'wc_order_is_editable' filter
2014-09-02 11:49:05 -07:00
78d932e6d2
Add WC_Abstract_Order::is_editable()
...
To centralise logic used to determine if an order can be edited from
the Edit Order screen
2014-09-02 11:47:56 -07:00
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
94365791af
Changed all use of get_product to wc_get_product
2014-08-19 12:09:29 +02:00
70541f85e7
fixed the woocommerce_order_item_needs_processing filter
2014-07-29 15:08:08 -03:00
c465c7235d
Merge branch 'credit-notes'
...
Conflicts:
includes/abstracts/abstract-wc-order.php
includes/class-wc-order-factory.php
includes/class-wc-post-types.php
includes/wc-formatting-functions.php
includes/wc-order-functions.php
2014-07-29 12:09:52 +01:00
f656d57282
Add WC_Order::get_order_subtotal()
...
Convenience method to return the order subtotal
Part of #4160
2014-07-27 23:31:26 -04:00
3cc9952fea
Include order item ID and rate ID in WC_Order::get_tax_totals()
...
Part of #4160
2014-07-27 23:31:02 -04:00
f4feefc100
Fix WC_Order::get_user()
2014-07-27 23:30:21 -04:00
e47ac33eb1
Add calculate_shipping() method to WC_Abstract_order
...
When the update_shipping() method is used, the order shipping amount is
not properly calculated unless the shipping costs are summed.
Part of #4160
2014-07-27 23:29:40 -04:00
1598d1b539
Add update methods to WC_Abstract_Order
...
These methods compliment the existing add_*() methods and provide a
consistent interface to add and update items for the order.
Part of #4160
2014-07-27 23:28:25 -04:00
cca54879fa
Fix misc docblocks
2014-07-27 23:23:59 -04:00
19b6922044
Refund line items and taxes
2014-07-24 15:34:14 +01:00
5152457d9d
improved the saving the new tax data
2014-07-20 01:28:16 -03:00
3a28c56876
save and display shipping taxes in order items meta box
2014-07-20 00:32:52 -03:00
93cf3c88bd
initial implementation of order items taxes
2014-07-19 01:08:02 -03:00
50113fa531
fixed "Invalid argument supplied for foreach()" warning in line 127
2014-07-19 00:16:34 -03:00
979f2c0b48
Get transaction ID method
2014-07-07 11:43:06 +01:00
2f3793e49b
pass to get_subtotal_to_display(). Fixes #5790
2014-07-04 20:29:17 +02:00
86a4add087
Merge remote-tracking branch 'upstream/master' into order-factory-refactor
...
Conflicts:
includes/class-wc-order.php
2014-07-03 13:38:55 +02:00
e7b6c49c7c
Added comment to indicate that WC_Order shouldn't be directly instantiated
2014-06-14 23:36:20 +02:00
aa60022297
Restore get_order call in WC_Order constructor
2014-06-13 15:38:24 +02:00
476870d9f2
Created WC_Abstract_Order, extended by WC_Order
2014-06-13 15:37:20 +02:00
Diego Zanella
Mike Jolley
Ewout Fernhout
Peter
Fredrik Forsmo
Claudio Sanches
Illimar Tambek
rchq
Brent Shepherd
Vignesh
Gregory Karpinsky
Gabor Javorszky
Nathan Dawson
InoPlugs Webdesign
Spreeuw
Nicola Mustone
Barry Kooij
Tamara Zuk
Paul Wilde
Scrutinizer Auto-Fixer
Andrew Benbow
Gerhard
Marin Atanasov
mgiulio
Max Rice
Barry Kooij
EmilEriksen
Coen Jacobs