Commit Graph

480 Commits

Author SHA1 Message Date
Mike Jolley 714cd8dc9a Merge branch 'pr/8901' 2015-08-21 15:32:11 +01:00
Mike Jolley 574c0b2936 Update wording 2015-08-21 15:25:03 +01:00
Mike Jolley 2d8b3f0c1f menu_order notices on IIS. 2015-08-21 14:08:32 +01:00
Tor Morten Jensen f6b7ab97b1 Adds tooltips to explain 'tax class' and 'tax status' in product admin. Addresses #8817 2015-08-20 14:33:25 +02:00
Mike Jolley 24c7f56b03 move attribute code above selector 2015-08-20 10:52:59 +01:00
Mike Jolley ac90660f7d Add expand/close links for attributes and match variation UI
Closes #8875
2015-08-19 14:00:26 +01:00
Mike Jolley 57bb0ebe25 Record manual order status change 2015-08-18 16:33:38 +01:00
George Stephanis ffd2b2de30 Pinking Shears. 2015-08-17 17:35:10 -04:00
Mike Jolley 7552704e75 double encode attributes 2015-08-13 12:16:08 +01:00
Claudio Sanches 38aa17b67b Fixed hardcoded string 2015-08-07 10:27:40 -03:00
Shiva Poudel 4cc26ab799 Backbone modal template to support wp.template 2015-08-06 10:22:53 +05:45
George Stephanis c938fa24da More missing esc_attr calls, :( 2015-08-05 15:17:52 -04:00
George Stephanis 95e6b84fbb Make sure we esc_attr translation results
Part 2 of … 2, I think.
2015-08-05 14:15:00 -04:00
Nicola Mustone bfb0aa95b3 fix possible fatal error on the order admin page 2015-08-05 14:10:23 +02: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 b0ee9a8cc6 Handle text vs select attribute names vs slugs 2015-07-29 10:58:28 +01:00
Claudio Sanches b0ce578541 Show errors for admin ajax variations 2015-07-27 14:16:52 -03:00
Mike Jolley 8d6858bb80 Sanitize not needed 2015-07-27 16:43:05 +01:00
Mike Jolley 2ea6a2efab Merge branch 'pr/8607' 2015-07-27 13:17:27 +01:00
Brent Shepherd c8405d3d29 Remove deprecated comments and commented out code
Because WC_Meta_Box_Product_Data::save_variations() doesn't need to be
deprecated.
2015-07-23 22:24:07 -07:00
Brent Shepherd 4100204344 Match the two save_variations()
Specifically, match WC_Meta_Box_Product_Data::save_variations() to the newer,
almost identical, WC_Ajax::save_variations(), added in SHA: ae18af8c (so that
we can eventually replace the newer WC_Ajax::save_variations().
2015-07-23 22:12:31 -07:00
Claudio Sanches 0eac4914df [2.3] Fix check for relative downloadable product path, closes #8612 2015-07-20 13:56:28 -03:00
Claudio Sanches 791c20ae51 Added param for exclude posts from wc-product-search, closes #8613 2015-07-20 13:41:14 -03: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
Josh Koberstein 38856b29c4 Correcting indentation 2015-07-16 16:02:33 -07:00
Josh Koberstein 922715791c Passing array of term ids to wp_set_object_terms instead of term names. 2015-07-16 15:31:14 -07:00
Claudio Sanches 0806a66fc5 Fixed Grouping select, stop select if do not have parent_post and allow clear the selection, closes #8586 2015-07-16 12:51:38 -03:00
Mike Jolley 0f7342a70d Fix grouped product label 2015-07-15 13:33:45 +01:00
Mike Jolley 015ace770d Split up bulk edit ajax methods 2015-07-14 11:39:48 +01:00
Claudio Sanches 9e4dc64f55 Merge branch 'master' of github.com:woothemes/woocommerce 2015-07-10 20:17:27 -03:00
Claudio Sanches b8a28bdab4 Admin variations - Cancel button reset the default form values
@mikejolley
2015-07-10 20:16:35 -03:00
Mike Jolley 86e0aa106e bulk_edit 2015-07-11 00:05:13 +01:00
Mike Jolley 3ec4003bbb Move add variation button and toolbars 2015-07-11 00:04:16 +01:00
Claudio Sanches 987a789367 Admin variations - Show link all variations bulk action 2015-07-10 00:49:52 -03:00
Claudio Sanches a64695b7f5 Admin variations - Added new triggers and removed data-product_id 2015-07-09 17:31:48 -03:00
Mike Jolley 34f149bcbf Replace dash with colon 2015-07-08 23:51:44 +01:00
Mike Jolley fedfa53754 expand/close 2015-07-08 23:46:19 +01:00
Mike Jolley a219243e60 Move link all variations to bulk actions 2015-07-08 23:34:21 +01:00
Mike Jolley 8161cbd095 Change remove buttons into links 2015-07-08 23:08:07 +01:00
Claudio Sanches 042a6644e2 Ajaxify grouped product option, closes #7751 2015-07-08 18:38:17 -03:00
Claudio Sanches 0a820f055f Admin variations - Add cancel changes button #6995 2015-07-08 16:10:45 -03:00
Claudio Sanches 064af9a54c Admin variations - Split the save button from the link/add buttons #6995 2015-07-08 15:53:00 -03:00
Claudio Sanches 843a55a6b5 Admin ajax variations 2015-07-07 20:53:36 -03:00
Claudio Sanches 4f3fb07dc9 Added new styles for variable pagenav 2015-07-07 19:06:51 -03:00
Claudio Sanches 8b681fddf7 Created bulk edit actions for variable sale schedule 2015-07-07 16:39:59 -03:00
Claudio Sanches de01133142 Save only updated/edited variations and fixed the variations sync and product cache/transients 2015-07-06 19:07:01 -03:00
Claudio Sanches af0b786104 Improved relative path check #8503 2015-07-06 15:02:15 -03:00
Claudio Sanches e888294caa [2.3] Fixed download URL for relative paths, closes #8503 2015-07-06 15:00:04 -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 ae18af8cc7 Added method to save variations via ajax 2015-07-06 01:50:20 -03:00
Claudio Sanches 2dc0ef3f86 Added method to set the pagenav fields when add and remove variations 2015-07-06 01:09:36 -03:00
Claudio Sanches c3b5ad2337 Refactored the link all variations, remove variation and add variation methods 2015-07-05 23:55:08 -03:00
Claudio Sanches ee437bb646 Improved the navigation and tested if variations have some edition 2015-07-05 22:31:56 -03:00
Claudio Sanches 3de8405cc9 Created variations ajax pagination 2015-07-05 22:00:38 -03:00
Claudio Sanches b16b026647 Load initial variations when click on variations tab 2015-07-05 20:19:45 -03:00
Claudio Sanches 3d59933d6b Created initial methods to load variations by ajax 2015-07-02 17:42:22 -03:00
Justin Shreve 8ae228f535 Do a less than or equals to check in meta-box-product-data in the case of $date_from being exactly the current time. 2015-06-17 12:18:57 +00:00
Justin Shreve e1130005a5 When figuring out if to store a sale price, make sure $date_from is set to "today" when blank. The date meta was previously set, but the check to set the actual sale price saw $date_from as empty. 2015-06-16 20:00:16 +00: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 622b11ae9f Add version check to prevent pre-2.4 logic kicking in when not needed
@claudiosmweb
2015-06-16 15:10:53 +01:00
Mike Jolley 75b01c5201 [2.3] woocommerce_downloadable_file_allowed_mime_types filter
#8362
2015-06-15 15:37:34 +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 922ca47cc1 [2.3] woocommerce_downloadable_file_exists filter 2015-06-09 15:27:28 +01:00
Mike Jolley eb4b9a7cd1 Merge pull request #8304 from krautnerds/quick-fix-variation-admin-stock-display
Quick fix stock display for product variations
2015-06-09 12:24:55 +01:00
Claudio Sanches 0b861d6587 Fixed filetype check for digital downloads, closes #8316
@mikejolley
2015-06-07 22:39:32 -03:00
Florian Ludwig 2b4e19d0b4 Quick fix stock display for product variations
This fixes bug #8302 in a very ugly way (in my opinion)
2015-06-05 19:22:32 +02:00
Mike Jolley a4c2a73050 Max array keys 2015-06-05 13:37:45 +01:00
Mike Jolley 1505424469 Define allowed_file_types
#13
2015-06-01 13:37:43 +01:00
Mike Jolley 527311d553 Validate file types when saving products. Closes #13
Handles 3 possible types of file;
  1. Relative path on server
  2. Absolute URL
  3. Shortcodes

URLs without extensions are not validated.
2015-06-01 13:37:39 +01:00
Mike Jolley 5b435024ea Use htmlspecialchars to ensure characters get encoded for select2
We cannot update to select2 4.0 until a major release. Closes #4
2015-06-01 13:37:26 +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
Mike Jolley e51eae80c6 Merge pull request #8167 from roykho/dynamic-variation-description
Dynamic variation description
2015-05-28 15:53:03 +01:00
Mike Jolley c01bc43369 Adjust #8165 to deal with 0 2015-05-19 12:53:03 -04:00
Mike Jolley a08b2e5968 Loop over all posted attributes by referencing max posted key
Closes #8165
2015-05-19 12:46:32 -04:00
Mike Jolley bb77120619 Auto load customer details + tweak icons
Closes #8112
2015-05-15 12:52:25 +01:00
roykho b812b2fd94 add dynamic variation description feature 2015-05-14 10:56:26 -07:00
Mike Jolley 48d071731a Set date after status
Closes #8078
2015-05-05 14:19:22 +01:00
Claudio Sanches e3782efbf5 Merge pull request #8001 from bordoni/feature/add_context_to_woocommerce_admin_order_item_headers_action
Admin Order Header lacks Variable for context
2015-05-05 08:56:39 -03:00
Claudio Sanches 89cd5ac32d Added esc_html() for #8075 2015-05-05 08:53:43 -03:00
Claudio Sanches 2c52e0e973 Fixed conflicts for #8075 2015-05-05 08:52:28 -03:00
Peter d94b2c95fc Update class-wc-meta-box-order-data.php 2015-04-29 16:47:17 -04:00
Peter c8707a68c1 Update class-wc-meta-box-order-data.php
Set "Order" string to be retrieved from post type object singular name rather than being hard coded. Similar to side bar meta box titles.
2015-04-29 16:01:34 -04:00
Mike Jolley d3415f2414 [2.3] Remove submitdiv and fix post status
Closes #8039
2015-04-27 11:13:49 +01:00
Gustavo Bordoni 22393df867 The woocommerce_admin_order_item_headers action lacks a variable for context 2015-04-21 23:13:55 -03:00
Claudio Sanches 08c8fad1fc Fixed standards for #7842 2015-04-13 12:31:18 -03:00
Mike Jolley b82339a4cb Merge pull request #7925 from dominic-p/order-meta-undefined-key
Prevent notices if variation_id isn't set
2015-04-13 10:53:49 +01:00
Mike Jolley e6de50f556 Merge pull request #7842 from nathanielks/hotfix/coupon-meta-box-products-error
Check if product is object before adding to array.
2015-04-13 10:48:09 +01: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 765b1e2e7d wrong var 2015-04-01 15:35:53 +02:00
Nicola Mustone 85fd634861 fix scrutinizer issues 2015-04-01 15:33:56 +02:00
Nathaniel Schweinberg 7de9f02574 fixed variable typo 2015-03-28 09:28:31 -05:00
Nathaniel Schweinberg 9c9b494d0f Check if product is object before adding to array. Prevents non-object fatal errors 2015-03-28 09:09:43 -05:00
Mike Jolley a49ac39519 Tweak note wording for clarity
Closes #7239
2015-03-24 11:27:33 +00:00
Claudio Sanches 931679bc82 Fixed the _wc_file_urls sanitization 2015-03-23 11:43:34 -03:00
Nicola Mustone c593e4ca50 added customer order refunded email 2015-03-20 16:31:31 +01:00
Claudio Sanches f058d43556 Allowed paths for file url, closes #7746 2015-03-17 14:20:51 -03:00
Gerhard 0e8ef24003 Allow saving of empty download expiry date, closes #773 2015-03-16 14:53:59 +02:00
Remi Corson fd80f61609 fix variable product docs URL 2015-03-13 17:51:50 +01:00
Mike Jolley 01ee531136 Same as #7662 for backend 2015-03-09 13:48:47 +00:00
Brent Shepherd 32cd95cc80 Order "Order Notes" on Edit Order screen by ID
So that insertion order is preserved in case multiple comments were inserted within
the same second of each other.
2015-03-05 15:49:45 -08:00
Claudio Sanches 37882756d3 Fixed HTML entities for up-sells and cross-sells fields, closes #7553 2015-02-25 10:27:53 -03:00
pjv 1cdc3174ca fix BadMethodCallException
receiving lines like this in the php error log:

Fatal error: Uncaught exception 'BadMethodCallException' with message 'Call to a member function get_formatted_name() on a non-object (boolean)' in /var/www/example.com/htdocs/wp-content/plugins/woocommerce/includes/admin/meta-boxes/class-wc-meta-box-product-data.php:484\nStack trace:\n#0 /var/www/example.com/htdocs/wp-admin/includes/template.php(1044): WC_Meta_Box_Product_Data::output()\n#1 /var/www/example.com/htdocs/wp-admin/edit-form-advanced.php(600): do_meta_boxes()\n#2 /var/www/example.com/htdocs/wp-admin/post.php(209): include()\n#3 {main}

The error resulted in a WSOD when trying to edit some products.
2015-02-22 09:01:37 -07:00
Mike Jolley 2a90208f93 Cross/up-sells should not search variations.
Closes #7502
2015-02-20 12:12:03 +00:00
Mike Jolley 82ac0fc11e Detect shortcodes when saving URLs.
Fixes #7474
2015-02-19 11:05:04 +00:00
Claudio Sanches 517a447743 Fixed some issues for scrutinizer 2015-02-18 16:09:02 -02:00
Mike Jolley 7899dd95d6 Run File URLs through esc_url_raw instead of wc_clean to preserve spaces.
Closes #7442
2015-02-16 14:23:13 +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
James Collins 0bbb4464ab Fix 2 undefined index notices when editing/saving a product
Fixes:

Notice: Undefined index: upsell_ids in /wp-content/plugins/woocommerce/includes/admin/meta-boxes/class-wc-meta-box-product-data.php on line 1202
Call Stack
#	Time	Memory	Function	Location
1	0.0110	486692	{main}( )	../post.php:0
2	4.7790	60047856	edit_post( ??? )	../post.php:229
3	4.7917	60075016	wp_update_post( ???, ??? )	../post.php:321
4	4.7930	60089156	wp_insert_post( ???, ??? )	../post.php:3572
5	4.9212	60223012	do_action( ???, ???, ???, ??? )	../post.php:3499
6	4.9213	60224380	call_user_func_array ( ???, ??? )	../plugin.php:496
7	4.9213	60224412	WC_Admin_Meta_Boxes->save_meta_boxes( ???, ??? )	../plugin.php:0
8	7.2460	60224516	do_action( ???, ???, ??? )	../class-wc-admin-meta-boxes.php:207
9	7.2539	60199340	call_user_func_array ( ???, ??? )	../plugin.php:496
10	7.2890	60735660	WC_Meta_Box_Product_Data::save( ???, ??? )	../plugin.php:0

( ! ) Notice: Undefined index: crosssell_ids in /wp-content/plugins/woocommerce/includes/admin/meta-boxes/class-wc-meta-box-product-data.php on line 1203
Call Stack
#	Time	Memory	Function	Location
1	0.0110	486692	{main}( )	../post.php:0
2	4.7790	60047856	edit_post( ??? )	../post.php:229
3	4.7917	60075016	wp_update_post( ???, ??? )	../post.php:321
4	4.7930	60089156	wp_insert_post( ???, ??? )	../post.php:3572
5	4.9212	60223012	do_action( ???, ???, ???, ??? )	../post.php:3499
6	4.9213	60224380	call_user_func_array ( ???, ??? )	../plugin.php:496
7	4.9213	60224412	WC_Admin_Meta_Boxes->save_meta_boxes( ???, ??? )	../plugin.php:0
8	7.2460	60224516	do_action( ???, ???, ??? )	../class-wc-admin-meta-boxes.php:207
9	7.2539	60199340	call_user_func_array ( ???, ??? )	../plugin.php:496
10	7.2890	60735660	WC_Meta_Box_Product_Data::save( ???, ??? )	../plugin.php:0
2015-02-09 11:51:33 +08:00
Mike Jolley 7694f8039c Dead vars when saving variations 2015-02-03 14:08:43 +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 52c84f407c Fix download save after adding with ajax 2015-02-03 10:57:43 +00:00
Jack Gregory 836a87d6e7 Add hook to admin product advanced data 2015-02-01 15:17:07 +00:00
Tamara Zuk c1100fbce5 Reviews meta box: avoid undefined index notice
Avoids a notice when updating some Product Reviews Pro review types
2015-01-31 14:05:51 -05:00
Mike Jolley 9f8a7d1199 Remove datepicker icon's and use focus event 2015-01-30 12:54:33 +00:00
Mike Jolley 064f2ebe17 Fix multiple product section in coupon section. Fixes #7170 2015-01-21 14:24:39 +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 0b393b7e82 Add comment #7163 2015-01-20 09:43:56 +00:00
Brent Shepherd f9f3054c22 Restore $theorder
SHA: 74ba11c189 removed instantiation of `$theorder` global in `WC_Meta_Box_Order_Actions::output()`
as it was mistaken for unused code. However, some callbacks attached to hooks in that function may
actually rely on that global to determine if actions should be displayed for certain orders.
2015-01-19 17:12:26 -08:00
Mike Jolley 0d64e3854d Add tooltips for manual and auto refunds Closes #7117 2015-01-19 14:50:06 +00:00
Claudio Sanches 505501912f Fixed "PHP Notice: Undefined variable: metabox_class" error for non-taxonomy attributes 2015-01-19 11:38:47 -02:00
Nicola Mustone 47b0c4cb97 clearer coupon option description 2015-01-19 09:18:44 +01:00
Claudio Sanches a82aa2bd13 Fixed refund amount when product dont have taxes 2015-01-15 16:57:33 -02:00
Claudio Sanches b3d6f6358e Fixed the selected attributes in product variations panel, closes #7115 2015-01-15 16:01:55 -02:00
Mike Jolley a52f94fb42 $order_taxes check 2015-01-15 15:19:19 +00:00
Mike Jolley e1c54687ac Minor issues with variables 2015-01-14 12:17: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 3ddcc68a19 includes/admin/meta-boxes/class-wc-meta-box-webhook-data.php
Removed old webhook file
2015-01-13 16:32:54 -02:00
Mike Jolley 550e569a29 Tweak placement and styling of view link. #7065 2015-01-13 12:27:07 +00:00