Commit Graph

57 Commits

Author SHA1 Message Date
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 82f3cc221e WordPress.WhiteSpace.ControlStructureSpacing.NoSpaceBeforeOpenParenthesis 2016-08-27 07:23:02 +03:00
Aristeides Stathopoulos 741f2b954a Squiz.WhiteSpace.SuperfluousWhitespace.EndLine 2016-08-27 07:01:22 +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
Justin Silver 4dec4832e1 Fix highlight series ID for coupons line from legend 2016-03-15 13:50:01 -07: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 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 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
Claudio Sanches 5893875b0c Removed period for file headers 2015-11-03 11:53:50 -02:00
Claudio Sanches efa19f799d Fixed some coding standards for docblocks 2015-11-03 10:28:01 -02:00
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 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 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 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 7795f69f51 Update wording to include refunds
Closes #7290
2015-02-04 15:14:02 +00:00
Mike Jolley 22f68af061 These should be arrays 2015-01-20 13:50:25 +00:00
Mike Jolley d70912c891 Define: $net_order_amounts 2015-01-14 11:28:00 +00:00
Mike Jolley 06ab96f39e Added net sales to sales by date report
Closes #7039
2015-01-06 13:27:44 +00:00
Mike Jolley 3a927d62dd Add tip to reports
Closes #5729
2014-11-24 15:18:41 +00:00
Mike Jolley c01bc63020 Correct report handling for full and partial refunds.
Fixes #6530

@claudiosmweb look good?
2014-10-14 16:39:57 +01:00
Mike Jolley 728086d175 Merge pull request #6324 from SiR-DanieL/reports-currency
Fixing currency position in reports
2014-10-09 12:39:20 +01:00
Mike Jolley 700369c386 Refund report changes
1. Ensure refund order_total is negative and reflects the full amount,
not just line items
2. Ensure transients are cleared when doing refunds
3. sales-reports order types so we can exclude refunds from pure
‘sales’ reporting
4. Tweak placement of refunds in legend.

Closes #6411
2014-10-06 13:39:53 +01:00
Chuck Mac ec83e932ed Adding refunds to Sales by Date report
Create a new axis for "in refunds" on the sales by date report.  Include
the refunds in the included time period.  Refunds do not reduce the sales
total in the report.
2014-10-01 23:35:34 -04:00
Nicola Mustone 8a7ed9a053 Fixing currency position in reports 2014-09-19 09:23:58 +02:00
Mike Jolley 6dd8b11762 Fixed minor XSS issue on reports screens by escaping and sanitizing 'range' GET variable. 2014-09-16 10:33:47 +01:00
Tamara Zuk 0ab6b44bfa Coding Standards: Admin - Reports
* 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`
* improved readability

@see http://make.wordpress.org/core/handbook/coding-standards/php/
2014-08-31 03:19:13 -04:00
Mike Jolley 873f36ca5c Pass order_types to reporting query functions 2014-07-24 15:55:06 +01:00