Finn
|
87a03c1e40
|
changed logic of start time for transaction and submitted time
|
2018-03-08 16:41:45 +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
|
f966c1a5a1
|
added essential flag to transactions in schema
|
2018-03-01 17:08:30 +00:00 |
|
Finn
|
9563851941
|
Fixed schema and added update for sql
|
2018-02-21 12:51:43 +00:00 |
|
Finn
|
62dbc1a49e
|
fixed table name and added initial org medal schema
|
2018-02-20 17:44:22 +00:00 |
|
Finn
|
5171a88db2
|
Added initial schema for medals
|
2018-02-20 17:20:51 +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
|
f79ec09782
|
redid relationships of transactions/categories
|
2018-01-16 13:07:12 +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 |
|
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 |
|