Commit graph

154 commits

Author SHA1 Message Date
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 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