Commit Graph

1576 Commits

Author SHA1 Message Date
Albert Juhé Lluveras 0cda85b997 Add missing thousands separator in charts Y-axis (https://github.com/woocommerce/woocommerce-admin/pull/1312) 2019-01-17 10:18:28 +01:00
Jeff Stieler 6ed8ea117a Refactor formatCurrency() to use store settings for formatting rather than store locale. 2019-01-17 00:04:57 -07:00
Jeff Stieler ddae6d3955 Add currency symbol to orders endpoint response. 2019-01-17 00:01:09 -07:00
Joshua T Flowers da22cbdc9d Update returning customer data to use customer ID (https://github.com/woocommerce/woocommerce-admin/pull/1180)
* Change check for returning customers to check customer_id

* Count distinct returning and new customers in totals

* Fix priority action misplacement and order date timestamp

* Change expected num returning/new customers to fix failing tests

Previously these included references to number of returning vs new orders.  Update to refer to the newly updated customer count.

* Use new get_customer_id_by_user_id() to get customer ID

* Fix 0 returning customers expectation

* Move returning customer function to order stats data store

* Sync order stats on order delete

* Change date compare for is_returning_customer

* Add test case for returning customer order

* Add references to  instead of 2
2019-01-17 10:47:30 +08:00
Jeff Stieler 858ec82e8c Rework numberFormat() to maintain decimal precision by default. 2019-01-16 18:41:15 -07:00
Paul Sealock d214e229ae refactor timeStampFilterDates 2019-01-17 13:57:11 +13:00
Paul Sealock af98c7dd91 better tests 2019-01-17 13:35:20 +13:00
Jeff Stieler 4bf7a79a84 Add price format, decimal separator, and thousand separator to currency settings object. 2019-01-16 17:32:48 -07:00
Jeff Stieler 78e1be139f Refactor numberFormat() to use the store settings for precision, decimal separator, and thousand separator. 2019-01-16 17:32:12 -07:00
Paul Sealock 41c30c7506 Filters: make 1/4 width for wiiiiiiide screens 2019-01-17 12:21:45 +13:00
Paul Sealock c866d1e1e2 Customers Report: remove extended data call 2019-01-17 10:10:23 +13:00
Paul Sealock aaceb781fd tests 2019-01-17 09:37:43 +13:00
Paul Sealock b3d7e96a00 jsDoc 2019-01-17 09:08:04 +13:00
Paul Sealock 4cd803466a updateFilter 2019-01-17 08:57:41 +13:00
Jeff Stieler 149ee08f4b Include all users in customer lookup table generation. 2019-01-16 10:20:11 -07:00
Jeff Stieler c0e6a097fd Fix orders report test. 2019-01-16 09:45:52 -07:00
Jeff Stieler 11cb74cccd Fix variable name nitpick. 2019-01-16 09:45:52 -07:00
Jeff Stieler a2f94c11ba Add coupons and taxes lookup table generation to reports rebuild. 2019-01-16 09:45:51 -07:00
Jeff Stieler 84732137bc Bail out of creating batches for customers and orders if there are none. 2019-01-16 09:45:51 -07:00
Jeff Stieler ffe11650a8 Remove now-defunct order stats background process. 2019-01-16 09:45:50 -07:00
Jeff Stieler 763cc972a7 Regenerate all reports from rebuild stats endpoint. 2019-01-16 09:45:04 -07:00
Jeff Stieler 5c6174066e Add tests for report regeneration batch queuing methods. 2019-01-16 09:45:04 -07:00
Jeff Stieler 1a5af7094d Add WC_Action_Queue test helper class.
The test helper allows inspection of the action queue.
2019-01-16 09:45:04 -07:00
Jeff Stieler 4786938bdf Fix customers report tests. 2019-01-16 09:45:03 -07:00
Jeff Stieler 6eca20c5fd Reports regenerate: add mechanism to queue an action after another completes - use to queue orders lookup init after customers lookup. 2019-01-16 09:45:03 -07:00
Jeff Stieler 4740f93985 Reports regenerate: use queue to update order stats and products lookup table. 2019-01-16 09:45:02 -07:00
Jeff Stieler 3b9a4ef4a1 Report regeneration: allow batch sizes to differ between actions. 2019-01-16 09:45:02 -07:00
Jeff Stieler fabc1dc70b Reports regenerate: use queue to update customers lookup table. 2019-01-16 09:45:02 -07:00
Jeff Stieler c361119a0d Report table generation: add method for enqueuing a large number of batch jobs with a limited batch size. 2019-01-16 09:45:01 -07:00
Timmy Crawford d45f31c389 Update packages docs (https://github.com/woocommerce/woocommerce-admin/pull/1324) 2019-01-16 08:39:37 -08:00
Timmy Crawford 0cb75629de Release v0.5.0 (https://github.com/woocommerce/woocommerce-admin/pull/1319)
* Release 0.5.0

* Updates from release build.
2019-01-16 08:24:45 -08:00
renovate[bot] e6dd023fc8 Update dependency recast to v0.16.2 (https://github.com/woocommerce/woocommerce-admin/pull/1318) 2019-01-16 13:13:44 +01:00
renovate[bot] f3c61d4121 Update dependency eslint-plugin-jest to v22.1.3 (https://github.com/woocommerce/woocommerce-admin/pull/1317) 2019-01-16 13:01:02 +01:00
renovate[bot] 65c2a01213 Update dependency dompurify to v1.0.9 (https://github.com/woocommerce/woocommerce-admin/pull/1315) 2019-01-16 12:58:54 +01:00
renovate[bot] 78cfaec287 Update dependency core-js to v2.6.2 (https://github.com/woocommerce/woocommerce-admin/pull/1314) 2019-01-16 12:57:08 +01:00
renovate[bot] f8c6d949e4 Pin dependency node-watch to 0.6.0 (https://github.com/woocommerce/woocommerce-admin/pull/1313) 2019-01-16 12:55:13 +01:00
Peter Fabian 05c7670090 Merge branch 'master' into fix/1035
# Conflicts:
#	includes/class-wc-admin-reports-interval.php
#	includes/data-stores/class-wc-admin-reports-data-store.php
#	includes/data-stores/class-wc-admin-reports-products-data-store.php
2019-01-16 12:51:23 +01:00
Joshua T Flowers 33a7cfa1b0 Store all order statuses (https://github.com/woocommerce/woocommerce-admin/pull/1285)
* Store all orders regardless of status in wc_order_stats

* Only query select statuses if status_is or status_is_not is not set

* Fix order stats example query

* Filter category store by default order statuses

* Add table_name to interval functions to avoid ambiguity

* Filter coupon store by default order statuses

* Fix interval stats by adding table_name to interval function

* Filter products store by default order statuses

* Remove unused order_status in coupons data store

* Store products with any order status

* Fix ambiguous order by call in products data store

* Apply status filter after other filters to avoid logical OR matching

* Store all coupon data regardless of order status

* Filter taxes by default order statuses

* Filter customer stats by default order status

* Filter default order statuses in variations data store

* Use excluded statuses to filter reports by default

* DRY up default excluded statuses query

* Fix up new orders data store after rebase
2019-01-16 10:23:00 +08:00
Albert Juhé Lluveras 1001dd0601 Fix watch package files in Linux (https://github.com/woocommerce/woocommerce-admin/pull/1301) 2019-01-15 19:40:13 +01:00
Albert Juhé Lluveras de4309d61e Remove `barfocus` elements from charts (https://github.com/woocommerce/woocommerce-admin/pull/1311)
* Remove barfocus elements from charts

* Render background color behind bars

* Rename barmouse to barfocus
2019-01-15 19:40:02 +01:00
renovate[bot] a5cfc072c2 Pin dependency mini-css-extract-plugin to 0.5.0 (https://github.com/woocommerce/woocommerce-admin/pull/1309) 2019-01-15 12:09:07 +01:00
Albert Juhé Lluveras 8b341f0981 Replace 'extract-text-webpack-plugin' with 'mini-css-extract-plugin' (https://github.com/woocommerce/woocommerce-admin/pull/1299) 2019-01-15 11:55:54 +01:00
Peter Fabian 29f07f8c57 Re-enable temporarily disabled tests. 2019-01-15 11:51:43 +01:00
Peter Fabian 5ba443fca8 Updated data store used in test to reflect the rename of class. 2019-01-15 11:50:53 +01:00
Peter Fabian c324157483 Merge branch 'master' into fix/1035
# Conflicts:
#	includes/data-stores/class-wc-admin-reports-orders-data-store.php
#	includes/data-stores/class-wc-admin-reports-orders-stats-data-store.php
2019-01-15 11:39:39 +01:00
Peter Fabian 2fc9de0bb0 Preparation for merge of a moved file. 2019-01-15 11:36:56 +01:00
Peter Fabian f84efa3a58 Added test for segmenting /orders/stats by product. 2019-01-15 11:16:31 +01:00
Peter Fabian d067c2148d Added sorting of segments so that they have predictable order. 2019-01-15 11:13:43 +01:00
Peter Fabian ea2d5bfe35 Removed double refund subtracting. 2019-01-15 11:11:58 +01:00
Peter Fabian 93b331243b Corrected JSON response in case no fields are selected in $query_params. 2019-01-15 11:11:14 +01:00
Peter Fabian b593163dff Added more general function for sorting array of arrays based on subarray's key. 2019-01-15 11:08:23 +01:00
Paul Sealock 7b11e40981 timeStampFilterDates 2019-01-15 15:40:12 +13:00
Joshua T Flowers ee19308254 Add initial state hydration for user data (https://github.com/woocommerce/woocommerce-admin/pull/1297)
* Hydrate initial state through localized script

* Parse user meta for default rows as integer

* Change eslint ignore to undef only

* Add currentUserData to wcSettings
2019-01-15 10:24:06 +08:00
Joshua T Flowers 4b3df7732b Add showMenu prop to TableCard to hide ellipsis menu (https://github.com/woocommerce/woocommerce-admin/pull/1296)
* Add showMenu prop to TableCard to hide ellipsis menu

* Fix proptype description
2019-01-15 10:13:15 +08:00
Paul Sealock 01cf0eba2f specify before on construct 2019-01-15 15:01:38 +13:00
Joshua T Flowers 14f8f08edf Add v4 orders endpoint (https://github.com/woocommerce/woocommerce-admin/pull/1246)
* Rename orders controllers and data store to order stats

* Add orders data store and controller

* Add coupon, product, and status filters

* Add customer type query filter

* Add extended info for products and categories

* Bump API namespace to v4

* Add missing schema properties

* Set default customer_type and extended_info params

* Add orders endpoint tests

* Only use one JOIN if both excluded and included queries are used

* Optimize query calls to get product and category data

* Split product and category fetch and limit to product_cat taxonomy
2019-01-15 09:53:02 +08:00
Paul Sealock 66b76f5b8f replaceFilter 2019-01-15 13:47:07 +13:00
Paul Sealock 7556b45eab Advanced Filters: Dates, fix query formats 2019-01-15 13:02:24 +13:00
Paul Sealock 1fa45e4364 Merge pull request woocommerce/woocommerce-admin#1146 from woocommerce/add/date-filter-calendar
Advanced Filters: Add DatePicker
2019-01-15 09:43:10 +13:00
Paul Sealock 64d52b0d2f Merge pull request woocommerce/woocommerce-admin#1233 from woocommerce/fix/devDocs-filePath
Fix/dev docs file path
2019-01-15 09:42:24 +13:00
Justin Shreve a3ccfd300e Fix date formatting in safari by switching to moment (https://github.com/woocommerce/woocommerce-admin/pull/1290) 2019-01-14 11:29:46 -05:00
Peter Fabian 13ec8e2851 FOrmula for shipping distribution among line items updated to reflect qty, so that sum of shipping per line item equals total shipping amount. 2019-01-14 16:10:13 +01:00
renovate[bot] 81b28d7b19 Update dependency eslint-plugin-react to v7.12.3 (https://github.com/woocommerce/woocommerce-admin/pull/1261) 2019-01-14 12:52:16 +01:00
renovate[bot] af91eacacb Lock file maintenance (https://github.com/woocommerce/woocommerce-admin/pull/1242) 2019-01-14 12:08:06 +01:00
renovate[bot] 2cd434c676 Update dependency chalk to v2.4.2 (https://github.com/woocommerce/woocommerce-admin/pull/1258) 2019-01-14 11:47:28 +01:00
renovate[bot] 0f25d33fcc Update dependency babel-loader to v8.0.5 (https://github.com/woocommerce/woocommerce-admin/pull/1257) 2019-01-14 11:45:23 +01:00
renovate[bot] 0bdbf3b724 Update dependency eslint to v5.12.0 (https://github.com/woocommerce/woocommerce-admin/pull/1259) 2019-01-14 11:42:51 +01:00
renovate[bot] 8ff156fb8d Update dependency autoprefixer to v9.4.5 (https://github.com/woocommerce/woocommerce-admin/pull/1256) 2019-01-14 11:31:18 +01:00
renovate[bot] b19b8b8687 Update dependency lerna to v3.10.5 (https://github.com/woocommerce/woocommerce-admin/pull/1262) 2019-01-14 11:26:35 +01:00
Albert Juhé Lluveras f009506a45 Makes table dates accessible (https://github.com/woocommerce/woocommerce-admin/pull/1274)
* Create 'Date' component to render accessible dates

* Add tests
2019-01-14 10:54:44 +01:00
Paul Sealock be76392a0c devDocs: update path for prop docs 2019-01-14 15:07:28 +13:00
Paul Sealock 7525e2347a Add calendar to date advanced filter 2019-01-14 13:22:39 +13:00
Albert Juhé Lluveras 328a49127a Remove decimals from Y-axis (https://github.com/woocommerce/woocommerce-admin/pull/1288)
* Remove decimals from Y-axis

* Add CHANGELOG message
2019-01-11 19:18:31 +01:00
Albert Juhé Lluveras ad457cc123 Avoid duplicated Y-axis values (https://github.com/woocommerce/woocommerce-admin/pull/1289)
* Avoid duplicated yGrids

* Add tests

* Rename 'roundedValue' to 'value' to better reflect its contents

* Add CHANGELOG message
2019-01-11 19:16:29 +01:00
Albert Juhé Lluveras 753ec498ba Update activity button focus styles (https://github.com/woocommerce/woocommerce-admin/pull/1287)
* Update activity button focus styles

* Set overflow to 'auto' instead of 'scroll' in activity panels
2019-01-11 18:45:06 +01:00
Peter Fabian 20090a90e4 Added segments property to revenue test. 2019-01-11 18:39:57 +01:00
Peter Fabian 562e21ff54 Replace time interval keys with numeric ones to format REST response correctly. 2019-01-11 18:20:43 +01:00
Timmy Crawford 7d89799194 Remove hour from default clause in getAllowedIntervalsForQuery when period is empty (https://github.com/woocommerce/woocommerce-admin/pull/1279) 2019-01-11 07:51:24 -08:00
Justin Shreve 764845a6c0 Add top categories block (https://github.com/woocommerce/woocommerce-admin/pull/1276)
* Add Top Categories Block

* Update category and product blocks with correct links.

* Handle PR feedback/design cleanup
2019-01-11 10:11:10 -05:00
Peter Fabian 8059251656 Updated type for products field in response. 2019-01-11 15:29:03 +01:00
Peter Fabian ab4eb674e2 Added segments fields to expected response in tests. 2019-01-11 15:28:28 +01:00
Peter Fabian bc68976fb7 Updated schema tests to reflect latest changes. 2019-01-11 15:27:24 +01:00
Peter Fabian 26925872ec Corrected return types so that no segmented queries work fine. 2019-01-11 15:25:17 +01:00
Peter Fabian ebe76c2d43 Added missing parameter to new data stores. 2019-01-11 15:23:13 +01:00
Peter Fabian 7308aa415b Schema updates. 2019-01-11 15:22:19 +01:00
Albert Juhé Lluveras 9d1edd6a56 Make d3chart component stateless (https://github.com/woocommerce/woocommerce-admin/pull/1273)
* Make d3chart component stateless

* Move back 'drawChart' to d3chart/chart.js

* Add getColor method changelog comment

* Reorder chart constructor methods binding
2019-01-11 12:24:10 +01:00
Peter Fabian 5edc60d30b Added refund_total also to intervals (to be able to calculate net_total correctly). 2019-01-11 11:32:59 +01:00
Peter Fabian ff6b4ffb26 Added refund_total to unique orders table to be able to calculate net_total correctly. 2019-01-11 11:31:21 +01:00
Peter Fabian d14426cbc1 Corrected type of parameter in the docblock. 2019-01-11 11:30:43 +01:00
Peter Fabian 69f63f48d2 Ain't Nobody Got Time for That. 2019-01-11 11:25:49 +01:00
Peter Fabian 250c0910a1 Merge branch 'master' into fix/1035 2019-01-11 11:16:01 +01:00
Peter Fabian 411ff59788 WIP on orders/stats segmenting. 2019-01-11 11:11:23 +01:00
Joshua T Flowers e68f751298 Change category gross stats to net (https://github.com/woocommerce/woocommerce-admin/pull/1283) 2019-01-11 17:56:58 +08:00
Jeff Stieler 3efebb37e1 Merge pull request woocommerce/woocommerce-admin#1267 from woocommerce/update/numeric-filter-array-value
Numeric filter: generate a true array value for “between” rule
2019-01-10 19:31:15 -07:00
Jeff Stieler adf8bbeb23 Merge pull request woocommerce/woocommerce-admin#1260 from woocommerce/fix/1239-handle-between-rest-api-param
Handle *_between params in Reports controllers
2019-01-10 10:52:08 -07:00
Justin Shreve 350e296d2c Allow sorting by title and SKU to report tables (https://github.com/woocommerce/woocommerce-admin/pull/1266) 2019-01-10 12:10:31 -05:00
Jeff Stieler 571ee1fee0 Merge pull request woocommerce/woocommerce-admin#1271 from woocommerce/update/customer-report-real-endpoint
Hook up customers report table to real data.
2019-01-10 08:16:13 -07:00
Albert Juhé Lluveras 279bc142bb Fix chart blocks not being responsive (https://github.com/woocommerce/woocommerce-admin/pull/1265) 2019-01-10 10:55:15 +01:00
Jeff Stieler c223977dbd Hook up customers report table to real data. 2019-01-09 17:45:24 -07:00
Jeff Stieler c565b9cb40 Numeric filter: generate a true array value for “between” rule instead of a comma-delimited string. 2019-01-09 14:23:49 -07:00
Jeff Stieler 2246a1e075 Expect array value for _between params.
Add param validation method and normalize to min/max based by comparing values.
2019-01-09 14:19:37 -07:00
Justin Shreve d46ce1df7a Add store performance indicator endpoint (https://github.com/woocommerce/woocommerce-admin/pull/1255)
* Add store performance REST API endpoint

* Clean up validation, add list of allowed stats to OPTIONS endpoint, and rename endpoint to performance-indicators

* Add tests

* Add additional filters to make extending the performance indiciators area easier.

* Add docblocks for filters
2019-01-09 16:08:39 -05:00
Jeff Stieler 43517940fb Merge pull request woocommerce/woocommerce-admin#1144 from woocommerce/add/916-customers-report-endpoint
Add `/reports/customers` endpoint
2019-01-08 19:04:17 -07:00
Jeff Stieler 06763cc3a5 Don’t cast date values to strings in customers report data store since they’re allowed to be null.
NULL column values resulted in NOW() in the response.
2019-01-08 18:49:49 -07:00
Jeff Stieler 6e369bd145 Handle *_between parameters in Customers Report endpoint controller. 2019-01-08 17:41:48 -07:00
Jeff Stieler b15a4bc804 Add utility method to normalize numeric “between” parameters in REST API requests. 2019-01-08 17:41:24 -07:00
Joshua T Flowers 80fe765657 Use a date instead of hour for single dates in report tables (https://github.com/woocommerce/woocommerce-admin/pull/1208)
* Use a date instead of hour for single dates in report tables

* Add hour to allowed list when day difference is less than 1

* Prioritize hour format over day and set day as default for tables

* Add default intervals for report tables

* Use explicit date format in report tables

* Add constant for default table format

* Restore allowed intervals for >1 && <7 days
2019-01-09 08:24:49 +08:00
Joshua T Flowers bdb9525afe Add dashboard chart interval preferences (https://github.com/woocommerce/woocommerce-admin/pull/1230)
* Add user interval preferences for dashboard charts

* Add interval selector styling
2019-01-09 08:12:39 +08:00
Jeff Stieler d9fd8568df Customers report: perform a LEFT JOIN on the order stats table to include customers that have not yet placed an order. 2019-01-08 10:47:19 -07:00
Jeff Stieler 46b503dd54 Update customers report lookup table when customers/users are updated. 2019-01-08 10:33:17 -07:00
Jeff Stieler 154482acc9 Derive orders_count, total_spend, avg_order_value, and date_late_order for customer reports from the order stats report table. 2019-01-08 10:33:17 -07:00
Jeff Stieler 8105ddb38a Add new guest customers to lookup when syncing the order stats report table. 2019-01-08 10:33:16 -07:00
Jeff Stieler 1a90840e97 Add customer_id to order stats report table to reference with customer lookup. 2019-01-08 10:30:16 -07:00
Jeff Stieler d42e04cd59 Short circuit registered customer data update when the given ID is bad. 2019-01-08 10:29:44 -07:00
Jeff Stieler a1317f2152 Customer lookup table: allow registration date to be null (for guests). 2019-01-08 10:29:43 -07:00
Jeff Stieler c337944cf6 Backfill guests into customer report lookup table using order data and billing email. 2019-01-08 10:29:43 -07:00
Jeff Stieler d000d3e42a Add cases using ‘name’ and a date parameter to customers report endpoint tests. 2019-01-08 10:29:42 -07:00
Jeff Stieler fa3379e62f Customer report data store: fix handling of ‘name’ parameter in WHERE clause. 2019-01-08 10:29:42 -07:00
Jeff Stieler 714c1ee030 Customer report data store: fix comparison operator for date param “after” where clause. 2019-01-08 10:29:42 -07:00
Jeff Stieler 737331dd3b Add missing _gmt date fields to customers report response items. 2019-01-08 10:29:41 -07:00
Jeff Stieler 1a4b890660 Add unit tests for customers report endpoint. 2019-01-08 10:29:41 -07:00
Jeff Stieler 04a30e668b Customer report data store: fix SQL when where clauses are empty. 2019-01-08 10:29:40 -07:00
Jeff Stieler 1832450fd1 Update customer lookup table when orders (with registered customers) are created, updated, or refunded. 2019-01-08 10:29:40 -07:00
Jeff Stieler 2ea61e9a86 Move registered customer lookup update logic into data store class. 2019-01-08 10:29:40 -07:00
Jeff Stieler d0e2c5162f Place a UNIQUE constraint on the user_id key for the customer report lookup table. 2019-01-08 10:29:39 -07:00
Jeff Stieler dd87522a5e Customers report endpoint: only include customer link if they’re a registered user. 2019-01-08 10:29:39 -07:00
Jeff Stieler fc20d2bb1b Remove unnecessary subquery from customer reports data store records count query. 2019-01-08 10:29:38 -07:00
Jeff Stieler a75a33c32f Handle match parameter in customers report data store.
Note: before/after and min/max ranges are always ‘AND’.
2019-01-08 10:29:38 -07:00
Jeff Stieler 97e6f795e9 Fix copy-pasta in customers report REST controller. 2019-01-08 10:29:38 -07:00
Jeff Stieler a180566c2f Set default parameters for customers report query. 2019-01-08 10:29:37 -07:00
Jeff Stieler 0c919add5d Fix query params in customers report controller. 2019-01-08 10:29:37 -07:00
Jeff Stieler 6e5fef2f7b Include customers report files. 2019-01-08 10:29:37 -07:00
Jeff Stieler 746120e254 Change customer report lookup table columns to match API parameters. 2019-01-08 10:29:36 -07:00
Jeff Stieler 9670719fc6 Add customers report query endpoint implementation. 2019-01-08 10:29:36 -07:00
Jeff Stieler b9f0d9fe5f Update customers report endpoint item schema to match (visual) table designs. 2019-01-08 10:29:35 -07:00
Jeff Stieler 56beada220 Update customers report endpoint parameters to match new lookup table filters. 2019-01-08 10:29:35 -07:00
Jeff Stieler a2154daa4c Register customer report lookup table with core WC. 2019-01-08 10:29:35 -07:00
Jeff Stieler 281c06a5d4 Add username column to customer report lookup table. 2019-01-08 10:29:34 -07:00
Jeff Stieler 9131932910 First pass at initializing the customer lookup table with existing registered customer data. 2019-01-08 10:29:34 -07:00
Jeff Stieler a5cf136037 Add customer report lookup table creation to initialization query. 2019-01-08 10:29:33 -07:00
Albert Juhé Lluveras 41b933e714 Add link to file in Downloads table (https://github.com/woocommerce/woocommerce-admin/pull/1253)
* Add link to file in Downloads table

* Fix wrong param name for 'ip_address'
2019-01-08 17:51:19 +01:00
Jeff Stieler d2ca354bd5 Merge pull request woocommerce/woocommerce-admin#1099 from woocommerce/fix/advanced-filters-legend-text
Rework advanced filters screen reader text generation
2019-01-08 08:45:13 -07:00
Justin Shreve f37b9319e1 Download Report API: Add path to response, fix ordering, and fix schema typo (https://github.com/woocommerce/woocommerce-admin/pull/1248)
* Add download_path to download report endpoint and fix schema typo

* Fix ordering and add tests
2019-01-08 09:51:28 -05:00
Albert Juhé Lluveras 03e17d372b Add new props to chart component (https://github.com/woocommerce/woocommerce-admin/pull/1247)
* Add different props to chart component that were inferred from 'mode'

* Add new chart props to packages CHANGELOG
2019-01-08 10:21:47 +01:00
Joshua T Flowers ef6d7ec4cb Add leaderboard section (https://github.com/woocommerce/woocommerce-admin/pull/1234)
* Add leaderboard section to dashboard

* Add rows per table user preference

* Pass in rowsPerTable to leaderboards to adjust total rows

* Add styling for rows select dropdown

* Set default for total rows if tableQuery is undefined

* Remove double localization on leaderboard labels

* Simplify toggle logic for hidden leaderboards

* Move updateCurrentUserData outside of setState callback
2019-01-08 15:20:01 +08:00
Joshua T Flowers 9fef5d4f5d Add dashboard chart links to reports (https://github.com/woocommerce/woocommerce-admin/pull/1236)
* Add dashboard chart links to reports

* Remove extra css background property from screen reader text

* Remove elements from previous click handler attempt

* Concat translation strings with sprintf

* Change chart hover interactions

* Move i18n to external dependencies

* Make legend buttons match background on hover
2019-01-08 14:48:39 +08:00
Joshua T Flowers 82200895dd Defer chart drawing until chart component has rendered (https://github.com/woocommerce/woocommerce-admin/pull/1244) 2019-01-08 10:10:29 +08:00
Joshua T Flowers d9e7e1b952 Remove unused show_product_categories_in_rest function (https://github.com/woocommerce/woocommerce-admin/pull/1235) 2019-01-08 09:53:02 +08:00
Joshua T Flowers e067da06be Add dashboard chart user preferences (https://github.com/woocommerce/woocommerce-admin/pull/1225)
* Add user preferences for shown dashboard charts

* Add user preferences for dashboard chart type

* Check if user preferences are set before assigning to state

* Move API update methods out of callbacks and use xor
2019-01-08 09:49:11 +08:00
Joshua T Flowers f3346e9298 Add the order status column to lookup table (https://github.com/woocommerce/woocommerce-admin/pull/1211)
* Add the order status column to lookup table

* Fix order status filter for order stats

* Fix normalize order status and make static function
2019-01-08 09:16:10 +08:00
Albert Juhé Lluveras 6ca0c628b2 Connect Downloads report to REST API (https://github.com/woocommerce/woocommerce-admin/pull/1238)
* Connect downloads chart and table to REST API

* Display date picker in Downloads report

* Fix missing value for 'days' in Downloads table summary

* Fix download_count being a string instead of a number

* Minor date packages comment fixes

* Fix filters in Downloads report

* Add back empty line

* JSDoc comments style fixes

* Fix username filter not working

* Fix days counter off by 1

* Fix alignment issue
2019-01-07 12:54:42 +01:00
Albert Juhé Lluveras 3a90c07e76 Fix date issues introduced in woocommerce/woocommerce-admin#1203 (https://github.com/woocommerce/woocommerce-admin/pull/1229)
* Revert "Show today charts up to the current hour (https://github.com/woocommerce/woocommerce-admin/pull/1203)"

This reverts commit 029ff9cc9c.

* Add current hour to timestamp of queries ending in today

* Fix getCurrentDates not returning moment objects as specified in the docs but returning string dates

* Set appendTimestamp( ..., 'now') seconds to 00

* Add test for appendTimestamp( ..., 'now' )

* Don't accept string dates in 'appendTimestamp'

* Fix 'moment' dependency deprecation warning
2019-01-07 11:41:46 +01:00
Albert Juhé Lluveras b08e604047 Fix bar chart in narrow viewports (https://github.com/woocommerce/woocommerce-admin/pull/1226)
* Fix bar chart in narrow viewports

* Make date width depend on the number of columns

* Return early in 'shouldBeCompact' and 'getWidth' functions

* Hide tooltip when scrolling
2019-01-07 11:41:01 +01:00
Albert Juhé Lluveras b91cfd2cc6 Split `d3chart/utils.js` into several files (https://github.com/woocommerce/woocommerce-admin/pull/1231)
* Split d3chart/utils.js

* Add format comment to breakpoints.js
2019-01-04 11:21:42 +01:00
Paul Sealock 3cd27ed631 Merge pull request woocommerce/woocommerce-admin#1127 from woocommerce/renovate/major-wordpress-monorepo
Update wordpress monorepo (major)
2019-01-04 14:34:30 +13:00
Paul Sealock d6c5f47ee1 jest update 2019-01-04 14:26:55 +13:00
Paul Sealock c75777cd11 add variable now used in button's scss 2019-01-04 14:00:28 +13:00
Paul Sealock 5a4f6185d6 Merge pull request woocommerce/woocommerce-admin#1216 from woocommerce/fix/date-range-dow
DateRange: use DayOfWeek from moment locale
2019-01-04 13:30:59 +13:00
Paul Sealock 17a21e00db DateRange: use DayOfWeek from moment locale{ 2019-01-04 11:50:05 +13:00
Paul Sealock 8867166556 Merge pull request woocommerce/woocommerce-admin#1221 from woocommerce/renovate/lerna-3.x
Update dependency lerna to v3.8.4
2019-01-04 11:45:25 +13:00
Jeff Stieler a8e81b709f Fix type in textContent() test case label. 2019-01-03 13:13:23 -07:00
Jeff Stieler f2df49ce24 Add tests for textContent(). 2019-01-03 13:13:22 -07:00
Jeff Stieler 1935e75f5c Render descriptive screen reader text for SearchFilter and SelectFilter components. 2019-01-03 13:13:22 -07:00
Jeff Stieler 850a738289 NumberFilter: don’t hide anything from accessibility tree, render descriptive span for screen reader instead of using speak(). 2019-01-03 13:13:22 -07:00
Jeff Stieler 7663cb2881 NumberFilter: a11y speak a description of the filter once all inputs are populated. 2019-01-03 13:13:21 -07:00
Jeff Stieler cbc5bc36fd NumberFilter: remove dynamic legend text, just use “add” label. 2019-01-03 13:13:21 -07:00
Jeff Stieler 3528957923 NumberFilter: automatically hide non-interpolated strings in title label from accessibility tree. 2019-01-03 13:13:20 -07:00
Jeff Stieler ed81b35d0a Rework NumberFilter screen reader text.
Only describe full filter if all values are set. Describe each input more precisely. Based on conversation here: https://github.com/woocommerce/wc-admin/pull/1089#discussion_r241843856
2019-01-03 13:13:20 -07:00
Justin Shreve e3e9ccb6a4 Add `reports/downloads/stats` REST API Endpoint (https://github.com/woocommerce/woocommerce-admin/pull/1142)
* First pass at downloads REST API

* Add reports/downloads/stats endpoint.

* Add tests

* Update cache key
2019-01-03 13:00:48 -05:00
Peter Fabian 13022fee4f WIP on orders/stats segmenting. 2019-01-03 18:59:07 +01:00
Albert Juhé Lluveras f5e2c8c5f9 Fix chart legend checkboxes not reacting to clicks (https://github.com/woocommerce/woocommerce-admin/pull/1213) 2019-01-03 13:00:37 +01:00
Renovate Bot 1e74730baf Update wordpress monorepo 2019-01-03 10:45:22 +00:00
Albert Juhé Lluveras 4419faea45 Add margin to inline search tags (https://github.com/woocommerce/woocommerce-admin/pull/1227) 2019-01-03 09:36:31 +01:00
Joshua T Flowers 28c0d292a8 Update dashboard charts on query change (https://github.com/woocommerce/woocommerce-admin/pull/1209)
* Update dashboard charts on query change

* Remove state derived props
2019-01-03 10:51:45 +08:00
Joshua T Flowers 06ed650954 Add chart loading spinner while data is being requested (https://github.com/woocommerce/woocommerce-admin/pull/1212) 2019-01-03 10:51:21 +08:00
Renovate Bot 6d45a38907 Update dependency lerna to v3.8.4 2019-01-03 02:02:12 +00:00
Paul Sealock b097cd3316 Merge pull request woocommerce/woocommerce-admin#1224 from woocommerce/renovate/webpack-4.x
Update dependency webpack to v4.28.3
2019-01-03 14:55:22 +13:00
Paul Sealock b97eb434d2 Merge pull request woocommerce/woocommerce-admin#1220 from woocommerce/renovate/husky-1.x
Update dependency husky to v1.3.1
2019-01-03 14:54:12 +13:00
Renovate Bot 49baee6319 Update dependency webpack to v4.28.3 2019-01-03 01:06:47 +00:00
Renovate Bot 7521b3770d Update wordpress monorepo 2019-01-03 14:03:56 +13:00
Renovate Bot f33444601e Update dependency husky to v1.3.1 2019-01-03 01:02:24 +00:00
Paul Sealock d2476d650c Merge pull request woocommerce/woocommerce-admin#1206 from woocommerce/release/0.4.0
Release/0.4.0
2019-01-03 13:59:24 +13:00
Paul Sealock f8df315c27 Merge pull request woocommerce/woocommerce-admin#1222 from woocommerce/renovate/marked-0.x
Update dependency marked to v0.6.0
2019-01-03 12:49:44 +13:00
Timmy Crawford a1887eb4d7 Prepping for 0.4.0 2019-01-03 12:32:00 +13:00
Paul Sealock 812cb17bd5 Merge pull request woocommerce/woocommerce-admin#1215 from woocommerce/fix/date-range-focus-endDate
DateRange: change focusInput prop on input focus
2019-01-03 10:48:51 +13:00
Peter Fabian 6bceabe095 Fixed extra parameters after refactoring. 2019-01-02 15:40:47 +01:00
Peter Fabian 52e1ed920f Added placeholders for new db columns. 2019-01-02 15:29:43 +01:00
Peter Fabian 4cc042ebd8 Added back updates to product lookup update routine after wc-admin-order-functions.php was removed and code moved to individual data stores. 2019-01-02 15:26:33 +01:00
Peter Fabian 1e39bc0756 Merge branch 'master' into fix/1035
# Conflicts:
#	includes/wc-admin-order-functions.php
2019-01-02 14:08:23 +01:00
Peter Fabian 4eaa5d911f WIP on segmenting for orders/stats. 2019-01-02 13:35:40 +01:00
Peter Fabian a9a0ccd185 Added refund_amount to products lookup as it needs to be reported on product level. 2019-01-02 11:33:05 +01:00
Peter Fabian 1931f3bf48 Added table name to time limit clauses. 2019-01-02 11:31:48 +01:00
Paul Sealock 37fe2eda00 Merge pull request woocommerce/woocommerce-admin#1219 from woocommerce/renovate/eslint-plugin-react-7.x
Update dependency eslint-plugin-react to v7.12.1
2019-01-02 16:02:08 +13:00
Renovate Bot f112ddfbaa Update dependency eslint-plugin-react to v7.12.1 2019-01-02 02:51:54 +00:00
Paul Sealock c6b466694c DateRange: change focusInput prop on input focus 2019-01-02 15:46:40 +13:00
Paul Sealock 1401bc1bd1 Search: make certain styles just for inlineTags 2019-01-02 15:44:53 +13:00
Renovate Bot 9ae31a6d60 Update dependency marked to v0.6.0 2019-01-02 01:47:50 +00:00
Paul Sealock 49fe2c1f93 CSS lint: fix errors 2019-01-02 12:38:11 +13:00
Albert Juhé Lluveras da8c49c90f Update chart interval thresholds (https://github.com/woocommerce/woocommerce-admin/pull/1214) 2019-01-01 23:30:28 +01:00
Renovate Bot 2e0468083d Lock file maintenance 2018-12-31 06:55:16 +00:00
Timmy Crawford 78ca63a72d Dashboard: Add Leaderboard Component (https://github.com/woocommerce/woocommerce-admin/pull/1198)
* Create Leaderboard component. Update Top Selling Products to use it.

* Use date picker values in Top Selling Products.

* Convert top selling products tests into leaderboard tests

* Updates per feedback.

* Skipping failing test for now.
2018-12-31 14:42:46 +08:00
Joshua T Flowers 7bbdd78bde Add missing intervals to product reports (https://github.com/woocommerce/woocommerce-admin/pull/1200)
* Add missing intervals to product reports

* Fix failing tests for product stats API

Before and after query should be within today's date since missing intervals for other days will be filled in with remaining dates.
2018-12-31 13:20:22 +08:00
Albert Juhé Lluveras 029ff9cc9c Show today charts up to the current hour (https://github.com/woocommerce/woocommerce-admin/pull/1203)
* Show today charts up to the current hour

* Fix tests

* Fix doc comment
2018-12-28 10:10:40 -08:00
Joshua T Flowers 2d5e592a10 Update chart button active state for dashboard charts (https://github.com/woocommerce/woocommerce-admin/pull/1202)
* Update chart button active state for dashboard charts

* Add default active state when no query is present
2018-12-28 09:59:05 -08:00
Joshua T Flowers 8dc3398636 Extract IE11 specific styles to IE stylesheet (https://github.com/woocommerce/woocommerce-admin/pull/1199)
* Extract IE11 specific styles to IE stylesheet

* Enqueue IE stylesheet conditionally

* Use server-side http user agent to detect IE11

IE11 and up does not detect conditional comments for stylesheets so match user agent string and conditionally load stylesheet.
2018-12-28 09:58:03 -08:00
Albert Juhé Lluveras 21ab4da93e Enable Autoprefixer 'grid' in packages (https://github.com/woocommerce/woocommerce-admin/pull/1204) 2018-12-28 09:57:18 -08:00
Joshua T Flowers 3f388028ac Sort default category response by category ID (https://github.com/woocommerce/woocommerce-admin/pull/1201) 2018-12-28 09:50:58 -08:00
Joshua T Flowers 268182e75f Add invalid note ID test (https://github.com/woocommerce/woocommerce-admin/pull/1197) 2018-12-28 09:44:53 -08:00
Joshua T Flowers e0596ea249 Add 404 response to REST response for invalid note ID (https://github.com/woocommerce/woocommerce-admin/pull/1194) 2018-12-28 09:51:22 +08:00
Albert Juhé Lluveras a0f23c93c9 Improve Charts X-axis when displaying a single date (https://github.com/woocommerce/woocommerce-admin/pull/1195)
* Improve Charts X-axis when displaying a single date

* Add tests for getXTicks

* Fix typo in tests

* Add assertion in compareStrings test for dates with commas

* Update interval options

* Fix secondaryDate always showing 12AM

* Don't convert dates to UTC when checking if they belong to the same date
2018-12-27 19:51:58 +01:00
Albert Juhé Lluveras 7287fa3b22 Allow Search box to break into several lines (https://github.com/woocommerce/woocommerce-admin/pull/1196) 2018-12-27 18:53:20 +01:00
renovate[bot] bca949feb6 Update dependency eslint to v5.11.1 (https://github.com/woocommerce/woocommerce-admin/pull/1172) 2018-12-27 11:52:40 +08:00
Joshua T Flowers b3979ff984 Fix order status product sync (https://github.com/woocommerce/woocommerce-admin/pull/1151)
* Move order product sync to product data store

* Move order taxes sync to taxes data store

* Move order coupons sync to coupons data store

* Use table_name constant in data syncs

* Remove order data for incomplete order statuses

* Fix report rebuild tool

* Update comments to describe create/update entry reference

* Fix data_store_init function name change
2018-12-27 11:49:00 +08:00
Joshua T Flowers 987929da83 Filter by categories query param in categories data store (https://github.com/woocommerce/woocommerce-admin/pull/1179) 2018-12-27 11:31:08 +08:00
Joshua T Flowers 017db0b339 Sync order status on refund delete (https://github.com/woocommerce/woocommerce-admin/pull/1074) 2018-12-27 11:11:33 +08:00
Peter Fabian 48dfb54a48 Switched average order value from gross to net revenue (https://github.com/woocommerce/woocommerce-admin/pull/1158)
* Switched Average order value calculation from gross to net revenue.

* Updated tests to reflect switch of average order value from gross to net revenue.
2018-12-26 15:49:46 -08:00
Timmy Crawford 1ed9813e3b Chart: Fix/current of undefined (https://github.com/woocommerce/woocommerce-admin/pull/1153)
* Add undefined check for this.listRef

* Update changelog
2018-12-26 09:27:24 -08:00
renovate[bot] a4434e3e67 Pin dependency babel-plugin-transform-es2015-template-literals to 6.22.0 (https://github.com/woocommerce/woocommerce-admin/pull/1178) 2018-12-26 15:21:54 +08:00
renovate[bot] ce3d895c27 Update dependency grunt-wp-i18n to v1.0.3 (https://github.com/woocommerce/woocommerce-admin/pull/1173) 2018-12-26 15:21:04 +08:00
renovate[bot] fc6057184b Update dependency lerna to v3.8.0 (https://github.com/woocommerce/woocommerce-admin/pull/1175) 2018-12-26 15:19:54 +08:00
renovate[bot] b22c2f6c83 Update dependency webpack to v4.28.2 (https://github.com/woocommerce/woocommerce-admin/pull/1177) 2018-12-26 13:55:29 +08:00
renovate[bot] 48c90fc5b9 Update dependency husky to v1.2.1 (https://github.com/woocommerce/woocommerce-admin/pull/1174) 2018-12-26 13:49:42 +08:00
renovate[bot] eea6ef7314 Update dependency css-loader to v2.1.0 (https://github.com/woocommerce/woocommerce-admin/pull/1171) 2018-12-26 13:46:24 +08:00
Joshua T Flowers ab310320dd Fix ie11 blank screen by babel transforms (https://github.com/woocommerce/woocommerce-admin/pull/1170)
* Add specific vendor packages to babel loader to fix ie11 transforms

* Remove unused buble
2018-12-26 10:46:32 +08:00
Joshua T Flowers c747d3399e Use unbounded per_page limit in apiFetch for categories (https://github.com/woocommerce/woocommerce-admin/pull/1149) 2018-12-26 10:37:02 +08:00
Joshua T Flowers f88311b372 Check for product categories before loading value (https://github.com/woocommerce/woocommerce-admin/pull/1164)
* Check for product categories before loading value

* Filter product category list for undefined values

* Remove unnecessary double check of productCategories
2018-12-25 18:28:37 +08:00
Albert Juhé Lluveras f51dba44a0 Charts: fix weird Y-axis ticks when max Y value is a small number (https://github.com/woocommerce/woocommerce-admin/pull/1168) 2018-12-25 11:16:52 +01:00
Albert Juhé Lluveras 1ca1dba3e7 Add Categories report filters (https://github.com/woocommerce/woocommerce-admin/pull/1167)
* Add Categories report filters

* Remove the option to sort categories by name, given that it's not supported by the endpoint
2018-12-25 10:28:20 +01:00
Joshua T Flowers 024d267ae6 Set minimum content height to prevent cutoff of absolute content (https://github.com/woocommerce/woocommerce-admin/pull/1166)
* Set minimum content height to prevent cutoff of absolute content

* Add admin bar height vars for SCSS and apply them
2018-12-25 12:34:24 +08:00
Joshua T Flowers 7cf9e293e1 Fix margin on dashboard block charts (https://github.com/woocommerce/woocommerce-admin/pull/1165) 2018-12-25 11:02:23 +08:00
Joshua T Flowers dcaa35c7bf Add product SKU to products report (https://github.com/woocommerce/woocommerce-admin/pull/1161)
* Add product SKU to products report

* Add tests for SKU data
2018-12-25 11:02:06 +08:00
Joshua T Flowers bdcebd7ea3 Clear filter query on removing all items (https://github.com/woocommerce/woocommerce-admin/pull/1162) 2018-12-25 11:01:39 +08:00
Albert Juhé Lluveras 5c8cfbc03f Report components docs (https://github.com/woocommerce/woocommerce-admin/pull/1140)
* Extend docs to report components

* Improve inline documentation in some files

* Update doc files

* Undo unnecessary doc changes

* Remove unnecessary line breaks in sidebar

* Rename 'Client components' to 'Analytics components'

* Minor docs fixes

* Rename toc contents to toc sections

* Update endpoint props doc to add an example and more information

* Fix outdated comment

* Fix merge error
2018-12-22 12:46:10 +01:00
Joshua T Flowers 9a4e613a2e Make user column preferences refer to hidden columns (https://github.com/woocommerce/woocommerce-admin/pull/1150)
* Make user column preferences refer to hidden columns

* Destructure props in onColumnsChange
2018-12-22 10:27:30 +08:00
renovate[bot] dfc7d8ae1b Update dependency core-js to v2.6.1 (https://github.com/woocommerce/woocommerce-admin/pull/1128) 2018-12-21 20:03:41 -06:00
Justin Shreve 579113910d Add remaining filters to the downloads report (https://github.com/woocommerce/woocommerce-admin/pull/1141)
* Add order number, username, and IP address filters to the downloads report.

* Adds tests
2018-12-21 16:40:41 -08:00
Robert Elliott ebd857cefa Add/chart dashboard block (https://github.com/woocommerce/woocommerce-admin/pull/1002)
* added new block and dashboard charts

section title and filters... lots of duplicate keys

toggle chart types in block heading

* Updates per feedback.

* Add some documentaiton about new interactive prop on chart/legend

* Revert a few files that only had whitespace changes.
2018-12-21 16:24:26 -08:00
Justin Shreve 49a0f0f6d2 Add `reports/downloads` REST API endpoint. (https://github.com/woocommerce/woocommerce-admin/pull/1122)
* First pass at downloads REST API

* Handle PR feedback
2018-12-21 14:57:46 -08:00
Joshua T Flowers 56577101c4 Add customer numeric filters (https://github.com/woocommerce/woocommerce-admin/pull/1116)
* Add customer numeric filters

* Add between params to customers controller

* Escape strings for translation and change inputs to currency

* Add Currency shorthand filter
2018-12-21 12:07:54 +08:00
Joshua T Flowers f83b0e0615 Add product categories wc-api and breadcrumbs (https://github.com/woocommerce/woocommerce-admin/pull/1131)
* Add support for product cats in wp rest api

* Add categories to WC API

* Add category breadcrumbs component

* Increase per_page limit size for product cat API

* Use wc/v3 API to pull product categories

* Return category IDs in API

* Add categories to product reports

* Add category IDs test for REST API

* Switch to getResource instead of require for total count selector
2018-12-21 10:44:27 +08:00
Paul Sealock 47b674ace2 Merge pull request woocommerce/woocommerce-admin#1069 from woocommerce/update/calendar-component-inline-picker
Add Single Date Picker
2018-12-21 15:25:54 +13:00
renovate[bot] 69a11b50e4 Update dependency autoprefixer to v9.4.3 (https://github.com/woocommerce/woocommerce-admin/pull/1125) 2018-12-20 20:20:05 -06:00
Paul Sealock c76ceb2591 DatePicker: cleanup example, propTypes 2018-12-21 15:19:10 +13:00
Joshua T Flowers 716ebc0658 Hook up coupons to REST API (https://github.com/woocommerce/woocommerce-admin/pull/1112) 2018-12-21 10:13:57 +08:00
Paul Sealock 524bb0c96f DateRangeFilterPicker 2018-12-21 11:58:01 +13:00
Paul Sealock 46c313cdc7 REST API: Categories: optimize query by removing get_the_terms 2018-12-21 11:08:08 +13:00
renovate[bot] 4e68b56fdc Update dependency css-loader to v2.0.1 (https://github.com/woocommerce/woocommerce-admin/pull/1129)
* Update dependency css-loader to v2.0.1

* http -> https
2018-12-20 13:25:36 -06:00
Joshua T Flowers 5bab0767b6 Fix item refunds report data (https://github.com/woocommerce/woocommerce-admin/pull/1059)
* Fix product report data issue when issuing item refund

* Modify product order lookup stats when refund is given

* Remove products where orders are refunded

* Remove unused  var and add comment about early return

* Reduce product revenue if quantity still remains after refund

* Fix subtotal array key and abs value for float

* Change product_gross_revenue to product_net_revenue
2018-12-21 02:40:44 +08:00
renovate[bot] 3718692ad6 Update babel monorepo (https://github.com/woocommerce/woocommerce-admin/pull/1124) 2018-12-20 09:56:02 -06:00
Peter Fabian 999c7fe8ca Updated REST API controller for segmenting, added schema changes missed before. 2018-12-20 12:35:45 +01:00