Pear-Trading/Foodloop-Server
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
698 commits 13 branches 26 tags 18 MiB
Commit graph

343 commits

Author SHA1 Message Date
Finn
b12cd3fcfc Categories admin interface fully implemented 2018-01-11 16:23:42 +00:00
Finn
8531d73930 Added transaction categories tables 2018-01-11 14:00:20 +00:00
Tom Bloor
6dd574e046 Add missed location updating in organisation edit on admin backend 2018-01-02 22:12:38 +00:00
Tom Bloor
725bebb00b Added fairly trading org field and change org transactions to show 
purchases not sales
 2018-01-02 19:57:12 +00:00
Tom Bloor
e29badb59d Added is_fair column for fairly trading organisations 2018-01-02 19:56:48 +00:00
Finn
17ba1e75fd frontpage stats amended for sectors and weeks 2017-12-19 18:03:15 +00:00
Finn
9f9a79c69d reverted fix and did different fix to order_by 2017-12-18 15:36:24 +00:00
Finn
b7493af6c6 added missing pg_or_sqlite sub 2017-12-18 15:08:15 +00:00
Finn
713fee37d6 fixed counts for sqlite vs postgres 2017-12-18 14:46:32 +00:00
Finn
e6ce9cc81a added support for mobile app back 2017-12-18 12:56:45 +00:00
Finn
2012e67273 sectors code added 2017-12-15 15:30:47 +00:00
Finn
7ffdfc5bd3 pie code made functional and relevant distance code updated 2017-12-15 14:59:38 +00:00
Finn
cb39b419d6 Added new stats and fixed test 2017-12-14 20:30:44 +00:00
Finn
12bd6b3ec9 org graphs and relevant test fixed 2017-12-14 17:25:00 +00:00
Finn
006cc7eb1e fixing graph code and added placeholder pie code 2017-12-14 17:20:06 +00:00
Finn
3b191e5c76 working graphs on frontend 2017-12-13 14:29:17 +00:00
Finn
5b745f666b made customer graphs work with passing test 2017-12-13 13:33:29 +00:00
Finn
536ab21551 fixed snippets if no values to get 2017-12-12 17:31:05 +00:00
Finn
1057eda445 added snippet endpoint and test 2017-12-12 17:21:32 +00:00
Finn
7d309755c6 adding paths and placeholder for customer dash API 2017-12-12 13:32:52 +00:00
Finn
cd59547311 schema and map code updated, test fixed 2017-12-08 13:19:22 +00:00
Finn
af7dcde7aa esta added to schema and updated admin interface 2017-12-08 12:30:49 +00:00
Finn
95398d2790 Merge pull request #81 from Pear-Trading/finn/linkcorrections 
added link corrections
 2017-12-08 11:27:44 +00:00
Finn
0b48c69612 added new tab linking and corrected redirect 2017-12-04 12:30:10 +00:00
Finn
d8403b8b11 Revert "added new tab linking and corrected redirect" 
This reverts commit 4eb5a4fd3f.
 2017-12-04 12:29:34 +00:00
Finn
e926d40779 added new tab linking and corrected redirect 2017-12-04 12:27:53 +00:00
Finn
36cd695ed5 Amended validation on orgs 2017-11-29 16:24:03 +00:00
Tom Bloor
f6f50d4932 Merge branch 'development' into TBSliver/Import-Fixes 2017-11-28 17:52:56 +00:00
Finn
f68479b5ac extra info fixed and test amended and fixtures changed 2017-11-27 17:16:22 +00:00
Finn
3f0f046c30 added location info to main map 2017-11-27 11:36:21 +00:00
Tom Bloor
9d8db81f2f Fix dev_data Command for testing 2017-11-23 16:52:52 +00:00
Tom Bloor
d718cfee42 Fixed issue with Importset for users and orgs trying to much data for 
the group by
 2017-11-23 16:52:33 +00:00
