Commit Graph

47 Commits

Author SHA1 Message Date
Hannes Huber cd1a8568e6 show only one entry per article suggestions fix #96 2020-06-21 00:06:15 +02:00
CodeSteak 9389675b5c Do not show dupliactes in category search. fixes #85 2020-06-21 00:01:28 +02:00
Jannik 4bef17dc0a Merge pull request 'feature/dashboard' (#83) from feature/dashboard into master
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-06-19 14:12:44 +02:00
Danny 6284a4d7bf Dashboard working 2020-06-15 17:47:55 +02:00
Philipp Schweizer 1dd4b5cfa5 del update query and impl error for trackigID 2020-06-13 20:05:22 +02:00
Philipp Schweizer 266bba095a merged feature/customer_orders with master 2020-06-13 19:58:30 +02:00
CodeSteak 56f4ec0dda Implement Arrival of Supplier Order. 2020-06-12 19:22:36 +02:00
Philipp ebeba72278 impl tracking ID 2020-06-10 17:03:59 +02:00
Philipp f671baf7f0 Error with package path 2020-06-10 14:51:12 +02:00
Hannes Huber b7134a60da rename CustomerOrderRepo in Cronjob 2020-06-01 20:25:31 +02:00
Jannik 21502a0b1c
Merge branch 'master' into feature/user 2020-06-01 19:03:42 +02:00
Hannes Huber 2394157be8 implement getCustomerOrder 2020-06-01 11:31:12 +02:00
Hannes Huber 9238162a4c implement better search 2020-06-01 10:52:19 +02:00
Lukas Fürderer e1df56147b
Merge remote-tracking branch 'origin/master' into feature/reorder_cronjob 2020-05-28 10:39:38 +02:00
Hannes Huber e4d6642d61 order orders by newest first 2020-05-27 15:52:51 +02:00
Hannes Huber 614a929592 code cleanup 2020-05-27 13:40:44 +02:00
Hannes Huber b5495bda3d show all Orders 2020-05-27 13:40:44 +02:00
Lukas Fürderer 8386629088
Implement the reorder cronjob 2020-05-25 17:08:15 +02:00
Jannik e571e21281 Merge pull request 'feature/image' (#26) from feature/image into master
Reviewed-by: Jannik Seiler <seil0@mosad.xyz>
2020-05-23 18:51:15 +02:00
Hendrik Schutter 620e163a14 added feature to change an article image 2020-05-23 14:18:33 +02:00
Hendrik Schutter fcdf0e776d set default img if article is added to listed articles 2020-05-23 10:45:14 +02:00
Jannik 525a5f7eb1
Merge branch 'master' into feature/offeredArticle 2020-05-21 20:23:47 +02:00
Hendrik Schutter 9cfb1cd0ad add offered article to listed article 2020-05-19 16:30:27 +02:00
Hendrik Schutter d8032c2bd7 load offeredArticles from DB and display basic info 2020-05-19 00:12:26 +02:00
Hannes Huber d739b15410 fix missing import 2020-05-17 13:11:32 +02:00
Hannes Huber bc350b3177 implement only show Searchresults 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
Jannik c73435b2a0
Merge remote-tracking branch 'origin/master' into feature/listedArticles 2020-05-15 19:04:02 +02:00
Hendrik Schutter 56efbd7940 code cleanup 2020-05-15 18:13:12 +02:00
Hendrik Schutter c69b20b914 added POST that changes the article WIP 2020-05-12 22:52:01 +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 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 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 7d83d723c1 Implement add Items to ShoppingCart 2020-05-10 21:30:50 +02:00
Hannes Huber a62e3e8a63 fix only show ordered Articles from specific Customer 2020-05-10 15:28:39 +02:00
CodeSteak d1301f6988 Fix naming-convension-error in ArticleOffer 2020-05-10 14:30:00 +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 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 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 31059b4894 Implement add Items to ShoppingCart 2020-05-05 17:24:25 +02:00