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

Qlw/vendor view month sales #39

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

Qlw/vendor view month sales #39

wants to merge 84 commits into from

Conversation

Qlwentt
Copy link

@Qlwentt Qlwentt commented Oct 7, 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
wilsab30 and others added 29 commits October 6, 2016 16:31
@wilsab30
Merge pull request #14 from Trishthedish/markets_vendor_crud
6812105 
Markets vendor crud
@Trishthedish
made a few notes based on convo with jamie.
717dd86
@Trishthedish
Merge branch 'master' into markets_vendor_crud
fac7844
@Qlwentt
Merge pull request #13 from Trishthedish/Vendorcreate
11a970b 
SRW/Vendor create,edit and delete
@Trishthedish
Merge branch 'master' into markets_vendor_crud
a84ad30
@Qlwentt
kept button for quai and rest for sabrina
430f2e0
@Trishthedish
Merge pull request #12 from Trishthedish/qlw/vendor_create_sale
cf76501 
add ability to create a sale associated with a product
@Qlwentt
include add sale in unordered list of buttons
f1498d2
@Trishthedish
Added functionality to delete button, that uses confirm helper method…
b64b7e6 
…. So when market user attemps to delete something it asks them to confirm this choice.
@Qlwentt
add drop down for month and year for sales_by_month functionality; ro…
dd51a42 
…ute to new page (not much on it yet)
@Qlwentt
update Gemfile for Heroku
7a87139
@Qlwentt
add updated lock file
77b566f
@Qlwentt
change csv in require from uppercase to lowercase
202cd34
@Qlwentt
remove pre-defined IDs from seeding
b56dca5
@wilsab30
Merge pull request #15 from Trishthedish/markets_vendor_crud
64f3abf 
Markets vendor crud
@Qlwentt
Merge pull request #16 from Trishthedish/qlw/vendor_create_sale
38ad88e 
include add sale in unordered list of buttons
@Qlwentt
"merge it"
f0964c1 
Merge branch 'master' into qlw/vendor_view_month_sales
@Qlwentt
add functionality to see sales for a vendor for a particularmonth
130f4e1
@wilsab30
Added images, navigation, font.
fd8eeed
@Qlwentt
Merge pull request #18 from Trishthedish/SiteCSS
a2b4c01 
SRW/Added images, navigation, font.
@Qlwentt
didn't do anything but need to pull from master
448149c
@wilsab30
Merge pull request #17 from Trishthedish/qlw/vendor_view_month_sales
a7a49ed 
Qlw/vendor view month sales
@Qlwentt
to merge
9ca03a8
@Qlwentt
tryna merge
708eda1 
Merge branch 'master' into qlw/vendor_view_month_sales
@Qlwentt
mergin again
c7e5de6 
Merge branch 'master' into qlw/vendor_view_month_sales
@Qlwentt
change date query to be compatible with both sqlite and postgres
e28022c
@Qlwentt
fix merge conflict
3eab7c7
@Qlwentt
add functionality to see total of all sales for a specific month; add…
a105415 
… Money gem and fixnum extension to display amount in real dollars
@Qlwentt
use .to_money method to format cents amount to dollar amount in vendo…
ecfaef0 
…r show page
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
Development

Successfully merging this pull request may close these issues.
4 participants
@Qlwentt @droberts-sea @Trishthedish @wilsab30