artfully_ose 1.2.0.pre.19 → 1.2.0.pre.20

Sign up to get free protection for your applications and to get access to all the features.
Files changed (159) hide show
  1. checksums.yaml +8 -8
  2. data/README.md +28 -0
  3. data/app/assets/javascripts/change-membership.js +66 -16
  4. data/app/assets/javascripts/store/store.js +4 -0
  5. data/app/assets/stylesheets/sass/store.sass +2 -0
  6. data/app/{models/carts → concerns}/cart_finder.rb +0 -0
  7. data/app/{models/actions → concerns}/immutable_action.rb +0 -0
  8. data/app/concerns/pdf_generation.rb +71 -0
  9. data/app/{models/orders → concerns}/unrefundable.rb +0 -0
  10. data/app/controllers/export_controller.rb +1 -5
  11. data/app/controllers/imports_controller.rb +12 -0
  12. data/app/controllers/members/index_controller.rb +1 -1
  13. data/app/controllers/members/members_controller.rb +6 -1
  14. data/app/controllers/members/passwords_controller.rb +10 -0
  15. data/app/controllers/members/people_controller.rb +17 -0
  16. data/app/controllers/membership_cancellations_controller.rb +46 -0
  17. data/app/controllers/membership_comps_controller.rb +97 -0
  18. data/app/controllers/membership_types_controller.rb +6 -2
  19. data/app/controllers/people_controller.rb +15 -3
  20. data/app/controllers/sales_controller.rb +4 -0
  21. data/app/controllers/searches_controller.rb +2 -2
  22. data/app/controllers/sections_controller.rb +1 -1
  23. data/app/controllers/shows_controller.rb +52 -3
  24. data/app/controllers/store/checkouts_controller.rb +2 -7
  25. data/app/controllers/store/memberships_controller.rb +2 -1
  26. data/app/helpers/artfully_ose_helper.rb +4 -3
  27. data/app/mailers/order_mailer.rb +3 -3
  28. data/app/models/actions/comp_action.rb +15 -0
  29. data/app/models/address.rb +7 -0
  30. data/app/models/{carts/cart.rb → cart.rb} +0 -19
  31. data/app/models/checkout.rb +53 -15
  32. data/app/models/comp.rb +21 -11
  33. data/app/models/database_views/item_view.rb +4 -0
  34. data/app/models/event.rb +1 -0
  35. data/app/models/{ext/ext.rb → ext.rb} +14 -1
  36. data/app/models/ext/preprocessor.rb +6 -0
  37. data/app/models/job/order_processor.rb +6 -3
  38. data/app/models/job/show_creator.rb +6 -2
  39. data/app/models/kit.rb +1 -1
  40. data/app/models/kits/membership_kit.rb +8 -1
  41. data/app/models/kits/scannable_tickets_kit.rb +24 -0
  42. data/app/models/member.rb +59 -13
  43. data/app/models/membership.rb +2 -14
  44. data/app/models/membership_cancellation.rb +80 -0
  45. data/app/models/membership_comp.rb +103 -0
  46. data/app/models/membership_comp_job.rb +32 -0
  47. data/app/models/membership_type.rb +3 -3
  48. data/app/models/{orders/order.rb → order.rb} +8 -2
  49. data/app/models/orders/comp_order.rb +4 -0
  50. data/app/models/organization.rb +5 -1
  51. data/app/models/{payments/payment.rb → payment.rb} +12 -1
  52. data/app/models/payments/credit_card_payment.rb +36 -5
  53. data/app/models/person.rb +11 -1
  54. data/app/models/rolling_membership_type.rb +3 -1
  55. data/app/models/sale.rb +1 -1
  56. data/app/models/search.rb +1 -6
  57. data/app/models/seasonal_membership_type.rb +1 -0
  58. data/app/models/ticket.rb +2 -0
  59. data/app/models/ticket/qr_code.rb +1 -1
  60. data/app/models/ticket/transfers.rb +6 -3
  61. data/app/models/ticket_type.rb +6 -0
  62. data/app/models/user.rb +2 -1
  63. data/app/views/addresses/_address.html.haml +7 -6
  64. data/app/views/events/_ticket_type_fields.html.haml +2 -2
  65. data/app/views/imports/index.html.haml +2 -1
  66. data/app/views/layouts/_menu.html.haml +3 -2
  67. data/app/views/layouts/storefront.html.haml +17 -13
  68. data/app/views/members/index/index.html.haml +5 -11
  69. data/app/views/members/invitations/edit.html.haml +17 -0
  70. data/app/views/members/mailer/_invitation_body.html.haml +18 -0
  71. data/app/views/members/mailer/invitation_instructions.html.haml +6 -12
  72. data/app/views/members/mailer/reset_password_instructions.html.erb +8 -0
  73. data/app/views/members/passwords/edit.html.haml +18 -0
  74. data/app/views/members/sessions/new.html.haml +19 -0
  75. data/app/views/membership_cancellations/_form.html.haml +39 -0
  76. data/app/views/membership_cancellations/_modal.html.haml +2 -0
  77. data/app/views/membership_cancellations/_processing.html.haml +14 -0
  78. data/app/views/membership_cancellations/create.js.erb +3 -0
  79. data/app/views/membership_cancellations/new.js.erb +3 -0
  80. data/app/views/membership_comps/confirm.html.haml +85 -0
  81. data/app/views/membership_comps/create.html.haml +18 -0
  82. data/app/views/membership_comps/new.html.haml +82 -0
  83. data/app/views/membership_mailer/cancellation_confirmation.html.haml +9 -0
  84. data/app/views/membership_mailer/cancellation_confirmation.text.haml +6 -0
  85. data/app/views/membership_mailer/refund_problem.html.haml +18 -0
  86. data/app/views/membership_mailer/refund_problem.text.haml +14 -0
  87. data/app/views/membership_types/_form.html.haml +18 -53
  88. data/app/views/membership_types/_membership_type_fees.html.haml +0 -0
  89. data/app/views/membership_types/index.html.haml +1 -5
  90. data/app/views/memberships/_membership_scripts.js.erb +15 -0
  91. data/app/views/memberships/index.html.haml +18 -17
  92. data/app/views/order_mailer/confirmation_for.html.haml +8 -0
  93. data/app/views/orders/_order_sidebar.html.haml +1 -3
  94. data/app/views/organizations/_form.html.haml +6 -0
  95. data/app/views/pdfs/member.html.haml +66 -0
  96. data/app/views/pdfs/order.html.haml +84 -0
  97. data/app/views/people/_comp_membership.html.haml +23 -0
  98. data/app/views/people/_edit_modal.html.haml +6 -3
  99. data/app/views/people/show.html.haml +1 -2
  100. data/app/views/searches/_form.html.haml +34 -33
  101. data/app/views/searches/show.html.haml +4 -1
  102. data/app/views/segments/show.html.haml +4 -1
  103. data/app/views/shows/_ticket_table.html.haml +1 -1
  104. data/app/views/shows/index.html.haml +8 -2
  105. data/app/views/store/checkouts/_membership_info.html.haml +1 -0
  106. data/app/views/store/checkouts/thanks.html.haml +7 -3
  107. data/app/views/store/events/index.html.haml +9 -3
  108. data/app/views/store/events/single_show.html.haml +4 -1
  109. data/app/views/store/memberships/index.html.haml +2 -1
  110. data/app/views/store/orders/show.html.haml +2 -2
  111. data/config/initializers/devise.rb +1 -1
  112. data/config/initializers/paperclip.rb +39 -0
  113. data/config/locales/devise_invitable.en.yml +1 -1
  114. data/config/locales/en.yml +9 -0
  115. data/config/routes.rb +14 -7
  116. data/db/migrate/20131223215615_goodbye_order_view.rb +6 -0
  117. data/db/migrate/20140114011856_add_welcome_message_to_memberships.rb +5 -0
  118. data/db/migrate/20140114212127_add_send_email_to_memberships.rb +5 -0
  119. data/db/migrate/20140125183606_index_memberships_and_types.rb +6 -0
  120. data/db/migrate/20140128213101_add_pdf_to_members.rb +5 -0
  121. data/db/migrate/20140128223140_add_uuid_to_member.rb +6 -0
  122. data/db/migrate/20140128223948_add_qr_code_to_member.rb +9 -0
  123. data/lib/artfully_ose/common_abilities.rb +1 -1
  124. data/lib/artfully_ose/engine.rb +23 -2
  125. data/lib/artfully_ose/version.rb +1 -1
  126. data/spec/factories/action_factories.rb +19 -0
  127. data/spec/factories/address_factories.rb +11 -0
  128. data/spec/factories/cart_factories.rb +26 -0
  129. data/spec/factories/chart_factories.rb +52 -0
  130. data/spec/factories/discount_factories.rb +11 -0
  131. data/spec/factories/donation_factories.rb +14 -0
  132. data/spec/factories/event_factories.rb +29 -0
  133. data/spec/factories/import_factories.rb +61 -0
  134. data/spec/factories/item_factories.rb +51 -0
  135. data/spec/factories/kit_factories.rb +27 -0
  136. data/spec/factories/member_factories.rb +19 -0
  137. data/spec/factories/membership_factories.rb +8 -0
  138. data/spec/factories/membership_type_factories.rb +18 -0
  139. data/spec/factories/order_factories.rb +40 -0
  140. data/spec/factories/organization_factories.rb +44 -0
  141. data/spec/factories/payments_factories.rb +97 -0
  142. data/spec/factories/person_factories.rb +44 -0
  143. data/spec/factories/phone_factories.rb +6 -0
  144. data/spec/factories/section_factories.rb +21 -0
  145. data/spec/factories/segment_factories.rb +6 -0
  146. data/spec/factories/show_factories.rb +33 -0
  147. data/spec/factories/ticket_factories.rb +57 -0
  148. data/spec/factories/ticket_offer_factories.rb +16 -0
  149. data/spec/factories/ticket_type_factories.rb +8 -0
  150. data/spec/factories/user_factories.rb +24 -0
  151. metadata +75 -17
  152. data/app/controllers/membership_awards_controller.rb +0 -60
  153. data/app/models/database_views/order_view.rb +0 -34
  154. data/app/models/membership_award.rb +0 -24
  155. data/app/models/orders/pdf_generation.rb +0 -75
  156. data/app/views/members/invitations/edit.html.erb +0 -14
  157. data/app/views/membership_awards/confirm.html.haml +0 -105
  158. data/app/views/membership_awards/create.html.haml +0 -1
  159. data/app/views/membership_awards/new.html.haml +0 -79
