Thrillow#22

Open

kayxn23 wants to merge 331 commits into

Ada-C10:masterfrom

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

Commits on Oct 22, 2018

Commits on Oct 23, 2018

Merge branch 'master' of https://github.com/kayxn23/betsy
danimetz
committed
Added more tests to the products and user models
danimetz
committed
Added links on dashboard for add product/add category/to edit or retire each product.
cassyarchibald
committed
created draft of dashboard, still need order/order item functionality
cassyarchibald
committed
Added root to require login
cassyarchibald
committed
Merge branch 'merchant_dashboard_products'
cassyarchibald
committed
Merge branch 'master' of https://github.com/kayxn23/betsy
danimetz
committed
Merge branch 'master' into AdditionalModelTests
danimetz
committed
Pulled in the lastest version of master to the branch
danimetz
committed
fixed categories controller show method, added the show route and then fixed typo in the show method in the controller
danimetz
committed
Revised current order method
KatherineJF
committed
properly named the fixtures orders_items bc we needed that underscoregit add .
kayxn23
committed
orderitems tests passing! just one failure on order model test that has to do with a method that is being edited 'add_product
kayxn23
committed
began work on find my order items method
cassyarchibald
committed
Merge branch 'master' of https://github.com/kayxn23/betsy into merchant_dashboard_orders
cassyarchibald
committed
updated app controller, order model testing
KatherineJF
committed
merge conflict
KatherineJF
committed

Commits on Oct 24, 2018

Commits on Oct 25, 2018

Commits on Oct 26, 2018