TEAM GLITZY- Tanja, Jan, Severin, and Amy#65

Open

ayjlee wants to merge 388 commits intoAda-C8:masterfrom

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

Commits on Oct 20, 2017

Commits on Oct 21, 2017

ReviewControllerUpdate: Added review and product catch for merchant; merchants cannot edit their own products
JNEdrozo
committed
ReviewControllerUpdate: Edit Denial message changed to inform users only logged in users can edit reviews
JNEdrozo
committed
Edited OrderItem form to limit the select options up to 20 or available product quantity
ayjlee
committed
Merge branch 'master' of https://github.com/ayjlee/betsy
ayjlee
committed
Added edit form to allow quantity change for order_item
JNEdrozo
committed
Updated OrderItem#update method to update order_item quantity from edit form
JNEdrozo
committed
Update Order and User fixtures (order fixture names and content have been updated to include user info and status name(used to order_one now pending_order; order_two now paid_order)
JNEdrozo
committed
Changed the edit and new order_item form so customers can choose any number between 1 and product quantity for order_item quantity [TAJ]
JNEdrozo
committed

Commits on Oct 23, 2017

Commits on Oct 24, 2017

Commits on Oct 25, 2017

Commits on Oct 26, 2017

Commits on Oct 27, 2017

Commits on Oct 30, 2017

Update README.md
misstonbon
authored