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

Qlw/vendor view month sales #39

Open
wants to merge 84 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
0662314
Created a new rails app within forked FarMarRails. Added ERD to assets.
Trishthedish Oct 4, 2016
9363db4
Added a corrected diagram pdf to our assets folder. Also commented ou…
Trishthedish Oct 4, 2016
763a7a8
Created Market model
Trishthedish Oct 4, 2016
f0dd8f9
Created vendor model
Trishthedish Oct 4, 2016
a1e340c
Created sales model
Trishthedish Oct 4, 2016
b7b60b6
Created model for product
Trishthedish Oct 4, 2016
7166e6d
created Market controller
Trishthedish Oct 4, 2016
a8b967d
Created vendor controller
Trishthedish Oct 4, 2016
ba169b1
Created sales controller
Trishthedish Oct 4, 2016
3b588f0
Created products controller
Trishthedish Oct 4, 2016
6844f42
Created seeded data for markets boom
Trishthedish Oct 4, 2016
33e1595
Seeded vendor data woo
Trishthedish Oct 4, 2016
df52145
Created seed data for sales
Trishthedish Oct 5, 2016
863a3b9
markets/index is showing all markets. Sans formating. Also, having a …
Trishthedish Oct 5, 2016
e4951f0
Removed tmp files and .sqlite3
wilsab30 Oct 5, 2016
ac16f32
Added list of things to ignore
wilsab30 Oct 5, 2016
84ac4bd
Added gem better_errors and binding_of_caller gems to file. Working o…
Trishthedish Oct 5, 2016
b84a4bd
A better foramted view. Unable to get my show html to render more det…
Trishthedish Oct 5, 2016
4515421
minimal changes made to notes
Trishthedish Oct 5, 2016
f970df4
Merge pull request #3 from Trishthedish/marketdetails
Trishthedish Oct 5, 2016
7a18bde
fix purchase time to datetime and add market show page
Qlwentt Oct 5, 2016
2e08d25
Merge pull request #4 from Trishthedish/qlw/changes
Qlwentt Oct 5, 2016
69df403
Added route resources
wilsab30 Oct 5, 2016
5df49a5
Merge pull request #2 from Trishthedish/SRW/VendorSalesList
wilsab30 Oct 5, 2016
ef74511
Added back in Market index logic and working on getting all markets t…
Trishthedish Oct 5, 2016
359b982
readd functionality to see a market's vendors
Qlwentt Oct 5, 2016
84318fe
Continue working on markets view all
Trishthedish Oct 5, 2016
3018447
Finished functionality of market#index page.
Trishthedish Oct 5, 2016
f34d9ea
Merge pull request #5 from Trishthedish/qlw/changes
Trishthedish Oct 5, 2016
14c05d2
Added total vendor sales to show method
wilsab30 Oct 5, 2016
03d9e94
Fixed conflict, and changed.
Trishthedish Oct 5, 2016
c429b89
Resolved conflict in vendor.rb- no change needed
wilsab30 Oct 5, 2016
037cef8
Merge pull request #6 from Trishthedish/marketdetails
Qlwentt Oct 5, 2016
a24790f
Merge pull request #7 from Trishthedish/SRW/VendorSalesList
Qlwentt Oct 5, 2016
b7a7c58
Created user controller for the main page
Trishthedish Oct 5, 2016
a013b9e
Merge branch 'master' into SRW/VendorSalesList
wilsab30 Oct 5, 2016
76a8755
Merge branch 'master' into SRW/VendorSalesList
wilsab30 Oct 5, 2016
ac03491
Created user routes index thing
Trishthedish Oct 5, 2016
4e4fc0a
Working on main page links for Markets Vendors, and eventually guest.…
Trishthedish Oct 5, 2016
fb8f4fb
Fixed conflict and merging changes. Also re-routed root page to user …
Trishthedish Oct 5, 2016
9e5d50a
working on main index page
Trishthedish Oct 6, 2016
f047438
Added vendor list of products
wilsab30 Oct 6, 2016
edd6781
add ability to create or edit a market
Qlwentt Oct 6, 2016
4eecc2c
Added list of sales amount and item purchased.
wilsab30 Oct 6, 2016
ed9cb44
Merge pull request #9 from Trishthedish/SRW/VendorSalesList
Qlwentt Oct 6, 2016
2f733fb
Merge pull request #8 from Trishthedish/qlw/create_market
Trishthedish Oct 6, 2016
ae28f48
Merge branch 'master' into user_main
Trishthedish Oct 6, 2016
58f6d90
Merge pull request #11 from Trishthedish/user_main
Qlwentt Oct 6, 2016
aee2911
Created validations for creating a new market so I dont save commas. …
Trishthedish Oct 6, 2016
588726b
Added ability to edit vendors in the market show page.Now beautifuly …
Trishthedish Oct 6, 2016
ae7425f
Finally got the full functionality of the edit button to update a ven…
Trishthedish Oct 6, 2016
0023662
add ability to create a sale associated with a product
Qlwentt Oct 6, 2016
bb71179
Delete vendor button is workinggit add . Should we also place a delet…
Trishthedish Oct 6, 2016
5170b4b
Now I've officially fixed & finlized functionality of both edit and d…
Trishthedish Oct 6, 2016
31a94b3
Added create, edit and delete of vendor
wilsab30 Oct 6, 2016
6812105
Merge pull request #14 from Trishthedish/markets_vendor_crud
wilsab30 Oct 6, 2016
717dd86
made a few notes based on convo with jamie.
Trishthedish Oct 6, 2016
fac7844
Merge branch 'master' into markets_vendor_crud
Trishthedish Oct 6, 2016
11a970b
Merge pull request #13 from Trishthedish/Vendorcreate
Qlwentt Oct 6, 2016
a84ad30
Merge branch 'master' into markets_vendor_crud
Trishthedish Oct 6, 2016
430f2e0
kept button for quai and rest for sabrina
Qlwentt Oct 6, 2016
cf76501
Merge pull request #12 from Trishthedish/qlw/vendor_create_sale
Trishthedish Oct 6, 2016
f1498d2
include add sale in unordered list of buttons
Qlwentt Oct 7, 2016
b64b7e6
Added functionality to delete button, that uses confirm helper method…
Trishthedish Oct 7, 2016
dd51a42
add drop down for month and year for sales_by_month functionality; ro…
Qlwentt Oct 7, 2016
7a87139
update Gemfile for Heroku
Qlwentt Oct 7, 2016
77b566f
add updated lock file
Qlwentt Oct 7, 2016
202cd34
change csv in require from uppercase to lowercase
Qlwentt Oct 7, 2016
b56dca5
remove pre-defined IDs from seeding
Qlwentt Oct 7, 2016
64f3abf
Merge pull request #15 from Trishthedish/markets_vendor_crud
wilsab30 Oct 7, 2016
38ad88e
Merge pull request #16 from Trishthedish/qlw/vendor_create_sale
Qlwentt Oct 7, 2016
f0964c1
"merge it"
Qlwentt Oct 7, 2016
130f4e1
add functionality to see sales for a vendor for a particularmonth
Qlwentt Oct 7, 2016
fd8eeed
Added images, navigation, font.
wilsab30 Oct 7, 2016
a2b4c01
Merge pull request #18 from Trishthedish/SiteCSS
Qlwentt Oct 7, 2016
448149c
didn't do anything but need to pull from master
Qlwentt Oct 7, 2016
a7a49ed
Merge pull request #17 from Trishthedish/qlw/vendor_view_month_sales
wilsab30 Oct 7, 2016
9ca03a8
to merge
Qlwentt Oct 7, 2016
708eda1
tryna merge
Qlwentt Oct 7, 2016
c7e5de6
mergin again
Qlwentt Oct 7, 2016
e28022c
change date query to be compatible with both sqlite and postgres
Qlwentt Oct 7, 2016
3eab7c7
fix merge conflict
Qlwentt Oct 8, 2016
a105415
add functionality to see total of all sales for a specific month; add…
Qlwentt Oct 8, 2016
ecfaef0
use .to_money method to format cents amount to dollar amount in vendo…
Qlwentt Oct 8, 2016
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
44 changes: 44 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,45 @@
.DS_Store
*.rbc
capybara-*.html
.rspec
/log
/tmp
/db/*.sqlite3
/db/*.sqlite3-journal
/public/system
/coverage/
/spec/tmp
**.orig
rerun.txt
pickle-email-*.html

# TODO Comment out this rule if you are OK with secrets being uploaded to the repo
config/initializers/secret_token.rb

# Only include if you have production secrets in this file, which is no longer a Rails default
# config/secrets.yml

# dotenv
# TODO Comment out this rule if environment variables can be committed
.env

## Environment normalization:
/.bundle
/vendor/bundle

# these should all be checked in to normalize the environment:
# Gemfile.lock, .ruby-version, .ruby-gemset

# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
.rvmrc

# if using bower-rails ignore default bower_components path bower.json files
/vendor/assets/bower_components
*.bowerrc
bower.json

# Ignore pow environment settings
.powenv

# Ignore Byebug command history file.
.byebug_history
57 changes: 57 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
source 'https://rubygems.org'


# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.2.7'

# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
# Use CoffeeScript for .coffee assets and views
gem 'coffee-rails', '~> 4.1.0'
# See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby

# Use jquery as the JavaScript library
gem 'jquery-rails'
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
gem 'turbolinks'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.0'
# bundle exec rake doc:rails generates the API under doc/api.
gem 'sdoc', '~> 0.4.0', group: :doc

gem 'pg', group: :production

gem 'rails_12factor', group: :production

gem 'money'

# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'

# Use Unicorn as the app server
# gem 'unicorn'

# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug'

end

group :development do
# Access an IRB console on exception pages or by using <%= console %> in views
gem 'web-console', '~> 2.0'

# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
#added these gems ala Jamie's previous suggestion.
gem 'better_errors'
gem 'binding_of_caller'
# Use sqlite3 as the database for Active Record
gem 'sqlite3'
end
182 changes: 182 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,182 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.2.7)
actionpack (= 4.2.7)
actionview (= 4.2.7)
activejob (= 4.2.7)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.7)
actionview (= 4.2.7)
activesupport (= 4.2.7)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.7)
activesupport (= 4.2.7)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
activejob (4.2.7)
activesupport (= 4.2.7)
globalid (>= 0.3.0)
activemodel (4.2.7)
activesupport (= 4.2.7)
builder (~> 3.1)
activerecord (4.2.7)
activemodel (= 4.2.7)
activesupport (= 4.2.7)
arel (~> 6.0)
activesupport (4.2.7)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
arel (6.0.3)
better_errors (2.1.1)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
rack (>= 0.9.0)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
builder (3.2.2)
byebug (9.0.6)
coderay (1.1.1)
coffee-rails (4.1.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.1.x)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.10.0)
concurrent-ruby (1.0.2)
debug_inspector (0.0.2)
erubis (2.7.0)
execjs (2.7.0)
globalid (0.3.7)
activesupport (>= 4.1.0)
i18n (0.7.0)
jbuilder (2.6.0)
activesupport (>= 3.0.0, < 5.1)
multi_json (~> 1.2)
jquery-rails (4.2.1)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (1.8.3)
loofah (2.0.3)
nokogiri (>= 1.5.9)
mail (2.6.4)
mime-types (>= 1.16, < 4)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_portile2 (2.1.0)
minitest (5.9.1)
money (6.7.1)
i18n (>= 0.6.4, <= 0.7.0)
sixarm_ruby_unaccent (>= 1.1.1, < 2)
multi_json (1.12.1)
nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0)
pg (0.19.0)
rack (1.6.4)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.7)
actionmailer (= 4.2.7)
actionpack (= 4.2.7)
actionview (= 4.2.7)
activejob (= 4.2.7)
activemodel (= 4.2.7)
activerecord (= 4.2.7)
activesupport (= 4.2.7)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.7)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.7)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.5)
railties (4.2.7)
actionpack (= 4.2.7)
activesupport (= 4.2.7)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (11.3.0)
rdoc (4.2.2)
json (~> 1.4)
sass (3.4.22)
sass-rails (5.0.6)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
sdoc (0.4.1)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
sixarm_ruby_unaccent (1.1.1)
spring (2.0.0)
activesupport (>= 4.2)
sprockets (3.7.0)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.0)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sqlite3 (1.3.11)
thor (0.19.1)
thread_safe (0.3.5)
tilt (2.0.5)
turbolinks (5.0.1)
turbolinks-source (~> 5)
turbolinks-source (5.0.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (3.0.2)
execjs (>= 0.3.0, < 3)
web-console (2.3.0)
activemodel (>= 4.0)
binding_of_caller (>= 0.7.2)
railties (>= 4.0)
sprockets-rails (>= 2.0, < 4.0)

PLATFORMS
ruby

DEPENDENCIES
better_errors
binding_of_caller
byebug
coffee-rails (~> 4.1.0)
jbuilder (~> 2.0)
jquery-rails
money
pg
rails (= 4.2.7)
rails_12factor
sass-rails (~> 5.0)
sdoc (~> 0.4.0)
spring
sqlite3
turbolinks
uglifier (>= 1.3.0)
web-console (~> 2.0)

BUNDLED WITH
1.13.1
28 changes: 28 additions & 0 deletions README.rdoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
== README

This README would normally document whatever steps are necessary to get the
application up and running.

Things you may want to cover:

* Ruby version

* System dependencies

* Configuration

* Database creation

* Database initialization

* How to run the test suite

* Services (job queues, cache servers, search engines, etc.)

* Deployment instructions

* ...


Please feel free to use a different markup language if you do not plan to run
<tt>rake doc:app</tt>.
6 changes: 6 additions & 0 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Add your own tasks in files placed in lib/tasks ending in .rake,
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.

require File.expand_path('../config/application', __FILE__)

Rails.application.load_tasks
Binary file added app/assets/farmar_rails_erd.pdf
Binary file not shown.
Loading