Lak, Jeta, Ross, Yaz#37

Open

saintmedusa wants to merge 507 commits into

Ada-C13:masterfrom

easternwashingaden:master

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

Commits on Jun 16, 2020

added orders#cancel controller action error handling, with logic in the model for changing cancelled status as well as other status error checking in order model
saintmedusa
committed
order controller tests for create cart, clear cart, submit cart
saintmedusa
committed
working merchant ORDERS dashboard. Hell ya
saintmedusa
committed
working change active status button on order :D, with activate/deactive conditional functionality on dashboard
saintmedusa
committed
Updated the strong params to add category.ids: []
easternwashingaden
committed
Merge branch 'master' of https://github.com/easternwashingaden/betsy

Jetmire Bajrami
authored and
Jetmire Bajrami
committed
Added titleize to category name
easternwashingaden
committed
Changed the product form to ensure that user can pick multiple categories
easternwashingaden
committed
Moved Review button to upper
easternwashingaden
committed
Merge pull request #18 from easternwashingaden/products-categories-relationship
easternwashingaden
authored
Merge branch 'master' of https://github.com/easternwashingaden/betsy

Jetmire Bajrami
authored and
Jetmire Bajrami
committed
setup Simplecov
syrosalynyu
committed
added condition to avatar display
syrosalynyu
committed
modified validation for Order status
syrosalynyu
committed
fixed error message of order_item message.
syrosalynyu
committed
added Order model tests
syrosalynyu
committed
Merge pull request #19 from easternwashingaden/ross-order-model-tests
syrosalynyu
authored
updated product controller and it's tests to reflect changes
saintmedusa
committed
Merge branch 'master' of https://github.com/easternwashingaden/betsy

Jetmire Bajrami
authored and
Jetmire Bajrami
committed
Merge branch 'master' into orders_controller_test
saintmedusa
authored
Merge pull request #20 from easternwashingaden/orders_controller_test
saintmedusa
authored
Merge branch 'master' of https://github.com/easternwashingaden/betsy

Jetmire Bajrami
authored and
Jetmire Bajrami
committed
Merge branch 'master' into merchant_dashboard
saintmedusa
authored
Merge pull request #21 from easternwashingaden/merchant_dashboard
saintmedusa
authored
Merge branch 'master' of https://github.com/easternwashingaden/betsy

Jetmire Bajrami
authored and
Jetmire Bajrami
committed
changed product model test to reflect changes to active field, added more thorough testing of flash to controller tests
saintmedusa
committed
Merge pull request #22 from easternwashingaden/test_updates
saintmedusa
authored
Merge branch 'master' of https://github.com/easternwashingaden/betsy

Jetmire Bajrami
authored and
Jetmire Bajrami
committed
coverage 100% with test category controller

Jetmire Bajrami
authored and
Jetmire Bajrami
committed
tests for category_controller

Jetmire Bajrami
authored and
Jetmire Bajrami
committed
working revenue, tested and working in view
saintmedusa
committed
Merge pull request #23 from easternwashingaden/revenue
saintmedusa
authored
add more column in products fixtures

Jetmire Bajrami
authored and
Jetmire Bajrami
committed
add more test for model category coverage 100%

Jetmire Bajrami
authored and
Jetmire Bajrami
committed

Commits on Jun 17, 2020

Commits on Jun 18, 2020

fixed pagination when search products by merchant
syrosalynyu
committed
delete show action form category controller

Jetmire Bajrami
authored and
Jetmire Bajrami
committed
added destroy action in products controller

Jetmire Bajrami
authored and
Jetmire Bajrami
committed
added tests for category_product action

Jetmire Bajrami
authored and
Jetmire Bajrami
committed
added tests for destroy action and toggle_active

Jetmire Bajrami
authored and
Jetmire Bajrami
committed
update fixtures file

Jetmire Bajrami
authored and
Jetmire Bajrami
committed
added delete buton for product

Jetmire Bajrami
authored and
Jetmire Bajrami
committed
delete some old code

