DeadGhost Betsy - #15

Open

secretsharer wants to merge 291 commits into

Ada-C7:masterfrom

secretsharer:master

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

Commits on Apr 21, 2017

Fixed merged conflicts
acgillette
committed
fdf243b
Passing tests for Category relations
jjjousun
committed
f4ec511
tests for relationships in merchant model (with product).
ssamant
committed
ba8682b
merchant controller, restful routes and views
ssamant
committed
1f88d0d
Merge conflict in product fixture; fixed
jjjousun
committed
601ed1f
Fixed merge conflict in Product model
jjjousun
committed
e5b4e33
basic restful controller methods added
ssamant
committed
c58b32e
fixed typo
ssamant
committed
8d77a9d
added migration to create description column in merchant schema table. Added seed data for merchants
ssamant
committed
0439033
nested route for merchant's products; updated index view to list merchants
ssamant
committed
83fb77d
restful views for merchants
ssamant
committed
ce03822
adding untracked merchant files(controller, views, migration
ssamant
committed
727e2e1
resolved merge conflict in schema
ssamant
committed
38ad759
Made product routes
acgillette
committed
6815aea
Working on products merchant passing
acgillette
committed
1ff40da
Got nested routes products controller green
acgillette
committed
18bc43b
Show controller test for product green
acgillette
committed
5c6a1a4
Product edit controller test green
acgillette
committed
c9239e0
Added quantity validation and tests to product model
acgillette
committed
39265e0
Added controller filter for find product
acgillette
committed
834b5d5
Added update controller and test
acgillette
committed
58d54b6
Delete product controller method made and test green:
acgillette
committed
0caed1b
New controller method written, nested route made for new, test green for products
acgillette
committed
ed2a192
Added nested create route, made create method, create test green for product controller
acgillette
committed
d31bce0
negative create test made
acgillette
committed
5b1ff5b

Commits on Apr 22, 2017

Added commented out before action require login for product
acgillette
committed
df2ea45
Added form partial
acgillette
committed
3d243bc
ran migrations to change categories_products table
ssamant
committed
51fe8b9
basic controller tests for merchant; fixed controller and views based on testing errors
ssamant
committed
1cceb19
Got review tests working, added product validation
acgillette
committed
2f15bac
White spaces modified, I think
jjjousun
committed
9421d2a
Working on Category Controller tests
jjjousun
committed
4e6983a
Commented out IDs in product.yml
acgillette
committed
9fe5ba8

Commits on Apr 24, 2017

stubbed out orders controller methods
secretsharer
committed
3733202
added validations and relationships to order model
secretsharer
committed
2ad0a9d
added some order model methods
secretsharer
committed
3deb7c0
deleted order model
secretsharer
committed
8ad0ea7
Made sessions full rest resources, gonna try this approach
secretsharer
committed
fec1a1b
super basic controller methods
ssamant
committed
3860e94
stubbed out orderscontroller methods again
secretsharer
committed
64eb0eb
added three current user, session and log in methods to application controller
secretsharer
committed
45a1c44
re-added sessions controller methods after losing them in the great branching accident of 2017
secretsharer
committed
8fd93e2
quick formatting edit on order model. though im not sure if quantity or unit price exist in the product/orderitems model yet, i will check tomorrow
secretsharer
committed
afc11db
added relationship and validation to session model. yes I made a session model
secretsharer
committed
366401d
order item controller
ssamant
committed
925a3aa
resolved merge conflict in schema
ssamant
committed
5866c21
adding controller stuff for order item to master
ssamant
committed
d9380c1
Fixed merged conflicts
jjjousun
committed
1f8e381
trying to resolve merge conflicts
ssamant
committed
03d7c33
Starting on sessions functionality
acgillette
committed
60822fa
Fixing merge conflicts
acgillette
committed
ef15ebb
added root route to products index
ssamant
committed
1b13d49
changing session controller
ssamant
committed
207e836
Got cart association to work hopefully
acgillette
committed
49fcd61
pairing with jou-jou on model methods
secretsharer
committed
673e3cf
Working on Orders Controller methods
jjjousun
committed
11acbf4
Fixed merge conflicts
jjjousun
committed
fd1bb22
uhh idk whats up with this
secretsharer
committed
838dda3
adding seed data for products, product index and show views and created order index view. Added description and image_url columns to product schema and updated strong params to inlcude those fields
ssamant
committed
7f58cc9
fising the merge detached head prob
secretsharer
committed
695f79e
categories seed data added
ssamant
committed
17c5081
merge conflice product model
ssamant
committed
bc5d18b
Changed OrderItems back to Order_items for controller
jjjousun
committed
4ff2a7a
Added cart link whoops forgot to push that
acgillette
committed
916043e
Merge branch 'master' of https://github.com/secretsharer/betsy
jjjousun
committed
1708822
Working on orderitems
acgillette
committed
51501e5
Got adding order items working I think
acgillette
committed
07c0f6b
working on orderitems WIP
ssamant
committed
dcb9f5a
Some more Orders Controller methods
jjjousun
committed
f28ecad
Merge branch 'master' of https://github.com/secretsharer/betsy
jjjousun
committed
f59e252
Fixed yml files somehow?
acgillette
committed
6cf9ee6
Fixed fixture errors and got simplecov to work
acgillette
committed
af3dbda
Changes, in French
secretsharer
committed
c6d6372
Fixed merge conflicts
acgillette
committed
fee192b
WIP show page for products to add orderitem
ssamant
committed
c0c65a3
fixed typo in application controller
ssamant
committed
b237332
Fixing tests
acgillette
committed
ce8fff0
WIP create orderitem
ssamant
committed
f5ab3be
merge conflict in routes
ssamant
committed
a5a8331
Merge branch 'master' of https://github.com/secretsharer/betsy
acgillette
committed
bda2fc7
Merged
acgillette
committed
7d9bcc0
added payments routes and method edits to orders controller
secretsharer
committed
ec96f89
Merge branch 'master' of https://github.com/secretsharer/betsy
secretsharer
committed
2c49b90
Stuff is being overwritten; thats fine
jjjousun
committed
d0c604a
Merge branch 'master' of https://github.com/secretsharer/betsy
jjjousun
committed
c42d087
WIP where the f is our order
ssamant
committed
5f86b42

Commits on Apr 25, 2017

Merge branch 'master' of https://github.com/secretsharer/betsy
jjjousun
committed
dd340a2
commented out code in order model so order.create method works
ssamant
committed
875120e
Merge branch 'master' of https://github.com/secretsharer/betsy
jjjousun
committed
5a83357
Took out raise
jjjousun
committed
dca37df
edits to create orderitem
ssamant
committed
10694ea
Merge branch 'master' of https://github.com/secretsharer/betsy
ssamant
committed
727b2fc
WIP setting up guest id and cart in session with no user login
ssamant
committed
1f7902c
Merge branch 'ss/order'
ssamant
committed
08c6b0d
Got cart functionality working
acgillette
committed
5b1b631
fixed something I guess?
acgillette
committed
419ec4a
Added delete individual item functionality
acgillette
committed
f294f0f
Added update functionality to cart
acgillette
committed
3209178
Does not allow user to add duplicate items into cart
acgillette
committed
9609db4
Cart shows subtotal
acgillette
committed
1e70d63
Working on bugs in cart
acgillette
committed
0ae185d
DRYer order_item and order controllers
ssamant
committed
add5ab8
Adding env OAuth stuff
jjjousun
committed
089faa6
Squashed the duplicate bug
acgillette
committed
52deba1
Working on OAuth, almost there
jjjousun
committed
ea9a53d
Bugs squashed
acgillette
committed
3e7286d
Merge branch 'master' of https://github.com/secretsharer/betsy
acgillette
committed
5befa10
setting up omniauth
ssamant
committed
04ac97c
Merge branch 'master' of https://github.com/secretsharer/betsy
ssamant
committed
0e899f8
gem file additions, git ignore additions, so why are you asking me to commit them
secretsharer
committed
f8bf94d
fixed gem file conflict
secretsharer
committed
d74736b
fixed gem file conflict
secretsharer
committed
5977e0d
Catching up on testing
acgillette
committed
316badf
cleaning up orders controller
secretsharer
committed
726c4fa
Stubs for testing
acgillette
committed
442312a
Create orderitem test green
acgillette
committed
552f5dc
WIP setting up session and merchant model to create a user through GitHub
jjjousun
committed
bb2a054
Quantity testing green
acgillette
committed
ae95932
Delete orderitem test green
acgillette
committed
b5fc92b
added session[:order_id] to order creation
ssamant
committed
eb8fdcf
login/logout with authentication
ssamant
committed
77f0365
merge conflict
ssamant
committed
6298c40
Review controller method, show view, migrated column
secretsharer
committed
bd5d962
merge wqhy
acgillette
committed
415a91c
Merge branch 'master' of https://github.com/secretsharer/betsy
acgillette
committed
df790bf
resolved merge conflict in orderitems and sessions controller
ssamant
committed
45c92bd
merge conflict again. you all are dead to me
ssamant
committed
fbe0eed
Got dat reviews werking hollaaaa
acgillette
committed
c0d9839
Fixin dem merge errors
acgillette
committed
97e7bdb
The bug was actually that browser needed to be restarted
jjjousun
committed
6c0f9c6
Merge branch 'master' of https://github.com/secretsharer/betsy
jjjousun
committed
8e911d6
merge conflicts
ssamant
committed
b386ad5
merge conflict in application controller
ssamant
committed
5cbf3b8
Idk rly what i'm committing
acgillette
committed
6f1bce8
Merge branch 'master' of https://github.com/secretsharer/betsy
acgillette
committed
947f073
Did the very important work of adding spoopy emojis to review
acgillette
committed
e7c20d4
fixed weirdo extra migration of raiting with problematic column
secretsharer
committed
54f084e
Merge branch 'master' of https://github.com/secretsharer/betsy
acgillette
committed
5560c16
Unbroke all the tests
acgillette
committed
64e4d5f
Got the gosh darn category showing thingy working man
acgillette
committed
c7db257
custom views for merchants (signed in users) and routes for custom views
ssamant
committed
c1e89d2

Commits on Apr 26, 2017

changed merchant account routes
ssamant
committed
33550fc
added require_login before_action to controllers
ssamant
committed
0879bcc
fixed controller filters for reviews and edited merchant index page
ssamant
committed
4223d21
WIP merchant account products view and fixed controller view to match user for merchant views
ssamant
committed
31f76d9
payments view, form_for, beginnings of payment controller logic.
secretsharer
committed
2af13c0
Merge branch 'master' of https://github.com/secretsharer/betsy
secretsharer
committed
509024b
added new and edit product views; users cannot review their own products; only merchants can see their account info
ssamant
committed
d60308a
fixed merchant match before_action AGAIN
ssamant
committed
d74b1bb
edit product capability
ssamant
committed
72143c3
merge conflict in routes (kept all routes)
ssamant
committed
fd8df24
merging basic payments controller logique
secretsharer
committed
0d2349f
added description and image_url to product form. sorrynotsorry i'm in master
ssamant
committed
86a0e86
Poking around products show page
jjjousun
committed
08c2e48
Merge branch 'master' of https://github.com/secretsharer/betsy
jjjousun
committed
6b74797
Got foundation gem installed
acgillette
committed
8bf27a0
removed extra routes
ssamant
committed
0f6f290
fixed session. merchant can only add a product from their own merchant page
ssamant
committed
2c6cd6a
Trying to figure out the nav bar
acgillette
committed
eb5db25
added categories to product form
ssamant
committed
cdefe62
don't have to be logged in to view cart
ssamant
committed
1a8e5f4
merge conflict and fixed cart controller
ssamant
committed
4457662
Finished mostly the header styling
acgillette
committed
28e9fa6
Fixed merge
acgillette
committed
6b2ea4e
add edit route to merchants_products
ssamant
committed
1843682
Working on styling and some view functionality
acgillette
committed
bc41723
fixed Edit Product link in merchant account product view
ssamant
committed
65beb7a

Commits on Apr 27, 2017

Working on payments, confirmation
jjjousun
committed
d43543d
Fixed merged conflicts
jjjousun
committed
25627a2
product can be edited, including categories
ssamant
committed
c254e02
product can be edited, including categories
ssamant
committed
02fa916
Added product status column to schema
ssamant
committed
dd003c9
payments logic with changes
secretsharer
committed
50c1195
payments logic with changes
secretsharer
committed
939fccc
payment confirmation view
secretsharer
committed
37efda4
merchant account products page is functional and has edit and retire links
ssamant
committed
051e9c5
merge, fixed schema and routes
ssamant
committed
b82789c
Working on styling
acgillette
committed
9c4c203
Merge branch 'master' of https://github.com/secretsharer/betsy
acgillette
committed
76340fa
Added images
acgillette
committed
60dfb67
WIP checking where i'm at compared to master
ssamant
committed
9cb3221
session testing done
ssamant
committed
7100499
Figured out some view logic, doing some more styling
acgillette
committed
ec918ed
Added some more category view stuff
acgillette
committed
8ad3fb4
added comments to code (WIP)
ssamant
committed
89f669f
Still working on making a confirmation page
jjjousun
committed
83df252
Fixing merge conflicts
jjjousun
committed
886c55e
Fixing merge errors
acgillette
committed
a71dd20
Moar merge
acgillette
committed
bc7f21c
Payment Confirmation Page is almost theregit add .! WHOOOOOO
jjjousun
committed
00441f0
fixed routing error for merchant creating new product
ssamant
committed
fefc7be
Added custom data to seed file
secretsharer
committed
ef4f575
Added custom data to seed file
secretsharer
committed
4c71715
doin more stylin doin some squashin
acgillette
committed
a1ca10e
mergin stuffs
acgillette
committed
f55834d
THE PAYMENT CONFIMATION PAGE YAS IT'S HERE YAAAAAS
jjjousun
committed
5ea3126
got seeds to work
acgillette
committed
4fc57d0
fixed route for creating a new product
ssamant
committed
765f409
Merge branch 'master' of https://github.com/secretsharer/betsy
jjjousun
committed
43ef319
Routes needed conflict merge fixing
jjjousun
committed
44834e0
Deleted empty mistake migration
jjjousun
committed
e1a004c
changed products schema to include default image. added default image to assets
ssamant
committed
131405e
merge conflict in schema
ssamant
committed
b8477db
Seed images were accidentally deleted; put them back in
jjjousun
committed
a890b7c
Merge branch 'master' of https://github.com/secretsharer/betsy
jjjousun
committed
9c2caee
product index only returns products that are active
ssamant
committed
0aca994
Merge branch 'master' of https://github.com/secretsharer/betsy
ssamant
committed
4811117
fixed some merchant IDs in seed (so run db:reset). image urls should be back in seed, still--thanks jou-jou :)
ssamant
committed
e82896d

