Commit Graph

8830 Commits

Author SHA1 Message Date
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
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 20f4509a93 created a simple jquery plugin for open backbone modals 2014-07-20 15:25:20 -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