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

504 Commits

Author SHA1 Message Date
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
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
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
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 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
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
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
Hendrik Schutter 0840eda369 Revert "UImodel for offeredArticle page, html cleanup" 
This reverts commit e0f638f0bd.
 2020-05-16 22:46:42 +02:00
Hendrik Schutter 3c69f38367 Revert "added link from listedArticles page to related offered article" 
This reverts commit 39fb735f21.
 2020-05-16 22:46:18 +02:00
Hendrik Schutter 39fb735f21 added link from listedArticles page to related offered article 2020-05-16 21:49:31 +02:00
Hendrik Schutter e0f638f0bd UImodel for offeredArticle page, html cleanup 2020-05-16 13:42:07 +02:00
Hendrik Schutter 4f6388e4b9 fixed links to offered articles page 2020-05-15 20:57:56 +02:00