artfully_ose 1.3.0.pre3 → 1.3.0.pre4

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

@@ -0,0 +1,41 @@
+.sections{:style => "#{'display:none' if collapsed}"}
+  - if show.chart.sections.storefront.empty?
+    No tickets are available for this show
+  - else
+    %table.table.available-ticket-type-table
+      - show.sections_for(current_member).each do |section|
+        -section.ticket_types_for(current_member).each do |ticket_type|
+          %tr
+            %td.ticket-type-name
+              = ticket_type.name
+            %td.right.span2.ticket-type-price
+              %span{:class => 'price'}= number_as_cents(ticket_type.price)
+            %td.right.span4.controls
+              = 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 :on_error,   store_event_path(@store_organization, show.event)
+                = hidden_field_tag :on_success, store_order_path(@store_organization)
+                = 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
+
+                - available = ticket_type.available("storefront", 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, available].min).to_a.map {|i| [pluralize(i, 'Ticket'), i]}), :style => "width:140px", :class => 'ticket-type-quantity'
+
+                = submit_tag 'Add to cart', :class => 'add-to-cart btn btn-primary'
+          %tr.no-border
+            %td.ticket-type-description{:colspan => "4"}
+              -unless ticket_type.description.nil?
+                -description = ticket_type.description
+                -if description.length > 150
+                  .toggle-truncated
+                    .truncated
+                      = simple_format "#{truncate(description, :length => 150)} (#{link_to 'more','#', :class => 'toggle'})"
+                    .not-truncated{:style => 'display:none;'}
+                      =simple_format "#{description} (#{link_to 'less','#', :class => 'toggle'})"
+                - else
+                  =simple_format description

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

@@ -10,12 +10,25 @@
           -unless current_cart.tickets.empty?
             %h4 Tickets
             %table.table#tickets-table
-              -current_cart.tickets.each do |ticket|
+              -current_cart.tickets.each_with_index do |ticket, index|
                 %tr.ticket-row
                   %td
                     =ticket.event.name
                     %br
+                    =ticket.ticket_type.name
+                    %br
                     =ticket.show
+                    -if ticket.seat
+                      %br
+                      ="Row #{ticket.seat.row_label}"
+                      %br
+                      ="Seat #{ticket.seat.col_label}"
+                      -if ticket.seat.qualifier.present?
+                        %br
+                        =ticket.seat.qualifier
+                      -if ticket.seat.seat_note.present?
+                        %br
+                        =ticket.seat.seat_note
                   %td.right=number_as_cents ticket.price
 
           -unless current_cart.memberships.empty?
@@ -43,7 +56,7 @@
                   %td.right=number_as_cents donation.price
 
           = form_tag store_order_path(@store_organization.cached_slug) do
-            %table.table
+            %table.table.no-border
               %tr#discount-input{:style => 'display:none'}
                 %td
                   = text_field_tag 'discount_or_pass_code', params[:discount_or_pass_code], :placeholder => @enter_code_string, :style => "margin-bottom:0px"
@@ -60,7 +73,7 @@
                     =number_as_cents current_cart.discount_amount
               -else     
                 %tr#discount-link
-                  %td= link_to @enter_code_string, "#"     
+                  %td= link_to enter_code_string, "#"     
 
           %table.table#totals-table
             -unless current_cart.fee_in_cents == 0
@@ -165,7 +178,7 @@
           -unless @special_instructions_hash.empty?
             .navbar.clean
               .navbar-inner
-                .brand.brand-lite Special
+                .brand.brand-lite Special Instructions
 
             #special-instructions
               - @special_instructions_hash.each do |event_id, caption|

data/app/views/store/shared/_donate_form.html.haml

@@ -1,6 +1,7 @@
 - donation_kit = @donation_kit || @store_organization.kit(:regular_donation)
 = form_tag store_order_path(@store_organization.cached_slug), :method => :post, :class => 'add-donation-to-cart form-inline' do
