Queues - Allison, Sahana, Marisol, Tehut - Andy's Kloset - #24

Open

sahanamurthy wants to merge 284 commits into

Ada-C7:masterfrom

sahanamurthy:master

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

Commits on Apr 22, 2017

merge conflict resolved on merchants.yml
tehut
committed
9e4a440
added product views & error reporting on all pages
tehut
committed
415efcb
added image url column to product table
tehut
committed
5fce67c
Merge pull request #4 from sahanamurthy/product_model
tehut
authored
3dd969f
added images for header
tehut
committed
f8e53c0
added images and basic formatting
tehut
committed
94bfba5
completed validations and association tests
marisol-lopez
committed
4bcf5e4
Merge branch 'master' into orderproducts
marisol-lopez
committed
07ac36a
Merge branch 'master' into orderproducts
marisol-lopez
committed
6985959
code for orderproducts controller
marisol-lopez
committed
214c503

Commits on Apr 23, 2017

update order method working and tested
Allison-Northrop
committed
008e40e
order controller complete and tested. edit method test still having glitchy issues for still some unknown reason. sometimes it passes if the terminal is restarted.
Allison-Northrop
committed
65c55f9
fixed merge conflicts
Allison-Northrop
committed
d917070
CRUD basic views complete
Sahana Murthy
committed
07cbdcf
added a form view to orders
Allison-Northrop
committed
d428f91
fiddled with header images and css
tehut
committed
9815fb4
Trying to merge merchant to master
Sahana Murthy
committed
126672d
merging merchant into master
Sahana Murthy
committed
3342c97
fixed bugs on edit methods of order and product
tehut
committed
c094841
Merge branch 'master' of https://github.com/sahanamurthy/betsy
tehut
committed
dcf74e0
removed unneccesary seed data
tehut
committed
cf3ec0d
resolved merge conflicts
tehut
committed
421a4c6
insignificant spacing changes--all whitespace
tehut
committed
b27143a
more layout fiddling
tehut
committed
ce8481f
added and integrated foundation gem
tehut
committed
ba3df70
basic sessions features working
Sahana Murthy
committed
600c934
added stuff
Sahana Murthy
committed
ea035b6
changed some unenssary routing commented out code.
Allison-Northrop
committed
52a8e9b
completed basics of edit order view using form partial
Allison-Northrop
committed
35c4329

Commits on Apr 24, 2017

heading and foundation
tehut
committed
a6dda92
Merge branch 'master' of https://github.com/sahanamurthy/betsy
tehut
committed
c668e8d
more tweaking to make site css & foundation play nicely
tehut
committed
501be93
commented out autogenerated test in on review model
tehut
committed
7ac5fbd
added filter_by merchant functionality and test to model--no views
tehut
committed
afb36bb
merging to master
Allison-Northrop
committed
0bb8535
Merge branch 'order'
Allison-Northrop
committed
187485f
Github Oauth complete and working. New github log-in is saved as a Merchant
Sahana Murthy
committed
ed1e1a0
fixed relationship test
Allison-Northrop
committed
49d82ae
Merge branch 'master' of https://github.com/sahanamurthy/betsy into order
Allison-Northrop
committed
235e5f6
fixing merge conflict from sessions-oauth to master
Sahana Murthy
committed
fa50726
Merge branch 'master' of https://github.com/sahanamurthy/betsy into order
Allison-Northrop
committed
1f041a9
Merge branch 'master' of https://github.com/sahanamurthy/betsy
Allison-Northrop
committed
cc02fba
Merge branch 'order'
Allison-Northrop
committed
b3b87a3
updated git ignore
tehut
committed
a60720e
Added simplecov
Sahana Murthy
committed
9b1d31b
Fixed oauth login bug
Sahana Murthy
committed
f4abb16
debugged order_product#create
tehut
committed
98c5a2d
changed up header/CSS
Sahana Murthy
committed
175ca23
merge conflict
marisol-lopez
committed
98223c1
merchant update flash message added
Sahana Murthy
committed
668b3d7
add to cart funcionality
marisol-lopez
committed
67047b0
Merge branch 'master' into orderproducts
marisol-lopez
committed
3b2a7a2
show view for order working
Allison-Northrop
committed
edb9544
Merge branch 'master' of https://github.com/sahanamurthy/betsy into order
Allison-Northrop
committed
c218c12
relationship tests complete. working on validation tests
Sahana Murthy
committed
2d9e598

