ef07447abc
fix json-file
2020-06-17 20:42:08 +02:00
bb7b35dc28
Increase the amount of commits
2020-06-17 19:00:49 +02:00
93cfbb4a27
Merge remote-tracking branch 'origin/master'
2020-06-17 18:59:10 +02:00
68cc35cec3
Fix typo 6
2020-06-17 18:57:42 +02:00
b2ee048f25
Fix typo 5
2020-06-17 18:57:23 +02:00
020a30474e
Fix typo 4
2020-06-17 18:56:32 +02:00
4bfc8a2cc6
Fix typo 3
2020-06-17 18:56:02 +02:00
0ff873baaa
Fix typo 2
2020-06-17 18:55:50 +02:00
1812c89994
Fix typo
2020-06-17 18:55:29 +02:00
2442a477c8
add missing "|"
2020-06-17 18:43:06 +02:00
e6c068e71a
Secretly fix number 0 showing on 'Warenkorb'
2020-06-17 00:23:05 +02:00
86e3ced19b
Secretly fix searchbar not showing term when searching
2020-06-17 00:17:50 +02:00
44df9e4b4f
Secretly add Favicon
2020-06-17 00:11:55 +02:00
18cbfbf148
Fix template strings with a starting "/"
2020-06-17 00:02:46 +02:00
e037b75f7c
Merge pull request 'fix creditcard num not being set leading to crash' ( #82 ) from feature/80_fix_creditcardnum_null_usersettings into master
2020-06-16 23:51:25 +02:00
486f237135
fix creditcard num not being set leading to crash
2020-06-16 23:50:10 +02:00
396d3fda14
Merge pull request 'Fix not creating directory when uploading file' ( #80 ) from feature/fix_uploading_images into master
2020-06-16 23:40:12 +02:00
3b1d378968
Fix not creating directory when uploading file
2020-06-16 23:38:35 +02:00
8199bd8a23
Merge pull request 'Allow employees to trigger cronjobs manually' ( #74 ) from feature/manual_cronjobs into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-06-16 19:29:38 +02:00
3b364ae815
Allow employees to trigger cronjobs manually
2020-06-15 16:23:42 +02:00
2ba4968556
Merge pull request 'feature/create_admin' ( #73 ) from feature/create_admin into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-06-15 11:18:59 +02:00
18f35c43e7
remove spaces
2020-06-15 10:46:04 +02:00
709c80fa37
add fist admin user after start
2020-06-15 10:43:16 +02:00
87bade71b4
Dateien hochladen nach „supplier/config“
2020-06-15 10:20:40 +02:00
b6eb66e348
Dateien hochladen nach „supplier/config“
2020-06-15 10:19:16 +02:00
0a7722d612
removed register user type and ad
2020-06-15 09:40:32 +02:00
985169117d
fix nullpointer in settings
2020-06-14 18:19:59 +02:00
fa610cae3b
if no orders show hint
2020-06-14 17:56:09 +02:00
3bb3c5b513
[HOTFIX] of HOTFIX: Use CanonicalPath for check
2020-06-14 16:51:59 +02:00
15616e05f3
[HOTFIX] Prevent path directory traversal attack for deploy
2020-06-14 15:54:56 +02:00
76550be9e7
Merge pull request 'Allow partial discount on supplier orders' ( #68 ) from fix/discount_calculation_in_supplier_service into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-06-13 12:21:26 +02:00
ef8aa826a3
Merge pull request 'Fix the cash booking sum on customer order' ( #67 ) from fix/wrong_bookings_on_customer_order into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-06-13 12:19:18 +02:00
114453b5b9
Merge pull request 'Implement Arrival of Supplier Order.' ( #62 ) from feature/supplier_order_arrived_button into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-06-13 11:59:17 +02:00
7397698929
fix check for missing article
2020-06-13 11:54:25 +02:00
9fa2c1f3a7
Allow partial discount on supplier orders
...
Closes #46
2020-06-13 11:46:16 +02:00
327ba182f5
Fix the cash booking sum on customer order
...
Closes #57
2020-06-13 11:10:20 +02:00
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
e0e853a575
fixes from PR review
2020-06-13 10:41:59 +02:00
d2b98f083b
Merge pull request 'fix missing cells in TODO-Warehouse. fixes #63 ' ( #64 ) from feature/63_fix_todo_ui into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-06-13 10:26:36 +02:00
a41889b2cb
login in extern loginController, RequestController cleanup, login right after register
2020-06-12 23:48:28 +02:00
0f7d248d40
add radio BTNs to register
2020-06-12 23:31:57 +02:00
11ade7b8f9
fix missing cells in TODO-Warehouse. fixes #63
2020-06-12 19:57:50 +02:00
a664b42853
Allow reuse of empty warehouse slots. Also fixes #59
2020-06-12 19:48:21 +02:00
56f4ec0dda
Implement Arrival of Supplier Order.
2020-06-12 19:22:36 +02:00
1590821f64
delete bonuspoints and notifications html
2020-06-12 11:15:05 +02:00
16803d2b12
Merge pull request 'feature/customers' ( #58 ) from feature/customers into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-06-12 00:52:53 +02:00
938d16301d
fix stuff
2020-06-10 20:10:12 +02:00
5a59ac11b0
code cleanup
2020-06-10 19:28:12 +02:00
c194f44308
implement customers detail bookings
2020-06-10 19:28:12 +02:00
fc68e231d3
Allow the user to create manual bookings
2020-06-10 19:28:07 +02:00
