Commit graph

652 commits

Author SHA1 Message Date
Finn
1eb151d827 updated git ignore and commented out currently redundant code 2019-07-12 17:07:42 +01:00
Finn
94aced117d
updated git ignore and commented out currently redundant code 2019-07-12 17:07:42 +01:00
Finn
a6b818cf89 fixed date on import AGAIN 2019-07-12 16:08:02 +01:00
Finn
ee4e5a868c
fixed date on import AGAIN 2019-07-12 16:08:02 +01:00
Finn
87c5da4a9a Fixing import 2019-07-12 16:02:19 +01:00
Finn
275b9cef46
Fixing import 2019-07-12 16:02:19 +01:00
Finn
e625dc8ffe Moved and added data for graphs etc. for org dashboard 2019-07-12 13:39:37 +01:00
Finn
8f44e26a6d
Moved and added data for graphs etc. for org dashboard 2019-07-12 13:39:37 +01:00
Finn
13021934e3 Added extra snippet data 2019-07-11 12:44:04 +01:00
Finn
eeb7a852be
Added extra snippet data 2019-07-11 12:44:04 +01:00
Finn
745a82220f got rid of dwarn statements 2019-07-11 11:28:02 +01:00
Finn
5203df3d50
got rid of dwarn statements 2019-07-11 11:28:02 +01:00
Finn
95042d7359 Fully added working import and API 2019-07-10 17:23:27 +01:00
Finn
efbf8cbad7
Fully added working import and API 2019-07-10 17:23:27 +01:00
Finn
975c348299 made it proper numerics 2019-07-09 18:06:31 +01:00
Finn
aa2d429403
made it proper numerics 2019-07-09 18:06:31 +01:00
Finn
0a097afdfe Properly catch errors loading minions 2019-07-09 17:55:50 +01:00
Finn
1444574d26
Properly catch errors loading minions 2019-07-09 17:55:50 +01:00
Finn
8465c25c11 implemented API for transaction and supplier log 2019-07-09 16:25:32 +01:00
Finn
9c79e50eba
implemented API for transaction and supplier log 2019-07-09 16:25:32 +01:00
Finn
eb2a71ce65 fixed some api and import stuff 2019-07-09 13:50:26 +01:00
Finn
1c942f0be7
fixed some api and import stuff 2019-07-09 13:50:26 +01:00
Finn
1a66933693 Added properly working imports with minions and status 2019-07-08 18:12:35 +01:00
Finn
d0506c2a95
Added properly working imports with minions and status 2019-07-08 18:12:35 +01:00
Finn
ff19c81074 Wip on changing flow with the minion 2019-07-08 16:41:59 +01:00
Finn
22e6001362
Wip on changing flow with the minion 2019-07-08 16:41:59 +01:00
Finn
c7ef724a46 Merge remote-tracking branch 'origin/TBSliver/Minion-Tasks' into finn/minionimport 2019-07-05 18:50:37 +01:00
Finn
bc74496738
Merge remote-tracking branch 'origin/TBSliver/Minion-Tasks' into finn/minionimport 2019-07-05 18:50:37 +01:00
Finn
cdff24d599 Added nicer explosions via try::tiny 2019-07-05 18:44:46 +01:00
Finn
afc635fdb4
Added nicer explosions via try::tiny 2019-07-05 18:44:46 +01:00
Finn
795543391a Fully added Transaction importing 2019-07-05 17:56:21 +01:00
Finn
d1cd30928e
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
46b5496901
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
bf4b092a12
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
Finn
4b7550f569
added initial UI for uploading csv 2019-07-04 14:16:49 +01:00
Finn
57d06f994c added new relations 2019-07-03 17:36:36 +01:00
Finn
c456428681
added new relations 2019-07-03 17:36:36 +01:00
Thomas Bloor
b00e9e838c In progress commit 2019-07-02 15:21:01 +01:00
Thomas Bloor
bea1301475
In progress commit 2019-07-02 15:21:01 +01:00
Thomas Bloor
71d4a83400 added new transaction meta table 2019-06-28 15:23:18 +01:00
Thomas Bloor
1d22da2bed
added new transaction meta table 2019-06-28 15:23:18 +01:00
Finn
8bdc03eb5c added default 2018-06-18 12:10:08 +01:00
Finn
adb19e84f7 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
8d4c9703a0 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
2b0abd2606 added ability to edit icons and gt them in stats 2018-06-14 16:40:50 +01:00
Finn
aa9519e74e Added icon line to category schema 2018-06-12 12:19:23 +01:00
Finn
4323e49cfc Added icon line to category schema 2018-06-12 12:19:23 +01:00
Finn
3fdcb59130 Merge pull request #121 from Pear-Trading/TBSliver/Recur-Calc-Fix
Fix recurring transactions calculator for after-the-fact updates
2018-06-05 14:43:51 +01:00
Finn
b8b06c06fe
Merge pull request #121 from Pear-Trading/TBSliver/Recur-Calc-Fix
Fix recurring transactions calculator for after-the-fact updates
2018-06-05 14:43:51 +01:00
Thomas Bloor
07a36c2268 Fix recurring transactions calculator for after-the-fact updates 2018-05-24 15:16:28 +01:00
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
5faca4d792 made tests sane 2018-03-20 18:46:50 +00:00
Finn
49e5e91860 made tests sane 2018-03-20 18:46:50 +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