Jon/lab5 #18
Open
Jon/lab5 #18
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 30 commits
June 18, 2013 15:56
added 28 commits
June 30, 2013 19:01
…okens setter method
ghost
assigned 
|
Good job! but there are conflict on your branch so you have to fix it before merge it |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added client side validations
Allow owners to specify open schedule
Updated Owner, User, Reservation, and Restaurant model relationships
Owners can approve reservation
Created has_and_belongs_to_many relationship between Restaurant and Category
Create a db/seeds.rb file
Update the Restaurant form to allow Owners to select a single Category per Restaurant
Update the Restaurant Show to display the Restaurant’s Category
Formatted reservation confirmation emails
Pushed to Heroku
Allow Users to create single Reservation per Restaurant per day
Came up with a way to store restaurant reservation inventory
Wrote Restaurant model and controller specs
Added Category index/show pages
Still need to:
Update Browse to have a filter for availability
in reservation#new form, display only reservation hours that fall between opening and closing hours
write more tests