Commit Graph

342 Commits

Author SHA1 Message Date
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
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
486f237135 fix creditcard num not being set leading to crash 2020-06-16 23:50:10 +02:00
3b1d378968 Fix not creating directory when uploading file 2020-06-16 23:38:35 +02:00
3b364ae815
Allow employees to trigger cronjobs manually 2020-06-15 16:23:42 +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
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
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
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
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
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
6d8a36b7ac implement customers detail part 2 2020-06-10 19:27:38 +02:00
49e26039a3 implement customers detail part 1 2020-06-10 19:27:38 +02:00
28834431ce Display financial bookings in the ui 2020-06-10 19:27:38 +02:00
5691f0eeec implement customers index 2020-06-10 19:27:16 +02:00
7f643987f3
fix wrong closing tags in customerOrder/id.html 2020-06-10 19:12:34 +02:00
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
691916894f
Apply some changes according to comments on the pullrequest 2020-06-10 11:48:38 +02:00
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
8fff0e2dca
Merge remote-tracking branch 'origin/master' into feature/cash_bookings 2020-06-08 18:15:34 +02:00
78a7ad053a Merge branch 'master' into feature/intern_warehouse 2020-06-08 09:22:06 +02:00
f6554629d7 Merge branch 'master' into feature/intern_warehouse 2020-06-08 09:14:50 +02:00
eb82d05f4f Use Spring model for template attributes 2020-06-08 09:14:11 +02:00
41320473d9 Merge pull request 'feature/supplier_page' (#52) from feature/supplier_page into master
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-06-07 15:00:56 +02:00
bd6be54149 removed space in SupplierOrderRepo 2020-06-07 11:45:53 +02:00
99612165f5 fixed review requests 2020-06-07 11:44:50 +02:00
9dff6adb3d rebase to master 2020-06-05 21:25:38 +02:00
445b504188 code cleanup 2020-06-05 21:20:54 +02:00