@@ -0,0 +1,5 @@
1
+ class AddWelcomeMessageToMemberships < ActiveRecord::Migration
2
+ def change
3
+ add_column :memberships, :welcome_message, :text, :default => nil
4
+ end
5
+ end
@@ -0,0 +1,5 @@
1
+ class AddSendEmailToMemberships < ActiveRecord::Migration
2
+ def change
3
+ add_column :memberships, :send_email, :boolean, :default => true
4
+ end
5
+ end
@@ -0,0 +1,6 @@
1
+ class IndexMembershipsAndTypes < ActiveRecord::Migration
2
+ def change
3
+ add_index :membership_types, :organization_id
4
+ add_index :memberships, :membership_type_id
5
+ end
6
+ end
@@ -0,0 +1,5 @@
1
+ class AddPdfToMembers < ActiveRecord::Migration
2
+ def change
3
+ add_attachment :members, :pdf
4
+ end
5
+ end
@@ -0,0 +1,6 @@
1
+ class AddUuidToMember < ActiveRecord::Migration
2
+ def change
3
+ add_column :members, :uuid, :string
4
+ add_index :members, :uuid, :unique => true
5
+ end
6
+ end
@@ -0,0 +1,9 @@
1
+ class AddQrCodeToMember < ActiveRecord::Migration
2
+ def up
3
+ add_attachment :members, :qr_code
4
+ end
5
+
6
+ def down
7
+ remove_attachment :members, :qr_code
8
+ end
9
+ end
@@ -69,7 +69,7 @@ module ArtfullyOse
69
69
 
