artfully_ose 1.3.0.pre3 → 1.3.0.pre4

data/app/controllers/members/sessions_controller.rb

@@ -3,8 +3,6 @@ class Members::SessionsController < Devise::SessionsController
 
   def new
     @org = Organization.find_by_name(params[:org_name])
-    # Store the referrer so we can send them back
-    # where they started after successful sign in.
     session[:continue] = request.referrer
     super
   end

data/app/controllers/membership_comps_controller.rb

@@ -18,8 +18,9 @@ class MembershipCompsController < ArtfullyOseController
     @membership_comp.send_email                  ||= true
     @membership_comp.number_of_memberships       ||= 1
     @membership_comp.person_id                    = params[:person_id]
-    @membership_comp.segment_id                    = params[:segment_id]
+    @membership_comp.segment_id                   = params[:segment_id]
     @membership_comp.search_id                    = params[:search_id]
+    @membership_comp.advanced_search_id                    = params[:advanced_search_id]
     @membership_comp.organization                 = current_user.current_organization
     @membership_comp.find_people
   end

data/app/controllers/prices_controller.rb

@@ -0,0 +1,20 @@
+class PricesController < ApplicationController
+  def update
+    @chart = Chart.find(params[:id])
+    authorize! :edit, @chart
+
+    if @chart.update_attributes_from_params(Chart.polish_params(params[:chart]))
+      flash[:notice] = "Prices saved."
+    else
+      flash[:error] = "Please name all of your ticket types."
+      redirect_to prices_event_url(@chart.event) and return
+    end
+
+    if user_requesting_next_step?
+      redirect_to seating_event_path(@chart.event)
+      #redirect_to image_event_path(@chart.event)
+    else
+      redirect_to prices_event_url(@chart.event)
+    end
+  end
+end

data/app/controllers/shows_controller.rb

@@ -33,7 +33,7 @@ class ShowsController < ArtfullyOseController
   end
 
   def new
-    @show = @event.next_show
+    @show = @event.build_next_show
   end
 
   def calendar
@@ -85,7 +85,9 @@ class ShowsController < ArtfullyOseController
   def show
     @show = Show.includes(:event => :venue, :tickets => :section).find(params[:id])
     authorize! :view, @show
+    @chart = Chart.includes(@show.chart.class.included_models).find(@show.chart_id)
     @tickets = @show.tickets
+    @show.chart = @chart
   end
 
   def edit

data/app/controllers/store/events_controller.rb

@@ -6,14 +6,15 @@ class Store::EventsController < Store::StoreController
     @shows = @event.upcoming_shows_rel.published
 
     if @shows.count < 5
-      @shows = @shows.includes(:event, :chart => [:sections => :ticket_types])
-    elsif 
-      dates = @shows.collect(&:datetime_local_to_event).map {|d| d.to_date}
-      @dates_by_month = dates.group_by {|d| d.strftime("%B %Y")}
+      @shows = @shows.includes(:event => :events_pass_types, :chart => @event.default_chart.class.included_models)
+    elsif session[:last_show_uuid]
+      @previous_show = @event.shows.find_by_uuid(session[:last_show_uuid])
     end
 
+    @current_membership_types = current_member.try(:current_membership_types)
+
     render :single_show and return if @event.single_show?
-    render :calendar    and return if @event.upcoming_public_shows.length > 4
+    render :calendar    and return if @event.upcoming_public_shows.length > 4 || @event.assigned?
     render :show
   end
 

data/app/controllers/store/orders_controller.rb

@@ -10,20 +10,10 @@ class Store::OrdersController < Store::StoreController
     handler.handle_passes(params)
     handler.handle_discount_or_pass_code(params)
 
-    if handler.error.present?
-      flash[:alert] = handler.error unless handler.error.blank?
+    errored = handler.error.present?
+    flash[:alert] = handler.error if errored
 
-      redirect_url = case params[:_source]
-      when 'storefront'
-        store_donate_path
-      else
-        store_order_path
-      end
-
-      redirect_to redirect_url
-    else
-      redirect_to store_order_path
-    end
+    redirect_to redirect_path(errored)
   end
 
   def show
