Commit Graph

2430 Commits

Author SHA1 Message Date
Max Rice 5be324a543 Add edit order REST API method
Part of #4160
2014-07-27 23:36:32 -04:00
Max Rice 315787e3d6 Refactor create order method
* handle errors through WC_API_Exception
* abstract order item creation

Part of #4160
2014-07-27 23:35:50 -04:00
Max Rice d919ed9d64 Tweak REST API order response
* se WC_Order::get_order_currency() for currency
* use new WC_Order::get_subtotal() for subtotal
* add order item ID and rate ID to tax lines

Part of #4160
2014-07-27 23:33:35 -04:00
Max Rice f656d57282 Add WC_Order::get_order_subtotal()
Convenience method to return the order subtotal

Part of #4160
2014-07-27 23:31:26 -04:00
Max Rice 3cc9952fea Include order item ID and rate ID in WC_Order::get_tax_totals()
Part of #4160
2014-07-27 23:31:02 -04:00
Max Rice f4feefc100 Fix WC_Order::get_user() 2014-07-27 23:30:21 -04:00
Max Rice e47ac33eb1 Add calculate_shipping() method to WC_Abstract_order
When the update_shipping() method is used, the order shipping amount is
not properly calculated unless the shipping costs are summed.

Part of #4160
2014-07-27 23:29:40 -04:00
Max Rice 1598d1b539 Add update methods to WC_Abstract_Order
These methods compliment the existing add_*() methods and provide a
consistent interface to add and update items for the order.

Part of #4160
2014-07-27 23:28:25 -04:00
Max Rice cca54879fa Fix misc docblocks 2014-07-27 23:23:59 -04:00
Max Rice b192bd46f8 Add wc_update_order_item() function 2014-07-27 23:21:16 -04:00
Max Rice c9342d6344 Add WC_API_Exception class
Part of #4160
2014-07-27 23:20:48 -04: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 710a570525 Coded in Restore stock option 2014-07-25 11:29:24 +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 e634efa958 fixed tax calc when exists tax columns 2014-07-24 18:09:13 -03:00
claudiosmweb 2d61126502 added add_shipping and add_fee ajax actions 2014-07-24 17:55:25 -03:00
claudiosmweb 93b464cb29 improved the add_order_tax ajax method 2014-07-24 17:37:02 -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
claudiosmweb 7328212c03 fixed the get refunds method 2014-07-24 12:09:03 -03:00
Mike Jolley a10204894d Clear transients after refunding 2014-07-24 16:03:52 +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 a3d0d5903e removed a test 2014-07-23 19:28:57 -03:00
claudiosmweb 26e50b7caf fixed post_type in reports 2014-07-23 14:17:01 -03:00
claudiosmweb 23628ad430 fixed undefined offset in wc_create_refund() 2014-07-23 13:56:43 -03:00
Mike Jolley 11835826de A start on negative line items
@claudiosmweb
2014-07-23 17:41:35 +01:00
Mike Jolley 3aa9475e39 Coupon code display 2014-07-23 11:47:02 +01:00
Mike Jolley 134f31abb9 Taxes were stored backwards
cc @claudiosmweb
2014-07-23 11:37: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 8edbd8fed5 fixed undefined variable $can_be_edited when add new line items via ajax 2014-07-22 17:33:49 -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 ab36ec12d5 Merge pull request #5822 from helgatheviking/fix/add-to-cart
add_to_cart() return $cart_item_key
2014-07-22 18:32:55 +01:00
Kathy Darling 7e0121a0d9 update docblock for add_to_cart() method 2014-07-22 12:25:12 -04: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 93155c9e11 Do not use before init.
#3164
2014-07-22 14:30:42 +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
Mike Jolley 2155b30065 Merge pull request #5872 from Ninos/master
Add filter: wc_get_template
2014-07-22 10:48:12 +01:00
Mike Jolley 0f7f3ee66a Merge pull request #5851 from BFTrick/abstract-settings-typos
Fixing Typos in Abstract Settings Class
2014-07-22 10:37:24 +01:00
Ninos Ego 7b24853afc Add filter: wc_get_template
Allow 3rd party plugin filter template file from their plugin
2014-07-22 03:05:25 +02:00
wilgert 0b032ab469 Update class-wc-coupon.php
add middle statement to ternary operator has ommitting this is only supported since PHP 5.3 and WooCommerce requires >5.2.4
2014-07-21 15:59:20 +02:00
wilgert 6ccd084e52 Update class-wc-coupon.php
If you loaded custom coupon data using the  `'woocommerce_get_shop_coupon_data'` filter. Only `$coupon->amount` was set. While the 'normal' coupons loaded from the database get both `$coupon->coupon_amount` and `$coupon->amount` set.

This change also adds `$coupon->coupon_amount` for in code generated coupons and allows functions using the `'woocommerce_get_shop_coupon_data'` filter to use either `amount` or `coupon_amount`.
2014-07-21 15:54:10 +02:00
claudiosmweb ef445aa1d7 removed a test ¬¬ 2014-07-21 00:00:18 -03:00
claudiosmweb 299c12bd57 fixed order get_total_refunded() method 2014-07-20 23:48:23 -03: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 50113fa531 fixed "Invalid argument supplied for foreach()" warning in line 127 2014-07-19 00:16:34 -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
Patrick Rauland e735fe45e0 fixing typos in abstract settings class 2014-07-15 16:41:28 -06: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
Patrick Rauland 568c0102ae adding get_a_job method 2014-07-14 09:18:07 -06:00