Commit Graph

764 Commits

Author SHA1 Message Date
Barry Kooij 6655188f0b Changed use of get_order with wc_get_order 2014-08-15 14:29:21 +02:00
Mike Jolley 6bd38b5ce0 Tweak display order text 2014-08-15 11:50:53 +01:00
Mike Jolley 1c3b4fdc5c Deprecate Mijireh - .org repo requested
Closes #6027
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
Mike Jolley dfe30bfe84 Tweak max spend text for #5992 2014-08-13 11:43:28 +01:00
Mike Jolley dc60cea213 Merge pull request #5992 from adamawesomeface/master
maximum ammount for coupon functionality added
2014-08-13 11:41:33 +01:00
Mike Jolley 9084ae222f Remove unused/uncoded options from dev branch
Fixes #6004
2014-08-13 11:38:49 +01:00
Mike Jolley 97724c8a95 woocommerce_create_page_id filter Closes #6013 2014-08-13 10:59:40 +01:00
claudiosmweb bbca8dd437 fixed customer report queries with order_types 2014-08-12 12:17:46 -03:00
Mike Jolley 5bc293a69c Initial display of add order item buttons Fixes #5991
Also Closes #5994
2014-08-12 12:54:44 +01:00
adamawesomeface 0e22412a7d maximum ammount for coupon functionality added 2014-08-08 07:38:58 -04:00
Mike Jolley fe12b330c0 Fix sorting indicator and add help text to parent. Fixes #5977 2014-08-08 10:24:42 +01:00
Mike Jolley 49b597665e Merge pull request #5967 from SiR-DanieL/master
Fixed issue #5895
2014-08-05 10:49:40 +01:00
claudiosmweb bce502f455 improved handling of stock options to save changes to a variable product 2014-08-04 14:53:29 -03:00
Nicola Mustone 7c7f6b30e5 following wc coding standards 2014-08-04 17:49:14 +02:00
Nicola Mustone 69694e6242 following wc coding standards 2014-08-04 17:45:35 +02:00
Nicola Mustone a4103f7bfe following wc coding standards 2014-08-04 17:42:16 +02:00
Nicola Mustone c5f9f2157f Fixed issue #5895 2014-08-04 17:28:20 +02:00
Mike Jolley f84cd332dc Merge pull request #5960 from bordoni/issue/5958
User that refunded now been shown at the Order edit page
2014-08-04 14:18:32 +01:00
Gustavo Bordoni 34a47c3682 Removing a `var_dump`, My bad 2014-08-04 08:14:00 -03:00
Nicola Mustone 91177e43da woocommerce support line outside the child theme conditional 2014-08-03 14:05:49 +02:00
Nicola Mustone 359d910090 Merge branch 'master' of https://github.com/woothemes/woocommerce 2014-08-03 13:59:17 +02:00
Gustavo Bordoni 6b3f228a55 Adding the information about who did the refund on the backend 2014-08-02 21:57:14 -03:00
Gustavo Bordoni fbf4ffd39b Include a isset before using a variable that might not be there 2014-08-02 21:32:18 -03:00
claudiosmweb 1a9d346e1f sync with master 2014-07-31 09:39:24 -03:00
Mike Jolley 727e49c097 Welcome page Closes #5920
@jameskoster can your review?
2014-07-31 09:48:17 +01:00
claudiosmweb a0bd72b9f3 Hide variation stock when manage stock is unchecked
closes #5935

@mikejolley
2014-07-30 15:32:06 -03:00
claudiosmweb 519de5be59 added alert about changing the product type that has variations
closes #5864