@@ -80,4 +70,12 @@ class Store::OrdersController < Store::StoreController
     def event
       current_cart.tickets.first.event
     end
+
+    def redirect_path(errored)
+      if errored
+        params[:on_error] || store_order_path(@store_organization) 
+      else
+        params[:on_success] || store_order_path(@store_organization)  
+      end 
+    end
 end

data/app/controllers/store/shows_controller.rb

@@ -1,5 +1,6 @@
 class Store::ShowsController < Store::StoreController
   def show
+    session[:last_show_uuid] = params[:id]
     @show = Show.includes(:event, :chart).where(:uuid => params[:id]).first
     render :layout => false
   end

data/app/controllers/store/store_controller.rb

@@ -2,6 +2,8 @@ class Store::StoreController < ActionController::Base
   layout "storefront"
   include CartFinder
   before_filter :store_organization
+  before_filter :save_page_location
+
 
   def store_organization
     @store_organization ||= load_store_organization
@@ -25,4 +27,13 @@ class Store::StoreController < ActionController::Base
       nil
     end 
   end
+
+  #
+  # We're saving all pages for the user
+  # so that if they use the modal to member login,
+  # devise will redirect back to what they were doing
+  #
+  def save_page_location
+    session[:continue] = request.original_url
+  end
 end

data/app/controllers/tickets_controller.rb

@@ -59,34 +59,6 @@ class TicketsController < ArtfullyOseController
     end
   end
 
-  def on_sale
-    authorize! :bulk_edit, Ticket
-    with_confirmation do
-      @show = Show.find(params[:show_id])
-      @selected_tickets = params[:selected_tickets]
-      if @show.bulk_on_sale(@selected_tickets)
-        flash[:notice] = "Put #{to_plural(@selected_tickets.size, 'ticket')} on sale. "
-      else
-        flash[:error] = "Tickets that have been sold or comped can't be put on or taken off sale. A ticket that is already on sale or off sale can't be put on or off sale again."
-      end
-      redirect_to event_show_url(@show.event, @show)
-    end
-  end
-
-  def off_sale
-    authorize! :bulk_edit, Ticket
-    with_confirmation do
-      @show = Show.find(params[:show_id])
-      @selected_tickets = params[:selected_tickets]
-      if @show.bulk_off_sale(@selected_tickets)
-        flash[:notice] = "Put #{to_plural(@selected_tickets.size, 'ticket')} off sale. "
-      else
-        flash[:error] = "Tickets that have been sold or comped can't be put on or taken off sale. A ticket that is already on sale or off sale can't be put on or off sale again."
-      end
-      redirect_to event_show_url(@show.event, @show)
-    end
-  end
-
   def delete
     @show = Show.find(params[:show_id])
     @selected_tickets = params[:selected_tickets]

data/app/controllers/user_memberships_controller.rb

@@ -11,11 +11,16 @@ class UserMembershipsController < ActionController::Base
       build_membership(user, clean_permission, @organization) or build_errors(user, @organization)
     end
 
-
-
     redirect_to organization_url(@organization, :active_tab=>"users") and return
   end
 
+  def reinvite
+    @organization = current_user.current_organization
+    @user = @organization.user_memberships.find(params[:id]).user
+    User.invite!({:email => @user.email}, current_user)
+    redirect_to organization_url(@organization, :active_tab=>"users"), :notice => "We've resent the invite to #{@user.email}." and return
+  end
+
   def destroy
     @organization = Organization.find(params[:organization_id])
     @mship = UserMembership.find(params[:id])

data/app/controllers/venues_controller.rb

@@ -4,6 +4,15 @@ class VenuesController < ArtfullyOseController
     authorize! :edit, @event
     @venue = @event.venue
   end
+
+  #
+  # Used asynchronously from events/new
+  # For now, pass venue name as the id since we can't get it from Bootstrap's typeahead
+  #
+  def show
+    @venue = Venue.most_recently_named(current_organization, params[:id])
+    render :show, :layout => false
+  end
   
   def update
     @event = Event.find(params[:event_id])

