Commit graph

394 commits

Author SHA1 Message Date
Tom Bloor
ebfd162b07 Make leaderboard calc script executable 2017-09-08 13:12:56 +01:00
Tom Bloor
6de616584a Add customer_range graph 2017-09-08 12:47:20 +01:00
Tom Bloor
4176c61c00 Remove post user/day, and reformat validators 2017-09-08 12:46:54 +01:00
Tom Bloor
c6679e1261 Merge pull request #53 from Pear-Trading/TBSliver/Org-Snippets
Added org snippets endpoint
2017-09-07 16:25:21 +01:00
Tom Bloor
5a7bce28fd Merge branch 'TBSliver/Boolean-Fix' into development 2017-09-07 16:19:35 +01:00
Tom Bloor
d5dd71661d Fix inflation of booleans from database 2017-09-07 16:19:13 +01:00
Tom Bloor
ff466b4ed8 Added basic test for snippets data 2017-09-07 16:06:51 +01:00
Tom Bloor
05c20b9e85 Added new snippets endpoints 2017-09-07 16:03:01 +01:00
Finn
ebbbbd865a Merge pull request #52 from Pear-Trading/finn/DeleteTransaction
Added transaction delete and admin transaction test
2017-09-07 13:39:32 +01:00
Finn
54c2b7f64d Added count to test 2017-09-07 13:26:03 +01:00
Finn
edac93bef5 Changed deletion method to POST and working test 2017-09-07 13:20:53 +01:00
Finn
416ac6343a Added ability to delete transactions successfully 2017-09-07 12:53:01 +01:00
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
b4cdc2cfa6 Merge branch 'TBSliver/Table-Clearup' into development 2017-09-06 16:55:18 +01:00
Tom Bloor
b90534babb Fixed table clearup sql for migration 2017-09-06 16:55:05 +01:00
Tom Bloor
ca9dbcd822 Merge branch 'TBSliver/Spelling-Fail' into development 2017-09-06 16:49:27 +01:00
Tom Bloor
3d44bad077 Failed to spell schema correctly in migration script 2017-09-06 16:49:12 +01:00
Tom Bloor
076a6c98e8 Merge branch 'TBSliver/More-Postgres-Fixes' into development 2017-09-06 16:48:20 +01:00
Tom Bloor
941b89ca66 Missed a constraint 2017-09-06 16:48:06 +01:00
Tom Bloor
260cb1e752 Merge branch 'TBSliver/Postgres-Index-Fix' into development 2017-09-06 16:45:57 +01:00
Tom Bloor
007afbc394 Missed some tables required for migration, and dropping indecies for
postgres etc.
2017-09-06 16:45:29 +01:00
Tom Bloor
0eeae0d28d Fixed index which needed renaming for upgrade 2017-09-06 16:20:48 +01:00
Tom Bloor
d02f8f3931 Merge branch 'TBSliver/Postgres-Fixes' into development 2017-09-06 16:18:11 +01:00
Tom Bloor
f3335810b3 Change postgres upgrade script to use proper boolean defaults 2017-09-06 16:16:35 +01:00
Tom Bloor
2320ec7e23 Change postgres deploy to use false for boolean default value 2017-09-06 16:15:07 +01:00
Tom Bloor
681ccf1370 Change defaults to be pure false 2017-09-06 16:14:11 +01:00
Tom Bloor
2c718e4337 Fix layout issue in upload test and change to using pure json 2017-09-06 16:13:00 +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
bb239ba000 Merge pull request #47 from Pear-Trading/finn/ViewTransactionList
View Single Transactions
2017-09-05 14:21:43 +01:00
Finn
1d5fdadc56 Better "no transaction image" picture 2017-09-05 14:08:05 +01:00
Finn
42e1642344 Added viewing transactions from organisation and user list view 2017-09-05 13:58:57 +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
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