Commit Graph

263 Commits

Author SHA1 Message Date
Aristeides Stathopoulos 9668247b95 WordPress.PHP.YodaConditions.NotYoda 2016-09-09 03:14:28 +03:00
Mike Jolley 311c540662 Merge pull request #11833 from aristath/master
Coding Standards (2nd pass)
2016-09-07 10:14:17 +01:00
Mike Jolley e4c91aef62 [2.6] Don't SUM meta
#11838
2016-09-07 10:05:17 +01:00
Mike Jolley ed2b7a9f57 [2.6] refunded_order_items should be reset per loop
#11838
2016-09-07 09:31:17 +01:00
Aristeides Stathopoulos 6ac7f03241 Generic.Formatting.DisallowMultipleStatements.SameLine 2016-09-02 06:40:52 +03:00
Aristeides Stathopoulos 2346c3b735 Squiz.ControlStructures.ControlSignature.SpaceAfterCloseBrace 2016-09-02 06:15:49 +03:00
Aristeides Stathopoulos d4e3faf014 PEAR.Functions.FunctionCallSignature.SpaceAfterOpenBracket 2016-09-02 04:51:31 +03:00
Aristeides Stathopoulos 0516e96843 PEAR.Functions.FunctionCallSignature.SpaceBeforeCloseBracket 2016-09-02 04:33:57 +03:00
Aristeides Stathopoulos fde1037757 fix failing tests. 2016-09-01 23:50:14 +03:00
Aristeides Stathopoulos fb62d280b5 WordPress.WhiteSpace.OperatorSpacing.NoSpaceBefore 2016-08-27 09:07:42 +03:00
Aristeides Stathopoulos e69fafbda7 WordPress.WhiteSpace.OperatorSpacing.NoSpaceAfter 2016-08-27 09:06:22 +03:00
Aristeides Stathopoulos 82f3cc221e WordPress.WhiteSpace.ControlStructureSpacing.NoSpaceBeforeOpenParenthesis 2016-08-27 07:23:02 +03:00
Aristeides Stathopoulos d430dabb37 Squiz.WhiteSpace.SuperfluousWhitespace.EmptyLines 2016-08-27 07:04:18 +03:00
Aristeides Stathopoulos 741f2b954a Squiz.WhiteSpace.SuperfluousWhitespace.EndLine 2016-08-27 07:01:22 +03:00
Aristeides Stathopoulos 6c30f84fa2 WordPress.Arrays.ArrayKeySpacingRestrictions.SpacesAroundArrayKeys 2016-08-27 06:23:21 +03:00
Aristeides Stathopoulos ff852038c9 WordPress.Arrays.ArrayKeySpacingRestrictions.NoSpacesAroundArrayKeys 2016-08-27 06:11:30 +03:00
Aristeides Stathopoulos 72ee94d11b WordPress.Arrays.ArrayDeclaration.SpaceBeforeComma 2016-08-27 05:46:40 +03:00
Aristeides Stathopoulos ec8a0b288b PHPCS: WordPress.Arrays.ArrayDeclaration.NoCommaAfterLast 2016-08-27 05:08:49 +03:00
Aristeides Stathopoulos b063bcfe4c last item in a multiline-array should end in a comma 2016-08-27 04:46:45 +03:00
Mike Jolley a6bb78b34a date created 2016-08-08 16:32:03 +01:00
Mike Jolley 39b4831e95 get_id 2016-08-05 15:56:23 +01:00
Mike Jolley 4de8af8a83 Merge pull request #11367 from andyexeter/master
Add NOT IN operator to WC_Admin_Report::get_order_report_data()
2016-08-02 14:22:50 +01:00
Mike Jolley 66c61eebc8 Define full path for includes
Closes #11087
2016-07-27 11:58:43 +01:00
andyexeter 043eecedc5 Add NOT IN operator to WC_Admin_Report::get_order_report_data() 2016-07-06 00:15:39 +01:00
Mike Jolley 847dea6a2d docs/vars 2016-06-07 14:02:02 +01:00
Mike Jolley f8db1c403f Type casting and docs 2016-06-07 11:22:36 +01:00
Mike Jolley 8ef3957ad1 Var checks 2016-06-06 19:15:40 +01:00
Mike Jolley d4d6f3181c Best practice tweaks 2016-06-06 17:24:31 +01:00
Manos Psychogyiopoulos 410c09d6b0 add 'woocommerce_admin_stock_html' filter 2016-06-01 15:06:10 +03:00
Mike Jolley c82e177fd3 Fix coupon total replacement
Fixes #10618
2016-03-30 12:56:53 +01:00
Justin Silver ef3a5b97ef Merge remote-tracking branch 'upstream/master' 2016-03-15 13:51:49 -07:00
Justin Silver 4dec4832e1 Fix highlight series ID for coupons line from legend 2016-03-15 13:50:01 -07:00
Mike Jolley c10b861f80 Merge pull request #10558 from doublesharp/master
Add 'woocommerce_admin_report_data' and 'woocommerce_admin_report_chart_data' to filter chart data by 3rd parties
2016-03-15 12:22:18 +00:00
Justin Silver ffdfe816ec Add ‘woocommerce_admin_report_data’ to filter chart data by 3rd parties
Refactor get_main_chart() to use an array of data so that it to can be
filtered
Add ‘woocommerce_admin_report_chart_data’ to filter chart data by
period (for display)
2016-03-14 19:30:49 -07:00
Mike Jolley c1e8dd1fe8 Use wc_get_orders iternally 2016-03-09 16:11:05 +00:00
Mike Jolley d3f98dce03 More advanced customer filter
#10500
2016-03-09 14:50:34 +00:00
Mike Jolley a1cce4a1b2 Issues from Justin 2016-03-04 10:53:48 +00:00
Mike Jolley 6880a71ea9 Merge pull request #10141 from woothemes/fix-10135
Fix 10135
2016-02-12 13:37:53 +00:00
Mike Jolley 5cae61cb69 Show net sales on dashboard
Closes #9948
2016-02-08 11:28:40 +00:00
Mike Jolley f5140af918 [2.5] Report on partial refunds/refunds items rather than full refunds to ensure they are reported when refunded
@claudiosmweb your testing + approval welcome.