data/app/helpers/artfully_ose_helper.rb

@@ -27,6 +27,17 @@ module ArtfullyOseHelper
     end
   end
 
+  def enter_code_string
+    @store_organization.can?(:access, :passes) ? "Have a Discount or Pass Code?" : "Have a Discount Code?"
+  end
+
+  def write_membership_modal
+    (@store_organization.has_kit? :membership) && 
+      (controller_path != "store/memberships") && 
+      (controller_path != "store/donations") && 
+      !member_signed_in?
+  end
+
   def current_role
     current_user.permission_in(current_user.current_organization)
   end
@@ -70,9 +81,12 @@ module ArtfullyOseHelper
     "#{target.class.name.downcase}_#{action_path_name}_path"
   end
 
-  def last_login(t)
-    return "Never logged in" if t.nil?
-    "Last login #{time_ago_in_words(t)} ago"
+  def last_login(user_membership)
+    if user_membership.user.current_sign_in_at.nil?
+      link_to("Resend invite", reinvite_organization_user_membership_path(@organization, user_membership), :method => :put)
+    else
+      "Last login #{time_ago_in_words(user_membership.user.current_sign_in_at)} ago"
+    end
   end
 
   def time_ago_sentence(t)
@@ -292,7 +306,7 @@ module ArtfullyOseHelper
   end
 
   def nav_dropdown(text, link='#')
-    link_to ERB::Util.html_escape(text) + ' <b class="caret"></b>'.html_safe, link, :class => 'dropdown-toggle', 'data-toggle' => 'dropdown'
+    link_to ERB::Util.html_escape(text) + ''.html_safe, link, :class => 'dropdown-toggle', 'data-toggle' => 'dropdown'
   end
 
   def bootstrapped_type(type)

data/app/helpers/seating_helper.rb

