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.

Sign up for GitHub

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

Jump to bottom

SRW/Vendor create,edit and delete #33

Open
wants to merge 49 commits into
base: master
Choose a base branch
from
Open

SRW/Vendor create,edit and delete #33

wants to merge 49 commits into from

Conversation

wilsab30
Copy link

@wilsab30 wilsab30 commented Oct 6, 2016

No description provided.

Trishthedish and others added 30 commits October 4, 2016 15:37
@Trishthedish
Created a new rails app within forked FarMarRails. Added ERD to assets.
0662314
@Trishthedish
Added a corrected diagram pdf to our assets folder. Also commented ou…
9363db4 
…t a planfor pulling in CSV
@Trishthedish
Created Market model
763a7a8
@Trishthedish
Created vendor model
f0dd8f9
@Trishthedish
Created sales model
a1e340c
@Trishthedish
Created model for product
b7b60b6
@Trishthedish
created Market controller
7166e6d
@Trishthedish
Created vendor controller
a8b967d
@Trishthedish
Created sales controller
ba169b1
@Trishthedish
Created products controller
3b588f0
@Trishthedish
Created seeded data for markets boom
6844f42
@Trishthedish
Seeded vendor data woo
33e1595
@Trishthedish
Created seed data for sales
df52145
@Trishthedish
markets/index is showing all markets. Sans formating. Also, having a …
863a3b9 
…weird tmp file pop up. I might need help deleting it or figuring out what to do with it.
@wilsab30
Removed tmp files and .sqlite3
e4951f0
@wilsab30
Added list of things to ignore
ac16f32
@Trishthedish
Added gem better_errors and binding_of_caller gems to file. Working o…
84ac4bd 
…n Show method.
@Trishthedish
A better foramted view. Unable to get my show html to render more det…
b84a4bd 
…ails.
@Trishthedish
minimal changes made to notes
4515421
@Trishthedish
Merge pull request #3 from Trishthedish/marketdetails
f970df4 
Marketdetails
@Qlwentt
fix purchase time to datetime and add market show page
7a18bde
@Qlwentt
Merge pull request #4 from Trishthedish/qlw/changes
2e08d25 
fix purchase time to datetime and add market show page
@wilsab30
Added route resources
69df403
@wilsab30
Merge pull request #2 from Trishthedish/SRW/VendorSalesList
5df49a5 
Added route resources
@Trishthedish
Added back in Market index logic and working on getting all markets t…
ef74511 
…o render on page.
@Qlwentt
readd functionality to see a market's vendors
359b982
@Trishthedish
Continue working on markets view all
84318fe
@Trishthedish
Finished functionality of market#index page.
3018447
@Trishthedish
Merge pull request #5 from Trishthedish/qlw/changes
f34d9ea 
readd functionality to see a market's vendors
@wilsab30
Added total vendor sales to show method
14c05d2
Trishthedish and others added 19 commits October 5, 2016 14:38
@Trishthedish
Fixed conflict, and changed.
03d9e94
@wilsab30
Resolved conflict in vendor.rb- no change needed
c429b89
@Qlwentt
Merge pull request #6 from Trishthedish/marketdetails
037cef8 
Marketdetails
@Qlwentt
Merge pull request #7 from Trishthedish/SRW/VendorSalesList
a24790f 
Srw/vendor sales list
@Trishthedish
Created user controller for the main page
b7a7c58
@wilsab30
Merge branch 'master' into SRW/VendorSalesList
a013b9e 
 the commit.
@wilsab30
Merge branch 'master' into SRW/VendorSalesList
76a8755
@Trishthedish
Created user routes index thing
ac03491
@Trishthedish
Working on main page links for Markets Vendors, and eventually guest.…
4e4fc0a 
… Not finished.
@Trishthedish
Fixed conflict and merging changes. Also re-routed root page to user …
fb8f4fb 
…index.
@Trishthedish
working on main index page
9e5d50a
@wilsab30
Added vendor list of products
f047438
@Qlwentt
add ability to create or edit a market
edd6781
@wilsab30
Added list of sales amount and item purchased.
4eecc2c
@Qlwentt
Merge pull request #9 from Trishthedish/SRW/VendorSalesList
ed9cb44 
Srw/vendor sales list
@Trishthedish
Merge pull request #8 from Trishthedish/qlw/create_market
2f733fb 
add ability to create or edit a market
@Trishthedish
Merge branch 'master' into user_main
ae28f48
@Qlwentt
Merge pull request #11 from Trishthedish/user_main
58f6d90 
User main
@wilsab30
Added create, edit and delete of vendor
31a94b3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Parens
Projects
None yet
Milestone
No milestone
4 participants
@wilsab30 @droberts-sea @Trishthedish @Qlwentt