Heather, Danielle, Yasmin, and Mary's Zoolily - #32

Open

heatherherrington wants to merge 367 commits into

Ada-C6:masterfrom

heatherherrington:master

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

Commits on Oct 24, 2016

Added review model validations, review model tests and review model fixture data
yasminor
committed
00ffe10
Attempt to test OAuth in merchant model
dschrimm
committed
0e938b0
Merge branch 'master' of https://github.com/heatherherrington/betsy
dschrimm
committed
6ef56cc
Added description column to the the reviews table
yasminor
committed
f6e9df6
Added methods to the reviews controller
yasminor
committed
578590a
Added limited tests for the review controller and added to the fixtures
yasminor
committed
19a9dfa
Merge branch 'b/yo/review_controller'
yasminor
committed
12dfa62
Merchant model test for full coverage
dschrimm
committed
a5bfd81
Merge branch 'master' of https://github.com/heatherherrington/betsy
dschrimm
committed
a2ed942
migration for adding product 'url' column and uncommented field in product form
morrime
committed
9e26229
Changed category to category_id in products table
heatherherrington
committed
ef02a26
dropped unnecessary categories_tables
yasminor
committed
a811075
Merge branch 'master' of https://github.com/heatherherrington/betsy
morrime
committed
e97cb2c
Fixed merge conflict in schema
yasminor
committed
a89fd44
linked to new product form from merchant show (dashboard)
morrime
committed
2c71335
Merge branch 'master' of https://github.com/heatherherrington/betsy
morrime
committed
f2c824d
Add photo url and updated show page with url logic
dschrimm
committed
61dc5b4
made product link to show page from dashboard
morrime
committed
e666090
please work
dschrimm
committed
4ca3349
Merge branch 'master' of https://github.com/heatherherrington/betsy
dschrimm
committed
9be7a8a
Remove photo_url text field from form
dschrimm
committed
adf86e7
Can view products by merchant and category
heatherherrington
committed
46caab9
Merge conflict in schema.rb fixed
heatherherrington
committed
7c8e6d9
Move show photo logic to products model
dschrimm
committed
942be33
Update logic in guests index page
dschrimm
committed
dd79ecb
remove url column
dschrimm
committed
4740f2c
fix merge conflict
dschrimm
committed
98cc46f
Deleted drop categories tables to rake db migrate
heatherherrington
committed
755d75a
fixed population of merchant id field so it isn't nil anymore
morrime
committed
f6bd487
resolved merge conflict
morrime
committed
5e47595
Add migration
dschrimm
committed
f931a20
Merge branch 'master' of https://github.com/heatherherrington/betsy
dschrimm
committed
0b5c023
Add photo logic for products index view
dschrimm
committed
7faa82b
change photo validation
dschrimm
committed
42f31a9
Added value to photo_url in seed
heatherherrington
committed
14ccb9c
Adding controller testing
heatherherrington
committed
1d04cb8
Added testing or orders controller
heatherherrington
committed
3b80dc8
Edited search functionality
heatherherrington
committed
024c35c
Images no longer repeat on main page
heatherherrington
committed
cf27538
added tests for sessions controller, modified routes and sessions controller
morrime
committed
fc88a67
Merge branch 'hay'
morrime
committed
7134c2b
add to cart experiments
dschrimm
committed
38e4a40
Merge branch 'master' of https://github.com/heatherherrington/betsy
dschrimm
committed
42956d9
Trying to style main page
heatherherrington
committed
b2c72b7
Merge branch 'master' of https://github.com/heatherherrington/betsy
heatherherrington
committed
8fad307
Merge branch 'main-page-styling'
heatherherrington
committed
0378468
Fixed errors with products testing
heatherherrington
committed
22b013b

Commits on Oct 25, 2016

