Lukas Fürderer
97a7f3a8ad
Fix the warehouse diagrams on the dashboard
...
- Show the correct utilization
- Display values as correct percentages
Closes #99
2020-06-20 23:54:33 +02:00
CodeSteak
fa75beb9c4
Fix 6284a4d7bf altering template
2020-06-20 22:09:25 +02:00
Jannik
4bef17dc0a
Merge pull request 'feature/dashboard' ( #83 ) from feature/dashboard into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-06-19 14:12:44 +02:00
bcbebe8e8d
master merged into feature/customer_orders
2020-06-18 01:11:11 +02:00
187656814e
String Error -> Enum ErrorHandling Logic removed from model class
2020-06-18 00:50:43 +02:00
Lukas Fürderer
93cfbb4a27
Merge remote-tracking branch 'origin/master'
2020-06-17 18:59:10 +02:00
Lukas Fürderer
68cc35cec3
Fix typo 6
2020-06-17 18:57:42 +02:00
Lukas Fürderer
b2ee048f25
Fix typo 5
2020-06-17 18:57:23 +02:00
Lukas Fürderer
020a30474e
Fix typo 4
2020-06-17 18:56:32 +02:00
Lukas Fürderer
4bfc8a2cc6
Fix typo 3
2020-06-17 18:56:02 +02:00
Lukas Fürderer
0ff873baaa
Fix typo 2
2020-06-17 18:55:50 +02:00
Jannik
2442a477c8
add missing "|"
2020-06-17 18:43:06 +02:00
CodeSteak
e6c068e71a
Secretly fix number 0 showing on 'Warenkorb'
2020-06-17 00:23:05 +02:00
CodeSteak
86e3ced19b
Secretly fix searchbar not showing term when searching
2020-06-17 00:17:50 +02:00
CodeSteak
44df9e4b4f
Secretly add Favicon
2020-06-17 00:11:55 +02:00
CodeSteak
486f237135
fix creditcard num not being set leading to crash
2020-06-16 23:50:10 +02:00
e904eba7a4
Merge remote-tracking branch 'origin/feature/manual_cronjobs' into feature/dashboard
...
Butfixes
2020-06-15 21:41:54 +02:00
6284a4d7bf
Dashboard working
2020-06-15 17:47:55 +02:00
Lukas Fürderer
3b364ae815
Allow employees to trigger cronjobs manually
2020-06-15 16:23:42 +02:00
Hendrik Schutter
0a7722d612
removed register user type and ad
2020-06-15 09:40:32 +02:00
Hannes Huber
fa610cae3b
if no orders show hint
2020-06-14 17:56:09 +02:00
0ab185f143
impl trackingID for the UserController
2020-06-13 21:59:18 +02:00
266bba095a
merged feature/customer_orders with master
2020-06-13 19:58:30 +02:00
Jannik
30226c5c19
Merge pull request 'fixes_ui' ( #66 ) from fixes_ui into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-06-13 11:03:20 +02:00
Hendrik Schutter
e0e853a575
fixes from PR review
2020-06-13 10:41:59 +02:00
Hendrik Schutter
0f7d248d40
add radio BTNs to register
2020-06-12 23:31:57 +02:00
CodeSteak
11ade7b8f9
fix missing cells in TODO-Warehouse. fixes #63
2020-06-12 19:57:50 +02:00
Hannes Huber
1590821f64
delete bonuspoints and notifications html
2020-06-12 11:15:05 +02:00
Hannes Huber
c194f44308
implement customers detail bookings
2020-06-10 19:28:12 +02:00
Hannes Huber
49e26039a3
implement customers detail part 1
2020-06-10 19:27:38 +02:00
Hannes Huber
5691f0eeec
implement customers index
2020-06-10 19:27:16 +02:00
Jannik
7f643987f3
fix wrong closing tags in customerOrder/id.html
2020-06-10 19:12:34 +02:00
Jannik
6b8bf25e0e
Merge pull request 'feature/cash_bookings' ( #55 ) from feature/cash_bookings into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-06-10 19:04:45 +02:00
ebeba72278
impl tracking ID
2020-06-10 17:03:59 +02:00
f671baf7f0
Error with package path
2020-06-10 14:51:12 +02:00
Lukas Fürderer
691916894f
Apply some changes according to comments on the pullrequest
2020-06-10 11:48:38 +02:00
Lukas Fürderer
03d557d67b
Show a hyphen in supplier column if an article is not offered by anyone
...
Closes #54
2020-06-08 18:56:35 +02:00
Lukas Fürderer
8fff0e2dca
Merge remote-tracking branch 'origin/master' into feature/cash_bookings
2020-06-08 18:15:34 +02:00
CodeSteak
78a7ad053a
Merge branch 'master' into feature/intern_warehouse
2020-06-08 09:22:06 +02:00
CodeSteak
f6554629d7
Merge branch 'master' into feature/intern_warehouse
2020-06-08 09:14:50 +02:00
Hendrik Schutter
99612165f5
fixed review requests
2020-06-07 11:44:50 +02:00
Hendrik Schutter
9dff6adb3d
rebase to master
2020-06-05 21:25:38 +02:00
Hendrik Schutter
445b504188
code cleanup
2020-06-05 21:20:54 +02:00
Hendrik Schutter
bd8b3db7f3
added post form for marking order as delivered
2020-06-05 21:18:04 +02:00
Hendrik Schutter
8a4ff4cfa5
added supplier bookings table
2020-06-05 21:18:04 +02:00
Hendrik Schutter
2245309198
added supplier balance label
2020-06-05 21:18:04 +02:00
Hendrik Schutter
d078c44027
finished supplier orders
2020-06-05 21:18:04 +02:00
Hendrik Schutter
bd8b07990b
finished show orders based on supplier
2020-06-05 21:18:04 +02:00
Hendrik Schutter
2f4c45ed71
show orders based on supplier
2020-06-05 21:18:04 +02:00
Hendrik Schutter
b600040bf3
basic detail page for supplier
2020-06-05 21:18:04 +02:00
Lukas Fürderer
CodeSteak
Jannik
Philipp Schweizer
Danny
Hendrik Schutter
Hannes Huber