artfully_ose 1.2.0.pre.15 → 1.2.0.pre.16

data/app/views/store/shows/_show.html.haml

@@ -22,18 +22,18 @@
             %td.right.span2.ticket-type-price
               %span{:class => 'price'}= number_as_cents(ticket_type.price)
             %td.right.span4
-              = form_tag store_order_path(@store_organization.cached_slug), :class => 'add-tickets-to-cart' do
+              = form_tag store_order_path(@store_organization.cached_slug), :class => 'add-tickets-to-cart', :id => "add-tickets-to-cart-#{ticket_type.id}" do
                 = hidden_field_tag :show_id, show.id
                 = hidden_field_tag :ticket_type_id, ticket_type.id
                 = hidden_field_tag :section_name, ticket_type.name
                 = hidden_field_tag :ticket_price, ticket_type.price
 
-                - if ticket_type.available == 0
-                  %select{:style => "width:140px", :class => 'ticket-type-quantity'}
-                    %option
-                      SOLD OUT
+                - available = ticket_type.available(current_member)
+                - if available == 0
+                  %select{:style => "width:140px", :class => 'ticket-type-quantity', :id => 'quantity', :name => 'quantity'}
+                    %option SOLD OUT
                 - else
-                  = select_tag :quantity, options_for_select((1..[10, ticket_type.available].min).to_a.map {|i| [pluralize(i, 'Ticket'), i]}), :style => "width:140px", :class => 'ticket-type-quantity'
+                  = select_tag :quantity, options_for_select((1..[10, available].min).to_a.map {|i| [pluralize(i, 'Ticket'), i]}), :style => "width:140px", :class => 'ticket-type-quantity'
 
                 = submit_tag 'Add to cart', :class => 'btn btn-primary'
           %tr.no-border

data/config/initializers/paperclip.rb

@@ -0,0 +1,14 @@
+if Rails.env.test?
+  TICKET_QR_STORAGE = {} # default
+else
+  TICKET_QR_STORAGE = {
+    :storage => :s3,
+    :path => ":attachment/:id/:style.:extension",
+    :bucket => Rails.configuration.s3.bucket,
+    :s3_protocol => 'https',
+    :s3_credentials => {
+      :access_key_id => Rails.configuration.s3.access_key_id,
+      :secret_access_key => Rails.configuration.s3.secret_access_key
+    }
+  }
+end

data/config/routes.rb

@@ -1,5 +1,38 @@
 Rails.application.routes.draw do
 
+  namespace :mobile do
+    resources :users, :only => [] do
+      collection do
+        post :sign_in
+      end
+    end
+    resource :dashboard, :only => :show, :controller => :dashboard
+    resources :organizations, :only => [] do
+      resources :events, :only => :index
+    end
+    resources :events, :only => [:index] do
+      resources :shows, :only => :index
+    end
+    resources :shows, :only => [:index] do
+      resources :orders, :only => :index
+    end
+    resources :orders, :only => [:index, :show] do
+      collection { post :validate }
+      member { post :validate }
+    end
+    resources :tickets, :only => [:show] do
+      collection do
+        post :validate
+        post :unvalidate
+      end
+      member do
+        post :validate
+        post :unvalidate
+        get :order
+      end
+    end
+  end
+
   namespace :api do
     resources :events, :only => :show
     resources :tickets, :only => :index
@@ -81,6 +114,8 @@ Rails.application.routes.draw do
     get :requirements, :on => :collection
   end
 
+  resources :membership_kits, :only => [ :edit, :update ]
+
   resources :reports, :only => :index
   resources :statements, :only => [ :index, :show ] do
     resources :slices, :only => [ :index ] do

data/db/migrate/20130722153731_add_autentication_token_to_users.rb

@@ -0,0 +1,5 @@
+class AddAutenticationTokenToUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :authentication_token, :string
+  end
+end

data/db/migrate/20130723212712_add_qr_code_to_tickets.rb

@@ -0,0 +1,9 @@
+class AddQrCodeToTickets < ActiveRecord::Migration
+  def up
+    add_attachment :tickets, :qr_code
+  end
+
+  def down
+    remove_attachment :tickets, :qr_code
+  end
+end

