Team Quartzy- Annalee, Meighan, Riley, Audrey - #16

Open

Dreedle wants to merge 493 commits into

Ada-C4:quartzy/masterfrom

Dreedle:quartzy/master

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

Commits on Dec 15, 2015

user_order_dash toggling properly between order status revenues
rileslovesyall
committed
23522ea
user#orders_by_status written
rileslovesyall
committed
f0aa9a0
Merge branch 'test' into quartzy/master
rileslovesyall
committed
f916b50
Guest cannot see edit product button
knaydee
committed
01da31f
Owner of product cannot buy own product
knaydee
committed
aa322d0
Owner cannot add a review to their own product
knaydee
committed
6155c9d
Guest cannot delete product
knaydee
committed
802b51c
Add <br> to _form view
knaydee
committed
f4c132f
Cannot add a product to cart that is out of stock
Dreedle
committed
fa33e78
space for flash in the layout, may need to change
rileslovesyall
committed
3dcc2bb
Merge branch 'working' into quartzy/master
rileslovesyall
committed
5f618c6
Took out the word 'error' from sessions
Dreedle
committed
ed36c97
Create new category form general layout
knaydee
committed
7d4599a
New and create methods in categories controller - still need tests
knaydee
committed
d5f9ced
Products and categories new methods now render :new on error
knaydee
committed
c2eb564
Products and categories new methods now render :new on error
knaydee
committed
796b387
Test for category new method
knaydee
committed
979cf7b
Test for category create
knaydee
committed
a4b3fac
Add font-awesome-rails' to to Gemfile and application.scss
knaydee
committed
936eeb9
User can shop but not for their own products
Dreedle
committed
eb2c87c
writing user#orderitems
rileslovesyall
committed
767b9b3
user#orderitems working
rileslovesyall
committed
62e5a98
Merge branch 'test' into quartzy/master
rileslovesyall
committed
0a9a4e5
h1 and h2 fonts
annaleeherrera
committed
ec33942
nav bar css
annaleeherrera
committed
0c0b215
headers css
annaleeherrera
committed
0a8df91
jumbotron, bg image, reduce form size
annaleeherrera
committed
654924f
updated some routes
rileslovesyall
committed
0f3bdfd
updated routes
rileslovesyall
committed
6c4946f
Merge branch 'test' into quartzy/master
rileslovesyall
committed
d097722
Add merchant to product#show
knaydee
committed
2231687
Orderitem status can be marked as shipped, table changes to show orderitem status
rileslovesyall
committed
ce4f694
Merge branch 'quartzy/master' of github.com:Dreedle/betsy into quartzy/master
rileslovesyall
committed
6fb9c61
orderitem#item_shipped working
rileslovesyall
committed
d9c2b28
item_shipped code added to ship controller;
rileslovesyall
committed
04c43b3
users index listing all merchants and links
annaleeherrera
committed
4df22ab
users index page
annaleeherrera
committed
9dd4caa
fixed routes merge
Dreedle
committed
ce5226e
Sold By now links to Merchant show path, add CSS to style rating stars
knaydee
committed
ded8450
Show form now only shows edit and delete button if it's an owner product
knaydee
committed
eb3d1bb
Retired checkbox now on edit form for owner product
knaydee
committed
e0ac3e9
removed method that belonged elsewhere
rileslovesyall
committed
a9818ff
Rspec tests passing for order#mark_shipped
rileslovesyall
committed
650e087
an order will be marked shipped if all its items get shipped
rileslovesyall
committed
ccdfdb1
Retired checkbox now on edit form for owner product
knaydee
committed
eea9ae2
Merge branch 'quartzy/master' of github.com:Dreedle/betsy into quartzy/master
knaydee
committed
8db6dca
Merge branch 'apple' into quartzy/master
knaydee
committed
1fce428
Can change quantity of orderitems within cart
Dreedle
committed
4b42290
nice_price helper working
rileslovesyall
committed
ba3b4f2
order mark shipped bugs fixed
rileslovesyall
committed
a18dfc9
removed extraneous product validation
rileslovesyall
committed
b651232
Implement nice_price and fix the bugs to ensure that rounding isn't happening
knaydee
committed
7c41a53
Fix who sees what button on the product show page
knaydee
committed
d92ae32
Order method written for cc last_four
rileslovesyall
committed
dfe826f
updated header fonts, added stuff to ordershow
rileslovesyall
committed
e5ce05c
initial orders confirm page
annaleeherrera
committed
7b5ddb1
added cntr-header to center the h5 header status
rileslovesyall
committed
95ca1d4
order#show done
rileslovesyall
committed
9efa0db
front page, body font, adding titles for merchants and categories
annaleeherrera
committed
a0b7cfd
won't get same category or user on front page
rileslovesyall
committed
b706956
number of items in cart showing in navbar
rileslovesyall
committed
52c723e
flash css stubbed, changing flash msgs
rileslovesyall
committed
738ae22
only one spot for flash notices;
rileslovesyall
committed
1732e2f
updated styling
rileslovesyall
committed
8908d11
added images to front page
rileslovesyall
committed
2fe70a5
DRYed controller, added flash for delete
rileslovesyall
committed
01fd2f8
Retired field only shows for owner products
knaydee
committed
8b6fd1e
Retired true says yes on form and vice versa
knaydee
committed
a868f46
Better formatting and prettifying of retired check box
knaydee
committed
d0c39dd
Merge branch 'quartzy/master' of github.com:Dreedle/betsy into quartzy/master
knaydee
committed
63cee8f
Retired field only shows for owner products
knaydee
committed
7fc877a
Retired true says yes on form and vice versa
knaydee
committed
9704da0
Better formatting and prettifying of retired check box
knaydee
committed
02f6e44
Merge branch 'retire' into quartzy/master
knaydee
committed
c1bcfd4
front page
annaleeherrera
committed
ab0ee1b
changed where product#create redirects, added flash msg
rileslovesyall
committed
6f8f6a2
Merge branch 'quartzy/master' of github.com:Dreedle/betsy into quartzy/master
rileslovesyall
committed
9fadeb8
css added for flash error
rileslovesyall
committed
2abf960
updated some CSS for front page
rileslovesyall
committed
c9e96ee
fixed page styling
rileslovesyall
committed
8b30577