Finn
96a9b152d1 extra org data added 2017-11-23 16:35:45 +00:00
Finn
54dcbf6fb8 fixes added and working admin interface 2017-11-23 16:25:14 +00:00
Finn
8754ffd93a endpoint and code added for LIS orgs 2017-11-23 15:42:37 +00:00
Finn
a4b307ad6c database upgraded and interface added 2017-11-23 14:54:59 +00:00
Finn
f5b94098fb Entity Assoiciations added to database 2017-11-23 13:20:26 +00:00
Tom Bloor
d4ad360f38 Fixed schema issue for import value foreign key being set wrong 2017-11-21 11:13:04 +00:00
Tom Bloor
b92ea1f7c6 Added logging on admin login endpoint 2017-11-21 10:42:23 +00:00
Tom Bloor
832dab70cb dded minor logging to API login endpoint 2017-11-21 10:40:22 +00:00
Tom Bloor
733107539d Added badges to users and pagination 2017-11-20 13:26:52 +00:00
Tom Bloor
c3ae7a2615 Added badge on organisations showing if they are a user or not 2017-11-20 13:02:07 +00:00
Tom Bloor
baffe144f3 Added major merge code for merging organisations 2017-11-17 18:10:16 +00:00
Tom Bloor
91677034ca Finishing off CSV import functionality 2017-11-15 18:22:49 +00:00
Tom Bloor
423c68aca2 Allow for ignoring of values in import and toggle showing of them 2017-11-14 18:41:54 +00:00
Tom Bloor
9d07830e27 Added org lookup and assignment for import 2017-11-14 15:02:46 +00:00
Tom Bloor
f0b1540f3e Refactored csv import flash errors 2017-11-14 12:57:28 +00:00
Tom Bloor
b873e63d55 Merge branch 'development' into TBSliver/Admin-Improvements 
Conflicts:
	CHANGELOG.md
 2017-11-14 12:43:29 +00:00
Tom Bloor
72929bf86b Added assigning users to import values 2017-11-13 19:00:34 +00:00
Tom Bloor
9096bef00d Further work on import functions 2017-11-13 13:30:33 +00:00
Tom Bloor
593efcedfa Schema update for v 16 to include import lookups 2017-11-13 13:02:22 +00:00
Finn
105c9093b8 fixes 2017-11-10 18:39:00 +00:00
Finn
049b4836c5 Added code to leaderboard web app API 2017-11-10 17:07:41 +00:00
Finn
c4681ffc3a web app api leaderboard added 2017-11-10 16:45:58 +00:00
Tom Bloor
40dbd1eb50 Added ignore_value boolean to Import Value table 2017-10-27 12:10:52 +01:00
Tom Bloor
e09974f0d9 First pass of importing data 2017-10-26 17:01:23 +01:00
Tom Bloor
ef36cbc541 Add setting of is_local to organisations 2017-10-24 15:23:09 +01:00
Tom Bloor
d881b3f95f Added is_local flag to organisation table 2017-10-24 13:47:41 +01:00
Tom Bloor
dcd5896cea Added pagination to organisation listings 2017-10-24 13:31:04 +01:00
Tom Bloor
ed8607fd35 Combine organisation lists into one with badges for warnings 2017-10-23 17:44:38 +01:00
Tom Bloor
de90fe1f77 Added toggling of actioned on feedback, and view change for lists 2017-10-23 16:09:20 +01:00
Tom Bloor
0302a3d299 Upgrade to have actioned boolean on feedback - also fix boolean 
deployment defaults
 2017-10-23 15:46:30 +01:00
Tom Bloor
62881a0eda Added transaction distance calculation 2017-10-03 18:08:30 +01:00
Tom Bloor
37e8f0b46a Updated to allow for user updates to change location by postcode 2017-10-03 15:47:05 +01:00
Tom Bloor
202deb9178 Added output of location on User endpoint, and setting lat/long on user 
registration
 2017-10-03 15:33:43 +01:00
