Commit Graph

201 Commits

Author SHA1 Message Date
Mike Jolley 65dbab486c [2.2] Don't force tax_rate_id to an integer. Allow strings.
Used in Taxamo extension.
2014-12-11 11:06:01 +00:00
Brent Shepherd 40de60ea3e Give child class access to billing/shipping fields
So that custom order types can extend `WC_Meta_Box_Order_Data` for their
own purposes without having to redefine all the billing/shipping fields
2014-12-10 18:46:32 -08:00
Brent Shepherd 1f2375f7e4 Make no order notes label more generic
To account for it being displayed on custom order type Add/Edit screens
where the order type is not referred to as an 'Order' (e.g. a 'Subscription',
'Refund' or 'Pre-order').
2014-12-10 18:46:32 -08:00
Brent Shepherd b0c2f05a6a Use post type label for "Save Order" button
To improve compatibility with custom order types

Conflicts:
	includes/admin/meta-boxes/class-wc-meta-box-order-actions.php
2014-12-10 18:46:15 -08:00
James Koster 316b43f770 coupons. closes #6836 2014-12-09 16:06:34 +00:00
Mike Jolley 95a504cf84 Fix admin term output
Resolves an issue decoding foreign chars caused by #6555
Fixes #6550
2014-12-09 09:54:42 +00:00
Mike Jolley b470e64b61 Error in previous commit. 2014-12-08 12:34:42 +00:00
Mike Jolley 80d08787a8 Correctly save custom address fields in admin 2014-12-08 12:30:11 +00:00
Mike Jolley cf694bcae6 Merge pull request #6875 from tamarazuk/limit-order-action
Execute `woocommerce_order_action_{$action}` only once
2014-12-05 14:04:47 +00:00
Mike Jolley 6a45f8f196 Merge branch 'master' of https://github.com/woothemes/woocommerce 2014-12-03 12:33:19 +00: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
Claudio Sanches 8fac703f97 Added missing textdomain
cc @bryceadams #fail
2014-12-03 10:30:32 -02:00
Bryce 80ccc7b09d Add help tip for schedule sales info
Closes #6863
2014-12-03 13:20:24 +07:00
Tamara Zuk f63c5e8c8f Execute `woocommerce_order_action_{$action}` only once
Prevents a “Maximum function nesting level reached” fatal error in
certain cases.

Since this ends up running on `’save_post’`, updating something like
the order status while hooked onto to
`woocommerce_order_action_{$action}` causes a fun recursion :)
2014-11-30 00:14:22 -05:00
splashingpixels 13ad1100c5 undefined index when product image gallery side meta box is removed fixes 6855 2014-11-27 20:42:58 -08:00
Mike Jolley 6df4c143cc Adjust total for partially refunded order totals
Closes #6666
2014-11-27 10:04:18 +00:00
Mike Jolley 4bc63de72a Added 'stupidtable' script to allow order item sorting on the order screen (by name, cost, qty).
Closes #5998
2014-11-26 15:37:06 +00:00
Mike Jolley 3904035003 Disable already added attributes #6189 2014-11-26 11:35:07 +00:00
Mike Jolley 4a8c541fbf Remove 'order' discounts from classes 2014-11-25 11:05:14 +00:00
Mike Jolley 549d7ab2c0 Removed 'apply before tax' options for coupons - this should be the default core behaviour 2014-11-24 17:24:25 +00:00
Mike Jolley 8b4332a037 Refactors to shipping tax rate methods 2014-11-21 13:06:33 +00:00
claudiosmweb 74ba11c189 Removed some unused code 2014-11-19 21:36:47 -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
Nicola Mustone 22a32ae9c8 Fixes #6555 2014-11-18 14:20:47 +01:00
Mike Jolley a0bf72f7b5 Bulk edit sales schedule on variations
Closes #6300
2014-11-17 16:50:25 +00:00
Mike Jolley 2e2ce3c286 [2.2] During refunds, correctly set shipping tax totals
Fixes #6691
2014-11-14 12:52:43 +00:00
Mike Jolley f8bc4a0abd Add item cost column Closes #6650
@jameskoster
2014-11-11 13:40:47 +00:00
Mike Jolley 01091c304c Fix conflicts in #5949 2014-11-11 11:23:44 +00:00
Nicola Mustone 011bb0a784 Added cancelled order admin email 2014-10-29 15:05:43 +01:00
Mike Jolley 3d1285c8c4 Allow some limited html in text attributes
Fixes #6620. @claudiosmweb @barrykooij see any issues with adding this
one? Doesn’t appear to break anything…
2014-10-29 10:29:51 +00:00
claudiosmweb a5ad428faf [2.2] fixed the value format in stock field with wc_stock_amount(), closes #6622 2014-10-28 18:37:53 -02: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 c62a13148b Instead of using saved title from order, use payment method_title for refund buttons
Closes #6334
2014-10-24 12:11:28 +01:00
Nicola Mustone dcde2a52e2 Removed GMT 2014-10-22 17:31:12 +02:00
Nicola Mustone cbbdfadb74 Order note use comment_date instead of GMT date
The order comment note should not use always GMT date. I think using `comment_date` is better.

Ref Ticket: #224994
2014-10-22 17:28:25 +02:00
Mike Jolley 997e7e7910 extra sanitisation for product data 2014-10-22 12:12:25 +01:00
James Koster e27d4afee1 data tabs tweaks. #6562 2014-10-17 14:50:23 +01:00
James Koster eb258950bd variations markup / css refactor. #6562 2014-10-17 12:17:30 +01:00
Barry Kooij acf6644830 Confirm to user email is sent when sending email from within order edit screen.
Fixes #6461.
2014-10-14 15:18:09 +02:00
Mike Jolley 5c1b931438 [2.2] Fix refund date.
Fixes #6499
2014-10-09 16:43:26 +01:00
Mike Jolley 02f5ed7542 Merge pull request #6327 from SiR-DanieL/order-notes
Fixing order notes date
2014-10-09 12:39:00 +01:00
Mike Jolley 853e17d28f [2.2] Prevent address fields being empty when editing an address within an order
Fixes #6476
2014-10-08 15:13:26 +01:00
thenbrent 94355b73dc Display order & item totals with correct currency
If a store changes currency or is using an extension which allows for
purchasing in multiple currencies, the currency symbol displayed on the
Edit Order admin screen may be incorrect for previous orders because
it uses the `wc_price()` fallback, which is the site wide currency
rather than the currency for that specific order. This fixes that.
2014-10-07 09:59:52 +10:00
Mike Jolley 589da28f42 Small tweak on text in #6457 2014-10-06 14:31:32 +01:00
Bryce 5a6f0b1529 Re-do coupon free shipping option desc issue #6391
I didn’t update the POT as was having some poedit issues
2014-10-03 16:44:57 +07:00
Mike Jolley 819436f0a3 Merge pull request #6388 from quadshot/action-buttons
Allow adding custom 'action buttons' in order item metabox
2014-10-02 14:06:11 +01:00
Mike Jolley 3e20b113d6 Add hook to refund html
Closes #6406
2014-10-02 13:40:34 +01:00
Loushou a37ea4976b new filter for adding custom 'action buttons' on the order_items metabox in the admin edit order screen
loushou
2014-09-24 17:41:13 -07:00
Mike Jolley a91c74d794 Merge pull request #6309 from quadshot/before-oi-meta
filter for adding info before order item itemmeta in order metabox
2014-09-22 10:36:48 +01:00
Mike Jolley 0aca8e01f8 Merge pull request #6305 from quadshot/line-buttons
filter to allow custom 'add line' buttons
2014-09-22 10:23:46 +01:00