NYnJA - #31

Open

allisonhoke wants to merge 381 commits into

Ada-C6:masterfrom

allisonhoke:master

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

Commits on Oct 24, 2016

added cart method
allisonhoke
committed
0277a79
adjusted cart view from orderItem to order controller
allisonhoke
committed
0cd972f
removed validation for email format
allisonhoke
committed
c202e95
added route for confirmation screen
allisonhoke
committed
6c3cda9
Added basic tests to reviews controller.
nurlywhirly
committed
3bbebba
added order routes not using id to be more secure
allisonhoke
committed
efd277f
adjusting order routes
allisonhoke
committed
7efd04a
moved controller filter for cart to application controller
allisonhoke
committed
fb3104c
WIP views for order
allisonhoke
committed
62f9d1d
Added tests and some views for category controller
nurlywhirly
committed
445562d
Finished some reviews controller test logic
nurlywhirly
committed
618bdbf
Merge branch 'master' of https://github.com/allisonhoke/betsy
nurlywhirly
committed
e36a188
WIP purchase method changes order status, product stock, and clears cart
allisonhoke
committed
29f9e5f
added link to home on purchase view. adjusted form on update view
allisonhoke
committed
f33041b
Merge branch 'b/amh/master'
allisonhoke
committed
6d32927
Messed with products index action to make browsing by category possible.
nurlywhirly
committed
a47f7d0
updated method call name in purchase method
allisonhoke
committed
d22febe
Fixed one lingering review_test.rb test
nurlywhirly
committed
8bbea95
Merge branch 'nmu/conttesting'
nurlywhirly
committed
5c044fd
removed unnecessary cart route
allisonhoke
committed
244d431
changed heading
allisonhoke
committed
c3f346b
products show completed, working on add to cart method in products
Ynakashima
committed
4105305
Merge branch 'b/yn/products'
Ynakashima
committed
8d90609
added route to destroy order item (remove from cart)
allisonhoke
committed
7321d2d
Merge branch 'b/amh/master'
allisonhoke
committed
2f4cc5d
Added model method to find total revenue; test for method passing; added method call to contorller/instance variable to view
jmojennifer
committed
19f698b
Merge branch 'b/jmo/master'
jmojennifer
committed
5f78320
changed delete to destroy in order item route
allisonhoke
committed
867b9d9
added link to delete order item and added delete action in controller
allisonhoke
committed
e4e64eb
Merge branch 'master' of https://github.com/allisonhoke/betsy
allisonhoke
committed
7391fed
Merge branch 'b/amh/master'
allisonhoke
committed
92baa43
removed unnecessary methods from order item controller
allisonhoke
committed
f511cd7
Deleted remaining json files
jmojennifer
committed
e7a7690
Merge branch 'b/jmo/master'
jmojennifer
committed
17c881f
Deleting additional_info sessions routes
nurlywhirly
committed
9825388
Merge branch 'nmu/current_user'
nurlywhirly
committed
a70b398
changed purchased to paid in attribute assignment in purchase method
allisonhoke
committed
7755369
added necessary keys to order model
allisonhoke
committed
ceec7c1
Merge branch 'b/amh/master'
allisonhoke
committed
d98b2b3
updated products index (well, Nicole did), still fighting with add to cart method and getting user input from view to pass into add to cart params
Ynakashima
committed
b4778bc
Merge branch 'b/yn/products'
Ynakashima
committed
ba40b2e
Changed some CSS, failed miserably
nurlywhirly
committed
d6e9d68
Merge branch 'nmu/current_user'
nurlywhirly
committed
9303955
Migration changing default order status value
jmojennifer
committed
9bc21c5

Commits on Oct 25, 2016