Tom Bloor
9e127b8851 Finalised Transaction report graph and test 2017-10-02 14:08:24 +01:00
Tom Bloor
e667947c65 Fix uninitialised warning 2017-09-29 16:14:02 +01:00
Tom Bloor
a739b02eed Allow for day scale of transaction report 2017-09-29 16:04:41 +01:00
Tom Bloor
cf2c7dcc4b Initial pass of Transaction reports 2017-09-29 14:45:44 +01:00
Tom Bloor
c3519fa4df Improved Feedback list page 2017-09-28 16:39:16 +01:00
Tom Bloor
5e078f8f8b Added supplier location endpoint 2017-09-27 18:01:06 +01:00
Tom Bloor
0486d910ee Added script for setting up lat/long in db and showing in admin panels 2017-09-22 12:35:12 +01:00
Tom Bloor
bfcacbee32 Added schema upgrade for transaction distance 2017-09-22 12:32:02 +01:00
Tom Bloor
62cad2d70e Added distance to transaction column 2017-09-21 17:25:55 +01:00
Tom Bloor
e2e4e4769d Added upgrade DDL for lat-long on customers and orgs 2017-09-21 17:06:50 +01:00
Tom Bloor
a810795ca5 Added lat and long to customers and organisations 2017-09-21 17:01:10 +01:00
Tom Bloor
ad51891f51 Made script able to import into database 2017-09-21 16:57:14 +01:00
Tom Bloor
db1bbab10f Upgrade for postcode data table 2017-09-21 16:47:02 +01:00
Tom Bloor
3e87326265 Added otucode listings for codepoint_open command 2017-09-21 15:52:01 +01:00
Tom Bloor
f056199ec1 Merge branch 'development' into TBSliver/Postcode-Location 2017-09-21 15:49:27 +01:00
Tom Bloor
5a80d57ca2 Added table for storing postcodes 2017-09-21 15:48:25 +01:00
Tom Bloor
119774e434 First pass of codepoint_open importer 2017-09-21 15:17:45 +01:00
Finn
22bdb625f0 Added datetime format 2017-09-19 17:40:17 +01:00
Finn
5f241bbd46 Tests fixed and API improved and DB upgraded 2017-09-19 17:23:30 +01:00
Finn
8e2cecfcf5 added read API 2017-09-19 15:50:58 +01:00
Finn
813f4af63f New routes added 2017-09-19 14:41:11 +01:00
Finn
e388d360ac Changed endpoints in API 2017-09-18 17:26:35 +01:00
Finn
616181def3 Payroll sumission API improved and test added 2017-09-18 17:13:18 +01:00
Finn
b224182e61 Merge branch 'development' into finn/OrgDataAPI 2017-09-18 15:39:14 +01:00
Finn
9cb4f7c782 Added error rewrites and added feedback test 2017-09-18 13:31:30 +01:00
Finn
9e56383b46 User and Register API errors improved 2017-09-18 11:34:22 +01:00
Finn
dd36cd0c0c Feedback API error improved 2017-09-18 11:31:57 +01:00
Finn
414acd76fb Transaction API errors improved 2017-09-18 11:11:53 +01:00
Tom Bloor
99cb3e888e Merge pull request #57 from Pear-Trading/finn/interfacechange 
Changed routing on submission
 2017-09-15 13:09:50 +01:00
Tom Bloor
25511ced69 Fix calculation mistake on leadearboard display 2017-09-15 12:54:36 +01:00
Finn
d1757bdac9 Changed routing on submission 2017-09-15 11:18:27 +01:00
Tom Bloor
1ffabb3e94 Updated all endpoints to use new transaction value multiple 2017-09-13 16:07:23 +01:00
Tom Bloor
b34e47215a Change to using straight numeric columns with no decimal points 2017-09-13 15:23:48 +01:00
Tom Bloor
66f4844835 Merge pull request #55 from Pear-Trading/TBSliver/Large-Graph 
Added large graph items
 2017-09-08 15:41:10 +01:00
Finn
26a37904d2 Naming sanitised 2017-09-08 13:00:42 +01:00