Commit graph

333 commits

Author SHA1 Message Date
Finn
795543391a Fully added Transaction importing 2019-07-05 17:56:21 +01:00
Finn
28c9ee8f65 Added submitting Transactions (currently breaking on headers) 2019-07-05 16:52:32 +01:00
Finn
c814085630 Added in importing Supplier CSV 2019-07-05 15:30:31 +01:00
Finn
c9fce1c887 added initial UI for uploading csv 2019-07-04 14:16:49 +01:00
Thomas Bloor
b00e9e838c In progress commit 2019-07-02 15:21:01 +01:00
Finn
8bdc03eb5c added default 2018-06-18 12:10:08 +01:00
Finn
8065719a4e got rid of Dwarn 2018-06-14 16:47:36 +01:00
Finn
626ba6a542 added ability to edit icons and gt them in stats 2018-06-14 16:40:50 +01:00
Finn
db71cab2d4 Removed sector data API for customer
Should eventually be given to organisation dashboard
2018-05-22 12:47:19 +01:00
Finn
081274c78e Added category all time purchase list 2018-05-22 12:23:17 +01:00
Finn
2d92ac2f03 changed stat viewing and amended tests 2018-04-13 18:08:10 +01:00
Finn
662db25c3c added month listing 2018-04-11 19:10:19 +01:00
Finn
45f0edef47 essential data added for bar chart 2018-04-09 19:21:14 +01:00
Finn
e7dee61433 changed pie data structure 2018-04-05 17:19:53 +01:00
Finn
5f324dd00a changing pie format (broken) 2018-03-26 14:44:03 +01:00
Finn
3a738a1000 Amended category listing 2018-03-26 14:43:23 +01:00
Finn
8a12442eac Merge pull request #113 from Pear-Trading/finn/statfix
fixed display error
2018-03-22 14:53:07 +00:00
Finn
81e171c413 fixed display error 2018-03-21 17:58:50 +00:00
Thomas Bloor
b937badc6e Stop error on large csv exceeding size of cookies 2018-03-21 17:24:41 +00:00
Finn
be0571f90b fixed category list on postgres 2018-03-21 15:52:00 +00:00
Finn
b63adc590c fixed transaction test for updating and deleting 2018-03-20 18:54:55 +00:00
Finn
504fec5207 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
5958f5edde 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
9229f6ec92 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
dfdf4b8104 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
37ffd53054 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
f69a6266fe 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
a7f2f7576e 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
26aba2cd9e 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
8aacc32c71 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
8db595c43b 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
46a2727ef8 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
e26a2330df 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
1914f564fb 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
e524f1d421 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
8c9bcbf85c 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
005388b27e 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
85a9647294 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
670d770d84 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
93de8fdf9e 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
5a88c283d5 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
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
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
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
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
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
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