Ditzy Pull Request#2

Open

jadevance wants to merge 303 commits intoAda-C5:masterfrom pottery123:master

+2,111-77

This pull request is big! We're only showing the most recent 250 commits

Commits on May 5, 2016

Commits on May 6, 2016

Commits on May 7, 2016

omg the cart works
jadevance
committed
working on linking up orders/completing a purchase from the cart of order items
jadevance
committed
Merge branch 'master' of github.com:pottery123/betsy
jadevance
committed
Merge branch 'jv-cart'
jadevance
committed
Redirected ditzy index to /products, removing the ditzy separate controller along with index.
jadevance
committed
removed ditzy controller
jadevance
committed
Fixed login issue where it was redirecting to the wrong path
jadevance
committed
Added a new method to sessions to handle the instantiation of a new cart object upon entering the site
jadevance
committed
removed raise from method I was testing, grouped new with create so create method in sessions now properly generates an order ID
jadevance
committed
created radio buttons for catagories, so merchants can assign more than one catagory to each product
leahnp
committed

Commits on May 8, 2016

Commits on May 10, 2016

Commits on May 11, 2016

Commits on May 12, 2016

Commits on May 13, 2016