Updating orders show stub
heatherherrington
committed
c8c6c16
Added inventory vs demand validator
heatherherrington
committed
32d6ba2
Maybe making a cart
heatherherrington
committed
e20f6a6
Expiration date working in orders
heatherherrington
committed
101d2b9
Add active category to products
dschrimm
committed
5e5fe7a
Add active category to products
dschrimm
committed
7be5d73
Correct orderitems_controller
dschrimm
committed
299b762
updated testing for orders controller, coverage is 100%, but will need another test once we fix the index action
morrime
committed
4b5329a
copied updated OrderItems controller
yasminor
committed
ff95f79
Fixed merge conflict
yasminor
committed
1840087
Product index page and show page only render active products
dschrimm
committed
7f57c3a
Ability to make a product not active
dschrimm
committed
f370ab2
Merge branch 'master' of https://github.com/heatherherrington/betsy
dschrimm
committed
a092ecc
Got Foundation working
heatherherrington
committed
7587950
Merge branch 'foundation'
heatherherrington
committed
a678a2e
Add active logic to category show page
dschrimm
committed
822ff7b
small adjustment to add to cart and comment out for now
dschrimm
committed
d4f9340
Formatting for product by category show page
heatherherrington
committed
b41fb10
Merge branch 'master' of https://github.com/heatherherrington/betsy
heatherherrington
committed
a53da6b
reset database
yasminor
committed
9a4c655
Merge branch 'b/yo/practice'
yasminor
committed
1bf38af
changed redirect_to for sessions controller create, fixed merchants and products controllers, and improved respective tests
morrime
committed
5a7974d
fixed sessions controller tests after changed sessiions controller action create redirect path
morrime
committed
3c49b57
Reinstate product method and button
dschrimm
committed
d57abae
Formatting pages as per wireframes
heatherherrington
committed
e1eea7f
Logic in show page to only show retire/reinstate links if merchant is logged in and only show one link based on active status
dschrimm
committed
b94d957
redirected the create action in sessions to the root path, may change later
yasminor
committed
4664ad5
Merge branch 'master' of https://github.com/heatherherrington/betsy
yasminor
committed
9e46273
resolved merge conflicts
morrime
committed
8b10a97
Merge branch 'master' of https://github.com/heatherherrington/betsy
morrime
committed
1e66774
fixed controller test
morrime
committed
3cd195c
Show retired products on index page only to merchant who owns those products
dschrimm
committed
219bbd6
Shows show page of retired product to merchant who owns it
dschrimm
committed
86f4ad0
Show page says if product is retired to merchant
dschrimm
committed
950b5ba
fixed orders controller tests
morrime
committed
d9002a9
deleted unnecessary test
morrime
committed
9f70a5c
Only current user can add new products to their merchant from link on show page
dschrimm
committed
0ee44e3
Styling to header
heatherherrington
committed
ab31a1a
Merge branch 'master' of https://github.com/heatherherrington/betsy
heatherherrington
committed
22f11a0
On merchant show page show current user their inactive products
dschrimm
committed
af0eef5
Text change to index and show page
dschrimm
committed
37d9b70
Conflict appears to be resolved
dschrimm
committed
43317e0
changed the orders table order_status column to a string datatype
yasminor
committed
a562f28
generated a carts controller and accompanying files
yasminor
committed
e024759
Added a helper method for current order
yasminor
committed
35f0bf5
Added some things to the order items, orders and products controllers that will have to do with the cart
yasminor
committed
03a9db9
tried to write tests for categories_controller, but I'm confused. So, maybe later
morrime
committed
bb139fe
Merge branch 'categories_controller_test'
morrime
committed
fc4da8e
Fix product paths on category show page
dschrimm
committed
6da9abf
Merge branch 'master' of https://github.com/heatherherrington/betsy
dschrimm
committed
628c725
changed method syntax in merchants controller, fixed test for that action, added products to yaml file
morrime
committed
0f170e4
Merge branch 'merchants_controller'
morrime
committed
903b357
Combine merges of product show page
dschrimm
committed
79283ac
Merge branch 'master' of https://github.com/heatherherrington/betsy
dschrimm
committed
b954b64
Formatted images and main page
heatherherrington
committed
e9c201c
Merge branch 'master' of https://github.com/heatherherrington/betsy
heatherherrington
committed
bac1752

