Commit Graph

201 Commits

Author SHA1 Message Date
Mike Jolley 75c264837f Justins feedback/code tidy 2016-02-10 13:21:16 +00:00
Mike Jolley 352184cc06 Merge branch 'master' into shipping-zones
# Conflicts:
#	assets/css/admin.css
#	i18n/languages/woocommerce.pot
#	includes/abstracts/abstract-wc-payment-gateway.php
#	includes/abstracts/abstract-wc-shipping-method.php
#	includes/admin/settings/class-wc-settings-shipping.php
#	includes/wc-core-functions.php
#	uninstall.php
2016-02-05 14:58:48 +00:00
Mike Jolley 57c643c93e [2.5] Round tax/tax refunded amounts on display.
Closes #10162
2016-01-25 15:18:49 +00:00
Mike Jolley 007abbc98e Shipping meta data
Closes #9094
2016-01-08 11:42:32 +00:00
Claudio Sanches 997d1caa50 Fixed several new variations admin actions, closes #9886 2015-12-21 03:36:36 -02:00
Claudio Sanches c001d5b274 Make tooltips consistent, closes #9856 2015-12-16 03:38:53 -02:00
Mike Jolley d515ddaaed Merge pull request #9798 from JeroenSormani/admin-order-item-hooks
Add hooks after order line items in admin
2015-12-14 12:50:54 +00:00
JeroenSormani 0bc4089ea7 Add hooks after order line items in admin 2015-12-09 09:29:32 +01:00
roykho 887d37583c Seperate variation description field from shipping div container 2015-11-28 07:20:47 -08:00
Claudio Sanches 5893875b0c Removed period for file headers 2015-11-03 11:53:50 -02:00
Claudio Sanches efa19f799d Fixed some coding standards for docblocks 2015-11-03 10:28:01 -02:00
Claudio Sanches b85ae9056c Rename wc_add_help_tip() function to wc_help_tip() 2015-10-23 13:09:08 -02:00
Claudio Sanches 2e95a68357 Use new "question" mark icon font
Created wc_add_help_tip() function to generate the icons
Replaced all .help_tip elements and [?]

We'll keep the old image and styles in order to maintain backwards
compatibility

Closes #9381
2015-10-23 01:40:52 -02:00
Claudio Sanches 1ea5b8433f Escape normalized for the woocommerce_variation_option_name filter 2015-10-18 10:42:44 -06:00
Claudio Sanches 3a536ac8b7 Sanitize shipping method label/title, closes #9159 2015-10-01 17:17:45 +02:00
Claudio Sanches 7c05671188 Added new actions to make easy add custom fields for variations, closes #8827 2015-10-01 16:30:02 +02:00
Claudio Sanches ebedba7906 Merge pull request #9081 from helgatheviking/filter-admin-order-item-thumbnails
Add `woocommerce_admin_order_item_thumbnail` filter in admin
2015-09-15 19:58:23 -03:00
Claudio Sanches 7e63374aaf Merge pull request #8735 from shivapoudel/backbone-modal
Allow support for variable in backbone modal template in extensions
2015-09-15 19:44:50 -03:00
James Koster 82f8b61418 make it clearer that variation drag/drop only applies to the backend. closes #9104 2015-09-15 17:05:55 +01:00
Kathy Darling 9571b8827e Add `woocommerce_admin_order_item_thumbnail` filter in `html-order-item.php`. 2015-09-08 13:41:12 -04:00
Kevin Hagerty 3671bcf39d Improve order total formatting
The function get_formatted_order_total already provides formatted HTML with indication of a prior refund. No need to do that logic and formatting again.
2015-09-05 07:48:24 -04:00
Mike Jolley dd7c32c22c Added 'false' check in variation admin
@claudiosmweb Closes #8966
2015-09-01 16:35:13 +01:00
Mike Jolley 2d8b3f0c1f menu_order notices on IIS. 2015-08-21 14:08:32 +01:00
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