Commit Graph

995 Commits

Author SHA1 Message Date
James Koster 316b43f770 coupons. closes #6836 2014-12-09 16:06:34 +00:00
Mike Jolley 317808a219 [2.2] If order_item_type is not set, don't query it in reports class 2014-12-09 12:59:01 +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
Nicola Mustone e59070ab01 clickable item name in orders table 2014-12-04 16:57:12 +01: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
Mike Jolley b852904e37 Merge pull request #6890 from bryceadams/patch-6888
Add style field to woocommerce_wp_xxxxx_input
2014-12-02 10:06:23 +00:00
antoscarface 78047959f4 Moved do action of 'woocommerce_admin_css' to avoid possible add action from debug plugin as "Debug Bar" and "Debug Bar Slow Actions"
See screen: http://d.pr/i/1fYX1/7ZiItezr
2014-12-02 10:26:17 +01:00
Bryce f8d4fe64ad Fix annoying white space 2014-12-02 13:50:17 +07:00
Bryce cd76ae82e7 Add style field to woocommerce_wp_xxxxx_input
Closes #6888
2014-12-02 13:48:06 +07:00
claudiosmweb 5d9a1ad908 Merge branch 'master' of github.com:woothemes/woocommerce 2014-12-01 21:56:45 -02:00
claudiosmweb 3ce620e4f3 Removed eXtremeGoHorse practices from WC_AJAX::calc_line_taxes() and wc_save_order_items()
cc @barrykooij
2014-12-01 21:55:48 -02:00
Barry Kooij e1b81b3a23 Introduced 'woocommerce_reports_taxes_tax_rate' and 'woocommerce_reports_taxes_rate' filters. 2014-12-01 13:36:50 +01:00
Tamara Zuk af442599b1 Code Standards: Finish up admin includes
* 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`

@see http://make.wordpress.org/core/handbook/coding-standards/php/

@see part 1: #6157
2014-11-30 01:52:32 -05: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
Claudio Sanches 8e929c1ee8 Merge pull request #6859 from SiR-DanieL/master
Edit link for WC Pages
2014-11-28 09:40:32 -02:00
Claudio Sanches 1afa04e7f6 Merge pull request #6857 from splashingpixels/product-gallery-images
undefined index when product image gallery side meta box is removed fixe...
2014-11-28 09:40:10 -02:00
Nicola Mustone c25b86e0ae Edit link for WC Pages 2014-11-28 09:06:15 +01:00
Bryce 0967525a72 Bit of code formatting 2014-11-28 14:21:01 +07:00
Bryce 5e0cbb4676 Add stupidtable.min.js 2014-11-28 14:17:58 +07:00
splashingpixels 13ad1100c5 undefined index when product image gallery side meta box is removed fixes 6855 2014-11-27 20:42:58 -08:00
claudiosmweb b6cd6b8735 Fixed some coding standards 2014-11-27 15:29:52 -02:00
shivapoudel 84bc7a2339 Cleanup for WC_Admin_Attributes Class 2014-11-27 22:34:19 +05:45
shivapoudel 3aa67ac352 Fixes attribute menu highlight, closes #6849 2014-11-27 22:32:11 +05:45
Mike Jolley 2c1c9896c5 Remove remove_variation and replace with remove_variations 2014-11-27 15:44:51 +00:00
Mike Jolley 2cfaead676 Added numeric sort for attributes. Closes #5978 2014-11-27 14:49:02 +00:00
Mike Jolley 251160d512 Added 'top freebies' to product report.
Closes #5596
2014-11-27 10:36:21 +00: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 06129f60cd Message when updating attributes #6189 2014-11-26 11:14:08 +00:00
Mike Jolley d9f26e7848 Remove troublesome 'featured image' text replacement
Little gain in keeping this - not worth the overhead. Closes #6451
2014-11-26 11:03:39 +00:00
Mike Jolley dbcc8430e9 Installer tweaks + unit tests closes #6356 2014-11-25 17:09:24 +00: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
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 f90c146d01 Give product gallery low priority
Closes #5976
2014-11-24 15:29:37 +00:00
Mike Jolley 3a927d62dd Add tip to reports
Closes #5729
2014-11-24 15:18:41 +00:00
Bryce e93c32565c merge changes 2014-11-22 00:09:11 +07:00
Mike Jolley 40e0fe7a4e Merge pull request #6811 from bryceadams/patch-5537
#5537 - Fix bulk edit overlap, bulkedit improvements
2014-11-21 16:40:28 +00:00
Mike Jolley 8b4332a037 Refactors to shipping tax rate methods 2014-11-21 13:06:33 +00:00
Bryce bad3b31a18 #5537 - Fix bulk edit overlap, bulkedit improvements 2014-11-21 13:37:14 +07:00
Bryce a6c88c9104 Only enqueue/localize on profile page 2014-11-21 12:42:32 +07:00
Mike Jolley f088f81dcf Optimise tax rate importer and use same code as tax settings class 2014-11-20 18:41:51 +00:00
Mike Jolley add83a75dc Tax rate importer parse error 2014-11-20 17:09:07 +00:00
Mike Jolley 1ec8dabf8a Added method for expanding postcode ranges 2014-11-20 17:08:17 +00:00
Mike Jolley 97d241c33c Moved delete tax rate rule 2014-11-20 15:46:07 +00:00
Mike Jolley 7472a722b2 Corrected format_ methods 2014-11-20 15:43:40 +00:00
Mike Jolley ce1a9b84c7 Redo construct and move settings/html to separate files 2014-11-20 15:03:45 +00:00
Mike Jolley 4fd8cd63cb Split up save_tax_rates() method 2014-11-20 11:11:08 +00:00
Bryce 8b1cc5f902 #5850 - Add QR code to API credentials
This uses https://github.com/jeromeetienne/jquery-qrcode for generating
the QR code.

This is what it looks like:

![see screen shot](http://cld.wthms.co/11wpb+)

It’s small, **but**, it scans perfectly without any issues.
2014-11-20 15:46:46 +07:00
Mike Jolley c70c232e2c Optimised save tax rate logic 2014-11-20 00:51:06 +00:00
claudiosmweb 8eeb6fc204 Removed more some unused code 2014-11-19 22:43:09 -02:00
claudiosmweb 74ba11c189 Removed some unused code 2014-11-19 21:36:47 -02:00
claudiosmweb 9b16425142 Fixed some coding style issues 2014-11-19 17:01:06 -02:00
Illimar Tambek e41368c99a DRY up order status bulk actions 2014-11-19 14:26:27 +02:00
Illimar Tambek d510372d64 DRY up mark_order_{$status} 2014-11-19 14:13:24 +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 b3782fa1a5 Removing Mijireh from core 2.3 2014-11-18 16:37:43 +00:00
Mike Jolley 003094c9c3 Ensure remaining hashes are translated Closes #6518 2014-11-18 16:29:21 +00:00
Mike Jolley ed1ff0f48c WooConf is over 2014-11-18 16:26:12 +00:00
Mike Jolley e7fc5520a8 Merge pull request #6776 from axisthemes/welcome
Welcome Page Cleanup
2014-11-18 16:25:44 +00:00
Nicola Mustone 22a32ae9c8 Fixes #6555 2014-11-18 14:20:47 +01:00
claudiosmweb 6077a10e44 Removed some dead variables 2014-11-18 10:42:54 -02:00
shivapoudel 78f9759e1c Some modification for theme-support notice 2014-11-18 17:22:15 +05:45
shivapoudel 36e74b3b0d Some curley braces 2014-11-17 22:59:49 +05:45
Mike Jolley a0bf72f7b5 Bulk edit sales schedule on variations
Closes #6300
2014-11-17 16:50:25 +00:00
shivapoudel d688a37f54 Some mistake revoked 2014-11-17 22:34:27 +05:45
shivapoudel 3d4954a3e1 Some gap added intensionally ;) 2014-11-17 22:27:39 +05:45
shivapoudel 85440b5927 use of final class helper function 2014-11-17 22:03:15 +05:45
shivapoudel 61dfac7ccd Unused var if needed in future we can use WC_PLUGIN_BASENAME constant 2014-11-17 21:44:32 +05:45
shivapoudel 5b0be2f102 Cleanup for the WC_Admin_Welcome Class 2014-11-17 21:41:36 +05:45
Mike Jolley 82145be444 Merge pull request #6773 from axisthemes/menu-order
Simplify the condition for custom menu order
2014-11-17 14:31:37 +00:00
shivapoudel 825d56f8ba Modified since current_user_can() returns boolean ;) 2014-11-17 20:00:01 +05:45
shivapoudel 891d3a4573 Simplify the condition for custom menu order :) 2014-11-17 15:21:47 +05:45
Bryce 71909a7c72 Update default for 'Default Product Sorting' option 2014-11-17 15:37:02 +07:00
Bryce 295fed6467 Add placeholder attribute for settings API #6764 2014-11-16 14:49:43 +07: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 9abbf4cef8 Fix coupons by date queries to prevent inflated results
Closes #6742
2014-11-13 17:25:45 +00:00
Mike Jolley 4c8a3eaba5 Merge pull request #6738 from bryceadams/master
Add script_debug $suffix for admin settings.js
2014-11-13 08:43:51 -08:00
Illimar Tambek a7a913ab09 Custom attributes for select, checkbox and textareas 2014-11-13 13:26:52 +02:00
Bryce d717eed3ad Add script_debug $suffix for admin settings.js 2014-11-13 15:57:09 +07:00
Mike Jolley 622c031f05 Merge pull request #6733 from SiR-DanieL/patch-3
Improved Shop Page Display option
2014-11-12 09:05:54 -08:00
Mike Jolley 87c417e56a When bulk editing variable products, set the stock status for non-stock managed variations
Fixes #6661
2014-11-12 15:15:05 +00:00
Nicola Mustone fc2429549e Improved Shop Page Display option
I tweaked the text of the second option in Shop Page Display because i guess it confuse users that only read "Show subcategories". What about main categories?

I'd like to change also "Show both" to "Show all". What do you think?
2014-11-12 15:01:17 +01:00
James Koster 6a0fe9974f reports print styles. closes #4544 2014-11-12 12:53:57 +00:00
Mike Jolley 9e53b3fb33 Clear shipping transient on save
Closes #6723
2014-11-11 16:22:29 +00:00
James Koster 57809bc017 coding standards 2014-11-11 15:47:14 +00:00
James Koster ecb5c77eae coding standards 2014-11-11 14:40:13 +00:00
James Koster 0321fc79d1 yoda 2014-11-11 14:31:27 +00:00
James Koster 7fd28c1295 order. #6639 2014-11-11 14:29:54 +00:00
James Koster c153a62406 Products setting tab. #6639 2014-11-11 14:25:46 +00:00
Mike Jolley f8bc4a0abd Add item cost column Closes #6650
@jameskoster
2014-11-11 13:40:47 +00:00
Mike Jolley 83fb26e30d Dump chosen select option. Closes #6593 2014-11-11 12:12:28 +00:00
Mike Jolley 01091c304c Fix conflicts in #5949 2014-11-11 11:23:44 +00:00