Commits on Oct 26, 2016

Layout changes
heatherherrington
committed
82951f9
Merge conflicts resolved
heatherherrington
committed
c8a963e
resolve new review error
dschrimm
committed
24352ea
Start of review form
dschrimm
committed
4c8b0ad
merchant show page logic
dschrimm
committed
9772592
products index page logic
dschrimm
committed
50543d7
merchant show page logic update if statement
dschrimm
committed
45c545e
fix merge conflict
dschrimm
committed
12bdacc
comment out double image assignment to reflect correct one only
dschrimm
committed
2557587
Our favicon is a pig in boots
heatherherrington
committed
7c9aa61
Merge branch 'master' of https://github.com/heatherherrington/betsy
heatherherrington
committed
99af4d7
resolved non-integer rating test
dschrimm
committed
3b21e4f
Merge branch 'master' of https://github.com/heatherherrington/betsy
dschrimm
committed
c56b43a
working on testing, added to yaml file
morrime
committed
fba2062
Merge branch 'products_controller'
morrime
committed
3ef52e4
Formatted money description and tried to center images
heatherherrington
committed
0433934
Merge branch 'master' of https://github.com/heatherherrington/betsy
heatherherrington
committed
732c872
Nested review routes and working new form
dschrimm
committed
bb8643f
Product reviews displaying on product show page
dschrimm
committed
d228e4b
Changed the OrderItems controller name to reflect naming conventions and fix naming errors, ended up having to make lots of changes in many files to reflect the name change
yasminor
committed
021e443
Add emoji for ranking
dschrimm
committed
cd208f3
Remove review link for current merchant's products
dschrimm
committed
ad03f24
WIP Categories controller testing
heatherherrington
committed
8c37503
a merchant cannot leave a review for their own product. need to get error message working
dschrimm
committed
02e57bd
Merge branch 'master' of https://github.com/heatherherrington/betsy
heatherherrington
committed
f5ff7e2
fixed tests for order model, added to yaml file, working on product controller tests for retire_product and reinstate_product, error = method undefined
morrime
committed
706de24
Merge branch 'order_test'
morrime
committed
b33dbb1
WIP categories controller 'new' test
heatherherrington
committed
80aaa50
Merge branch 'ds/review_self'
dschrimm
committed
6a93793
Added test and route for new category
heatherherrington
committed
719a0c5
Merge branch 'master' of https://github.com/heatherherrington/betsy
heatherherrington
committed
c82bb4a
Minor formatting of main page
heatherherrington
committed
4e20bf8
Add text to merchant's show page review area
dschrimm
committed
b01126e
test for create new review
morrime
committed
0ce4041
Merge branch 'master' of https://github.com/heatherherrington/betsy
dschrimm
committed
c751159

Commits on Oct 27, 2016

