CodeSteak
bdd1017232
Set Default Payment on first order
2020-06-25 11:46:01 +02:00
Jannik
b993700ae4
Merge pull request 'feature/employee_login_defaults' ( #124 ) from feature/employee_login_defaults into master
...
Reviewed-on: #124
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-06-24 19:00:36 +02:00
Jannik
5d506a1526
Merge pull request 'Fix display order in various locations. closes #120 ' ( #121 ) from feateure/display_order_intern into master
...
Reviewed-on: #121
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-06-24 18:59:14 +02:00
CodeSteak
fb222c9213
Merge branch 'master' into feature/employee_login_defaults
2020-06-24 18:57:05 +02:00
CodeSteak
cdc372d574
Redirect to intern if employee.
2020-06-24 18:40:22 +02:00
Jannik
2290f01a8f
Merge pull request 'feature/fix_delivery_api' ( #116 ) from feature/fix_delivery_api into master
...
Reviewed-on: #116
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-06-24 18:38:03 +02:00
Jannik
3bc0996c73
Merge pull request 'Add & generate tracking information to (Supplier-)OrderConfirmation. Fixes #110 ' ( #114 ) from feature/supplier_tracking into master
...
Reviewed-on: #114
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-06-24 18:37:15 +02:00
Jannik
758c6810ab
Merge pull request 'Clean Shopping Cart on Logout' ( #123 ) from feature/clean_shopping_on_logout into master
...
Reviewed-on: #123
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-06-24 18:27:24 +02:00
CodeSteak
577a4f72f0
Clean Shopping Cart on Logout for real
2020-06-24 18:25:42 +02:00
CodeSteak
a2aca7a8ca
Clean Shopping Cart on Logout
2020-06-24 18:23:01 +02:00
CodeSteak
5861b61565
Merge branch 'master' into feature/supplier_tracking
2020-06-24 10:44:38 +02:00
CodeSteak
0d547c8903
Fix display order in various locations. closes #120
2020-06-24 02:15:31 +02:00
CodeSteak
5162e3fc19
Fix in stock calculation. closes #118
2020-06-24 02:05:25 +02:00
CodeSteak
b9e87f5bd4
Add additional infos for order history in /user/... fixes #109
2020-06-24 01:19:37 +02:00
CodeSteak
cd641d6cc4
Fix #113 by fixing initialization of RestServiceForDelivery.
2020-06-24 01:18:16 +02:00
CodeSteak
8d27c486d5
Add & generate tracking information to (Supplier-)OrderConfirmation. Fixes #110
2020-06-24 00:37:58 +02:00
CodeSteak
714ac4f1de
Fix issues with class loading in Cronjobs
2020-06-24 00:35:18 +02:00
CodeSteak
186db31b17
Merge pull request 'Fix showing CustomerOrder all CustomerOrders in my orders. fix displaying orders in random order' ( #108 ) from feature/fix_show_orders into master
...
reviewed by Lukas
2020-06-21 22:22:53 +02:00
CodeSteak
7fafd14715
Fix variable name
2020-06-21 19:01:25 +02:00
CodeSteak
d5181f149a
Fix showing CustomerOrder all CustomerOrders in my orders. fix displaying orders in random order
2020-06-21 18:58:15 +02:00
CodeSteak
a1abbf5329
Implement Supplier AutoSupplierPayment. closes #100
2020-06-21 15:50:27 +02:00
CodeSteak
ffe9af0633
Prevent duplicate Articles from ArticleOffer
2020-06-21 01:07:04 +02:00
CodeSteak
d77b8c046a
Fix bad query for article slot sum
2020-06-20 23:24:06 +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
79e4986880
delete blank line
2020-06-19 14:11:32 +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
1812c89994
Fix typo
2020-06-17 18:55:29 +02:00
ebb3c8c235
removes unused Imports and fomattet
2020-06-17 17:23:29 +02:00
CodeSteak
86e3ced19b
Secretly fix searchbar not showing term when searching
2020-06-17 00:17:50 +02:00
CodeSteak
18cbfbf148
Fix template strings with a starting "/"
2020-06-17 00:02:46 +02:00
CodeSteak
3b1d378968
Fix not creating directory when uploading file
2020-06-16 23:38:35 +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
985169117d
fix nullpointer in settings
2020-06-14 18:19:59 +02:00
CodeSteak
3bb3c5b513
[HOTFIX] of HOTFIX: Use CanonicalPath for check
2020-06-14 16:51:59 +02:00
CodeSteak
15616e05f3
[HOTFIX] Prevent path directory traversal attack for deploy
2020-06-14 15:54:56 +02:00
0ab185f143
impl trackingID for the UserController
2020-06-13 21:59:18 +02:00
1dd4b5cfa5
del update query and impl error for trackigID
2020-06-13 20:05:22 +02:00
266bba095a
merged feature/customer_orders with master
2020-06-13 19:58:30 +02:00
Jannik
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
CodeSteak
7397698929
fix check for missing article
2020-06-13 11:54:25 +02:00
Hendrik Schutter
e0e853a575
fixes from PR review
2020-06-13 10:41:59 +02:00
Hendrik Schutter
a41889b2cb
login in extern loginController, RequestController cleanup, login right after register
2020-06-12 23:48:28 +02:00
Hendrik Schutter
0f7d248d40
add radio BTNs to register
2020-06-12 23:31:57 +02:00
CodeSteak
a664b42853
Allow reuse of empty warehouse slots. Also fixes #59
2020-06-12 19:48:21 +02:00
CodeSteak
56f4ec0dda
Implement Arrival of Supplier Order.
2020-06-12 19:22:36 +02:00
Hannes Huber
938d16301d
fix stuff
2020-06-10 20:10:12 +02:00
CodeSteak
Jannik
Danny
Philipp Schweizer
Lukas Fürderer
Hendrik Schutter
Hannes Huber