Ampers: Maddie, Angela, Katie, Nora#25

Open

kcforsman wants to merge 387 commits intoAda-C9:masterfrom kcforsman:master

+6,172

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

Commits on Apr 23, 2018

Commits on Apr 24, 2018

edit tests for order
madaleines
committed
deletes homepages controller test file. adds migration to categories_products table. edits product fixtures. adds tests to product_test.rb
npeters5
committed
updated schema file
npeters5
committed
schema all good
kcforsman
committed
Merge branch 'master' of https://github.com/kcforsman/betsy
kcforsman
committed
these f-ing dropdown menus, man
AngelaPoland
committed
merged an angela branch Merge branch 'master' of https://github.com/kcforsman/betsy
AngelaPoland
committed
Merge branch 'master' of https://github.com/kcforsman/betsy
kcforsman
committed
adds/finished category model tests
AngelaPoland
committed
adds calculate_total method to order model
npeters5
committed
edits product fixture
npeters5
committed
Merge branch 'master' of https://github.com/kcforsman/betsy
npeters5
committed
THE F-ING DROPDOWN MENUS WORK NOW THANKS TO KATIE
AngelaPoland
committed
Merge branch 'master' of https://github.com/kcforsman/betsy
AngelaPoland
committed
Merge branch 'master' of https://github.com/kcforsman/betsy
kcforsman
committed
added update quantity functionality to cart, accounts for adding inventory back to a product if buyer reduce quantity being purchased and decreases inventroy if buyer adds more into their cart
kcforsman
committed
added remove from cart funcationality by creating a restful route for destroying an order_product in the routes.rb, created buttons to empty cart and remove from cart in carts main view from the bu…
kcforsman
committed
added logic to order_product destroy action method that adds quantity from the order product back into the inventory of the product and handles in the order_product record is not actually an record…
kcforsman
committed
added logic in the order show view to see cart table info and checkout/cart-related buttons only if the there is something in the cart
kcforsman
committed
added empty cart functionality to the orders#destroy action method, updates the related products inventory when cart is empties, and customized confirmation messages for the emptying carts and dele…
kcforsman
committed
adds merchant model unit tests. all tests passing
npeters5
committed
adds additional review fixture
npeters5
committed
adds has_many unit tests for product model
npeters5
committed
adds staff picks to root page
AngelaPoland
committed
adds merchant custom method model test
AngelaPoland
committed
adds tests for reviews controller
npeters5
committed
adds dependent: :destroy to order_products and reviews for products controller
npeters5
committed
adds root tests for products controller
npeters5
committed
Added log message
madaleines
committed
Added auth failure route
madaleines
committed
edit merchant fixtures and commented out code in sessions controller
madaleines
committed
added top rated functionality to root view
AngelaPoland
committed
Merge branch 'master' of https://github.com/kcforsman/betsy
AngelaPoland
committed
another root view fix
AngelaPoland
committed
Move cart show logic to index view
madaleines
committed
edits render404 method in app controller
npeters5
committed
minor refactoring on product controller
npeters5
committed
adds product controller tests for index & show
npeters5
committed
adds category for hoodie fixture
npeters5
committed
Merge branch 'master' of https://github.com/kcforsman/betsy
npeters5
committed
adds placeholder image functionality to products controller
npeters5
committed
adds image_tag to product index view
npeters5
committed
adds image_tag to product show page and root
npeters5
committed

Commits on Apr 25, 2018

Commits on Apr 26, 2018

Commits on Apr 27, 2018

Commits on Oct 16, 2018