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

data/app/views/shows/new.html.haml

@@ -9,27 +9,7 @@
   .span9
     = render "shared/error_messages", :target => @event
     = form_for @show, :html => { :class => 'form-horizontal' }, :url => event_shows_path(@event, @show) do |show_form|
-      .control-group
-        .navbar.clean
-          .navbar-inner
-            .brand.brand-lite Show Time
-        .controls
-          =select_tag :hour, options_for_select(["1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12"], "8"), :id => "show-time-hour", :class => "input-small"
-          =":"
-          =select_tag :minute, options_for_select(["00", "01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "41", "42", "43", "44", "45", "46", "47", "48", "49", "50", "51", "52", "53", "54", "55", "56", "57", "58", "59"]), :id => "show-time-minute", :class => "input-small"
-          =select_tag :meridian, options_for_select([["AM", "a"], ["PM", "p"]], "p"), :id => "show-time-meridian", :class => "input-small"
-      .bottom-room
-        .navbar.clean
-          .navbar-inner
-            .brand.brand-lite Show Dates
-        #new-show-calendar{'data-event-id' => @event.id}
-        #calendar-help
-          .pull-right
-            %span{:style => 'background-color: #adadad'} &nbsp&nbsp&nbsp&nbsp
-            Existing shows
-            %span{:style => 'background-color: #3a87ad'} &nbsp&nbsp&nbsp&nbsp
-            New shows
-          %div{:style => "clear:both"}
+      =render :partial => "shared/show_time_and_calendar", :locals => {:event_type => "events"}
 
       .navbar.clean
         .navbar-inner

data/app/views/statements/_passes_table.html.haml

@@ -0,0 +1,25 @@
+%table.standalone.table
+  %thead
+    %tr
+      %th Pass Type
+      %th.right{:style=>'width:100px'} Tickets
+      %th.right{:style=>'width:100px'}
+      %th.right{:style=>'width:100px'} 
+      %th.right{:style=>'width:100px'} 
+  %tbody
+    / - if statement.discount_rows.empty?
+    /   %tr
+    /     %td{:colspan => 6} No passes used for this show
+
+    %tr
+      %td="Summer Play Pass"
+      %td.right=rand(30)
+      %td.right 
+      %td.right
+      %td.right
+    %tr
+      %td="Golden Ticket"
+      %td.right=19
+      %td.right 
+      %td.right
+      %td.right

data/app/views/statements/show.html.haml

@@ -28,4 +28,7 @@
         #order_location
           = render :partial => 'order_location_table', :locals => { :statement => @statement }
         #discounts_table
-          = render :partial => 'discounts_table', :locals => { :statement => @statement }
+          = render :partial => 'discounts_table', :locals => { :statement => @statement }
+        -with_kit(:passes) do
+          #passes_table
+            = render :partial => 'passes_table', :locals => { :statement => @statement }

data/app/views/store/checkouts/thanks.html.haml

@@ -32,6 +32,9 @@
           - if @fafs_success == true
             %p Thank you for your donation! You will receive a separate email confirmation for that donation.
 
+        %p{:style => "text-align:center"}
+          =link_to "Use Your Pass Now!", store_organization_events_path(@store_organization.cached_slug), :class => "btn btn-success btn-large"
+
         #shopping-cart-display
           .well
             -unless @order.tickets.empty?
@@ -62,6 +65,14 @@
                     %td="Donation to #{@store_organization.name}"
                     %td.right=number_as_cents item.total_price
 
+            -unless @order.passes.empty?
+              %h4 Passes
+              %table.table
+                -@order.passes.each do |item|
+                  %tr
+                    %td="#{item.product.pass_type.passerize}: #{item.product.pass_code}"
+                    %td.right=number_as_cents item.total_price
+
             %table.table
               -@order.discount_codes.each do |discount|
                 %tr#discount-display
@@ -69,11 +80,8 @@
                     Discount code
                     %span=discount.code
 
-                  -# Hiding this, because we display the sold price of the tickets in this view.
-                  -# also displaying the discount amount makes the math wrong
-                  %td.right.amount
-                    -#=number_as_cents @order.total_discount
-
+                  %td.right.amount  
+                  
             %table.table
               -unless @order.service_fee == 0
                 %tr

data/app/views/store/orders/show.html.haml

@@ -26,9 +26,17 @@
                   %td=membership.membership_type.membershipize
                   %td.right=number_as_cents membership.price
 
+          -unless current_cart.passes.empty?
+            %h4 Passes
+            %table.table#passes-table
+              -current_cart.passes.each do |pass|
+                %tr
+                  %td=pass.pass_type.passerize
+                  %td.right=number_as_cents pass.price
+
           -unless current_cart.donations.empty?
             %h4 Donations
-            %table.table#memberships-table
+            %table.table#donations-table
               -current_cart.donations.each do |donation|
                 %tr
                   %td="Donation to #{@store_organization.name}"
@@ -51,6 +59,23 @@
                   %td.right.amount
                     =number_as_cents current_cart.discount_amount
 
+          -if @store_organization.can? :access, :passes
+            = form_tag store_order_path(@store_organization.cached_slug) do
+              %table.table
+                %tr#pass-code-input{:style => 'display:none'}
+                  %td= text_field_tag 'pass_code', params[:pass_code], :placeholder => "Enter pass here, eg. COWBELL"
+                  %td= button_tag "Apply", :class => 'btn btn-primary', :disable_with => "Applying..."
+                -if current_cart.applied_pass.nil?
+                  %tr#pass-code-link
+                    %td= link_to "Apply Pass Code", "#"
+                -else          
+                  %tr#discount-display
+                    %td.details
+                      Pass code
+                      %span=current_cart.applied_pass.pass_code
+                      #pass-code-link= link_to "Change", "#", :class => 'btn btn-primary'
+                    %td.right.amount
+
           %table.table#totals-table
             -unless current_cart.fee_in_cents == 0
               %tr

data/app/views/store/passes/index.html.haml

@@ -0,0 +1,33 @@
+- content_for :title do
+  Purchase a Pass
+  
+.container
+  %h1 Purchase a Pass
+
+  .row#membership-storefront
+    .span8  
+      #salesy{:style => "margin-bottom: 20px"} 
+        =@passes_kit.marketing_copy_heading.html_safe
+
+      - @pass_types.each do |pass_type|
+        .row-fluid{:id => "pass-type-#{pass_type.id}"}
+          .span12
+            %ul#memberships.unstyled
+              %li
+                .title.active
+                  .price
+                    =number_as_cents pass_type.price
+                  .membership_type_name
+                    =pass_type.name
+            =pass_type.description
+            %br
+            %br
+            .section
+              = form_for pass_type, :as => :pass_type, :url => store_order_path(@store_organization.cached_slug), :html => {:id => "edit_pass_type_#{pass_type.id}"}, :method => :post do |f| 
+                = f.hidden_field :id
+                = select_tag :quantity, options_for_select((1..6).to_a.map {|i| [pluralize(i, "#{pass_type.name} Pass"), i]})
+                = f.submit 'Add to cart', :class => 'btn btn-primary', :style => 'margin-top: -10px'
+      
+    .span4
+      .side-section
+        =@passes_kit.marketing_copy_sidebar.html_safe

data/config/locales/en.yml

@@ -182,6 +182,8 @@
       seasonal_membership_type:
         starts_at: "Membership begins"
         ends_at: "Membership ends"
+      pass_type:
+        tickets_allowed: "Number of Tickets"
       organization:
         # Blithering hack to get around Rails' miserable validation message handling
         cached_slug: "Sorry,"

data/config/routes.rb

@@ -48,6 +48,7 @@ Rails.application.routes.draw do
     namespace :store do
       resources :events, :only => [:show, :index]
       resources :memberships, :only => [:show, :index]
+      resources :passes, :only => [:show, :index]
       resources :rolling_membership_types,  :controller => :membership_types
       resources :seasonal_membership_types, :controller => :membership_types
       resources :shows, :only => :show
@@ -116,6 +117,8 @@ Rails.application.routes.draw do
   end
 
   resources :membership_kits, :only => [ :edit, :update ]
+  resources :passes_kits, :only => [ :edit, :update ]
+  resources :passes_reports, :only => [:index]
 
   resources :reports, :only => :index
   resources :statements, :only => [ :index, :show ] do
@@ -128,6 +131,7 @@ Rails.application.routes.draw do
 
   def people_actions
     resources :actions
+    resources :passes, :only => [:index]
     resources :memberships do
       collection do
         post :bulk_update
@@ -201,16 +205,17 @@ Rails.application.routes.draw do
       get :messages
     end
     resources :discounts
+    resources :events_pass_types
     resources :shows do
       resource :sales, :only => [:new, :create, :show, :update]
       member do
         get :door_list
         post :published
         post :unpublished
+        post :on_sale
+        post :off_sale
       end
       collection do
-        post :built
-        post :on_sale
         get  :calendar
         get  :upcoming
         get  "/:year/:month", :as => :monthly, :action => :index
@@ -268,6 +273,7 @@ Rails.application.routes.draw do
   resources :returns, :only => :create
   resources :comps, :only => [ :new, :create ]
   resources :merges, :only => [ :new, :create ]
+  resources :pass_types
   resources :membership_types
   resources :rolling_membership_types,  :controller => :membership_types
   resources :seasonal_membership_types, :controller => :membership_types

data/db/migrate/20140207135731_update_items_view.rb

@@ -0,0 +1,38 @@
+class UpdateItemsView < ActiveRecord::Migration
+  def up
+    execute "CREATE OR REPLACE VIEW items_view as " +
+              "select "  +
+              "orders.id as order_id," +
+              "orders.type as order_type," +
+              "items.id as item_id," +
+              "items.product_type as product_type," +
+              "organizations.id as organization_id," +
+              "organizations.name as organization_name," +
+              "organizations.time_zone as time_zone," +
+              "orders.created_at,"  +
+              "orders.payment_method," + 
+              # people and addresses got moved out into a relation
+              # since this export now runs in a background job, speed isn't the primary concern
+              "people.id as person_id," +
+              "shows.datetime," +
+              "shows.id as show_id," +
+              "events.id as event_id," +
+              "events.name as event_name," +
+              "items.price," +
+              "items.nongift_amount," +
+              "orders.special_instructions, " +
+              "orders.notes " +
+              "from items " +
+              "LEFT OUTER JOIN `orders` ON `orders`.`id` = `items`.`order_id`"  +              
+              "LEFT OUTER JOIN `people` ON `people`.`id` = `orders`.`person_id` " +
+              "LEFT OUTER JOIN `organizations` ON `organizations`.`id` = `orders`.`organization_id`" +
+              "LEFT OUTER JOIN `shows` ON `shows`.`id` = `items`.`show_id` " +
+              "LEFT OUTER JOIN `events` ON `events`.`id` = `shows`.`event_id` " +
+              "LEFT OUTER JOIN `venues` ON `venues`.`id` = `events`.`venue_id`"  +
+              "WHERE `items`.`deleted_at` IS NULL "
+  end
+
+  def down
+    execute "drop view items_view"
+  end
+end

data/db/migrate/20140210154723_add_cached_stats.rb

@@ -0,0 +1,5 @@
+class AddCachedStats < ActiveRecord::Migration
+  def change
+    add_column :shows, :cached_stats, :text
+  end
+end

data/db/migrate/20140218202726_cache_stats.rb

@@ -0,0 +1,7 @@
+class CacheStats < ActiveRecord::Migration
+  def change
+    Show.find_in_batches do |shows|
+      shows.each {|s| s.delay.refresh_stats unless s.event.nil? }
+    end
+  end
+end

data/db/migrate/20140304171625_passes_ahoy.rb

@@ -0,0 +1,52 @@
+class PassesAhoy < ActiveRecord::Migration
+  def change
+    create_table :pass_types do |t|
+      t.belongs_to  :organization
+      t.belongs_to  :segment
+
+      t.string      :name
+      t.integer     :price
+
+      t.datetime    :starts_at
+      t.datetime    :ends_at
+      t.datetime    :sales_start_at
+      t.datetime    :sales_end_at
+      t.boolean     :on_sale
+      t.integer     :tickets_allowed
+
+      t.boolean     :hide_fee
+
+      t.text        :description
+      t.text        :thanks_copy
+
+    end
+
+    add_index :pass_types, :organization_id
+
+    create_table :passes do |t|
+      t.belongs_to  :organization
+      t.belongs_to  :person
+      t.belongs_to  :cart
+      t.belongs_to  :pass_type
+
+      t.string      :pass_code
+
+      t.integer     :price
+      t.integer     :sold_price
+
+      t.datetime    :starts_at
+      t.datetime    :ends_at
+
+      t.integer     :service_fee
+      t.boolean     :send_email
+
+      t.integer     :tickets_allowed
+      t.integer     :tickets_purchased
+
+      t.timestamps
+    end
+    add_index :passes, :organization_id
+    add_index :passes, :person_id
+    add_index :passes, :pass_type_id
+  end
+end

data/db/migrate/20140304174807_add_passes_kit.rb

@@ -0,0 +1,5 @@
+class AddPassesKit < ActiveRecord::Migration
+  def change
+    PassesKit.create!({:state => "activated", :organization => Organization.first}, :without_protection => true)
+  end
+end

data/db/migrate/20140307144454_add_events_pass_types.rb

@@ -0,0 +1,9 @@
+class AddEventsPassTypes < ActiveRecord::Migration
+  def change
+    create_table :events_pass_types do |t|
+      t.belongs_to  :organization
+      t.belongs_to  :event
+      t.belongs_to  :pass_type
+    end
+  end
+end

data/db/migrate/20140307193350_add_pass_id_to_cart.rb

@@ -0,0 +1,7 @@
+class AddPassIdToCart < ActiveRecord::Migration
+  def change
+    add_column :carts, :applied_pass_id, :integer, :default => nil
+    add_column :tickets, :pass_id, :integer, :default => nil
+    add_column :items, :pass_id, :integer, :default => nil
+  end
+end

data/db/migrate/20140314162422_add_total_paid_to_membership.rb

@@ -0,0 +1,13 @@
+class AddTotalPaidToMembership < ActiveRecord::Migration
+  def change
+    add_column :memberships, :cart_price, :integer
+    add_column :memberships, :total_paid, :integer
+    add_column :memberships, :changed_membership_id, :integer, :defult => nil
+
+    Membership.all.each do |membership|
+      membership.cart_price = membership.sold_price
+      membership.total_paid = membership.sold_price
+      membership.save
+    end
+  end
+end

data/db/migrate/20140319191237_add_show_dates_to_advanced_search.rb

@@ -0,0 +1,6 @@
+class AddShowDatesToAdvancedSearch < ActiveRecord::Migration
+  def change
+    add_column :searches, :show_date_start, :datetime, :default => nil
+    add_column :searches, :show_date_end, :datetime, :default => nil
+  end
+end

data/db/migrate/20140328172333_add_cols_to_events_pass_types.rb

@@ -0,0 +1,6 @@
+class AddColsToEventsPassTypes < ActiveRecord::Migration
+  def change
+    add_column :events_pass_types, :ticket_types, :text
+    add_column :events_pass_types, :excluded_shows, :text
+  end
+end

data/db/migrate/20140328174217_add_deleted_at_to_ept.rb

@@ -0,0 +1,9 @@
+class AddDeletedAtToEpt < ActiveRecord::Migration
+  def self.up
+    add_column :events_pass_types, :deleted_at, :datetime
+  end
+
+  def self.down
+    remove_column :events_pass_types, :deleted_at
+  end
+end

data/db/migrate/20140328185432_add_active_to_ept.rb

@@ -0,0 +1,5 @@
+class AddActiveToEpt < ActiveRecord::Migration
+  def change
+    add_column :events_pass_types, :active, :boolean, :default => true
+  end
+end

data/db/migrate/20140328192612_add_pass_type_id_to_search.rb

@@ -0,0 +1,5 @@
+class AddPassTypeIdToSearch < ActiveRecord::Migration
+  def change
+    add_column :searches, :pass_type_id, :integer, :default => nil
+  end
+end

data/lib/artfully_ose.rb

@@ -1,11 +1,11 @@
+require "devise"
+require "devise_invitable"
+require "devise_suspendable"
 require "artfully_ose/engine"
 require "artfully_ose/common_abilities"
 require "artfully_ose/core_ext"
 require "transitions"
 require "active_record/transitions"
-require "devise"
-require "devise_invitable"
-require "devise_suspendable"
 require "slugged"
 
 require "active_merchant"