Commits on Dec 16, 2015

made fonts into variables
rileslovesyall
committed
7a112da
added nice price to revenue
rileslovesyall
committed
29ac30c
order controller show spec
Dreedle
committed
22af525
First half of order controller cart spec
Dreedle
committed
991c927
Still order specs (not totally done)
Dreedle
committed
bb4636b
Finished cart spec for orders controller
Dreedle
committed
6579d2e
changed button
rileslovesyall
committed
522a695
added some css classes around
rileslovesyall
committed
b2d8789
minor css
rileslovesyall
committed
cac01f1
working on CSS and general stuff
rileslovesyall
committed
4d865d5
changing some thing
rileslovesyall
committed
8d678e8
Merge branch 'working' into quartzy/master
rileslovesyall
committed
e12442a
Adding rspec tests for orders_controller delete action
Dreedle
committed
028b8f9
uniform fonts and colors
annaleeherrera
committed
334004d
updated styling on checkout page
rileslovesyall
committed
a884d94
css styling formatted
rileslovesyall
committed
ea9f8c1
cssed cart page
rileslovesyall
committed
ae86bbe
fixed order update status, working on forms
rileslovesyall
committed
3489234
fixed status again
rileslovesyall
committed
f317c13
form padding
annaleeherrera
committed
f624e1d
updated order total methods
rileslovesyall
committed
b547dbe
order confirm page complete
rileslovesyall
committed
0828789
rspec test for orders_controller confirm
Dreedle
committed
7c20a3d
rspec test for orders controller confirm action
Dreedle
committed
7019921
rspec test for orders_controller cancel_as_guest
Dreedle
committed
c6a21bc
Merge branch 'quartzy/master' of github.com:Dreedle/betsy into quartzy/master
Dreedle
committed
e125e6e
updating css
rileslovesyall
committed
f54a018
Merge branch 'quartzy/master' of github.com:Dreedle/betsy into quartzy/master
rileslovesyall
committed
046788b
updated css colors and styling
rileslovesyall
committed
41d57bc
putting header-box everywhere
rileslovesyall
committed
a7d8db1
front page won't show merchants with too few products for display
rileslovesyall
committed
58e6af9
more button css
rileslovesyall
committed
b353e7a
more css
rileslovesyall
committed
80a2551
minor css
rileslovesyall
committed
c574a16
welcome controller spec fixed
rileslovesyall
committed
07a21c4
Merging new welcome controller specs
Dreedle
committed
1e2daf2
started order cancelled button
rileslovesyall
committed
75e92b4
writing logic for shipped and cancaled order items
rileslovesyall
committed
93af7a2
removed user dash cancel button
rileslovesyall
committed
a505d6e
Removing cancel_as_user order controller action and route
Dreedle
committed
278e9de
made prices look better
rileslovesyall
committed
4ab24c3
bug fixed on welcome index page
rileslovesyall
committed
d56433f
Merge branch 'quartzy/master' of github.com:Dreedle/betsy into quartzy/master
rileslovesyall
committed
3ceff9e
form bug
annaleeherrera
committed
8f165a8
Taking order destroy out of orders controller
Dreedle
committed
918a22a
added header boxes
rileslovesyall
committed
f8b100a
added at to cart button
rileslovesyall
committed
ec1a6d6
add to cart button everywhere
rileslovesyall
committed
3682b2e
Merge branch 'quartzy/master' of github.com:Dreedle/betsy into quartzy/master
Dreedle
committed
f95d8a0
Fix POST create spec in products controller
knaydee
committed
5bfcb5c
Fix merge in products controller
knaydee
committed
fa67c30
add to cart logic fixed
rileslovesyall
committed
fcfeabe
Fixing products show again
Dreedle
committed
e45135a
reverted to old version
rileslovesyall
committed
9c3223a
Fix price in product update method
knaydee
committed
fabc6df

