Traverse - [b]Etsy#6

Open

sophiabaldonado wants to merge 262 commits intoAda-C5:masterfrom

sophiabaldonado:master

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

Commits on May 5, 2016

Commits on May 6, 2016

Worked on new and create action for Orders controller;
sophiabaldonado
committed
added seed data for product category to test to see if bridge works.
Cristal Tay
committed
Merge branch 'ProductIndex'
Cristal Tay
committed
the freaking many to many relationship works for product and categories. had to double check with the active record docs
Cristal Tay
committed
Working on update quantity form for cart items in orders new NOT WORKING;
sophiabaldonado
committed
made a add to cart button and method.
Cristal Tay
committed
Added a div with class container to layout for bootstrappiness;
sophiabaldonado
committed
Merge branch 'master' of github.com:sophiabaldonado/betsy
sophiabaldonado
committed
Added cart update route; Added update submit button to cart item quantity edit form on orders new;
sophiabaldonado
committed
Resolved merge confilct in routes, application layout, and products controller;
sophiabaldonado
committed
changed the show method to include an or for product
Cristal Tay
committed
Resolve merge conflict in routes;
sophiabaldonado
committed
changed the show method to include an or for product
Cristal Tay
committed
Merge branch 'master' of github.com:sophiabaldonado/betsy
Cristal Tay
committed
changed route. mebbe.
Cristal Tay
committed
Working on getting cart item quantity to update;
sophiabaldonado
committed
trying to get form_tag to actually add to the cart. it's not. damn it.
Cristal Tay
committed
Merge branch 'master' into orders_controller
sophiabaldonado
committed
fixed the form tag. the problem was with how I defined the params in the products controller, createcart method. it workssss. hells eyeahhhhh. add a product will show up in the order cart.
Cristal Tay
committed
Merge branch 'master' into orders_controller
sophiabaldonado
committed
Update cart item quantity mostly works now;
sophiabaldonado
committed
Order of cart_items on order/new is descending;
sophiabaldonado
committed
Added proceed to checkout button and boostrap classes;
sophiabaldonado
committed
Changed inventory of one product in seed file;
sophiabaldonado
committed
Order create subtracts the correct quantity from inventory;
sophiabaldonado
committed
added nav bar with links, working on the logic for the sign in/up log out/in
mcarson1111
committed
Order item price is created with the correct value now;
sophiabaldonado
committed
Merge branch 'master' of github.com:sophiabaldonado/betsy
mcarson1111
committed
Merge branch 'orders_controller'
sophiabaldonado
committed
fixing product images with bootstrap and shady css
Cristal Tay
committed
fixed the conflicts from show html in products to be able to add a certain number of products.
Cristal Tay
committed
Merge branch 'master' of github.com:sophiabaldonado/betsy
Cristal Tay
committed
fixed nav bar
mcarson1111
committed
Merge branch 'master' of github.com:sophiabaldonado/betsy
mcarson1111
committed
Take params out of views;
sophiabaldonado
committed
working on cart button
mcarson1111
committed
Merge branch 'master' of github.com:sophiabaldonado/betsy
mcarson1111
committed
added a link to the picture to look at product details
Cristal Tay
committed
Merge branch 'master' of github.com:sophiabaldonado/betsy
Cristal Tay
committed
added shopping cart
mcarson1111
committed
Merge branch 'master' of github.com:sophiabaldonado/betsy
mcarson1111
committed

Commits on May 9, 2016

added log in and log ou capabilitiest
mcarson1111
committed

Commits on May 10, 2016

Commits on May 11, 2016

Commits on May 12, 2016

Commits on May 13, 2016

Commits on May 14, 2016

yaml file for products up in hur.
Cristal Tay
committed
added users in fixtures for testing
yordanosd
committed
Merge branch 'master' of github.com:sophiabaldonado/betsy
Cristal Tay
committed
Merge branch 'master' of github.com:sophiabaldonado/betsy
Cristal Tay
committed
edited the user test file
yordanosd
committed
local git conflict
yordanosd
committed
trying out a test in product_test.rb. It keeps throwing a no method error
Cristal Tay
committed
added 'fixtures :all' in the test_helper.rb file
yordanosd
committed
added simplecov gem and changed the fixture requirement in the text_helper file
yordanosd
committed
commiting product_test.rb before merging
Cristal Tay
committed
fixed the merge conflict
Cristal Tay
committed
finished testing for product and categories
Cristal Tay
committed
completed 100% test coverage for users, reviews and billings
yordanosd
committed
resloved conflict issues with coverage files
yordanosd
committed
Merging tests;
sophiabaldonado
committed
added cart_items coverage.
Cristal Tay
committed
Orders test;
sophiabaldonado
committed
Add coverage to gitignore;
sophiabaldonado
committed
added cart_items coverage.
Cristal Tay
committed
Merge branch 'master' of github.com:sophiabaldonado/betsy
Cristal Tay
committed
Debugging tests;
sophiabaldonado
committed
merge conflict in testhelper;
sophiabaldonado
committed
Finish orders tests;
sophiabaldonado
committed
fixed the second image in the carousel. missing .jpg extension
sophiabaldonado
committed