-  = hidden_field_tag :_source, 'storefront'
+  = hidden_field_tag :on_error,   store_donate_path(@store_organization)
+  = hidden_field_tag :on_success, store_order_path(@store_organization)
 
   - if donation_kit.suggested_gifts.present? && donation_kit.suggested_gifts.any?
     - donation_kit.suggested_gifts.each_with_index do |suggested_gift, index|

data/app/views/store/shared/_small_donate_form.html.haml

@@ -16,7 +16,7 @@
       %p= "#{@store_organization.authorization_hash[:fsp_name]} is a fiscally sponsored project of Fractured Atlas, a non-profit arts service organization. Donations for the purposes of #{@store_organization.authorization_hash[:fsp_name]} must be made payable to Fractured Atlas and are tax-deductible to the extent permitted by law."
 
     = form_tag store_order_path(@store_organization.cached_slug), :method => :post, :class => 'add-donation-to-cart form-inline' do
-      = hidden_field_tag :_source, 'cart'
+      = hidden_field_tag :return_to, store_order_path(@store_organization)
       .preset-amount.last
         .input-prepend
           %span.add-on $

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

@@ -9,42 +9,4 @@
 
     = show.datetime_local_to_event.strftime("%l:%M %p")
 
-.sections{:style => "#{'display:none' if collapsed}"}
-  - if show.chart.sections.storefront.empty?
-    No tickets are available for this show
-  - else
-    %table.table.available-ticket-type-table
-      - show.sections_for(current_member).each do |section|
-        -section.ticket_types_for(current_member).each do |ticket_type|
-          %tr
-            %td.ticket-type-name
-              = ticket_type.name
-            %td.right.span2.ticket-type-price
-              %span{:class => 'price'}= number_as_cents(ticket_type.price)
-            %td.right.span4.controls
-              = 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
-
-                - available = ticket_type.available("storefront", 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, available].min).to_a.map {|i| [pluralize(i, 'Ticket'), i]}), :style => "width:140px", :class => 'ticket-type-quantity'
-
-                = submit_tag 'Add to cart', :class => 'add-to-cart btn btn-primary'
-          %tr.no-border
-            %td.ticket-type-description{:colspan => "4"}
-              -unless ticket_type.description.nil?
-                -description = ticket_type.description
-                -if description.length > 150
-                  .toggle-truncated
-                    .truncated
-                      = simple_format "#{truncate(description, :length => 150)} (#{link_to 'more','#', :class => 'toggle'})"
-                    .not-truncated{:style => 'display:none;'}
-                      =simple_format "#{description} (#{link_to 'less','#', :class => 'toggle'})"
-                - else
-                  =simple_format description
+=render :partial => "store/#{show.chart.class.name.underscore.pluralize}/show", :locals => {:show => show, :collapsed => collapsed}

data/app/views/ticket_types/edit.html.haml

@@ -2,7 +2,7 @@
   .close{'data-dismiss'=>'modal'} x
   .row-fluid
     .span10
-      %h3 New Ticket Type
+      %h3 Edit Ticket Type
 
 = form_for( @ticket_type, :html => { :class => 'form-horizontal' } ) do |form|
   .modal-body

data/app/views/user_memberships/_list.html.haml

@@ -25,7 +25,7 @@
             -if user_membership.receive_daily_sales_report?
               %i.icon-envelope.artfully-tooltip#daily-sales-report-icon{"data-toggle"=>"tooltip", :rel => "tooltip", "data-original-title" => "This user will receive the daily sales report.", "data-trigger" => "hover"}
           .other
-            ="#{pluralize user_membership.user.sign_in_count, 'login'}. #{last_login(user_membership.user.current_sign_in_at)}."
+            ="#{pluralize user_membership.user.sign_in_count, 'login'}. #{last_login(user_membership)}.".html_safe
         .span5.user-role
           =user_membership.role_title
 

data/app/views/venues/edit.html.haml

@@ -40,7 +40,7 @@
           
       .control-group
         =form.label :time_zone, :class => 'control-label' do
