forked from AdaGold/betsy
-
Notifications
You must be signed in to change notification settings - Fork 7
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Betsy Complete - Team Fuzzy #12
Open
noglows
wants to merge
422
commits into
Ada-C4:fuzzy/master
Choose a base branch
from
noglows:fuzzy/master
base: fuzzy/master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
422 commits
Select commit
Hold shift + click to select a range
dbabce2
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
0bda1ef
Working on patch update tests in products controller spec file
lacuchilla b136394
Added stuff for block-grid
daphnegold 89f2938
oops the stuff I added to application.scss is broken
daphnegold 85d24d5
fix get cart test in order items controller
lacuchilla f7f2a47
Some bootstrap and org for product index
daphnegold ec03789
Sidebar accordion
daphnegold 1b74343
More sidebar accordion
daphnegold 0dca540
Added stuff to application.js in order to switch buttons for accordio…
daphnegold af9997c
Fixed an issue with the accordion js
daphnegold 9294105
More CSS for sidebar and images
daphnegold bc25847
Switch to dropdown for small devices (instead of sidebar)
daphnegold a6d0194
Trying to fix broken tests for order items controller
lacuchilla 4aeb969
Add shell tests to be filled out tomorrow when we work on tests
lacuchilla 985a01a
Fixed javascript thingy
daphnegold 4fda453
Fixed some model specs and some controller specs
noglows 444c24b
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
noglows 8736547
Fixing rspec tests
noglows c57775b
Cookies are signed now. Added remove functionality and 0 to delete or…
daphnegold 99fadff
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
daphnegold 39858ea
More trying to write tests in the order items controller
lacuchilla 3a3fb49
Mostly done with form for checkout
daphnegold ea41ca8
Shopping cart page no longer prompts user to sign in...
daphnegold e523d91
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
daphnegold badb172
Updated user model specs
noglows 404e94e
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
noglows 0eab447
Updated user model specs
noglows 263d28e
adjust tests in order items controller
lacuchilla 1f5e8ab
Can't review own products
noglows 9decdeb
Cart sorts in stock from out of stock items
daphnegold d28c145
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
daphnegold 4c341c7
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
noglows f33bc35
Cannot edit or delete another user's products
noglows 1c9eab5
Cannot view another users account details page
noglows 74d4b0d
passing spec for creating new order when first order item created
3640bda
erge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/master
4f04cea
Fixed the login bug
noglows 08edd3a
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
noglows 5779801
Removed a binding.pry
noglows 6be08a5
Updated checkout to show items in cart
daphnegold 2f72973
Fixed the model specs
noglows 4b13fa2
passing specs for creating or not creating appropriately a new order …
9026938
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
8e8832a
Order card_exp is now a date object
daphnegold 1f6cb41
Fixing merge conflict in schema.rb
daphnegold d5743cc
Working on fixing order completion logic
noglows 0a8cdf2
Fixed merge conflicts
noglows ed4538a
Shipping orders/marking orders as complete logic working
noglows 2917e52
Updated before_actions so signed in users cannot see another user's o…
noglows b23c2dc
Fixed issue with mismatched ends on the application controller
daphnegold a0313a0
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
daphnegold 961e4d5
controller specs order items
lacuchilla c012c74
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
lacuchilla 3307238
Created presence true validations for order checkout, and mostly fini…
daphnegold f438242
Fixed some CSS
daphnegold 76835c1
Added total instock cart sum to cart view
daphnegold a3dbea9
Total on checkout view as wel
daphnegold f947c2a
Some bug fixes from standup
noglows 0c3926e
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
noglows 1d1df86
Can't get to the sign-in or new account page when logged in
noglows f76d1b6
Stock is adjusted when guest places an order
daphnegold 2347148
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
daphnegold e7e8453
If product inventory changes while user is checking out, redirect to …
daphnegold bfbea40
Fix merge conflict in products controller
lacuchilla 6254e6d
Fix broken products controller tests for retire method. Retire method…
lacuchilla 580d9c9
fixed bug with retired products not appearing in the grid correctly
daphnegold 30a4b3b
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
daphnegold b573536
Weeded out unnecessary routes
noglows 53de52d
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
noglows 0239552
Bug fix - if there are no orders for a status, a message is displayed
noglows 4f08176
Bug fix - you can no longer create a blank category
noglows 722d6f0
Fix a couple of tests in products controller. So many tests still bro…
lacuchilla 74dfbad
changed spacing
a53e66b
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
abe60e4
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
daphnegold df6cb72
Small controller bug fix - categories were broken
noglows 4fe2d81
Bug fix - you can add/edit a product without setting categories
noglows 2ec8732
Fixed grid bug on front page
daphnegold ec72784
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
daphnegold 661a733
Working on confirmation page
noglows 5670329
working on product show page
daphnegold d38d59c
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
daphnegold f75df93
set up it and params for PATCH update
da72987
Order confirmation page complete
noglows 2f1a762
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
noglows 84cb9ee
Added unit price to shopping cart
noglows 9445777
Some css for product show page
daphnegold 27f0b1d
spec for update redirects to cart is passing
cd8f14b
Fixed formatting of CC expiration
noglows ec56507
spec set, but NOT PASSING for update destroys when quantity is 0
38154f0
spec PASSING for update destroys when quantity is 0
1163110
spec added and IS PASSING for update does not destroy when quantity i…
a751185
Wrote specs for application_helper
noglows c846085
Price was missing from product show page
daphnegold 2d7a353
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
daphnegold a5fa960
Spec files no longer show up in the coverage report
noglows 4698e87
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
noglows 40cef86
More css for product show page
daphnegold 8806044
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
daphnegold d71b500
Fixed issue with picture resizing on product show view
daphnegold 76fcade
specs written and PASSING for update method
604581e
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
0dfd5de
spec for destroy renders cart written and NOT passing
0d42965
spec for destroy renders cart written and IS PASSING
2b556d6
spec written and NOT PASSING for delete destorys the order item from …
ae7b532
spec written and IS PASSING for delete destorys the order item from t…
067c896
spec written and NOT PASSING for index renders index view
8e5618e
Worked on user controller specs
noglows 58b31ed
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
noglows df2c7bc
Additional user controller specs
noglows 780d58c
removed old order seed data
b875f4c
Some fonts we can change, some CSS
daphnegold 89e14ad
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
daphnegold 941d842
More CSS and some glyphicons
daphnegold 7bc860b
spec written and IS PASSING for index renders index view
af40ab7
Sessions controller spec complete
noglows d816705
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
noglows 5a22034
More fiddling. Tests are so broken.
lacuchilla 8629431
Fix merge conflict in sessions controller spec
lacuchilla 186d8bb
Changed color of captions
daphnegold ef4a1a8
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
daphnegold 9c5e732
Add user model specs
noglows 5d0938c
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
noglows b8bb782
prep for merge
1515a13
fixed merge errors from testing
bd89fcd
Fixed bug in sessions controller spec
noglows cde8b2d
Amy and Daphne Fixed all the things in Products Controller spec YAYYYYY
daphnegold eeade41
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
daphnegold fe3118d
Misaligned grids on front page fixed
daphnegold 5b19b92
Linear Gradient for Navbar
daphnegold 2df8cc7
Fixed bug with products index sorts
daphnegold 1271900
Fixed some css and random things
daphnegold b16049d
more play time with css
daphnegold 6bb3b3f
bug with date dropdowns being too narrow fixed
daphnegold a6246e4
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
758fd1f
Fixed off center front page body
daphnegold 2b357a1
Realigned site title
daphnegold 3e7d091
Worked on test coverage for the application controller
noglows 1291554
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
noglows b720c8a
Addition application controller coverage
noglows 2a1a476
Spec cleanup
noglows fd834de
Fixed form validation for new product
noglows d33faf6
Bug fix - Edit form not submitting
noglows d98d87e
Add working tests for orders controller for the index and show actions
lacuchilla c28fd1f
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
lacuchilla 8eac902
fix merge conflicts
88adecf
Fixed broken prod controller spec
daphnegold 0fd02e1
Increased test coverage for order model
noglows 92c15ec
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
noglows da03b60
products controller show spec
661841a
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
1d0e5c1
Added more seed data
noglows ba8a85c
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
noglows 57c3a5a
added orders controller specs
daphnegold cbcdd8a
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
daphnegold 6ddbfc3
Blocked users from viewing other user's content
noglows cac657d
Added validator so only images can be added for image url
noglows 106bfbf
More orders controller rspec tests
daphnegold 49b00d2
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
daphnegold 43e5e8a
Fixed the products controller spec
noglows 9ff0c18
Add working test for ship method in orders controller
lacuchilla e74ff16
Minor changes to css
daphnegold 3afbb6f
All but one order controller method is covered by tests
lacuchilla 0b68b4d
Working on products controller spec
noglows 122969a
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
noglows 72e4e8c
Removed a binding.pry
noglows 83f55c9
commit for specs
cd144ac
commit merge
75d90f4
Removed another instance of Pry
noglows d3c16ab
Fixed the nav bar
noglows ebe059b
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
d398bc4
Fixed issue with order total and products not showing up on confirmat…
daphnegold 7e6bcab
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
daphnegold 1939f01
Add 2 tests for confirmation method in orders controller. Almost 97 p…
lacuchilla 60709e6
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
lacuchilla 7ee312a
Really fixed the bug with confirmation this time
daphnegold 2af7bb5
Prepared gemfile for Heroku
noglows 0603b0f
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
noglows 6e62c89
footer for additional space
daphnegold 545eae6
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
daphnegold 8c0e49d
cvv field added
3dfb896
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
acf267f
city and state fields
c78cd21
Add working test for one of the next lines in the index method for th…
lacuchilla f5770c8
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
lacuchilla 0534978
Fix merge conflict
lacuchilla ad9ad66
Added javascript to load ship form but no form yet
daphnegold b48e275
Fixed merge issue in products_controller_spec
noglows c04fe87
Fixed the database issues for real this time
noglows 87ce8c2
Things
lacuchilla 5bbdbb0
Fix merge conflict
lacuchilla 6b44083
Finished form for billing information
daphnegold f65ec23
Added validation to price, quantity
noglows f371d68
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
noglows 35a28aa
Required first/last name, added length requirements
noglows fdd61c1
Bug fix - Only see categories and merchants that have products
noglows b75fe00
Add length maximum validation for the name and description fields to …
lacuchilla c0e08c7
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
lacuchilla 4b0c538
Fixed merge conflict and checkout form
daphnegold dc78760
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
daphnegold a56950e
Validate length of the name and description of product
daphnegold c483420
Word wrap for long words in small spaces
daphnegold 3625e63
Added min/max limits for category names
noglows edf1008
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
noglows b6806e8
validation for expiration of card being in the future
daphnegold ca8136d
maxlength for product name and product description set
46987b4
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
daphnegold 4421a94
min and max number limit for product price and product inventory
309a02d
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
cab2b00
max length for new category name is set
d8cdf94
Fix things
lacuchilla a7211b5
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
lacuchilla 8d648bf
flash messages for cart changes has been updated to be more clear
e74b3f0
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
5bfed85
quantity drop down on cart when cart has changed is now in correct po…
ad771cf
after writing a review, page redirects to review tab
daphnegold 7595454
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
daphnegold d2c8ce4
added stars to the reviews section
881c728
made error for not allowing review of own product to be more clear us…
5459c03
Fixed failing user tests
noglows f08f835
Commented out unused code in products controller (line 16)
noglows a1a4a08
Updated failing test in products_controller
noglows 1e61e0c
fix cart has updated bug
c477c7b
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
6b2d528
More options for credit card expiration year
noglows 0ba7ccd
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
noglows 4fc46ad
Moved the All Orders to the top of the order fulfillment page
noglows 0be1b52
Average review rounds to 1 decimal place
noglows 5858160
Fixed the timezone
noglows 0f9e060
deleted some unused empty files and fixed flash errors for reviews
daphnegold ec280a0
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
daphnegold a405c9a
moar seeds
de3c8d2
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
0a4ca03
Fixed overflowing div
daphnegold 2bfe2ab
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
daphnegold 5aece42
Bug fix - order items in orders
noglows 2665fcc
Update README.md
noglows f8e45f6
rspec tests
lacuchilla b919915
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
lacuchilla bf38408
remove commented out code
b236df1
remove commented out code
2fe2cb9
remove commented out code
088b2f1
move instock logic out of the cart view
a53835d
move logic out of cart view
c2720c6
Code fixes for things
lacuchilla ddf7f5d
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
lacuchilla 82b76aa
move shipped status logic out of view and into helper
1b81b95
Merge branch 'fuzzy/master' of github.com:noglows/betsy into fuzzy/ma…
c903e00
move reverse logic from controller to model
b83ccbd
move reverse logic from controller to model
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Added validation to price, quantity
- Loading branch information
commit f65ec236104e9e1bd2810a73a7778404cb03de1e
There are no files selected for viewing
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's good to remove unused code before a pull request.