Commit Graph

307 Commits

Author SHA1 Message Date
Mike Jolley 100b95ae4f Tweak the get magic method in product class 2014-12-11 14:54:56 +00:00
Claudio Sanches a579ce4578 Merge pull request #6894 from franticpsyx/add_shop_prices_in_variation_data_array
Add display_prices in available_variations array
2014-12-10 15:52:57 -02:00
Mike Jolley 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
Claudio Sanches ec30dab6c4 Improved the colorpicker field 2014-12-09 10:10:59 -02:00
Claudio Sanches 5ea4e1b0a7 Created new colorpicker settings api field 2014-12-09 10:07:29 -02:00
Mike Jolley eba8206540 Merge branch 'tax-coupon-handling' Closes #6830
Conflicts:
	assets/js/admin/meta-boxes-order.min.js
	includes/api/class-wc-api-coupons.php
	includes/class-wc-cart.php
	templates/checkout/review-order.php
2014-12-03 12:33:15 +00:00
Manos Psychogyiopoulos 4b04701cc8 add display_prices in variation data
The commit introduces 3 changes:
1. It adds 2 extra fields to the available_variations array,
display_price and display_regular_price, to be used by extensions in
cases like
https://github.com/woothemes/woocommerce-product-addons/issues/19
2. Introduces a get_display_price() function in WC_Product to retrieve
product prices incl or excl tax relative to the
woocommerce_tax_display_shop setting.
3. Fixes a minor issue where passing a 0 price to
get_price_including_tax() or get_price_excluding_tax() results in a
wrong output.
2014-12-03 11:28:04 +02:00
claudiosmweb 676549b4ab Fixed docblock for WC_Product::get_categories() 2014-12-01 22:09:42 -02:00
Bryce 83a457b29c improve get_rating_count() for rating-less reviews
Should close #6839.

According to `woocommerce_enable_review_rating` &
`woocommerce_review_rating_required`, it will do a different DB query,
so that when reviews without ratings are allowed, it will do a query
that counts those comments as reviews.
2014-11-27 14:32:09 +07:00
Mike Jolley 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
Mike Jolley 4a8c541fbf Remove 'order' discounts from classes 2014-11-25 11:05:14 +00:00
Barry Kooij 47cc448028 Added correct docblock. 2014-11-21 22:34:30 +01:00
Barry Kooij 4b539e7a9a Merge branch 'master' of github.com:woothemes/woocommerce 2014-11-21 22:31:17 +01:00
Barry Kooij 6ebadd572a Added correct docblock. 2014-11-21 22:31:09 +01:00
Michael Tieso 70d5fc834a Spelling correction - calculdate to calculate 2014-11-21 13:26:32 -08:00
Barry Kooij f8a161c406 Documentation improvement. 2014-11-21 22:16:15 +01:00
Barry Kooij ae1ed2b7f6 Added missing param docblock. 2014-11-21 22:14:13 +01:00
Barry Kooij b131f250b6 Added missing docblock return statement. 2014-11-21 22:12:37 +01:00
Barry Kooij 64227fe9d8 Added missing docblock 2014-11-21 22:12:03 +01:00
Barry Kooij 33b53c30b5 Updated docblock and added return statement. 2014-11-21 22:09:46 +01:00
Gerhard fa42c9d397 Change remove_order_items subqueries to inner joins.
Closes #6804
Hat tip Jason @ WPEngine
2014-11-21 09:18:31 +02:00
claudiosmweb b4e544e5dc Fixed coding styles and docblocks 2014-11-20 00:14:06 -02:00
claudiosmweb 6d4650dd7b Declared all Settings API variables 2014-11-19 23:11:08 -02:00
claudiosmweb 74ba11c189 Removed some unused code 2014-11-19 21:36:47 -02:00
claudiosmweb d4c480a6ea Fixed process_refund() docblock 2014-11-19 21:14:28 -02:00
claudiosmweb e87aefc8e0 Fixed missing initial $query = array() 2014-11-19 16:26:10 -02: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 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
claudiosmweb da43955416 Introduces the wc_get_default_location() function 2014-11-18 12:56:13 -02:00
Nicola Mustone 913cc42c06 Fixes https://github.com/woothemes/woocommerce-product-addons/issues/24 2014-11-18 14:22:21 +01:00
claudiosmweb 6077a10e44 Removed some dead variables 2014-11-18 10:42:54 -02:00
Mike Jolley e6a5825f8c Some shipping class tidyup 2014-11-17 16:30:18 +00:00
Mike Jolley 65ace6818b Merge pull request #6757 from tamarazuk/master
Introduce `woocommerce_product_is_on_sale` filter
2014-11-17 14:11:59 +00:00
claudiosmweb 24e17e36d3 Preventing errors when adding a widget using the WP Customize
Fixed coding standards and used methods from WC_Widget for start and end the widget
2014-11-14 23:12:59 -02:00
Tamara Zuk 20655d367d Introduce `woocommerce_product_is_on_sale` filter
This filter is useful for extensions like Measurement Price Calculator
which alter the product price quite a bit, but would still like the
sale badge to appear :)

