9406bbc4ac
fix nullpointer again
2020-05-27 15:10:12 +02:00
e5b28250c2
fix payment method null pointer
2020-05-27 14:56:15 +02:00
db1d3d31b2
fix register
2020-05-27 14:55:51 +02:00
Philipp Schweizer
42a02effa6
fixed pull request #25
2020-05-27 14:24:05 +02:00
819cca7f2a
Merge remote-tracking branch 'origin/feature/user' into feature/user
2020-05-27 13:41:04 +02:00
846e448f01
code cleanup
2020-05-27 13:40:44 +02:00
614a929592
code cleanup
2020-05-27 13:40:44 +02:00
60699ed847
fix error handling
2020-05-27 13:40:44 +02:00
83ad1f3999
remove advertisementflag
2020-05-27 13:40:44 +02:00
5b4c0be1c8
add Errorhandling to UpdateSettingsAction
2020-05-27 13:40:44 +02:00
0256c19e8f
implement change User Settings
2020-05-27 13:40:44 +02:00
adcd840154
remove notification center
2020-05-27 13:40:44 +02:00
b5495bda3d
show all Orders
2020-05-27 13:40:44 +02:00
106b00a907
show usersettings from db
2020-05-27 13:40:44 +02:00
7c73f69865
remove bonuspoints
2020-05-27 13:40:44 +02:00
Danny
7c467c8641
bugfix register
2020-05-27 12:22:24 +02:00
ffb683bdd0
Set the advertise flag if at least one supplier wants it to be set
2020-05-25 17:19:25 +02:00
8386629088
Implement the reorder cronjob
2020-05-25 17:08:15 +02:00
86a2e5d8c2
code cleanup
2020-05-25 12:17:09 +02:00
747eb1cde2
Merge pull request 'feature/register' ( #24 ) from feature/register into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-05-25 10:51:33 +02:00
8d65998ac2
code cleanup
2020-05-25 10:21:36 +02:00
178f98d664
fix error handling
2020-05-25 10:10:42 +02:00
33ff754b9d
remove advertisementflag
2020-05-25 09:36:40 +02:00
Tyro
ac79e1cf22
Check for inactive accounts
...
Check for employee by access on /intern
2020-05-24 21:51:40 +02:00
Philipp Schweizer
40013f0812
Merge remote-tracking branch 'origin/feature/delivery_api' into feature/delivery_api
2020-05-24 20:06:43 +02:00
Philipp Schweizer
77892c9dfc
fixed pull request #25
2020-05-24 20:05:50 +02:00
Philipp Schweizer
cff9417dc5
fixed pull request #24
2020-05-24 20:04:03 +02:00
e571e21281
Merge pull request 'feature/image' ( #26 ) from feature/image into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-05-23 18:51:15 +02:00
019f5d8f1b
code cleanup
2020-05-23 14:19:43 +02:00
620e163a14
added feature to change an article image
2020-05-23 14:18:33 +02:00
6892a11688
Merge branch 'feature/supplier_api' into feature/reorder_cronjob
2020-05-23 11:16:46 +02:00
fcdf0e776d
set default img if article is added to listed articles
2020-05-23 10:45:14 +02:00
a3efa4092a
removed old static product images
2020-05-23 09:40:52 +02:00
32c6b8cb68
Merge pull request 'feature/offeredArticle' ( #23 ) from feature/offeredArticle into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-05-21 20:25:53 +02:00
525a5f7eb1
Merge branch 'master' into feature/offeredArticle
2020-05-21 20:23:47 +02:00
ba570852a7
added id´s to inputs
2020-05-21 10:27:26 +02:00
8ede86fdce
add Errorhandling to UpdateSettingsAction
2020-05-20 12:08:57 +02:00
Philipp Schweizer
caf5430a06
delivery_api finished
2020-05-19 20:38:22 +02:00
Philipp Schweizer
9a24fa306d
gitignore push
2020-05-19 20:37:26 +02:00
Tyro
da78ab4990
register working
2020-05-19 18:47:15 +02:00
9cfb1cd0ad
add offered article to listed article
2020-05-19 16:30:27 +02:00
Tyro
7686c4cda6
Create rudimentary register class
2020-05-19 15:41:43 +02:00
39eefbdd3e
implement change User Settings
2020-05-19 15:18:48 +02:00
6e3d1cbcf5
remove notification center
2020-05-19 14:17:38 +02:00
1ce9a971ba
show all Orders
2020-05-19 11:52:41 +02:00
d8032c2bd7
load offeredArticles from DB and display basic info
2020-05-19 00:12:26 +02:00
4711527971
show usersettings from db
2020-05-18 14:41:33 +02:00
b7b5c7a6b3
remove bonuspoints
2020-05-18 12:49:37 +02:00
5c5df83872
Merge pull request 'feature/search' ( #19 ) from feature/search into master
...
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-05-18 09:42:06 +02:00
7b6882b12b
format code
2020-05-18 09:41:02 +02:00