@@ -0,0 +1,157 @@
+module SeatingHelper
+
+  def html_class_for(seat)
+    classes = "" 
+
+    seat.ticket_types.each do |ticket_type|
+      classes = classes + "ticket-type-#{ticket_type.id} "
+    end
+
+    if seat.ticket && seat.ticket.sold?
+      classes = classes + "seat-unselectable "
+    else
+      classes = classes + "seat-selectable "
+    end
+
+
+    classes = classes + "available empty " if seat.available
+    #classes = classes + "sold " if seat.ticket && seat.ticket.sold?
+    classes = classes + "killed " if seat.killed
+    classes = classes + "aisle " if seat.aisle
+    classes = classes + "wheelchair " if seat.wheelchair
+    classes = classes + "wheelchair-companion " if seat.wheelchair_companion
+    
+    if seat.on_hold? && (!seat.ticket || !seat.ticket.sold?)
+      classes = classes + "hold house-hold "
+      return "development-hold" if seat.development_hold
+      return "tech-hold" if seat.tech_hold
+      return "contractual-hold" if seat.contractual_hold
+      return "person-hold" if seat.person_hold
+      return "press-hold" if seat.press_hold
+    end    
+  
+     classes
+  end
+  
+  def hold_popover_text_for(seat)
+    str = ""
+
+    if seat.held_for_id.present?
+      str += "Hold for: #{seat.held_for.to_s}"
+      str += "<br>"
+    end
+
+    str += (h seat.hold_note)
+
+    if seat.ticket.present?
+      str += "<br>"
+      str += "<br>"
+      str += (link_to "Sell", "javascript:showSellSeat('#{seat.id}','#{seat.label}')", :class => "btn btn-primary sell-btn", :target => "_blank")
+    end
+
+    str
+  end
+
+  def storefront_html_class_for(seat)
+    classes = ""
+    classes = classes + "seat-in-cart " if seat.ticket.cart_id == current_cart.id #current_cart.tickets.include?(seat.ticket)
+    classes = classes + "available empty " if seat.available_for_purchase
+    classes = classes + "filled " if !seat.available_for_purchase
+    classes = classes + "aisle " if seat.aisle
+    classes = classes + "wheelchair " if seat.wheelchair
+    classes = classes + "wheelchair-companion " if seat.wheelchair_companion
+
+    if current_cart.discount.present?
+      if (current_cart.discount.ticket_types & seat.ticket_types.collect(&:name)).present?
+        classes = classes + "member-on "
+      else
+        classes = classes + "member-off "
+      end
+    end
+
+    if current_cart.applied_pass.present?
+      if current_cart.applied_pass.applies_to? (seat)
+        classes = classes + "member-on "
+      else
+        classes = classes + "member-off "
+      end
+    end
+
+    if current_member
+      if seat.member_ticket_for? @current_membership_types 
+        classes = classes + "member-on "
+      else
+        classes = classes + "member-off "
+      end
+    end
+
+    classes
+  end
+
+  def exchange_html_class_for(seat, ticket_type)
+
+    classes = ""
+    
+    if !seat.available_for_purchase || !seat.ticket_types.include?(ticket_type)
+      classes = classes + "filled "
+      classes = classes + "seat-unselectable "
+    elsif seat.available_for_purchase && seat.ticket_types.include?(ticket_type)
+      classes = classes + "available empty "
+      classes = classes + "seat-selectable "
+    end
+    
+    classes = classes + "aisle " if seat.aisle
+    classes = classes + "wheelchair " if seat.wheelchair
+    classes = classes + "wheelchair-companion " if seat.wheelchair_companion
+
+    classes
+  end
+
+  def storefront_html_class_for(seat)
+    classes = ""
+    classes = classes + "seat-in-cart " if seat.ticket.cart_id == current_cart.id #current_cart.tickets.include?(seat.ticket)
+    classes = classes + "available empty " if seat.available_for_purchase
+    classes = classes + "filled " if !seat.available_for_purchase
+    classes = classes + "aisle " if seat.aisle
+    classes = classes + "wheelchair " if seat.wheelchair
+    classes = classes + "wheelchair-companion " if seat.wheelchair_companion
+
+    if current_cart.discount.present?
+      if (current_cart.discount.ticket_types & seat.ticket_types.collect(&:name)).present?
+        classes = classes + "member-on "
+      else
+        classes = classes + "member-off "
+      end
+    end
+
+    if current_cart.applied_pass.present?
+      if current_cart.applied_pass.applies_to? (seat)
+        classes = classes + "member-on "
+      else
+        classes = classes + "member-off "
+      end
+    end
+
+    if current_member
+      if seat.member_ticket_for? @current_membership_types 
+        classes = classes + "member-on "
+      else
+        classes = classes + "member-off "
+      end
+    end
+
+    classes
+  end
+
+  def hold_header_for(seat)
+    "House Hold"
+  end
+
+  def ticket_type_pseudo_array_for(seat)
+    seat.ticket_types.collect(&:id).join(",")
+  end
+
+  def css_class(ticket_type)
+    ((ticket_type.name || "") + " " + (ticket_type.id || "").to_s).parameterize
+  end
+end

data/app/models/assigned_chart.rb