data/db/migrate/20130820011240_add_uuid_to_tickets.rb

@@ -0,0 +1,13 @@
+class AddUuidToTickets < ActiveRecord::Migration
+  def change
+    add_column :tickets, :uuid, :string
+    add_index :tickets, :uuid, :unique => true
+
+    #
+    # This is usually done in a rake task for speed, but local migrations can stand to do it inline
+    #
+    Ticket.unscoped.where(:uuid => nil).pluck(:id).each do |ticket_id|
+      Ticket.unscoped.update_all({ :uuid => Ext::Uuid.uuid }, :id => ticket_id, :uuid => nil)
+    end
+  end
+end

data/db/migrate/20130820025134_make_ticket_uuid_not_null.rb

@@ -0,0 +1,11 @@
+class MakeTicketUuidNotNull < ActiveRecord::Migration
+  def up
+    # Every ticket must have a uuid for this to work.
+    # Run `rake backfill_ticket_uuids` first
+    change_column_null :tickets, :uuid, false
+  end
+
+  def down
+    change_column_null :tickets, :uuid, true
+  end
+end

data/db/migrate/20130823191625_add_pdf_to_orders.rb

@@ -0,0 +1,5 @@
+class AddPdfToOrders < ActiveRecord::Migration
+  def change
+    add_attachment :orders, :pdf
+  end
+end

data/db/migrate/20131127162818_add_buyer_id_index_to_tickets.rb

@@ -0,0 +1,5 @@
+class AddBuyerIdIndexToTickets < ActiveRecord::Migration
+  def change
+    add_index :tickets, :buyer_id
+  end
+end

data/db/migrate/20131127164000_member_tickets.rb

@@ -0,0 +1,9 @@
+class MemberTickets < ActiveRecord::Migration
+  def change
+    add_column :ticket_types, :membership_type_id,      :integer, :default => nil
+    add_column :ticket_types, :tickets_per_membership,  :integer, :default => nil
+    add_column :ticket_types, :member_ticket,           :boolean, :default => false
+
+    add_index :ticket_types, :membership_type_id
+  end
+end

data/lib/artfully_ose.rb

@@ -44,5 +44,7 @@ require "set_watch_for"
 require "swiper"
 require "slicer"
 
+require 'rqrcode_png'
+
 module ArtfullyOse
-end
+end

data/lib/artfully_ose/engine.rb

@@ -32,10 +32,11 @@ module ArtfullyOse
     
     initializer "artfully_ose.google_analytics_config" do |app|
       puts "ArtfullyOse: Initializing Google Analytics config"
-      GoogleAnalytcsConfig = Struct.new(:account, :domain)
-      app.config.google_analytics           = GoogleAnalytcsConfig.new
-      app.config.google_analytics.account   = ENV['GA_ACCOUNT']
-      app.config.google_analytics.domain    = ENV['GA_DOMAIN']
+      GoogleAnalytcsConfig = Struct.new(:account, :storefront_account, :domain)
+      app.config.google_analytics                       = GoogleAnalytcsConfig.new
+      app.config.google_analytics.account               = ENV['GA_ACCOUNT']
+      app.config.google_analytics.storefront_account    = ENV['GA_STOREFRONT_ACCOUNT']
+      app.config.google_analytics.domain                = ENV['GA_DOMAIN']
     end
    
     initializer "artfully_ose.autoload_paths", :before => :set_autoload_paths do |app|

data/lib/artfully_ose/version.rb

@@ -1,3 +1,3 @@
 module ArtfullyOse
-  VERSION = "1.2.0.pre.15"
+  VERSION = "1.2.0.pre.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: artfully_ose
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre.15
+  version: 1.2.0.pre.16
 platform: ruby
 authors:
 - Artful.ly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-07 00:00:00.000000000 Z
+date: 2013-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -500,6 +500,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.0.2
+- !ruby/object:Gem::Dependency
+  name: rqrcode_png
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
   requirement: !ruby/object:Gem::Requirement
@@ -1799,6 +1813,7 @@ files:
 - app/assets/javascripts/angular-resource.min.js
 - app/assets/javascripts/angular.min.js
 - app/assets/javascripts/application.js
