Hala/Leah (Space) & Hannah/Jocelyn (Time)#28

Open

wangjoc wants to merge 378 commits intoAda-C13:masterfrom

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

Commits on Jun 12, 2020

Commits on Jun 13, 2020

Commits on Jun 14, 2020

Commits on Jun 15, 2020

test
Hannah Tekié
committed
adding couple of lines
Hannah Tekié
committed
Merge branch 'master' of https://github.com/wangjoc/betsy
Hannah Tekié
committed
Merge branch 'master' of https://github.com/wangjoc/betsy
halahaddad1
committed
added some seed data
halahaddad1
committed
Merge branch 'master' of https://github.com/wangjoc/betsy
Hannah Tekié
committed
Merge branch 'master' into dash
Hannah Tekié
committed
fixed git complaining
Hannah Tekié
committed
fixed space issue breaking layout
Hannah Tekié
committed
added in error handling in show page for if merchant doesn't exist
wangjoc
committed
added in show test
wangjoc
committed
added in error handling if logout without being logged in
wangjoc
committed
added in login/logout tests
wangjoc
committed
updated dashboard tests
wangjoc
committed
cleaned up spacing
wangjoc
committed
checked all tests
wangjoc
committed
added in validations and validation testing
wangjoc
committed
added in custom test for get_merchant_order_items
wangjoc
committed
added custom test for get_merchant_order
wangjoc
committed
added in test to confirm that an invalid merch id returns empty array
wangjoc
committed
updated featured_merchants to pull top three merchants with most orderitems, with testing
wangjoc
committed
added in section for newest merchants, with model tests
wangjoc
committed
added in new and create controller tests
wangjoc
committed
added in show tests
wangjoc
committed
added in instantiation test
wangjoc
committed
added in relationship test
wangjoc
committed
added in validations tests
wangjoc
committed
uncomment all passing tests
wangjoc
committed
added in simple cov
wangjoc
committed
changed date format
wangjoc
committed
formatted dollars
wangjoc
committed
Merge branch 'master' of https://github.com/wangjoc/betsy
Hannah Tekié
committed
Merge branch 'dash'
Hannah Tekié
committed
cleaned up order detail and dashboard presentation
wangjoc
committed
fixed order show path if it directs to a order that doesn't exist
wangjoc
committed
fixed indentation
Hannah Tekié
committed
fixed warning message label for validation
wangjoc
committed
added in blanks to drop down for cc_exp
wangjoc
committed
fixed total of order for confirmation page and receipt
wangjoc
committed
Merge branch 'master' into simplecov
wangjoc
committed
added methods and tests to product
halahaddad1
committed
added methods and tests to product
halahaddad1
committed
re-adding the deleted test
Hannah Tekié
committed
Merge branch 'master' of https://github.com/wangjoc/betsy
Hannah Tekié
committed
removed increase stock
halahaddad1
committed
reduce stock quantity when purchase is made
wangjoc
committed
added in test for making sure stock decreases
wangjoc
committed
minor tweaks to order_controller logic
wangjoc
committed
limited featured to 5
halahaddad1
committed
minor edit to featured products
halahaddad1
committed
more edits to product.rb
halahaddad1
committed
adds style tweaks
leahwho
committed
organize routes
leahwho
committed
route cleanup refactor
leahwho
committed
Merge branch 'master' of https://github.com/wangjoc/betsy
Hannah Tekié
committed
edited tests
halahaddad1
committed
Merge branch 'master' of https://github.com/wangjoc/betsy
halahaddad1
committed
Merge branch 'master' of https://github.com/wangjoc/betsy
Hannah Tekié
committed
ignore code coverage
Hannah Tekié
committed
deleted ignore files
Hannah Tekié
committed
so many styling tweaks
leahwho
committed
style tweaks and pulled changes
leahwho
committed
Merge branch 'master' of https://github.com/wangjoc/betsy
Hannah Tekié
committed
fixed routes order
halahaddad1
committed
Merge branch 'master' of https://github.com/wangjoc/betsy
halahaddad1
committed
Merge branch 'master' of https://github.com/wangjoc/betsy
Hannah Tekié
committed
adds merchant styling
leahwho
committed
commits pulled changes to routes, coverage, order controller test
leahwho
committed
added helpers for merchants and orders
Hannah Tekié
committed
Merge branch 'master' of https://github.com/wangjoc/betsy
Hannah Tekié
committed

Commits on Jun 16, 2020

Commits on Jun 17, 2020