Space & Time - Charlotte, Katie, Mair, Yoyo#34

Open

ktvoort123 wants to merge 219 commits intoAda-C13:masterfrom

mheshmati-tech:master

Commits on Jun 9, 2020

initial set up
mheshmati-tech
committed

Commits on Jun 10, 2020

Commits on Jun 11, 2020

Merge branch 'products' of github.com:mheshmati-tech/betsy
FreeMonkey19
committed
schema change
mheshmati-tech
committed
fixed merge conflict
mheshmati-tech
committed
rails db:migrated for adding foreign key for product and user
mheshmati-tech
committed
Merge branch 'master' of github.com:mheshmati-tech/betsy
FreeMonkey19
committed
added the current user as the product user id - wrote a method to know if the user is logged in the application
mheshmati-tech
committed
Merge branch 'master' of github.com:mheshmati-tech/betsy
FreeMonkey19
committed
created order model and controller, created order item model, created relationships between orders, order items, and products
ktvoort123
committed
added a form to the product show page to create an order item
ktvoort123
committed

Commits on Jun 12, 2020

Commits on Jun 13, 2020

Commits on Jun 14, 2020

Commits on Jun 15, 2020

Commits on Jun 16, 2020

Commits on Jun 17, 2020

Commits on Jun 18, 2020

Commits on Jun 19, 2020