Commit Graph

47 Commits

Author SHA1 Message Date
CodeSteak bdd1017232 Set Default Payment on first order 2020-06-25 11:46:01 +02:00
CodeSteak 5162e3fc19 Fix in stock calculation. closes #118 2020-06-24 02:05:25 +02:00
Lukas Fürderer 1812c89994 Fix typo 2020-06-17 18:55:29 +02:00
CodeSteak 86e3ced19b Secretly fix searchbar not showing term when searching 2020-06-17 00:17:50 +02:00
CodeSteak 18cbfbf148 Fix template strings with a starting "/" 2020-06-17 00:02:46 +02:00
CodeSteak 3bb3c5b513 [HOTFIX] of HOTFIX: Use CanonicalPath for check 2020-06-14 16:51:59 +02:00
CodeSteak 15616e05f3 [HOTFIX] Prevent path directory traversal attack for deploy 2020-06-14 15:54:56 +02:00
CodeSteak 78a7ad053a Merge branch 'master' into feature/intern_warehouse 2020-06-08 09:22:06 +02:00
CodeSteak f6554629d7 Merge branch 'master' into feature/intern_warehouse 2020-06-08 09:14:50 +02:00
Hannes Huber 7f652e38f0 fix nullpointer in category search 2020-06-05 12:32:34 +02:00
CodeSteak a192f0ac51 Set Tracing Id in Warehouse/finish not in Checkout. This was wrong. 2020-06-03 16:55:36 +02:00
Jannik 21502a0b1c
Merge branch 'master' into feature/user 2020-06-01 19:03:42 +02:00
Jannik e539a9433a Merge pull request 'implement better search' (#43) from feature/search into master
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-06-01 16:59:37 +02:00
Hannes Huber 839bebcd89 trim searchterm 2020-06-01 11:58:08 +02:00
Hendrik Schutter 38fcda708f check if article.image is null 2020-06-01 10:53:10 +02:00
Hannes Huber 9238162a4c implement better search 2020-06-01 10:52:19 +02:00
Hannes Huber e5b28250c2 fix payment method null pointer 2020-05-27 14:56:15 +02:00
Hannes Huber b5495bda3d show all Orders 2020-05-27 13:40:44 +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
Hannes Huber f403a6e1c4 fix in stock bug 2020-05-15 12:33:32 +02:00
Hannes Huber 530034a40e fix unused imports and unneeded empty lines 2020-05-10 17:19:18 +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
CodeSteak 731f4761fa Show error if articles are not avail during checkout. 2020-05-10 14:29:08 +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 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 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 da9a737fd0 Fix Duplicate Names of Controllers 2020-05-01 10:48:12 +02:00
CodeSteak de6c750e7f Refactor Package Layout 2020-04-29 22:44:16 +02:00