Closes #10138
2016-01-22 17:53:12 +00:00
Mike Jolley 77e1aa8263 Make qty for refunds negative
Fixes order counts reported in #10135

May however require an upgrade routine and needs more testing. Not for
2.5.

Fixes #10135
2016-01-22 16:28:29 +00:00
Mike Jolley 6cc700a497 [2.5] Report on partial refunds/refunds items rather than full refunds to ensure they are reported when refunded
@claudiosmweb your testing + approval welcome.

Closes #10138
2016-01-22 15:50:23 +00:00
Fredrik Forsmo c7ab50ec7e Add missing param tags to various wc admin docblocks 2016-01-05 16:49:41 +01:00
Mike Jolley ade2b04ab3 Merge pull request #9960 from frozzare/docs/class-wc-report-stock
Improve docblock comments in WC_Report_Stock class
2016-01-05 12:15:34 +00:00
Mike Jolley 12bf6c5355 Merge pull request #9959 from frozzare/docs/class-wc-report-sales-by-category
Improve docblock comments in WC_Report_Sales_By_Category class
2016-01-05 12:15:21 +00:00
Mike Jolley a8f8802631 Merge pull request #9958 from frozzare/docs/class-wc-report-sales-by-date
Improve docblock comments in WC_Report_Sales_By_Date class
2016-01-05 12:14:01 +00:00
Mike Jolley 6ee8727ff6 Merge pull request #9957 from frozzare/docs/class-wc-report-sales-by-product
Improve docblock comments in WC_Report_Sales_By_Product class
2016-01-05 12:13:13 +00:00
Mike Jolley cc1232e126 Merge pull request #9956 from frozzare/docs/class-wc-report-out-of-stock
Improve docblock comments in WC_Report_Out_Of_Stock class
2016-01-05 12:12:38 +00:00
Mike Jolley c564a05ac3 Merge pull request #9954 from frozzare/docs/class-wc-report-customers
Improve docblock comments in WC_Report_Customers class
2016-01-05 12:12:18 +00:00
Mike Jolley 80eb99526d Merge pull request #9955 from frozzare/docs/class-wc-report-most-stocked
Improve docblock comments in WC_Report_Most_Stocked class
2016-01-05 12:11:46 +00:00
Fredrik Forsmo 67308a3131 Add missing `exit if accessed directly` to WC_Report_Taxes_* classes 2016-01-05 12:47:44 +01:00
Fredrik Forsmo a9b4cc2caf Improve docblock comments in WC_Report_Stock class
* Added comments to properties that don’t have any.
* Added comment to `__construct`, `column_default`, `get_columns` and
`prepare_items` since it
was `method function`
* Added missing param tags to `display_tablenav`
2016-01-05 12:46:15 +01:00
Fredrik Forsmo 53d5684c92 Improve docblock comments in WC_Report_Sales_By_Product class
* Added comments to properties that don’t have any.
* Added comment to `get_chart_widgets` since it
was `method function`
* Added missing `exit if accessed directly`
* Updated `current_filters` and `products_widget`
2016-01-05 12:41:12 +01:00
Fredrik Forsmo 0b62c624fa Improve docblock comments in WC_Report_Sales_By_Date class
* Added comments to properties that don’t have any.
* Fixed return tag value for `get_report_data`
2016-01-05 12:28:49 +01:00
Fredrik Forsmo 03a3e4f06d Improve docblock comments in WC_Report_Sales_By_Category class
* Added comments to properties that don’t have any.
* Added comment to `get_chart_widgets` since it
was `method function`
* Added missing `exit if accessed directly`
* Updated `category_widget` comment to a better one.
2016-01-05 12:18:58 +01:00
Fredrik Forsmo a59e110895 Improve docblock comments in WC_Report_Out_Of_Stock class
* Added missing param tags to `get_items`
2016-01-05 11:52:38 +01:00
Fredrik Forsmo c88119814c Improve docblock comments in WC_Report_Most_Stocked class
* Added missing param tags to `get_items`
2016-01-05 11:37:33 +01:00
Mike Jolley e07185ec1f Merge pull request #9952 from frozzare/docs/class-wc-report-low-in-stock
Add missing docblock param tags to get_items in WC_Report_Low_In_Stock class
2016-01-05 10:17:13 +00:00
Mike Jolley a24df3aa61 Merge pull request #9949 from frozzare/docs/class-wc-report-coupon-usage
Improve docblock comments in WC_Report_Coupon_Usage class
2016-01-05 10:17:03 +00:00
Mike Jolley 8231853f70 Merge pull request #9950 from frozzare/docs/class-wc-admin-report
Improve docblock comments in WC_Admin_Report class
2016-01-05 10:16:49 +00:00
Fredrik Forsmo b589d22a84 Improve docblock comments in WC_Report_Customers class
* Added comments to properties that don’t have any.
* Added comment to `get_chart_widgets`, `customers_vs_guests` since it
was `method function`
* Added missing `exit if accessed directly`
* Updated `get_main_chart` comment since it is wrong.
2016-01-05 11:11:20 +01:00
Fredrik Forsmo c0be061de6 Add missing docblock param tags to WC_Report_Low_In_Stock class 2016-01-05 11:08:12 +01:00
Fredrik Forsmo 130ff76ffc Improve docblock comments in WC_Report_Customer_List class
* Added missing `public` before `column_default` function
* Added comment to `__construct `, `column_default`, `get_columns` and
`prepare_items` since it was `method function`
2016-01-05 10:00:52 +01:00
Fredrik Forsmo e0f5117efe Improve docblock comments in WC_Report_Coupon_Usage class
* Added comments to properties that don’t have any.
* Added comment to `get_chart_widgets` since it was `method function`
* Updated `coupons_widget` comment since it is wrong.
* Added missing `exit if accessed directly`
2016-01-05 09:54:43 +01:00
Fredrik Forsmo 004ab615c5 Improve phpdoc comments in WC_Admin_Report class
* Added comments to properties that don’t have any.
* Fixed return value for `prepare_chart_data`.
* Added comment to `get_chart_widgets` since it was `method function`
2016-01-05 09:48:39 +01:00
Mike Jolley 4f0cc137cc Enable SQL_BIG_SELECTS in reports
@claudiosmweb
2015-11-05 15:45:19 +00:00
Claudio Sanches 5893875b0c Removed period for file headers 2015-11-03 11:53:50 -02:00
Claudio Sanches ee30b5b308 Fixed php docs standards 2015-11-03 11:31:20 -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
Mike Jolley 4fd987c165 Merge pull request #9266 from woothemes/issues/9125-report-does-not-match-with-chart
[2.4] Fixed wrong gross sales calculation on sales by date report.
2015-10-05 09:17:59 +01:00
Akeda Bagus dc0d5362cd Fixed wrong gross sales calculation on sales by date report.
The order amounts should exclude refunds.

