Commit Graph
71 Commits
Author SHA1 Message Date
hhuber 7f652e38f0 fix nullpointer in category search 2020-06-05 12:32:34 +02:00
hhuber f4ba79a4cd add id's to form inputs 2020-06-01 20:27:19 +02:00
hhuber b7134a60da rename CustomerOrderRepo in Cronjob 2020-06-01 20:25:31 +02:00
hhuber ff4c984f54 fix error message 2020-06-01 20:24:45 +02:00
hhuber 839bebcd89 trim searchterm 2020-06-01 11:58:08 +02:00
hhuber dfa528484c Merge branch 'master' into feature/user 2020-06-01 10:57:55 +02:00
hhuber 9238162a4c implement better search 2020-06-01 10:52:19 +02:00
hhuber 8a2eff1fe9 code cleanup 2020-05-27 19:03:18 +02:00
hhuber e4d6642d61 order orders by newest first 2020-05-27 15:52:51 +02:00
hhuber 9406bbc4ac fix nullpointer again 2020-05-27 15:10:12 +02:00
hhuber e5b28250c2 fix payment method null pointer 2020-05-27 14:56:15 +02:00
hhuber db1d3d31b2 fix register 2020-05-27 14:55:51 +02:00
hhuber 819cca7f2a Merge remote-tracking branch 'origin/feature/user' into feature/user 2020-05-27 13:41:04 +02:00
hhuber 846e448f01 code cleanup 2020-05-27 13:40:44 +02:00
hhuber 614a929592 code cleanup 2020-05-27 13:40:44 +02:00
hhuber 60699ed847 fix error handling 2020-05-27 13:40:44 +02:00
hhuber 83ad1f3999 remove advertisementflag 2020-05-27 13:40:44 +02:00
hhuber 5b4c0be1c8 add Errorhandling to UpdateSettingsAction 2020-05-27 13:40:44 +02:00
hhuber 0256c19e8f implement change User Settings 2020-05-27 13:40:44 +02:00
hhuber adcd840154 remove notification center 2020-05-27 13:40:44 +02:00
hhuber b5495bda3d show all Orders 2020-05-27 13:40:44 +02:00
hhuber 106b00a907 show usersettings from db 2020-05-27 13:40:44 +02:00
hhuber 7c73f69865 remove bonuspoints 2020-05-27 13:40:44 +02:00
hhuber 86a2e5d8c2 code cleanup 2020-05-25 12:17:09 +02:00
hhuber 8d65998ac2 code cleanup 2020-05-25 10:21:36 +02:00
hhuber 178f98d664 fix error handling 2020-05-25 10:10:42 +02:00
hhuber 33ff754b9d remove advertisementflag 2020-05-25 09:36:40 +02:00
hhuber 8ede86fdce add Errorhandling to UpdateSettingsAction 2020-05-20 12:08:57 +02:00
hhuber 39eefbdd3e implement change User Settings 2020-05-19 15:18:48 +02:00
hhuber 6e3d1cbcf5 remove notification center 2020-05-19 14:17:38 +02:00
hhuber 1ce9a971ba show all Orders 2020-05-19 11:52:41 +02:00
hhuber 4711527971 show usersettings from db 2020-05-18 14:41:33 +02:00
hhuber b7b5c7a6b3 remove bonuspoints 2020-05-18 12:49:37 +02:00
hhuber 7b6882b12b format code 2020-05-18 09:41:02 +02:00
hhuber d739b15410 fix missing import 2020-05-17 13:11:32 +02:00
hhuber 0c66a713b4 add some comments 2020-05-17 13:10:04 +02:00
hhuber d0785308d4 code cleanup 2020-05-17 13:09:51 +02:00
hhuber bc350b3177 implement only show Searchresults which are in Stock 2020-05-17 13:09:26 +02:00
hhuber 8d6a1f4053 implement only show advertisements which are in stock 2020-05-17 13:09:26 +02:00
hhuber 6b9db3eed5 implement errorhandling 2020-05-17 13:09:26 +02:00
hhuber 3f5b1efa0c implement search 2020-05-17 13:08:18 +02:00
hhuber f403a6e1c4 fix in stock bug 2020-05-15 12:33:32 +02:00
hhuberandlocalhorst 143a53acf5 fix better quantities for UI 2020-05-10 21:30:50 +02:00
hhuberandlocalhorst bb4aa79243 implement personalized suggestions 2020-05-10 21:30:50 +02:00
hhuberandlocalhorst 82dacef4c0 Advertised Articles now shown correctly 2020-05-10 21:30:50 +02:00
hhuberandlocalhorst 262640a2b4 change Databasename and add Advertisementflag 2020-05-10 21:30:50 +02:00
hhuberandlocalhorst 1e7266e554 implement imageserving and first part of ArticleRepository 2020-05-10 21:30:50 +02:00
hhuberandlocalhorst e9e072b26b ShopIndexController without databasestuff 2020-05-10 21:30:50 +02:00
hhuberandlocalhorst 8a28aabaf3 ShopIndexController initial implementation 2020-05-10 21:30:50 +02:00
hhuber edcdb2e9cf fix use Math.min for loopcount 2020-05-10 17:25:48 +02:00
hhuber 530034a40e fix unused imports and unneeded empty lines 2020-05-10 17:19:18 +02:00
hhuber 8f24aee350 fix add should_be_advertised to script 2020-05-10 17:16:17 +02:00
hhuber a62e3e8a63 fix only show ordered Articles from specific Customer 2020-05-10 15:28:39 +02:00
hhuber 7f95cef13b fix personalized suggestions 2020-05-10 15:03:45 +02:00
hhuber 95e52cc79d fix non-formatted and non-vatted price 2020-05-10 14:57:02 +02:00
hhuber c0ce1e23c3 fix better quantities for UI 2020-05-08 13:01:29 +02:00
hhuber 1bd267a26d implement personalized suggestions 2020-05-08 11:44:30 +02:00
hhuber e4b4698a27 Advertised Articles now shown correctly 2020-05-08 10:37:42 +02:00
hhuber c097e58bf3 change Databasename and add Advertisementflag 2020-05-08 10:00:22 +02:00
hhuber 4fd80bb3c7 implement imageserving and first part of ArticleRepository 2020-05-08 10:00:22 +02:00
hhuber f48f5c40f0 ShopArticleController initial 2020-05-02 14:38:40 +02:00
hhuber 8f081823ca ShopIndexController without databasestuff 2020-05-01 14:40:43 +02:00
hhuber f67a23bab9 ShopIndexController initial implementation 2020-05-01 12:19:52 +02:00
hhuber 10480bebce Move intern ArticleController to intern 2020-04-30 10:32:48 +02:00
hhuber 2d2258d02e fix dashboard description 2020-02-08 14:07:50 +01:00
hhuber 619e586280 add checkout 2020-01-18 15:34:54 +01:00
hhuber 6d6f4bda6a Merge remote-tracking branch 'origin/master' 2020-01-18 14:01:43 +01:00
hhuber 0f71e2b595 remade articleDetail without own css 2020-01-18 14:01:35 +01:00
hhuber 483cc260f3 remade searchResults without own css 2020-01-17 17:25:38 +01:00
hhuber 6985b22e82 update color and use fragments 2020-01-12 16:14:01 +01:00
hhuber 213c5a2c94 initial searchresult and detailview 2020-01-11 16:39:34 +01:00