Commit Graph

8749 Commits

Author SHA1 Message Date
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 dcf4a4e5a8 Prevent chosen being cut off 2014-07-23 11:51:09 +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
Mike Jolley 036c02725b Variable height modal 2014-07-23 10:49:39 +01:00
Mike Jolley ce767f1ec2 rates should not be joined; it is an array. Fixes tax rate exists check. 2014-07-23 09:51:57 +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 fdf48d92e8 fixed some js coding standards 2014-07-22 16:52:36 -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
Claudio Sanches d823428745 Merge pull request #5876 from claudiosmweb/fix-refund-button
fixed refunds button with the corrent total when using commas instead of decimals
2014-07-22 11:41:24 -03:00
claudiosmweb aae1dbbe2e fixed refunds button with the corrent total when using commas instead of decimals 2014-07-22 11:40:26 -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 bf2c30c320 Reduce delete padding 2014-07-22 11:57:46 +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 3b71920d1c Merge pull request #5867 from claudiosmweb/new-order-items
New order items and refunds interface
2014-07-22 10:43:35 +01:00
Mike Jolley 233a7e86d0 Merge pull request #5858 from woothemes/filter-whole-coupon-message
Put the whole coupon message in the filter.
2014-07-22 10:40:02 +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 8d257efa92 fixed the modals with ajax 2014-07-20 23:58:34 -03:00
claudiosmweb 299c12bd57 fixed order get_total_refunded() method 2014-07-20 23:48:23 -03:00