-          "Time Zone"
+          Time Zone
           .tip.muted Changing your time zone will change your existing show times.
         .controls
           = form.time_zone_select :time_zone, ActiveSupport::TimeZone.us_zones, {:default => current_user.current_organization.time_zone}, {:class => 'input-xlarge'}

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

@@ -0,0 +1,11 @@
+- if @venue
+  #venue{:style => "text-align: right"}
+    =link_to image_tag("https://maps.google.com/maps/api/staticmap?size=290x140&maptype=roadmap&markers=color:red|#{@venue.address_as_url_query}&sensor=false&zoom=15"), "https://maps.google.com/maps?q=#{@venue.address_as_url_query.html_safe}&z=15"
+    %h4{:style => "margin-bottom: 0px"}=@venue.name
+    %div=@venue.address1
+    -unless @venue.address2.blank?
+      %div=@venue.address2
+    %div=@venue.city_state_zip_as_string
+    %p
+      .tip.muted
+        We will re-use your prices and seating information from your most recent event this venue. You can make changes to this information in event setup.

data/config/routes.rb

@@ -84,7 +84,12 @@ Rails.application.routes.draw do
 
   resources :organizations do
     put :tax_info, :on => :member
-    resources :user_memberships
+    resources :user_memberships do
+      member do
+        put :reinvite
+      end
+    end
+
     member do
       post :connect
     end
@@ -106,6 +111,7 @@ Rails.application.routes.draw do
       post :contacts
       get :donations
       get :ticket_sales
+      get :all_sales
     end
   end
 
@@ -275,6 +281,7 @@ Rails.application.routes.draw do
       get :resell
       get :wp_plugin
       get :prices
+      get :seating
       get :image
       get :messages
     end
@@ -300,6 +307,11 @@ Rails.application.routes.draw do
     end
     resource :venue, :only => [:edit, :update]
   end
+  resources :event_calendars, :only => [:index]
+
+  resources :venues, :only => [:show]
+  resources :charts, :only => [:show]
+  resources :seats, :only => [:show]
 
   resources :shows, :only => [] do
     resources :tickets, shallow: true, :only => [ :new, :create ] do
@@ -319,17 +331,14 @@ Rails.application.routes.draw do
     end
   end
 
-  resources :campaigns do
-    resources :appeals
-    resources :contributions, :only => [:new, :create]
-    member do
-      get :copy
-    end
-  end
-
-  resources :charts, :only => [:update] do
+  # Working under the assumption that this isn't needed
+  # resources :general_admission_charts, :only => [:update] do
+  #   resources :sections
+  # end  
+  resources :assigned_charts, :controller => :charts, :only => [:update, :show] do
     resources :sections
   end
+  resources :prices, :only => [:update]
 
   resources :sections do
     resources :ticket_types, :only => [:new, :create]
@@ -357,6 +366,14 @@ Rails.application.routes.draw do
     end
   end
 
+  resources :campaigns do
+    resources :appeals
+    resources :contributions, :only => [:new, :create]
+    member do
+      get :copy
+    end
+  end
+
   resources :job_monitors, :only => [:show], :as => :monitors
   resources :contributions
 

data/db/migrate/20140828174357_add_type_to_chart.rb

@@ -0,0 +1,7 @@
+class AddTypeToChart < ActiveRecord::Migration
+  def change
+    add_column :charts, :type, :string
+    Chart.update_all(:type => "GeneralAdmissionChart")
+  end
+
+end

data/db/migrate/20140828195617_create_seats.rb

@@ -0,0 +1,16 @@
+class CreateSeats < ActiveRecord::Migration
+  def change
+    create_table :seats do |t|
+      t.integer :chart_id,        :null => false
+      t.integer :row_index
+      t.integer :col_index
+      t.string  :row_label
+      t.string  :col_label
+      t.string  :label
+
+      t.boolean :available
+      t.boolean :killed
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20140829135426_add_venue_to_chart.rb

