Commit graph

710 commits

Author SHA1 Message Date
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
e330812cf8 Merge pull request #46 from Pear-Trading/finn/ViewUserTransactions
View Transactions from a User on their page
2017-09-05 12:39:06 +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
5452dac826 Merge pull request #43 from Pear-Trading/finn/OrgAccountUpdatefix
fixing account edit for org
2017-09-04 17:26:49 +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
Finn
537048b506 Merge pull request #41 from Pear-Trading/TBSliver/Schema-Changes
Major schema changes
2017-09-04 14:31:20 +01:00
Tom Bloor
161d50e095 Fix editing user in Admin 2017-09-04 14:10:38 +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
2594d826ef Finished upgrade to schema for entity upgrade 2017-09-04 14:03:39 +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
96c8fa16c8 fixed resultset_leaderboard schema test for entity changes 2017-08-31 18:28:36 +01:00
Tom Bloor
44c29ad7a2 Fixed leaderboard_trend test for entity upgrade 2017-08-31 18:27:44 +01:00
Tom Bloor
66cc99b975 Fixed schema leaderboard test for entity changes 2017-08-31 18:26:19 +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
1ab2d0b71c Added new search data fixtures 2017-08-31 16:58:23 +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
815056b771 Fix error in fixtures data 2017-08-31 16:35:51 +01:00
Tom Bloor
5d425df4f8 Merge branch 'development' 2017-08-31 15:32:57 +01:00
Tom Bloor
758089bad1 Removed pending_read template as uneccessary now 2017-08-31 14:53:04 +01:00
Tom Bloor
92afe1c531 Fix admin organisation management tests 2017-08-31 14:52:45 +01:00
Tom Bloor
0159ef91dc Fix undef issue on valid_read template 2017-08-31 14:52:25 +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
6cd3113912 Updated basic test to use fixtures 2017-08-31 13:21:00 +01:00
Tom Bloor
0b6bb47072 Added documentation for user fixtures 2017-08-31 13:20:06 +01:00
Tom Bloor
d4ccd0b7a2 Update user fixtures with new entity code 2017-08-31 13:18:04 +01:00
Tom Bloor
bd8b1f91a4 Merge branch 'development' into TBSliver/Schema-Changes 2017-08-31 13:07:23 +01:00
Finn
db63b5b3cf Merge pull request #40 from Pear-Trading/finn/ReceiptListImprove
Added timings and descending submit at time for receipts
2017-08-31 13:06:31 +01:00
Tom Bloor
6b9e1763b8 Added schema graph for v6 2017-08-31 12:54:41 +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