Commits on Apr 25, 2017

still broken pushing to branch for team to tag in
Allison-Northrop
committed
6e381d8
review model tests (relationship and validation) passing
Sahana Murthy
committed
829f547
Review CRUD methods, controller, model, and all associated tests complete. All tests passing
Sahana Murthy
committed
b4c8806
Merge branch 'master' of https://github.com/sahanamurthy/betsy
Sahana Murthy
committed
6bd89ed
wrote order controller method for show_products TODO:rename method to show_order_products
tehut
committed
e3909f2
moved logo to background image
tehut
committed
f65f7e1
updated css on master
tehut
committed
7566d5b
Merge branch 'master' of https://github.com/sahanamurthy/betsy into order
Allison-Northrop
committed
986c26a
Merge branch 'master' into order
tehut
authored
f529818
Merge pull request #5 from sahanamurthy/order
tehut
authored
f3896f5
Merge branch 'master' of https://github.com/sahanamurthy/betsy into order
Allison-Northrop
committed
a4f2f75
created category model and categoryproducts join table and removed old categories column from products table
tehut
committed
9772245
Didn't really change much
Sahana Murthy
committed
357ef99
added pending and paid functionality in the order controller. also put back in validations
Allison-Northrop
committed
8812fb1
working on orderproducts tests create, edit, and update
marisol-lopez
committed
de6e2d8
re-created categories_products table to fix join
tehut
committed
dba3d7d
added order status in order new views
Allison-Northrop
committed
a7a42e8
created order summary route and method
Allison-Northrop
committed
09f894b
order summary test passing
Allison-Northrop
committed
480e865
added controller tests and actions
tehut
committed
2775b93
added empty views for controller new and index
tehut
committed
dd31752
oder summary connecting to correct orders - tests for create controller not testing
Allison-Northrop
committed
8376d20
updated git ignore
tehut
committed
afe6c00
updated git ignore
tehut
committed
63a73b5
updated git ignore
tehut
committed
fa00b51
begun add categories model
tehut
committed
5624d99
background image up
Sahana Murthy
committed
3f48671
basic order summary views completed -- very basic
Allison-Northrop
committed
b8a6501
got products to show on order summary product list
Allison-Northrop
committed
9c9f0cb
got price of individual products to show up.
Allison-Northrop
committed
b99e7af
fixed add_category method on model
Sahana Murthy
committed
d43633e
Merge branch 'master' of https://github.com/sahanamurthy/betsy into category-product
tehut
committed
912943c
Merge pull request #6 from sahanamurthy/category-product
tehut
authored
6682a9c
Merge branch 'master' of https://github.com/sahanamurthy/betsy
tehut
committed
1381a1b
update method and update tests
marisol-lopez
committed
4523ea6
added file for update test and method
marisol-lopez
committed
168eaee
Merge pull request #7 from sahanamurthy/css
tehut
authored
e53422b
Merge branch 'master' of https://github.com/sahanamurthy/betsy
tehut
committed
caf8288
refractored create so that it makes an empty order in database
Allison-Northrop
committed
fd23a43
merge-a-geddon
marisol-lopez
committed
bcb3db0
merge
marisol-lopez
committed
193a764
merging to master - update still needs working on
Allison-Northrop
committed
118d1e3

Commits on Apr 26, 2017

