Commit Graph

91 Commits

Author SHA1 Message Date
41d62898c1 shopping cart done
Signed-off-by: Johannes Theiner <j.theiner@live.de>
2019-06-06 19:03:37 +02:00
7d443a1aeb ~ shopping cart ammount change working without database 2019-06-06 17:10:04 +02:00
cc06ec797e ~ order overview done
~ template changes for users not logged in.
2019-06-06 13:13:20 +02:00
Julian Hinxlage
1965331149 +landing page 2019-06-06 13:00:08 +02:00
Julian Hinxlage
4abb018703 +cart link to book
~more infos on cart and bookinfo
2019-06-06 11:18:07 +02:00
6cf6e2f6e3 working order overview, design not done yet
Signed-off-by: Johannes Theiner <j.theiner@live.de>
2019-06-06 06:55:39 +02:00
ad17d0d80c + started working on order listing
Signed-off-by: Johannes Theiner <j.theiner@live.de>
2019-06-05 21:42:09 +02:00
6d6a1c9b2a ordering process done
Signed-off-by: Johannes Theiner <j.theiner@live.de>
2019-06-05 18:41:59 +02:00
88145df721 Merge remote-tracking branch 'origin/julian5' into johannes5
# Conflicts:
#	src/main/webapp/template.xhtml
2019-06-05 18:02:12 +02:00
f09762c100 + payment pages
+ selection pages
2019-06-05 14:57:54 +02:00
Julian Hinxlage
0f763413e9 +confirmation and thank-you 2019-06-05 14:05:00 +02:00
Julian Hinxlage
a53cccc52e +logout working 2019-06-05 13:22:52 +02:00
Julian Hinxlage
d1a45681a2 +working shopping-cart 2019-06-05 13:11:36 +02:00
d205e62419 + first two payment methods being displayed
Signed-off-by: Johannes Theiner <j.theiner@live.de>
2019-06-05 10:25:42 +02:00
Julian Hinxlage
1a115e00a9 +shopping cart 2019-06-04 23:39:40 +02:00
Julian Hinxlage
7412c45eca nothing is working!!! 2019-06-04 21:58:44 +02:00
Julian Hinxlage
1402e0fbf5 +CartBean 2019-06-04 20:13:57 +02:00
9f3b31113f + Address pages 2019-06-04 17:43:05 +02:00
c8b6376284 + register
+ logout

Signed-off-by: Johannes Theiner <j.theiner@live.de>
2019-06-04 08:51:00 +02:00
c091084584 + login, but only tested for nonexistent users as there is no register yet 2019-06-03 18:12:16 +02:00
5fe9880ffe ~ database handling for payments stuff complete 2019-05-31 11:44:51 +02:00
8415eb3b24 + database getters for payment types 2019-05-27 18:48:28 +02:00
32b39e2db9 fixed constructors not compiling 2019-05-23 11:10:56 +02:00
8ebff9a7f0 + database handling for orders 2019-05-22 15:22:18 +02:00
1742ee4c14 + Shopping cart database handling
+ documentation
2019-05-21 13:04:31 +02:00
b2ed3d6a03 + database stuff for address.
Signed-off-by: Johannes Theiner <j.theiner@live.de>
2019-05-20 11:12:50 +02:00
5e21307980 + database methods for user
Signed-off-by: Johannes Theiner <j.theiner@live.de>
2019-05-19 20:12:30 +02:00
07924cfbdf ~ refactor database into multiple files
Signed-off-by: Johannes Theiner <j.theiner@live.de>
2019-05-19 14:26:45 +02:00
59d944fccd fully working version
Signed-off-by: Johannes Theiner <j.theiner@live.de>
2019-05-17 20:56:01 +02:00
960f58c8c1 + working category selection 2019-05-17 13:08:57 +02:00
Julian Hinxlage
5366ce10ab +bookinfo JSF page 2019-05-17 11:10:57 +02:00
533a6fb202 Merge remote-tracking branch 'origin/julian4' 2019-05-17 10:18:57 +02:00
Julian Hinxlage
59ec7e875a +template for JSF 2019-05-17 10:14:15 +02:00
68a66d2067 working version, without exceptions 2019-05-17 10:14:07 +02:00
32896e0cc3 + dropdown with categories, not working fully
Signed-off-by: Johannes Theiner <j.theiner@live.de>
2019-05-17 08:38:11 +02:00
3f727eae72 found problem, never needed a fix
Signed-off-by: Johannes Theiner <j.theiner@live.de>
2019-05-16 21:10:53 +02:00
b231574e76 tried finding bug 2019-05-16 18:30:04 +02:00
Johannes Theiner
7172524501 Merge branch 'johannes3' of Studium/Internet-Technologien into master 2019-05-03 07:33:16 +00:00
93ab2f3039 Aufgabe 3: kleinere fixes 2019-05-03 09:32:39 +02:00
410004c557 Aufgabe 3: fertig 2019-05-02 16:59:45 +02:00
Johannes Theiner
2ef4187b37 Merge branch 'julian2' of Studium/Internet-Technologien into master 2019-05-02 07:54:13 +00:00
c9785a5f32 ~ cleanup
Signed-off-by: Johannes Theiner <j.theiner@live.de>
2019-05-01 16:34:12 +02:00
813c3aa1f3 ~ Database Configuration
+ random Category image

Signed-off-by: Johannes Theiner <j.theiner@live.de>
2019-04-30 18:13:14 +02:00
b265adec2c + existsBook
+ getCategories
2019-04-30 15:53:50 +02:00
Johannes Theiner
41dd15048a Merge branch 'julian2' of Studium/Internet-Technologien into master 2019-04-27 09:39:40 +00:00
027ebd2a46 + Index
~ small fixes
- db, hello
- web.xml

Signed-off-by: Johannes Theiner <j.theiner@live.de>
2019-04-27 11:37:05 +02:00
Julian Hinxlage
5849812afd changed booklist entries
added value validation to addbook form
added simple Error massages
2019-04-25 11:31:47 +02:00
61e9b4df54 ~weird bug fixed: head->desk
Signed-off-by: Johannes Theiner <j.theiner@live.de>
2019-04-25 07:00:50 +02:00
d91e4ad5f1 + Fixed all insert bugs
~ found a weird one in PreparedStatement

Signed-off-by: Johannes Theiner <j.theiner@live.de>
2019-04-24 21:59:23 +02:00
c9ae2db7e1 Meisten Bugs gefixt 2019-04-24 16:15:15 +02:00