Commit Graph

200 Commits

Author SHA1 Message Date
Tyro
da78ab4990 register working 2020-05-19 18:47:15 +02:00
Tyro
7686c4cda6 Create rudimentary register class 2020-05-19 15:41:43 +02:00
7b6882b12b format code 2020-05-18 09:41:02 +02:00
d739b15410 fix missing import 2020-05-17 13:11:32 +02:00
0c66a713b4 add some comments 2020-05-17 13:10:04 +02:00
d0785308d4 code cleanup 2020-05-17 13:09:51 +02:00
bc350b3177 implement only show Searchresults which are in Stock 2020-05-17 13:09:26 +02:00
8d6a1f4053 implement only show advertisements which are in stock 2020-05-17 13:09:26 +02:00
6b9db3eed5 implement errorhandling 2020-05-17 13:09:26 +02:00
3f5b1efa0c implement search 2020-05-17 13:08:18 +02:00
0840eda369 Revert "UImodel for offeredArticle page, html cleanup"
This reverts commit e0f638f0bd.
2020-05-16 22:46:42 +02:00
3c69f38367 Revert "added link from listedArticles page to related offered article"
This reverts commit 39fb735f21.
2020-05-16 22:46:18 +02:00
39fb735f21 added link from listedArticles page to related offered article 2020-05-16 21:49:31 +02:00
e0f638f0bd UImodel for offeredArticle page, html cleanup 2020-05-16 13:42:07 +02:00
4f6388e4b9 fixed links to offered articles page 2020-05-15 20:57:56 +02:00
b1840dd845 code cleanup 2020-05-15 19:47:26 +02:00
dc49bc2e8d code cleanuo 2020-05-15 19:45:10 +02:00
8c777ca1ff fixed merge bug: cascade = CascadeType.ALL in Article to Categories 2020-05-15 19:31:31 +02:00
c73435b2a0
Merge remote-tracking branch 'origin/master' into feature/listedArticles 2020-05-15 19:04:02 +02:00
ea8aaa3931 removed PW bypass 2020-05-15 18:16:03 +02:00
56efbd7940 code cleanup 2020-05-15 18:13:12 +02:00
a98782bc01 added new route in external controller 2020-05-15 14:14:29 +02:00
f403a6e1c4 fix in stock bug 2020-05-15 12:33:32 +02:00
d06fd57447 added new route for offered articles page 2020-05-15 11:57:20 +02:00
197a774fb2 removed data folder 2020-05-14 23:14:33 +02:00
af99e8107d added change for stock, price and autobuy values on article edit page 2020-05-14 22:16:06 +02:00
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
c69b20b914 added POST that changes the article WIP 2020-05-12 22:52:01 +02:00
fd9dcf141e fixes in listed article page and converted form to POST 2020-05-11 15:32:39 +02:00
09c85fe8cb fixed route for /intern/articles and /intern/suppliers/articles 2020-05-11 14:32:07 +02:00
22d2744c8c GET article edit page 2020-05-11 11:58:26 +02:00
3a3b7abad0 fix typo 2020-05-10 21:30:50 +02:00
a2f20938cd show listedArticles 2020-05-10 21:30:50 +02:00
2b3ecb2342 changed listedArticles Request to own Controller 2020-05-10 21:30:50 +02:00
143a53acf5 fix better quantities for UI 2020-05-10 21:30:50 +02:00
bb4aa79243 implement personalized suggestions 2020-05-10 21:30:50 +02:00
82dacef4c0 Advertised Articles now shown correctly 2020-05-10 21:30:50 +02:00
262640a2b4 change Databasename and add Advertisementflag 2020-05-10 21:30:50 +02:00
1e7266e554 implement imageserving and first part of ArticleRepository 2020-05-10 21:30:50 +02:00
4048d6c5ad Unify Style of error messages to match rest of ui. 2020-05-10 21:30:50 +02:00
572a999467 Implement proper querying of warehouse slot sums and booking accounts. 2020-05-10 21:30:50 +02:00
5f071939d3 Renice error handling 2020-05-10 21:30:50 +02:00
2ec3ad32ea Implement CreateCustomerOrderAction; Not implemented: correct booking and WarehouseBooking fetching...
Puhh, that was a struggle to get working. Damn JPA Shit
2020-05-10 21:30:50 +02:00
d2bf6e8c52 implement checkout for non logged in users. 2020-05-10 21:30:50 +02:00
7d83d723c1 Implement add Items to ShoppingCart 2020-05-10 21:30:50 +02:00
4338f188f0 fix local merge conflicts in req ctrl 2020-05-10 21:30:50 +02:00
e9e072b26b ShopIndexController without databasestuff 2020-05-10 21:30:50 +02:00
8a28aabaf3 ShopIndexController initial implementation 2020-05-10 21:30:50 +02:00
89eaeaed40 Merge pull request 'feature/basic_functions' (#7) from feature/basic_functions into master
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-05-10 17:48:31 +02:00
edcdb2e9cf fix use Math.min for loopcount 2020-05-10 17:25:48 +02:00