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

data/app/models/job/order_processor.rb

@@ -28,6 +28,7 @@ class OrderProcessor < Struct.new(:order, :options)
       self.order.create_donation_actions unless skip_actions
       self.order.create_purchase_action  unless skip_actions
       process_memberships
+      process_passes
     end
 
     begin
@@ -60,7 +61,15 @@ class OrderProcessor < Struct.new(:order, :options)
     self.order.memberships.each do |membership_item|
       Member.for(membership_item.product, self.order.person)
     end
-    self.order.create_membership_action
+    self.order.create_generic_action("memberships")
+  end
+
+  def process_passes
+    self.order.passes.each do |pass_item|
+      pass_item.product.person = self.order.person
+      pass_item.product.save
+    end
+    self.order.create_generic_action("passes")
   end
 
   def generate_pdf

data/app/models/job/show_creator.rb

@@ -26,7 +26,8 @@ class ShowCreator < Struct.new(:datetimes, :show_params, :chart_params, :event,
         @show.chart_id = @show.chart.id
 
         @show.datetime = DateTime.parse(datetime_string).change(:offset => offset(datetime_string, event.time_zone))
-        @show.go!(publish)      
+        @show.go!(publish)    
+        @show.refresh_stats  
       end
     end
   end

data/app/models/kit.rb

@@ -61,7 +61,7 @@ class Kit < ActiveRecord::Base
   end
 
   def self.subklasses
-    @subklasses ||= [ TicketingKit, RegularDonationKit, SponsoredDonationKit, ResellerKit, MailchimpKit, MembershipKit, ScannableTicketsKit ].freeze
+    @subklasses ||= [ TicketingKit, RegularDonationKit, SponsoredDonationKit, ResellerKit, MailchimpKit, MembershipKit, PassesKit, ScannableTicketsKit ].freeze
   end
 
   def self.pad_with_new_kits(kits = [])

data/app/models/kits/passes_kit.rb

@@ -0,0 +1,62 @@
+class PassesKit < Kit
+  include ActionView::Helpers::SanitizeHelper
+
+  acts_as_kit :with_approval => true, :admin_only => true do
+    approve  :unless => :no_bank_account?
+
+    self.configurable = true
+
+    state_machine do
+      state :cancelled, :enter => :kit_cancelled
+    end
+
+    when_active do |organization|
+      organization.can :access, :passes
+    end
+  end
+
+  before_save :initialize_accessors
+  before_save :sanitize_accessors
+
+  ACCESSORS = [ :marketing_copy_heading, :marketing_copy_sidebar ]
+  
+  ACCESSORS.each do |accessor|
+    attr_accessible accessor
+  end
+  
+  store :settings, :accessors => ACCESSORS
+
+  def friendly_name
+    "Passes"
+  end  
+
+  def no_bank_account?
+    errors.add(:requirements, "Your organization needs bank account information first.") if organization.bank_account.nil?
+    organization.bank_account.nil?
+  end
+
+  def pitch
+    "Sell Passes!"
+  end
+
+  def configured?
+    passes_state == "configured"
+  end
+
+  def configured!
+    settings[:passes_state] = "configured"
+    save
+  end
+
+  def initialize_accessors
+    ACCESSORS.each do |accessor|
+      self.send("#{accessor}=", "") if self.send("#{accessor}").nil?
+    end  
+  end
+
+  def sanitize_accessors
+    ACCESSORS.each do |accessor|
+      self.send("#{accessor}=", (sanitize self.send(accessor)))
+    end
+  end
+end

data/app/models/membership.rb

@@ -1,3 +1,7 @@
+#
+# service_fee represents the fee displayed to the patron in the cart.
+# If the producer is eating the fee, service_fee is 0
+#
 class Membership < ActiveRecord::Base
   belongs_to :organization
   belongs_to :member
@@ -18,17 +22,30 @@ class Membership < ActiveRecord::Base
   scope :lapsed,       lambda { |time = Time.now, since = (time - 1.year)| where("ends_at < ?", time).where("ends_at > ?", since.midnight) }
   scope :past,         lambda { |time = Time.now| where("ends_at < ?", time - 1.year) }
 
+  belongs_to :changed_membership, :class_name => "Membership"
+  has_one    :changed_to, :class_name => "Membership", :foreign_key => "changed_membership_id"
+
   def self.for(membership_type, member = nil)
     new.tap do |membership|
       membership.membership_type  = membership_type
       membership.organization     = membership_type.organization
       membership.price            = membership_type.price_for(member)
+      membership.cart_price       = membership.price
       membership.sold_price       = membership.price
+      membership.total_paid       = membership.price
       membership.starts_at        = membership_type.starts_at
       membership.ends_at          = membership_type.ends_at
     end
   end
 
+  def changed?
+    self.changed_to.present?
+  end
+
+  def changee?
+    self.changed_membership.present?
+  end
+
   def update_member_counters
     self.member.try(:count_memberships)
   end
@@ -42,16 +59,12 @@ class Membership < ActiveRecord::Base
     items.first
   end
 
-  def cart_price
-    price
-  end
-
   def self.realized_fee
     0
   end
 
-  def realized_fee
-    self.membership_type.hide_fee? ? self.price * MembershipType::SERVICE_FEE : 0
+  def realized_fee 
+    self.membership_type.hide_fee? ? self.cart_price * MembershipType::SERVICE_FEE : 0
   end
 
   def expired?

data/app/models/membership_change.rb

@@ -50,7 +50,7 @@ class MembershipChange
 
       # Add the new memberships
       new_memberships.each do |membership|
-        cart.memberships << membership
+        @cart.memberships << membership
       end
     end
     @cart
@@ -91,12 +91,17 @@ class MembershipChange
         @new_memberships = membership_ids.map do |old_membership_id|
           old = old_memberships[old_membership_id]
 
-          # Create the new membership, setting sold price, and the start/end dates from the old one
-          membership           = Membership.for(membership_type)
-          membership.starts_at = old.starts_at
-          membership.ends_at   = old.ends_at
-          membership.price     = price
-          membership.member    = person.member
+          membership            = Membership.for(membership_type)
+          membership.starts_at  = old.starts_at
+          membership.ends_at    = old.ends_at
+
+          membership.price      = membership.membership_type.price
+          membership.cart_price = price
+          membership.sold_price = price
+          membership.total_paid = old.total_paid + price
+          membership.member     = person.member
+
+          membership.changed_membership = old
 
           membership
         end
@@ -169,8 +174,14 @@ class MembershipChange
   end
 
   class Order < ::Order
+    before_create :set_details
+
     def membership_action_class
       ChangeAction
     end
+
+    def set_details
+      self.details = "Membership type change."
+    end
   end
 end

data/app/models/membership_comp.rb

@@ -89,6 +89,7 @@ class MembershipComp
         membership                  = Membership.for(self.membership_type)
         membership.ends_at          = self.ends_at
         membership.sold_price       = 0
+        membership.total_paid       = 0
         membership.welcome_message  = self.welcome_message
         membership.send_email       = self.send_email
         membership.save

data/app/models/membership_type.rb

@@ -29,7 +29,7 @@ class MembershipType < ActiveRecord::Base
     memberships 'Memberships sold' do |m|
       m.count
     end
-    members { |m| m.count }
+    members { |m| m.distinct(:member_id).count }
     duration
     period
     starts_at

data/app/models/order.rb

@@ -238,6 +238,10 @@ class Order < ActiveRecord::Base
     items(reload).select(&:membership?)
   end
 
+  def passes(reload=false)
+    items(reload).select(&:pass?)
+  end
+
   def membership_types
     memberships.collect{|item| item.product.membership_type}.uniq
   end
@@ -374,7 +378,7 @@ class Order < ActiveRecord::Base
     self.person.calculate_lifetime_donations
   end
 
-  def membership_action_class
+  def action_class
     GetAction
   end
 
@@ -428,24 +432,29 @@ class Order < ActiveRecord::Base
     end
   end
 
-  def create_membership_action
-    unless self.memberships.empty?
-      action                  = self.membership_action_class.new
+  #
+  # Creates actions for collection_name
+  #
+  # For example, if we're creating actions for the passses on this order, call order.create_generic_action('passes')
+  # This order must respond to .send(collection_name)
+  #
+  def create_generic_action(collection_name)
+    unless self.passes.empty?
+      action                  = self.action_class.new
       action.person           = self.person
       action.subject          = self
       action.organization     = self.organization
-      action.details          = membership_details
+      action.details          = action_details(self.send(collection_name).length, collection_name)
       action.occurred_at      = self.created_at
 
-      #Weird, but Rails can't initialize these so the subtype is hardcoded in the model
       action.subtype          = action.subtype
       action.save!
       action      
     end
   end
-
-  def membership_details
-    details = "#{pluralize(self.memberships.size, 'membership')}"
+  
+  def action_details(quantity, thing)
+    details = "#{pluralize(quantity, thing)}"
     details = details + ". #{self.notes}" unless self.notes.blank?
     details
   end

data/app/models/order_handler.rb

@@ -60,6 +60,14 @@ class OrderHandler
     @discount
   end
 
+  def apply_pass(params)
+    if params[:pass_code].present?
+      @pass = Pass.where(:pass_code => params[:pass_code]).first
+      @pass.apply_pass_to_cart(self.cart)
+    end
+    @pass
+  end
+
   def handle_donation(params, organization)
     if params[:donation_amount]
       self.cart.clear_donations
@@ -90,4 +98,18 @@ class OrderHandler
       
     end
   end
+
+  #
+  # Note that this handles passes *currently being purchased* NOT passes that are being applied to the cart
+  #
+  def handle_passes(params)
+    unless params[:pass_type].blank?
+      pass_type_id = params[:pass_type][:id]
+      quantity = params[:quantity].to_i
+      (1..quantity).each do |i|
+        self.cart.passes << Pass.for(PassType.find(pass_type_id))
+      end
+      
+    end    
+  end
 end

data/app/models/organization.rb

@@ -22,6 +22,9 @@ class Organization < ActiveRecord::Base
   has_many :membership_types
   has_many :memberships
   has_many :members
+
+  has_many :pass_types
+
   has_many :searches
 
   has_many :users, :through => :user_memberships, :order => 'user_memberships.owner desc'
@@ -110,6 +113,10 @@ class Organization < ActiveRecord::Base
     self.kits.where(:type => "MembershipKit").first
   end
 
+  def passes_kit
+    self.kits.where(:type => "PassesKit").first
+  end
+
   delegate :can?, :cannot?, :to => :ability
   def ability
     OrganizationAbility.new(self)

data/app/models/pass.rb

@@ -0,0 +1,45 @@
+class Pass < ActiveRecord::Base
+  belongs_to  :pass_type
+  belongs_to  :person
+  belongs_to  :organization
+  has_many    :tickets
+
+  def self.for(pass_type)
+    new.tap do |pass|
+      pass.pass_type  = pass_type
+      pass.organization     = pass_type.organization
+      pass.price            = pass_type.price
+      pass.sold_price       = pass.price
+      pass.tickets_allowed  = pass_type.tickets_allowed
+      pass.tickets_allowed  = 0
+      pass.pass_code        = new_pass_code
+    end
+  end  
+
+  def cart_price
+    price
+  end
+
+  def realized_fee
+    self.pass_type.hide_fee? ? self.price * PassType::SERVICE_FEE : 0
+  end
+
+  def self.new_pass_code(size=8)
+    # Avoid confusable characters like 1/L and 0/O
+    charset = %w{ 2 3 4 6 7 9 A C D E F G H J K M N P Q R T V W X Y Z}
+    (0...size).map{ charset.to_a[rand(charset.size)] }.join
+  end
+
+  def apply_pass_to_cart(cart)
+    transaction do
+      cart.applied_pass = self
+      cart.tickets.each do |ticket|
+        ticket.pass = self
+        ticket.cart_price = 0
+        ticket.save
+      end
+      FeeCalculator.apply(FeeStrategy.new).to(cart)
+      cart.save
+    end
+  end
+end

data/app/models/pass_type.rb

@@ -0,0 +1,19 @@
+class PassType < ActiveRecord::Base
+  belongs_to :organization
+  has_many :passes
+
+  attr_accessible :name, :description, :hide_fee, :thanks_copy, :sales_start_at, :sales_end_at, 
+                  :on_sale, :price, :tickets_allowed, :starts_at, :ends_at
+
+  validates :name, :description, :price, :tickets_allowed, :presence => true
+
+  scope :storefront, where(:on_sale => true).where("sales_start_at < ? or sales_start_at is null", DateTime.now).where("sales_end_at > ? or sales_end_at is null", DateTime.now)
+  scope :on_sale, where(:on_sale => true)
+  scope :not_ended, where('ends_at > ?', DateTime.now)
+
+  SERVICE_FEE = 0.05
+
+  def passerize
+    self.name.end_with?("Pass") ? self.name : self.name + " Pass"
+  end
+end

data/app/models/person.rb

@@ -26,6 +26,7 @@ class Person < ActiveRecord::Base
   has_one     :address, :validate => false
   has_one     :member
   has_many    :memberships, :through => :member
+  has_many    :passes
 
   accepts_nested_attributes_for :address, :allow_destroy => false
   accepts_nested_attributes_for :phones, :reject_if => lambda { |p| p[:number].blank? }, :allow_destroy => true
@@ -282,10 +283,12 @@ class Person < ActiveRecord::Base
   end
   
   def self.first_or_create(attributes=nil, options ={}, &block)
+    Rails.logger.debug("Person.first_or_create #{attributes.inspect}")
     attributes[:organization_id] ||= attributes[:organization].try(:id)
     raise(ArgumentError, "You must include an organization when searching for people") if attributes[:organization_id].blank?
     
     attributes.delete(:organization)
+    return Person.where(:id => attributes[:id]).where(:organization_id => attributes[:organization_id]).first if attributes[:id].present?
     return Person.create(attributes, options, &block)                                  if attributes[:email].blank?
     
     Person.where(:email => attributes[:email]).where(:organization_id => attributes[:organization_id]).first || Person.create(attributes, options, &block) 
@@ -296,6 +299,7 @@ class Person < ActiveRecord::Base
     raise(ArgumentError, "You must include an organization when searching for people") if attributes[:organization_id].blank?
     
     attributes.delete(:organization)
+    return Person.where(:id => attributes[:id]).where(:organization_id => attributes[:organization_id]).first if attributes[:id].present?
     return Person.new(attributes, options, &block)                                     if attributes[:email].blank?
     
     Person.where(:email => attributes[:email]).where(:organization_id => attributes[:organization_id]).first || Person.new(attributes, options, &block) 

data/app/models/search.rb

@@ -11,9 +11,10 @@ class Search < ActiveRecord::Base
                   :min_lifetime_value, :max_lifetime_value,
                   :min_donations_amount, :max_donations_amount,
                   :min_donations_date, :max_donations_date, :discount_code,
-                  :membership_status, :passholder, :membership_type_id, :membership_type
+                  :membership_status, :pass_type_id, :membership_type_id, :membership_type,
+                  :show_date_start, :show_date_end
 
-  attr_accessor :passholder
+  ANY_EVENT = -1
 
   def length
     people.length
@@ -31,6 +32,10 @@ class Search < ActiveRecord::Base
     Delayed::Job.enqueue(ActionJob.new(action, people))
   end
 
+  def event_name
+    event.try(:name) || Event::ANY_EVENT_TEXT
+  end
+
   def description
     conditions = []
 
@@ -38,10 +43,13 @@ class Search < ActiveRecord::Base
 
     if event_id.present?
       if has_purchased_for
-        conditions << "Purchased tickets for #{event.name}." 
+        conditions << "Purchased tickets for #{event_name}." 
       else
-        conditions << "Have not purchased tickets for #{event.name}." 
+        conditions << "Have not purchased tickets for #{event_name}." 
       end
+
+      conditions << "For show dates after #{show_date_start.strftime('%D')}" if show_date_start.present?
+      conditions << "For show dates through #{show_date_end.strftime('%D')}" if show_date_end.present?
     end
 
     if zip.present? || state.present?
@@ -118,87 +126,186 @@ class Search < ActiveRecord::Base
     end
   end
 
+  def offset_show_date_start
+    return nil if self.show_date_start.blank?
+    @offset_show_date_start ||= self.show_date_start.to_datetime.change(:offset => offset(self.show_date_start))
+  end
+
+  def offset_show_date_end
+    return nil if self.show_date_end.blank?
+    @offset_show_date_end ||= self.show_date_end.to_datetime.end_of_day.change(:offset => offset(self.show_date_end))
+  end
+
+  def offset(datetime)
+    @offset ||= datetime.in_time_zone(ActiveSupport::TimeZone.create(self.organization.time_zone)).formatted_offset
+  end
+
   private
 
-  def find_people
-    column_names = Person.column_names.collect {|cn| "people.#{cn}" }
-    column_names << "lower(people.last_name) AS ordered_last_names"
+    def find_people
+      column_names = Person.column_names.collect {|cn| "people.#{cn}" }
+      column_names << "lower(people.last_name) AS ordered_last_names"
 
-    people = Person.where(:organization_id => organization_id)
-    people = people.where(:dummy => false)
-    people = people.order('ordered_last_names ASC')
+      people = Person.where(:organization_id => organization_id)
+      people = people.where(:dummy => false)
+      people = people.order('ordered_last_names ASC')
 
-    people = people.where("people.type" => person_type) unless person_type.blank?
-    people = people.where("people.subtype" => person_subtype) unless person_type.blank? || person_subtype.blank?
+      people = people.where("people.type" => person_type) unless person_type.blank?
+      people = people.where("people.subtype" => person_subtype) unless person_type.blank? || person_subtype.blank?
 
-    people = people.tagged_with(tagging) unless tagging.blank?
-    people = people.joins(:address) unless zip.blank? && state.blank?
-    
-    if event_id.present?
-      people = people.joins("LEFT JOIN `tickets` ON `tickets`.`buyer_id` = `people`.`id` ")
-                     .joins("LEFT JOIN `shows` ON `shows`.`id` = `tickets`.`show_id` ")
-                     .joins("LEFT JOIN `events` ON `events`.`id` = `shows`.`event_id`")
+      people = people.tagged_with(tagging) unless tagging.blank?
+      people = people.joins(:address) unless zip.blank? && state.blank?
 
-      if has_purchased_for
-        people = people.where("events.id" => event_id)
-      else
-        people = people.where("`events`.`id` <> ? or events.id is null", event_id)
+      people = add_event_query(people, column_names)
+
+      people = people.where("addresses.zip" => zip.to_s) unless zip.blank?
+      people = people.where("addresses.state" => state) unless state.blank?
+      people = people.where("people.lifetime_value >= ?", min_lifetime_value * 100.0) unless min_lifetime_value.blank?
+      people = people.where("people.lifetime_value <= ?", max_lifetime_value * 100.0) unless max_lifetime_value.blank?
+
+      unless discount_code.blank?
+        people = people.joins(:orders => [:items => [:discount]])
+        people = (discount_code == Discount::ALL_DISCOUNTS_STRING) ? people.where("items.discount_id is not null") : people.where("discounts.code = ?", discount_code)
       end
-    end
-    
 
-    people = people.where("addresses.zip" => zip.to_s) unless zip.blank?
-    people = people.where("addresses.state" => state) unless state.blank?
-    people = people.where("people.lifetime_value >= ?", min_lifetime_value * 100.0) unless min_lifetime_value.blank?
-    people = people.where("people.lifetime_value <= ?", max_lifetime_value * 100.0) unless max_lifetime_value.blank?
+      unless [min_donations_amount, max_donations_amount, min_donations_date, max_donations_date].all?(&:blank?)
+        people = people.joins(:orders => :items)
+        people = people.where("orders.created_at >= ?", min_donations_date) unless min_donations_date.blank?
+        people = people.where("orders.created_at <= ?", max_donations_date + 1.day) unless max_donations_date.blank?
+        people = people.where("items.product_type = 'Donation'")
+        people = people.group("people.id")
+        if min_donations_amount.blank?
+          people = people.having("SUM(items.price + items.nongift_amount) >= 1")
+        else
+          people = people.having("SUM(items.price + items.nongift_amount) >= ?", min_donations_amount * 100.0)
+        end
+        people = people.having("SUM(items.price + items.nongift_amount) <= ?", max_donations_amount * 100.0) unless max_donations_amount.blank?
+      end
 
-    unless discount_code.blank?
-      people = people.joins(:orders => [:items => [:discount]])
-      people = (discount_code == Discount::ALL_DISCOUNTS_STRING) ? people.where("items.discount_id is not null") : people.where("discounts.code = ?", discount_code)
+      ### MEMBERSHIP ##
+
+      if searching_membership?
+        #Necessary because we need a left join for the "Not" condition to work
+        people = people.joins('left join members on members.person_id = people.id')
+      end
+
+      if membership_status.present?
+        people = people.merge(Member.current)  if membership_status == "Current"
+        people = people.merge(Member.lapsed)   if membership_status == "Lapsed"
+        people = people.merge(Member.past)     if membership_status == "Past"
+        people = people.where("members.id is null")     if membership_status == "None"
+      end
+
+      if membership_type_id.present?
+        people = people.joins('inner join memberships on members.id = memberships.member_id')
+        people = people.joins('inner join membership_types on membership_types.id = memberships.membership_type_id')
+
+        people = people.where('membership_types.id = ?', membership_type_id)
+      end
+
+      people.select(column_names).group("people.id")
     end
 
-    unless [min_donations_amount, max_donations_amount, min_donations_date, max_donations_date].all?(&:blank?)
-      people = people.joins(:orders => :items)
-      people = people.where("orders.created_at >= ?", min_donations_date) unless min_donations_date.blank?
-      people = people.where("orders.created_at <= ?", max_donations_date + 1.day) unless max_donations_date.blank?
-      people = people.where("items.product_type = 'Donation'")
-      people = people.group("people.id")
-      if min_donations_amount.blank?
-        people = people.having("SUM(items.price + items.nongift_amount) >= 1")
-      else
-        people = people.having("SUM(items.price + items.nongift_amount) >= ?", min_donations_amount * 100.0)
+    def add_event_query(people, column_names)
+      if any_event?
+        people = add_any_event_query(people, column_names)
+      elsif specific_event?
+        people = add_specific_event_query(people, column_names)
       end
-      people = people.having("SUM(items.price + items.nongift_amount) <= ?", max_donations_amount * 100.0) unless max_donations_amount.blank?
+      
+      people
     end
 
-    ### MEMBERSHIP ##
+    def add_specific_event_query(people, column_names)
+      if has_purchased_for
+        people = people.joins("LEFT JOIN `tickets` ON `tickets`.`buyer_id` = `people`.`id` ")
+                       .joins("LEFT JOIN `shows` ON `shows`.`id` = `tickets`.`show_id` ") 
+                       .joins("LEFT JOIN `events` ON `events`.`id` = `shows`.`event_id`")
+        
+        people = people.where("events.id" => event_id)
 
-    if searching_membership?
-      #Necessary because we need a left join for the "Not" condition to work
-      people = people.joins('left join members on members.person_id = people.id')
-    end
+        if show_date_search?
+          people = people.where("shows.datetime >= ?", offset_show_date_start) unless show_date_start.blank?
+          people = people.where("shows.datetime <= ?", offset_show_date_end)   unless show_date_end.blank?
+        end
 
-    if membership_status.present?
-      people = people.merge(Member.current)  if membership_status == "Current"
-      people = people.merge(Member.lapsed)   if membership_status == "Lapsed"
-      people = people.merge(Member.past)     if membership_status == "Past"
-      people = people.where("members.id is null")     if membership_status == "None"
+      elsif !has_purchased_for
+        if show_date_search?
+          people_subquery = Ticket.joins(:show)
+                                  .where("shows.event_id = ?", event_id)
+                                  .where("tickets.buyer_id = people.id")
+
+          people_subquery = people_subquery.where("shows.datetime >= ?", offset_show_date_start) unless show_date_start.blank?
+          people_subquery = people_subquery.where("shows.datetime <= ?", offset_show_date_end)   unless show_date_end.blank?
+
+          people = people.where("NOT EXISTS (#{people_subquery.to_sql})")
+        else
+          #
+          # Had to use a correlated subquery here. Sorry.
+          # ActiveRecord 3.2 does not support NOT IN, so we have to do some manual work here.
+          # AR 4.0 has NOT IN
+          #
+          people_subquery = Person.select("people.id")
+                                 .joins("LEFT JOIN `tickets` ON `tickets`.`buyer_id` = `people`.`id` ")
+                                 .joins("LEFT JOIN `shows` ON `shows`.`id` = `tickets`.`show_id` ")
+                                 .joins("LEFT JOIN `events` ON `events`.`id` = `shows`.`event_id`")
+                                 .where("events.id" => event_id)
+          people = people.where("people.id not in (#{people_subquery.to_sql})")
+        end
+
+        people
+      end
+
+      people
     end
 
-    if membership_type_id.present?
-      people = people.joins('inner join memberships on members.id = memberships.member_id')
-      people = people.joins('inner join membership_types on membership_types.id = memberships.membership_type_id')
+    def add_any_event_query(people, column_names)
+      people = people.joins("LEFT JOIN `tickets` ON `tickets`.`buyer_id` = `people`.`id` ")
+      
+      if has_purchased_for
+        column_names << "count(tickets.id) as ticket_count"
+        if show_date_search?
+          people = people.joins("LEFT JOIN `shows` ON `shows`.`id` = `tickets`.`show_id` ")
+          people = people.where("shows.datetime >= ?", offset_show_date_start) unless show_date_start.blank?
+          people = people.where("shows.datetime <= ?", offset_show_date_end)   unless show_date_end.blank?
+        end
+        people = people.having("ticket_count > 0")
+      elsif !has_purchased_for
+        if show_date_search?
+          people_subquery = Ticket.joins(:show)
+                                  .where("tickets.buyer_id = people.id")
+
+          people_subquery = people_subquery.where("shows.datetime >= ?", offset_show_date_start) unless show_date_start.blank?
+          people_subquery = people_subquery.where("shows.datetime <= ?", offset_show_date_end)   unless show_date_end.blank?
+                                  
+          people = people.where("NOT EXISTS (#{people_subquery.to_sql})")
+        else
+          column_names << "count(tickets.id) as ticket_count"
+          people = people.having("ticket_count = 0")
+        end
+      end
 
-      people = people.where('membership_types.id = ?', membership_type_id)
+      people   
     end
 
-    people.select(column_names).uniq
-  end
+    def searching_for_event?
+      event_id.present?
+    end
 
+    def show_date_search?
+      show_date_start.present? || show_date_end.present?
+    end
 
+    def any_event?
+      self.event_id == ANY_EVENT
+    end
 
-  def searching_membership?
-    membership_status.present? ||
-    membership_type_id.present?
-  end
+    def specific_event?
+      self.event_id.present? && self.event_id > ANY_EVENT
+    end
+
+    def searching_membership?
+      membership_status.present? ||
+      membership_type_id.present?
+    end
 end