Commits on Apr 28, 2017

Had to take out merchant ids that don't exist in our seed data
jjjousun
committed
721db4d
payment controller has skip_before_action :require_login now
ssamant
committed
765a92f
merge conflict in seeds for one merchant id in products
ssamant
committed
8b119cf
fixed product controller tests and the code that goes with them in the products_controller
ssamant
committed
f7f4681
Bug squashin
acgillette
committed
12869cb
Category tests green
acgillette
committed
b4551c6
fixed some model tests for product
ssamant
committed
58bd6b4
working on product testing and trying to get the retire a product part to work; added skip before action :require login to orderitems; changed paths and actions on product form
ssamant
committed
c739825
added private link to merchant edit form; set display name for merchant to name (instead of username) and assigned a default value to name through the create from github method in the merchant model
ssamant
committed
327bbce
products_controllers tests are mostly done
ssamant
committed
07d1b72
removed unused code from order model, changed validation for order status and added migration to set order status default to pending
ssamant
committed
a297dbf
merge conflct in seeds and merchant; tried to keep HEAD
ssamant
committed
1b5dfac
Minor stlying
acgillette
committed
e5cc7a7
Fixin dem merge
acgillette
committed
5eb9af3
getting rid of dumb routes AGAIN
ssamant
committed
64b85b7
fixed the same error for the 4th time
secretsharer
committed
7d02bc7
There is a ghost in gitgit add .
secretsharer
committed
a53150a
ROUTES AGAIN
ssamant
committed
9a254f2
Merge branch 'master' of https://github.com/secretsharer/betsy
secretsharer
committed
7e52ab9
Changed the test coverage by a whole one percent oh boy
acgillette
committed
ea9299e
Merge branch 'master' of https://github.com/secretsharer/betsy
acgillette
committed
745507b
a mess of changes with tests and some styling
ssamant
committed
cf93ea6
Made a few reviews controller tests
jjjousun
committed
fdc4f58
Merge branch 'master' of https://github.com/secretsharer/betsy
jjjousun
committed
4f6eada
Merge branch 'master' of https://github.com/secretsharer/betsy
acgillette
committed
665bc46
Tests n styling
acgillette
committed
b8ecc4e
pull before heroku push
secretsharer
committed
bf071d9
changes to seed and view
ssamant
committed
2c943f8
fixed stylsheet merge conflict
ssamant
committed
09fd107
fixed category links on product show page
ssamant
committed
3f7934b
changed default image and some other crap
ssamant
committed
da58ffa
yea
acgillette
committed
fde3320
Merge branch 'master' of https://github.com/secretsharer/betsy
acgillette
committed
8b53e63
OHMYGOD A- TEST COVERAGE sorry asian parents I DONT CARE
jjjousun
committed
c36e667
Fixed merge conflicts
jjjousun
committed
5ecc1e4
pulling before final push to heroku
secretsharer
committed
ac4f0c3
Fixed the last thing?
secretsharer
committed
419bf13