Commit Graph

1510 Commits

Author SHA1 Message Date
Claudio Sanches d0c71bd46e Fixe the admin access for subscsribers and customers 2015-02-27 13:32:47 -03:00
Tamara Zuk 3525b0f193 Append status codes to wp_remote_post and wp_remote_get notes 2015-02-26 02:05:01 -05:00
Tamara Zuk 8e4259b915 System Status: Fix fatal error when `$response` is not an object 2015-02-26 01:50:42 -05:00
Claudio Sanches 37882756d3 Fixed HTML entities for up-sells and cross-sells fields, closes #7553 2015-02-25 10:27:53 -03:00
Mike Jolley 2006c7217e Add reports menu item if user can access reports but not the main WC section.
Closes #7528
2015-02-24 12:29:03 +00:00
Mike Jolley ba582c307b Dashboard - use same query as reports Closes #7529 2015-02-24 12:18:56 +00:00
Mike Jolley 4c411a69e7 * Fix - Saving an order needs to save the discount amount ex. tax like
the cart.
* Tweak - Show discounts inc. tax when showing order totals inc. tax.

Closes #7532

@barrykooij @claudiosmweb How does this look? Looks like we were saving
order discounts inconsistent with the cart/checkout
2015-02-23 17:39:57 +00:00
roykho c9a84030bb add hook to system status report so 3rd party items can display debug info there 2015-02-23 07:07:14 -08:00
Mike Jolley 2657ed251c Adjust syntax 2015-02-23 11:45:34 +00: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 321d38be0a Round report values.
Closes #7505
2015-02-20 12:27:55 +00:00
Mike Jolley 2a90208f93 Cross/up-sells should not search variations.
Closes #7502
2015-02-20 12:12:03 +00:00
Mike Jolley 2caf287258 Tweak rating prompt text on click, and change once rated
@bftrick This is to keep the .org folk happy and look less spammy :)
2015-02-19 11:38:35 +00:00
Mike Jolley 049abcfdd3 Show random tweet
Closes #7481
2015-02-19 11:16:24 +00:00
Mike Jolley 82ac0fc11e Detect shortcodes when saving URLs.
Fixes #7474
2015-02-19 11:05:04 +00:00
roykho af940dcf72 fix taxes save issue when page is paginated 2015-02-18 22:52:34 -08:00
Claudio Sanches 517a447743 Fixed some issues for scrutinizer 2015-02-18 16:09:02 -02:00
Claudio Sanches 1a45a447b0 Fixed the true-null-false case 2015-02-18 15:34:03 -02:00
Magnus Jepson ded1cf76e0 Fix sales report description
Net Sales report tooltip description was misleading by “excluding
refunds”
2015-02-18 18:19:10 +01:00
Claudio Sanches 6c7a22b910 Removed admin message from user profile pages, closes #7478 2015-02-18 15:06:11 -02:00
Claudio Sanches 69f44e1d4f Changed get_bloginfo("title") to get_bloginfo("name") 2015-02-18 13:47:30 -02:00
Claudio Sanches 0979fc475a Merge pull request #7466 from qTranslate-Team/master
replace get_bloginfo('name') with get_bloginfo('name', 'display')
2015-02-18 13:44:49 -02:00
Mike Jolley 470b259a8a Don't download GeoIP Database until geolocation option is enabled in settings. 2015-02-18 12:53:24 +00:00
John Clause 6c9f863c04 replaced get_bloginfo('name') with get_bloginfo('name','display') 2015-02-17 20:56:18 -07:00
Claudio Sanches c97dffcc66 Improved the WC_Admin::admin_footer_text(), closes #7461 2015-02-17 16:24:11 -02:00
Mike Jolley d1c19d5782 Check for GZIP support 2015-02-17 16:19:33 +00:00
Mike Jolley 5ec61e3acd Tweak transient welcome redirect 2015-02-17 15:24:12 +00:00
Mike Jolley ac8d97ab54 No need to add double quotes here Closes #7447 2015-02-16 14:33:12 +00: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
Nicola Mustone 1f0fe09910 Added target _blank to the template structure doc link 2015-02-16 13:55:28 +01:00
Mike Jolley e58e9cb426 Merge pull request #7444 from SiR-DanieL/patch-6
Target _blank on Theme integration guide
2015-02-16 12:46:48 +00:00
Mike Jolley f5e73d792d Fix error when no product is chosen for report.
Fixes #7427
2015-02-16 11:53:37 +00:00
Nicola Mustone fe0cbd505c target _blank on Theme integration guide 2015-02-16 12:41:21 +01:00
Mike Jolley fcbd5c4292 Merge branch 'reports-api-fixes' 2015-02-16 11:35:10 +00:00
Mike Jolley e307786f5e Merge pull request #7438 from paulwilde/upstream
Introduce wc_get_page_permalink
2015-02-16 11:13:02 +00:00
Lucas Karpiuk fc11849054 Fixes issue #7440 2015-02-15 15:36:18 -05:00
Paul Wilde c913316f8b Introduce wc_get_page_permalink. 2015-02-15 19:13:22 +00:00
Mike Jolley 8409d67602 Share data between sales by date report and API.
Also ensures data is consistent. #7416
2015-02-13 21:25:59 +00:00
Claudio Sanches eff087f5ab Merge pull request #7413 from woothemes/plain-text-email
Check support for DOMDocument, closes #7404
2015-02-13 12:55:39 -02:00
Mike Jolley 765dcd174b Tweak text in frontend colors notice 2015-02-13 14:53:22 +00:00
Claudio Sanches 4065f56376 Improved the description for DOMDocument in system status 2015-02-13 12:47:56 -02:00
Claudio Sanches 3a85b8cf95 Fixed a typo 2015-02-13 12:44:47 -02:00
Claudio Sanches 7714901fd5 Added DOMDocument item in system status 2015-02-13 12:43:30 -02:00
Mike Jolley 2f2acc6964 Update dashboard report to show gross, after refunds 2015-02-13 13:53:03 +00:00
Mike Jolley 50322801e5 Sales by date handling for refunds
- Exclude refunds from gross/net
- Correct order counts
- Display refunded order and item count, plot after refunds
- Combine query functions for legend and main chart
2015-02-13 13:42:09 +00:00
Mike Jolley 55969390f0 Taxes by date handling for partial and full refunds 2015-02-13 13:42:09 +00:00
Mike Jolley 8f5ac9417c Taxes by code handling for partial and full refunds 2015-02-13 13:42:09 +00:00
Mike Jolley 857a78c2fc Include posts without parent in join so combinations of orders + refunds can be queried at the same time 2015-02-13 13:42:09 +00:00
Nicola Mustone ca3deba1c7 getting wrong ID 2015-02-13 11:00:41 +01:00
Mike Jolley f0d0fa9394 Auto-generation of slug when adding new attribute. 2015-02-12 23:25:10 +00:00
Mike Jolley 323faed337 Taxes by code - include refunds Closes #7397 2015-02-12 22:58:19 +00:00
Mike Jolley 0ef336d97c Change hooks used to output post columns - fixes columns after quick edit. 2015-02-12 14:26:00 +00:00
Mike Jolley 16e14914d8 Enqueue tracking js when needed only 2015-02-12 11:35:12 +00:00
Mike Jolley 1eb29d0acf Merge pull request #7386 from woothemes/tracking-duplicate-optins
Tracking duplicate optins
2015-02-12 11:30:14 +00:00
Mike Jolley 2a472e64e8 Only run the uninstaller if the "Uninstall on Delete" option is checked in system status. 2015-02-12 11:09:13 +00:00
Gerhard 1ac68adf20 Hide the tracker notice once clicked to avoid double clicks. 2015-02-12 11:41:04 +02:00
Nicola Mustone 78bd357f56 missing _e 2015-02-11 18:15:00 +01:00
Nicola Mustone 5cab9f5f2a escape & 2015-02-11 18:14:03 +01:00
Nicola Mustone 2e6b571f09 added target _blank to the Storefront read more button 2015-02-11 18:12:18 +01:00
Mike Jolley 19b6350afc Changelog code should ignore WC core 2015-02-11 11:21:31 +00:00
Mike Jolley 3a4e9c0d7f Report should include refunded status orders
Fixes #7343
2015-02-10 18:24:46 +00:00
Claudio Sanches 736ed330c8 Fixed a typo in the frontend colors notice 2015-02-10 14:08:05 -02:00
Claudio Sanches af99be8ffc Improved the tracking notice 2015-02-10 14:01:51 -02:00
Claudio Sanches edac0b00c7 Fixed the remote post and get messages in status report 2015-02-10 12:16:25 -02:00
Claudio Sanches 6ca681ce86 Added new filters to help translation plugins, closes #7338 2015-02-10 10:51:44 -02: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
shivapoudel 85976ddcfb Comment for Meta-Box Class 2015-02-08 21:32:47 +05:45
shivapoudel cdce6835f5 Comment for Disable Auto Save 2015-02-08 21:30:08 +05:45
shivapoudel 8db46ced4d Clean docblock statement for bulk messages 2015-02-08 20:30:19 +05:45
shivapoudel 7fad3e9428 Move the {post|bulk_post}_updated_messages methods to top 2015-02-08 20:27:48 +05:45
shivapoudel 99ae5c6a53 Specify custom bulk actions messages for a post type 2015-02-08 20:25:19 +05:45
shivapoudel dcdf00e06f Cleanup WC_Admin_Permalink_Settings 2015-02-04 22:12:06 +05:45
Mike Jolley 7795f69f51 Update wording to include refunds
Closes #7290
2015-02-04 15:14:02 +00:00
Mike Jolley 3154b08d3e Replace CDN select2 with local copy
Closes #7287
2015-02-04 15:00:14 +00:00
Mike Jolley 7b294c7cbf Prevent meta boxes being saved multiple times 2015-02-04 11:35:02 +00:00
Mike Jolley 4c3a58c957 Undefined product_ids_titles 2015-02-03 14:12:48 +00:00
Mike Jolley fc826de960 Dead vars in category report 2015-02-03 14:12:04 +00:00
Mike Jolley ff2b0db69b Undefined var customers 2015-02-03 14:10:03 +00:00
Mike Jolley 7acfc0b7f2 Dead var 2015-02-03 14:09:54 +00: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
Claudio Sanches 566f1ea7b6 Make possible to show log by URL
@mikejolley
2015-02-02 21:58:25 -02:00
Mike Jolley 1785d48096 Update rating text
Based on feedback from Marina and James, cc @bftrick
2015-02-02 14:53:13 +00:00
Mike Jolley d0daa1ecee Tweak reset_admin_notices to add, not remove, notices
Fixes #7254
2015-02-02 14:40:11 +00:00
Gerhard 28385b8868 Update usage tracking notice link 2015-02-02 14:40:52 +02: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
msdesign21 2e76a58385 Update html-notice-template-check.php
Would also be nice to include a direct link when we mention the System Status report. Wasn't sure the best way to do that.
2015-01-30 15:34:25 -05:00
Mike Jolley a3e323f4e0 Define vars passed to addons view 2015-01-30 14:21:49 +00:00
Mike Jolley d6ee40191c Split webhooks column_default into multiple columns 2015-01-30 13:57:45 +00:00
Claudio Sanches a87f852122 Make it easy to find all orders that use a coupon #6925 2015-01-30 11:47:32 -02:00
Mike Jolley 9f8a7d1199 Remove datepicker icon's and use focus event 2015-01-30 12:54:33 +00:00
Claudio Sanches 1a3617c55b Improved the select fields in webhooks ui 2015-01-30 10:31:43 -02:00
Bryce 171f189f70 Update URL to link to review form
Closes #7243
2015-01-30 18:26:01 +07:00
Claudio Sanches afb19715d4 Prevented XSS in urls 2015-01-29 12:33:06 -02:00
Claudio Sanches 7890095ba0 Fixed the webhooks topic saving, closes #7236 2015-01-29 11:11:35 -02:00
Claudio Sanches 7eb3ec9a4a Admin footer text improvements #7234
@BFTrick @mikejolley
2015-01-29 10:41:39 -02:00
Claudio Sanches 85adccb416 Merge pull request #7234 from BFTrick/iss-7213
Adding Please Rate Our Plugin Footer Text
2015-01-29 10:37:28 -02:00
Claudio Sanches f7e24c0b77 Fixed more typos 2015-01-29 01:31:03 -02:00
Claudio Sanches 80b70c79f1 Fixed a typo in status report 2015-01-29 00:54:46 -02:00
Patrick Rauland e7224cdc1d using wc_get_screen_ids instead of manually typing them out. see #7213 2015-01-28 17:20:38 -07:00
Patrick Rauland ee11ac6080 adding please rate our plugin footer text. closes #7213 2015-01-28 17:13:13 -07:00
Claudio Sanches 177bcbe7d5 Removed unused code 2015-01-23 16:34:43 -02:00
Claudio Sanches 560d7d24ee Fixed the tracking opt-out 2015-01-23 15:20:09 -02:00
Mike Jolley e52611bbc3 Merge branch 'master' of https://github.com/woothemes/woocommerce
Conflicts:
	includes/class-wc-tracker.php
