Merge develop to master#7

Merged

zoltanNemeth merged 98 commits intomasterfrom

Nov 4, 2019

Commits on May 14, 2019

Commits on May 15, 2019

Corrected getSumOfPriceBy Product method in Order
zoltanNemeth
committed
Plus test cases in Class Initializer
zoltanNemeth
committed
minor changes to animals data
Blodie
committed
products now have a supplier assigned to them
Blodie
committed
Merge branch 'order' into develop
Blodie
committed
changed order class to a singleton, added complete method
Blodie
committed
order date gets saved to json file on order completion, new dependency: Jackson - added to pom.xml
Blodie
committed
added confirmed and paid field to order class, added main method for testing purposes to order class
Blodie
committed
Filters back-end implemented && tested
boroslizi
committed
shopping cart page
TheRandomHero
committed
before merging
TheRandomHero
committed
working
TheRandomHero
committed
Filter and index page works well
boroslizi
committed
Add button working
TheRandomHero
committed
Filter refactored
boroslizi
committed
Merge branch 'filter_products' into order
TheRandomHero
committed
Pom dependency corrected
boroslizi
committed
working with filter feature
TheRandomHero
committed
shopping cart button went on top
TheRandomHero
committed
Merge remote-tracking branch 'origin/develop' into order
zoltanNemeth
committed
Refactored Index.html
zoltanNemeth
committed
Add to Cart with post request
zoltanNemeth
committed

Commits on May 16, 2019

Refactored table in shopping cart page
zoltanNemeth
committed
display cart size
TheRandomHero
committed
Refactored table in shopping cart page
zoltanNemeth
committed
display cart size
TheRandomHero
committed
Merge remote-tracking branch 'origin/order' into order
TheRandomHero
committed
Merge into develop
TheRandomHero
committed
Merge pull request #2 from CodecoolGlobal/order
TheRandomHero
authored
Refactored table in shopping cart Controller and Back to shop button added to cart page
zoltanNemeth
committed
Refactored cart page
zoltanNemeth
committed
Edit shopping cart
erikaZToth
committed
Formatted table of shopping cart
erikaZToth
committed
checkout done, payment in progress
TheRandomHero
committed
Merge branch 'develop' of https://github.com/CodecoolGlobal/webshop-java-codecoolshop into checkout
TheRandomHero
committed
Back button and paymant button working
TheRandomHero
committed
payment fields fixed
TheRandomHero
committed
Refactored Initializer
zoltanNemeth
committed
Refactored ProductController
zoltanNemeth
committed
Refactored index page, CheckOutController, corrected call of Order.getInstance().complete()
zoltanNemeth
committed

Commits on May 30, 2019

Commits on May 31, 2019

Merge pull request #5 from CodecoolGlobal/tests
zoltanNemeth
authored

Commits on Sep 7, 2019

refactored tests
zoltanNemeth
committed

Commits on Sep 11, 2019