70
70
  def person_abilities_for(user)
71
71
  can :manage, Person do |person|
72
- (user.current_organization.can? :manage, person) || (current_member.person.id == person.id)
72
+ user.current_organization.can? :manage, person
73
73
  end
74
74
 
75
75
  can :manage, Segment do |segment|
@@ -1,5 +1,13 @@
1
1
  module ArtfullyOse
2
2
  class Engine < ::Rails::Engine
3
+
4
+ if Rails.env.test?
5
+ initializer 'artfully_ose.factories', :after => 'factory_girl.set_factory_paths' do
6
+ puts 'ArtfullyOse: Setting up additional FactoryGirl paths'
7
+ FactoryGirl.definition_file_paths << File.expand_path('../../../spec/factories', __FILE__) if defined?(FactoryGirl)
8
+ end
9
+ end
10
+
3
11
  initializer "artfully_ose.braintree_config" do |app|
4
12
  puts "ArtfullyOse: Initializing Braintree config"
5
13
  BraintreeConfig = Struct.new(:merchant_id, :public_key, :private_key)
@@ -41,10 +49,23 @@ module ArtfullyOse
41
49
  end
42
50
 
43
51
  initializer "artfully_ose.autoload_paths", :before => :set_autoload_paths do |app|
52
+ # First level sub-directories only
53
+ model_paths = [
54
+ "#{config.root}/app/models/actions",
55
+ "#{config.root}/app/models/database_views",
56
+ "#{config.root}/app/models/discounts",
57
+ "#{config.root}/app/models/imports",
58
+ "#{config.root}/app/models/job",
59
+ "#{config.root}/app/models/kits",
60
+ "#{config.root}/app/models/orders",
61
+ "#{config.root}/app/models/payments",
62
+ ]
63
+
44
64
  puts "ArtfullyOse: Setting up additional autoload paths"
