Ampers: Fur-eign Keys#27

Open

2020dream wants to merge 358 commits intoAda-C9:masterfrom 2020dream:master

+8,475-9

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

Commits on Apr 23, 2018

add toggle is active test and method
MonalisaC
committed
Add view for homepage
2020dream
committed
Merge branch 'master' of https://github.com/choricao/betsy
2020dream
committed
Implement Retire and Reactivate buttons on user account page
2020dream
committed
add_to_cart method in Products controller is starting to work.
Lasiorhine
committed
beginning of a button_to for adding to cart for the products show page.
Lasiorhine
committed
Resolved potential merge conflict after pulling from master
Lasiorhine
committed
Deleted and regenerated Gemfile.lock because everything suddenly went weird. Seems ok now, though.
Lasiorhine
committed
added homepage controller and route
SelamawitA
committed
Merge branch 'master' of https://github.com/choricao/betsy
SelamawitA
committed
Vary basic cart is working, can can be viewed from the cart button in the nav bar.
Lasiorhine
committed
When a duplicate item is added to the cart, the quantity now goes up, and an additional instance of OrderItem is not created.
Lasiorhine
committed
Discard date for data_select
2020dream
committed
Homepage: add outfits, toys & categories; collect images for carousal
2020dream
committed
Add carousal images
2020dream
committed
Add dog-with-keys image to footer yay
2020dream
committed
Initial cart controller created
Lasiorhine
committed
Steps w/re routing and controller method creation toward having a New method for the cart controller. Nothing is completed or functional yet w/re this.
Lasiorhine
committed
methods and tests for top seller and can cancel
MonalisaC
committed
Merge branch 'modeltesting'
MonalisaC
committed
Add search box on Products#index & it workedgit add .
2020dream
committed
Merge branch 'master' of https://github.com/choricao/betsy
2020dream
committed
Add popular list
2020dream
committed
Messing around with the cart controller on my own.
Lasiorhine
committed
Add status filter on Users#show, statistics is working properly
2020dream
committed
Update Cancel on confirmation page using custom method can_cancel
2020dream
committed
Link Cancel button
2020dream
committed
Add product buttons in both products show and products index pages are updated and working. Methods within the cart controller for add_product, access_cart, and the private create_cart are also wor…
Lasiorhine
committed
search method and tests
MonalisaC
committed
Move search button to right side of search box
2020dream
committed
Cart's add_products method is working again, after having failed in the wake of a test of the cart's destroy method.
Lasiorhine
committed
list of all orders and by status method and tests
MonalisaC
committed

Commits on Apr 24, 2018

Commits on Apr 25, 2018

Commits on Apr 26, 2018

Commits on Apr 27, 2018