Commits on Dec 17, 2015

only_current_user updated
rileslovesyall
committed
d2e2845
nice price added
rileslovesyall
committed
cb34c62
updated quantity cart is showing
rileslovesyall
committed
9691013
added required fields
rileslovesyall
committed
742ec7a
Merge branch 'quartzy/master' of github.com:Dreedle/betsy into quartzy/master
rileslovesyall
committed
6c911a9
Remove Rating from in front of rating star reviews
knaydee
committed
e91dd72
Product categories are now show in list format in show view
knaydee
committed
60d7a15
Users may now leave reviews for products tthey do not own
knaydee
committed
5eaf84e
Product controller spec for PATCH update works
knaydee
committed
a2b04eb
Comment out spec for PATCH retire
knaydee
committed
9d0fb28
placed at and order status added
rileslovesyall
committed
17f4217
wrote product#out_of_stock?
rileslovesyall
committed
6b4f27f
logic added for out of stock showing
rileslovesyall
committed
c134b08
changing where we are decrementing inventory
rileslovesyall
committed
6e7fa6b
orderitems by order status working
rileslovesyall
committed
6732f7f
order dash works even if you don't have any orders
rileslovesyall
committed
82a21f9
cannot mark items as shipped if their order has been cancelled
rileslovesyall
committed
085594e
added required fields
rileslovesyall
committed
26b6af6
Orders controller test for finalize action
Dreedle
committed
7858c78
changing orders#ship to a patch method
Dreedle
committed
e13d851
Taking out session_over method from controller
Dreedle
committed
d0cefe7
Changing products#buy to remove conditional about stock. Will be taken care of in views
Dreedle
committed
cce250d
show name on page, minor styling
rileslovesyall
committed
3cfb3f8
Merge branch 'quartzy/master' of github.com:Dreedle/betsy into quartzy/master
rileslovesyall
committed
49b18f2
updated styling
rileslovesyall
committed
35edc5a
removed extraneous code
rileslovesyall
committed
10e10b0
added required fields to form
rileslovesyall
committed
057f74c
orders won't populate twice
rileslovesyall
committed
296a568
user#dash working without orders or products
rileslovesyall
committed
8ffb4c2
delete pictures
annaleeherrera
committed
2318898
Remove orders with status set to complete
knaydee
committed
82f9f21
Working on method to decrement product stocks in order model
Dreedle
committed
0c688d5
Tested in rails c the method to decrement products stock
Dreedle
committed
75edfac
Adding decrement_products_stock method into orders controller finalize action
Dreedle
committed
cca2927
Stocks of products decrement by 1 when you finalize an order
Dreedle
committed
ddd630a
Merge branch 'quartzy/master' of github.com:Dreedle/betsy into quartzy/master
annaleeherrera
committed
f89e6f6
delete pictures
annaleeherrera
committed
06bc3d5
validation bugs
annaleeherrera
committed
6c504d8
Merge branch 'productvalidation' into quartzy/master
annaleeherrera
committed
f67f71a
add cart buttons doesn't show on main page if out of stock
rileslovesyall
committed
29146ae
Merge branch 'quartzy/master' of github.com:Dreedle/betsy into quartzy/master
rileslovesyall
committed
fb88b09
product#show doesn't show add to cart if product.out_of_stock?
rileslovesyall
committed
f4f6ec6
Deleting unneeded comment from order.rb
Dreedle
committed
5b6c326
Quantity of item in cart must be 1 or greater. Use remove button to go to zero
Dreedle
committed
57c52c3
checkout page looks way better
rileslovesyall
committed
ea134a5
new pic for t-chainz
rileslovesyall
committed
26aec33
updated seeds, added border around front page users/cats
rileslovesyall
committed
ee07a81
Methods to make sure orders and users exist
Dreedle
committed
2ab572b
Further debugging of cart showing problem
Dreedle
committed
a675212
Adding @user = @current_user to order_dash controller
Dreedle
committed
07027cd
New order seeds (four of them)
Dreedle
committed
479fe93
Test that retired is updated when clicked
knaydee
committed
b6078a7
Test that if retired is updated it goes back to product show page
knaydee
committed
c002e5f
I don't remember the changes I made
knaydee
committed
5243ae5
Made prices lower in seeds
Dreedle
committed
c955578
Update Gemfile for Heroku and create Procfile
knaydee
committed
81d6ed2
Fix image
knaydee
committed
6b862fb
Changed products#buy to use current_order. Starting to add flash when item is added to cart. work on second add, but not first
Dreedle
committed
c1549dd
Flashes work when you add items to cart
Dreedle
committed
39b548b
caps on checkout form
Dreedle
committed
5279408
order item specs
annaleeherrera
committed
5430d4c
orderitem specs
annaleeherrera
committed
16207ab
order item rspec orderitem by order method
annaleeherrera
committed
e6fdc4f
update readme w heroku link
annaleeherrera
committed
efb819d
updated readme to include heroku link
rileslovesyall
committed
fbd293c
redirecting somewhere weird wtf
rileslovesyall
committed
059f60b
removed nice price value, form works but is icky
rileslovesyall
committed
894593f
Merge branch 'quartzy/master' of github.com:Dreedle/betsy into quartzy/master
rileslovesyall
committed
a1f4e72