Fixes #9125.
2015-10-02 11:08:41 +02:00
Mike Jolley 96103724dc Display 2 averages on report
Closes #9144
2015-10-02 10:42:48 +02:00
Florian Ludwig 7d2d102dc4 Fixed wrong highlighting of reports chart
The highlight data attributes were totally messed up - Fixed them
according to the current sorting of the graph series
2015-09-20 18:12:31 +02:00
Nicola Mustone 6f7b534493 missing comma 2015-08-24 17:27:23 +02:00
Nicola Mustone beb97b279e _x for refund reports 2015-08-24 17:13:04 +02: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
Mike Jolley 622dc777f0 Correct number format in coupon total 2015-07-30 12:52:52 +01:00
Mike Jolley 7d1a016502 Adjust sales report to deal with partial shipping refunds and full refunds 2015-07-01 12:11:21 +01:00
Mike Jolley 5cac639cff Merge branch 'improve-refund-reporting' Closes #8028
Conflicts:
	includes/admin/reports/class-wc-report-sales-by-date.php
	includes/updates/woocommerce-update-2.4.php
2015-05-28 14:41:20 +01:00
Mike Jolley d1d5a489fc [2.3] Fix round_chart_totals to deal with arrays
Closes #8077
2015-05-05 13:55:56 +01:00
Nicola Mustone 3288997f72 fix coupons amount 2015-05-04 17:19:34 +02:00
Mike Jolley 6c8cc42876 Revise reports #8028 2015-04-24 15:58:13 +01:00
Mike Jolley 4ab4865ac6 [2.3] Fix stock report pagination. Closes #8023 2015-04-24 12:01:49 +01:00
Mike Jolley a2a0e6f10d [2.3] Refund reporting Fixes #8010
- Prevents the refund amount being SUMed and multiplied by the number
of items
- Does LEFT join on qty, so refunds are reported if not done directly
on the line
2015-04-23 10:19:43 +01:00
Mike Jolley 38f8c5fd0b Round values in category report
Closes #7949
2015-04-14 10:51:20 +01:00
Mike Jolley 204c65ca6a Merge pull request #7836 from aelia-co/master
Added support for JOIN types in WC_Admin_Report
2015-04-08 12:11:04 +01:00
Nicola Mustone 85fd634861 fix scrutinizer issues 2015-04-01 15:33:56 +02:00
Mike Jolley 20850bc742 Fix last_month logic which breaks in feb 2015-03-31 13:13:16 +01:00
Diego Zanella 76a0ef1e9f Improved handling of JOIN clauses
* Refactored report logic to allow developers to specify the type of JOIN to use when fetching report data. Ref https://github.com/woothemes/woocommerce/issues/7818.
2015-03-27 17:02:14 +00:00
Mike Jolley ba582c307b Dashboard - use same query as reports Closes #7529 2015-02-24 12:18:56 +00:00
Mike Jolley 321d38be0a Round report values.
Closes #7505
2015-02-20 12:27:55 +00: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
Mike Jolley f5e73d792d Fix error when no product is chosen for report.
Fixes #7427
2015-02-16 11:53:37 +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
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