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
3e4506c376
Clean up total/subtotal display
2014-07-22 16:44:02 +01:00
7b5b1fc845
prevented that exist duplicate tax rate columns #3164
2014-07-22 12:42:17 -03:00
954a5ddc23
only show refund via button when gateway supports refunds #3164
2014-07-22 12:13:35 -03:00
559ff43c42
Shipping should be displayed before fees
2014-07-22 14:42:12 +01:00
414bc4e314
Dashes when there is no tax
2014-07-22 14:42:04 +01:00
b032c857ee
Fix delete of shipping and fee line items. Remove checkbox for refunds.
2014-07-22 14:38:07 +01:00
550db70d77
Line item icons
2014-07-22 14:27:47 +01:00
6e0a880699
Group line items by type
2014-07-22 14:18:11 +01:00
c65cd44aef
Fix input styling
2014-07-22 11:56:52 +01:00
0c5be5f054
Moved add tax button, and tidied up tax column display
2014-07-22 11:54:59 +01:00
d2340a5cef
fixed refund calcule
2014-07-20 23:26:40 -03:00
098919f469
removed some order totals old stuff
2014-07-20 22:59:42 -03:00
144d094ad2
created method for delete order tax
2014-07-20 22:57:23 -03:00
d875cfa1ac
created ajax method to add new taxes
2014-07-20 22:36:12 -03:00
3e287ff19c
fixed calculate total action
2014-07-20 21:12:39 -03:00
eed6ca4405
removed order totals meta box
2014-07-20 20:53:55 -03:00
2d7e1cc51a
added method to save all order taxes
2014-07-20 20:53:43 -03:00
5152457d9d
improved the saving the new tax data
2014-07-20 01:28:16 -03:00
2cfebdc6c5
save/update shipping taxes
2014-07-20 00:56:38 -03:00
3a28c56876
save and display shipping taxes in order items meta box
2014-07-20 00:32:52 -03:00
6176cb6b77
allow multiple taxes columns in order items
2014-07-20 00:21:33 -03:00
93cf3c88bd
initial implementation of order items taxes
2014-07-19 01:08:02 -03:00
794548e923
added tiptip for order totals
2014-07-18 20:27:10 -03:00
e0aeacb734
added action to calculte the order total and edit discount and total
2014-07-18 17:24:34 -03:00
f3ef446678
improved the order totals display
2014-07-17 18:17:42 -03:00
d321395946
created new methods to save and load the order items in shop_order screen
2014-07-17 17:17:54 -03:00
2f4b98d330
fixed erros while add a new shipping order item
2014-07-17 15:48:37 -03:00
589aa9ddd4
fixed refund qty in order fee item
2014-07-17 15:48:03 -03:00
501cc29bd9
hide the order totals when active the refunds panel
2014-07-16 23:08:59 -03:00
af235e08f6
moved refunds to order items
2014-07-16 17:12:33 -03:00
d7133035e1
added order items add shipping cost button
2014-07-16 15:41:18 -03:00
04e8fbcb5e
added new add products order items action
2014-07-16 15:11:48 -03:00
c629c86d0c
add attributes do_action
2014-07-15 10:51:20 +02:00
29bb05f51c
fixed coupon class
2014-07-14 18:04:45 -03:00
0a71c4498d
moved the coupons to order items metabox
2014-07-14 17:04:23 -03:00
f0bf3e9e7e
moved the shipping save method to order items
2014-07-14 16:32:04 -03:00
7e17443be4
added new html-order-shipping.php to work in order items metabox
2014-07-14 16:22:01 -03:00
ef2bff285a
created new order totals display in order items
2014-07-14 15:23:56 -03:00
8c77382d95
removed old order_type taxonomy stuffs and fixed some code standards
2014-07-11 15:38:23 -03:00
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
32bd50c379
Move TFOOT to after TBODY element throughout templates and classes
2014-07-10 21:50:51 -04:00
664c20a2ed
fixed order status change when save
2014-07-10 17:41:53 -03:00
eca4025f5e
Delete and display refunds
2014-07-10 16:39:10 +01:00
6862829fce
Show total available
2014-07-10 14:52:36 +01:00
d88279fe53
Start on ajax handlers
2014-07-10 13:33:05 +01:00
31a8483b4f
created method to get the total amount already refunded
2014-07-08 16:59:38 -03:00
7e36d05c75
created order_type taxonomy
2014-07-08 14:23:11 -03:00
9701cfe2a7
Revert "order_type taxonomy and register_order_type() function"
2014-07-08 14:10:37 -03:00
73a273caf8
removed order_type hidden input in order actions meta box
2014-07-08 11:46:39 -03:00
2282d76efb
More UI / Split up meta box scripts
2014-07-08 14:14:29 +01:00
5c0ea16a39
More refund UI -show qty boxes and totals
2014-07-08 10:51:10 +01:00
90110f300f
added order_type when save the order data
2014-07-07 17:11:40 -03:00
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
5b6c574664
Use get_transaction_id
2014-07-07 11:44:35 +01:00
72396bf987
Add an order action to 'create credit note'
2014-07-04 15:20:29 +01:00
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
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
d3dc018ffc
fixed the wc_product_has_unique_sku() function name
2014-06-27 16:03:25 -03:00
0a4b6387e6
introduces the wp_product_has_unique_sku() function
2014-06-27 15:59:24 -03:00
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
a5f8d4dd5c
guaranteed that variations have unique sku, closes #5712
2014-06-27 09:45:50 -03:00
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
50a4c5bd23
Merge branch 'variation-stock-management'
...
Conflicts:
includes/class-wc-product-variation.php
2014-06-27 11:15:42 +01:00
021431f012
Merge branch 'philmeadows-patch-1'
2014-06-25 13:57:36 +01:00
0f6f04e017
Added wc_stock_amount() core function and replaced intval
...
#4612
2014-06-25 11:25:28 +01:00
6ad8f0f718
fix conflicts
2014-06-25 10:36:11 +03:00
f69e5fc4ee
Only use a value for changes - allows automatic changes to stock status to take over
2014-06-24 13:02:48 +01:00
d631f4acdc
Hide status box for variables and handle save event
2014-06-24 13:02:09 +01:00
19adbb9bba
Product admin/saving
2014-06-19 16:47:04 +01:00
c66f2b8232
Split out several transient clearing functions to be called only when needed.
2014-06-19 12:25:10 +01:00
af77d8f12c
Only remove featured transient when featured changes
2014-06-19 12:25:10 +01:00
89ea6c46ab
Replace new WC_Order calls with get_order
2014-06-13 15:24:51 +02:00
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
9beaf30a73
Merge pull request #5657 from claudiosmweb/feature-transaction-id-display
...
Display Transaction ID in order data
2014-06-12 11:59:17 +01:00
ff186a23cc
Merge pull request #5659 from claudiosmweb/fix-hard-code-strings
...
Fix some hard code strings
2014-06-12 11:59:06 +01:00
61c94f9e25
fixed some hard code strings
2014-06-11 17:12:23 -03:00
c3ed04197b
fixed hard coded Edit string
2014-06-11 17:05:09 -03:00
9540fd9444
fixed some coding standards in includes/admin/meta-boxes/class-wc-meta-box-order-data.php
2014-06-11 16:50:15 -03:00
977751dd20
display the transaction id in the order data meta box
2014-06-11 16:37:00 -03:00
5e39d81acc
fixed hard coded Edit string
2014-06-11 16:07:12 -03:00
f1926834da
fixed some coding standards in includes/admin/meta-boxes/views/html-order-fee.php
2014-06-11 16:06:31 -03:00
911b1699ee
improved the tax name in order item fee
2014-06-11 16:03:07 -03:00
eaf5a9e866
added some brackets
2014-06-11 15:47:33 -03:00
b5ee32efd0
improved the test for get the term name
2014-06-11 15:46:41 -03:00
29305bd9ec
fixed some coding standards in includes/admin/meta-boxes/views/html-order-item.php
2014-06-11 15:31:54 -03:00
7ee7d75ed4
improved the order items names when is attributes, closes #5551
2014-06-11 15:18:33 -03:00
3ad8935b20
Removed ununsed global variables in local scopes
2014-06-08 22:33:11 +02:00
23950bcf0d
unslash order item meta key before updating in DB
...
To prevent nested slashes in DB when item meta key contains quotes.
This is in line with WordPress' behaviour - see update_meta() in wp-includes/meta.php
2014-06-04 15:09:01 +01:00
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
Mike Jolley
claudiosmweb
Remi Corson
Michael Silber
Coen Jacobs
Manos Psychogyiopoulos
enru