merging'
Allison-Northrop
committed
c4e31d3
Merge branch 'master' of https://github.com/sahanamurthy/betsy
tehut
committed
57bf9c6
new and improved logo
tehut
committed
2b217a7
way better logo placement
tehut
committed
c290674
redid layout with sidebar
tehut
committed
f87d228
new look
tehut
committed
2a8d9fc
now it looks good
tehut
committed
10df4f3
refractored code so that complete order now is calling upon update. update method working and passing tests
Allison-Northrop
committed
0818869
menu layout
tehut
committed
83d72e2
got order validation working properly - only validates info in order is present within the update method. also validates status is available in edit method.
Allison-Northrop
committed
23146b8
resized background image and removed list icons in css
tehut
committed
a8d44f2
removed list items in css and resized background image
tehut
committed
00c591b
committing for the night
Allison-Northrop
committed
720d8fa
re-routed reviews through products and begun work on create product_review
tehut
committed
6fc03ec
deleting extraneous files
tehut
committed
8d7484f
users can add a review to a product
tehut
committed
079484a
fixed add_category component of products#create
tehut
committed
64ccd85
session controller integration test for returning user login
tehut
committed
1b89413
sessions controller new user integration test
tehut
committed
f9b0f40
commiting to merge
Allison-Northrop
committed
7b69273
Merge branch 'master' of https://github.com/sahanamurthy/betsy into order
Allison-Northrop
committed
abc9f29
Merge branch 'master' of https://github.com/sahanamurthy/betsy
Allison-Northrop
committed
9c69d7b
Merge branch 'order'
Allison-Northrop
committed
485aa79
unfinished oath sessions testing
tehut
committed
a2e7a34
Merge branch 'master' of https://github.com/sahanamurthy/betsy
tehut
committed
9902d42
added etch a sketch image to asset path
tehut
committed
b3e318b
Merge branch 'reviews'
tehut
committed
e7a522f
merge conflict on css
tehut
committed
0982aba
fixed css on updated menubar
tehut
committed
1b5a356
fixed css on updated menubar
tehut
committed
8ebfdb6
updated layout
tehut
committed
1af757b
edited form for for update quantity for orderproducts
marisol-lopez
committed
0c2797e
Added feature: merchant account details page/products page
Sahana Murthy
committed
8e1ed01
wrote model method and test to filter by category
tehut
committed
aeb6f0b
added model method to products model
tehut
committed
2013671

Commits on Apr 27, 2017

