Commit Graph

395 Commits

Author SHA1 Message Date
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
shivapoudel ae3bc4051f Absolute path, Indentation & docblocks fix for includes/admin/meta-boxes/*.php :) 2014-09-21 01:50:06 +05:45
Loushou 0f8c8886e0 adding the after
loushou
2014-09-19 08:34:34 -07:00
Loushou 09159f83c7 removing extra param and correcting whitespace 2014-09-19 08:05:25 -07:00
Mike Jolley 4803937222 Fix adding items to orders
* Fix - When manually adding items to an order, show tax columns.
* Fix - When manually adding items to an order, include variation data.

Closes #6313
2014-09-19 12:52:26 +01:00
Loushou f17bb56891 filter to allow custom 'add line' buttons
loushou
2014-09-18 09:05:42 -07:00
Loushou f0c4b80113 filter for adding info before order item itemmeta in order metabox
loushou
2014-09-18 08:55:13 -07:00
Mike Jolley 28e13bdab3 Add notice when order is no longer editable.
Closes #6298
2014-09-18 11:32:25 +01:00
Mike Jolley 265ffee23a Remove $can_be_edited in favour of ->is_editable()
For #6154
2014-09-03 10:09:04 +01: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
claudiosmweb cd154a30ef improved the line items backward compatibility, closes #6109 2014-09-01 12:35:04 -03:00
Mike Jolley e6defc0ddd Merge pull request #6127 from tamarazuk/master
Order totals: 4 new action hooks
2014-08-29 09:46:57 +01:00
thenbrent 175923056a Only display "Refund" when unrefunded amount > 0
If an order has been fully refunded, the "Refund" button was still
displayed despite there being no amount to refund.
2014-08-28 22:04:51 -07:00
Tamara Zuk eb9460aa2d Order totals: 4 new action hooks 2014-08-28 21:56:30 -04:00
claudiosmweb 6081f3b61f fixed some missing and wrong textdomains 2014-08-15 16:08:43 -03:00
Mike Jolley 575ba5974e Variation level backorder 'parent' option makes no sense now parent backorder select is hidden
#6035
2014-08-15 15:29:14 +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 5bc293a69c Initial display of add order item buttons Fixes #5991
Also Closes #5994
2014-08-12 12:54:44 +01:00
Gustavo Bordoni 34a47c3682 Removing a `var_dump`, My bad 2014-08-04 08:14:00 -03: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 a0bd72b9f3 Hide variation stock when manage stock is unchecked
closes #5935

@mikejolley
2014-07-30 15:32:06 -03: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
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
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 a7eaefc374 Change button label for calc taxes 2014-07-25 10:48:47 +01: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 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
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 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 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
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 af235e08f6 moved refunds to order items 2014-07-16 17:12:33 -03: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 7e17443be4 added new html-order-shipping.php to work in order items metabox 2014-07-14 16:22:01 -03:00
Michael Silber 32bd50c379 Move TFOOT to after TBODY element throughout templates and classes 2014-07-10 21:50:51 -04:00
Mike Jolley 5c0ea16a39 More refund UI -show qty boxes and totals 2014-07-08 10:51:10 +01: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 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
Mike Jolley 50a4c5bd23 Merge branch 'variation-stock-management'
Conflicts:
	includes/class-wc-product-variation.php
2014-06-27 11:15:42 +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 19adbb9bba Product admin/saving 2014-06-19 16:47:04 +01:00
Mike Jolley 2f3c60d4cf Merge pull request #5655 from claudiosmweb/fix-order-item-fees-tax-names
Fix tax name in order item fees
2014-06-12 11:59:33 +01:00
claudiosmweb c3ed04197b fixed hard coded Edit string 2014-06-11 17:05:09 -03:00
claudiosmweb 5e39d81acc fixed hard coded Edit string 2014-06-11 16:07:12 -03:00
claudiosmweb f1926834da fixed some coding standards in includes/admin/meta-boxes/views/html-order-fee.php 2014-06-11 16:06:31 -03:00
claudiosmweb 911b1699ee improved the tax name in order item fee 2014-06-11 16:03:07 -03:00
claudiosmweb eaf5a9e866 added some brackets 2014-06-11 15:47:33 -03:00
claudiosmweb b5ee32efd0 improved the test for get the term name 2014-06-11 15:46:41 -03:00
claudiosmweb 29305bd9ec fixed some coding standards in includes/admin/meta-boxes/views/html-order-item.php 2014-06-11 15:31:54 -03:00
claudiosmweb 7ee7d75ed4 improved the order items names when is attributes, closes #5551 2014-06-11 15:18:33 -03:00
Mike Jolley ded4b7404d Admin changes for #5046
- Removed post type classes. Since they were always loaded, there was
no benefit having them split up. Combined meaning less hooked in
methods.
- Stopped loading some function files and sessions in the admin area.
They are not needed there.
- Made a few admin page classes static as they are stateless
2014-06-04 11:16:19 +01:00