Robits #41

Open

Bella8 wants to merge 342 commits intoAda-C6:masterfrom Bella8:master

+7,040-264

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

Commits on Oct 21, 2016

Commits on Oct 22, 2016

Commits on Oct 24, 2016

Added tests for Order; changed self.build method in Order model to reflect the added validation. Still missing: statuses allowed
guineveresaenger
committed
Unified log in and log out view for Homepage by making them pointing to one template: index.html.erb and putting render :index in Sessions controller. Added .DS_Store in .gitignore.
KellyPT
committed
Merge branch 'master' of https://github.com/Bella8/betsy
KellyPT
committed
Fixed some more product test messes. Added mostly blank test to PaymentDetails. Wrote comments with suggestions into payment_detail.rb. Wrote incomplete yml fixture for product_test.
guineveresaenger
committed
Added validations, tests and fixtures for Category
guineveresaenger
committed
Added CVV to payment_detail test and mocked it in fixtures(still need to complete those; need someone who knows the algorithm to throw me some valid mock cc numbers). Added Merchant validations, te…
guineveresaenger
committed
Fixing some git trouble
guineveresaenger
committed
Encountering trouble with testing CategoriesProduct. Possibly because test files were generated manually...?
guineveresaenger
committed
Merge branch 'master' of https://github.com/Bella8/betsy
guineveresaenger
committed
Fixes seed file to add join table
nahmisa
committed
Added the Sign Up button on nav bar in layouts/application
KellyPT
committed
Changed the Merchant.csv file to clear confusion. Modified create action in products controller and index page of merchant's products.
KellyPT
committed
Uses check_availability model method to avoid updating product count too early
nahmisa
committed
Merge branch 'master' of github.com:Bella8/betsy
nahmisa
committed
added gem for simplecov
Bella8
committed
more simple Installation
Bella8
committed
Changes to payment_detail - credit card expiration date is now a Datetime data type. Corresponding changes in fixture. Added some tests and fixtures to order.
guineveresaenger
committed
Changes to payment_detail - credit card expiration date is now a Datetime data type. Corresponding changes in fixture. Added some tests and fixtures to order.
guineveresaenger
committed
Merge branch 'master' of https://github.com/Bella8/betsy
guineveresaenger
committed
Modified the new and create actions in Production Controller. Change the products' partial view _form.html.erb to display correction. Minor change on merchant log in list.
KellyPT
committed
Removed edit, update, destroy from reviews'routes. Removed the corresponding action from Reviews Controller.
KellyPT
committed
Removed destroy from merchant's routes. Removed destroy action from Merchants Controller.
KellyPT
committed
Removed new and create from merchants' routes. Removed new and create from Merchants Controller. Reason: a Merchant can't create another Merchant object in our database. Added a link to show a Merc…
KellyPT
committed
Merchant'routes now only have index, because Merchant's object is initiated when a person log in GitHub. He/she can't create or update or delete a Merchant object. Removed all actions except for in…
KellyPT
committed
Removed destroy from product's routes and products controller. Because a logged-in Merchant won't ever delete a product.
KellyPT
committed
Modified Merchant.csv. Modified the controller filter in Products Controller.
KellyPT
committed
Added Dragonfly gem in order to add photo's and added image table, added cache gem
Bella8
committed
no change in routes
Bella8
committed
Merge branch 'master' of https://github.com/Bella8/betsy
Bella8
committed
Removes products from stock upon purchasing
nahmisa
committed
Merge branch 'master' of github.com:Bella8/betsy
nahmisa
committed
Changed Merchant.csv file to allow unique user.
KellyPT
committed
Allow index and show actions to be in Merchants Controller again.
KellyPT
committed
Add index and show routes to Merchants
KellyPT
committed
Show a Merchant's list of products
KellyPT
committed

Commits on Oct 25, 2016

Commits on Oct 26, 2016

Commits on Oct 27, 2016

Commits on Oct 28, 2016