Commit Graph

165 Commits

Author SHA1 Message Date
Hendrik Schutter a98782bc01 added new route in external controller 2020-05-15 14:14:29 +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
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
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
Hannes Huber a62e3e8a63 fix only show ordered Articles from specific Customer 2020-05-10 15:28:39 +02:00
Hannes Huber 7f95cef13b fix personalized suggestions 2020-05-10 15:03:45 +02:00
Hannes Huber 95e52cc79d fix non-formatted and non-vatted price 2020-05-10 14:57:02 +02:00
CodeSteak d4d1426438 Fix decimals in checkout page 2020-05-10 14:34:20 +02:00
CodeSteak d1301f6988 Fix naming-convension-error in ArticleOffer 2020-05-10 14:30:00 +02:00
CodeSteak 731f4761fa Show error if articles are not avail during checkout. 2020-05-10 14:29:08 +02:00
Jannik 69b5b33af8
fix typo in 8dd4cc4459 2020-05-09 19:58:31 +02:00
Jannik 8dd4cc4459
use application.properties when run via bootRun 2020-05-09 19:31:57 +02:00
Hannes Huber c0ce1e23c3 fix better quantities for UI 2020-05-08 13:01:29 +02:00
Hannes Huber 1bd267a26d implement personalized suggestions 2020-05-08 11:44:30 +02:00
Hannes Huber e4b4698a27 Advertised Articles now shown correctly 2020-05-08 10:37:42 +02:00
Hannes Huber c097e58bf3 change Databasename and add Advertisementflag 2020-05-08 10:00:22 +02:00
Hannes Huber 4fd80bb3c7 implement imageserving and first part of ArticleRepository 2020-05-08 10:00:22 +02:00
CodeSteak beb0131b60 Unify Style of error messages to match rest of ui. 2020-05-06 17:00:28 +02:00
CodeSteak cdce22968d Implement proper querying of warehouse slot sums and booking accounts. 2020-05-06 14:10:37 +02:00
CodeSteak f5a99700a0 Renice error handling 2020-05-05 23:34:17 +02:00
CodeSteak b2f927e48d Implement CreateCustomerOrderAction; Not implemented: correct booking and WarehouseBooking fetching...
Puhh, that was a struggle to get working. Damn JPA Shit
2020-05-05 22:56:12 +02:00
CodeSteak d681f240e1 implement checkout for non logged in users. 2020-05-05 18:59:15 +02:00
CodeSteak 31059b4894 Implement add Items to ShoppingCart 2020-05-05 17:24:25 +02:00
CodeSteak cbaec13d38 fix local merge conflicts in req ctrl 2020-05-05 17:22:35 +02:00
CodeSteak a5152aaa3d Merge remote-tracking branch 'origin/feature/start' into feature/basic_functions 2020-05-05 16:48:37 +02:00
Hannes Huber f48f5c40f0 ShopArticleController initial 2020-05-02 14:38:40 +02:00
Jannik 6ab3b63923
Revert "split RequestController acording to mapping"
This reverts commit 41eb4d0b8f.
2020-05-01 15:25:50 +02:00
Jannik 41eb4d0b8f
split RequestController acording to mapping 2020-05-01 14:53:35 +02:00
Hannes Huber 8f081823ca ShopIndexController without databasestuff 2020-05-01 14:40:43 +02:00
Hannes Huber f67a23bab9 ShopIndexController initial implementation 2020-05-01 12:19:52 +02:00
CodeSteak 0d0f8e3272 Merge branch 'master' of git.mosad.xyz:localhorst/e-commerce 2020-05-01 10:52:53 +02:00
CodeSteak da9a737fd0 Fix Duplicate Names of Controllers 2020-05-01 10:48:12 +02:00
Hannes Huber 10480bebce Move intern ArticleController to intern 2020-04-30 10:32:48 +02:00
CodeSteak 411760e1d4 Move repos to own package 2020-04-29 23:07:47 +02:00
CodeSteak de6c750e7f Refactor Package Layout 2020-04-29 22:44:16 +02:00
CodeSteak bad1d94f8a add controllers and packages 2020-04-28 22:41:29 +02:00
CodeSteak 1186c390fb Implement Entries // TODO: Move to packages, add Repos. 2020-04-28 21:02:33 +02:00
CodeSteak 14161b7fd3 Reformat (all the) Code 2020-04-27 09:48:24 +02:00
CodeSteak 7c82b7b547 Build Prototype for Login 2020-04-08 18:27:46 +02:00
Jannik 26b64b8ab4
move /user to separate RequestController 2020-03-16 13:49:51 +01:00