Resolved merge conflict
jmojennifer
committed
21d643f
Adjusted controller to call current_user
jmojennifer
committed
47bcede
Updated schema from migration
jmojennifer
committed
8f2e17a
Added ability to use nickname as username if no github name; added text to creation failure view
jmojennifer
committed
0d99158
Only page's merchant's products show now
jmojennifer
committed
1bc311d
Fixed Product query error
jmojennifer
committed
86c28c4
WIP controller tests
allisonhoke
committed
b8df55c
added update route for order items to change quantity in cart
allisonhoke
committed
3577655
added logic to update method for changing quantity in cart
allisonhoke
committed
6741c62
added form to change quantity in cart
allisonhoke
committed
02dfad8
Added ability to see a merchant's revenue by order status
jmojennifer
committed
fc53807
Merge branch 'b/jmo/master'
jmojennifer
committed
e7f1e2e
updated form for update and method to redirect to confirmation page. updated url on change quantity form on order show (cart) view
allisonhoke
committed
91116d0
deleted unnecessary view files. added to update method so order item will save and render cart view
allisonhoke
committed
691f4e2
removed unnecessary commented out methods
allisonhoke
committed
10e0a92
changed before action to correct methods
allisonhoke
committed
58e94b6
updated before action methods to call with proper actions
allisonhoke
committed
047abfb
WIP order_items controller tests
allisonhoke
committed
2518766
Added merchant revenue by order status method; revised unit tests for model; added fixture data/changes to test_helper as needed
jmojennifer
committed
1e09990
Merge branch 'b/jmo/master'
jmojennifer
committed
44acfdb
Added merchant num of orders by status method; tests for method; related merchant controller/show view changes
jmojennifer
committed
d4bddaf
Merge branch 'b/jmo/master'
jmojennifer
committed
ec50e5d
added before action of cart
allisonhoke
committed
fa27721
Merge branch 'b/amh/master'
allisonhoke
committed
0c1f87a
Working on conditional button and OAuth login
nurlywhirly
committed
3e03810
no changes but git thinks there are so commiting them before pulling
Ynakashima
committed
8463e1f
Merge branch 'b/yn/products'
Ynakashima
committed
9b64059
Changed belongs_to from :user to :merchant
jmojennifer
committed
30feb34
WIP order_item controller tests
allisonhoke
committed
f94ff3f
Merge branch 'master' of https://github.com/allisonhoke/betsy
jmojennifer
committed
487af67
Updated fixture data references to other fixture yml records
jmojennifer
committed
3f929c6
Fixed order_item fixture reference
jmojennifer
committed
969906a
Fixed merchant model tests/methods; changed products yml fixture for testing
jmojennifer
committed
b7938e3
moved add to cart out of products controller, calling create order item in the products show view instead, adding create method to order items
Ynakashima
committed
f1df3f2
Merge branch 'b/yn/products'
Ynakashima
committed
5b88133
fixed merge conflict
allisonhoke
committed
57d8d93
WIP add to cart logic needs tweaking in order_items controller
allisonhoke
committed
b84beca
nothing
Ynakashima
committed
434265a
resolved merge conflicts on order items controller
Ynakashima
committed
7b63d10
fixed path add to cart/create order_item
allisonhoke
committed
cdf1570
fixed update logic and made view a bit more readable
allisonhoke
committed
badf802
adjusted @product to self to access current product
allisonhoke
committed
84639e7
adjusted url to direct to update
allisonhoke
committed
05299d8
made variable to access product
allisonhoke
committed
f21859f
adjusted purchase method to correctly decrease stock of product
allisonhoke
committed
00c4947
added save to decrease stock
allisonhoke
committed
156af3a

Commits on Oct 26, 2016

