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

Shoppersellertoggle #11

Open
wants to merge 70 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
88373f9
adding angular
mattathompson Sep 22, 2014
2d29257
Adding columns to User ROLE ADMIN
mattathompson Sep 22, 2014
6d2cba9
creating item & invoice models
mattathompson Sep 22, 2014
1ac8d7c
Merge pull request #1 from danarch/migration_and_bundler
danarch Sep 22, 2014
1fb06f0
need work on joined invoices and items
khinlatt Sep 22, 2014
77b0161
passing items and invoices spec
khinlatt Sep 22, 2014
e7198f4
created cart version 1
khinlatt Sep 22, 2014
a3a0e20
Merge pull request #2 from danarch/InvoicesItems
danarch Sep 22, 2014
26b1f51
Finishing up the current specs
mattathompson Sep 23, 2014
3c4f8ca
Merge pull request #3 from danarch/finishing_tests
danarch Sep 23, 2014
68f1991
adding controller routes for items
mattathompson Sep 23, 2014
01380c9
some basic auth with cancancan about creating editing and destroying …
mattathompson Sep 23, 2014
c696b50
refactor database with cart as ActiveRecord::Base
danarch Sep 24, 2014
e7fc6e7
working full text pg-search
khinlatt Sep 24, 2014
92361ec
added some mailer and sidekiq
danarch Sep 24, 2014
bebe46a
Merge pull request #5 from danarch/cancancan_2
danarch Sep 24, 2014
75a16e4
resolve merge conflicts fro stripe branch"
danarch Sep 24, 2014
8edab9b
Merge pull request #6 from danarch/stripe
mattathompson Sep 24, 2014
f668a25
changing merge conflicts
khinlatt Sep 24, 2014
3b55423
working pg_search and faker to populate
khinlatt Sep 24, 2014
25b9364
get cart activerecord model passing specs
danarch Sep 24, 2014
3aa4481
Merge pull request #8 from danarch/stripe
mattathompson Sep 24, 2014
732afe2
commit gemlock
mattathompson Sep 24, 2014
0bce005
Fixed merge conflicts
mattathompson Sep 24, 2014
b9d3e71
add shopping cart
khinlatt Sep 24, 2014
6645a87
stupid gemfile.lock
khinlatt Sep 24, 2014
67d9c3c
Merge branch 'master' of https://github.com/danarch/iron-shop
khinlatt Sep 24, 2014
586db54
remove binding of pry and require sidekiq web for the mo
danarch Sep 24, 2014
14d3260
merged after new cart table
khinlatt Sep 24, 2014
687ac76
specs working after adding carts table
khinlatt Sep 24, 2014
b6c3737
Merge pull request #7 from danarch/ElasticSearch
mattathompson Sep 24, 2014
1cff33b
Remove Tire
mattathompson Sep 24, 2014
31ce657
removed tire
khinlatt Sep 24, 2014
2b71449
finally a merged master that works
mattathompson Sep 24, 2014
4a673ff
remove elasticsearch and tire
danarch Sep 24, 2014
5daccaf
merge master to stripe branch
danarch Sep 24, 2014
c0e3f32
begin stripe integration with javascript button and gem
danarch Sep 24, 2014
1b533e5
Stripe specs passing
danarch Sep 25, 2014
4967bfd
background mailer working; just call send_receipt method
khinlatt Sep 25, 2014
5b949dc
Working views that allow users to add items to carts
mattathompson Sep 25, 2014
d94fb1c
Merge pull request #9 from danarch/cart_items
mattathompson Sep 25, 2014
5dde4b7
merge master into working stripe feature
danarch Sep 25, 2014
8da87ba
Set up Devise background mailer
khinlatt Sep 25, 2014
46f2955
Merge pull request #12 from danarch/cart_items
danarch Sep 25, 2014
4f71ebe
Merge branch 'master' into stripe
danarch Sep 25, 2014
7465ebb
Merge branch 'master' of https://github.com/danarch/iron-shop
khinlatt Sep 25, 2014
1727092
Merge branch 'master' into backgroundmailer
khinlatt Sep 25, 2014
70785ff
Merge pull request #11 from danarch/stripe
mattathompson Sep 25, 2014
0c9eb77
Merge branch 'master' of https://github.com/danarch/iron-shop
khinlatt Sep 25, 2014
af01d2b
Merge branch 'master' into backgroundmailer
khinlatt Sep 25, 2014
00fabad
Merge pull request #13 from danarch/backgroundmailer
danarch Sep 25, 2014
a32f0b6
Fully funcitioning cart actions
mattathompson Sep 25, 2014
65ce2b2
refactor invoices controller for error handling
danarch Sep 25, 2014
d73fd2a
Merge pull request #14 from danarch/finished_cart
danarch Sep 25, 2014
3adf708
use Matt's checkout controller action
danarch Sep 25, 2014
0070277
adding some javascript for formating item descriptions and worked on …
mattathompson Sep 25, 2014
3c4348c
Merge branch 'master' into finished_cart
mattathompson Sep 25, 2014
87caec1
Merge pull request #15 from danarch/stripe
mattathompson Sep 25, 2014
3524c8e
Merge branch 'master' into finished_cart
mattathompson Sep 25, 2014
ee452a5
Set up changing role - function only
khinlatt Sep 25, 2014
b767c54
role changing looks nicer now but ugly code
khinlatt Sep 25, 2014
ca3030c
adding price to header next to shopping cart
mattathompson Sep 25, 2014
5db8754
Add a bit of javascript to check radio button
khinlatt Sep 25, 2014
7b2544a
Merge branch 'master' into shoppersellertoggle
khinlatt Sep 25, 2014
638cd9f
Clearing the cart when invoice is paid. Also some stylistic changes
mattathompson Sep 26, 2014
93d16fa
Adding Amazon aws and Paperclip to items.
mattathompson Sep 26, 2014
7acaa58
Merge pull request #17 from danarch/Style_changes_and_clearing_the_cart
danarch Sep 26, 2014
138f01b
Merge branch 'master' into shoppersellertoggle
khinlatt Sep 26, 2014
50f2246
Merge pull request #18 from danarch/aws_for_items
khinlatt Sep 26, 2014
b2d6618
Merge branch 'master' into shoppersellertoggle
khinlatt Sep 26, 2014
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
Binary file added .DS_Store
Binary file not shown.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,6 @@
/tmp