2015-01-23 16:38:44 +00:00
Mike Jolley 5ffaf97397 Only load tracking during cron and move notices to notices class 2015-01-23 16:36:52 +00:00
Claudio Sanches a1462ccf26 Merge pull request #7198 from splashingpixels/theme-support-notice
fixed theme-support notice closes #7196
2015-01-23 14:32:51 -02:00
Claudio Sanches b1c5e19d56 Improved the system status report script 2015-01-23 14:19:06 -02:00
splashingpixels 6c61bf8c4c fixed theme-support notice closes #7196 2015-01-23 08:15:31 -08:00
Gerhard d09df4fc0f Merge branch '6711-opt-in-tracking' 2015-01-23 17:31:01 +02:00
Gerhard 8610ca6aef Merge branch 'master' into 6711-opt-in-tracking
Conflicts:
	includes/admin/class-wc-admin-status.php
2015-01-23 17:30:11 +02:00
Scrutinizer Auto-Fixer 19f660171e Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-01-23 14:37:20 +00:00
Mike Jolley 2d707689d9 Add transient cache to webhooks Closes #7184 2015-01-23 13:28:30 +00:00
Mike Jolley b289c9446c WC_INSTALLING constant - don't create options for any gateways/shipping methods during install. 2015-01-23 13:05:38 +00:00
Mike Jolley 2584041700 wc_price enhancements
- Renamed some 2.3 methods for consistency
- Allow more args to be passed to wc_price to control output
- Filter wc_price args which Closes #7188
- wc_get_price_decimal_separator function
- wc_get_price_thousand_separator function
- wc_get_price_decimals function
2015-01-23 11:50:32 +00:00
Mike Jolley 6b39849be2 Functions: wc_price_decimal_separator, wc_price_thousand_separator with defaults.
Closes #7167
2015-01-22 16:05:47 +00:00
James Koster 44fd8f69cf child theme context. closes #7173 2015-01-22 10:36:15 +00:00
Claudio Sanches ffbafbf652 Prevent errors in webhook log display 2015-01-21 14:25:33 -02:00
Mike Jolley 064f2ebe17 Fix multiple product section in coupon section. Fixes #7170 2015-01-21 14:24:39 +00:00
Claudio Sanches 5a8ecf3947 Merge pull request #7168 from woothemes/utm-links
Storefront Notice Fixes
2015-01-21 09:10:20 -02:00
Mike Jolley 59b902b50d Refactor menu_highlight 2015-01-21 11:06:55 +00:00
Gerhard d2b6673eef Add utm params to the storefront link 2015-01-21 07:33:22 +02:00
Gerhard 07d728f851 Link to storefront and not hightwind in theme search. 2015-01-21 07:25:01 +02:00
Mike Jolley 2d8f021cc7 Optimise the admin notices class.
@claudiosmweb
2015-01-20 15:23:34 +00:00
Mike Jolley 22f68af061 These should be arrays 2015-01-20 13:50:25 +00:00
Mike Jolley 5404006b29 MAP Url method 2015-01-20 13:31:02 +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 8e9539b0c2 scrutinizer issues in sales-by-category report 2015-01-20 09:53:33 +00:00
Mike Jolley 7f2a6b5e41 Fix pagination by preventing old query args from being re-added to the link
Fixes #7164
2015-01-20 09:43:56 +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
Claudio Sanches ab3553a6fd Select2 translatable, closes #7159 2015-01-19 17:31:22 -02:00
Mike Jolley f75a5d3a83 Merge pull request #7153 from helgatheviking/fix/php-notice-on-parse-query
changes tax_query to false for downloadable and virtual product filters
2015-01-19 14:51:23 +00:00
Mike Jolley 0d64e3854d Add tooltips for manual and auto refunds Closes #7117 2015-01-19 14:50:06 +00:00
Mike Jolley a9301323b5 Merge pull request #7113 from grey-rsi/master
add filters in admin reports
2015-01-19 14:05:58 +00:00
Kathy Darling 631099d6b2 changes tax_query to false for downloadable and virtual product filters. fixes #7152 2015-01-19 14:39:59 +01:00
Claudio Sanches 505501912f Fixed "PHP Notice: Undefined variable: metabox_class" error for non-taxonomy attributes 2015-01-19 11:38:47 -02:00
Mike Jolley 33e046a4d0 Use WC_Cache_Helper to expire shipping cache on setting save, and transient clear
Closes #7151
2015-01-19 13:19:44 +00:00
Nicola Mustone 47b0c4cb97 clearer coupon option description 2015-01-19 09:18:44 +01:00
Claudio Sanches bd468b7ac1 Fixed a typo 2015-01-16 10:47:29 -02: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 5612d54058 Refactor attribute save code 2015-01-15 16:32:13 +00:00
Mike Jolley 5b7d03271e Pass reference to extract 2015-01-15 16:32:13 +00:00
Mike Jolley d37e6d424a Set $loop = 0; 2015-01-15 16:32:13 +00:00
Mike Jolley a52f94fb42 $order_taxes check 2015-01-15 15:19:19 +00:00
Claudio Sanches eda9eb07d4 Fixed quick/bulk edit product weight placeholders 2015-01-15 11:47:20 -02:00
Claudio Sanches 26ea24ae4c Removed useless data-tip in webhooks save button 2015-01-15 09:44:29 -02:00
Claudio Sanches eeea3f0146 Fixed a typo in webhooks table list 2015-01-15 09:35:13 -02:00
Claudio Sanches 6ed21bb0cc Removed ilegal brackets from context/msgctxt 2015-01-15 09:22:32 -02:00
Claudio Sanches b174d7c179 Stopped error when users use the woocommerce_enqueue_styles filter in the wrong way #7104 2015-01-14 12:32:34 -02:00
Claudio Sanches b232e99034 Merge branch 'master' of github.com:woothemes/woocommerce 2015-01-14 10:17:22 -02:00
Mike Jolley e1c54687ac Minor issues with variables 2015-01-14 12:17:19 +00:00
Claudio Sanches 6b8ce0c3fd Merge branch 'master' of github.com:woothemes/woocommerce 2015-01-14 10:17:10 -02:00
Mike Jolley 206a650488 Tidy variation output 2015-01-14 12:17:09 +00:00
Claudio Sanches ebf5763fd6 Added message about WooCommerce Colors plugin, closes #7099 2015-01-14 10:17:03 -02: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
Mike Jolley d70912c891 Define: $net_order_amounts 2015-01-14 11:28:00 +00:00
Claudio Sanches 9c52a70597 Fixed webhooks status description 2015-01-13 22:09:54 -02:00
Claudio Sanches b55ecea6ba Used wp_unslash() instead of stripslashes_deep()
The WordPress documentation recommends:

