Commit graph

490 commits

Author SHA1 Message Date
Finn
73d44feace added deleting and updating transactions 2018-03-20 18:43:00 +00:00
Finn
4affc1bd54 fixed to category viewing and recurring transaction data 2018-03-20 12:19:04 +00:00
Finn
2cf0678126 fixed to category viewing and recurring transaction data 2018-03-20 12:19:04 +00:00
Finn
5958f5edde Merge branch 'finn/translistchange' into finn/recurring 2018-03-15 16:05:44 +00:00
Finn
75ae16cd8d Merge branch 'finn/translistchange' into finn/recurring 2018-03-15 16:05:44 +00:00
Finn
3341053ca4 revamped transaction list view 2018-03-15 16:02:17 +00:00
Finn
b157ba0843 revamped transaction list view 2018-03-15 16:02:17 +00:00
Finn
9229f6ec92 removed transaction list code 2018-03-15 13:07:29 +00:00
Finn
3ceb926cd4 removed transaction list code 2018-03-15 13:07:29 +00:00
Finn
e75cc907f9 amended transactionlist code 2018-03-15 13:06:50 +00:00
Finn
60438ea51c amended transactionlist code 2018-03-15 13:06:50 +00:00
Finn
dfdf4b8104 fixed critical bugs introduced earlier and changed category viewing 2018-03-14 19:38:05 +00:00
Finn
551a40a9a0 fixed critical bugs introduced earlier and changed category viewing 2018-03-14 19:38:05 +00:00
Finn
bd36405fa8 amended api for recurring transaction list 2018-03-14 17:55:24 +00:00
Finn
d5e03cc9e3 amended api for recurring transaction list 2018-03-14 17:55:24 +00:00
Finn
37ffd53054 amended upload to allow for validation changes 2018-03-13 12:55:13 +00:00
Finn
0cb3426825 amended upload to allow for validation changes 2018-03-13 12:55:13 +00:00
Finn
0dfa3a8aa9 fully operational and functioning recurring script + changes to schema 2018-03-08 15:31:44 +00:00
Finn
bdf23b2f3d fully operational and functioning recurring script + changes to schema 2018-03-08 15:31:44 +00:00
Finn
f69a6266fe whitespace fix and created initial recurring transaction script 2018-03-07 18:08:11 +00:00
Finn
813cbb82a5 whitespace fix and created initial recurring transaction script 2018-03-07 18:08:11 +00:00
Finn
39c47a4983 Changed logic of storing recurring transactions 2018-03-07 15:34:41 +00:00
Finn
98cd134d84 Changed logic of storing recurring transactions 2018-03-07 15:34:41 +00:00
Finn
a7f2f7576e Fixed recurring purchase entry 2018-03-07 12:46:50 +00:00
Finn
d937e64663 Fixed recurring purchase entry 2018-03-07 12:46:50 +00:00
Finn
b2dfa36d35 Upgraded schema and made fixes 2018-03-05 16:18:17 +00:00
Finn
79324ff5f7 Upgraded schema and made fixes 2018-03-05 16:18:17 +00:00
Finn
26aba2cd9e added initial possible schema and ability to submit on transaction 2018-03-05 15:49:30 +00:00
Finn
786cd1618a added initial possible schema and ability to submit on transaction 2018-03-05 15:49:30 +00:00
Finn
d029bba1a9 Added initial for upload to accept recurring type 2018-03-05 15:37:01 +00:00
Finn
7aa93bf380 Added initial for upload to accept recurring type 2018-03-05 15:37:01 +00:00
Finn
8aacc32c71 Fixed code to ensure tests passed 2018-03-02 17:33:57 +00:00
Finn
712959c37e Fixed code to ensure tests passed 2018-03-02 17:33:57 +00:00
Finn
4ebe99f6ad removed debug line and unneeded code 2018-03-02 16:42:30 +00:00
Finn
1377742acd removed debug line and unneeded code 2018-03-02 16:42:30 +00:00
Finn
8db595c43b added fixes for budget view and working essential 2018-03-02 16:32:28 +00:00
Finn
ebcc79fd36 added fixes for budget view and working essential 2018-03-02 16:32:28 +00:00
Finn
18edad5f42 amended upload code to allow for essential purchases 2018-03-01 17:08:44 +00:00
Finn
396cb3c8f6 amended upload code to allow for essential purchases 2018-03-01 17:08:44 +00:00
Finn
46a2727ef8 Added placeholder API for user points 2018-02-05 14:58:55 +00:00
Finn
156af841c2 Added placeholder API for user points 2018-02-05 14:58:55 +00:00
Finn
8a48dc571b made placeholder more obvious 2018-01-31 12:54:14 +00:00
Finn
6879a8b3b8 made placeholder more obvious 2018-01-31 12:54:14 +00:00
Finn
e26a2330df Added routing and placeholder for medal data 2018-01-31 12:52:52 +00:00
Finn
613272f413 Added routing and placeholder for medal data 2018-01-31 12:52:52 +00:00
Finn
fb3582d2a9 Updated data view 2018-01-26 09:51:28 +00:00
Finn
1b74931248 Updated data view 2018-01-26 09:51:28 +00:00
Finn
1914f564fb category purchase list fully grouped 2018-01-24 13:19:35 +00:00
Finn
ecbcd205fe category purchase list fully grouped 2018-01-24 13:19:35 +00:00
Finn
4aae7fb3ea working API with arrays 2018-01-22 16:26:45 +00:00
Finn
6cd7df1259 working API with arrays 2018-01-22 16:26:45 +00:00
Finn
e524f1d421 fixed to admin interface categories & stats 2018-01-18 14:24:47 +00:00
Finn
e64e4bcbc8 fixed to admin interface categories & stats 2018-01-18 14:24:47 +00:00
Finn
8ec32e3b3c Changed logic for transaction list API 2018-01-17 17:38:24 +00:00
Finn
b247183914 Changed logic for transaction list API 2018-01-17 17:38:24 +00:00
Finn
8c9bcbf85c added further fix 2018-01-17 17:38:07 +00:00
Finn
de9d70432f added further fix 2018-01-17 17:38:07 +00:00
Finn
25f9d818f8 Fixed transaction ID edit 2018-01-17 17:36:55 +00:00
Finn
cd4f13bf8c Fixed transaction ID edit 2018-01-17 17:36:55 +00:00
Finn
005388b27e fixed api and quantised statement code 2018-01-17 17:14:50 +00:00
Finn
6fe4cd9a31 fixed api and quantised statement code 2018-01-17 17:14:50 +00:00
Finn
d3f0ebb62f Added initial ability to get transaction category list from month 2018-01-17 16:47:05 +00:00
Finn
b383284519 Added initial ability to get transaction category list from month 2018-01-17 16:47:05 +00:00
Finn
85a9647294 fixed delete checking for category on transaction 2018-01-16 14:52:16 +00:00
Finn
dddbb04023 fixed delete checking for category on transaction 2018-01-16 14:52:16 +00:00
Finn
5ad83795bd fixed reading transactions and category deletion 2018-01-16 14:47:17 +00:00
Finn
ad30cf9cd9 fixed reading transactions and category deletion 2018-01-16 14:47:17 +00:00
Finn
670d770d84 Fixed upload and added category read to transaction 2018-01-15 17:14:16 +00:00
Finn
1f70f9b40a Fixed upload and added category read to transaction 2018-01-15 17:14:16 +00:00
Finn
4e9312148c Fixed upload code 2018-01-15 17:01:59 +00:00
Finn
c4f68332b9 Fixed upload code 2018-01-15 17:01:59 +00:00
Finn
93de8fdf9e functional category loading and category in upload 2018-01-15 16:57:19 +00:00
Finn
175026e37e functional category loading and category in upload 2018-01-15 16:57:19 +00:00
Finn
f4cd25dd68 fixed faulty syntax 2018-01-15 14:34:02 +00:00
Finn
53b63aa655 fixed faulty syntax 2018-01-15 14:34:02 +00:00
Finn
5a88c283d5 added category API 2018-01-15 14:18:27 +00:00
Finn
4369a95054 added category API 2018-01-15 14:18:27 +00:00
Finn
b12cd3fcfc Categories admin interface fully implemented 2018-01-11 16:23:42 +00:00
Finn
4e74c871a2 Categories admin interface fully implemented 2018-01-11 16:23:42 +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
cc2360ab22
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
8be16867bb
Added fairly trading org field and change org transactions to show
purchases not sales
2018-01-02 19:57:12 +00:00
Finn
17ba1e75fd frontpage stats amended for sectors and weeks 2017-12-19 18:03:15 +00:00
Finn
bb254cb278 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
feeba76523 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
8e34f34bd6 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
cc0ca06470 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
3914ec44a8 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
74a1b3d238 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
88aa5becff 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
c4b7fa5102 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
b9a57c7dcb 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
b2627eea4f 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
f50c5e685c 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
8067d3cb96 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
8e1e9b2ec2 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
3100fec233 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
b3f1a018b5 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
e6c236e1ff 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
fb25cbe773 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
0b6d823145
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
1e02062ca3 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
8b91c3b3c8 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
4eb5a4fd3f 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
Finn
a95bfccdf9 Amended validation on orgs 2017-11-29 16:24:03 +00:00
Finn
f68479b5ac extra info fixed and test amended and fixtures changed 2017-11-27 17:16:22 +00:00
Finn
9a71c1b7f5 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
Finn
9adf9668b1 added location info to main map 2017-11-27 11:36:21 +00:00
Finn
96a9b152d1 extra org data added 2017-11-23 16:35:45 +00:00
Finn
460c9e6049 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
8ada3f86b6 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
0072a97a3a 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
8c166464cc database upgraded and interface added 2017-11-23 14:54:59 +00:00
Tom Bloor
b92ea1f7c6 Added logging on admin login endpoint 2017-11-21 10:42:23 +00:00
Tom Bloor
9f4d39e029
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
addd5c640c
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
9aaf3b4718
Added badges to users and pagination 2017-11-20 13:26:52 +00:00
Tom Bloor
baffe144f3 Added major merge code for merging organisations 2017-11-17 18:10:16 +00:00
Tom Bloor
14410b475a
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
f49fb93658
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
1015be7810
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
7df6fecfc4
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
37bc29829f
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
cb7ab797f5 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
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
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
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
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
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
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
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
Finn
9cfd5536b9 Removed redundant code and added error messages 2017-09-08 12:15:11 +01:00
Tom Bloor
83094f380d Continue defaulting to 0 as well 2017-09-08 12:03:48 +01:00
Tom Bloor
e13a128179 Add zero to sums to force number on output 2017-09-08 12:00:23 +01:00
Finn
662219fc6e Initial API for submission added 2017-09-08 11:41:21 +01:00
Tom Bloor
05c20b9e85 Added new snippets endpoints 2017-09-07 16:03:01 +01:00