+- app/assets/javascripts/bootstrap-wysihtml5.js
 - app/assets/javascripts/bootstrap.js
 - app/assets/javascripts/box-office.js
 - app/assets/javascripts/custom/door-list.js
@@ -1832,8 +1847,10 @@ files:
 - app/assets/javascripts/store/sliding-wizard.js
 - app/assets/javascripts/store/store.js
 - app/assets/javascripts/storefront.js
+- app/assets/javascripts/wysihtml5-0.3.0.min.js
 - app/assets/stylesheets/application.sass
 - app/assets/stylesheets/bootstrap-overrides.css
+- app/assets/stylesheets/bootstrap-wysihtml5.css
 - app/assets/stylesheets/bootstrap.css
 - app/assets/stylesheets/font-awesome.sass
 - app/assets/stylesheets/jquery/chosen.scss
@@ -1854,6 +1871,7 @@ files:
 - app/assets/stylesheets/sass/store.sass
 - app/assets/stylesheets/sass/themes/default.sass
 - app/assets/stylesheets/storefront.css
+- app/assets/stylesheets/wysiwyg-color.css
 - app/concerns/itemable.rb
 - app/concerns/oh_noes.rb
 - app/controllers/actions_controller.rb
@@ -1874,9 +1892,16 @@ files:
 - app/controllers/members/invitations_controller.rb
 - app/controllers/members/members_controller.rb
 - app/controllers/membership_awards_controller.rb
+- app/controllers/membership_kits_controller.rb
 - app/controllers/membership_types_controller.rb
 - app/controllers/memberships_controller.rb
 - app/controllers/merges_controller.rb
+- app/controllers/mobile/dashboard_controller.rb
+- app/controllers/mobile/events_controller.rb
+- app/controllers/mobile/orders_controller.rb
+- app/controllers/mobile/shows_controller.rb
+- app/controllers/mobile/tickets_controller.rb
+- app/controllers/mobile/users_controller.rb
 - app/controllers/notes_controller.rb
 - app/controllers/orders_controller.rb
 - app/controllers/organizations_controller.rb
@@ -1979,9 +2004,11 @@ files:
 - app/models/individual.rb
 - app/models/item.rb
 - app/models/job/action_job.rb
+- app/models/job/checkout_processor.rb
 - app/models/job/daily_email_report_job.rb
 - app/models/job/expire_ticket_job.rb
 - app/models/job/mailchimp_sync_job.rb
+- app/models/job/order_mailer_job.rb
 - app/models/job/order_processor.rb
 - app/models/job/person_lifetime_value_job.rb
 - app/models/job/recall_import_job.rb
@@ -1989,6 +2016,7 @@ files:
 - app/models/job/tag_job.rb
 - app/models/kit.rb
 - app/models/kits/mailchimp_kit.rb
+- app/models/kits/membership_kit.rb
 - app/models/kits/regular_donation_kit.rb
 - app/models/kits/reseller_kit.rb
 - app/models/kits/sponsored_donation_kit.rb
@@ -2005,6 +2033,7 @@ files:
 - app/models/orders/exchange_order.rb
 - app/models/orders/imported_order.rb
 - app/models/orders/order.rb
+- app/models/orders/pdf_generation.rb
 - app/models/orders/refund_order.rb
 - app/models/orders/unrefundable.rb
 - app/models/orders/web_order.rb
@@ -2028,6 +2057,7 @@ files:
 - app/models/section_summary.rb
 - app/models/segment.rb
 - app/models/show.rb
+- app/models/show_stats_view.rb
 - app/models/slices.rb
 - app/models/statement.rb
 - app/models/sundial.rb
@@ -2036,6 +2066,7 @@ files:
 - app/models/ticket/glance.rb
 - app/models/ticket/locker.rb
 - app/models/ticket/pricing.rb
+- app/models/ticket/qr_code.rb
 - app/models/ticket/reporting.rb
 - app/models/ticket/reports.rb
 - app/models/ticket/sale_transitions.rb
@@ -2157,9 +2188,13 @@ files:
 - app/views/layouts/members.html.haml
 - app/views/layouts/storefront.html.haml
 - app/views/members/index/index.html.haml