45
- app.config.autoload_paths += Dir["#{config.root}/app/models/**/"]
65
+ app.config.autoload_paths += model_paths
66
+
46
67
  end
47
-
68
+
48
69
  config.generators do |g|
49
70
  g.test_framework :rspec, :view_specs => false
50
71
  end
@@ -1,3 +1,3 @@
1
1
  module ArtfullyOse
2
- VERSION = "1.2.0.pre.19"
2
+ VERSION = "1.2.0.pre.20"
3
3
  end
@@ -0,0 +1,19 @@
1
+ FactoryGirl.define do
2
+ factory :get_action do
3
+ person
4
+ occurred_at { DateTime.now }
5
+ end
6
+
7
+ factory :do_action, :class => DoAction do
8
+ person
9
+ subject { person }
10
+ details { Faker::Lorem.sentence }
11
+ occurred_at { DateTime.now }
12
+ end
13
+
14
+ factory :give_action do
15
+ person
16
+ subject { FactoryGirl.create(:donation) }
17
+ occurred_at { DateTime.now }
18
+ end
19
+ end
@@ -0,0 +1,11 @@
1
+ FactoryGirl.define do
2
+ factory :address do
3
+ address1 { Faker::Address.street_address }
4
+ address2 { Faker::Address.secondary_address }
5
+ city { Faker::Address.city }
6
+ state { Faker::Address.state }
7
+ zip { Faker::Address.zip_code }
8
+ country "United States"
9
+ person_id 0
10
+ end
11
+ end
@@ -0,0 +1,26 @@
1
+ FactoryGirl.define do
2
+ factory :reseller_cart, :class => Reseller::Cart do
3
+ state :approved
4
+ reseller { FactoryGirl.create :organization_with_reselling }
5
+ end
6
+
7
+ factory :cart do
8
+ end
9
+
10
+ factory :cart_with_items, :parent => :cart do
11
+ after(:create) do |cart|
12
+ tickets = 3.times.collect { FactoryGirl.create(:ticket) }
13
+ Ticket.lock(tickets, tickets.first.ticket_type, cart)
14
+ cart.donations << FactoryGirl.create(:donation)
15
+ end
16
+ end
17
+
18
+ factory :cart_with_free_items, :parent => :cart do
19
+ after(:create) do |order|
20
+ order.tickets << 3.times.collect { FactoryGirl.create(:free_ticket) }
21
+ end
22
+ end
23
+
24
+ factory :cart_with_only_tickets, :parent => :cart do
25
+ end
26
+ end
@@ -0,0 +1,52 @@
1
+ FactoryGirl.define do
2
+ #
3
+ # pass :price => 2000 just like anything else
4
+ #
5
+ factory :chart do
6
+ ignore do
7
+ price nil
8
+ capacity nil
9
+ end
10
+
11
+ name 'Test Chart'
12
+ is_template false
13
+ organization
14
+
15
+ after(:create) do |chart, evaluator|
16
+ unless evaluator.capacity.nil?
17
+ chart.sections.first.capacity = evaluator.capacity
18
+ chart.sections.first.save
19
+ end
20
+
21
+ unless evaluator.price.nil?
22
+ chart.sections.first.ticket_types.first.price = evaluator.price
23
+ chart.sections.first.ticket_types.first.save
24
+ end
25
+ end
26
+ end
27
+
28
+ factory :chart_with_sections, :parent => :chart do
29
+ skip_create_first_section true
30
+ after(:create) do |chart|
31
+ 2.times do
32
+ chart.sections << FactoryGirl.create(:section)
33
+ end
34
+ end
35
+ end
36
+
37
+ factory :chart_with_free_sections, :parent => :chart do
38
+ after(:create) do |chart|
39
+ 2.times do
40
+ chart.sections << FactoryGirl.create(:free_section)
41
+ end
42
+ end
43
+ end
44
+
45
+ factory :assigned_chart, :parent => :chart_with_sections do
46
+ event
47
+ end
48
+
49
+ factory :chart_template, :parent => :chart do
50
+ is_template true
51
+ end
52
+ end
@@ -0,0 +1,11 @@
1
+ FactoryGirl.define do
2
+ factory :discount do
3
+ active true
4
+ code { (5...10).inject(""){|s, _| s << 65.+(rand(26)).chr} }
5
+ promotion_type "DollarsOffTickets"
6
+ event
7
+ organization
8
+ creator { build(:user) }
9
+ properties { HashWithIndifferentAccess.new( amount: 1000 ) }
10
+ end
11
+ end
@@ -0,0 +1,14 @@
1
+ FactoryGirl.define do
2
+ factory :donation do
3
+ amount 1000
4
+ organization
5
+ end
6
+
7
+ factory :sponsored_donation, :parent => :donation do
8
+ after(:create) do |donation|
9
+ donation.organization.fiscally_sponsored_project = FiscallySponsoredProject.new
10
+ donation.organization.fiscally_sponsored_project.fs_project_id = 1
11
+ donation.organization.save
12
+ end
13
+ end
14
+ end
@@ -0,0 +1,29 @@
1
+ FactoryGirl.define do
2
+ factory :event do
3
+ name "Some Event"
4
+ producer "Some Producer"
5
+ association :organization
6
+ association :venue
7
+ contact_email { Faker::Internet.email }
8
+ members_only false
9
+ end
10
+
11
+ factory :paid_event, :parent => :event do
12
+ is_free false
13
+ end
14
+
15
+ factory :free_event, :parent => :event do
16
+ is_free true
17
+ end
18
+
19
+ factory :venue do
20
+ name "Venue Theater"
21
+ address1 { Faker::Address.street_address }
22
+ address2 { Faker::Address.secondary_address }
23
+ city { Faker::Address.city }
24
+ state { Faker::Address.state }
25
+ zip { Faker::Address.zip_code }
26
+ country "United States"
27
+ time_zone "Mountain Time (US & Canada)"
28
+ end
29
+ end
@@ -0,0 +1,61 @@
1
+ FactoryGirl.define do
2
+ factory :import do
3
+ user { FactoryGirl.create :user_in_organization }
4
+ s3_bucket { "example-bucket" }
5
+ s3_key { "example-key" }
6
+ s3_etag { Digest::MD5.hexdigest("value") }
7
+
8
+ after(:build) do |import|
9
+ import.organization = import.user.user_memberships.first.organization
10
+ end
11
+
12
+ end
13
+
14
+ factory :donations_import, :class => DonationsImport do
15
+ user { FactoryGirl.create :user_in_organization }
16
+ s3_bucket { "example-bucket" }
17
+ s3_key { "example-key" }
18
+ s3_etag { Digest::MD5.hexdigest("value") }
19
+
20
+ after(:build) do |import|
21
+ import.organization = import.user.user_memberships.first.organization
22
+ end
23
+
24
+ end
25
+
26
+ factory :memberships_import, :class => MembershipsImport do
27
+ user { FactoryGirl.create :user_in_organization }
28
+ s3_bucket { "example-bucket" }
29
+ s3_key { "example-key" }
30
+ s3_etag { Digest::MD5.hexdigest("value") }
31
+
32
+ after(:build) do |import|
33
+ import.organization = import.user.user_memberships.first.organization
34
+ end
35
+
36
+ end
37
+
38
+ factory :events_import, :class => EventsImport do
39
+ user { FactoryGirl.create :user_in_organization }
40
+ s3_bucket { "example-bucket" }
41
+ s3_key { "example-key" }
42
+ s3_etag { Digest::MD5.hexdigest("value") }
43
+
44
+ after(:build) do |import|
45
+ import.organization = import.user.user_memberships.first.organization
46
+ end
47
+
48
+ end
49
+
50
+ factory :people_import do
51
+ user { FactoryGirl.create :user_in_organization }
52
+ s3_bucket { "example-bucket" }
53
+ s3_key { "example-key" }
54
+ s3_etag { Digest::MD5.hexdigest("value") }
55
+
56
+ after(:build) do |import|
57
+ import.organization = import.user.user_memberships.first.organization
58
+ end
59
+
60
+ end
61
+ end
@@ -0,0 +1,51 @@
1
+ FactoryGirl.define do
2
+ factory :item do
3
+ product { FactoryGirl.create(:sold_ticket) }
4
+ order
5
+ reseller_net 100
6
+ end
7
+
8
+ factory :fully_discounted_item, :parent => :item do
9
+ product { FactoryGirl.create(:fully_discounted_ticket) }
10
+ end
11
+
12
+ factory :free_item, :parent => :item do
13
+ product { FactoryGirl.create(:free_ticket) }
14
+ association :discount
15
+ end
16
+
17
+ factory :settled_item, :class => Item do
18
+ product { FactoryGirl.create(:ticket, :state => :sold) }
19
+ after(:build) do |i|
20
+ i.state="settled"
21
+ end
22
+ end
23
+
24
+ factory :comped_item, :class => Item do
25
+ product { FactoryGirl.create(:comped_ticket) }
26
+ after(:build) do |i|
27
+ i.state="comped"
28
+ end
29
+ end
30
+
31
+ factory :exchanged_item, :class => Item do
32
+ product { FactoryGirl.create(:ticket, :state => :on_sale) }
33
+ after(:build) do |i|
34
+ i.state="exchanged"
35
+ end
36
+ end
37
+
38
+ factory :exchangee_item, :class => Item do
39
+ product { FactoryGirl.create(:ticket, :state => :sold) }
40
+ after(:build) do |i|
41
+ i.state="exchangee"
42
+ end
43
+ end
44
+
45
+ factory :refunded_item, :class => Item do
46
+ product { FactoryGirl.create(:ticket, :state => :on_sale) }
47
+ after(:build) do |i|
48
+ i.state="refunded"
49
+ end
50
+ end
51
+ end
@@ -0,0 +1,27 @@
1
+ FactoryGirl.define do
2
+ factory :ticketing_kit do
3
+ organization
4
+ end
5
+
6
+ factory :regular_donation_kit do
7
+ organization
8
+ end
9
+
10
+ factory :sponsored_donation_kit do
11
+ organization
12
+ end
13
+
14
+ factory :reseller_kit do
15
+ organization
16
+ end
17
+
18
+ factory :mailchimp_kit do |t|
19
+ t.association :organization
20
+ t.settings { { :api_key => "api_key-us5", :attached_lists => [{:list_id => "88a334b", :list_name => "First List"}] } }
21
+ end
22
+
23
+ factory :membership_kit do |t|
24
+ t.association :organization
25
+ t.settings { { :marketing_copy_heading => "Top", :marketing_copy_sidebar => "Sidebar" } }
26
+ end
27
+ end
@@ -0,0 +1,19 @@
1
+ FactoryGirl.define do
2
+ factory :member do
3
+ organization
4
+ email { Faker::Internet.email }
5
+ password "password"
6
+ member_number "34R43"
7
+
8
+ after(:build) do |member|
9
+ member.person = FactoryGirl.create(:individual, :organization => member.organization) unless member.person
10
+ member.memberships << FactoryGirl.create(:membership, :member => member, :organization => member.organization) if member.memberships.empty?
11
+ end
12
+
13
+ after(:create) do |member|
14
+ member.person.address = FactoryGirl.create(:address)
15
+ member.person.phones << FactoryGirl.create(:phone)
16
+ member.person.save
17
+ end
18
+ end
19
+ end