FINALLY displays item availability in the show view in a beautiful js calendar
FINALLY displays item availability in the show view in a beautiful js calendar
Host creates an in item test selects dropdowns
Allows user to book a listing with specific datesOrderItem connects to availabilities to display quantity.
Scopes unreserved orders so that the item show calendar displays only available dates
Merge branch 'availability-part2' of github.com:MarcGarreau/the_pivot into lolomg

Conflicts:
	app/models/item.rb
	app/views/items/show.html.haml
Fix merge conflicts
Makes tests pending that crash for a 'first argument in form cannot contain nil'
Makes tests pending that crash for a 'first argument in form cannot contain nil'
Merge branch 'availability-part2' of github.com:MarcGarreau/the_pivot into availability-part2
Merge branch 'availability-part2' of github.com:MarcGarreau/the_pivot into availability-part2
Fix adding to order test
Update tests for order subtotal
Add helper for adding to order test
Don't log to STDOUT in tests:
Always verify both user_id and remember_token when checking current user

If both of these properties are relevant to us being (securely) sure that the current user has not been spoofed, then we should always be verifying for both of these. Either being incorrect would indicate a tampered session token. We should not be conditionally returning 404 in this case, we should be erroring out as soon as humanly possible.  is the logical place for this, though an argument could be made for setting current_user to nil if the remember_token doesn't match, in the case that they signed in on another machine. This should be investigated later.
Merge branch 'capybara' into availability-part2
Merge branch 'availability-part2' of github.com:MarcGarreau/the_pivot into availability-part2
Fix more tests
Fix merge conflicts