Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Csv seeds #56

Open
wants to merge 281 commits into
base: master
Choose a base branch
from
Open

Csv seeds #56

wants to merge 281 commits into from

Conversation

StacyLundquist
Copy link

No description provided.

christinaminh and others added 30 commits November 18, 2020 08:39
@christinaminh
Merge pull request #3 from geneminde/OrderItemsController
6ca8f6b 
OrderitemsController Actions
@StacyLundquist
Merge pull request #5 from geneminde/product
8d14b76 
Product
@christinaminh
Renamed Orderitem to OrderItem (order_item) and Recreated categories_…
48963b9 
…products join table
@annakim93
working on seed data
9f7a88e
@annakim93
Merge remote-tracking branch 'origin/master' into seed-data
887bca5
@StacyLundquist
products controller
8dab2cb
@StacyLundquist
users controller
7fc122c
@annakim93
added seed data for users, orders, and products
15b834f
@StacyLundquist
Merge branch 'master' of https://github.com/geneminde/betsy into master
5336d55
@christinaminh
Changed Orderitem to OrderItem and changed orderitems to order_items …
51bfebe 
…throughout files. Changed seed.rb and fixtures to reflect these changes
@christinaminh
Corrected typo in seed.rb in puts statement
6428492
@annakim93
minor adj to seed data - user_id for product
baeac1b
@annakim93
fix view for current user filepath
e803bf8
@annakim93
setting up header for merchant dash
170ade2
@annakim93
adding relationships to user model
85a2328
@annakim93
merchant dash header - includes join date, num products listed, num i…
4fefe04 
…tems sold
@annakim93
add user#show to users_controller
15be428
@christinaminh
Changed more OrderItems and order_items
5ef64c1
@geneminde
create orders controller
62f60e8
@annakim93
drying up code in partial
3bfd350
@christinaminh
Fixed yml files to remove single quotes that were not escaped
6ce6353
@annakim93
revised seed data to use an image; template view for items
c847e5c
@annakim93
add users#show to skip_before_action req login
99fb185
@annakim93
change seed data to have more products than order items
bf5e8d0
@christinaminh
Tested OrderItemController#create
82328d7
@christinaminh
Undo commenting out product views
b6d2422
@annakim93
Merge pull request #6 from geneminde/merchant-dash
c9c6a34 
Merchant dash
@christinaminh
Commented out untested OrderItemController actions
f33fa23
@christinaminh
Merge branch 'master' into OrderItemsTest
363f5a5
@christinaminh
Fixed conflicts in order and order_item.rb
76011cf
StacyLundquist and others added 30 commits November 23, 2020 15:02
@StacyLundquist
added gem for testing
ed501eb
@StacyLundquist
test update (working), create (not)
6115e0b
@geneminde
add Category#create + tests
7b6a8ad
@annakim93
adding form partial for review; new review view; removing available? …
56c15d0 
…from product form
@StacyLundquist
coverage
94a9454
@StacyLundquist
Merge remote-tracking branch 'origin/master' into csv_seeds
38f45b0
@StacyLundquist
Merge branch 'products_testing' into csv_seeds
9370021
@christinaminh
Renamed partial views. Added styling to merchant's order summary page
1ef5f9b
@geneminde
add Category#edit, view, tests
26199f4
@geneminde
add Category#update, tests
2d65bc0
@geneminde
add perform login top Product#create tests
ee00c21
@geneminde
add find_category controller helper
a3a3106
@StacyLundquist
some images
6c0c94a
@StacyLundquist
fixed typo
877ddaa
@annakim93
fixing form for creating new rating
ce5cc3f
@annakim93
make user optional for review
b137ee2
@annakim93
removed counter cache from review relationships
577b06f
@christinaminh
Added Order#items_subtotal and Order.by_status(user) for order fulfil…
ee81053 
…lment page
@annakim93
show each rating on product show page
25eff25
@StacyLundquist
Merge pull request #22 from geneminde/products_testing
622cc51 
Products testing merge
@geneminde
Merge branch 'master' of github.com:geneminde/betsy into category
98ba135
@annakim93
Merge branch 'master' into products-edit
6a606d8
@annakim93
Merge pull request #23 from geneminde/products-edit
d7490c7 
Products edit
@christinaminh
Merge branch 'master' into OrderFulfillmentPage
a0928a7
@christinaminh
Merge pull request #24 from geneminde/OrderFulfillmentPage
9dff688 
Order fulfillment page
@geneminde
resolve merge conflicts
e26a384
@geneminde
Merge pull request #21 from geneminde/category
25c329a 
Category
@StacyLundquist
Merge remote-tracking branch 'origin/master' into csv_seeds
c106ecc
@StacyLundquist
seeds w/categories
5a6ad0b
@StacyLundquist
with images
4138f2c
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@StacyLundquist @christinaminh @annakim93 @geneminde