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 |
|
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 |
|