@mikejolley
2014-07-30 15:04:04 -03:00
Mike Jolley dab9a9be1f Merge pull request #5788 from kilbot/patch-1
Add woocommerce_product_visibility_options filter
2014-07-30 17:03:13 +01:00
Mike Jolley 75a6be58b9 Merge pull request #5755 from doublesharp/patch-1
Corrected duplicated settings_page() content
2014-07-30 17:01:19 +01:00
Mike Jolley 80a33b83d7 Merge pull request #5838 from danielvonmitschke/master
adding default product visibility filter hook
2014-07-30 12:58:50 +01:00
Mike Jolley d41cf9552f Merge pull request #5846 from corsonr/attributes_do_action
Add attributes do_action in products settings
2014-07-30 12:20:29 +01:00
Barry Kooij e49237c692 Added isset() checks around $legacy_order, var is only set if 'woocommerce_calc_taxes' option is 'yes'. 2014-07-30 11:13:09 +02:00
claudiosmweb 1cce388e1e added copy for support button, closes #5865 2014-07-29 12:06:58 -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 8a6831f33b Hide tax columns for legacy orders
@claudiosmweb
2014-07-28 17:08:11 +01:00
Bryce 1ffa2dd867 Updated to employ WordPress coding standards 2014-07-28 22:16:35 +07:00
Bryce 16fad7469b Admin Views HTML Headers, Stop Direct Access
Also a couple small formatting improvements
2014-07-28 21:50:11 +07:00
claudiosmweb fda7a5565c removed extra td element in refunds 2014-07-28 10:40:08 -03:00
Mike Jolley 42ac0c0368 Fix refund table alignment 2014-07-28 11:45:16 +01:00
Mike Jolley bf86072cce Interface tweaks
#3164
2014-07-28 11:41:52 +01:00
claudiosmweb acaee93236 fixed refunds cancel button action 2014-07-25 13:32:16 -03:00
Mike Jolley 5e663a7fa8 Show refunded line items inline 2014-07-25 16:48:19 +01:00
Mike Jolley f4e7211d3a Fix top seller on dashboard 2014-07-25 15:48:37 +01:00
Mike Jolley a9e30766d6 fix dashboard total 2014-07-25 15:47:51 +01:00
Mike Jolley 029bbbec39 Updated reports 2014-07-25 15:46:19 +01:00
Mike Jolley a7eaefc374 Change button label for calc taxes 2014-07-25 10:48:47 +01:00
claudiosmweb ca2dfdd7c1 synchronized the trash and delete actions between orders and refunds #3164 2014-07-24 18:39:59 -03:00
claudiosmweb 2d61126502 added add_shipping and add_fee ajax actions 2014-07-24 17:55:25 -03:00
claudiosmweb 5b3f69de0a fixed the "calculate tax" action #3164 2014-07-24 17:33:26 -03:00
Mike Jolley 00af832203 Sales by product report 2014-07-24 17:11:25 +01:00
Mike Jolley 873f36ca5c Pass order_types to reporting query functions 2014-07-24 15:55:06 +01:00
Mike Jolley 19b6922044 Refund line items and taxes 2014-07-24 15:34:14 +01:00
Mike Jolley e38dcf79bb Show refund boxes on click 2014-07-24 10:56:32 +01:00
Mike Jolley 0b231f2e03 Calc refund amounts and total via javascript 2014-07-24 10:53:29 +01:00
Mike Jolley 1ecfc59dfe Remove refund qty column 2014-07-24 10:22:04 +01:00
Mike Jolley e9b3d67ab7 Coupon template not needed 2014-07-24 10:21:57 +01:00
Mike Jolley 13f4f889a4 woocommerce_admin_order_item_values + refund fields 2014-07-24 10:21:47 +01:00
claudiosmweb a46ef1fced improved the shipping order items 2014-07-23 19:30:55 -03:00
claudiosmweb 26e50b7caf fixed post_type in reports 2014-07-23 14:17:01 -03:00
Mike Jolley 3aa9475e39 Coupon code display 2014-07-23 11:47:02 +01:00
Mike Jolley 4a306beef5 Max 100 taxes displayed, but show text input 2014-07-23 11:30:06 +01:00
claudiosmweb ae1881de06 fixed the line item quantity calcule #3164 2014-07-22 18:08:24 -03:00
claudiosmweb b56b60f191 stopped order editing when the status is not equal to pending or on-hold #3164 2014-07-22 16:25:37 -03:00
Mike Jolley 388e2eec49 removed display block 2014-07-22 16:46:28 +01:00
Mike Jolley 249f18f70d Merge branch 'credit-notes' of https://github.com/woothemes/woocommerce into credit-notes
Conflicts:
	assets/js/admin/meta-boxes-order.min.js
