Commit Graph

68 Commits

Author SHA1 Message Date
Joshua T Flowers 5d3c771d45 Trigger sync_order on order stats table when refunding (https://github.com/woocommerce/woocommerce-admin/pull/990) 2018-12-05 10:10:22 +08:00
Joshua T Flowers 755b9c94f7 Reduce order table net revenue by refund total (https://github.com/woocommerce/woocommerce-admin/pull/988)
* Reduce order table net revenue by refund total

* Use order utils to get refund total
2018-12-05 10:06:00 +08:00
Peter Fabian 1c8459244a Merge branch 'master' into fix/749
# Conflicts:
#	includes/data-stores/class-wc-admin-reports-products-data-store.php
2018-12-04 12:07:43 +01:00
Peter Fabian 670801cee8 Merge pull request woocommerce/woocommerce-admin#978 from woocommerce/fix/PHP52-compat
Fixed PHP 5.2 compatibility
2018-12-04 12:00:37 +01:00
Paul Sealock bf0e025b05 REST API: isolate extened info in /reports/products 2018-12-04 13:01:36 +13:00
Peter Fabian 15b4681d30 Updated refactored function call from variations data store. 2018-12-03 20:14:05 +01:00
Peter Fabian ef0f11182a Added missing function parameter. 2018-12-03 20:07:44 +01:00
Peter Fabian e297e5ba7f Fixed TABLE_NAME references.
To be compatible with PHP 5.2.
2018-12-03 18:01:50 +01:00
Peter Fabian 1acb9827e7 Merge branch 'master' into fix/749
# Conflicts:
#	includes/data-stores/class-wc-admin-reports-products-data-store.php
2018-12-03 16:21:04 +01:00
Peter Fabian b8dff97e00 Fixed PHP 5.2 compatibility. 2018-12-03 14:44:43 +01:00
Peter Fabian 6e68247701 Merge pull request woocommerce/woocommerce-admin#953 from woocommerce/fix/740
Added support for ordering by product name in products endpoint.
2018-12-03 11:56:28 +01:00
Paul Sealock 516062975b try/variations-endpoint 2018-12-03 12:02:58 +13:00
Paul Sealock 164a67144b try/variations-endpoint 2018-12-03 11:49:37 +13:00
Peter Fabian 8b80de9bc2 Added support for ordering by product name in products endpoint. 2018-11-28 15:14:34 +01:00
Peter Fabian e6cca3c083 Replaced code_includes/_excludes with coupon_* as agreed. 2018-11-28 10:53:11 +01:00
Peter Fabian eff3a97573 Added time clause to WHERE subquery and fixed product selection. 2018-11-27 21:41:52 +01:00
Peter Fabian bc29615454 Removed unnecessary SQL conditions. 2018-11-27 21:40:13 +01:00
Peter Fabian c1af1da752 Updated structure of SQL queries for coupons and products.
As there can be multiple couopns and products assigned to one order, it requires different handling to what was initially implemented.
2018-11-27 16:34:12 +01:00
Peter Fabian 8e5709ce26 Updated get_unique_products to be more versatile and support running in other contexts.
In some cases of advanced filters, it produced incorrect SQL code.
Additionally, split of where clause to time clause and rest needed to be reflected here, too.
2018-11-27 16:32:42 +01:00
Peter Fabian 32e30ac274 Made sync of order stats table run also on clean_post_cache.
Otherwise, some changes in master data for orders would not be reflected, as save_post action is skipped if order is updated while the save_post action is running.
2018-11-27 16:29:21 +01:00
Peter Fabian 216b7c94ca Updated structure for includes/excludes coupons and products subqueries.
As there can be multiple coupons and products assigned to one order, it needs to ba handled differently when constructing SQL query.
2018-11-27 16:26:50 +01:00
Peter Fabian 7dd611f4d4 Added table name to time period sql params.
Without this, the subquery could not be used in some contexts, as the column name was ambiguous.
2018-11-27 16:23:40 +01:00
Peter Fabian db9d6e03e7 Added spaces around operator. 2018-11-16 18:22:40 +01:00
Peter Fabian c1cf221773 Fixed typos. 2018-11-16 18:02:19 +01:00
Peter Fabian 26debd77c3 WIP on advanced filters.
Plus fixing bugs:
- fixed tests
- fixed schema definition to reflect response data
- split WHERE SQL clause into time constraints and rest
2018-11-16 17:51:33 +01:00
Peter Fabian 46923de3d2 Removed superfluous unsets. 2018-11-16 12:37:15 +01:00
Peter Fabian 7c6d0dc314 Handled case where match parameter is missing. 2018-11-16 12:32:13 +01:00
Peter Fabian ea766b83ca Renamed method to better reflect its purpose.
Plus added conversion of count as string to integer.
2018-11-16 12:30:00 +01:00
Peter Fabian 16d5265aed Merge branch 'master' into fix/749 2018-11-16 12:16:50 +01:00
Peter Fabian ba09fea35d Updated filters subqueries to correctly handle no filter case. 2018-11-16 12:12:47 +01:00
Peter Fabian 723ac1e506 Added defaults for new params to Data Store. 2018-11-15 19:01:52 +01:00
Peter Fabian d009deb3e1 Added initial implementation of advanced filters. 2018-11-15 15:27:19 +01:00
Allen Snook 9246ab6ef4 Correct merge of class-wc-admin-reports-data-store 2018-11-07 07:25:17 -05:00
Allen Snook 962bb73288 Remove temporary comments on reports data store 2018-11-07 07:22:53 -05:00
Allen Snook 24c80427fc Fix a bug in the notes updater; better handle test case where
note expiration/expired date changes at woocommerce.com causing
an expired note to become an expiring note (corner case)
2018-11-07 07:21:23 -05:00
Joshua T Flowers 0f45a08f20 Update order summary in Orders report (https://github.com/woocommerce/woocommerce-admin/pull/613)
* Move TableSummary below pagination

* Add summary to order table

* Add new and returning customers

* Add product to totals in API

* Use get_var instead of get_results for unique products

* Change table summary styling

Remove slashes and increase padding between items based on discussion with @LevinMedia

Change margin to padding to overlap table shadow when pagination is not present.

* Fix wp_posts prefix and move to separate fxn

* Change new/returning customer column types to intval

* Add new/returning customer data to tests and fix formatting
2018-10-31 14:09:38 -05:00
Kelly Dwan f62537fc17 Try: Add Lerna to split out utility packages (https://github.com/woocommerce/woocommerce-admin/pull/678)
* Add lerna & GB package-building script

* Move currency library to lerna module

* Update lerna config

* Add publish commands

* Add currency as an faux-external module

* Add separate command to build just core files

* Update dependency path

* Update build script to build all packages into `dist`

* Add packages to the jest test setup

* Move date library to packages

* Update imports to use @woocommerce/date

* Output wcSettings definition before any scripts are output

Fixes issues where wc-dates lib relies on settings object

* Add the build step into travis

* Update jest config to dynamically get package paths

* Update package postcss config to match wc-admin’s main config

* Add combined watch scripts for package+app, add a `clean` command to clean up old build files

* Ignore PHPCS error (leave todo message to fix)

* Concat files with a space, fix issue where all files join in one continuous string and fail the check
2018-10-30 14:57:48 -04:00
Peter Fabian bfb6f246f0 Return correct object for REST products controller. (https://github.com/woocommerce/woocommerce-admin/pull/710) 2018-10-30 11:06:23 -07:00
Peter Fabian 3d71ec9208 Simplified compound expression to fix code for older PHP versions. 2018-10-26 14:02:53 +02:00
Jonathan Belcher 46c369afb1 Fixes lints in class-wc-admin-reports-data-store (https://github.com/woocommerce/woocommerce-admin/pull/643)
* Fixes lints in class-wc-admin-reports-data-store

* Fix documentation
2018-10-23 13:55:03 -04:00
Allen Snook bf898e642b Merge pull request woocommerce/woocommerce-admin#566 from woocommerce/add/admin-notices-new-sales-record
Activity Panel: Inbox: New Sales Record Note
2018-10-22 09:26:13 -07:00
Jonathan Belcher ecb3013fd3 Uses PHPBCF to autofix warnings and errors (https://github.com/woocommerce/woocommerce-admin/pull/611) 2018-10-22 12:20:14 -04:00
Allen Snook a46d83aea3 Rewrite the queries a bit to leverage prepare when possible 2018-10-19 15:48:38 -07:00
Allen Snook bb14dcd995 One argument per line in multi argument calls 2018-10-19 15:05:40 -07:00
Allen Snook 04b33f9e6b Hook up the remainder of the sales record message. There can only be one. 2018-10-19 14:45:03 -07:00
Allen Snook 3155d5ec24 Merge pull request woocommerce/woocommerce-admin#507 from woocommerce/add/admin-notices-rest-api
Activity Panel: Inbox: Add REST API (GETters only)
2018-10-19 08:04:46 -07:00
Jonathan Belcher f6d90821af Fix phpcs errors 2018-10-17 12:51:48 -04:00
Jonathan Belcher d800054c1e Merge branch 'master' into fix/474 2018-10-17 12:42:03 -04:00
Allen Snook 2a94177f71 Fix per_page default handling, json encoding options, schema help 2018-10-16 12:49:01 -07:00
Allen Snook 054fbb4ee3 Accept page and per page params in REST query, return total count of notes in header 2018-10-16 12:49:01 -07:00