Commit graph

382 commits

Author SHA1 Message Date
Tom Bloor 4d21de7bae Improved Graphs and added sales and purchase data graphs.
Includes an API change for development.
2017-09-04 17:29:28 +01:00
Finn fabd01f988 Fixed for sector in account editing 2017-09-04 17:05:10 +01:00
Finn 2137b5607f Fixed Org account editing for portal 2017-09-04 16:12:03 +01:00
Tom Bloor 4fa52901cb Update add org to work with new form 2017-09-04 14:09:36 +01:00
Tom Bloor 2ef5193e41 Fixed organisaiton listing and editing in backend 2017-09-04 14:03:58 +01:00
Tom Bloor cca27b5475 Fix org graphs test for entity upgrade 2017-08-31 19:12:13 +01:00
Tom Bloor adfcd8880f Fix User endpoints for entity upgrade 2017-08-31 19:08:22 +01:00
Tom Bloor dd6e21eb50 Fix upload tests for entity upgrade 2017-08-31 19:03:49 +01:00
Tom Bloor e91863a3d7 Fixed stats endpoint for leaderboards on entity upgrade 2017-08-31 18:31:42 +01:00
Tom Bloor aa6cc63506 Refactor leaderboard creation functions for entity upgrade 2017-08-31 18:25:27 +01:00
Tom Bloor 8d205d62c2 Refactor stats test to use fixtures and fix stats endpoints for entity
update
2017-08-31 18:04:51 +01:00
Tom Bloor 2980fd129f Fix search test for entity upgrade 2017-08-31 17:54:25 +01:00
Tom Bloor bf16077b10 Fix register for new entity work 2017-08-31 16:46:25 +01:00
Tom Bloor 4cc8aad367 Fix admin user test for entity upgrade 2017-08-31 16:38:03 +01:00
Tom Bloor 92afe1c531 Fix admin organisation management tests 2017-08-31 14:52:45 +01:00
Tom Bloor 18992784b2 Fix admin login test and required changes for entity upgrade 2017-08-31 13:35:49 +01:00
Tom Bloor bd8b1f91a4 Merge branch 'development' into TBSliver/Schema-Changes 2017-08-31 13:07:23 +01:00
Tom Bloor b2312f7dbc Fix unique constraint on LB values 2017-08-31 12:40:42 +01:00
Tom Bloor 27d06fbe37 Bump schema version number to 6 2017-08-31 12:39:36 +01:00
Tom Bloor fd98670333 Updated user to use new Entity table 2017-08-31 12:39:10 +01:00
Tom Bloor 2954297b35 Change transaction to use entity table 2017-08-31 12:30:52 +01:00
Tom Bloor 8acf3af28a Removed pending org and transaction 2017-08-31 12:30:37 +01:00
Tom Bloor 4f99ef82f6 Update organisation with extra information required for entity upgrade 2017-08-31 12:29:06 +01:00
Tom Bloor 7042020969 Change LB Value to link to entity instead of user 2017-08-31 12:19:47 +01:00
Tom Bloor 64cab5f17c Fixed whitespace in Feedback table 2017-08-31 12:18:07 +01:00
Tom Bloor 6a720b0a46 Added Entity to customer 2017-08-31 12:17:05 +01:00
Tom Bloor 736ffb89cf Added entity table 2017-08-31 12:16:38 +01:00
Finn 4189025c6f Added timings and descending submit at time for receipts 2017-08-31 11:51:22 +01:00
Finn 72813ff2a3 Made image upload optional 2017-08-31 11:41:38 +01:00
Tom Bloor 36e91866c9 Remove Administrator column 2017-08-31 11:26:30 +01:00
Tom Bloor 3ae8a43df4 Added organisation graph endpoint and tests 2017-08-29 12:42:27 +01:00
Tom Bloor 7ed2636978 Added fixture installer to main fixtures set 2017-08-25 17:12:12 +01:00
Tom Bloor df7f1de1a6 Merge pull request #37 from Pear-Trading/TBSliver/Login-Info
Added extra info to login return
2017-08-25 16:15:16 +01:00
Finn ef2e0627e1 Fixes and schema update stuff 2017-08-25 15:32:39 +01:00
Finn ff263374ec Added endpoints for organisation sector 2017-08-25 15:25:52 +01:00
Tom Bloor 4a4c568fb7 Return user type on login 2017-08-25 14:59:15 +01:00
Tom Bloor 0a9ca57689 Added user type attribute 2017-08-25 14:59:01 +01:00
Tom Bloor e886eb2ce6 Remove explicit undef returns 2017-08-25 14:44:36 +01:00
Finn 06e89c9199 Merge pull request #34 from Pear-Trading/finn/AccountUpdateFix
Fixed validation for organisation edit
2017-08-24 13:21:05 +01:00
Finn db45f710c3 Code fixed, now functioning account edit 2017-08-24 12:37:53 +01:00
Finn 9865130666 Added user account stuff test and some fixes 2017-08-23 18:42:19 +01:00
Finn 4c7836c9f6 Initial server code added for updating user account 2017-08-23 16:50:04 +01:00
Finn 6f01bf2661 Fixed validation removing redundant code 2017-08-23 16:47:29 +01:00
Finn 4d299cee10 Fixed validation for organisation edit 2017-08-23 16:25:08 +01:00
Tom Bloor 49beb3037d Merge pull request #33 from Pear-Trading/TBSliver/Recalc-Leaderboards
Recalculate Leaderboards
2017-08-21 17:04:26 +01:00
Tom Bloor 9b9b2bd322 Enabled recalculation of leaderboards at any point 2017-08-21 15:29:10 +01:00
Tom Bloor 3f743f0b5f Fixed all_day calculating from the wrong time 2017-08-21 15:29:09 +01:00
Finn a1b6dd8d2a Add Organisation Code 2017-08-21 15:10:33 +01:00
Finn 36a5fdf2e3 Fixed code and added test for reading and editing Organisations 2017-08-18 16:46:49 +01:00
Finn db2dc9fc0f Can now edit valid and pending organisations 2017-08-18 12:56:14 +01:00
Tom Bloor 056d37501b Fixing syntax error 2017-08-17 16:34:43 +01:00
Finn fa1968f035 DatetimeErrorlogfix 2017-08-17 16:26:11 +01:00
Tom Bloor d169249538 Better fix and change status to 400 for upload errors 2017-08-17 15:45:26 +01:00
Tom Bloor d07610e72d Check for organisation and transaction actually being defined on upload 2017-08-17 15:38:08 +01:00
Finn efbcdbce84 Added system redundancy 2017-08-14 16:21:06 +01:00
Finn c6726682d4 Leaderboards corrected and fixes 2017-08-14 16:10:14 +01:00
Finn d078a09ccd Added receipt datetime string submission validation & validator test 2017-08-14 15:35:23 +01:00
Finn 65d5bab444 Fixed errors and tests and updated DB 2017-08-14 15:04:24 +01:00
Finn b44a256434 Updated DB and added more DateTime 2017-08-14 12:45:54 +01:00
Finn 85c80980c3 Added code for date submission in receipt upload 2017-08-14 11:15:33 +01:00
Finn 9affdbf08e Removed redundant file and fixed user updat e+ added tests 2017-07-27 14:18:22 +01:00
Finn bad60c85e7 Removed bad error 2017-07-26 19:22:28 +01:00
Finn 397de48711 Error codes added and fix 2017-07-26 19:05:35 +01:00
Finn 2ef73c9346 Added User Account update code 2017-07-26 18:57:13 +01:00
Finn 2b3c13518b Added API endpoints and user info retrieval 2017-07-26 18:28:14 +01:00
Finn b0e9ef249a Rewrote code for login info retrieval 2017-07-26 16:45:46 +01:00
Finn dfa1ba11f0 Fix to naming of JSON 2017-07-26 15:55:39 +01:00
Finn 1d782a4e84 Added giving user info on login 2017-07-26 15:29:38 +01:00
Tom Bloor e2732a6a93 Change to underlying postcode regex for validation 2017-07-25 17:07:15 +01:00
Tom Bloor 4644f9217e Added pagination to organisation pages 2017-07-25 15:44:16 +01:00
Tom Bloor 1df31d79a0 Merge pull request #20 from Pear-Trading/TBSliver/Organisation-Approve
Fix organisation approving, Closes #7
2017-07-25 14:42:49 +01:00
Tom Bloor 9dd808c547 Fix issue with approving organisations. 2017-07-25 14:33:11 +01:00
Tom Bloor 01c7db6844 Removed admin api endpoint as unused 2017-07-25 14:23:03 +01:00
Tom Bloor b44cb5fe1d Fix issue with turning quote_names on with case insensitive search 2017-07-25 14:14:30 +01:00
Finn 6126e44c6b Final changes to schema an upgrade 2017-07-24 15:39:06 +01:00
Finn 09f9cf9d48 Feedback HTML views added and fixes made 2017-07-24 15:21:10 +01:00
Finn baea01e8b5 Schema and actual DB submit code added 2017-07-24 14:55:05 +01:00
Finn d38758ac90 New Feedback API endpoint added 2017-07-24 13:20:22 +01:00
Tom Bloor 50e06981d7 Fix issue with undefined leaderboard 2017-07-20 17:41:59 +01:00
Tom Bloor 243722df93 Fix issue with login error
fixes #9
2017-07-20 17:34:33 +01:00
Tom Bloor dde8988345 Deployment Handler Script
Adding the script and required items for deployment handler script to work
2017-07-20 17:08:02 +01:00
Finn 16abfe34ea Fixed rank sending and added leaderboard creation script 2017-07-20 11:56:24 +01:00
Finn 4f09483f59 Front page stat sending added 2017-07-19 17:29:00 +01:00
Tom Bloor 559e88d9e6 Fix issue with leaderboard position due to wrong calculation of trend 2017-06-13 23:15:10 +01:00
Tom Bloor 2c96131905 Fix Dev script to use correct id for seller_id 2017-06-13 22:01:22 +01:00
Tom Bloor 41072acc07 Remove age_range_id setting from dev_data script 2017-06-13 21:46:30 +01:00
Tom Bloor 6f5e0fb31e Remove unneccessary endpoint for AgeRanges 2017-06-13 21:45:23 +01:00
Tom Bloor 9523db7684 Remove register controller as no use anymore 2017-06-13 21:33:47 +01:00
Tom Bloor bba724bc3b Fix dev_data script 2017-06-13 21:30:32 +01:00
Tom Bloor d73ddb6ba2 Remove AgeRange table and first pass of fixing tests 2017-06-13 21:02:24 +01:00
Tom Bloor de0b58814e Improved leaderboard to remove previous items for recalculation 2017-06-12 23:41:19 +01:00
Tom Bloor 392d7f3a7a Fixed issue with undefined env var, and bad reverse counting of days 2017-06-12 23:30:40 +01:00
Tom Bloor 606d5bffc2 added dev data and transaction creation scripts 2017-06-12 23:22:34 +01:00
Tom Bloor e2a56227c8 Add command to create leaderboards 2017-06-12 22:41:17 +01:00
Tom Bloor 9cd9f8079e Add leaderboard stats endpoint and trends 2017-06-06 22:30:02 +01:00
Tom Bloor daeeac811c Change leaderboards to only follow customers 2017-06-05 22:59:31 +01:00
Tom Bloor 5e06f0a69b Added resultset for leaderboard for more consice code 2017-06-05 22:34:48 +01:00
Tom Bloor 7e11fc50bd Added get_latest and test for it on leaderboard 2017-06-05 22:15:27 +01:00
Tom Bloor bc12dbf8b0 Added leaderboard first pass stuff 2017-05-23 23:06:07 +01:00
Tom Bloor 00e98f874a Get sums to show 0 instead of undef for no data 2017-05-22 22:21:05 +01:00
Tom Bloor 9586d1a637 Add more stats to default stat set 2017-05-16 22:45:49 +01:00
Tom Bloor a680d7b9df Remove today_avg as redundant due to other data 2017-05-16 21:46:44 +01:00
Tom Bloor 86955c0d1c Started with basic today stats 2017-05-16 21:30:38 +01:00
Tom Bloor 22abc4e464 Fix postcode issue on upload 2017-05-15 22:43:31 +01:00
Tom Bloor 6d86389768 Fix missed part from customer display name change 2017-05-08 20:54:50 +01:00
Tom Bloor 56fc868786 missed failout return from email validator 2017-04-26 20:58:24 +01:00
Tom Bloor 7614b7bc2e Possible fix for postcode validator not working all the time 2017-04-26 20:53:27 +01:00
Tom Bloor ae6884202a Fixed issue with postcode validator 2017-04-25 23:33:35 +01:00
Tom Bloor aed22d1c98 Change to having display_name and full_name for customers 2017-04-25 21:44:13 +01:00
Tom Bloor 286ecf11e1 Fixed issue with validator for postcodes 2017-04-25 20:50:34 +01:00
Tom Bloor e31ec73934 Forgot to define $c in CORS endpoints 2017-04-25 20:19:41 +01:00
Tom Bloor 0292ac7e2e Improve CORS to cover all api routes, including get and post 2017-04-25 20:13:34 +01:00
Tom Bloor fed62641ad Change to * rule for CORS 2017-04-25 19:48:29 +01:00
Tom Bloor 1cd92d1e12 Added a basic CORS options for api/* 2017-04-25 19:47:50 +01:00
piratefinn a4ce60407e Did test and routing fixes and dependency fix 2017-04-24 17:42:07 +01:00
Tom Bloor 98f15a67af Added organisations page to admin interface 2017-04-24 12:49:18 +01:00
Tom Bloor 25c0d06211 Add specific include for fileparse in validators 2017-04-23 17:23:35 +01:00
Tom Bloor fad90980f6 Removed unnecessary code and test 2017-04-23 17:02:01 +01:00
Tom Bloor 1598909958 Started on user day entry 2017-04-23 16:59:35 +01:00
Tom Bloor b03b7ccc5f Added error flag to validation errors and added age_range api endpoint 2017-04-23 14:02:10 +01:00
Tom Bloor 1d1b4aa1cf Change registration to be the same as the api docs 2017-04-22 19:35:19 +01:00
Tom Bloor a097db2017 Fix home page upload to use json api instead of seperate upload code 2017-04-21 23:38:12 +01:00
Tom Bloor 00b0687136 Fixed token administration 2017-04-21 22:48:47 +01:00
Tom Bloor 261751886b Remove final unused helper 2017-04-21 22:13:41 +01:00
Tom Bloor 3be6289fc3 Finish major rework of schema 2017-04-21 22:12:53 +01:00
Tom Bloor dd7862d93d Refactored AccountToken table 2017-04-21 21:28:50 +01:00
Tom Bloor f69b06bda2 Refactored customer table and fixed all tests form that 2017-04-21 21:20:47 +01:00
Tom Bloor d0cbb215d8 refactor user table and setup timestamp auto setting 2017-04-21 20:52:14 +01:00
Tom Bloor 6bfd516d76 Remove more old helpers and deprecate db helper 2017-04-21 20:03:51 +01:00
Tom Bloor 4c5f27976c Change proof storage to have a settable folder 2017-04-21 19:54:28 +01:00
Tom Bloor 8c424c02d3 Fix web portal upload basic form 2017-04-21 17:33:50 +01:00
Tom Bloor 786b69f54d Fix and refactor search test 2017-04-21 17:23:41 +01:00
Tom Bloor b48edea9fb Fixed admin-merge test after refactoring 2017-04-21 14:54:19 +01:00
Tom Bloor c40a480361 Refactored Pending and Valid orgs and admin-approve test 2017-04-21 14:14:51 +01:00
Tom Bloor 99ef319c3b Started refactoring pending orgs table 2017-04-21 12:42:31 +01:00
Tom Bloor 6596fd10aa Refactor Organisation table to easier column names 2017-04-20 22:17:13 +01:00
Tom Bloor e2cf58c895 Add reporting of pending orgs and transactions in admin section 2017-04-20 22:16:44 +01:00
Tom Bloor d1add8ee7c Added ability to upload a receipt from the user page 2017-04-20 17:33:59 +01:00
Tom Bloor 2cc670b58f Improve failed upload error 2017-04-20 14:02:30 +01:00
Tom Bloor e9f4888a8c Added filetype validation for upload 2017-04-20 13:58:45 +01:00
Tom Bloor 7f18aa7173 Refactor upload API to easier to read variables 2017-04-20 12:33:56 +01:00
Tom Bloor 94583f61bf Refactored entire api auth code, and upload endpoint 2017-04-20 01:27:18 +01:00
Tom Bloor 110a051a4e Fixed upload test and controller after updates to session key usage 2017-04-18 23:43:49 +01:00
Tom Bloor 5a1c6b0015 Removed all unneeded helpers from main codebase and removed deprecated
test
2017-04-18 22:44:59 +01:00
Tom Bloor 68b66d431c Reworked api login to just need a session_key for everything 2017-04-18 22:31:08 +01:00
Tom Bloor 1d02854c96 Initial work on Admin users page 2017-04-18 19:03:03 +01:00
Tom Bloor 13d1f8d4a7 Refactor session helper 2017-04-18 18:31:10 +01:00
Tom Bloor ddba771415 Update schema relationship name 2017-04-18 18:29:30 +01:00
Tom Bloor cf8154169b Refactor to use standard $c instead of $self 2017-04-18 17:38:58 +01:00
Tom Bloor a8b917808f Refactor dbh items in api register to dbic 2017-04-18 17:36:37 +01:00
Tom Bloor 98d4309b67 Move use statement and refactor register to use mojo validators 2017-04-18 12:38:39 +01:00
Tom Bloor 10738d7adc Move use statement to where its actually used 2017-04-18 10:59:30 +01:00
Tom Bloor 1466ea84eb Initial user admin page 2017-04-18 10:44:07 +01:00
Tom Bloor 36e8cfe1d0 Modified admin interfaces, factored common css out 2017-04-18 10:43:23 +01:00
Tom Bloor 208e45082f Fix issue with registration that was missed, fixed relationship name 2017-04-09 14:21:36 +01:00
Tom Bloor 1bb483bb5a Final minor pass of a full registration form on the website 2017-04-09 14:17:12 +01:00
Tom Bloor 704f429fa5 Added postcode validation and test for validators 2017-04-09 12:50:50 +01:00
Tom Bloor 0a32b05b6c Started working on registration page on website, with validation 2017-04-08 18:25:34 +01:00
Tom Bloor cb9819aa2e Added validation on Token adding and editing 2017-04-08 15:10:05 +01:00
Tom Bloor 58ab852f4c Added extra redirects and basic pages for getting between admin and user
side
2017-04-08 14:34:22 +01:00
Tom Bloor 30c80679be Move to single login page instead of seperate admin login 2017-04-08 14:25:06 +01:00
Tom Bloor a78de6ea8e Added admin test and logout function 2017-04-08 13:38:54 +01:00
Tom Bloor b10daa469a Added token administration page set 2017-04-08 02:32:13 +01:00
Tom Bloor 61d609861a Added initial admin login page and backend page with authentication 2017-04-07 00:33:50 +01:00
Tom Bloor 998259f0ae Move api authentication to under command, add Authentication plugin 2017-04-06 23:12:28 +01:00
Tom Bloor f2f2a543fa Moved all API endpoints under /api, fixed all tests 2017-04-06 22:43:27 +01:00
Tom Bloor dbc2c59461 Moved all api endpoints to /api/* and added root controller 2017-04-06 22:19:36 +01:00
Tom Bloor 8bda8dba73 Refactored more helpers to use DBIC 2017-04-06 00:19:20 +01:00
Tom Bloor ce038fd46d Fix bind mismatch of adding \n to a number 2017-04-06 00:01:01 +01:00
Tom Bloor eba73ca903 Refactor various parts in root app module 2017-04-05 23:20:42 +01:00
Tom Bloor a6e282ebb5 Refactor schema into attribute 2017-04-05 22:43:08 +01:00
Tom Bloor 1b55fbeeca Fix search to user uppercase saerch in database 2017-04-05 00:45:08 +01:00
Tom Bloor 85444b1c70 Make endpoints under /api apart form in testing 2017-04-05 00:44:49 +01:00
Tom Bloor affa51d1e6 Added documentation of Upload endpoint 2017-04-04 22:22:22 +01:00
Tom Bloor b6064cc985 Added header for use during dev 2017-04-04 22:21:57 +01:00
Paul Dill 15d474d4d1 Add debug log message to admin-approve API which had been missed. 2017-03-09 17:00:27 +00:00
Paul Dill fd05760943 More helpful blank login page. 2017-03-09 16:48:49 +00:00
Paul Dill 1cd9cc8721 User history API for how much they have spent tested and implemented. 2017-03-08 18:50:25 +00:00
Paul Dill c27e8d80fc Added admin-merge API and test. 2017-03-06 03:35:49 +00:00
Paul Dill ac2563237a Add return JSON value to upload API when adding a new organisation, fix admin-approve test and fix admin-approve bug. 2017-03-05 17:32:38 +00:00
Paul Dill 7bfa65f4c3 Code cleanup 2017-03-02 15:46:35 +00:00
Paul Dill 1eafaf4ab1 Moved to full Mojolicious app. 2017-02-24 19:27:43 +00:00