2014-07-22 16:44:23 +01:00
Mike Jolley 3e4506c376 Clean up total/subtotal display 2014-07-22 16:44:02 +01:00
claudiosmweb 7b5b1fc845 prevented that exist duplicate tax rate columns #3164 2014-07-22 12:42:17 -03:00
claudiosmweb 954a5ddc23 only show refund via button when gateway supports refunds #3164 2014-07-22 12:13:35 -03:00
Mike Jolley 01950bebdc Add confirmation before deleting tax column #3164 2014-07-22 15:26:18 +01:00
Mike Jolley 559ff43c42 Shipping should be displayed before fees 2014-07-22 14:42:12 +01:00
Mike Jolley 414bc4e314 Dashes when there is no tax 2014-07-22 14:42:04 +01:00
Mike Jolley b032c857ee Fix delete of shipping and fee line items. Remove checkbox for refunds. 2014-07-22 14:38:07 +01:00
Mike Jolley 550db70d77 Line item icons 2014-07-22 14:27:47 +01:00
Mike Jolley 6e0a880699 Group line items by type 2014-07-22 14:18:11 +01:00
Mike Jolley c65cd44aef Fix input styling 2014-07-22 11:56:52 +01:00
Mike Jolley 0c5be5f054 Moved add tax button, and tidied up tax column display 2014-07-22 11:54:59 +01:00
claudiosmweb d2340a5cef fixed refund calcule 2014-07-20 23:26:40 -03:00
claudiosmweb 098919f469 removed some order totals old stuff 2014-07-20 22:59:42 -03:00
claudiosmweb 144d094ad2 created method for delete order tax 2014-07-20 22:57:23 -03:00
claudiosmweb d875cfa1ac created ajax method to add new taxes 2014-07-20 22:36:12 -03:00
claudiosmweb 3e287ff19c fixed calculate total action 2014-07-20 21:12:39 -03:00
claudiosmweb eed6ca4405 removed order totals meta box 2014-07-20 20:53:55 -03:00
claudiosmweb 2d7e1cc51a added method to save all order taxes 2014-07-20 20:53:43 -03:00
claudiosmweb 5152457d9d improved the saving the new tax data 2014-07-20 01:28:16 -03:00
claudiosmweb 2cfebdc6c5 save/update shipping taxes 2014-07-20 00:56:38 -03:00
claudiosmweb 3a28c56876 save and display shipping taxes in order items meta box 2014-07-20 00:32:52 -03:00
claudiosmweb 6176cb6b77 allow multiple taxes columns in order items 2014-07-20 00:21:33 -03:00
claudiosmweb 93cf3c88bd initial implementation of order items taxes 2014-07-19 01:08:02 -03:00
claudiosmweb 794548e923 added tiptip for order totals 2014-07-18 20:27:10 -03:00
msdesign21 14f5524ffd Please 'copy and paste' report
Updated description when you 'Get System Report' to specify customers should 'copy and paste' information.
2014-07-18 14:55:14 -06:00
claudiosmweb e0aeacb734 added action to calculte the order total and edit discount and total 2014-07-18 17:24:34 -03:00
claudiosmweb f3ef446678 improved the order totals display 2014-07-17 18:17:42 -03:00
claudiosmweb d321395946 created new methods to save and load the order items in shop_order screen 2014-07-17 17:17:54 -03:00
claudiosmweb 2f4b98d330 fixed erros while add a new shipping order item 2014-07-17 15:48:37 -03:00
claudiosmweb 589aa9ddd4 fixed refund qty in order fee item 2014-07-17 15:48:03 -03:00
claudiosmweb 501cc29bd9 hide the order totals when active the refunds panel 2014-07-16 23:08:59 -03:00
claudiosmweb af235e08f6 moved refunds to order items 2014-07-16 17:12:33 -03:00
claudiosmweb d7133035e1 added order items add shipping cost button 2014-07-16 15:41:18 -03:00
claudiosmweb 04e8fbcb5e added new add products order items action 2014-07-16 15:11:48 -03:00
claudiosmweb 3ca145ac85 created backbone modal dialog 2014-07-15 19:56:07 -03:00
Remi Corson c629c86d0c add attributes do_action 2014-07-15 10:51:20 +02:00
claudiosmweb 29bb05f51c fixed coupon class 2014-07-14 18:04:45 -03:00
claudiosmweb 0a71c4498d moved the coupons to order items metabox 2014-07-14 17:04:23 -03:00
claudiosmweb f0bf3e9e7e moved the shipping save method to order items 2014-07-14 16:32:04 -03:00
claudiosmweb 7e17443be4 added new html-order-shipping.php to work in order items metabox 2014-07-14 16:22:01 -03:00
claudiosmweb ef2bff285a created new order totals display in order items 2014-07-14 15:23:56 -03:00
daniel von mitschke b991617ff7 adding default product visibility filter hook
Added a filter hook ‚woocommerce_product_visibility_default’ to set the
default visibility option on new products
2014-07-12 14:30:43 +02:00
claudiosmweb 8c77382d95 removed old order_type taxonomy stuffs and fixed some code standards 2014-07-11 15:38:23 -03:00
claudiosmweb cdadc18665 fixed an fatal error in admin dashboard 2014-07-11 15:03:34 -03:00
Mike Jolley 0ed0a41a04 Merge pull request #5833 from CFXd/move-tfoot-after-tbody-multiple-occurences
Move TFOOT to after TBODY element throughout templates and classes
2014-07-11 15:44:33 +01:00
Mike Jolley 755001f19b Use order types where required 2014-07-11 12:43:42 +01:00
Michael Silber 32bd50c379 Move TFOOT to after TBODY element throughout templates and classes 2014-07-10 21:50:51 -04:00
claudiosmweb 664c20a2ed fixed order status change when save 2014-07-10 17:41:53 -03:00
Mike Jolley eca4025f5e Delete and display refunds 2014-07-10 16:39:10 +01:00
Mike Jolley 6862829fce Show total available 2014-07-10 14:52:36 +01:00
Mike Jolley d88279fe53 Start on ajax handlers 2014-07-10 13:33:05 +01:00
claudiosmweb 31a8483b4f created method to get the total amount already refunded 2014-07-08 16:59:38 -03:00
claudiosmweb 7e36d05c75 created order_type taxonomy 2014-07-08 14:23:11 -03:00
Claudio Sanches 9701cfe2a7 Revert "order_type taxonomy and register_order_type() function" 2014-07-08 14:10:37 -03:00
claudiosmweb 73a273caf8 removed order_type hidden input in order actions meta box 2014-07-08 11:46:39 -03:00
Mike Jolley 2282d76efb More UI / Split up meta box scripts 2014-07-08 14:14:29 +01:00
Mike Jolley 5c0ea16a39 More refund UI -show qty boxes and totals 2014-07-08 10:51:10 +01:00
claudiosmweb 90110f300f added order_type when save the order data 2014-07-07 17:11:40 -03:00
Mike Jolley fdccaa21d3 Rough, non-functioning example of the UI for refund total and add items in the order items panel
#3164
2014-07-07 16:45:08 +01:00
Mike Jolley 5b6c574664 Use get_transaction_id 2014-07-07 11:44:35 +01:00
Mike Jolley 72396bf987 Add an order action to 'create credit note' 2014-07-04 15:20:29 +01:00
Paul Kilmurray 8c2f7a1388 Add woocommerce_product_visibility_options filter
Matches filter used in class-wc-admin-post-types.php
2014-07-04 14:42:14 +08:00
Mike Jolley abe0d0004a Merge pull request #5678 from coenjacobs/order-factory-refactor
Order factory refactor implementation (take two)
2014-07-03 15:14:43 +01:00
Mike Jolley ad2c483370 No need to clear all transients here - only clear parent's cache
Part of #5777
2014-07-03 12:59:57 +01:00
Coen Jacobs 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
Mike Jolley 101254a6a3 Have get_product_from_item only return variable product if it exists, and show on the order item row if the variation no longer exists.
Fixes #5536
2014-07-02 13:58:10 +01:00
doublesharp 605c1b25f0 Corrected duplicated settings_page() content
Replaced duplicated call to `array( $this, 'settings_page' )` with `null` to prevent the HTML from being printed to the admin settings twice.
2014-06-27 16:08:30 -07:00
Mike Jolley 2d23172cb1 Merge pull request #5752 from claudiosmweb/feature-wc-check-for-unique-sku-function
Introduces the wc_product_has_unique_sku() function
2014-06-27 21:22:52 +01:00
claudiosmweb 2b1a99eca6 introduces the wc_get_core_supported_themes() function 2014-06-27 16:42:23 -03:00
claudiosmweb 04f9361de7 added woocommerce support information in system status page 2014-06-27 16:37:59 -03:00
claudiosmweb d3dc018ffc fixed the wc_product_has_unique_sku() function name 2014-06-27 16:03:25 -03:00
claudiosmweb 0a4b6387e6 introduces the wp_product_has_unique_sku() function 2014-06-27 15:59:24 -03:00
claudiosmweb dfb1aeeb7b fixed some coding standards in includes/admin/meta-boxes/class-wc-meta-box-product-data.php 2014-06-27 10:08:39 -03:00
claudiosmweb a5f8d4dd5c guaranteed that variations have unique sku, closes #5712 2014-06-27 09:45:50 -03:00
Mike Jolley cc1d1e2237 Included method to define a link format for a transaction ID, set transaction ID manually, and tweaked display. 2014-06-27 13:12:10 +01:00
Mike Jolley 50a4c5bd23 Merge branch 'variation-stock-management'
Conflicts:
	includes/class-wc-product-variation.php
2014-06-27 11:15:42 +01:00
Mike Jolley 5dcd19f5fa Better handling of serialised settings Closes #4584 2014-06-25 16:30:47 +01:00
Mike Jolley 021431f012 Merge branch 'philmeadows-patch-1' 2014-06-25 13:57:36 +01:00
Mike Jolley 0f6f04e017 Added wc_stock_amount() core function and replaced intval
#4612
2014-06-25 11:25:28 +01:00
Manos Psychogyiopoulos 6ad8f0f718 fix conflicts 2014-06-25 10:36:11 +03:00
Mike Jolley f69e5fc4ee Only use a value for changes - allows automatic changes to stock status to take over 2014-06-24 13:02:48 +01:00
Mike Jolley d631f4acdc Hide status box for variables and handle save event 2014-06-24 13:02:09 +01:00
Mike Jolley fb1b6af309 Merge pull request #5662 from franticpsyx/order_item_count
order item count is wrong
2014-06-23 13:05:30 +01:00
Mike Jolley feb3088dfc Merge pull request #5644 from franticpsyx/overrides_scan_table_format
table format in Status report, template overrides
2014-06-23 12:24:47 +01:00