Commit Graph

312 Commits

Author SHA1 Message Date
Tim Gröger ef733e040a bugfix in ##172, forgot to load types 2020-03-01 20:35:12 +01:00
Tim Gröger 174bef1fce Merge branch 'feature/pricelist' into develop 2020-03-01 20:10:32 +01:00
Tim Gröger f0a2231a5b finished ##172
edit and add pricelist
edit and add drinktypes
2020-03-01 19:18:58 +01:00
Tim Gröger afa8945f66 add Icon to go to pricelist 2020-02-27 22:19:31 +01:00
Tim Gröger e0697b2a6d finished ##172 2020-02-27 21:54:28 +01:00
Tim Gröger 5d8befdaec Merge branch 'feature/user_storno' into develop 2020-02-27 16:02:41 +01:00
Tim Gröger 796e359463 better Button vor history in ##200 2020-02-27 15:59:10 +01:00
Tim Gröger af8584173e finished ##200
user can storno them transaktion
2020-02-27 15:52:58 +01:00
Tim Gröger 578f8923b3 Merge branch 'feature/serviceManegement' into develop 2020-02-26 20:12:59 +01:00
Tim Gröger e90dbf6513 finished ##169 and ##170
user can transact a Job, if the transact accepted the user can delete his job

user can decline or accept a jobrequest
2020-02-25 22:34:45 +01:00
Tim Gröger 917690eba3 finished ##192
user can delete his job if day not locked
2020-02-24 18:57:28 +01:00
Tim Gröger 9082b00567 finished ##186 2020-02-24 12:19:13 +01:00
Tim Gröger b6dfc45c46 finished ##184 2020-02-23 22:32:31 +01:00
Tim Gröger dadb31f376 finished ##188
for sm only send year, month, day. But you have to decrement month to send, because month starts with 0.
Also you have to increment month to get.
2020-02-23 11:19:53 +01:00
Tim Gröger 62af175884 finished ##168 2020-02-22 11:14:54 +01:00
Tim Gröger ae89781da1 destroy Interval to render every Second the History 2020-02-22 08:40:02 +01:00
Tim Gröger 3125e00a2a fixed ##181 2020-02-22 08:33:21 +01:00
Tim Gröger 6f4980dfb5 fixed ##180 2020-02-22 07:28:13 +01:00
Tim Gröger 75056fc932 Merge branch 'feature/info_message' into develop 2020-02-19 23:22:37 +01:00
Tim Gröger 20fb2f56de storno at 5 min for the baruser in geruecht ##164 2020-02-19 23:22:23 +01:00
Tim Gröger 211bb99d07 change name to 'Flaschengeist', add some logic that messages_navigation_drawer hide and show in tablet mode 2020-02-19 21:29:09 +01:00
Tim Gröger 08c8475ac1 add history 2020-02-16 20:35:13 +01:00
Tim Gröger a8ae06b3a8 transfer 2020-02-11 20:34:05 +01:00
Tim Gröger 4642d58a2c Merge branch 'feature/useroptions' into develop 2020-01-27 20:19:31 +01:00
Tim Gröger 3be0315993 add joboverview, so the user can see when he has to work 2020-01-27 19:56:56 +01:00
Tim Gröger 743018e9ed Merge remote-tracking branch 'origin/feature/useroptions' into feature/useroptions
# Conflicts:
#	src/plugins/routes.js
2020-01-26 23:57:00 +01:00
Tim Gröger 7d27421659 change icons and added userConfigChange 2020-01-26 23:55:59 +01:00
Tim Gröger 23d24658cf added userSkeleton for finanzer 2020-01-26 12:55:39 +01:00
Tim Gröger ba5a50c35f added loading utilities for every view 2020-01-23 23:25:21 +01:00
Tim Gröger 3bf0467726 upload skeleton 2020-01-23 21:10:04 +01:00
Tim Gröger 706c69803f add progress circal in user list for finanzer navigation 2020-01-23 13:24:12 +01:00
Tim Gröger db524355b5 added loading and fix bug thät sm delete user when switch months 2020-01-23 11:11:26 +01:00
Tim Gröger d6896d29b2 Merge branch 'feature/dienstverwaltung' into develop 2020-01-19 21:36:21 +01:00
Tim Gröger af542bb2e5 finished serviceManagement 2020-01-19 21:31:48 +01:00
Tim Gröger b724f83e84 added serviceManagement 2020-01-18 12:49:49 +01:00
Tim Gröger aa0279c5b8 Merge branch 'feature/user' into develop 2020-01-17 22:16:18 +01:00
Tim Gröger 8ef387ac55 added certs for ssl in development mode, layout with route finished 2020-01-17 22:11:19 +01:00
Tim Gröger 8f786d3883 new Layout and new Routes for router 2020-01-17 01:01:10 +01:00
Tim Gröger 708f40938a add search for baruser
TODO: maybe we can change the filter in finanzerview too
2020-01-14 23:10:09 +01:00
Tim Gröger 1bd0d87034 fix some bugs 2020-01-14 22:30:14 +01:00
Tim Gröger 4374eaa3d7 used prettier on code 2020-01-14 22:01:24 +01:00
Tim Gröger 40fdb109a6 Merge branch 'develop' of 192.168.5.2:newgeruecht-vue into develop 2020-01-14 21:55:49 +01:00
Tim Gröger bd91185edc add prettier to devdependencies 2020-01-14 21:55:41 +01:00
Tim Gröger dc76bf6e67 Merge branch 'feature/vuex' into develop 2020-01-14 19:59:18 +01:00
Tim Gröger 42996d8ad1 finish to use Vuex 2020-01-14 19:57:45 +01:00
Tim Gröger 9ba50a429c set namespaced in module finanzerUsers.js
todos: barview
2020-01-14 18:20:05 +01:00
Tim Gröger 398c7d7def start change commandlayout for vuex, FinanzerView.vue is ready
next steps: overview, table, user ...
2020-01-05 23:39:30 +01:00
Tim Gröger bb400f29d0 added actions for finanzer to send automaticly emails
some bugfixes
2020-01-05 14:17:06 +01:00
Tim Gröger 32a01cb5e3 bug fixes, that baruser see endsum of user not only month 2019-12-29 21:57:18 +01:00
Tim Gröger 88abb2599a finanzer can add useres to DB
in usercontent for finanzer, he can add amount or credit too
bug fixes
2019-12-29 21:35:32 +01:00