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

246 Commits

Author SHA1 Message Date
Hannes Huber dfa528484c Merge branch 'master' into feature/user 2020-06-01 10:57:55 +02:00
Jannik 1a1502b38c Merge pull request 'feature/reorder_cronjob' (#27) from feature/reorder_cronjob into master 
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
 2020-05-29 16:20:04 +02:00
Jannik e9a3cb51ba Merge pull request 'fix/intern_articles' (#39) from fix/intern_articles into master 
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
 2020-05-28 13:23:01 +02:00
Jannik f4b0d6a576
fix html warnings [2] 2020-05-28 13:22:28 +02:00
Jannik 2bf383b113
fix html warnings 2020-05-28 13:20:42 +02:00
Jannik ff5b0afc93 Merge pull request 'feature/delivery_api' (#25) from feature/delivery_api into master 
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
 2020-05-28 12:19:29 +02:00
Lukas Fürderer d5540c1979
Small changes according to comments on the pullrequest 2020-05-28 10:58:11 +02:00
Lukas Fürderer e1df56147b
Merge remote-tracking branch 'origin/master' into feature/reorder_cronjob 2020-05-28 10:39:38 +02:00
Hendrik Schutter 35861d3664 fixed styling for edit/add btn 2020-05-27 21:53:58 +02:00
Hendrik Schutter 08dc4bcb47 fixed spaces in textarea 2020-05-27 21:43:26 +02:00
Hendrik Schutter a38b817f20 fixed empty input fields fixes #32 2020-05-27 21:07:31 +02:00
Hannes Huber 8a2eff1fe9 code cleanup 2020-05-27 19:03:18 +02:00
Hannes Huber e4d6642d61 order orders by newest first 2020-05-27 15:52:51 +02:00
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 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
Lukas Fürderer ffb683bdd0
Set the advertise flag if at least one supplier wants it to be set 2020-05-25 17:19:25 +02:00
Lukas Fürderer 8386629088
Implement the reorder cronjob 2020-05-25 17:08:15 +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
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
Lukas Fürderer 6892a11688
Merge branch 'feature/supplier_api' into feature/reorder_cronjob 2020-05-23 11:16:46 +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 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
Philipp Schweizer caf5430a06 delivery_api finished 2020-05-19 20:38:22 +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
Hendrik Schutter d8032c2bd7 load offeredArticles from DB and display basic info 2020-05-19 00:12:26 +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