Commit Graph

528 Commits

Author SHA1 Message Date
Shiva Poudel 4cc26ab799 Backbone modal template to support wp.template 2015-08-06 10:22:53 +05:45
George Stephanis 95e6b84fbb Make sure we esc_attr translation results
Part 2 of … 2, I think.
2015-08-05 14:15:00 -04:00
Mike Jolley e7dfff8687 Update wording and add tooltip
#8690
2015-07-31 17:14:28 +01:00
Mike Jolley 82f50cedb0 Allow menu_order sorting like in 2.3
Also allow setting manually to allow sorting between pages.

Fixes #8690
2015-07-31 12:39:23 +01:00
Mike Jolley 64d38f6dd8 STOCK STATUS field for variations should never be hidden
Fixes #8687
2015-07-30 15:45:05 +01:00
Mike Jolley 7b2aec4791 Take item qty into consideration when refunding orders
Fixes #8675
2015-07-29 13:13:41 +01:00
Mike Jolley 8d6858bb80 Sanitize not needed 2015-07-27 16:43:05 +01:00
Manos Psychogyiopoulos 18a7c6b7fb back-compat with text-based attributes: defaults don't work in WC2.4 2015-07-18 12:34:41 +03:00
Mike Jolley 34f149bcbf Replace dash with colon 2015-07-08 23:51:44 +01:00
Mike Jolley 8161cbd095 Change remove buttons into links 2015-07-08 23:08:07 +01:00
Claudio Sanches 843a55a6b5 Admin ajax variations 2015-07-07 20:53:36 -03:00
Claudio Sanches 8b681fddf7 Created bulk edit actions for variable sale schedule 2015-07-07 16:39:59 -03:00
adnanoner 725e3ee4e0 Add $order to action 'woocommerce_order_item_' . $item['type'] . '_html'
This comes in handy when you want change the line_items loop.
In my case I wanted to have a single line for each order items (per quantity) so I could edit the order and change the product for individual items. Would be appreciated if this could be merged.
2015-07-06 18:09:06 +02:00
Claudio Sanches 3d59933d6b Created initial methods to load variations by ajax 2015-07-02 17:42:22 -03:00
Justin Shreve 5d8b17bd6f Update the help text to mention that we expect already encoded URLs. 2015-06-16 15:48:05 +00:00
Mike Jolley f8151f416c Merge branch 'text-attribute-handling' 2015-06-16 15:11:58 +01:00
Mike Jolley 753a22734f Prevent Manage stock being forced on
Closes #8336
2015-06-12 11:22:54 +01:00
Mike Jolley 12396f4296 Attempted bw compat by comparing sanitised text to real text 2015-06-11 15:42:18 +01:00
Mike Jolley 89f7e15052 Save full version of text based attributes when dealing with variations 2015-06-11 14:43:02 +01:00
Mike Jolley b9708c4df9 Show refunded total shipping and taxes
Closes #8222
2015-06-01 11:06:11 +01:00
Mike Jolley 0a3defd798 Move tax enabled check 2015-05-29 14:55:57 +01:00
roykho b9eefa58fa use esc_textarea function 2015-05-28 16:08:22 -07:00
roykho 54b0a0ca54 changed dynamic variation description to allow limited HTML and some sanitized tweaks 2015-05-28 14:31:45 -07:00
roykho b812b2fd94 add dynamic variation description feature 2015-05-14 10:56:26 -07:00
Gustavo Bordoni 22393df867 The woocommerce_admin_order_item_headers action lacks a variable for context 2015-04-21 23:13:55 -03:00
Dominic be8e61161b Prevent notices if variation_id isn't set
It's a minor thing, but I have ran into circumstances where the `$item`
array doesn't have the `variation_id` set (namely after importing data
using another plugin). This tweak checks for the `variation_id` without
throwing a notice if the array key isn't defined.
2015-04-09 16:15:28 -07:00
Mike Jolley 26e7a5c705 Merge pull request #7865 from SiR-DanieL/scrutinizer-issues
Fix scrutinizer issues
2015-04-08 11:53:44 +01:00
James Koster cd20ce6789 variation images. closes #7844 2015-04-08 10:19:23 +01:00
shivapoudel 227c83a084 Use of <button> instead of <a> for modal-close
This was the clone of themes.php modal close button
2015-04-04 13:57:20 +05:45
shivapoudel 29f584ba98 Fix - Unusual slightly dark box on the backdrop of modal right side 2015-04-04 13:51:10 +05:45
Nicola Mustone 85fd634861 fix scrutinizer issues 2015-04-01 15:33:56 +02:00
Mike Jolley 01ee531136 Same as #7662 for backend 2015-03-09 13:48:47 +00:00
Mike Jolley 8bdd4fc283 Run item meta label through wc_attribute_label() in admin order page.
Closes #7420
2015-02-16 13:49:44 +00:00
Mike Jolley 447ee6e7bb Docblocks 2015-02-03 14:02:38 +00:00
Mike Jolley c11d283ddc Still trying to get scruit to pick up these variables. Testing a few variations. 2015-02-03 13:49:04 +00:00
Mike Jolley 7c019c0c50 More docblocks; the check for WP_POST isn't needed as the second case (isset) runs regardless and is true for posts 2015-02-03 13:13:07 +00:00
Mike Jolley 2693e110c6 Correct @var syntax. 2015-01-20 11:35:59 +00:00
Mike Jolley c0bea39c95 Seeing if magic properties are recognised 2015-01-20 11:06:15 +00:00
Mike Jolley 562743e847 Another @var declaration 2015-01-20 10:52:08 +00:00
Mike Jolley 0e4026941b Move $current_tab to where used 2015-01-20 10:41:26 +00:00
Mike Jolley 0e9bb50aae Docblock experiments continued... 2015-01-20 10:29:54 +00:00
Mike Jolley bc45f7755f Testing to see if scruitinizer recognises docblock 2015-01-20 10:01:28 +00:00
Mike Jolley 0d64e3854d Add tooltips for manual and auto refunds Closes #7117 2015-01-19 14:50:06 +00:00
Claudio Sanches a82aa2bd13 Fixed refund amount when product dont have taxes 2015-01-15 16:57:33 -02:00
Mike Jolley a52f94fb42 $order_taxes check 2015-01-15 15:19:19 +00:00
Mike Jolley 206a650488 Tidy variation output 2015-01-14 12:17:09 +00:00
Mike Jolley 8d8e57cbf5 Use @var to define vars passed in 2015-01-14 11:46:03 +00:00
Mike Jolley 32f2a44091 define @global 2015-01-14 11:32:00 +00:00
Claudio Sanches 695b04be61 Fixed conflits 2015-01-12 16:02:46 -02:00
Claudio Sanches 017831f1c6 Fixed the backbone modal 2015-01-12 15:11:01 -02:00
Mike Jolley 9852d9c6ec Order data JS select2 + refactor 2015-01-12 15:43:13 +00:00
Mike Jolley 4b7f97c1de Attributes 2015-01-09 16:53:47 +00:00
Claudio Sanches 03193b867b Creted new webhooks edit interface 2015-01-08 16:34:30 -02:00
Mike Jolley 5c86e962e8 Hide restock checkbox until qty is input Closes #6937 2015-01-05 17:19:18 +00:00
Claudio Sanches e53a6f5e57 Fixed variation fields when use "Link all variations" button 2015-01-02 15:07:31 -02:00
shivapoudel 39bf306f1a Fix add tax backbone modal backdrop issue 2015-01-02 20:00:21 +05:45
shivapoudel eab3a23b14 Fix missing icon for add tax backbone modal 2015-01-02 19:56:59 +05:45
Claudio Sanches 794621e3ba Improved the close button in backbone modal #7016 2015-01-02 11:58:57 -02:00
Claudio Sanches 28d960d5bb Added variable_pricing class/wrap for variable price fields, closes #7008 2014-12-23 14:12:12 -02:00
Mike Jolley 22cc1fb0c7 Add attributes with ajax and don't load all attributes at once.
Significantly improves performance with many attributes in admin.
Closes #6852 cc @claudiosmweb
2014-12-22 14:16:15 +00:00
Claudio Sanches 690b04b29a Improved the webhook meta boxes 2014-12-17 16:20:37 -02:00
Claudio Sanches 67f90fbb87 Created webhook logs meta box 2014-12-17 15:50:19 -02:00
Mike Jolley 65dbab486c [2.2] Don't force tax_rate_id to an integer. Allow strings.
Used in Taxamo extension.
2014-12-11 11:06:01 +00:00
James Koster 316b43f770 coupons. closes #6836 2014-12-09 16:06:34 +00:00
Mike Jolley 95a504cf84 Fix admin term output
Resolves an issue decoding foreign chars caused by #6555
Fixes #6550
2014-12-09 09:54:42 +00:00
Mike Jolley eba8206540 Merge branch 'tax-coupon-handling' Closes #6830
Conflicts:
	assets/js/admin/meta-boxes-order.min.js
	includes/api/class-wc-api-coupons.php
	includes/class-wc-cart.php
	templates/checkout/review-order.php
