Earth/Fire - Anna, Christina, Genevieve, Stacy - #82

Open

geneminde wants to merge 421 commits into

Ada-C14:masterfrom

geneminde:master

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

Commits on Nov 20, 2020

migration for date_placed in orders db
annakim93
committed
205e317
adjust logic in seeds data to allow for 0 qunatity items (to test for out of stock items) and set available to false if is_retired OR quantity == 0
annakim93
committed
f71eb8e
revise toggle_retire model method to change available to true only if quantity is also positive
annakim93
committed
95f3ae3
revise views to reflect the separated retired vs out of stock item
annakim93
committed
2373987
revise merchant dash to reflect separation of oos and retired
annakim93
committed
b45bf0d
add image alt tags
annakim93
committed
ae73a69
fix some of the user summary language for merch dash vs a guest user view
annakim93
committed
d8a7f1f
Merge pull request #15 from geneminde/product-retirement-tests
annakim93
authored
34388ce
adding links to application nav for easier navigation
annakim93
committed
d0df6a4
adding create product button to merchant dash
annakim93
committed
ad8c9cf
checkout functionality + order confirmation view
geneminde
committed
fb376d6
Merge branch 'master' of github.com:geneminde/betsy into checkout
geneminde
committed
ac0e3ee
decrement inventory upon payment
geneminde
committed
394d0b8
add merchants view
annakim93
committed
cddbfce
Merge branch 'merchant-index-view'
annakim93
committed
87a1830
Merge branch 'master' of github.com:geneminde/betsy into checkout
geneminde
committed
3058d5e
Merge pull request #16 from geneminde/checkout
geneminde
authored
7ff8f36

Commits on Nov 22, 2020

categories csv
StacyLundquist
committed
b5f3b29
users csv -- complete
StacyLundquist
committed
9621c9d
updated products csv
StacyLundquist
committed
b8d9e4b
DRY up products_controller
StacyLundquist
committed
de3485b
Merge branch 'product' into csv_seeds
StacyLundquist
committed
d60eaf8
new seed data from csv
StacyLundquist
committed
215025f
Added Order#filter_items and Order#shared to filter current user's items in shared orders on order fulfillment page
christinaminh
committed
0682e46

Commits on Nov 23, 2020