Current workaround is to use three filters ( `woocommerce_get_price`,
`woocommerce_get_regular_price`, and `woocommerce_get_sale_price` )
which most extension may be using already, but not all need/want to
alter these prices.
2014-11-14 18:00:03 -05:00
Mike Jolley 2e2ce3c286 [2.2] During refunds, correctly set shipping tax totals
Fixes #6691
2014-11-14 12:52:43 +00:00
Marin Atanasov 7c5be1ebde fixing small typo 2014-11-11 22:32:06 +02:00
Mike Jolley cb8fe34b4c get_base_tax_rates() + filter. Closes #6668 2014-11-11 11:56:17 +00:00
Mike Jolley 69ca69ce52 Split up the product widget methods 2014-10-29 11:07:06 +00:00
Mike Jolley 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
Mike Jolley e4b212cb3a [2.2] Fix stock report queries Closes #6565 2014-10-21 14:50:18 +01:00
Mike Jolley 1922b377e8 Corrected comment 2014-10-20 16:10:39 +01:00
Mike Jolley 8766cfa6df Tweak woocommerce_get_price_html_from_to in #6455 2014-10-17 16:25:54 +01:00
Mike Jolley 2668f0b8dd Merge pull request #6455 from paulwilde/from-to-filters
Introduce filters to get_price_html_from_text() and get_price_html_from_to()
2014-10-17 16:25:16 +01:00
Tamara Zuk f34187d5d3 Allow for non-integer stock quantities
It looks like a3b522aff8 removed this
ability.
This would be very useful for extensions like Measurement Price
Calculator.
2014-10-17 00:52:56 -04:00
Mike Jolley 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
Mike Jolley 30edd0aa05 [2.2] Prevent notice if meta is not set Closes #6514 2014-10-14 11:26:14 +01: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
Mike Jolley e9393ddaf7 Settings API should use h3 rather than h4 when outputting titles 2014-10-08 15:06:38 +01:00
Mike Jolley 80716fbd46 Corrected get_return_url docblock 2014-10-07 11:09:38 +01:00
Mike Jolley 742594e207 Tweaks to order class 2014-10-07 11:09:29 +01:00
Mike Jolley 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
Paul Wilde 279c01d005 Introduce filters to get_price_html_from_text() and get_price_html_from_to(). 2014-10-02 20:11:34 +01:00
Mike Jolley e5ebeff99c Merge pull request #6383 from BFTrick/iss-6358
Refactoring Email Classes to Use One Send Method
2014-10-02 14:00:18 +01:00
mgiulio 56c2e5838d Fix get_cart_tax() comment 2014-09-29 17:11:34 +02:00
Patrick Rauland 1498198215 renaming and moving abstract-wc-email file 2014-09-23 10:12:43 -06:00
shivapoudel 303a5b28d0 Absolute path fix for abstract classes :) 2014-09-21 00:24:49 +05:45
Mike Jolley 493285f101 When updating order status, ensure its a valid WC order status.
Fixes #6285
2014-09-17 12:24:10 +01:00
Illimar Tambek fb19f5b9c5 Improve naming & comments 2014-09-17 11:27:43 +03:00
Illimar Tambek 386011ffae Allow getting rating count for a specific rating number 2014-09-17 11:03:10 +03:00
Mike Jolley ce1236bd95 Merge branch 'master' of https://github.com/woothemes/woocommerce
Conflicts:
	readme.txt
