localhorst
/
e-commerce
Archived
4
1
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity
254 Commits 2 Branches 2 Tags 7.2 MiB
Commit Graph

254 Commits

Author SHA1 Message Date
Hannes Huber 9406bbc4ac fix nullpointer again 2020-05-27 15:10:12 +02:00
Hannes Huber e5b28250c2 fix payment method null pointer 2020-05-27 14:56:15 +02:00
Hannes Huber db1d3d31b2 fix register 2020-05-27 14:55:51 +02:00
Hannes Huber 819cca7f2a Merge remote-tracking branch 'origin/feature/user' into feature/user 2020-05-27 13:41:04 +02:00
Hannes Huber 846e448f01 code cleanup 2020-05-27 13:40:44 +02:00
Hannes Huber 614a929592 code cleanup 2020-05-27 13:40:44 +02:00
Hannes Huber 60699ed847 fix error handling 2020-05-27 13:40:44 +02:00
Hannes Huber 83ad1f3999 remove advertisementflag 2020-05-27 13:40:44 +02:00
Hannes Huber 5b4c0be1c8 add Errorhandling to UpdateSettingsAction 2020-05-27 13:40:44 +02:00
Hannes Huber 0256c19e8f implement change User Settings 2020-05-27 13:40:44 +02:00
Hannes Huber adcd840154 remove notification center 2020-05-27 13:40:44 +02:00
Hannes Huber b5495bda3d show all Orders 2020-05-27 13:40:44 +02:00
Hannes Huber 106b00a907 show usersettings from db 2020-05-27 13:40:44 +02:00
Hannes Huber 7c73f69865 remove bonuspoints 2020-05-27 13:40:44 +02:00
Danny 7c467c8641 bugfix register 2020-05-27 12:22:24 +02:00
Hannes Huber 86a2e5d8c2 code cleanup 2020-05-25 12:17:09 +02:00
Jannik 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
Hannes Huber 8d65998ac2 code cleanup 2020-05-25 10:21:36 +02:00
Hannes Huber 178f98d664 fix error handling 2020-05-25 10:10:42 +02:00
Hannes Huber 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
Jannik 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
Hendrik Schutter 019f5d8f1b code cleanup 2020-05-23 14:19:43 +02:00
Hendrik Schutter 620e163a14 added feature to change an article image 2020-05-23 14:18:33 +02:00
Hendrik Schutter fcdf0e776d set default img if article is added to listed articles 2020-05-23 10:45:14 +02:00
Hendrik Schutter a3efa4092a removed old static product images 2020-05-23 09:40:52 +02:00
Jannik 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
Jannik 525a5f7eb1
Merge branch 'master' into feature/offeredArticle 2020-05-21 20:23:47 +02:00
Hendrik Schutter ba570852a7 added id´s to inputs 2020-05-21 10:27:26 +02:00
Hannes Huber 8ede86fdce add Errorhandling to UpdateSettingsAction 2020-05-20 12:08:57 +02:00
Tyro da78ab4990 register working 2020-05-19 18:47:15 +02:00
Hendrik Schutter 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
Hannes Huber 39eefbdd3e implement change User Settings 2020-05-19 15:18:48 +02:00
Hannes Huber 6e3d1cbcf5 remove notification center 2020-05-19 14:17:38 +02:00
Hannes Huber 1ce9a971ba show all Orders 2020-05-19 11:52:41 +02:00
Hendrik Schutter d8032c2bd7 load offeredArticles from DB and display basic info 2020-05-19 00:12:26 +02:00
Hannes Huber 4711527971 show usersettings from db 2020-05-18 14:41:33 +02:00
Hannes Huber b7b5c7a6b3 remove bonuspoints 2020-05-18 12:49:37 +02:00
Jannik 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
Hannes Huber 7b6882b12b format code 2020-05-18 09:41:02 +02:00
Hannes Huber d739b15410 fix missing import 2020-05-17 13:11:32 +02:00
Hannes Huber 0c66a713b4 add some comments 2020-05-17 13:10:04 +02:00
Hannes Huber d0785308d4 code cleanup 2020-05-17 13:09:51 +02:00
Hannes Huber bc350b3177 implement only show Searchresults which are in Stock 2020-05-17 13:09:26 +02:00
Hannes Huber 8d6a1f4053 implement only show advertisements which are in stock 2020-05-17 13:09:26 +02:00
Hannes Huber 6b9db3eed5 implement errorhandling 2020-05-17 13:09:26 +02:00
Hannes Huber 3f5b1efa0c implement search 2020-05-17 13:08:18 +02:00
Hendrik Schutter d4be2b9e94 Revert "Revert "added link from listedArticles page to related offered article"" 
This reverts commit 3c69f38367.
 2020-05-16 22:48:40 +02:00
Hendrik Schutter 14bef592c4 Revert "Revert "UImodel for offeredArticle page, html cleanup"" 
This reverts commit 0840eda369.
 2020-05-16 22:48:20 +02:00