artfully_ose 1.2.0.pre.21 → 1.2.0.pre.23

data/lib/artfully_ose/version.rb

@@ -1,3 +1,3 @@
 module ArtfullyOse
-  VERSION = "1.2.0.pre.21"
+  VERSION = "1.2.0.pre.23"
 end

data/spec/factories/kit_factories.rb

@@ -24,4 +24,9 @@ FactoryGirl.define do
     t.association :organization
     t.settings { { :marketing_copy_heading => "Top", :marketing_copy_sidebar => "Sidebar" }  }
   end
+  
+  factory :passes_kit do |t|
+    t.association :organization
+    t.settings { { :marketing_copy_heading => "Top", :marketing_copy_sidebar => "Sidebar" }  }
+  end
 end

data/spec/factories/membership_factories.rb

@@ -1,6 +1,7 @@
 FactoryGirl.define do
   factory :membership do
     price       1000
+    sold_price  1000
     starts_at   1.year.ago
     ends_at     DateTime.now + 1.year
     membership_type

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: artfully_ose
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre.21
+  version: 1.2.0.pre.23
 platform: ruby
 authors:
 - Artful.ly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -280,16 +280,16 @@ dependencies:
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 3.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 3.5.2
 - !ruby/object:Gem::Dependency
   name: comma
   requirement: !ruby/object:Gem::Requirement
@@ -1903,6 +1903,7 @@ files:
 - app/controllers/discounts_controller.rb
 - app/controllers/discounts_reports_controller.rb
 - app/controllers/events_controller.rb
+- app/controllers/events_pass_types_controller.rb
 - app/controllers/exchanges_controller.rb
 - app/controllers/export_controller.rb
 - app/controllers/imports_controller.rb
@@ -1928,6 +1929,10 @@ files:
 - app/controllers/notes_controller.rb
 - app/controllers/orders_controller.rb
 - app/controllers/organizations_controller.rb
+- app/controllers/pass_types_controller.rb
+- app/controllers/passes_controller.rb
+- app/controllers/passes_kits_controller.rb
+- app/controllers/passes_reports_controller.rb
 - app/controllers/people_controller.rb
 - app/controllers/phones_controller.rb
 - app/controllers/refunds_controller.rb
@@ -1988,6 +1993,7 @@ files:
 - app/models/contribution.rb
 - app/models/daily_donation_report.rb
 - app/models/daily_membership_report.rb
+- app/models/daily_pass_report.rb
 - app/models/daily_ticket_report.rb
 - app/models/database_views/item_view.rb
 - app/models/discount.rb
@@ -2000,6 +2006,7 @@ files:
 - app/models/donation_search.rb
 - app/models/door_list.rb
 - app/models/event.rb
+- app/models/events_pass_type.rb
 - app/models/exchange.rb
 - app/models/ext/callbacks.rb
 - app/models/ext/delayed_indexing.rb
@@ -2040,6 +2047,7 @@ files:
 - app/models/kit.rb
 - app/models/kits/mailchimp_kit.rb
 - app/models/kits/membership_kit.rb
+- app/models/kits/passes_kit.rb
 - app/models/kits/regular_donation_kit.rb
 - app/models/kits/reseller_kit.rb
 - app/models/kits/scannable_tickets_kit.rb
@@ -2065,6 +2073,8 @@ files:
 - app/models/organization.rb
 - app/models/organization_ability.rb
 - app/models/parsed_row.rb
+- app/models/pass.rb
+- app/models/pass_type.rb
 - app/models/payment.rb
 - app/models/payments/cash_payment.rb
 - app/models/payments/comp_payment.rb
@@ -2083,6 +2093,7 @@ files:
 - app/models/segment.rb
 - app/models/show.rb
 - app/models/show_stats_view.rb
+- app/models/show_touch.rb
 - app/models/slices.rb
 - app/models/statement.rb
 - app/models/sundial.rb
@@ -2157,6 +2168,10 @@ files:
 - app/views/events/temp_discount_form.html.haml
 - app/views/events/temp_discounts_index.html.haml
 - app/views/events/widget.html.haml
+- app/views/events_pass_types/_form.html.haml
+- app/views/events_pass_types/edit.html.haml
+- app/views/events_pass_types/index.html.haml
+- app/views/events_pass_types/new.html.haml
 - app/views/exchanges/_grouped_form.html.haml
 - app/views/exchanges/new.html.haml
 - app/views/imports/donations/_approved.html.haml
@@ -2272,6 +2287,14 @@ files:
 - app/views/organizations/index.html.haml
 - app/views/organizations/new.html.haml
 - app/views/organizations/show.html.haml
+- app/views/pass_types/_form.html.haml
+- app/views/pass_types/_pass_type_fees.html.haml
+- app/views/pass_types/edit.html.haml
+- app/views/pass_types/index.html.haml
+- app/views/pass_types/new.html.haml
+- app/views/passes/index.html.haml
+- app/views/passes_kits/edit.html.haml
+- app/views/passes_reports/index.html.haml
 - app/views/pdfs/member.html.haml
 - app/views/pdfs/order.html.haml
 - app/views/people/_comp_membership.html.haml
@@ -2317,6 +2340,7 @@ files:
 - app/views/shared/_save_save_and_next.html.haml
 - app/views/shared/_section_summary.html.haml
 - app/views/shared/_show_summary.html.haml
+- app/views/shared/_show_time_and_calendar.html.haml
 - app/views/shared/_submit.haml
 - app/views/shared/_submit_cancel.haml
 - app/views/shared/_tags.html.haml
@@ -2342,6 +2366,7 @@ files:
 - app/views/slices/index.html.haml
 - app/views/statements/_discounts_table.html.haml
 - app/views/statements/_order_location_table.html.haml
+- app/views/statements/_passes_table.html.haml
 - app/views/statements/_payment_method_table.haml
 - app/views/statements/_shows.html.haml
 - app/views/statements/_ticket_type_table.haml
@@ -2359,6 +2384,7 @@ files:
 - app/views/store/events/single_show.html.haml
 - app/views/store/memberships/index.html.haml
 - app/views/store/orders/show.html.haml
+- app/views/store/passes/index.html.haml
 - app/views/store/shared/_donate_form.html.haml
 - app/views/store/shows/_show.html.haml
 - app/views/store/shows/show.html.haml
@@ -2507,6 +2533,19 @@ files:
 - db/migrate/20140128213101_add_pdf_to_members.rb
 - db/migrate/20140128223140_add_uuid_to_member.rb
 - db/migrate/20140128223948_add_qr_code_to_member.rb
+- db/migrate/20140207135731_update_items_view.rb
+- db/migrate/20140210154723_add_cached_stats.rb
+- db/migrate/20140218202726_cache_stats.rb
+- db/migrate/20140304171625_passes_ahoy.rb
+- db/migrate/20140304174807_add_passes_kit.rb
+- db/migrate/20140307144454_add_events_pass_types.rb
+- db/migrate/20140307193350_add_pass_id_to_cart.rb
+- db/migrate/20140314162422_add_total_paid_to_membership.rb
+- db/migrate/20140319191237_add_show_dates_to_advanced_search.rb
+- db/migrate/20140328172333_add_cols_to_events_pass_types.rb
+- db/migrate/20140328174217_add_deleted_at_to_ept.rb
+- db/migrate/20140328185432_add_active_to_ept.rb
+- db/migrate/20140328192612_add_pass_type_id_to_search.rb
 - lib/artfully_ose/common_abilities.rb
 - lib/artfully_ose/core_ext.rb
 - lib/artfully_ose/engine.rb