@@ -0,0 +1,5 @@
+class AddVenueToChart < ActiveRecord::Migration
+  def change
+    add_column :charts, :venue_id, :integer, :default => nil
+  end
+end

data/db/migrate/20140829143520_add_assigned_to_event.rb

@@ -0,0 +1,5 @@
+class AddAssignedToEvent < ActiveRecord::Migration
+  def change
+    add_column :events, :assigned, :boolean, :default => false
+  end
+end

data/db/migrate/20140904164927_add_fields_to_seat.rb

@@ -0,0 +1,14 @@
+class AddFieldsToSeat < ActiveRecord::Migration
+  def change
+    add_column :seats, :house_hold,           :boolean, :default => false
+    add_column :seats, :development_hold,     :boolean, :default => false
+    add_column :seats, :tech_hold,            :boolean, :default => false
+    add_column :seats, :contractual_hold,     :boolean, :default => false
+    add_column :seats, :person_hold,          :boolean, :default => false
+    add_column :seats, :press_hold,           :boolean, :default => false
+
+    add_column :seats, :wheelchair,           :boolean, :default => false
+    add_column :seats, :wheelchair_companion, :boolean, :default => false
+    add_column :seats, :aisle,                :boolean, :default => false
+  end
+end

data/db/migrate/20140912170010_add_note_to_seat.rb

@@ -0,0 +1,6 @@
+class AddNoteToSeat < ActiveRecord::Migration
+  def change
+    add_column :seats, :seat_note, :string
+    add_column :seats, :hold_note, :string
+  end
+end

data/db/migrate/20140919152307_add_seats_to_ticket.rb

@@ -0,0 +1,5 @@
+class AddSeatsToTicket < ActiveRecord::Migration
+  def change
+    add_column :tickets, :seat_id, :integer, :default => nil
+  end
+end

data/db/migrate/20140930224543_add_public_note_to_chart.rb

@@ -0,0 +1,5 @@
+class AddPublicNoteToChart < ActiveRecord::Migration
+  def change
+    add_column :charts, :public_note, :string
+  end
+end

data/db/migrate/20141001140737_add_seat_id_index_to_tickets.rb

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

data/db/migrate/20141001193242_associate_hold_with_person.rb

@@ -0,0 +1,6 @@
+class AssociateHoldWithPerson < ActiveRecord::Migration
+  def change
+    add_column :seats, :held_for_id, :integer, :default => nil
+    add_index  :seats, :held_for_id 
+  end
+end

data/db/migrate/20141021175311_create_ticket_types_seats.rb

@@ -0,0 +1,11 @@
+class CreateTicketTypesSeats < ActiveRecord::Migration
+  def change
+    create_table :ticket_types_seats do |t|
+      t.belongs_to  :ticket_type
+      t.belongs_to  :seat
+    end
+
+    add_index :ticket_types_seats, :ticket_type_id
+    add_index :ticket_types_seats, :seat_id
+  end
+end

data/db/migrate/20150106161744_migrate_charts_back_to_venues.rb

@@ -0,0 +1,18 @@
+class MigrateChartsBackToVenues < ActiveRecord::Migration
+  #
+  # This migration is going to be slow but we can't run it in parallel after a release
+  #
+
+  def change
+    Venue.all.each do |venue|
+      next if venue.default_chart.present?
+
+      if venue.event.present? && venue.event.default_chart.present?
+        venue.update_default_chart_from(venue.event.default_chart)
+      else
+        GeneralAdmissionChart.default_chart_for(venue).save
+      end
+    
+    end
+  end
+end

data/db/migrate/20151105085424_add_creator_to_items_view.rb

@@ -0,0 +1,40 @@
+class AddCreatorToItemsView < 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, " +
+                "users.email as creator " +
+                "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`"  +
+                "LEFT OUTER JOIN `users` ON `users`.`id` = `orders`.`creator_id`"  +
+                "WHERE `items`.`deleted_at` IS NULL "
+  end
+
+  def down
+    execute "drop view items_view"
+  end
+end