Commit graph

196 commits

Author SHA1 Message Date
Finn
8034844cec Merge pull request #50 from Pear-Trading/finn/TransactionViewAPI
Transaction API added
2017-09-06 17:52:56 +01:00
Finn
ebe6ccb33e Fixed page no 2017-09-06 17:03:53 +01:00
Tom Bloor
6ed0be4801 Use normal 1 instead of deferenced for proper inflation 2017-09-06 16:12:36 +01:00
Tom Bloor
8eda4f88b2 Fixed boolean inflation for User table 2017-09-06 16:11:57 +01:00
Tom Bloor
d2b769d471 Auto inflate correctly based on database type for booleans 2017-09-06 16:10:34 +01:00
Finn
4e7c8bbfae Created test and fixed things
Still needs to spit out timezone on the datetime
2017-09-05 17:24:04 +01:00
Finn
06858fc005 Added outgoing transaction list API 2017-09-05 16:37:31 +01:00
Finn
60e6b2717e Added ability for when there is no image 2017-09-05 13:52:05 +01:00
Finn
e7631dd90e Code for viewing single transaction added 2017-09-05 13:44:58 +01:00
Finn
cd6c075588 View Transactions from a User on their page 2017-09-05 12:27:37 +01:00
Tom Bloor
cae2806ad2 Merge pull request #44 from Pear-Trading/finn/StopSameOrgPurchase
Stopped Orgs from buying for themselves & added to test
2017-09-05 12:20:25 +01:00
Tom Bloor
1693bc7fb6 Merge pull request #45 from Pear-Trading/TBSliver/Org-Graph-Improvements
Added extra graph types
2017-09-05 12:19:18 +01:00
Finn
a463b99fa9 Stopped Orgs from buying for themselves & added to test 2017-09-05 12:03:49 +01:00
Tom Bloor
4ba6a443fc Stop null values on org graphs 2017-09-04 17:39:48 +01:00
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