+- app/views/members/invitations/edit.html.erb
+- app/views/members/invitations/new.html.erb
+- app/views/members/mailer/invitation_instructions.html.haml
 - app/views/membership_awards/confirm.html.haml
 - app/views/membership_awards/create.html.haml
 - app/views/membership_awards/new.html.haml
+- app/views/membership_kits/edit.html.haml
 - app/views/membership_types/_form.html.haml
 - app/views/membership_types/_rolling_membership_type_form.html.haml
 - app/views/membership_types/_seasonal_membership_type_form.html.haml
@@ -2174,6 +2209,10 @@ files:
 - app/views/notes/_note.html.haml
 - app/views/order_mailer/confirmation_for.html.haml
 - app/views/order_mailer/confirmation_for.text.haml
+- app/views/order_mailer/confirmation_for_exchange.html.haml
+- app/views/order_mailer/confirmation_for_exchange.text.haml
+- app/views/order_mailer/confirmation_for_refund.html.haml
+- app/views/order_mailer/confirmation_for_refund.text.haml
 - app/views/orders/_by_person.haml
 - app/views/orders/_donation_table.haml
 - app/views/orders/_item_donations_table.html.haml
@@ -2265,10 +2304,12 @@ files:
 - app/views/statements/_top_stats.haml
 - app/views/statements/index.html.haml
 - app/views/statements/show.html.haml
+- app/views/store/checkouts/_membership_info.html.haml
 - app/views/store/checkouts/thanks.html.haml
 - app/views/store/donations/index.html.haml
 - app/views/store/events/_calendar.html.haml
 - app/views/store/events/_venue.html.haml
+- app/views/store/events/calendar.html.haml
 - app/views/store/events/index.html.haml
 - app/views/store/events/show.html.haml
 - app/views/store/events/single_show.html.haml
@@ -2307,6 +2348,7 @@ files:
 - config/initializers/date_formats.rb
 - config/initializers/delayed_job_config.rb
 - config/initializers/devise.rb
+- config/initializers/paperclip.rb
 - config/initializers/validates_timeliness.rb
 - config/locales/devise.en.yml
 - config/locales/devise_invitable.en.yml
@@ -2379,9 +2421,11 @@ files:
 - db/migrate/20130611175122_add_more_indexes.rb
 - db/migrate/20130612183117_add_types_to_searches.rb
 - db/migrate/20130712145416_add_middle_name_and_suffix_to_people.rb
+- db/migrate/20130722153731_add_autentication_token_to_users.rb
 - db/migrate/20130722182255_create_membership_types.rb
 - db/migrate/20130723182754_create_slugged_slugs.rb
 - db/migrate/20130723182811_add_cached_slug_to_organizations.rb
+- db/migrate/20130723212712_add_qr_code_to_tickets.rb
 - db/migrate/20130725012338_create_new_memberships.rb
 - db/migrate/20130725013145_devise_create_members.rb
 - db/migrate/20130729140618_convert_to_company.rb
@@ -2391,6 +2435,9 @@ files:
 - db/migrate/20130802235709_add_memberships_to_search.rb
 - db/migrate/20130808002742_add_lifetime_ticket_value_to_person.rb
 - db/migrate/20130808005856_add_members_only_to_events.rb
+- db/migrate/20130820011240_add_uuid_to_tickets.rb
+- db/migrate/20130820025134_make_ticket_uuid_not_null.rb
+- db/migrate/20130823191625_add_pdf_to_orders.rb
 - db/migrate/20130827190839_add_fee_to_tickets_and_donations.rb
 - db/migrate/20130829015011_migrate_fees_to_items.rb
 - db/migrate/20130917165559_add_service_fee_to_memberships.rb
@@ -2403,6 +2450,8 @@ files:
 - db/migrate/20131013192807_change_number_of_shows_to_tickets.rb
 - db/migrate/20131023200559_add_admin_to_user_memberships.rb
 - db/migrate/20131029173612_add_sales_start_to_membership_typ.rb
+- db/migrate/20131127162818_add_buyer_id_index_to_tickets.rb
+- db/migrate/20131127164000_member_tickets.rb
 - lib/artfully_ose/common_abilities.rb
 - lib/artfully_ose/core_ext.rb
 - lib/artfully_ose/engine.rb