Jetmire Bajrami
authored and
Jetmire Bajrami
committed
add icons to the navbar
syrosalynyu
committed
Merge pull request #33 from easternwashingaden/delete_product
jetabajrami
authored
Merge pull request #34 from easternwashingaden/website-homepage
syrosalynyu
authored
Added average_rating to the product model
easternwashingaden
committed
Deleted unneeded comments
easternwashingaden
committed
Added categories for product0
easternwashingaden
committed
Added product to each rating
easternwashingaden
committed
Added average_rating test to product_test and passed all the tests
easternwashingaden
committed
Merge pull request #35 from easternwashingaden/average-rating
easternwashingaden
authored
created test for "shop" action
syrosalynyu
committed
fixed categoies controller tests
syrosalynyu
committed
fixed merchants controller tests
syrosalynyu
committed
fixed reviews controller tests
syrosalynyu
committed
added image attribute to mock_auth_hash
syrosalynyu
committed
cleaned routes
syrosalynyu
committed
Merge pull request #36 from easternwashingaden/increase-test-coverage-for-merchant-controller
syrosalynyu
authored
dried up testing with setting up let variables at top, made tests more general to anticipate changes to order_items.yml
saintmedusa
committed
added show order tests
saintmedusa
committed
completed order_items_controller testing
saintmedusa
committed
fixed bug in testing total_price
saintmedusa
committed
broke products controller testing by making small change to yml, fixed yml
saintmedusa
committed
added small change to merchant revenue testing to reflect item status requirements for revenue
saintmedusa
committed
add more styleaa

Jetmire Bajrami
authored and
Jetmire Bajrami
committed
Merge pull request #37 from easternwashingaden/dropdown_category
jetabajrami
authored
Merge pull request #38 from easternwashingaden/item_controller_tests
saintmedusa
authored
fixed merchant revenue test to reflect status functionality
saintmedusa
committed
covered 'couldn't create merchant' testing case. Deleted params controller filter - not needed for oauth application
saintmedusa
committed
Merge pull request #39 from easternwashingaden/merchant_controller_tests
saintmedusa
authored
changed the my orders pages for mercahnts to exclude pending order_items
saintmedusa
committed
Added stylings
easternwashingaden
committed
Added titleize to name
easternwashingaden
committed
Added titleize to the merchant name
easternwashingaden
committed
Added titleize to the product name
easternwashingaden
committed
Added titleize to the product name
easternwashingaden
committed
Added titleize to the category name
easternwashingaden
committed
Added slides to the homepage
easternwashingaden
committed
Upate the nav bars look
easternwashingaden
committed
added order controller filter to grab last four dig of inputted 16 dig cc before submitting order
saintmedusa
committed
Updated the styling for table
easternwashingaden
committed
Linked image to the product
easternwashingaden
committed
Resized the image on the cart
easternwashingaden
committed
Added a space
easternwashingaden
committed
Removed section from the form
easternwashingaden
committed
Added error validation for category
easternwashingaden
committed
Changed all cap to titleize for the category
easternwashingaden
committed
Remove ADD PRODUCT from the form
easternwashingaden
committed
Merge branch 'master' into clean-up
easternwashingaden
authored
Merge pull request #40 from easternwashingaden/clean-up
easternwashingaden
authored
Fixed mispelling
easternwashingaden
committed
Missign a closing </p> tag
easternwashingaden
committed
add bottom to the footer
syrosalynyu
committed
fixed bug

Jetmire Bajrami
authored and
Jetmire Bajrami
committed
fixed bug

Jetmire Bajrami
authored and
Jetmire Bajrami
committed
fixed tests and fixed the flash error message

Jetmire Bajrami
authored and
Jetmire Bajrami
committed
Merge branch 'master' into product_category
jetabajrami
authored
Merge pull request #41 from easternwashingaden/product_category
jetabajrami
authored
add bootstrap tot the quantity dropdown
syrosalynyu
committed
validation of 16dig cc in submit form, and then storing as 4 digit field for order. Added a controller filter to help achieve this, as wel as order#cc_num_is_correct model method and relevatn testing
saintmedusa
committed
fixed stock destock/restock bug - now reflecting changes on database and site
saintmedusa
committed
Merge pull request #42 from easternwashingaden/validate_cc_16_to
saintmedusa
authored
changed tests to reflect error flash capitalization in controllers
saintmedusa
committed
added flash error for order

Jetmire Bajrami
authored and
Jetmire Bajrami
committed
Merge pull request #43 from easternwashingaden/order_form
jetabajrami
authored
fixed tests for order validation

Jetmire Bajrami
authored and
Jetmire Bajrami
committed
Merge pull request #44 from easternwashingaden/order_tests
jetabajrami
authored

Commits on Jun 19, 2020

Commits on Jun 20, 2020

added return in the orders action
syrosalynyu
committed