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

484 Commits

Author SHA1 Message Date
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
Jannik 2bbf8260f4 Merge pull request 'WIP feature/listedArticles' (#15) from feature/listedArticles into master 
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
 2020-05-15 19:48:21 +02:00
Hendrik Schutter b1840dd845 code cleanup 2020-05-15 19:47:26 +02:00
Hendrik Schutter dc49bc2e8d code cleanuo 2020-05-15 19:45:10 +02:00
Hendrik Schutter 8c777ca1ff fixed merge bug: cascade = CascadeType.ALL in Article to Categories 2020-05-15 19:31:31 +02:00
Jannik c73435b2a0
Merge remote-tracking branch 'origin/master' into feature/listedArticles 2020-05-15 19:04:02 +02:00
Hendrik Schutter ea8aaa3931 removed PW bypass 2020-05-15 18:16:03 +02:00
Hendrik Schutter 56efbd7940 code cleanup 2020-05-15 18:13:12 +02:00
Hendrik Schutter a98782bc01 added new route in external controller 2020-05-15 14:14:29 +02:00
Lukas Fürderer 0de35f1a51
Implement scheduled execution of cronjobs 2020-05-15 13:47:54 +02:00
Hannes Huber f403a6e1c4 fix in stock bug 2020-05-15 12:33:32 +02:00
Hendrik Schutter d06fd57447 added new route for offered articles page 2020-05-15 11:57:20 +02:00
Hendrik Schutter 197a774fb2 removed data folder 2020-05-14 23:14:33 +02:00
Hendrik Schutter af99e8107d added change for stock, price and autobuy values on article edit page 2020-05-14 22:16:06 +02:00
Jannik f2fc51384e Merge pull request 'update dependencies & gradle' (#12) from feature/spring-boot-2.2.7 into master 
Reviewed-by: CodeSteak <codesteak@shellf.art>
 2020-05-13 19:45:46 +02:00
Jannik 922e21a454
update dependencies & gradle 
* gradle 5.6.2 -> 6.4
* spring boot 2.2.2 -> 2.2.7
* sqlite-jdbc 3.28.0 -> 3.31.1
 2020-05-13 18:28:21 +02:00
Hendrik Schutter c69b20b914 added POST that changes the article WIP 2020-05-12 22:52:01 +02:00
CodeSteak c92e485018 Implement API Bindings for SupplierService 2020-05-12 22:42:25 +02:00
CodeSteak 62d811db1d Implement First Draft of Supplier API 2020-05-12 22:41:08 +02:00
Hendrik Schutter fd9dcf141e fixes in listed article page and converted form to POST 2020-05-11 15:32:39 +02:00
Hendrik Schutter 09c85fe8cb fixed route for /intern/articles and /intern/suppliers/articles 2020-05-11 14:32:07 +02:00