2014-12-03 12:33:15 +00:00
Mike Jolley 6df4c143cc Adjust total for partially refunded order totals
Closes #6666
2014-11-27 10:04:18 +00:00
Mike Jolley 4bc63de72a Added 'stupidtable' script to allow order item sorting on the order screen (by name, cost, qty).
Closes #5998
2014-11-26 15:37:06 +00:00
Mike Jolley 4a8c541fbf Remove 'order' discounts from classes 2014-11-25 11:05:14 +00:00
Mike Jolley 8b4332a037 Refactors to shipping tax rate methods 2014-11-21 13:06:33 +00:00
claudiosmweb f34cead914 Removed old code in favor of wc_tax_enabled() and wc_prices_include_tax() 2014-11-18 14:45:29 -02:00
Nicola Mustone 22a32ae9c8 Fixes #6555 2014-11-18 14:20:47 +01:00
Mike Jolley 2e2ce3c286 [2.2] During refunds, correctly set shipping tax totals
Fixes #6691
2014-11-14 12:52:43 +00:00
Mike Jolley f8bc4a0abd Add item cost column Closes #6650
@jameskoster
2014-11-11 13:40:47 +00:00
Mike Jolley c62a13148b Instead of using saved title from order, use payment method_title for refund buttons
Closes #6334
2014-10-24 12:11:28 +01:00
James Koster e27d4afee1 data tabs tweaks. #6562 2014-10-17 14:50:23 +01:00
James Koster eb258950bd variations markup / css refactor. #6562 2014-10-17 12:17:30 +01:00
Mike Jolley 5c1b931438 [2.2] Fix refund date.
Fixes #6499
2014-10-09 16:43:26 +01:00
thenbrent 94355b73dc Display order & item totals with correct currency
If a store changes currency or is using an extension which allows for
purchasing in multiple currencies, the currency symbol displayed on the
Edit Order admin screen may be incorrect for previous orders because
it uses the `wc_price()` fallback, which is the site wide currency
rather than the currency for that specific order. This fixes that.
2014-10-07 09:59:52 +10:00
Mike Jolley 819436f0a3 Merge pull request #6388 from quadshot/action-buttons
Allow adding custom 'action buttons' in order item metabox
2014-10-02 14:06:11 +01:00
Mike Jolley 3e20b113d6 Add hook to refund html
Closes #6406
2014-10-02 13:40:34 +01:00
Loushou a37ea4976b new filter for adding custom 'action buttons' on the order_items metabox in the admin edit order screen
loushou
2014-09-24 17:41:13 -07:00
Mike Jolley a91c74d794 Merge pull request #6309 from quadshot/before-oi-meta
filter for adding info before order item itemmeta in order metabox
2014-09-22 10:36:48 +01:00
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