Commit Graph

3852 Commits

Author SHA1 Message Date
Mike Jolley d09353c689 Merge pull request #7021 from bryceadams/patch-7019
Add filter 'woocommerce_grouped_children_args'
2014-12-30 14:47:39 +00:00
Mike Jolley caac9768a7 Added more fallbacks for API geoIP 2014-12-30 11:11:17 +00:00
Bryce d8c49cb988 Fix brackets 2014-12-29 21:48:26 +07:00
Bryce ca5416217c Add check for my account page too 2014-12-29 21:46:03 +07:00
Bryce ebf3ab5cc6 New `is_view_order_page` conditional function
Returns true when on the `my-account/view-order/` page
2014-12-29 15:31:18 +07:00
Bryce 7670a08ff4 Add filter 'woocommerce_grouped_children_args'
Allows people to filter the grouped product children, like changing the
order that the children products are displayed in, etc.
2014-12-29 13:13:26 +07:00
James Koster 773c87d254 Merge pull request #7006 from corsonr/welcome_screen_fix
Fix cart icon alignment on welcome page
2014-12-27 12:42:01 +00:00
Brandon Hubbard 018e56e957 Fixed Comment 2014-12-26 11:43:12 -08:00
Brandon Hubbard 79ba6bc31e Added support for several Jetpack Features
* Added support for publicize and markdown editor for products
* Added support for product results in Omniseaarch
https://www.evernote.com/shard/s1/sh/f47adc63-2aa5-4f5e-9f0d-71a34dd145f
6/03b99171ff6e6fddabcea387f2db02f6
2014-12-26 09:44:38 -08:00
Mike Jolley 896ccb1b88 Force taxes to display/calculate for customer location 2014-12-23 22:07:27 +00:00
Mike Jolley 4e8e90a8de Support dev environment 2014-12-23 22:03:10 +00:00
Mike Jolley f820905327 Handle geolocation option 2014-12-23 18:50:05 +00:00
Mike Jolley bba6ca2007 Maxmind Geolocation library 2014-12-23 18:49:55 +00:00
Mike Jolley ef3ad7d99f Setup cron jobs 2014-12-23 18:49:43 +00:00
Mike Jolley f561aa4224 Geolocation class 2014-12-23 18:49:37 +00:00
Mike Jolley 6800ee0ec3 Base vs default 2014-12-23 17:34:05 +00:00
Mike Jolley 34413a1dd7 Core methods for getting locations 2014-12-23 17:33:51 +00:00
Mike Jolley d908093eac Made function names make more sense (customer location vs base locations) 2014-12-23 17:33:33 +00:00
Mike Jolley 5b31745061 Add geolocation option for default address 2014-12-23 17:33:10 +00:00
Claudio Sanches 5ce07351a1 Merge branch 'master' of github.com:woothemes/woocommerce 2014-12-23 14:12:22 -02:00
Claudio Sanches 28d960d5bb Added variable_pricing class/wrap for variable price fields, closes #7008 2014-12-23 14:12:12 -02:00
Remi Corson 3f882480e8 fix cart icon alignment 2014-12-23 16:04:46 +01:00
Nicola Mustone d6bf1e81f9 added variation ID in order stock notes 2014-12-23 12:01:11 +01:00
boohoogal d3cdc5d795 Fixed parse error #6998 2014-12-22 23:40:27 +00: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
Mike Jolley 8df8c9b482 Make 'public', and rewrite, optional for attributes
#6852
2014-12-22 14:16:15 +00:00
Claudio Sanches e7f0233c8e Merge pull request #6992 from bryceadams/patch-6991
Check we're on the correct post type before editing columns
2014-12-22 00:01:39 -02:00
Mike Jolley e6fd9f2288 Merge pull request #6990 from boohoogal/page_breadcrumbs_fix
Fix for breadcrumbs for pages #6989
2014-12-22 00:55:52 +00:00
Bryce 75c40366bc destroy the global! 2014-12-21 22:43:38 +07:00
Claudio Sanches 389a829474 Fixed meta_query for shortcodes, closes #6960 2014-12-21 13:31:27 -02:00
Bryce 41de9936fe Check we're on the correct post type before editing columns
Closes #6991
2014-12-21 12:48:30 +07:00
boohoogal efee85557c Fix for breadcrumbs for pages #6989 2014-12-21 05:21:19 +00:00
Mike Jolley a79bedc945 Merge pull request #6947 from juangadiel/master
Update class-wc-checkout.php fixes issue #6940
2014-12-21 00:36:04 +00:00
Juan Gadiel Rosado Colon de1466779b Fixes issue #6940
Check if the cart needs shipping before updating the user shipping address. This fixes the issue (#6940) of the shipping address being updated with the user billing address when purchasing a virtual product.
2014-12-20 20:29:09 -04:00
Mike Jolley bb6b7c5489 Merge pull request #6967 from BFTrick/issue-6965
Adding Email Styles Back to Email Preview. Fixes #6965
2014-12-21 00:20:46 +00:00
Spencer Hill d8c8d37fd6 Using post_status of 'any' causes a conflict with the WP Invoice Plugin by Usability Dynamics resulting in the Select Box for Variable Subscriptions - when the WooCommerce Variable Subscriptons Plugin is installed and activated - not functioning and returning an error to the user on the front end. Since it's filtering out the Trash status, and others, anyway when being displayed on the front end we found that setting the post_status to publish resolved the issue and doesn't appear to have adverse affects elsewhere. 2014-12-19 13:21:15 -08:00
Rtransat d53210dfbf Fix label "for" attribute for products_categories 2014-12-19 17:15:24 +01:00
Claudio Sanches 7e780a64b1 Introduces the woocommerce_restock_refunded_item and woocommerce_order_refunded actions, closes #6922 2014-12-19 10:29:47 -02:00
tc33 fb51984a6b Fixes #6979 by fetching attribute slugs instead of names. 2014-12-18 20:09:07 +00:00
Claudio Sanches d821dbf88e [API] Fixed the individual_use, enable_free_shipping and exclude_sale_items params for coupons endpoint 2014-12-18 15:01:54 -02:00
Claudio Sanches c32b40ac10 Changed the position of the webhook menu 2014-12-17 16:33:51 -02:00
Claudio Sanches 690b04b29a Improved the webhook meta boxes 2014-12-17 16:20:37 -02:00
Claudio Sanches d84e1bae10 Merge pull request #6970 from woothemes/webhooks-ui
Webhooks ui, closes #6912
2014-12-17 16:08:43 -02:00
Claudio Sanches 67f90fbb87 Created webhook logs meta box 2014-12-17 15:50:19 -02:00
Claudio Sanches 9b9243fb92 Validated webhook delivery_url and topic 2014-12-17 10:45:20 -02:00
Claudio Sanches 6ccf391168 Improved the webhook data class and send a webhook ping when create a new 2014-12-17 10:42:39 -02:00
Claudio Sanches 5b318b1d2a Added the wc_is_webhook_valid_topic() and wc_is_valid_url() conditional functions 2014-12-17 10:16:14 -02:00
Claudio Sanches d1bed7bef9 Changed the shop_webhook postupdated messages 2014-12-17 09:45:59 -02:00
Claudio Sanches 429c91708b Improved the WC_Meta_Box_Webhook_Data:save() method 2014-12-17 09:29:43 -02:00
Claudio Sanches b8e842d2ee Fixed WC_Webhook::enqueue() [2] 2014-12-17 01:48:29 -02:00
Claudio Sanches e0ad955afe Fixed WC_Webhook::enqueue() 2014-12-17 01:44:35 -02:00
Claudio Sanches 509147b105 Created webhook actions meta box 2014-12-16 20:18:06 -02:00
Claudio Sanches 4c47def638 Stop hook webhooks when is not configured the hooks and delivery URL 2014-12-16 20:16:38 -02:00
Claudio Sanches 9f83541d9f Added webhook meta box js 2014-12-16 19:07:48 -02:00
Claudio Sanches 1fae690e68 Added methods to save and display the webhook data meta box 2014-12-16 19:07:28 -02:00
Claudio Sanches 802ebdee38 Added URL data_type for woocommerce_wp_text_input() 2014-12-16 19:06:47 -02:00
Claudio Sanches 10b2b6bccc Removed support for title in webhooks 2014-12-16 19:05:53 -02:00
Claudio Sanches 4d3673c4c2 Created webhook data meta box class 2014-12-16 19:05:03 -02:00
Claudio Sanches b247997bd2 Created method to get the webhook statuses 2014-12-16 18:54:48 -02:00
Patrick Rauland d8ff34710d adding email styles back to email preview. closes #6965 2014-12-16 11:32:54 -07:00
Claudio Sanches 8180de7fec Created the WC_Webhook::get_i18n_status() method 2014-12-16 15:29:37 -02:00
Claudio Sanches 481aee3969 Fixed dead variable in my account shortcode class 2014-12-16 10:10:25 -02:00
Claudio Sanches 5a14f0f3fe Merge pull request #6963 from bryceadams/patch-6962
Removal of old PHP class var use
2014-12-16 09:49:14 -02:00
Bryce 19d06c3d5b remove var keyword in WC_Product_Cat_List_Walker 2014-12-16 18:45:02 +07:00
Bryce ee8125d97c remove var keyword in WC_Product_Cat_Dropdown_Walker 2014-12-16 18:43:58 +07:00
James Koster 0c95d76c45 Storefront banner on add-ons. closes #6923 2014-12-16 11:43:26 +00:00
Bryce a5d51d040e remove var keyword in WC_Shipping_International_Delivery 2014-12-16 18:43:05 +07:00
Bryce 96ba418d5c remove var keyword in WC_Email_Customer_Reset_Password 2014-12-16 18:40:51 +07:00
Bryce 6af72ecb3d remove var keyword in some email classes 2014-12-16 18:40:21 +07:00
Bryce f428da3a01 remove var keyword in WC_Email_Customer_Invoice 2014-12-16 18:39:23 +07:00
Bryce 1c31af94f5 remove var keyword in WC_Shipping_Method 2014-12-16 18:38:58 +07:00
Bryce e2443c9d4c remove var keyword in WC_Shipping 2014-12-16 18:37:58 +07:00
Bryce 40b0d8d003 remove var keyword in WC_Integrations 2014-12-16 18:36:26 +07:00
Claudio Sanches 4150b03ea0 Fixed the stock status in quick and bulk edit 2014-12-15 20:03:50 -02:00
Claudio Sanches 1198a1dba2 Improved the Webhooks columns/table list 2014-12-15 18:49:18 -02:00
Claudio Sanches 2aeee0169a Display Webhooks menu when the WC API is activated 2014-12-15 17:28:58 -02:00
Nicola Mustone 7cec3c9f0b introduced woocommerce_get_product_attributes filter 2014-12-15 14:40:23 +01:00
thenbrent e1560bc9c6 Remove mention of after tax discounts in comments
Related to #6830
2014-12-15 15:27:10 +10:00
thenbrent a94cf06e4b Deprecated notice for WC_Cart->discount_total
Related to #6830
2014-12-15 15:25:53 +10:00
juangadiel ca1b9c334c Update class-wc-checkout.php fixes issue #6940
Check if the cart needs shipping before updating the user shipping address. This fixes the issue (#6940) of the shipping address being updated with the user billing address when purchasing a virtual product.
2014-12-12 17:18:16 -04:00
Mike Jolley 8434463694 Tweak skip button to make it less clickable 2014-12-12 17:03:11 +00:00
Mike Jolley c929b35f4f $discount_total deprecated to prevent errors. 2014-12-12 16:39:24 +00:00
Claudio Sanches c0e01e88dc Fixed the force http option on customizer screen, closes #6809 2014-12-12 11:15:38 -02:00
Claudio Sanches 24cfef046e Fixed the email settings save method 2014-12-12 10:48:55 -02:00
Claudio Sanches 32e30ed877 Improved the purchased items on order screen 2014-12-12 10:03:11 -02:00
Claudio Sanches 264a347fb5 Registre support for twenty fifteen 2014-12-12 09:49:54 -02:00
Claudio Sanches 7cf69a337b Updated the hosted payments option description on simplify commerce gateway 2014-12-12 01:56:28 -02:00
Claudio Sanches 48bf608120 [API] Improved the params in orders api actions 2014-12-12 01:22:42 -02:00
Mike Jolley 100b95ae4f Tweak the get magic method in product class 2014-12-11 14:54:56 +00:00
Claudio Sanches 051d3078ad [API] Prevented errors with deleted products in the orders endpoint, closes #6813 2014-12-11 10:54:07 -02:00
Barry Kooij 3f0a8be3d2 Merge branch 'master' into enhancement/checkout-order-review-error-handling 2014-12-11 12:10:53 +01: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
Brent Shepherd 1e8f25defa Use wc_get_order() not new WC_Order()
Because an order might be a custom order type
2014-12-10 18:46:32 -08:00
Brent Shepherd 40de60ea3e Give child class access to billing/shipping fields
So that custom order types can extend `WC_Meta_Box_Order_Data` for their
own purposes without having to redefine all the billing/shipping fields
2014-12-10 18:46:32 -08:00
thenbrent e4b104d153 Use order type's singular label for meta box names 2014-12-10 18:46:32 -08:00
Brent Shepherd 1f2375f7e4 Make no order notes label more generic
To account for it being displayed on custom order type Add/Edit screens
where the order type is not referred to as an 'Order' (e.g. a 'Subscription',
'Refund' or 'Pre-order').
2014-12-10 18:46:32 -08:00
Brent Shepherd ac42a29520 Delete order items for custom order types 2014-12-10 18:46:32 -08:00
Brent Shepherd 2eca3fd765 Apply request filters for custom order types 2014-12-10 18:46:32 -08:00
Brent Shepherd a141c79d10 Change insert button label for custom order types 2014-12-10 18:46:32 -08:00
Brent Shepherd 3fd9bc9027 Display order filters for custom order types
That declare they are using order-meta-boxes (and therefore, are assumed
to be exposing the Edit Order interface and a list table)
2014-12-10 18:46:32 -08:00
Brent Shepherd b0c2f05a6a Use post type label for "Save Order" button
To improve compatibility with custom order types

Conflicts:
	includes/admin/meta-boxes/class-wc-meta-box-order-actions.php
2014-12-10 18:46:15 -08:00
Claudio Sanches 53b1c66427 [API] Added parent_id in products endpoint, closes #6786 2014-12-10 16:28:30 -02:00
Claudio Sanches a579ce4578 Merge pull request #6894 from franticpsyx/add_shop_prices_in_variation_data_array
Add display_prices in available_variations array
2014-12-10 15:52:57 -02:00
Claudio Sanches a5d70fa24c Fixed API products when save multiple images from the media library, closes #6792 2014-12-10 15:23:36 -02:00
Claudio Sanches cb7cd8f765 Fixed the process order status method in simplify commerce 2014-12-10 15:04:57 -02:00
Mike Jolley fd15ac4c64 Allow a cancelled order to be marked paid, if there is a payment delay
Closes #6810
2014-12-10 16:54:08 +00:00
Mike Jolley 0e3cb2498e set timezone_name_from_abbr 3rd arg to 0
Closes #6897
2014-12-10 16:46:25 +00:00
Claudio Sanches e8a347ed18 Created the simplify commerce hosted payments return handler 2014-12-10 10:07:45 -02:00
Claudio Sanches 1da03a170c Created initial simplify commerce hosted payments flow and options 2014-12-09 17:11:55 -02:00
Mike Jolley 5aa058249c Allow plugins to filter the taxable location
Passes tax_class so we can workaround mixed carts and EU VAT.
cc @barrykooij
2014-12-09 16:41:30 +00:00
James Koster 316b43f770 coupons. closes #6836 2014-12-09 16:06:34 +00:00
Gerhard af1e4d794f Alignment. 2014-12-09 15:09:39 +02:00
Gerhard 20ad987274 Define WooCommerce core settings to track. 2014-12-09 15:05:32 +02:00
Gerhard 9fff6eb8c2 Update some docblocks 2014-12-09 15:02:02 +02:00
Mike Jolley 317808a219 [2.2] If order_item_type is not set, don't query it in reports class 2014-12-09 12:59:01 +00:00
Mike Jolley 76ec750dbb [2.2] remove_taxes needs to clear line_tax_data 2014-12-09 12:58:25 +00:00
Claudio Sanches ec30dab6c4 Improved the colorpicker field 2014-12-09 10:10:59 -02:00
Claudio Sanches 5ea4e1b0a7 Created new colorpicker settings api field 2014-12-09 10:07:29 -02:00
Mike Jolley 76898699cd Clarify variable comment #6830 2014-12-09 11:00:41 +00:00
Mike Jolley caec42dc13 Merge pull request #6917 from webaware/cleanup-sessions-escape-for-like
Escape `_` in LIKE to allow index search
2014-12-09 10:47:19 +00:00
Mike Jolley ba4fc09eeb Merge pull request #6920 from SiR-DanieL/patch-2
Fix possible notice with taxes
2014-12-09 10:44:48 +00:00
Mike Jolley 56e0e0dc55 Add special wc_query variable when querying products. #6444 2014-12-09 10:21:50 +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
Nicola Mustone 7ebd7399cb Fix possible notice 2014-12-09 10:14:25 +01:00
Mike Jolley e6b94e486b Leave postcode before city swapping to JS
Fixes #6842
2014-12-09 09:07:28 +00:00
Mike Jolley 2f66bbd8c0 woocommerce_price_filter_meta_keys filter to allow plugins to define min/max meta keys that require searching
Closes #6492
2014-12-09 08:33:33 +00:00
Ross McKay 648040d458 Don't return option_value from cleanup_sessions() query, no longer required 2014-12-09 08:16:40 +11:00
Ross McKay d37d58d19f Escape `_` in LIKE to allow index search
Also filters for expired sessions in DB, not PHP.
Fixes #6916
2014-12-09 08:07:12 +11:00
Mike Jolley b470e64b61 Error in previous commit. 2014-12-08 12:34:42 +00:00
Mike Jolley 80d08787a8 Correctly save custom address fields in admin 2014-12-08 12:30:11 +00:00
Mike Jolley 2874ef9947 Merge pull request #6909 from webaware/cleanup-sessions-cached
Delete cached sessions when clearing expired sessions
2014-12-08 07:47:10 +00:00
splashingpixels 25b6377298 ajaxified coupon removal on checkout page for better UX closes #6881 2014-12-07 22:15:03 -08:00
Ross McKay ee0cbb27c6 only delete sessions from object cache if using persistent object cache 2014-12-08 09:04:55 +11:00
Ross McKay 95a25d3023 Delete cached sessions when clearing expired sessions
Fixes #6907
2014-12-06 18:43:56 +11:00
Mike Jolley caee0cd679 Fix timezone_name_from_abbr unit test 2014-12-05 14:21:05 +00:00
Mike Jolley cf694bcae6 Merge pull request #6875 from tamarazuk/limit-order-action
Execute `woocommerce_order_action_{$action}` only once
2014-12-05 14:04:47 +00:00
Mike Jolley 6da8be66a6 Merge pull request #6905 from SiR-DanieL/patch-2
Clickable item name in orders table
2014-12-05 14:04:16 +00:00
Mike Jolley e13c01e7f4 Adjust wc_timezone_string to use is_dst and return the timezone when not false. Only fallback to UTC when needed.
Fixes #6897
2014-12-05 14:01:08 +00:00
Mike Jolley 508bfd5c06 Merge branch 'breadcrumbs-class'
Adds endpoint page titles for #5522
Fixes link back to endpoint pages and closes #6638
Avoids need for breadcrumb fix which closes #6834
Removes the need and closes #6834
Fixes #6840
2014-12-05 13:42:19 +00:00
Nicola Mustone e59070ab01 clickable item name in orders table 2014-12-04 16:57:12 +01:00
Claudio Sanches 256216e13d Fixed the wc_update_new_customer_past_orders() function, closes #6903
get_post_status() returns post status (string) or false (bool) on failure.
2014-12-04 11:09:37 -02:00
Barry Kooij 438988d9c7 Added the possibility to display notices and/or force reload on order review. 2014-12-04 09:40:49 +01:00
Mike Jolley 6a45f8f196 Merge branch 'master' of https://github.com/woothemes/woocommerce 2014-12-03 12:33:19 +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
Claudio Sanches 8fac703f97 Added missing textdomain
cc @bryceadams #fail
2014-12-03 10:30:32 -02:00
Manos Psychogyiopoulos 4b04701cc8 add display_prices in variation data
The commit introduces 3 changes:
1. It adds 2 extra fields to the available_variations array,
display_price and display_regular_price, to be used by extensions in
cases like
https://github.com/woothemes/woocommerce-product-addons/issues/19
2. Introduces a get_display_price() function in WC_Product to retrieve
product prices incl or excl tax relative to the
woocommerce_tax_display_shop setting.
3. Fixes a minor issue where passing a 0 price to
get_price_including_tax() or get_price_excluding_tax() results in a
wrong output.
2014-12-03 11:28:04 +02:00
Bryce 80ccc7b09d Add help tip for schedule sales info
Closes #6863
2014-12-03 13:20:24 +07:00
Claudio Sanches 951c70de7e Allows custom directory for email templates
cc @SiR-DanieL
2014-12-03 01:30:28 -02:00
Nicola Mustone 6b03da033d Introduced woocommerce_delete_from_theme_folder filter 2014-12-03 00:52:08 +01:00
Nicola Mustone fcc072abcc Added trim to avoid errors 2014-12-03 00:40:44 +01:00
Nicola Mustone d1ce8c00ac Introduced filter woocommerce_copy_to_theme_folder 2014-12-03 00:36:26 +01:00
James Koster 7bd6b7d009 remove frontend dashicons, tweak loader 2014-12-02 21:19:03 +00:00
Barry Kooij 36c98dae6d Merge branch 'master' of github.com:woothemes/woocommerce 2014-12-02 12:58:00 +01:00
Barry Kooij f105664805 Introduced 'woocommerce_ajax_calc_line_taxes' filter. 2014-12-02 12:57:53 +01:00
Barry Kooij b79a98bc87 Introduced 'woocommerce_find_rates' filter. 2014-12-02 12:57:01 +01:00
Mike Jolley 11af24902b [2.2] Ensure float is safely converted to string 2014-12-02 11:20:07 +00:00
Mike Jolley b852904e37 Merge pull request #6890 from bryceadams/patch-6888
Add style field to woocommerce_wp_xxxxx_input
2014-12-02 10:06:23 +00:00
antoscarface 78047959f4 Moved do action of 'woocommerce_admin_css' to avoid possible add action from debug plugin as "Debug Bar" and "Debug Bar Slow Actions"
See screen: http://d.pr/i/1fYX1/7ZiItezr
2014-12-02 10:26:17 +01:00
Bryce f8d4fe64ad Fix annoying white space 2014-12-02 13:50:17 +07:00
Bryce cd76ae82e7 Add style field to woocommerce_wp_xxxxx_input
Closes #6888
2014-12-02 13:48:06 +07:00
claudiosmweb 676549b4ab Fixed docblock for WC_Product::get_categories() 2014-12-01 22:09:42 -02:00
claudiosmweb 5d9a1ad908 Merge branch 'master' of github.com:woothemes/woocommerce 2014-12-01 21:56:45 -02:00
claudiosmweb 3ce620e4f3 Removed eXtremeGoHorse practices from WC_AJAX::calc_line_taxes() and wc_save_order_items()
cc @barrykooij
2014-12-01 21:55:48 -02:00
Barry Kooij e1b81b3a23 Introduced 'woocommerce_reports_taxes_tax_rate' and 'woocommerce_reports_taxes_rate' filters. 2014-12-01 13:36:50 +01:00
claudiosmweb 780aca38a6 Fixed checkbox label in woocommerce_form_field() function, closes #6880 2014-12-01 10:13:41 -02:00
Gerhard 6f62e17fd0 Use get_bloginfo so it does not output. 2014-12-01 13:50:18 +02:00
Gerhard f90cf15adf Use correct theme_data variable. 2014-12-01 13:43:48 +02:00
Gerhard 77a09e3f85 Update to new tracker domain. 2014-12-01 13:28:18 +02:00
Claudio Sanches 8de9492199 Merge pull request #6876 from tamarazuk/coding-standards-part-2
Code Standards Part 2
2014-11-30 12:14:33 -02:00
Barry Kooij 4c2adfda62 Doc return type update. 2014-11-30 14:16:40 +01:00
Tamara Zuk af442599b1 Code Standards: Finish up admin includes
* fixed indentation - swapped spaces for tabs at start of line, swapped
tabs for spaces min-line for alignment
* removed instances of `@return void` and `@access public`

@see http://make.wordpress.org/core/handbook/coding-standards/php/

@see part 1: #6157
2014-11-30 01:52:32 -05:00
Tamara Zuk f63c5e8c8f Execute `woocommerce_order_action_{$action}` only once
Prevents a “Maximum function nesting level reached” fatal error in
certain cases.

Since this ends up running on `’save_post’`, updating something like
the order status while hooked onto to
`woocommerce_order_action_{$action}` causes a fun recursion :)
2014-11-30 00:14:22 -05:00
Barry Kooij 23b38f9490 Typos 2014-11-29 12:35:36 +01:00
Barry Kooij 0ccf153227 Merge branch 'master' of github.com:woothemes/woocommerce 2014-11-29 12:33:43 +01:00
Barry Kooij 21b7fe60f6 Codestandards 2014-11-29 12:33:36 +01:00
claudiosmweb 80ea5420c3 [API] Fixed the action parameters in the methods to create and edit orders, closes #6845 2014-11-28 10:22:35 -02:00
Claudio Sanches 8e929c1ee8 Merge pull request #6859 from SiR-DanieL/master
Edit link for WC Pages
2014-11-28 09:40:32 -02:00
Claudio Sanches 1afa04e7f6 Merge pull request #6857 from splashingpixels/product-gallery-images
undefined index when product image gallery side meta box is removed fixe...
2014-11-28 09:40:10 -02:00
Nicola Mustone c25b86e0ae Edit link for WC Pages 2014-11-28 09:06:15 +01:00
Bryce 0967525a72 Bit of code formatting 2014-11-28 14:21:01 +07:00
Bryce 5e0cbb4676 Add stupidtable.min.js 2014-11-28 14:17:58 +07:00
splashingpixels 13ad1100c5 undefined index when product image gallery side meta box is removed fixes 6855 2014-11-27 20:42:58 -08:00
Barry Kooij c2321aeb94 Code standards. 2014-11-27 22:38:36 +01:00
Barry Kooij d990daed57 Typo. 2014-11-27 22:36:46 +01:00
claudiosmweb b6cd6b8735 Fixed some coding standards 2014-11-27 15:29:52 -02:00
shivapoudel 84bc7a2339 Cleanup for WC_Admin_Attributes Class 2014-11-27 22:34:19 +05:45
shivapoudel 3aa67ac352 Fixes attribute menu highlight, closes #6849 2014-11-27 22:32:11 +05:45
Mike Jolley 2c1c9896c5 Remove remove_variation and replace with remove_variations 2014-11-27 15:44:51 +00:00
Mike Jolley 44af56ff75 Simplify feature_product() 2014-11-27 15:40:39 +00:00
Mike Jolley e3c1ebc927 Simplify mark_order_status() 2014-11-27 15:37:42 +00:00
Mike Jolley 3415b5d7c0 In the cart, add variation selected data to the permalink.
Closes #6060
2014-11-27 15:04:24 +00:00
Mike Jolley 2cfaead676 Added numeric sort for attributes. Closes #5978 2014-11-27 14:49:02 +00:00
claudiosmweb fb955e8a40 [API] Added error message when try search a product with a invalid SKU 2014-11-27 10:52:24 -02:00
claudiosmweb 553fe744cf [API] Created a route to get products by SKU, closes #6847 2014-11-27 10:34:55 -02:00
claudiosmweb 15996a1dee Created the wc_get_product_id_by_sku() function 2014-11-27 10:31:56 -02:00
Claudio Sanches 7a62f75eca Revert "Look up product by sku" 2014-11-27 10:06:28 -02:00
Mike Jolley 2c6debf1f4 Merge pull request #6850 from bryceadams/patch-6839
improve get_rating_count() for rating-less reviews
2014-11-27 11:07:30 +00:00
Mike Jolley d8c6d3b9c3 Merge pull request #6847 from harrisonde/sku
Look up product by sku
2014-11-27 11:04:26 +00:00
Mike Jolley 48ffa859cf Merge pull request #6837 from ragulka/email-settings-action-hooks
Introduce email settings action hooks
2014-11-27 11:01:31 +00:00
Mike Jolley 251160d512 Added 'top freebies' to product report.
Closes #5596
2014-11-27 10:36:21 +00:00
Mike Jolley 6df4c143cc Adjust total for partially refunded order totals
Closes #6666
2014-11-27 10:04:18 +00:00
Gerhard 70297b8973 Track server related info. 2014-11-27 10:13:16 +02:00
Gerhard 4aadc76e3d Add WordPress tracking data. 2014-11-27 10:00:20 +02:00
Gerhard 522416f698 Change succesfull reset message. 2014-11-27 09:46:11 +02:00
Gerhard 69553d53ab Add button to tools page to reset usage settings. 2014-11-27 09:43:43 +02:00
Bryce 83a457b29c improve get_rating_count() for rating-less reviews
Should close #6839.

According to `woocommerce_enable_review_rating` &
`woocommerce_review_rating_required`, it will do a different DB query,
so that when reviews without ratings are allowed, it will do a query
that counts those comments as reviews.
2014-11-27 14:32:09 +07:00
Gerhard 144c683d7b Extend theme info to include child theme and wc support. 2014-11-27 09:07:31 +02:00
Gerhard c4b4071649 Change general to settings to reflect it better. 2014-11-27 08:56:35 +02:00
Gerhard d1c58cc276 Update docblock param reference. 2014-11-27 08:55:40 +02:00
Gerhard 8bb21d4dbc Add check to send method to ensure customer subscribed. 2014-11-27 08:55:06 +02:00
Gerhard d2da65e399 Fix extra array wrap in theme info function. 2014-11-27 08:43:03 +02:00
Gerhard 9213138a93 Add filter to tracking data so extensions can extend. 2014-11-27 08:12:17 +02:00
Harrison DeStefano 7c42b66a02 product by sku 2014-11-26 15:51:04 -05:00
Gerhard b7d2f88161 Wrap up send_tracking_data function. 2014-11-26 21:46:16 +02:00
Gerhard a33400db9f Add tracker class to includes. 2014-11-26 21:36:14 +02:00
Gerhard 0faa686176 Opt-in and Opt-out admin notice and actions. 2014-11-26 21:10:42 +02:00
Gerhard e58c47b5b3 Use get_option( 'admin_email' ) instead. 2014-11-26 20:40:09 +02:00
Nicola Mustone b074f63a7e Typo itme -> item 2014-11-26 19:07:13 +01:00
Mike Jolley 5f77ee752e Merge pull request #6814 from bryceadams/patch-6026
#6026 - Introduction of Sort Code 'locale' for BACS
2014-11-26 16:23:40 +00:00
Bryce 8f89ef9c0b Remove locales with 'Sort Code'
Wrong swamp
2014-11-26 23:03:48 +07: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 2e398a3a79 Decoupled the order summary and payments area. Both are updated independently via ajax fragments and can be moved around via actions. TEMPLATES OVERRIDING THESE TEMPLATES WILL NEED TO UPDATE THEIR FILES.
Closes #5781
Closes #6570
2014-11-26 14:19:53 +00:00
Gerhard 9d667ba81b Add WC_Tracker class with tracking data functionality. 2014-11-26 16:03:34 +02:00
Mike Jolley 3904035003 Disable already added attributes #6189 2014-11-26 11:35:07 +00:00
Mike Jolley 06129f60cd Message when updating attributes #6189 2014-11-26 11:14:08 +00:00
Mike Jolley d9f26e7848 Remove troublesome 'featured image' text replacement
Little gain in keeping this - not worth the overhead. Closes #6451
2014-11-26 11:03:39 +00:00
Mike Jolley c3fb83d443 Append query string when removing item from cart to bust cache
Closes #6544
2014-11-26 10:56:51 +00:00
Mike Jolley 67d899da3a Restore __Get and move template debug mode to template functions 2014-11-26 00:03:00 +00:00
Mike Jolley 626d7f4256 Moved email methods to emails class 2014-11-26 00:03:00 +00:00
Mike Jolley 0d4d6fdcaf WC class cleanup 2014-11-26 00:03:00 +00:00
Mike Jolley 1993509e07 Removed unused variables from emails class, including content_type 2014-11-26 00:03:00 +00:00
Mike Jolley 206496b584 Split up WC_Product_Factory methods 2014-11-26 00:03:00 +00:00
Illimar Tambek 2752e0c61d Correct hook name: `woocommerce_email_settings_before` 2014-11-26 00:28:23 +02:00
Mike Jolley ce1d59c7ba Merge pull request #6838 from khag7/master
Corrected the docblock descriptions for two "send email" classes
2014-11-25 17:09:54 +00:00
Mike Jolley dbcc8430e9 Installer tweaks + unit tests closes #6356 2014-11-25 17:09:24 +00:00
khag7 bf15b5e351 Corrected the docblock description for the order cancellation email class
This email is sent when an order is cancelled, not when a new order is paid for.
2014-11-25 11:23:00 -05:00
khag7 067d62541e Corrected the docblock description
This is an email sent to the customer, not the admin.
2014-11-25 11:15:53 -05:00
Illimar Tambek 88c4c2394f Introduce email settings action hooks 2014-11-25 16:59:29 +02:00
claudiosmweb ce721fc86f [API] Fixed the coupons expiry_date format with POST and PUT, closes #6829 2014-11-25 12:44:33 -02:00
claudiosmweb c73bcb614e API - deletes the product when fails to create, closes #6801 2014-11-25 12:10:12 -02:00
Mike Jolley 3c82331a8b Store discount 'tax' to show discounts on prices including tax more accuratly
Also deprecated some functions named after having 2 levels of discounts.
2014-11-25 13:05:03 +00:00
Mike Jolley 4a8c541fbf Remove 'order' discounts from classes 2014-11-25 11:05:14 +00:00
Mike Jolley 1f3adbd0c2 esc_html for the term name 2014-11-25 10:38:54 +00:00
Mike Jolley 549d7ab2c0 Removed 'apply before tax' options for coupons - this should be the default core behaviour 2014-11-24 17:24:25 +00:00
Mike Jolley f90c146d01 Give product gallery low priority
Closes #5976
2014-11-24 15:29:37 +00:00
Mike Jolley 3a927d62dd Add tip to reports
Closes #5729
2014-11-24 15:18:41 +00:00
Mike Jolley fe6d52b705 Final tax class unit tests
Closes #6357
2014-11-24 14:57:11 +00:00
Bryce 3fd7997413 Move locale to new method in BACS gateway 2014-11-24 21:26:33 +07:00
Mike Jolley 802e807319 Limit length of password when creating web hook 2014-11-24 13:52:13 +00:00
claudiosmweb 2c48a87086 Fixed WC API Coupons params, closes #6828 2014-11-24 10:37:38 -02:00
Barry Kooij 4ed7de31ca Merge pull request #6820 from ryanr14/typo-fix
Spelling correction - insursion to insertion
2014-11-21 22:48:24 +01:00
Ryan Ray cc5be422cc Spelling correction - insursion to insertion 2014-11-21 16:46:33 -05:00
Barry Kooij 4dd60d42c7 Docblock fixes 2014-11-21 22:40:42 +01:00
Barry Kooij 47cc448028 Added correct docblock. 2014-11-21 22:34:30 +01:00
Barry Kooij 4b539e7a9a Merge branch 'master' of github.com:woothemes/woocommerce 2014-11-21 22:31:17 +01:00
Barry Kooij 6ebadd572a Added correct docblock. 2014-11-21 22:31:09 +01:00
Michael Tieso 70d5fc834a Spelling correction - calculdate to calculate 2014-11-21 13:26:32 -08:00
Barry Kooij f8a161c406 Documentation improvement. 2014-11-21 22:16:15 +01:00
Barry Kooij ae1ed2b7f6 Added missing param docblock. 2014-11-21 22:14:13 +01:00
Barry Kooij b131f250b6 Added missing docblock return statement. 2014-11-21 22:12:37 +01:00
Barry Kooij 64227fe9d8 Added missing docblock 2014-11-21 22:12:03 +01:00
Barry Kooij 33b53c30b5 Updated docblock and added return statement. 2014-11-21 22:09:46 +01:00
Mike Jolley f1f92e120d Merge pull request #6799 from bryceadams/patch-4459
#4459 - Add filters for product_list_widget before / after
2014-11-21 17:29:01 +00:00
Bryce e93c32565c merge changes 2014-11-22 00:09:11 +07:00
Mike Jolley 40e0fe7a4e Merge pull request #6811 from bryceadams/patch-5537
#5537 - Fix bulk edit overlap, bulkedit improvements
2014-11-21 16:40:28 +00:00
Mike Jolley d55b57dc8a Merge pull request #6812 from woothemes/remove-order-items-query-speed
Change remove_order_items subqueries to inner joins.
2014-11-21 16:40:06 +00:00
Mike Jolley b2f91a4a14 Merge pull request #6794 from franticpsyx/issue-5661-amendments
woocommerce_variation_is_visible/is_active filter args
2014-11-21 16:35:48 +00:00
Mike Jolley 8b4332a037 Refactors to shipping tax rate methods 2014-11-21 13:06:33 +00:00
Mike Jolley b440a6a165 Split find_rates method 2014-11-21 13:06:33 +00:00
Bryce 7abd1358fc Fix whitespace 2014-11-21 16:13:03 +07:00
Bryce 6dad8fdc59 #6026 - Introduction of Sort Code 'locale' for BACS
In the admin, it will use the store’s base country to determine the
term for ‘Sort Code’.

In the front-end, it will use the customer’s billing country to
determine the term for ‘Sort Code’.

In all cases, if a locale does not have a sortcode label set, it will
use ‘Sort Code’.

**Locales have been added for:**
* AU
* CA
* IE
* IN
* IT
* NZ
* SE
* US
* GB
* ZA

But may need adjusting based on user feedback.
2014-11-21 16:10:12 +07:00
Gerhard fa42c9d397 Change remove_order_items subqueries to inner joins.
Closes #6804
Hat tip Jason @ WPEngine
2014-11-21 09:18:31 +02:00
Bryce bad3b31a18 #5537 - Fix bulk edit overlap, bulkedit improvements 2014-11-21 13:37:14 +07:00
Bryce a6c88c9104 Only enqueue/localize on profile page 2014-11-21 12:42:32 +07:00
Mike Jolley 665d2aa8a3 combine city and postcode save logic 2014-11-20 21:02:10 +00:00
Mike Jolley dd53f8e730 Move widget registration to own function/file - avoid register_widget in class files 2014-11-20 20:56:24 +00:00
Mike Jolley f088f81dcf Optimise tax rate importer and use same code as tax settings class 2014-11-20 18:41:51 +00:00
Mike Jolley add83a75dc Tax rate importer parse error 2014-11-20 17:09:07 +00:00
Mike Jolley 1ec8dabf8a Added method for expanding postcode ranges 2014-11-20 17:08:17 +00:00
Mike Jolley 97d241c33c Moved delete tax rate rule 2014-11-20 15:46:07 +00:00
Mike Jolley 7472a722b2 Corrected format_ methods 2014-11-20 15:43:40 +00:00
Mike Jolley db13b2224f Fix refund class 2014-11-20 15:03:46 +00:00
Mike Jolley ce1a9b84c7 Redo construct and move settings/html to separate files 2014-11-20 15:03:45 +00:00
Mike Jolley 7df9f20e18 Merge pull request #6798 from bryceadams/patch-2906
#2906 - Set reviews count in tab to only count actual reviews
2014-11-20 12:16:02 +00:00
Mike Jolley 4fd8cd63cb Split up save_tax_rates() method 2014-11-20 11:11:08 +00:00
Bryce 333e4dd2fe Remove previously added filter, not necessary 2014-11-20 16:43:48 +07:00
Bryce 8b1cc5f902 #5850 - Add QR code to API credentials
This uses https://github.com/jeromeetienne/jquery-qrcode for generating
the QR code.

This is what it looks like:

![see screen shot](http://cld.wthms.co/11wpb+)

It’s small, **but**, it scans perfectly without any issues.
2014-11-20 15:46:46 +07:00
Bryce bd96565eeb #4459 - Add filters for product_list_widget before / after
2 new filters introduced:

* `woocommerce_before_widget_product_list`
* `woocommerce_after_widget_product_list`
2014-11-20 12:57:39 +07:00
Bryce 985df5bca4 #2906 - Set reviews count in tab to only count actual reviews
Nested comments shouldn’t be treated as reviews. This addresses that by
using `$product->get_rating_count()` to determine the correct number of
reviews, instead of get_comments_number.

It can be filtered using the new `woocommerce_product_reviews_count`
filter.
2014-11-20 12:39:07 +07:00
claudiosmweb b4e544e5dc Fixed coding styles and docblocks 2014-11-20 00:14:06 -02:00
claudiosmweb 6d4650dd7b Declared all Settings API variables 2014-11-19 23:11:08 -02:00
Mike Jolley c70c232e2c Optimised save tax rate logic 2014-11-20 00:51:06 +00:00
claudiosmweb 8eeb6fc204 Removed more some unused code 2014-11-19 22:43:09 -02:00
claudiosmweb 45ddc1d26e Merge branch 'master' of github.com:woothemes/woocommerce 2014-11-19 21:36:53 -02:00
claudiosmweb 74ba11c189 Removed some unused code 2014-11-19 21:36:47 -02:00
Mike Jolley 2b645ed293 Moved if statement in flat rate shipping 2014-11-19 23:28:23 +00:00
claudiosmweb d4c480a6ea Fixed process_refund() docblock 2014-11-19 21:14:28 -02:00
Mike Jolley e630e64cb7 Flat rate shipping tweaks + inline instructions 2014-11-19 22:22:35 +00:00
claudiosmweb 9b16425142 Fixed some coding style issues 2014-11-19 17:01:06 -02:00
claudiosmweb 59c8f9440e Merge branch 'master' of github.com:woothemes/woocommerce 2014-11-19 16:57:33 -02:00
claudiosmweb 744f80e0c6 Fixed password reset handler 2014-11-19 16:57:26 -02:00
Mike Jolley ef7693cb4b valid_response method 2014-11-19 18:26:29 +00:00
Mike Jolley 263134d395 ob_clean and header is unnecessary - default is 200 2014-11-19 18:26:29 +00:00
claudiosmweb e87aefc8e0 Fixed missing initial $query = array() 2014-11-19 16:26:10 -02:00
Mike Jolley 82f381df67 WC_Autoloader class 2014-11-19 18:08:38 +00:00
Mike Jolley d3dc8be3ec Undo commit which autoloaded widgets
Since they are loaded every time with core, it doesn’t make sense to
autoload them.
2014-11-19 18:08:38 +00:00
Manos Psychogyiopoulos 0b275de06a Issue 5661: filter params 2014-11-19 19:46:05 +02:00
Mike Jolley 1e217758fc Fix IPN response 2014-11-19 15:00:05 +00:00
Mike Jolley ca37524fe6 woocommerce_get_paypal_order filter
@thenbrent this should cover subscriptions needs
2014-11-19 15:00:05 +00:00
Mike Jolley 0ad1e05e23 Split PayPal class into separate classes for IPN and PDT and refund handling 2014-11-19 15:00:05 +00:00
Mike Jolley 2190405d61 Merge pull request #6791 from ragulka/dry-status-actions
DRY status actions, support custom status handling
2014-11-19 14:37:48 +00:00
Illimar Tambek e41368c99a DRY up order status bulk actions 2014-11-19 14:26:27 +02:00
Illimar Tambek d510372d64 DRY up mark_order_{$status} 2014-11-19 14:13:24 +02:00
claudiosmweb dbcf4de41f Fixed WC_Cart::get_cart_item() return type 2014-11-19 09:46:40 -02:00
Claudio Sanches c7dc0947c4 Merge pull request #6788 from SiR-DanieL/undo_cart
Undo cart removal
2014-11-19 09:31:09 -02:00
Nicola Mustone 37ea3faf0a Added missing get_cart_item 2014-11-18 20:48:45 +01:00
Mike Jolley 83cd831e1a can_refund_order/limit_string_length methods 2014-11-18 16:53:03 +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
Mike Jolley b3782fa1a5 Removing Mijireh from core 2.3 2014-11-18 16:37:43 +00:00
Nicola Mustone 5d30109ab6 Handle cart item undo 2014-11-18 17:31:06 +01:00
Nicola Mustone 7eecb87d34 Added get_undo_url 2014-11-18 17:30:52 +01:00
Mike Jolley 003094c9c3 Ensure remaining hashes are translated Closes #6518 2014-11-18 16:29:21 +00:00
Mike Jolley ed1ff0f48c WooConf is over 2014-11-18 16:26:12 +00:00
Mike Jolley e7fc5520a8 Merge pull request #6776 from axisthemes/welcome
Welcome Page Cleanup
2014-11-18 16:25:44 +00:00
Mike Jolley e476a3f76b Merge pull request #6785 from SiR-DanieL/make_clickable
Automatically creates clickable links in item metas
2014-11-18 16:21:29 +00:00
Mike Jolley 4c5b7a3c06 Remove updates, 1.4, 1.5 2014-11-18 16:18:48 +00:00
Mike Jolley 387296a807 More PayPal line item tweaks 2014-11-18 16:13:41 +00:00
Mike Jolley 898c989753 wc_tax_enabled() and wc_prices_include_tax() methods 2014-11-18 16:13:41 +00:00
claudiosmweb da43955416 Introduces the wc_get_default_location() function 2014-11-18 12:56:13 -02:00
claudiosmweb 771f25d7b7 Improved the WC_Customer class, removed dead variables, removed duplicated code and added new docblocks 2014-11-18 12:32:48 -02:00
Mike Jolley a39353fc73 Split up line item methods in paypal 2014-11-18 13:46:55 +00:00
Mike Jolley e68353da63 Use one variable for endpoint in paypal 2014-11-18 13:46:55 +00:00
Mike Jolley 2e9f02932d Simplify get_icon() method 2014-11-18 13:46:55 +00:00
Mike Jolley 74b93b8c67 Moved paypal settings to file 2014-11-18 13:46:55 +00:00
Mike Jolley dc3aca2d06 Simplify logging and get_paypal_order(). Removes < 2 bw compat
@thenbrent this removes the old IPN handling legacy code. Is this
something that may affect subscriptions? I believe that IPN code was
for WC < 2.0 when we used to send back a string/integer in ‘custom’
2014-11-18 13:46:55 +00:00
claudiosmweb 6acfd3e2a7 Created WC_Customer::get_default_location() for avoid duplicate code 2014-11-18 11:32:44 -02:00
Nicola Mustone 913cc42c06 Fixes https://github.com/woothemes/woocommerce-product-addons/issues/24 2014-11-18 14:22:21 +01:00
Nicola Mustone 22a32ae9c8 Fixes #6555 2014-11-18 14:20:47 +01:00
claudiosmweb 6077a10e44 Removed some dead variables 2014-11-18 10:42:54 -02:00
shivapoudel 78f9759e1c Some modification for theme-support notice 2014-11-18 17:22:15 +05:45
shivapoudel 36e74b3b0d Some curley braces 2014-11-17 22:59:49 +05:45
Mike Jolley a0bf72f7b5 Bulk edit sales schedule on variations
Closes #6300
2014-11-17 16:50:25 +00:00
shivapoudel d688a37f54 Some mistake revoked 2014-11-17 22:34:27 +05:45
shivapoudel 4341174927 Merge remote-tracking branch 'upstream/master' into welcome 2014-11-17 22:30:52 +05:45
shivapoudel 3d4954a3e1 Some gap added intensionally ;) 2014-11-17 22:27:39 +05:45
Mike Jolley e6a5825f8c Some shipping class tidyup 2014-11-17 16:30:18 +00:00
shivapoudel 85440b5927 use of final class helper function 2014-11-17 22:03:15 +05:45
shivapoudel 61dfac7ccd Unused var if needed in future we can use WC_PLUGIN_BASENAME constant 2014-11-17 21:44:32 +05:45
shivapoudel 5b0be2f102 Cleanup for the WC_Admin_Welcome Class 2014-11-17 21:41:36 +05:45
Mike Jolley 82145be444 Merge pull request #6773 from axisthemes/menu-order
Simplify the condition for custom menu order
2014-11-17 14:31:37 +00:00