Feature: order fulfillment. Order fulfillment page is showing a list of orders. Still needs the appropriate details
Sahana Murthy
committed
ca15699
Merge branch 'master' of https://github.com/sahanamurthy/betsy
Sahana Murthy
committed
fe67b7b
subtract inventory order method refractored to deal with multiple quantities in order
Allison-Northrop
committed
75b32d1
test helper everywhere
tehut
committed
25af47b
Merge branch 'menubar'
tehut
committed
400c886
Fixed bug in product_by_merchant.html.erb
Sahana Murthy
committed
e947a82
Merge branch 'master' of https://github.com/sahanamurthy/betsy into order
Allison-Northrop
committed
440baf6
wrote subtotal method in order model
Allison-Northrop
committed
e12467e
combination of button functionality for order and orderproducts
marisol-lopez
committed
7d5a214
Merge branch 'master' of https://github.com/sahanamurthy/betsy
marisol-lopez
committed
7c0e0bc
Merge branch 'master' of https://github.com/sahanamurthy/betsy into order
Allison-Northrop
committed
a08b59d
updated default image logic
tehut
committed
2a37266
Merge branch 'master' of https://github.com/sahanamurthy/betsy
tehut
committed
cfe57e8
fixed order routing bug
Allison-Northrop
committed
bf182d1
Merge branch 'master' of https://github.com/sahanamurthy/betsy
Allison-Northrop
committed
56056d5
button for edit and delete order product from orders page
marisol-lopez
committed
2c96e36
Merge branch 'orderproducts'
marisol-lopez
committed
0f15017
Merge branch 'master' of https://github.com/sahanamurthy/betsy
marisol-lopez
committed
42d36a8
added images
tehut
committed
3fd110f
Add files via upload
tehut
authored
0a2e078
commiting to view what we have
Allison-Northrop
committed
ba3d699
changed buttons
tehut
committed
4e99509
Merge branch 'workflow' of https://github.com/sahanamurthy/betsy into workflow
tehut
committed
3564da0
subtotal added to order summary view
Allison-Northrop
committed
cd6fca0
Added flash message - unable to save product to cart
Sahana Murthy
committed
ab5f503
Still working on flash bug. Sorry
Sahana Murthy
committed
a4a1078
Back to original
Sahana Murthy
committed
e52cb88
fixed create
Allison-Northrop
committed
faace93
Basic menu created. Colors/style needs to be changed. Menu position needs to be changed
Sahana Murthy
committed
5ac1663
Merge branch 'master' of https://github.com/sahanamurthy/betsy into order
Allison-Northrop
committed
7a7aa38
Merge branch 'master' of https://github.com/sahanamurthy/betsy
tehut
committed
da3572e
edit/delete button for each item in cart
marisol-lopez
committed
9913a79
Merge branch 'orderproducts'
marisol-lopez
committed
73dd5a7
checkout button on order
marisol-lopez
committed
a180830
trying to fix update
Allison-Northrop
committed
54e942a
Stuff
Sahana Murthy
committed
b08fd92
Merge branch 'master' of https://github.com/sahanamurthy/betsy into order
Allison-Northrop
committed
649d128
order summary page
marisol-lopez
committed
47372eb
Merge branch 'master' of https://github.com/sahanamurthy/betsy
marisol-lopez
committed
4dd91a9
removed raise from order summary
marisol-lopez
committed
ffffcdb
moved order.status in update controller to change status
marisol-lopez
committed
8973cab
CSV/Seeds
Sahana Murthy
committed
1bfea3a
Merge branch 'master' of https://github.com/sahanamurthy/betsy
Sahana Murthy
committed
39f659d
fixed logo placement, made dropdown transparent
tehut
committed
82d80f8
fixed application merge conflict
tehut
committed
aeff52d
Merge branch 'master' of https://github.com/sahanamurthy/betsy
tehut
committed
2c4a899
merge hell
tehut
committed
40e45b3
Added stuff
Sahana Murthy
committed
6c5e636
css selectors
tehut
committed
9a70f75

Commits on Apr 28, 2017

