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
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
Hendrik Schutter 22d2744c8c GET article edit page 2020-05-11 11:58:26 +02:00
Hendrik Schutter bba4173269 fixed inputstream once more 2020-05-10 22:19:58 +02:00
Hendrik Schutter c14ae996be Merge branch 'feature/listedArticles' of git.mosad.xyz:localhorst/e-commerce into feature/listedArticles 2020-05-10 21:32:19 +02:00
Jannik 3a3b7abad0 fix typo 2020-05-10 21:30:50 +02:00
Hendrik Schutter a2f20938cd show listedArticles 2020-05-10 21:30:50 +02:00
Hendrik Schutter 2b3ecb2342 changed listedArticles Request to own Controller 2020-05-10 21:30:50 +02:00
Hannes Huber 143a53acf5 fix better quantities for UI 2020-05-10 21:30:50 +02:00
Hannes Huber bb4aa79243 implement personalized suggestions 2020-05-10 21:30:50 +02:00
Hannes Huber 82dacef4c0 Advertised Articles now shown correctly 2020-05-10 21:30:50 +02:00
Hannes Huber 262640a2b4 change Databasename and add Advertisementflag 2020-05-10 21:30:50 +02:00
Hannes Huber 1e7266e554 implement imageserving and first part of ArticleRepository 2020-05-10 21:30:50 +02:00
CodeSteak 4048d6c5ad Unify Style of error messages to match rest of ui. 2020-05-10 21:30:50 +02:00
CodeSteak 572a999467 Implement proper querying of warehouse slot sums and booking accounts. 2020-05-10 21:30:50 +02:00
CodeSteak 5f071939d3 Renice error handling 2020-05-10 21:30:50 +02:00
CodeSteak 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
CodeSteak d2bf6e8c52 implement checkout for non logged in users. 2020-05-10 21:30:50 +02:00
CodeSteak 7d83d723c1 Implement add Items to ShoppingCart 2020-05-10 21:30:50 +02:00
CodeSteak 4338f188f0 fix local merge conflicts in req ctrl 2020-05-10 21:30:50 +02:00
Hannes Huber e9e072b26b ShopIndexController without databasestuff 2020-05-10 21:30:50 +02:00
Hannes Huber 8a28aabaf3 ShopIndexController initial implementation 2020-05-10 21:30:50 +02:00
Hendrik Schutter e1d7becc2e added yaml dump&parse class 2020-05-10 21:23:44 +02:00
Jannik 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
Hannes Huber edcdb2e9cf fix use Math.min for loopcount 2020-05-10 17:25:48 +02:00
Hannes Huber 530034a40e fix unused imports and unneeded empty lines 2020-05-10 17:19:18 +02:00
Hannes Huber 8f24aee350 fix add should_be_advertised to script 2020-05-10 17:16:17 +02:00
CodeSteak bd2aeb63f6 Remove unneeded comment 2020-05-10 17:05:19 +02:00
CodeSteak 713c8ebe86 Comment empty constructors 2020-05-10 17:03:40 +02:00
CodeSteak e406918ca2 Remove commend out code 2020-05-10 16:57:33 +02:00
CodeSteak e167832164 Merge branch 'feature/basic_functions' of git.mosad.xyz:localhorst/e-commerce into feature/basic_functions 2020-05-10 15:39:35 +02:00
CodeSteak 777786f5b6 Remove old missleading comment 2020-05-10 15:39:24 +02:00