Working average on products show page
dschrimm
committed
f1b5e4d
rounded average to two decimals
dschrimm
committed
d4c6d0c
Edit button and capabilities for merchant's products
dschrimm
committed
5a75379
allow for float prices
dschrimm
committed
234715f
Modified search result display
heatherherrington
committed
bcea9ab
Edited to add merchant dashboard and merchant product show page
heatherherrington
committed
6fde22e
Added content to order show page
heatherherrington
committed
03622ac
Fixed error causing orders not being saved properly and order items not being properly associated with their orders
yasminor
committed
c4b9bcd
Added a before_create model filter to set order status to pending every time a new order is created
yasminor
committed
4480acb
Cart views
yasminor
committed
050a740
put in controller actions for require login, added route, created views/sessions/login_failure
morrime
committed
0e7aaa1
Merge branch 'controller_actions'
morrime
committed
db1a263
Fixed merge conflicts in app, orders and products controllers as well as schema
yasminor
committed
a2f5103
Barebones dashboard show page
heatherherrington
committed
5681720
Merge branch 'master' of https://github.com/heatherherrington/betsy
heatherherrington
committed
48eb401
migrated schema changes
yasminor
committed
d00a56a
Fix join table association and add csv of product categories
dschrimm
committed
3b049f0
Dropdown for order status
heatherherrington
committed
f99788c
Use join table in category show pages
dschrimm
committed
a7a4b9e
moved require_login to merchants controller
morrime
committed
c146aa6
Minor changes to Categories controller test
heatherherrington
committed
a4978e3
Merge branch 'master' of https://github.com/heatherherrington/betsy
yasminor
committed
282cdb1
merge conflict
morrime
committed
6fa0ee2
Merge branch 'master' of https://github.com/heatherherrington/betsy
heatherherrington
committed
eb533e4
Merge branch 'master' of https://github.com/heatherherrington/betsy
yasminor
committed
f5461f8
Fixed conditional validations for order on order_status and got the cart to clear when the user changes (had to delete session[:order_id] when logging out
yasminor
committed
68bbef2
fixed testing errors for merchant controller by adding exceptions to require login before action
morrime
committed
b78e24b
Merge branch 'master' of https://github.com/heatherherrington/betsy
morrime
committed
479ef81
WIP review controller testing
heatherherrington
committed
6d996b0
Merge branch 'master' of https://github.com/heatherherrington/betsy
heatherherrington
committed
bf1b9a9
WIP: adding cart functionality to get to order confirmation page
yasminor
committed
6665000
Tested reviews controller
heatherherrington
committed
4c62f8d
Merge branch 'testing'
heatherherrington
committed
53b8eb0
Working assign product multiple categories omg
dschrimm
committed
31de33e
remove category_id from product table
dschrimm
committed
a697fb6
resolved resulting merge conflict from removing category_id column from product table
dschrimm
committed
165e0cd
tried fixing merchant controller issues, failed.
morrime
committed
fabb281
Merge branch 'merch_control_test'
morrime
committed
d8bc12c
Order items model testing
heatherherrington
committed
7b3fdd5
Merge branch 'master' of https://github.com/heatherherrington/betsy
heatherherrington
committed
cd4f2f9
Ran migration and schema changed
heatherherrington
committed
713aa08
Fixed review functionality and layout on product page
heatherherrington
committed
4f946ba
added button to merchant products so they can edit them
morrime
committed
a810ce8
Merge branch 'merch_products'
morrime
committed
9edd30f
edit existing product's categories
dschrimm
committed
b58ca88
Merge branch 'b/ds/edit_prod_categories'
dschrimm
committed
fdef6f1
Edited merchants show page button
heatherherrington
committed
cfec2ca
Categories show on edit
dschrimm
committed
77f026c
Merge branch 'master' of https://github.com/heatherherrington/betsy
heatherherrington
committed
b6cfe82
fix merge conflict
dschrimm
committed
a212937
Modified the orders model validations so that you can change order status to paid and run validations at the same time
yasminor
committed
95ab465
Merge branch 'b/yo/cart_phase_II'
yasminor
committed
b4c48d2
allow for no category do be selected during product creation
dschrimm
committed
08d57ff
add helper method for find categories and add to product update
dschrimm
committed
92b1e87
fixed issue with price changing upon edit
dschrimm
committed
7a48401
Merge branch 'b/ds/no_category_selected'
dschrimm
committed
8acecc3
Fixed product creation by unlogged in user
heatherherrington
committed
e8753e6

Commits on Oct 28, 2016

Make photos closer to same size
dschrimm
committed
1b097b6
Merge branch 'b/ds/css_images'
dschrimm
committed
57860d8
Edited Gemfile for Heroku deploy
heatherherrington
committed
3c418bf
Changed production.rb for Heroku deploy
heatherherrington
committed
c9e636b
Merge branch 'master' of https://github.com/heatherherrington/betsy
heatherherrington
committed
36435e8
Changed for Heroku deploy
heatherherrington
committed
3db6f24
Fixed the cart AGAIN
yasminor
committed
9659e9c
Merge branch 'master' of https://github.com/heatherherrington/betsy
yasminor
committed
293bf24
testing for products controller
morrime
committed
b67b0cb
Merge branch 'products_controller_test'
morrime
committed
a3722d5
Changed production.rb per heroku instructions
heatherherrington
committed
72ff9d8
change gemfile.lock
yasminor
committed
555b3a9
Merge branch 'b/yo/cart_phase_III'
yasminor
committed
805d0b0
Eff the order validations
yasminor
committed
0123483
price and total calculations
dschrimm
committed
2ade990
add spacing
dschrimm
committed
0fcd55a
Add one of the item if no number is selected
dschrimm
committed
f4cde08
default quantity value 1
dschrimm
committed
c837200
allow for nil quantity
dschrimm
committed
3a97b00
total cart price
dschrimm
committed
82007be
Generated Gemfile.lock
heatherherrington
committed
9a23c82
Order items saved in cart
dschrimm
committed
0c7dd9c
Add render if order_item not created
dschrimm
committed
3a799a2
Added functionality for merchant to add new category WIP
heatherherrington
committed
f76c459
Cannot add new category unless logged in
heatherherrington
committed
4e34233
Minor CSS changes
heatherherrington
committed
71f1cd3
A second item created of same product adds to initial line item instead of creating an additional one
dschrimm
committed
552fe54
Merge branch 'b/ds/cart_orders'
dschrimm
committed
1b562f8
puts two decimal points after price
dschrimm
committed
fd74067
CSS and drop-down for review form
heatherherrington
committed
94c612c
Merge branch 'CSS'
heatherherrington
committed
d041e9b
WIP categories controller testing
heatherherrington
committed
398993c
redirecting to back if order qty is greater than available qty, also fixed some indentation
morrime
committed
b20ab10
WIP controller testing and product edit
heatherherrington
committed
9e50bff
Merge branch 'master' of https://github.com/heatherherrington/betsy
heatherherrington
committed
d192a47
slight additions to orderitem tests
dschrimm
committed
12235d9
Merge branch 'b/ds/testing_trial'
dschrimm
committed
41343d7
WIP Sessions Controller testing
heatherherrington
committed
4ba9cd6
Merge branch 'master' of https://github.com/heatherherrington/betsy
heatherherrington
committed
4ce6e89
WIP sessions controller testing
heatherherrington
committed
59c4ff6
Failing sessions controller tests and do not know why
heatherherrington
committed
e2f53d5
The cart works now with validations
yasminor
committed
e4e3bdd
merge conflict fixed
yasminor
committed
f04a12c
Resolved merge conflict in order items controller
heatherherrington
committed
de7197a
Fixed error functionality
heatherherrington
committed
4f4b983
forgot a fix another merge conflict, now fixed
yasminor
committed
76553a4
Merge branch 'master' of https://github.com/heatherherrington/betsy
yasminor
committed
ecbdfb4
photo text and edit button
dschrimm
committed
c28230f
Centered images on merchant page
dschrimm
committed
d3f032f
Centered images on categories and products index page
dschrimm
committed
c9f3115
close div tags
dschrimm
committed
c91bb9b
Merge branch 'b/ds/photo_placement'
dschrimm
committed
7497b0e
fixed edit button on product show page
dschrimm
committed
fd0da1d

Commits on Oct 30, 2016

Order items controller testing
heatherherrington
committed
d6590d7
Maybe fixed case-sensitive search functionality for heroku
heatherherrington
committed
f8dc613