Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ampers - Sweetsy (Alex, Aruna and Leti) #24

Open
wants to merge 359 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
359 commits
Select commit Hold shift + click to select a range
ddd28e7
title
brownav Apr 21, 2018
e8add4e
merge fixes
brownav Apr 21, 2018
b559b29
add a new product
aruna79 Apr 21, 2018
a477a44
product controller show page
aruna79 Apr 21, 2018
e0d6c0e
added edit view for order_product
aruna79 Apr 21, 2018
42a9093
merchant show layout
brownav Apr 22, 2018
99c95ff
fixed root error
brownav Apr 22, 2018
fca30ad
added review page
aruna79 Apr 22, 2018
2e4ff27
added params to orderproduct controller
aruna79 Apr 22, 2018
bbd0f40
merge conflict in categories resolved
aruna79 Apr 22, 2018
565a65c
merge conflict on edit view in orderproduct
aruna79 Apr 22, 2018
ccb7f55
fixed some bugs
aruna79 Apr 22, 2018
1340d86
Merge branch 'product_controller' into order_product
aruna79 Apr 22, 2018
2961f77
added methods to orderproduct controlle
aruna79 Apr 22, 2018
a318762
Finished categories_controller tests for methods we have so far.
LetiTran Apr 22, 2018
873c88a
Added method render_404 (not found) in application_controller.
LetiTran Apr 22, 2018
e64b6e2
Added line in catgeories#find_category to call application#render_404…
LetiTran Apr 22, 2018
19ec3e2
merge conflict on orderproduct controller
aruna79 Apr 23, 2018
a0a8d71
merge order_product
aruna79 Apr 23, 2018
0902130
starting merchant controller testing
brownav Apr 23, 2018
d9f7e03
merge conflict
brownav Apr 23, 2018
63e7d93
Merge branch 'category-contr-basic-tests'
LetiTran Apr 23, 2018
ba26047
Merge branch 'master' of https://github.com/LetiTran/betsy into testing
aruna79 Apr 23, 2018
4ac83ad
index and show
brownav Apr 23, 2018
8aaa81c
Added OrderProducts methods
LetiTran Apr 23, 2018
7cff74b
merchant controller methods
brownav Apr 23, 2018
f0dcbc4
Merge branch 'master' of https://github.com/LetiTran/betsy
brownav Apr 23, 2018
ae75acd
Added calling 404 method on every find helper method if element is no…
LetiTran Apr 23, 2018
66186f0
merge resolved in orderproduct
aruna79 Apr 23, 2018
b3fe536
fixed the reviews bug
aruna79 Apr 23, 2018
ebf1c88
resolved merge
aruna79 Apr 23, 2018
e5a5553
resolved merge
aruna79 Apr 23, 2018
7971931
Added OmniAuth
LetiTran Apr 23, 2018
ad06f6b
added products
aruna79 Apr 23, 2018
43d9242
resolved merge conflict in routes
aruna79 Apr 23, 2018
186761a
cleaned routes a bit
brownav Apr 23, 2018
7a039ad
Merge branch 'master' of https://github.com/LetiTran/betsy
brownav Apr 23, 2018
9fbb2b6
Fixed merge conflicts
LetiTran Apr 23, 2018
19f37dc
Fixed merge conflicts
LetiTran Apr 23, 2018
944202a
Fixed model tests and merging conflicts
LetiTran Apr 23, 2018
b0d2e49
merge conflix
brownav Apr 23, 2018
67e19ea
merge fix
brownav Apr 23, 2018
987d3ae
sessions controller tests
brownav Apr 23, 2018
b7ef025
Added some tests for products controller
LetiTran Apr 23, 2018
e3215ed
Fixed Products#create
LetiTran Apr 23, 2018
378f87d
Merge branch 'master' of https://github.com/LetiTran/betsy
LetiTran Apr 23, 2018
f785c54
merchant and sessions controller testing
brownav Apr 23, 2018
d526aa7
Fixed products_controller#edit and create
LetiTran Apr 23, 2018
8dd236a
Finished tests on products controller.
LetiTran Apr 23, 2018
0221ad0
Merge branch 'master' of https://github.com/LetiTran/betsy
LetiTran Apr 23, 2018
fecea01
review controller testing passed
aruna79 Apr 23, 2018
bec56ca
review tests
aruna79 Apr 23, 2018
ca62b6a
Added new file for checkout form with buyer information
LetiTran Apr 23, 2018
0ab9afe
Added path to new order form
LetiTran Apr 23, 2018
cda27c9
Added flash messages
LetiTran Apr 24, 2018
71cd2c6
Added first tests for orders_controller
LetiTran Apr 24, 2018
b1b2643
working on order_products
aruna79 Apr 24, 2018
f0a4122
Order can be created.
LetiTran Apr 24, 2018
3c3d6cc
Merge branch 'order-controller-basic' of https://github.com/LetiTran/…
aruna79 Apr 24, 2018
b833856
Removed order validations for now, will do it in a different way for …
LetiTran Apr 24, 2018
98b47ac
fixed session display
brownav Apr 24, 2018
6d78e22
order has merchant_id
brownav Apr 24, 2018
5059581
Working on Order
LetiTran Apr 24, 2018
c8f1798
Merge branch 'orderproduct' of https://github.com/LetiTran/betsy into…
LetiTran Apr 24, 2018
204aa51
changes
aruna79 Apr 24, 2018
5ba1219
Working on Order and new migration to add order_id to orderproducts
LetiTran Apr 24, 2018
9bf613f
orderprouct stuff
brownav Apr 24, 2018
ba15db3
creates orderproduct, adds order_id, creates order if not found
brownav Apr 24, 2018
978c380
Working on Orders views for merchants, order#index.
LetiTran Apr 24, 2018
4c012f2
submit button text
brownav Apr 24, 2018
926469e
Merge branch 'order-controller-basic'
LetiTran Apr 24, 2018
cb9b327
method in orderproducts to create orderproduct
brownav Apr 24, 2018
a0e85e9
Merge branch 'master' of https://github.com/LetiTran/betsy
brownav Apr 24, 2018
ada7db5
basic table with data
brownav Apr 24, 2018
0684475
op index styling
brownav Apr 24, 2018
d93062a
Added destroy method for canceling a order
LetiTran Apr 24, 2018
8b9f565
Added order#show view
LetiTran Apr 24, 2018
f4ce029
Added destroy method for canceling a order
LetiTran Apr 24, 2018
316a707
Working on order views
LetiTran Apr 24, 2018
3702a79
cart page methods
brownav Apr 24, 2018
58c9c0b
edit quantity
brownav Apr 24, 2018
4e3366d
Working on 'paying an order'
LetiTran Apr 24, 2018
a7b6919
Merge branch 'orders-controller2'
LetiTran Apr 24, 2018
ebdde34
resolved
aruna79 Apr 24, 2018
7a4ef00
Added link in cart to checkout (update the order)
LetiTran Apr 24, 2018
275a804
orders
aruna79 Apr 24, 2018
ca4b883
update product.quantity when added to cart
brownav Apr 24, 2018
ded5af6
orderproducts assigned to correct order
brownav Apr 25, 2018
4157ae9
nav styling, cart error chasing
brownav Apr 25, 2018
24c1d4e
Added condition for products_controller#index and Fixed products_cont…
LetiTran Apr 25, 2018
c5d0e38
Added function of viewing the logged-in user's products for sale
LetiTran Apr 25, 2018
f2a650c
Added view conditional for showing either user products or other-merc…
LetiTran Apr 25, 2018
4492de0
nav fixing
brownav Apr 25, 2018
3f9402c
Added conditional view for logged-in user products x other-merchants …
LetiTran Apr 25, 2018
ecd944a
Fixed functionality of canceleing an order and also now showing only …
LetiTran Apr 25, 2018
84ffab0
Merge branch 'master' into edit_product
aruna79 Apr 25, 2018
fb241ba
chenges
aruna79 Apr 25, 2018
96febdc
added add inventory
aruna79 Apr 25, 2018
a5d7be7
colspan
brownav Apr 25, 2018
ad9786f
Merge branch 'cart'
brownav Apr 25, 2018
cc44bd4
subtotal and total columns for cart
brownav Apr 25, 2018
170e331
working on quantity
aruna79 Apr 25, 2018
faa529b
can add product from prodocut#index
brownav Apr 25, 2018
195cfd9
added total and sub_total
aruna79 Apr 25, 2018
24a6eba
Merge branch 'master' of https://github.com/LetiTran/betsy
aruna79 Apr 25, 2018
7f87246
Working on user welcome/profile
LetiTran Apr 25, 2018
f3f8d66
Merging with new model methods
LetiTran Apr 25, 2018
30bb9ef
added status in products
aruna79 Apr 25, 2018
345f75e
Working on login profile
LetiTran Apr 25, 2018
2467d08
Working on login profile
LetiTran Apr 25, 2018
063ac81
Merge branch 'master' of https://github.com/LetiTran/betsy
aruna79 Apr 25, 2018
64a04d6
price view
brownav Apr 25, 2018
1eca564
merge fix
brownav Apr 25, 2018
12233a1
total price display fix
brownav Apr 25, 2018
f3f0229
edit orderproduct quantity
brownav Apr 25, 2018
a187e3b
added retire status method
aruna79 Apr 25, 2018
182b945
added find active method in product controller
aruna79 Apr 25, 2018
321c9b5
retired products are not showing up
aruna79 Apr 25, 2018
a23ab9b
Merge branch 'master' of https://github.com/LetiTran/betsy
aruna79 Apr 25, 2018
077094a
Created route for user profile and user products, also working on the…
LetiTran Apr 25, 2018
8e25fea
Merged with new version of products with status
LetiTran Apr 25, 2018
58c0f01
dropdown
brownav Apr 25, 2018
4394109
merge fix
brownav Apr 25, 2018
1e9d669
merge fix
brownav Apr 26, 2018
1bd3f42
view
brownav Apr 26, 2018
3e0b56e
fixed op quantity subtotal
aruna79 Apr 26, 2018
ff4bf50
quantity updated in cart
aruna79 Apr 26, 2018
6824e15
styling
brownav Apr 26, 2018
38207b0
pricing view
brownav Apr 26, 2018
9fbbd29
product page, reviews need more work
brownav Apr 26, 2018
359172f
product quantity gets updated
aruna79 Apr 26, 2018
04165a8
root styling
brownav Apr 26, 2018
6c81f96
Merge branch 'master' of https://github.com/LetiTran/betsy
brownav Apr 26, 2018
fc3e323
fixing css
brownav Apr 26, 2018
06d0c45
added migration for photo attribute
aruna79 Apr 26, 2018
61a5461
product show
brownav Apr 26, 2018
33404e1
fix merge
brownav Apr 26, 2018
763e843
products and images
brownav Apr 26, 2018
6ee7bfe
images added
brownav Apr 26, 2018
3196e31
added link to merchants add acart
aruna79 Apr 26, 2018
eb55444
added seeds file
aruna79 Apr 26, 2018
1ac5571
resolved merge conflict
aruna79 Apr 26, 2018
6261f07
Fixed reviews display method, added revenue page, 'my products' showi…
LetiTran Apr 26, 2018
b314793
Merging
LetiTran Apr 26, 2018
18d5f65
working on seed file
aruna79 Apr 26, 2018
020839f
blah
brownav Apr 26, 2018
5ceb537
Merge branch 'master' of https://github.com/LetiTran/betsy
brownav Apr 26, 2018
d414f1b
Fixed how the seed.rb was reding the csv file, creating a random cate…
LetiTran Apr 26, 2018
2cfb6b3
seeds
brownav Apr 26, 2018
ab6e0e0
changed seeds file
aruna79 Apr 26, 2018
02e0509
merge
brownav Apr 26, 2018
9e78f49
Linked each product to a merchant on seeds file.
LetiTran Apr 26, 2018
9bce9d7
Removed option of retiring a product from the user_products view, it …
LetiTran Apr 26, 2018
b040671
checking for updated stock after the user edits the quantity
aruna79 Apr 26, 2018
8a02525
Fixed orderproducts_controller#add_inventory method enable the clearc…
LetiTran Apr 26, 2018
c172708
Changed a variable name in orderproducts
LetiTran Apr 26, 2018
58f5225
Added Order model conditional validation for the checkout form.
LetiTran Apr 27, 2018
9e4c4ea
working on categories show and index
aruna79 Apr 27, 2018
8422183
Merge branch 'master' of https://github.com/LetiTran/betsy
aruna79 Apr 27, 2018
1c20ea9
Changed 'create category' button from add product to category index a…
LetiTran Apr 27, 2018
b3cb0df
Merging
LetiTran Apr 27, 2018
11fbd93
products fixing
brownav Apr 27, 2018
6950346
views
brownav Apr 27, 2018
afb4562
Updated some of the test's fixtures
LetiTran Apr 27, 2018
333b6d2
h1 and products styling
brownav Apr 27, 2018
b48df67
tried some styling on categories
aruna79 Apr 27, 2018
cac935a
resolved merge in categories
aruna79 Apr 27, 2018
41065f0
show page pic and details
brownav Apr 27, 2018
4b7575b
product show
brownav Apr 27, 2018
9dc5ba8
Merge branch 'master' of https://github.com/LetiTran/betsy
brownav Apr 27, 2018
08117e7
updated review controller tests
aruna79 Apr 27, 2018
1fe6a7e
added some tests to categories controller tests
aruna79 Apr 27, 2018
a973b4a
reviews and category controller tests passing
aruna79 Apr 27, 2018
38bf320
Fixed typo
LetiTran Apr 27, 2018
dc965b8
Finished product model testing
LetiTran Apr 27, 2018
aef228a
working on order model.
LetiTran Apr 27, 2018
890501d
categories styling
brownav Apr 27, 2018
006d5c3
Added class for checkout form section
LetiTran Apr 27, 2018
8ed9ce1
commented out the conditional validation, seems to be affecting the c…
LetiTran Apr 27, 2018
434b792
Added padding for checkout form
LetiTran Apr 27, 2018
574df06
few session controller tests added
aruna79 Apr 27, 2018
a78de6a
Finished testing on Order model (need to check for the conditional va…
LetiTran Apr 27, 2018
ed767a3
Merge branch 'master' of https://github.com/LetiTran/betsy
LetiTran Apr 27, 2018
14cb4e2
Changed Order testing
LetiTran Apr 27, 2018
c6c4ac0
updated validations in order model
aruna79 Apr 27, 2018
ff82507
merge conflict resolved
aruna79 Apr 27, 2018
88bd5f5
validations in order is working
aruna79 Apr 27, 2018
e0232dc
cart view
brownav Apr 27, 2018
76853c2
Merge branch 'master' of https://github.com/LetiTran/betsy
aruna79 Apr 27, 2018
c99cb3a
Added total per item method in ordel model and changed its view.
LetiTran Apr 27, 2018
6736dc8
merging
LetiTran Apr 27, 2018
095e134
title style
brownav Apr 27, 2018
9021d14
Merge branch 'master' of https://github.com/LetiTran/betsy
brownav Apr 27, 2018
b4df6f3
Fix migrations or something
aruna79 Apr 27, 2018
441b79b
title
brownav Apr 27, 2018
fa1e661
Updated flash messages and styled it.
LetiTran Apr 27, 2018
fae0290
Merge branch 'master' of https://github.com/LetiTran/betsy
LetiTran Apr 27, 2018
a85e843
Removed duplicated migration
LetiTran Apr 27, 2018
6988a18
Merge branch 'master' of https://git.heroku.com/ala-yummly
aruna79 Apr 27, 2018
c5b6079
simplecov?
brownav Apr 27, 2018
f4f0bcd
Merge branch 'master' of https://github.com/LetiTran/betsy
brownav Apr 27, 2018
dd0ad12
spacing
brownav Apr 27, 2018
d909229
Changed the 'add product' button on index to only show if there is st…
LetiTran Apr 27, 2018
daa1b0f
Merged
LetiTran Apr 27, 2018
d9b849c
Merge branch 'master' of https://github.com/LetiTran/betsy
aruna79 Apr 27, 2018
58bad0e
Removed cart button if not logged in.
LetiTran Apr 27, 2018
924f8cb
Merge branch 'master' of https://github.com/LetiTran/betsy
LetiTran Apr 27, 2018
23a7cb6
Changed order#index to only show the order tables if there are orders…
LetiTran Apr 27, 2018
150bd74
updated test_helper.rb
aruna79 Apr 27, 2018
c80d125
Added button to continue shopping if user has no orders.
LetiTran Apr 27, 2018
dd1624d
resolved merge conflict in coverage files
aruna79 Apr 27, 2018
3722c8b
Merge branch 'master' of https://github.com/LetiTran/betsy
aruna79 Apr 27, 2018
e4fa523
Fixed issue with picture for new product and added a image for all pr…
LetiTran Apr 27, 2018
2a2b222
Added generic profile pic for merchants and added it with link to eac…
LetiTran Apr 27, 2018
6d70f71
tests
brownav Apr 27, 2018
d62f147
Fixed pict problem in root
LetiTran Apr 27, 2018
7fc9304
tests
brownav Apr 27, 2018
64dd6d4
Merge branch 'master' of https://github.com/LetiTran/betsy
brownav Apr 27, 2018
0baa601
Fixed photo in categories#show
LetiTran Apr 27, 2018
53da9cb
product controller tests all passing
aruna79 Apr 27, 2018
4c47d27
merchant model tests
brownav Apr 27, 2018
f5ffd91
products controller testing all passing - needs more tests
LetiTran Apr 27, 2018
3e3227e
orders controller testing all passing - needs more tests
LetiTran Apr 27, 2018
73bf0e3
Work in progress, needed to merge
LetiTran Apr 27, 2018
6213490
Merge branch 'master' of https://github.com/LetiTran/betsy
aruna79 Apr 27, 2018
b00ff46
Removing coverage file from github and adding it to git igonre
LetiTran Apr 27, 2018
14295cd
added coverage directory in .gitignore
aruna79 Apr 27, 2018
e29acee
merge confict in controller test resolved
aruna79 Apr 27, 2018
d037bce
merchant create
brownav Apr 27, 2018
8a9b645
coverage
brownav Apr 27, 2018
ef6e260
another try
brownav Apr 27, 2018
e28d349
added end
brownav Apr 27, 2018
f1fad28
Deleted unecessary lines in css
LetiTran Apr 27, 2018
0696474
product validation status
brownav Apr 27, 2018
e35415d
photo
brownav Apr 27, 2018
6875494
Fix order view error.
LetiTran Apr 27, 2018
b7e0d86
Merge branch 'master' of https://github.com/LetiTran/betsy
LetiTran Apr 27, 2018
0e8af2a
Fix order view error2.
LetiTran Apr 27, 2018
150a9f2
small fix
brownav Apr 27, 2018
3129e0e
Merge branch 'master' of https://github.com/LetiTran/betsy
brownav Apr 27, 2018
7817d92
Order index was giving error
LetiTran Apr 27, 2018
b551894
Migration to delete a unecessary colum in orders model
LetiTran Apr 27, 2018
e4e2453
Working on tests.
LetiTran Apr 28, 2018
6f8fd5f
Merge branch 'master' of https://github.com/LetiTran/betsy
brownav Apr 28, 2018
c82e356
more testing
brownav Apr 28, 2018
5b7f156
more testing
brownav Apr 28, 2018
f8e680f
modernized colors a bit
brownav Apr 29, 2018
a829a15
more styling for cleaner look / buttons hover / removed box borders
brownav Apr 29, 2018
4e5f621
added button on edit review page
brownav Apr 29, 2018
f3f063e
fixed orderproduct#edit quantity dropdown options
brownav Apr 29, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixed op quantity subtotal
aruna79 committed Apr 26, 2018
commit 3e0b56e49a6a7d8d40e26a471dfa5165dda05dd7
4 changes: 2 additions & 2 deletions app/views/orderproducts/index.html.erb
Original file line number Diff line number Diff line change
@@ -28,13 +28,13 @@
<%= product.name %><br />
</td>
<td>
<%= product.quantity %>
<%= op.quantity %>
</td>
<td>
<%= format_price(product.price) %>
</td>
<td>
<%= format_price(product.quantity * product.price) %>
<%= format_price(op.quantity * product.price) %>
</td>
<td>
<%= link_to "Edit", edit_orderproduct_path(op.id) %>