coverage

# Ignore application configuration
/config/application.yml
18 changes: 18 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,29 @@ gem 'jquery-rails'
gem 'jbuilder', '~> 2.0'
gem 'sdoc', '~> 0.4.0', group: :doc

gem 'pg'
gem 'pg_search'

gem "paperclip", "~> 4.2"
gem 'aws-sdk'


gem 'devise'
gem 'devise-async'
gem 'cancancan'

gem 'figaro'
gem 'angular-rails'

gem 'stripe'

gem 'sidekiq'
gem 'sinatra'

group :development do
gem 'annotate'
gem 'better_errors'
gem 'letter_opener'
gem 'binding_of_caller'
gem 'pry-rails'
gem 'quiet_assets'
Expand Down
186 changes: 126 additions & 60 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,74 +1,97 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.1.4)
actionpack (= 4.1.4)
actionview (= 4.1.4)
mail (~> 2.5.4)
actionpack (4.1.4)
actionview (= 4.1.4)
activesupport (= 4.1.4)
actionmailer (4.1.6)
actionpack (= 4.1.6)
actionview (= 4.1.6)
mail (~> 2.5, >= 2.5.4)
actionpack (4.1.6)
actionview (= 4.1.6)
activesupport (= 4.1.6)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
actionview (4.1.4)
activesupport (= 4.1.4)
actionview (4.1.6)
activesupport (= 4.1.6)
builder (~> 3.1)
erubis (~> 2.7.0)
activemodel (4.1.4)
activesupport (= 4.1.4)
activemodel (4.1.6)
activesupport (= 4.1.6)
builder (~> 3.1)
activerecord (4.1.4)
activemodel (= 4.1.4)
activesupport (= 4.1.4)
activerecord (4.1.6)
activemodel (= 4.1.6)
activesupport (= 4.1.6)
arel (~> 5.0.0)
activesupport (4.1.4)
activesupport (4.1.6)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 1.1)
addressable (2.3.6)
angular-rails (0.0.12)
coffee-script (~> 2.2.0)
rails
annotate (2.6.5)
activerecord (>= 2.3.0)
rake (>= 0.8.7)
arel (5.0.1.20140414130214)
aws-sdk (1.53.0)
aws-sdk-v1 (= 1.53.0)
aws-sdk-v1 (1.53.0)
json (~> 1.4)
nokogiri (>= 1.4.4)
bcrypt (3.1.7)
better_errors (1.1.0)
better_errors (2.0.0)
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)
cancancan (1.9.2)
capybara (2.4.1)
capybara (2.4.3)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
celluloid (0.15.2)
timers (~> 1.1.0)
climate_control (0.0.3)
activesupport (>= 3.0)
cocaine (0.5.4)
climate_control (>= 0.0.3, < 1.0)
coderay (1.1.0)
coffee-rails (4.0.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0)
coffee-script (2.3.0)
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.7.1)
coffee-script-source (1.8.0)
connection_pool (2.0.0)
debug_inspector (0.0.2)
devise (3.2.4)
devise (3.3.0)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
thread_safe (~> 0.1)
warden (~> 1.2.3)
devise-async (0.9.0)
devise (~> 3.2)
diff-lcs (1.2.5)
docile (1.1.3)
docile (1.1.5)
erubis (2.7.0)
execjs (2.2.1)
factory_girl (4.4.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.4.1)
factory_girl (~> 4.4.0)
railties (>= 3.0.0)
faker (1.3.0)
faker (1.4.3)
i18n (~> 0.5)
figaro (1.0.0)
thor (~> 0.14)
haml (4.0.5)
tilt
haml-rails (0.5.3)
Expand All @@ -81,25 +104,36 @@ GEM
jbuilder (2.1.3)
activesupport (>= 3.0.0, < 5)
multi_json (~> 1.2)
jquery-rails (3.1.1)
jquery-rails (3.1.2)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.1)
launchy (2.4.2)
addressable (~> 2.3)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
letter_opener (1.2.0)
launchy (~> 2.2)
mail (2.6.1)
mime-types (>= 1.16, < 3)
method_source (0.8.2)
mime-types (1.25.1)
mime-types (2.3)
mini_portile (0.6.0)
minitest (5.4.0)
minitest (5.4.1)
multi_json (1.10.1)
netrc (0.7.7)
nokogiri (1.6.3.1)
mini_portile (= 0.6.0)
orm_adapter (0.5.0)
polyglot (0.3.5)
pry (0.10.0)
paperclip (4.2.0)
activemodel (>= 3.0.0)
activesupport (>= 3.0.0)
cocaine (~> 0.5.3)
mime-types
pg (0.17.1)
pg_search (0.7.8)
activerecord (>= 3.1)
activesupport (>= 3.1)
arel
pry (0.10.1)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
Expand All @@ -108,42 +142,50 @@ GEM
quiet_assets (1.0.3)
railties (>= 3.1, < 5.0)
rack (1.5.2)
rack-protection (1.5.3)
rack
rack-test (0.6.2)
rack (>= 1.0)
rails (4.1.4)
actionmailer (= 4.1.4)
actionpack (= 4.1.4)
actionview (= 4.1.4)
activemodel (= 4.1.4)
activerecord (= 4.1.4)
activesupport (= 4.1.4)
rails (4.1.6)
actionmailer (= 4.1.6)
actionpack (= 4.1.6)
actionview (= 4.1.6)
activemodel (= 4.1.6)
activerecord (= 4.1.6)
activesupport (= 4.1.6)
bundler (>= 1.3.0, < 2.0)
railties (= 4.1.4)
railties (= 4.1.6)
sprockets-rails (~> 2.0)
railties (4.1.4)
actionpack (= 4.1.4)
activesupport (= 4.1.4)
railties (4.1.6)
actionpack (= 4.1.6)
activesupport (= 4.1.6)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.3.2)
rdoc (4.1.1)
rdoc (4.1.2)
json (~> 1.4)
rspec-core (3.0.2)
rspec-support (~> 3.0.0)
rspec-expectations (3.0.2)
redis (3.1.0)
redis-namespace (1.5.1)
redis (~> 3.0, >= 3.0.4)
rest-client (1.7.2)
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
rspec-core (3.1.4)
rspec-support (~> 3.1.0)
rspec-expectations (3.1.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.0.0)
rspec-mocks (3.0.2)
rspec-support (~> 3.0.0)
rspec-rails (3.0.1)
rspec-support (~> 3.1.0)
rspec-mocks (3.1.1)
rspec-support (~> 3.1.0)
rspec-rails (3.1.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 3.0.0)
rspec-expectations (~> 3.0.0)
rspec-mocks (~> 3.0.0)
rspec-support (~> 3.0.0)
rspec-support (3.0.2)
rspec-core (~> 3.1.0)
rspec-expectations (~> 3.1.0)
rspec-mocks (~> 3.1.0)
rspec-support (~> 3.1.0)
rspec-support (3.1.0)
sass (3.2.19)
sass-rails (4.0.3)
railties (>= 4.0.0, < 5.0)
Expand All @@ -153,11 +195,21 @@ GEM
sdoc (0.4.1)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
simplecov (0.8.2)
sidekiq (3.2.5)
celluloid (= 0.15.2)
connection_pool (>= 2.0.0)
json
redis (>= 3.0.6)
redis-namespace (>= 1.3.1)
simplecov (0.9.1)
docile (~> 1.1.0)
multi_json
multi_json (~> 1.0)
simplecov-html (~> 0.8.0)
simplecov-html (0.8.0)
sinatra (1.4.5)
rack (~> 1.4)
rack-protection (~> 1.4)
tilt (~> 1.3, >= 1.3.4)
slop (3.6.0)
spring (1.1.3)
spring-commands-rspec (1.0.2)
Expand All @@ -167,17 +219,19 @@ GEM
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.1.3)
sprockets-rails (2.1.4)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.8)
sqlite3 (1.3.9)
stripe (1.15.0)
json (~> 1.8.1)
mime-types (>= 1.25, < 3.0)
rest-client (~> 1.4)
thor (0.19.1)
thread_safe (0.3.4)
tilt (1.4.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
timers (1.1.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (2.5.3)
Expand All @@ -192,26 +246,38 @@ PLATFORMS
ruby

DEPENDENCIES
angular-rails
annotate
aws-sdk
better_errors
binding_of_caller
cancancan
capybara
coffee-rails (~> 4.0.0)
devise
devise-async
factory_girl_rails
faker
figaro
haml-rails
jbuilder (~> 2.0)
jquery-rails
launchy
letter_opener
paperclip (~> 4.2)
pg
pg_search
pry-rails
quiet_assets
rails
rspec-rails
sass-rails (~> 4.0.3)
sdoc (~> 0.4.0)
sidekiq
simplecov
sinatra
spring
spring-commands-rspec
sqlite3
stripe
uglifier (>= 1.3.0)
Binary file added app/.DS_Store
Binary file not shown.
Binary file added app/assets/.DS_Store
Binary file not shown.
Binary file added app/assets/images/.DS_Store
Binary file not shown.
Binary file added app/assets/images/nicEditorIcons.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/javascripts/.DS_Store
Binary file not shown.
Loading