Commits on Dec 18, 2015

Merge branch 'quartzy/master' of github.com:Dreedle/betsy into quartzy/master
knaydee
committed
3ab5a72
Update Gemfile for Heroku and create Procfile
knaydee
committed
29ccefc
Fix image
knaydee
committed
c038f86
Test that a guest or non-owner cannot retire a product
knaydee
committed
488f9e7
Merge branch 'flash' into quartzy/master
knaydee
committed
ce8dee6
mark shipped updated
rileslovesyall
committed
01c3708
Merge branch 'quartzy/master' of github.com:Dreedle/betsy into quartzy/master
rileslovesyall
committed
f0648a8
removing ship from orderscontroller and corresponding spec
Dreedle
committed
c3023c3
delete unused html
annaleeherrera
committed
efccb24
got rid of extraneous views
rileslovesyall
committed
de975f1
flash color is falshier
rileslovesyall
committed
b99bf07
gave orderitems a default value of 1
rileslovesyall
committed
619d63a
h3 product name on product index are centered
Dreedle
committed
5a4d847
Centered images and button on product_view
Dreedle
committed
712481a
Centering and sizing images on products view
Dreedle
committed
0f82b42
created application controller spec file
rileslovesyall
committed
dd4a729
stubbed out stuff in file
rileslovesyall
committed
6d89ee7
only_current_user spec stubbed
rileslovesyall
committed
0c69191
stubs for needed specs written
rileslovesyall
committed
d737d50
Final retire test - to test that product is created with retired set to false
knaydee
committed
47c497f
Attempt at making review form look better
knaydee
committed
fad61a2
Empty cart looks a bit better
Dreedle
committed
68f1a5b
css on index page to make groups more distinct
Dreedle
committed
cf624f4
Fix a bit of indent on index html
Dreedle
committed
3f10e84
Should have fixed problem of logging out when the order doesn't exist
Dreedle
committed
0e311d7
product show page better aligned;
rileslovesyall
committed
5336e7e
sign up
annaleeherrera
committed
6ad34c8
Add flash messages for create user and finalize order
knaydee
committed
b9fbbfa
revenue totaling
annaleeherrera
committed
d096694
merchants display is iterating more properly in users index
Dreedle
committed
a896017
Centered things in users#index and changed treasure troll seed
Dreedle
committed
9783470
Merge branch 'quartzy/master' of github.com:Dreedle/betsy into quartzy/master
annaleeherrera
committed
3e86ab7
hover button colors fitting better
rileslovesyall
committed
dbb2c08
fixed order#total logic
rileslovesyall
committed
242456a
commit
rileslovesyall
committed
9036707
recentering in welcome index
Dreedle
committed
d04c448
Centered things in categories index
Dreedle
committed
35ac7bc
DRYed up retire method and rspec in controller and add retire_toggle method to product model
knaydee
committed
1a56d75
Merge branch 'quartzy/master' of github.com:Dreedle/betsy into quartzy/master
knaydee
committed
e5ca88e
updated a few last things in dash
rileslovesyall
committed
f1d9dc4
final switch
rileslovesyall
committed
e4ef7bc
fixed header
rileslovesyall
committed
4160c93

Commits on Dec 19, 2015

Commits on Dec 21, 2015

test written for order_by_status
rileslovesyall
committed
dc8ef3a
fixed revenue by status issue
rileslovesyall
committed
278069f

Commits on Jan 15, 2016

Add hidden form fields to product_params
knaydee
committed
601470d