"This should be used to remove slashes from data passed to core API that expects data to be unslashed. Use this instead of stripslashes_deep()."
2015-01-13 17:54:10 -02: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
Claudio Sanches 64f1f7f919 Fixed textdomains 2015-01-13 15:39:26 -02:00
Mike Jolley 04cb8c90c8 contributors 2015-01-13 16:16:01 +00:00
Mike Jolley 45b4364d90 Welcome page update Closes #7089 2015-01-13 16:12:54 +00:00
Sergey b3e9b1e6d8 add do_action in wc_price function and filters in admin reports 2015-01-13 15:34:48 +02:00
Mike Jolley 550e569a29 Tweak placement and styling of view link. #7065 2015-01-13 12:27:07 +00:00
Mike Jolley 9b8c23e2bd Merge pull request #7065 from pagelines/master
Link to find all customers orders from order page.
2015-01-13 12:16:51 +00:00
Claudio Sanches 20470db763 Add select2 to State/Country user meta fields in admin profile #6359 2015-01-12 17:15:37 -02:00
Claudio Sanches 695b04be61 Fixed conflits 2015-01-12 16:02:46 -02:00
Claudio Sanches 8e28c17c66 Merge pull request #7091 from woothemes/chosen-to-select2
Chosen to select2
2015-01-12 15:47:31 -02:00
Claudio Sanches 9a6dc0bf41 Added select2 for all settings fields 2015-01-12 15:45:47 -02:00
Claudio Sanches 017831f1c6 Fixed the backbone modal 2015-01-12 15:11:01 -02:00
Mike Jolley 2c32f6cdd0 Add functions to get money spent/order count for customers and fix in API Closes #7083 2015-01-12 17:09:46 +00:00
Mike Jolley 8110a8376b Upsells and cross sells select2 2015-01-12 16:39:49 +00:00
Mike Jolley 50c6e1e4a0 select2 settings 2015-01-12 16:29:01 +00:00
Claudio Sanches 60b23e6f6f Merge branch 'chosen-to-select2' of github.com:woothemes/woocommerce into chosen-to-select2 2015-01-12 13:48:43 -02:00
Mike Jolley 9852d9c6ec Order data JS select2 + refactor 2015-01-12 15:43:13 +00:00
Mike Jolley 2e82cbb311 Customer ajax searches 2015-01-12 13:04:19 +00:00
Mike Jolley 1fa26f1f6e Product searches select2 2015-01-12 11:56:44 +00:00
Nicola Mustone f00cd875f1 Typo 2015-01-12 12:31:42 +01:00
Claudio Sanches f3e5c03b38 Repositioned the "move to trash" and "save" buttons 2015-01-12 09:27:09 -02:00
Claudio Sanches 56c49daea8 Added empty trash action 2015-01-09 23:03:22 -02:00
Claudio Sanches 052380e191 Added webhooks search field 2015-01-09 22:41:33 -02:00
Claudio Sanches 9fa5ad756e Fixed a typo 2015-01-09 22:25:04 -02:00
Claudio Sanches 572d451aa6 Created webhooks bulk actions 2015-01-09 22:08:45 -02:00
Claudio Sanches c71869cd6e Added method to create webhooks on settings page 2015-01-09 16:21:19 -02:00
Claudio Sanches 2626275782 Edit and deleted webhooks 2015-01-09 15:42:01 -02:00
Mike Jolley 4b7f97c1de Attributes 2015-01-09 16:53:47 +00:00
Mike Jolley 5f5d8076d4 sales by cat select2 2015-01-09 16:43:35 +00:00
Mike Jolley f18b2c6c93 Added and enqueued select2 to admin 2015-01-09 16:39:10 +00:00
Simon 42c570114c Add some spaces. 2015-01-08 18:55:26 +00:00
Claudio Sanches 03193b867b Creted new webhooks edit interface 2015-01-08 16:34:30 -02:00
Simon 4003acd1e6 Link to find all customers orders from order page.
Moved to master branch as instructed.
Added check to only display if valid customer.
Removed pointless ?><?php
2015-01-08 16:57:40 +00:00
Mike Jolley 64901d82e5 Clear order transients when trashing posts. Closes #7052 2015-01-08 15:48:01 +00:00
Claudio Sanches a4dcc9261e Hide the old webhooks menu 2015-01-06 22:08:24 -02:00
Claudio Sanches baca07f9d2 Added webhooks table list views 2015-01-06 22:02:33 -02:00
Claudio Sanches 22ac725ec1 Removed not useful global vars 2015-01-06 17:39:34 -02:00
Claudio Sanches 842d26bc24 Removed old webhook post type actions 2015-01-06 17:29:49 -02:00
Claudio Sanches 3c038e613f Created initial webhooks table list in settings page 2015-01-06 17:24:32 -02:00
Mike Jolley 054d499636 Made checkout JS more modular 2015-01-06 17:49:22 +00:00
Mike Jolley 06ab96f39e Added net sales to sales by date report
Closes #7039
2015-01-06 13:27:44 +00:00
Remi Corson ecfb86a3f2 added link to docs in status report 2015-01-06 11:39:16 +01:00
Mike Jolley 5c86e962e8 Hide restock checkbox until qty is input Closes #6937 2015-01-05 17:19:18 +00:00
Mike Jolley f847b92a0f Merge branch 'wc-geolocation' 2015-01-05 10:18:25 +00:00
Mike Jolley b26ba4b9e4 Made system status export useful for English support people
Closes #7020
2015-01-03 17:45:02 +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
splashingpixels 0923d31de2 use proper label tags for generate api key setting field 2015-01-01 13:33:08 -08:00
Mike Jolley 3698eab0ae Made dashboard sales report match monthly sales report Closes #6871 2014-12-30 15:08:06 +00: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
Mike Jolley 5b31745061 Add geolocation option for default address 2014-12-23 17:33:10 +00: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
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
Bryce 75c40366bc destroy the global! 2014-12-21 22:43:38 +07:00
Bryce 41de9936fe Check we're on the correct post type before editing columns
Closes #6991
2014-12-21 12:48:30 +07: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
Rtransat d53210dfbf Fix label "for" attribute for products_categories 2014-12-19 17:15:24 +01: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 509147b105 Created webhook actions meta box 2014-12-16 20:18:06 -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
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
James Koster 0c95d76c45 Storefront banner on add-ons. closes #6923 2014-12-16 11:43:26 +00: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
Mike Jolley 8434463694 Tweak skip button to make it less clickable 2014-12-12 17:03:11 +00: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
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 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
James Koster 316b43f770 coupons. closes #6836 2014-12-09 16:06:34 +00: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 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 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 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
Nicola Mustone e59070ab01 clickable item name in orders table 2014-12-04 16:57:12 +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
Bryce 80ccc7b09d Add help tip for schedule sales info
Closes #6863
2014-12-03 13:20:24 +07: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 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
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
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
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 2cfaead676 Added numeric sort for attributes. Closes #5978 2014-11-27 14:49:02 +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 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
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 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 dbcc8430e9 Installer tweaks + unit tests closes #6356 2014-11-25 17:09:24 +00: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 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
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 8b4332a037 Refactors to shipping tax rate methods 2014-11-21 13:06:33 +00: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 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 ce1a9b84c7 Redo construct and move settings/html to separate files 2014-11-20 15:03:45 +00:00
Mike Jolley 4fd8cd63cb Split up save_tax_rates() method 2014-11-20 11:11:08 +00: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
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 74ba11c189 Removed some unused code 2014-11-19 21:36:47 -02:00
claudiosmweb 9b16425142 Fixed some coding style issues 2014-11-19 17:01:06 -02: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 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
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
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 3d4954a3e1 Some gap added intensionally ;) 2014-11-17 22:27:39 +05:45
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
shivapoudel 825d56f8ba Modified since current_user_can() returns boolean ;) 2014-11-17 20:00:01 +05:45
shivapoudel 891d3a4573 Simplify the condition for custom menu order :) 2014-11-17 15:21:47 +05:45
Bryce 71909a7c72 Update default for 'Default Product Sorting' option 2014-11-17 15:37:02 +07:00
Bryce 295fed6467 Add placeholder attribute for settings API #6764 2014-11-16 14:49:43 +07: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 9abbf4cef8 Fix coupons by date queries to prevent inflated results
Closes #6742
2014-11-13 17:25:45 +00:00
Mike Jolley 4c8a3eaba5 Merge pull request #6738 from bryceadams/master
Add script_debug $suffix for admin settings.js
2014-11-13 08:43:51 -08:00