CSS-ing and finishing up OAuth controller filters
nurlywhirly
committed
d872cbf
Merge branch 'nmu/cond_button'
nurlywhirly
committed
702e964
Added a latest review option on products#show page, and a link to all reviews
nurlywhirly
committed
ccc2220
Added merchant only button view helper
nurlywhirly
committed
6d9d7a7
commiting so my pull request on master doesn't error
Ynakashima
committed
650c7d5
resolved merge confict
Ynakashima
committed
18e94e9
Added skip require_login in sessions controller for the create action
nurlywhirly
committed
9133e99
Merge branch 'master' of https://github.com/allisonhoke/betsy
Ynakashima
committed
47644b0
added route for merchant order view
allisonhoke
committed
426fa0d
deleted unnecessary views. WIP view for merchant to view order info
allisonhoke
committed
5215016
WIP adjusting update method to save only last four of cc
allisonhoke
committed
367e568
Merge branch 'b/amh/master'
allisonhoke
committed
9098389
Fixed products fixture data
jmojennifer
committed
a4fc266
updated product show page so that show page works even if there are no reviews
Ynakashima
committed
fc4c290
Merge branch 'master' of https://github.com/allisonhoke/betsy
Ynakashima
committed
969d67f
Merge branch 'b/yn/products'
Ynakashima
committed
9ebabf1
Revised model methods/tests; still testing to-do
jmojennifer
committed
e7162ab
Updated display logic; added HTML tag
jmojennifer
committed
bf3c911
Merge branch 'master' of https://github.com/allisonhoke/betsy
jmojennifer
committed
e6df8b8
CSS adjustments to fix merchant_controller_test error
jmojennifer
committed
b80d606
Tests passing; coverage still needed
jmojennifer
committed
4449b37
Cleaned up not needed HTML
jmojennifer
committed
6b681d0
mechant model method adjustments; model method tests passing (94.2% coverage)
jmojennifer
committed
742409a
Merchant model method adjustments; model method tests passing (94.2% coverage)
jmojennifer
committed
609deb7
Merchant controller method adjustments; controller tests passing (100% coverage)
jmojennifer
committed
118c8c5
Application view helpers
nurlywhirly
committed
da6f206
Added application helper to convert cents into dollar amounts
jmojennifer
committed
3a68aa7
Converted price into dollars
jmojennifer
committed
1fd09b7
added merchant_view to view order information for orders with their product
allisonhoke
committed
dbccde2
added skip before action of require login for actions that don't require login
allisonhoke
committed
1ae68c8
Merge branch 'b/amh/master'
allisonhoke
committed
3a5bb27
Resolved merge conflict
jmojennifer
committed
e9f2533
Merge branch 'master' of https://github.com/allisonhoke/betsy
jmojennifer
committed
20550ed
Fixed a problem with duplicate products showing up on homepage if they have multiple 5 star reviews, dilly dallied with some layout on homepage as well
nurlywhirly
committed
961f6e5
Merge branch 'nmu/fixing_things'
nurlywhirly
committed
e43d264
Changed some links to official buttons on categories views
nurlywhirly
committed
4438cf3

Commits on Oct 27, 2016

fixed white space on controller and tests are a WIP
allisonhoke
committed
5b9d46e
Merge branch 'b/amh/master'
allisonhoke
committed
5b11f63
Merge branch 'master' into nmu/fixing_things
nurlywhirly
committed
c5ef348
wrote tests for order item controller actions
allisonhoke
committed
8da393a
wrote tests for orders controller. all tests passing
allisonhoke
committed
762272a
Updated CSS/JS/HTML for merchant orders filtered table
jmojennifer
committed
1a1e6ed
Fixed find_orders model method; refactored methods in model/controller
jmojennifer
committed
5a77e59
Added fixture data for a cancelled order
jmojennifer
committed
4ebe0c6
Updated model methods/tests to account for cancelled orders
jmojennifer
committed
f74cf43
Nicely formatting Order Date values
jmojennifer
committed
54429e5
Merge branch 'master' of https://github.com/allisonhoke/betsy
jmojennifer
committed
baf6a80
updated create order item functionality to add to quantity in cart rather than create new order item if item already exists in cart - THIS COULD BE CLEANED UP
allisonhoke
committed
7692e16
wrote test for item already in cart(add to quantity rather than create new item)
allisonhoke
committed
002cf96
Merge branch 'b/amh/master'
allisonhoke
committed
c0f98e3
Migration and change reversal migration (as rollback errored)
jmojennifer
committed
ace9877
Merge branch 'master' of https://github.com/allisonhoke/betsy
jmojennifer
committed
ee18d65
Added comment with URLs I got the orders table code from
jmojennifer
committed
172aad0
WIP: merchant session validation on content
jmojennifer
committed
0fc49a6
Adjusted total revenue method to not include cancelled orders
jmojennifer
committed
de9a7f9
Fixed wording of Order Status
jmojennifer
committed
11ab2fa
added comment to refactor an action later
allisonhoke
committed
c89a5ea
Removed shuffle due to an error
jmojennifer
committed
3f32959
Add price formatting to various pages; changed Product-related pages to generic Product terminology
jmojennifer
committed
d853a00
products show now works, can either be routed through merchant products or through all products
Ynakashima
committed
d0baa95
Changed new review form layout a bit
nurlywhirly
committed
6335e71
Merge branch 'nmu/fixing_things'
nurlywhirly
committed
5df81c7
Merge branch 'master' into b/jmo/master
jmojennifer
committed
a3c8646
Limited content to logged-in merchant
jmojennifer
committed
3e7159a
Added Foundation to form submit buttons
jmojennifer
committed
fcd23f4
resolved merge conflict
Ynakashima
committed
e6d328b
resolved merge conflict
Ynakashima
committed
d5a4d4d
Fixed things in controller so reviews weren't limited to logged in users, and fixed the review form a bit
nurlywhirly
committed
0cc04f3
Holy merge conflict, batman
nurlywhirly
committed
d92461e
Styling changes; edit product link behind merchant-only filter
jmojennifer
committed
1580f29
Fixed merge conflict
jmojennifer
committed
28fca28
fixed ridiculous failing tests in controllers. why would they do that?
allisonhoke
committed
5448cf4
Merge branch 'b/amh/master'
allisonhoke
committed
42d01b9
added view cart link when user has a cart
allisonhoke
committed
ed5c777
fixed helper method location for money format
allisonhoke
committed
2508fa9

