Commit Graph

521 Commits

Author SHA1 Message Date
Tim Gröger f98b3d72fc Merge branch 'develop' into feature/balance 2021-04-19 09:30:50 +02:00
Tim Gröger 95867428a8 [core] draggable shortcutlinks 2021-04-18 23:43:16 +02:00
Tim Gröger 3c7d711f59 [core] dynamic shortcutlinks 2021-04-18 23:26:54 +02:00
Tim Gröger 81c5b10101 [core] change style of menulinks in drawer 2021-04-18 22:33:32 +02:00
Tim Gröger d2044975db [balance] sortable balance in adminpage 2021-04-18 11:20:46 +02:00
Tim Gröger ea01742e00 [balance] show history of last 3hours 2021-04-18 10:43:22 +02:00
Tim Gröger 7395b1f288 [balance] fix some style for mobile 2021-04-18 10:41:37 +02:00
Tim Gröger 57e468f1f4 [balance] modify limit of one user in admin page 2021-04-18 00:42:21 +02:00
Tim Gröger 5e8f4bc86a [balance] show receiver or sender in overview 2021-04-18 00:23:14 +02:00
Tim Gröger ca9e4bdbcb [balance] fix context to add shortcuts 2021-04-18 00:01:52 +02:00
Tim Gröger 561025d646 [balance] modify balance transfer in admin page 2021-04-17 23:48:28 +02:00
Tim Gröger 955942ac8d [balance] modify balance in admin page 2021-04-17 23:15:08 +02:00
Tim Gröger dc58fa8e1d [balance] add limits
set limits for all users
get limits for all users
2021-04-17 22:08:43 +02:00
Tim Gröger a83ba72cfa [balance] fix sort in overview 2021-04-17 20:37:21 +02:00
Tim Gröger a8a6cd8814 Merge branch 'feature/pricelist' into develop 2021-04-17 18:32:06 +02:00
Tim Gröger 18d0098bb3 [pricelist][#6] draggable change of order of pricelist columns 2021-04-17 18:26:21 +02:00
Tim Gröger be347225c4 [pricelist] some more style 2021-04-17 14:44:25 +02:00
Tim Gröger e2b46d96b9 [pricelist] clean style tags 2021-04-17 14:17:42 +02:00
Tim Gröger 6e74105f38 [pricelist] clean styele extraIngredients 2021-04-17 13:58:27 +02:00
Tim Gröger ae5212bbfc [pricelist] clean style drinkType 2021-04-17 13:40:03 +02:00
Tim Gröger 2a11964c4b [pricelist][electron] add electron 2021-04-17 12:36:19 +02:00
Tim Gröger e0bf8f77bf [pricelist][fix] real fix for loading pictures in cordova 2021-04-16 17:19:34 +02:00
Tim Gröger c76da59290 [pricelist][fix] cordova loading pictures 2021-04-16 16:50:58 +02:00
Tim Gröger 52ae8fce29 [pricelist] add fullscreen for pricelist 2021-04-15 23:07:03 +02:00
Tim Gröger f7a6f3fbe1 [pricelist] add useroption for pricelist_view 2021-04-15 22:54:40 +02:00
Tim Gröger 8ee5c891a5 [pricelist] add pricelist as list 2021-04-15 22:04:33 +02:00
Tim Gröger 479dfd658a [pricelist] add some more permissions 2021-04-15 15:40:40 +02:00
Tim Gröger 97dcc8e602 Merge remote-tracking branch 'origin/develop' into feature/pricelist 2021-04-15 15:36:35 +02:00
Tim Gröger a376fd7cc2 [pricelist] fix update volume when ingredients changed 2021-04-15 15:35:08 +02:00
Tim Gröger 8b21ccf978 [pricelist] add permissions 2021-04-14 22:42:09 +02:00
Tim Gröger cee6eda585 [pricelist] delete visibleColumns 2021-04-14 20:11:44 +02:00
Tim Gröger dc948e6f11 [pricelist][prettier] some style up 2021-04-14 19:44:53 +02:00
Tim Gröger 86bb722623 [pricelist] no change of cost_per_volume if volumes has ingredients 2021-04-14 19:43:32 +02:00
Tim Gröger 0df2677b1b [pricelist](issue #4) add warning when price is less then min_price 2021-04-14 19:39:28 +02:00
Tim Gröger 43397fe3a7 [pricelist] dont show 'add ingredients' if cost_per_volume exists 2021-04-14 19:13:47 +02:00
Tim Gröger 851c5a0588 [pricelist] sync min_prices if changing 2021-04-14 18:53:17 +02:00
Tim Gröger 0626cf993f [pricelist] cleanup some code 2021-04-13 16:20:32 +02:00
Tim Gröger 9b0679278c [pricelist][cocktailbuilder] fix new ingredient component 2021-04-12 06:45:18 +02:00
Tim Gröger b40b1064e7 [pricelist][calculation] can add new drink 2021-04-11 23:11:43 +02:00
Tim Gröger 06256f651a [pricelist][calculation] modify picture 2021-04-11 22:08:59 +02:00
Tim Gröger e90dc4c306 [pricelist][calculation] stable version of new view 2021-04-11 16:29:11 +02:00
Tim Gröger 8c321fb8ca [pricelist] modify ingredients without saving 2021-04-10 23:05:03 +02:00
Tim Gröger 459a9fea08 [pricelist] fix copy object of state 2021-04-10 00:14:39 +02:00
Tim Gröger 7a3a151688 [pricelist] cleanup some code 2021-04-09 23:49:49 +02:00
Tim Gröger 1c64dbbaf6 [pricelist][calculation] add edit-button 2021-04-06 22:45:33 +02:00
Ferdinand Thiessen 4e340e5bea [core] Updates dependencies 2021-04-06 16:04:17 +02:00
Tim Gröger 89cd109587 [pricelist][calculation] fixed overloade 2021-04-04 23:20:53 +02:00
Ferdinand Thiessen 010ad6e107 [notifications] Fixed icon names 2021-04-04 22:55:11 +02:00
Ferdinand Thiessen 6f053d849a [utils] IsoDateTime, do not set time if used as date input 2021-04-04 21:38:27 +02:00
Tim Gröger f5b370e743 [pricelist][calculation] update grid view 2021-04-03 22:39:06 +02:00