Commit graph

643 commits

Author SHA1 Message Date
Thomas Bloor
25b6b3a9a4
Fix recurring transactions calculator for after-the-fact updates 2018-05-24 15:16:28 +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
6741aba746 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
779a6e77ff Added category all time purchase list 2018-05-22 12:23:17 +01:00
Finn
51e045287b added being able to work with yearly submit 2018-05-15 16:51:39 +01:00
Finn
6d2cbecffa added being able to work with yearly submit 2018-05-15 16:51:39 +01:00
Thomas Bloor
ab1c1f6c35 Merge branch 'development' into TBSliver/Minion-Tasks 2018-04-16 12:49:59 +01:00
Thomas Bloor
c3ac620a2d
Merge branch 'development' into TBSliver/Minion-Tasks 2018-04-16 12:49:59 +01:00
Finn
2d92ac2f03 changed stat viewing and amended tests 2018-04-13 18:08:10 +01:00
Finn
a4bcd9c6d7 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
78fdfc1e1d 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
bc92d2eb11 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
9284218431 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
b036d5494b 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
4b4d50de07 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
4844174ead
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
Finn
e817dc29b1 fixed display error 2018-03-21 17:58:50 +00:00
Thomas Bloor
9b761ee343 Allow for parsing currency without a currency sign in front 2018-03-21 17:24:55 +00:00
Thomas Bloor
2286e54104
Allow for parsing currency without a currency sign in front 2018-03-21 17:24:55 +00:00
Thomas Bloor
b937badc6e Stop error on large csv exceeding size of cookies 2018-03-21 17:24:41 +00:00
Thomas Bloor
2b5bb9cd8c
Stop error on large csv exceeding size of cookies 2018-03-21 17:24:41 +00:00
Thomas Bloor
9f71971249 Set secrets with decent default for production 2018-03-21 17:24:13 +00:00
Thomas Bloor
2d03d25916
Set secrets with decent default for production 2018-03-21 17:24:13 +00:00
Thomas Bloor
30c210200f Created role for Minion Jobs to make dev easier 2018-03-21 17:14:51 +00:00
Thomas Bloor
3514a9e0ed
Created role for Minion Jobs to make dev easier 2018-03-21 17:14:51 +00:00
Finn
a02c74d830 customer stats test fixed 2018-03-21 16:01:46 +00:00
Finn
c5341af3e7 customer stats test fixed 2018-03-21 16:01:46 +00:00
Finn
be0571f90b fixed category list on postgres 2018-03-21 15:52:00 +00:00
Finn
6527d1e36c fixed category list on postgres 2018-03-21 15:52:00 +00:00
Thomas Bloor
c0375dcd41 Stopped example job being enqueued if Minion is enabled 2018-03-20 19:25:32 +00:00
Thomas Bloor
a53479c6c8
Stopped example job being enqueued if Minion is enabled 2018-03-20 19:25:32 +00:00
Thomas Bloor
4476246048 Added initial Minion support and example test job 2018-03-20 19:24:48 +00:00
Thomas Bloor
1302f9e843
Added initial Minion support and example test job 2018-03-20 19:24:48 +00:00
Finn
b63adc590c fixed transaction test for updating and deleting 2018-03-20 18:54:55 +00:00
Finn
4ff3f07f9a 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
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
bc3574561e fix DDL 2018-03-09 17:44:47 +00:00
Finn
fdea4be36f fix DDL 2018-03-09 17:44:47 +00:00
Finn
8c885000a5 hotfix to medal schema data types 2018-03-09 17:38:12 +00:00
Finn
af43a3ce9f hotfix to medal schema data types 2018-03-09 17:38:12 +00:00
Finn
87a03c1e40 changed logic of start time for transaction and submitted time 2018-03-08 16:41:45 +00:00
Finn
d4d1b841d7 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
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
f966c1a5a1 added essential flag to transactions in schema 2018-03-01 17:08:30 +00:00
Finn
28a33cf27f 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
f519bb9f2f 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
413479b94f 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
940d96921c 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
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
f79ec09782 redid relationships of transactions/categories 2018-01-16 13:07:12 +00:00
Finn
8a0f933f07 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
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
Finn
8531d73930 Added transaction categories tables 2018-01-11 14:00:20 +00:00
Finn
c2a099c3e2 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
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
Tom Bloor
e29badb59d Added is_fair column for fairly trading organisations 2018-01-02 19:56:48 +00:00
Tom Bloor
d4ff855251
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
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
Tom Bloor
f6f50d4932 Merge branch 'development' into TBSliver/Import-Fixes 2017-11-28 17:52:56 +00:00
Tom Bloor
843037ea78
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
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
Tom Bloor
9d8db81f2f Fix dev_data Command for testing 2017-11-23 16:52:52 +00:00
Tom Bloor
1bc56016e7 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