@@ -0,0 +1,220 @@
+class AssignedChart < Chart 
+  has_many   :seats, :foreign_key => "chart_id"
+  belongs_to :venue
+
+  def by_rows(row_key = :row_index)
+    rows = {}
+    self.seats.each do |seat|
+      seats_in_row = rows.fetch(seat.send(row_key), [])
+      seats_in_row << seat
+      rows[seat.send(row_key)] = seats_in_row
+    end
+    rows
+  end
+
+  #
+  # Suitable for chaining includes
+  # :chart => chart.class.included_models
+  #
+  def self.included_models
+    [:seats => [:held_for, :ticket, :ticket_types]]
+  end
+
+  def num_columns
+    #col_index starts with zero
+    self.seats.empty? ? 0 : self.seats.collect(&:col_index).max + 1
+  end
+
+  def create_tickets
+    raise "Only charts that have been assigned to shows can create tickets" if self.show.nil?
+    self.seats.each do |seat| 
+      seat.create_ticket
+    end
+  end
+
+  def sync(seat_hash)
+
+    transaction do
+      updated_ids = []
+      Rails.logger.debug("CHARTSYNC received: #{seat_hash}")
+      seats = self.seats.includes(:ticket_types, :ticket).all
+      ticket_type_hash = {}
+      self.ticket_types.each {|ticket_type| ticket_type_hash[ticket_type.id] = ticket_type}
+      seat_hash["seatRows"].each do |seat_row|
+        Rails.logger.debug("CHARTSYNC handling row: #{seat_row["rowIndex"]}")
+        row_label = seat_row["rowLabel"]
+        row_index = seat_row["rowIndex"]
+        seat_row["seats"].each do |json_seat|
+
+          Rails.logger.debug("CHARTSYNC -")
+          
+          Rails.logger.debug("CHARTSYNC handling seat: #{json_seat["colIndex"]}")
+          Rails.logger.debug("CHARTSYNC updating seat with id: [#{json_seat["id"]}]")
+          seat = seats.find{|s| s.id == json_seat["id"].to_i}
+          if seat.present?
+            Rails.logger.debug("CHARTSYNC found seat: #{seat.inspect}")
+          else
+            Rails.logger.debug("CHARTSYNC no seat found. Creating a new seat.")
+            seat = Seat.new if seat.nil?
+          end
+          #seat = Seat.where(:id => json_seat["id"]).first_or_initialize
+          updated_ids               <<json_seat["id"]
+          seat.chart = self
+          seat.row_index            = row_index
+          seat.row_label            = row_label
+
+          seat.col_index            = json_seat["colIndex"]
+          seat.col_label            = (json_seat["colIndex"].to_i + 1).to_s
+          
+          seat.label                = json_seat["label"]
+          seat.available            = json_seat["available"]
+          seat.killed               = json_seat["killed"]
+          seat.aisle                = json_seat["aisle"]
+          seat.wheelchair           = json_seat["wheelchair"]
+          seat.wheelchair_companion = json_seat["wheelchairCompanion"]
+
+          seat.house_hold           = json_seat["houseHold"]
+          seat.development_hold     = json_seat["developmentHold"]
+          seat.tech_hold            = json_seat["techHold"]
+          seat.contractual_hold     = json_seat["contractualHold"]
+          seat.person_hold          = json_seat["personHold"]
+          seat.press_hold           = json_seat["pressHold"]
+
+          seat.hold_note            = json_seat["holdNote"]
+          seat.held_for_id          = json_seat["holdPersonId"]
+          seat.seat_note            = json_seat["seatNote"]
+
+          Rails.logger.debug("CHARTSYNC ticket_types are: #{json_seat["ticketTypeIds"]}")
+
+          if (seat.ticket_types.collect(&:id) != json_seat["ticketTypeIds"].collect{|tt| tt.to_i})
+            seat.ticket_types_seats.destroy_all
+            json_seat["ticketTypeIds"].each do |ticket_type_id|
+              Rails.logger.debug("CHARTSYNC adding ticket_type: #{ticket_type_id}")
+              #seat.ticket_types         << TicketType.find(ticket_type_id)
+              seat.ticket_types         << ticket_type_hash[ticket_type_id.to_i]
+            end
+          else
+            Rails.logger.debug("CHARTSYNC no changes to ticket types")
+          end
+
+          Rails.logger.debug("CHARTSYNC saving seat: #{seat.inspect}")
+          seat.update_ticket
+          Rails.logger.debug("CHARTSYNC Changed: #{seat.changes}")
+          seat.save
+          seat.create_ticket
+        end
+      end
+      # deleted_ids = self.seats.collect(&:id).select{|id| updated_ids.exclude?(id)}
+      Rails.logger.debug("CHARTSYNC updated seats: #{updated_ids}")
+      self.seats.where('id not in (?)', updated_ids).destroy_all unless updated_ids.blank?
+      self.show.delay.refresh_stats if self.show
+      self.event.venue.delay.update_default_chart_from(self) if self.event
+    end
+
+  end
+
+  #
+  # Pass a venue or event
+  #
+  def self.default_chart_for(chartable)
+    chart = AssignedChart.where(chartable.class.name.foreign_key.to_sym => chartable.id)
+                         .where(:is_template => true)
+                         .first
+    return chart unless chart.nil?
+
+    chart = AssignedChart.new
+    ["A","B","C","D","E","F","G","H","I","J"].each_with_index do |row_label, index|
+      (0..9).each do |col_index|
+        seat = chart.seats.build({:row_index => index,
+                                  :col_index => col_index,
+                                  :row_label => row_label,
+                                  :col_label => col_index + 1,
+                                  :label     => "#{row_label}#{col_index+1}",
+                                  :available => true})
+        chart.seats << seat
+      end
+    end
+    chart.is_template = true
+    chart.send("#{chartable.class.name.downcase}=", chartable)
+    chart.name = chartable.name
+    chart.organization = chartable.organization
+    chart
+  end
+  def update_attributes_from_params(params_hash = {}, parent_chart = nil)
+    super(params_hash)
+    attach_ticket_types_to_seats(parent_chart)
+  end
+
+  #
+  # Rebuild-the ticket types from the parent_chart
+  #
+  def attach_ticket_types_to_seats(parent_chart)
+    return if parent_chart.nil?
+    seats.each do |seat|
+      parent_seat = parent_chart.seats
+                                .where(:row_index => seat.row_index)
+                                .where(:col_index => seat.col_index)
+                                .first
+      
+      Rails.logger.debug("SEATS parent_seat #{parent_seat.inspect}")
+      parent_seat.ticket_types.each do |parent_ticket_type|
+        Rails.logger.debug("SEATS parent ticket type #{parent_ticket_type.inspect}")
+        Rails.logger.debug("SEATS my ticket types #{self.ticket_types.inspect}")
+        ticket_type = self.ticket_types.find{|tt| tt.name == parent_ticket_type.name}
+        Rails.logger.debug("SEATS found ticket_type #{ticket_type.inspect}")
+        if ticket_type
+          seat.ticket_types << ticket_type
+          Rails.logger.debug seat.ticket_types.inspect
+        end
+      end
+      
+      seat.save if self.persisted?
+    end
+  end
+
+  #
+  # Returns an array of available tickets as well as an error
+  # [[ ticket array ], "error message suitable for end-user display"]
+  #
+  # this method ignores ticket_limit
+  #
+  def get_available_tickets(ticket_type, ticket_limit = 4, member = nil, seat = nil, cart = nil)
+    #
+    # TODO: check member, ticket holds, etc... 
+    #
+
+    available_to = 1
+    if member && ticket_type.member_ticket?
+      Rails.logger.debug("ASSIGNED SEATING Checking for tickets available to this member")
+      available_to = ticket_type.available_to(member)
+      Rails.logger.debug("ASSIGNED SEATING available_to #{available_to}")
+      already_in_cart = cart.tickets.select{|t| t.ticket_type == ticket_type}.length
+      Rails.logger.debug("ASSIGNED SEATING already in cart #{already_in_cart}")
+      available_to = available_to - already_in_cart
+      Rails.logger.debug("ASSIGNED SEATING available to this member #{available_to}")
+    end
+
+    if available_to > 0 
+      [ Array.wrap(Ticket.available.where(:seat_id => seat.id).first), nil ]
+    else
+      [ [], "Sorry, we couldn't add any more tickets at this price level." ]
+    end
+  end
+
+  protected
+
+    def duplicate(options = {})
+      new_chart = super(options)
+
+      self.seats.each do |seat|
+        new_chart.seats << seat.dup!
+      end
+
+      if (!!options[:save])
+        new_chart.save
+        new_chart.attach_ticket_types_to_seats(self)
+      end
+      
+      new_chart
+    end
+end