2014-09-16 10:48:46 +01:00
Mike Jolley a3b522aff8 Prepare update queries. 2014-09-16 10:45:28 +01:00
Barry Kooij 9723ed8096 Added settings sub title styling 2014-09-15 17:47:01 +02:00
Barry Kooij a93b107e55 removed unused default 2014-09-15 17:30:15 +02:00
claudiosmweb 066eb3c5b0 fixed wc_get_order_status_name() appear as wc 2.1 order status 2014-09-12 10:01:49 -03:00
claudiosmweb 591d3dc3be added methods to dynamically get the address fields in WC_Checkout::create_order(), closes #6226 2014-09-11 17:12:17 -03:00
Mike Jolley 7ae41bb4ed Fix - Ensure shipping address gets displayed - fixes needs_shipping_address() method. 2014-09-11 11:11:22 +01:00
Mike Jolley 3a4ba6e4c8 For regular products, ensure stock level saves on product creation. 2014-09-10 23:55:40 +01:00
Max Rice 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
claudiosmweb 2f1533ff94 created the wc_get_order_status_label() function 2014-09-09 14:14:10 -03:00
claudiosmweb c85a71dcee fixed the order status label 2014-09-09 14:00:37 -03:00
Mike Jolley 27a20dd80e Docblock changes 2014-09-08 16:35:40 +01:00
Mike Jolley c4ef86d44e scrutinizer patches 2014-09-08 00:37:55 +01:00
Mike Jolley 1d13f767b3 Merge pull request #6157 from tamarazuk/coding-standards
Coding standards Part 1
2014-09-03 17:05:42 +01:00
Mike Jolley 349c85b639 Remove redundant wc_order_can_be_edited filter
#6154
2014-09-03 10:09:31 +01:00
Mike Jolley cb76bd7fb8 Merge pull request #6154 from thenbrent/is_editable
Add `WC_Abstract_Order::is_editable()` method and `'wc_order_is_editable'` filter
2014-09-03 10:06:04 +01:00
claudiosmweb 78c7fefe3e fixed some docblocks 2014-09-02 16:50:19 -03:00
thenbrent 3acfb14214 Store order's editable status in property
To save overhead of a function call
2014-09-02 12:27:26 -07:00
thenbrent 4dea71314f Add 'wc_order_is_editable' filter 2014-09-02 11:49:05 -07:00
thenbrent 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
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
justinstern 8417209d6c Improve, fix, WC_Payment_Gateway::get_transaction_url()
* Make the new get_transaction_url() method a bit more
flexible/convenient by passing in the full order object rather than
transaction_id
* Fix bug with core PayPal gateway get_transaction_url() override
2014-08-27 21:51:03 -04:00
Barry Kooij 94365791af Changed all use of get_product to wc_get_product 2014-08-19 12:09:29 +02:00
Mikel Martin 1ed0a9e9db Payment unavailable if max_amount greater than 0 and order totar greater than max_amount 2014-08-17 22:10:35 +02:00
Mike Jolley c51fac23e0 Availability with backorders not requiring notification. 2014-08-15 15:29:14 +01:00
Barry Kooij 6655188f0b Changed use of get_order with wc_get_order 2014-08-15 14:29:21 +02:00
Mike Jolley da483198f8 Simplify icons 2014-08-15 11:50:53 +01:00
Mike Jolley 3f53512c7f Fix up visibility of stock options, drop downs, and get_availability() when parent is managing stock for a variation.
Fixes #6017
2014-08-13 15:03:30 +01:00
claudiosmweb acb0699e94 updated the reason default value 2014-08-11 10:07:09 -03:00
claudiosmweb 066ba904cb added $reason param in WC_Payment_Gateway::process_refund() 2014-08-07 15:57:29 -03:00
Mike Jolley 760cd6861c Small refactor of is_visible
Also returns false for non-published products and fixes #5955
2014-08-04 11:19:58 +01:00
Mike Jolley 368e6b9412 Round shipping quote totals to store DP setting
Fixes #5888
2014-07-30 11:04:01 +01:00
claudiosmweb 70541f85e7 fixed the woocommerce_order_item_needs_processing filter 2014-07-29 15:08:08 -03:00
Mike Jolley 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
Mike Jolley cdc0efed75 Merge pull request #5843 from maxrice/feature-orders-endpoint-issue-4160
Create/Edit/Delete orders via the REST API
2014-07-28 09:18:49 +01:00
Max Rice 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
Max Rice 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
Max Rice f4feefc100 Fix WC_Order::get_user() 2014-07-27 23:30:21 -04:00
Max Rice 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