updated layout
tehut
committed
ad56ef4
styling
tehut
committed
3340f86
changed root
tehut
committed
c9861bd
added categories images
tehut
committed
257ed22
Adding user restriction
Sahana Murthy
committed
752a6d9
Merge branch 'master' of https://github.com/sahanamurthy/betsy
Sahana Murthy
committed
85d30aa
Fixed bugs in user restriction
Sahana Murthy
committed
7423101
added category views
tehut
committed
45c2a62
Changed dummy link for log-in in Merchants drop down
Sahana Murthy
committed
7ce14a7
Merge branch 'master' of https://github.com/sahanamurthy/betsy into categories_view
tehut
committed
c5ae2ff
Merge pull request #8 from sahanamurthy/categories_view
tehut
authored
bf729d0
Called .uniq on products_by_merchant
Sahana Murthy
committed
16d93f2
Created basic orders table
Sahana Murthy
committed
7b49f5d
added reviews buttons
marisol-lopez
committed
12e339f
resolved nav header blockage
tehut
committed
271c94f
Fixed link to order
Sahana Murthy
committed
f4535f0
before merge with master
Sahana Murthy
committed
43ffd59
Merge branch 'master' into merchant-orders
Sahana Murthy
committed
6f034cb
layout and cart clear debugging
tehut
committed
9ee0677
Order fulfillment stuff
Sahana Murthy
committed
d2b6f00
Merge remote-tracking branch 'origin/master'
tehut
committed
5a73bbb
deleted an blank method
Allison-Northrop
committed
91882ca
fixed section header dropdown
tehut
committed
a90d261
Merge branch 'master' of https://github.com/sahanamurthy/betsy
tehut
committed
de88bdd
fixed section header dropdown
tehut
committed
9559059
dropdown menu for merchant order view
marisol-lopez
committed
6482c33
changed text color for forms
marisol-lopez
committed
15771aa
ORDER FULFILLMENT COMPLETE (I think)
Sahana Murthy
committed
bab18de
ORDER FULFILLMENT 1
Sahana Murthy
committed
ac48bf1
fixing merge conflict stuff
Sahana Murthy
committed
fd2f589
Finished order fulfillment page
Sahana Murthy
committed
a69e88c
changed formatting for links in order_summary
Allison-Northrop
committed
42c1598
completed browse by merchant
tehut
committed
19235b0
merge fix
tehut
committed
122adec
OF output nice
Sahana Murthy
committed
5959238
Merge branch 'master' of https://github.com/sahanamurthy/betsy
Sahana Murthy
committed
f7cde6a
fixed a routing issue
Allison-Northrop
committed
a341f39
Merchant's specific product details page
Sahana Murthy
committed
266cd8a
changed the views in order to show money in the correct way
Allison-Northrop
committed
ebece50
Merge branch 'master' of https://github.com/sahanamurthy/betsy into tests
Allison-Northrop
committed
69ed4ad
Changed some view details for product show page
Sahana Murthy
committed
6574efa
updated button in form
Allison-Northrop
committed
3c5f6ed
rewrote view by merchant and merchant produc show page
tehut
committed
878c01b
Merge branch 'master' of https://github.com/sahanamurthy/betsy
tehut
committed
870ceff
fixed a few things
Allison-Northrop
committed
c642ecf
reviews controller and tests
marisol-lopez
committed
1435fac
Merge branch 'master' of https://github.com/sahanamurthy/betsy
marisol-lopez
committed
958a02c
Merge branch 'tests'
Allison-Northrop
committed
51a8a84
reviews controller tests
marisol-lopez
committed
da183ee
Merge branch 'master' of https://github.com/sahanamurthy/betsy
marisol-lopez
committed
a711b27
Reviews page stuff
Sahana Murthy
committed
ccaa6cf
Merge branch 'master' of https://github.com/sahanamurthy/betsy
Sahana Murthy
committed
a8ccf7c
added flash to order show
Allison-Northrop
committed
be984cf
Merge branch 'master' of https://github.com/sahanamurthy/betsy
Allison-Northrop
committed
fd70be4
updates to view by merchants
tehut
committed
a6694a7
Merge branch 'master' of https://github.com/sahanamurthy/betsy
tehut
committed
f85825a
orderproduct new test
marisol-lopez
committed
c932744
Merge branch 'master' of https://github.com/sahanamurthy/betsy
marisol-lopez
committed
19c4437
Merge branch 'master' of https://github.com/sahanamurthy/betsy
tehut
committed
5876290
Debugging info for heroku deploy
Sahana Murthy
committed
72fcddc
Remove debugging info
Sahana Murthy
committed
70c42b4
layout fixes
tehut
committed
4a90556
Merge branch 'master' of https://github.com/sahanamurthy/betsy
Sahana Murthy
committed
9f09860
fixed category view
tehut
committed
035b3cf
Merge branch 'master' of https://github.com/sahanamurthy/betsy
tehut
committed
15730e2

Commits on Apr 29, 2017

Realigned Browse by Merchants page
Sahana Murthy
committed
a8e9593
fixed bug on categories show page
tehut
committed
84aa62c
Merge branch 'master' of https://github.com/sahanamurthy/betsy
tehut
committed
e1e342d
Added restriction for reviews
Sahana Murthy
committed
376703e