Removed OrderItem@already_in_cart since it overlaps with OrderItemsController#consolidate_cart
christinaminh
committed
a70e969
Added tests for Order#filter_items and Order#shared?
christinaminh
committed
bfe9c70
Resolved conflicts with master branch
christinaminh
committed
78269f9
Removed OrderItem#sell and corresponding tests as it overlaps with Order#decrement_inv
christinaminh
committed
46f8290
Removed redundant column from order fulfillment and aligned order status to right
christinaminh
committed
933ff3e
add complete_order method to update order with order date + Order model tests
geneminde
committed
9e53147
resolve merge conflicts
geneminde
committed
a95ba4d
Merge pull request #17 from geneminde/checkout
geneminde
authored
a18ff2f
Order relations, initialize tests
geneminde
committed
1519a29
order controller tests sans validations
geneminde
committed
2070c1e
refactor Order#complete_order
geneminde
committed
5087f02
commetning in login action to pass tests
annakim93
committed
4447176
adding simplecov gem and adding coverage/* to gitignore
annakim93
committed
92d2cfb
adding products controller tests for retire toggle; added let blocks and before block to login as this can only be done by a logged in user
annakim93
committed
8b10e79
adjusting logic for retirement toggle to exit after changing available in specific case; add product model tests for toggle retirement
annakim93
committed
758657d
minor adjustments to users tests
annakim93
committed
78e9a40
fixing logic for views for retired vs not
annakim93
committed
cb0d623
adding styling to new product page
annakim93
committed
fffbdc6
closing a li tag
annakim93
committed
e9a8245
Merge pull request #18 from geneminde/checkout
geneminde
authored
bf49b8d
Merge pull request #20 from geneminde/product
StacyLundquist
authored
46459b3
Merge pull request #19 from geneminde/product-retire-tests
annakim93
authored
888fd4d
gitignore revision
annakim93
committed
ba20ef6
Merge branch 'master' of https://github.com/geneminde/betsy
annakim93
committed
27fc172
Fixed order item validation so item in cart cannot be updated to exceed inventory
christinaminh
committed
3c2347f
adding edit view to products
annakim93
committed
e3184ce
Refactored Order.user_orders scope to return distinct orders
christinaminh
committed
ab36cb9
adjust find_product method to work with toggle_retire
annakim93
committed
8781ad0
create categories controller
geneminde
committed
6cb16b9
index action
geneminde
committed
7f254b3
edit product view
annakim93
committed
cad4843
add products#update controller method
annakim93
committed
239a798
added products controller tests for edit, update, and retire
annakim93
committed
0bf8745
add category association, model tests + fixtures
geneminde
committed
20fe756
adding product validations for name, description, quantity, and price
annakim93
committed
39c082a
add product validation errors to the application html page
annakim93
committed
986e5cd
#edit,#new
StacyLundquist
committed
66571ff
Merge remote-tracking branch 'origin/products-edit' into products_testing
StacyLundquist
committed
2ce3d1c
adding product model validation tests
annakim93
committed
f08ff2f
Category#index, view, tests
geneminde
committed
bc638e5
fixed one products#update test
annakim93
committed
9ffd243
add relationships and validations for review
annakim93
committed
9fa5faa
adjust validation to force rating to be a number from 1-5 not 0-5
annakim93
committed
b176bd5
Added OrdersController#index for Order Fulfillment page and added basic styling
christinaminh
committed
8e3890f
nested product routes within product; working on reviews controller
annakim93
committed
b00cb57
Added tests for OrdersController#index and Order.to_status_hash(user)
christinaminh
committed
fe03344
add Categores#show, view & tests
geneminde
committed
c89b975
move find_product to application controller for use in reviews controller; add controller actions
annakim93
committed
e8a637f
migration for reviews to reference user and product
annakim93
committed
6ad8a82
test for category#active_products, update products.yaml
geneminde
committed
10c4433
style product show page - separate image and description (lr); add ratings to bottom
annakim93
committed
984dc98
add new controller action, view and tests
geneminde
committed
6511956
added gem for testing
StacyLundquist
committed
ed501eb
test update (working), create (not)
StacyLundquist
committed
6115e0b
add Category#create + tests
geneminde
committed
7b6a8ad
adding form partial for review; new review view; removing available? from product form
annakim93
committed
56c15d0
coverage
StacyLundquist
committed
94a9454
Merge remote-tracking branch 'origin/master' into csv_seeds
StacyLundquist
committed
38f45b0
Merge branch 'products_testing' into csv_seeds
StacyLundquist
committed
9370021
Renamed partial views. Added styling to merchant's order summary page
christinaminh
committed
1ef5f9b
add Category#edit, view, tests
geneminde
committed
26199f4

Commits on Nov 24, 2020

add Category#update, tests
geneminde
committed
2d65bc0
add perform login top Product#create tests
geneminde
committed
ee00c21
add find_category controller helper
geneminde
committed
a3a3106
some images
StacyLundquist
committed
6c0c94a
fixed typo
StacyLundquist
committed
877ddaa
fixing form for creating new rating
annakim93
committed
ce5cc3f
make user optional for review
annakim93
committed
b137ee2
removed counter cache from review relationships
annakim93
committed
577b06f
Added Order#items_subtotal and Order.by_status(user) for order fulfillment page
christinaminh
committed
ee81053
show each rating on product show page
annakim93
committed
25eff25
Merge pull request #22 from geneminde/products_testing
StacyLundquist
authored
622cc51
Merge branch 'master' of github.com:geneminde/betsy into category
geneminde
committed
98ba135
Merge branch 'master' into products-edit
annakim93
authored
6a606d8
Merge pull request #23 from geneminde/products-edit
annakim93
authored
d7490c7
Merge branch 'master' into OrderFulfillmentPage
christinaminh
authored
a0928a7
Merge pull request #24 from geneminde/OrderFulfillmentPage
christinaminh
authored
9dff688
resolve merge conflicts
geneminde
committed
e26a384
Merge pull request #21 from geneminde/category
geneminde
authored
25c329a
revisions for products controller test
annakim93
committed
1559cc8
adding author name as an optional field for reviews; updated schema
annakim93
committed
0a79bef
partial for listing reviews
annakim93
committed
e5cd80d
fixing padding for merch listing
annakim93
committed
5d5ab4d
adding logic to remove extra horiz separator line in view; commenting out unnecessary actions for reviews controller
annakim93
committed
6cae1af
Merge remote-tracking branch 'origin/master' into csv_seeds
StacyLundquist
committed
c106ecc
add missing end
geneminde
committed
9d69867
seeds w/categories
StacyLundquist
committed
5a6ad0b
added average_rating custom model method to application record model
annakim93
committed
0196a9e
Added Order.total_revenue and styling to Order Fulfillment Page
christinaminh
committed
2720af9
changing avg rating to float with one decimal place
annakim93
committed
d784a07
adjusted return nil portion of average_rating method; add tests for average_rating in user model tests
annakim93
committed
e8a5bd5
added average_rating tests to product model tests
annakim93
committed
f9d35a0
add nav menu for category
geneminde
committed
13726c7
make add category option visible from any page
geneminde
committed
5d7616e
remove before action:
geneminde
committed
a6d99b8
add user model custom method to check if product is their own; add helper method verify_auth_review in reviews_controller to check for this before new and create; create reviews_controller test file
annakim93
committed
3cc4fbe
added user model tests for check_own_product custom method
annakim93
committed
6853a29
added review model tests
annakim93
committed
7f1081a
adjustment to seed data to produce test reviews
annakim93
committed
0800aa7
adjustment to review listing view
annakim93
committed
dae02c1
add retired view to product show
annakim93
committed
8d368a8
add user model relationship has_many reviews through products tests
annakim93
committed
56546b2
add product model relationship test for reviews
annakim93
committed
a32a247
with images
StacyLundquist
committed
4138f2c
Added more styling to merchant's order summary page
christinaminh
committed
edb243c
add categories selection to product form
geneminde
committed
ad2ccb0
partial for error messages
annakim93
committed
3e5fe69
update product params
geneminde
committed
50b05dc
added reviews controller tests for guest vs logged in user
annakim93
committed
e483de4
added test for verify_auth_review in reviews controller
annakim93
committed
ff37c54
Added Order model tests for finding item subtotal and total revenue
christinaminh
committed
98dba20
standardize coloring for stars
annakim93
committed
422ee62
add custom method 'set_availability' to product model
annakim93
committed
c01368d
adding tests for before_save action
annakim93
committed
d5f1ded
commenting out unused methods in product model
annakim93
committed
29202a6
drying up toggle-retire code
annakim93
committed
6ae3823
add helper verify_authorized for products controller
annakim93
committed
ba5a845
fix typo in complete_order
geneminde
committed
26a0903
fix tests given addition of verify auth before_action in products_controller
annakim93
committed
e72c8e7
fix typo current user path
geneminde
committed
f7e2577
Merge pull request #25 from geneminde/category_menu
geneminde
authored
389748f
Merge pull request #28 from geneminde/csv_seeds
StacyLundquist
authored
065188e
Merge pull request #27 from geneminde/OrderFulfillmentPage
christinaminh
authored
74f7c35
Merge branch 'master' into ratings
annakim93
authored
d429b55
Merge pull request #26 from geneminde/ratings
annakim93
authored
1e73583
adjustments to allow for seeding to work
annakim93
committed
80b18ad
render new form again if save failed w/error msg
geneminde
committed
9820dba
implement fix for Product#create
geneminde
committed
bea637e
Merge pull request #29 from geneminde/product_create_fix
geneminde
authored
7a1dec1
remove unused categories action/routes
geneminde
committed
a9c67bd
fix typo in empty cart
geneminde
committed
63fc272
Added tests OrderItemsController and OrderItems. Removed redundant conditionals in OrderItemsController
christinaminh
committed
0462bf3
Merge branch 'master' of https://github.com/geneminde/betsy
christinaminh
committed
57958f5
deleted duplicate files and coverage files
christinaminh
committed
8640680
Fixed typo in remove from cart button
christinaminh
committed
58704f0
adding partial for each product section
annakim93
committed
22ae09f
change date/time display on confirmation page
geneminde
committed
2888168
time view helper + tests
geneminde
committed
caa935d
messing with styling
annakim93
committed
b09e15f
adjustments to font-size for product#show page; finished one section for products view page
annakim93
committed
1197990
style cart page
geneminde
committed
0c48f9b
new partial prod-carousel; added logic to show prods by category
annakim93
committed
679f653
add checkout + home button to cart view
geneminde
committed
535b637
adding titleize for conformity
StacyLundquist
committed
a562d7d
add name to partial so that it links to all products
annakim93
committed
3f32326
dry off confirmation page
geneminde
committed
92d168e
add all images section; add delimiters to numbers:
annakim93
committed
b806a0c
dry off cart view
geneminde
committed
6f09d4f

Commits on Nov 25, 2020

update cart view logic + Order#cart tests
geneminde
committed
c8874d8
update cart styles
geneminde
committed
b83f7aa
remove remove item button from order confirmation view
geneminde
committed
2e4f402
add some styles to subtotal
geneminde
committed
af0ca55
change price display on order summary
geneminde
committed
1011a34
order confirmation page home button
geneminde
committed
11eebb2
update categories show view to use product_section partial
annakim93
committed
07609c5
adding delimiter to product listing partial
annakim93
committed
40118b0
resolve conflicts
geneminde
committed
b710a1c
Merge pull request #31 from geneminde/products-index-view
annakim93
authored
848d7a0
Added number_with_delimiter to order item subtotals
christinaminh
committed
921b115
fixing merge conflicts
StacyLundquist
committed
e6e7e54
adding if statement to products#index view to let tests pass
annakim93
committed
e301917
titleize
StacyLundquist
committed
f8df5e4
adjustment to merch index page icon padding
annakim93
committed
153d5d6
add checkout form style
geneminde
committed
656a63c
clearing coverage for merge
StacyLundquist
committed
809721f
Merge remote-tracking branch 'origin/master' into products_testing
StacyLundquist
committed
425feb2
delete unused views
geneminde
committed
50124c7
finish adding average reviews to merchant pages
annakim93
committed
15fa91b
fixed user_summary partial re: no reviews
annakim93
committed
be3ac30
fixed user_summary partial re: no reviews for merchant show page
annakim93
committed
2c815be
using review_stats partial for merchant review summary
annakim93
committed
f534f46
making pluralization consistent with num_items sold in user_summary
annakim93
committed
072801f
cleanup in code formatting
annakim93
committed
0d0c861
add img to cart table
geneminde
committed
2fe70fa
Merge branch 'master' of github.com:geneminde/betsy into payment
geneminde
committed
1bd80e8
formatting for merch dashes and merch show pages
annakim93
committed
c22a474
Merge branch 'master' of https://github.com/geneminde/betsy
annakim93
committed
f59e9e0
remove category edit functionality
geneminde
committed
9b36e89
Merge branch 'master' of github.com:geneminde/betsy
geneminde
committed
f277f25
titleize, some tests
StacyLundquist
committed
eb2464f
merged master w/products
StacyLundquist
committed
d22be8d
remove unused order method
geneminde
committed
cbab625
remove unused order routes
geneminde
committed
695f856
Merge pull request #32 from geneminde/cleanup
geneminde
authored
62ed572
remove unused category controller test
geneminde
committed
78e3e94
Merge branch 'master' of github.com:geneminde/betsy
geneminde
committed
6ff7ba8
fixed formatting error div end tags in partial - affecting merchant show page
annakim93
committed
873b038
Merge branch 'master' of https://github.com/geneminde/betsy
annakim93
committed
aa2b234
add order status validation + tests
geneminde
committed
8ac1943
Made navbar more responsive
christinaminh
committed
1934f36
add link to product in cart summary
geneminde
committed
f01fdd8
Merge pull request #33 from geneminde/order-validations
geneminde
authored
812a134
fixing edit bug
StacyLundquist
committed
15dffb4
deleting coverage files
StacyLundquist
committed
5e777c1
merge coverage conflicts
StacyLundquist
committed
6cb169b
coverage, yet again
StacyLundquist
committed
1b55093
Merge branch 'products_testing' into master
StacyLundquist
committed
7ca7852
Changed function of adding items to cart that were already in the cart
christinaminh
committed
cf5a114
Merge branch 'master' of https://github.com/geneminde/betsy
christinaminh
committed
4aa4ecb
current user before edit
StacyLundquist
committed
dcb8673
Merge branch 'master' of https://github.com/geneminde/betsy into master
StacyLundquist
committed
ae6fe4c
Fixed bug to allow order item quantity to exceed product quantity if order is already paid/complete/cancelled
christinaminh
committed
247a4a1
Merge branch 'master' of https://github.com/geneminde/betsy
christinaminh
committed
85d8732
fix for products controller
annakim93
committed
996b377
Merge branch 'master' of https://github.com/geneminde/betsy
annakim93
committed
04dc259
Changed tests to reflect OrderItem validation that item quantity can't exceed product quantity unless order is already paid, complete, or cancelled
christinaminh
committed
8c9f339
add retire product to out of stock items too
annakim93
committed
7838e9d
Merge branch 'master' of https://github.com/geneminde/betsy
annakim93
committed
8d20a22
Saved product in Order#complete_order to set product availability
christinaminh
committed
9332304
browse by merchant
StacyLundquist
committed
a442caa
fix error display
annakim93
committed
5b25f1c
fixed bug in merchants dropdown menu
geneminde
committed
9d4f3bb

Commits on Nov 26, 2020

deleting commented out code in users controller
annakim93
committed
1c36c85
Removed unused commented out code
christinaminh
committed
3534476
Merge branch 'master' of https://github.com/geneminde/betsy
christinaminh
committed
539ebd6
add a footer
geneminde
committed
0de2052
Merge branch 'master' of github.com:geneminde/betsy
geneminde
committed
d3d2df8
Removed more comments in OrderItemsControlelr
christinaminh
committed
e26b78b
Merge branch 'master' of https://github.com/geneminde/betsy
christinaminh
committed
7ea88b9
remove comments
geneminde
committed
451ead6
Merge branch 'master' of github.com:geneminde/betsy
geneminde
committed
e7a0d25
Merge pull request #34 from geneminde/s_feedback_check
StacyLundquist
authored
ec5c88e