Commits on Oct 28, 2016

added conditional to not add to cart if quantity is greater than stock and created view page to let user know the issue
allisonhoke
committed
fa17d12
Working on categories and reviews tests
nurlywhirly
committed
acf37cd
Merge branch 'nmu/fixing_things'
nurlywhirly
committed
f7838e2
Fixed merge conflict
jmojennifer
committed
8387b57
Merge branch 'b/jmo/master'
jmojennifer
committed
d651875
reviews controller test little fix
nurlywhirly
committed
b38765d
Merge branch 'master' of https://github.com/allisonhoke/betsy
nurlywhirly
committed
37dff81
product edit and new now work. thank you Dan
Ynakashima
committed
b91323d
resolved merge conflict
Ynakashima
committed
d18c30e
Added table for product name/quantity/subtotal on merchants account page
jmojennifer
committed
06bfba9
Added add_decimal functionality to merchant model
jmojennifer
committed
99ecdfd
Merge branch 'master' of https://github.com/allisonhoke/betsy
jmojennifer
committed
7282e1a
Fixed model method/model/tests
jmojennifer
committed
8fa334e
Merge branch 'b/jmo/master'
jmojennifer
committed
4fd7267
Test coverage on home_controller now at 100%
nurlywhirly
committed
6002852
Added one application helper test
nurlywhirly
committed
4897ac6
ADDED SURPRISE SMALL FRYgit stgit st! :D
nurlywhirly
committed
a06ca5a
Added a view all merchants page with links
nurlywhirly
committed
6828199
Messed with the nav bar a bit so view cart doesn't go wonky
nurlywhirly
committed
90ab0bc
Changed products index page to get rid of empty table header. Changed some of the homepage as well
nurlywhirly
committed
cf2a6d2
Changed some things in the products index and show pages, sorry Yuri.
nurlywhirly
committed
2028cc7
Changes to order fulfillment table on merchant show view (account page); related controller/test adjustments
jmojennifer
committed
e266c66
Resolved merge conflict
jmojennifer
committed
6efc9d3
Merge branch 'master' of https://github.com/allisonhoke/betsy
jmojennifer
committed
14cbbba
Added Product Details link to merchant show view; related changes to model/controller
jmojennifer
committed
8a06610
Added Order ID to order fulfillment
jmojennifer
committed
10d5b16
Working out route_path error
jmojennifer
committed
d3f5a39
added functionality to mark order as shipped
allisonhoke
committed
b92e3e3
Merge branch 'master' into b/amh/master
allisonhoke
committed
b69a043
Add shipping link
jmojennifer
committed
82d437e
Added a category option to edit product and new product
nurlywhirly
committed
d6c16db
Merge branch 'nmu/fixing_things'
nurlywhirly
committed
cf2855f
Merge branch 'b/amh/master'
allisonhoke
committed
ece4b22
fixed controller action name
allisonhoke
committed
4ee33f8
updated products new view
Ynakashima
committed
93e6733
limited access to product edit page to the actual owner of the product.
nurlywhirly
committed
82c5510
Merge branch 'nmu/fixing_things'
nurlywhirly
committed
955c60e
added logic to check if stock is not nil
allisonhoke
committed
0cf6b86
Fixed redirect after editing a product
nurlywhirly
committed
4dc65d4
Merge branch 'nmu/fixing_things'
nurlywhirly
committed
68e97f0
resolved merge conflict in products new view
Ynakashima
committed
d6c38e6
Merge branch 'master' of https://github.com/allisonhoke/betsy
Ynakashima
committed
2841892
Shipping Link functional -- Allison rocks
jmojennifer
committed
f6a4d81
Merge branch 'master' of https://github.com/allisonhoke/betsy
jmojennifer
committed
6ec5f9d
Referencing order id in both order fulfillment tables
jmojennifer
committed
a7a2499
Merge branch 'master' into b/jmo/master
jmojennifer
committed
d25574d
Added sad small fry to all the error pages
nurlywhirly
committed
3277859
working on products controller testing
Ynakashima
committed
df55109
Merge branch 'b/yn/products'
Ynakashima
committed
cb1dc08
updated merchants path on homepage
Ynakashima
committed
b930a99
Merge branch 'master' of https://github.com/allisonhoke/betsy
Ynakashima
committed
a096b9b
Added content filtering by merchant back in
jmojennifer
committed
96042ac
Added gems for Heroku deployment
jmojennifer
committed
80cee29
new review button on both reviews/index and reviews/show page
nurlywhirly
committed
ce1ee7d
wrote test for ship method. added styling to links
allisonhoke
committed
e04a742
Merge branch 'nmu/fixing_things'
nurlywhirly
committed
4826bb2
Merge branch 'b/amh/master'
allisonhoke
committed
f93edc8
Fixed negative test by removing fixture and used hardcoded invalid example data
jmojennifer
committed
046063e
Changed layout of order fulfillment tables
jmojennifer
committed
5959b1e
removed errors from form
allisonhoke
committed
56f3e64
Merge branch 'master' of https://github.com/allisonhoke/betsy
allisonhoke
committed
fb25aa6
Added button class to submit link
jmojennifer
committed
fe90091
products controller testing completed
Ynakashima
committed
bbd6426
Merge branch 'master' of https://github.com/allisonhoke/betsy
Ynakashima
committed
cd66e8d
Merge branch 'b/yn/products'
Ynakashima
committed
30cd01e
Added button styling
jmojennifer
committed
c3fa602
Merge branch 'master' of https://github.com/allisonhoke/betsy
jmojennifer
committed
ce48031
Removed duplicate sqlite3 gem reference
jmojennifer
committed
fc3a034
Added another application helper test
nurlywhirly
committed
95b9cdc
Merge branch 'nmu/fixing_things'
nurlywhirly
committed
ac79881
added missing route for ship
allisonhoke
committed
b9eb8fd
Merge branch 'b/amh/master'
allisonhoke
committed
f8c7b18
added missing tests to product controller
allisonhoke
committed
8130d75
added logic to retire product
allisonhoke
committed
d8c28da
Merge branch 'b/amh/master'
allisonhoke
committed
581f2f5
Added setting for Heroku images
jmojennifer
committed
41871c9
Merge branch 'master' of https://github.com/allisonhoke/betsy
jmojennifer
committed
a05e83d
Added additional setting for Heroku images
jmojennifer
committed
912dfb6
Added some more pictures
nurlywhirly
committed
df67901
Toooootally spelled twister as twitter.
nurlywhirly
committed
8c188ff
Needed to uniq the categories/products path
nurlywhirly
committed
611f9e5
Added shipping to financials
jmojennifer
committed
4ed5725
Fixed error per Heroku console
jmojennifer
committed
d9bece8
Fixed error per Heroku console pt 2
jmojennifer
committed
0a44eaa
Added shipping to methods
jmojennifer
committed
5baeb19