artfully_ose 1.2.0.beta.1 → 1.2.0.pre

data/app/models/comp.rb

@@ -1,35 +1,33 @@
 class Comp
-  include ActiveModel::Conversion
+  include ActiveModel::Conversion 
   include ActiveModel::Validations
   extend ActiveModel::Naming
 
   validate :valid_recipient_and_benefactor
 
-  attr_accessor :show, :tickets, :memberships, :recipient, :benefactor, :order, :notes
-  attr_accessor :comped_count, :uncomped_count, :details
+  attr_accessor :show, :tickets, :recipient, :benefactor, :reason, :order
+  attr_accessor :comped_count, :uncomped_count
 
   #tickets can be an array of tickets_ids or an array of tickets
-  def initialize(show, tickets_or_ids, memberships, recipient, benefactor, notes=nil)
+  def initialize(show, tickets_or_ids, recipient, benefactor)
     @show = show
     @tickets = []
-    @memberships = memberships
     load_tickets(tickets_or_ids)
     @recipient = Person.find(recipient) unless recipient.blank?
     @benefactor = benefactor
-    @notes      = notes
   end
-
+  
   def valid_recipient_and_benefactor
     if @recipient.nil?
       errors.add(:base, "Please select a person to comp to or create a new person record")
       return
     end
-
+    
     if @benefactor.nil?
       errors.add(:base, "Please select a benefactor")
       return
     end
-
+    
     unless @benefactor.current_organization.eql? @recipient.organization
       errors.add(:base, "Recipient and benefactor are from different organizations")
     end
@@ -45,13 +43,13 @@ class Comp
 
   def submit
     ActiveRecord::Base.transaction do
-      create_order(@tickets, @memberships, @recipient, @benefactor, @notes)
+      create_order(@tickets, recipient, @benefactor)
       self.comped_count    = tickets.size
       self.uncomped_count  = 0
     end
   end
 
-  protected
+  private
     def load_tickets(tickets_or_ids)
       tickets_or_ids.each do |t|
         t = Ticket.find(t) unless t.kind_of? Ticket
@@ -59,22 +57,17 @@ class Comp
         @tickets << t
       end
     end
-
-    def create_order(comped_tickets, comped_memberships, recipient, benefactor, notes)
+  
+    def create_order(comped_tickets, recipient, benefactor)
       @order = CompOrder.new
       @order << comped_tickets
-      @order << comped_memberships
       @order.person = recipient
       @order.organization = benefactor.current_organization
-      @order.details = order_details
-      @order.notes   = @notes
-      @order.skip_email = true
+      @order.details = "Comped by: #{benefactor.email} Reason: #{reason}"
       @order.to_comp!
-      f = @order.save
-      f
-    end
-
-    def order_details
-      "Comped by: #{@benefactor.email}"
+    
+      if 0 < comped_tickets.size
+        @order.save
+      end
     end
-end
+end

data/app/models/company.rb

@@ -15,4 +15,4 @@ class Company < Person
   def naming_details_available?
     email.present? || company_name.present?
   end
-end
+end

data/app/models/contribution.rb

@@ -148,7 +148,6 @@ class Contribution
     order = order_klass.new(attributes).tap do |order|
       order.payment_method = @payment_method
       order.skip_actions = true
-      order.skip_email = true
     end
   end
 

data/app/models/database_views/item_view.rb

@@ -3,8 +3,7 @@ class ItemView < ActiveRecord::Base
   self.primary_key = 'id'
 
   has_many :items,  :foreign_key => 'order_id'
-  belongs_to :person, :foreign_key => 'person_id'
-  belongs_to :item
+  has_many :people, :foreign_key => 'person_id'
   has_many :shows,  :foreign_key => 'show_id'
 
   set_watch_for :created_at, :local_to => :self, :as => :organization
@@ -12,178 +11,38 @@ class ItemView < ActiveRecord::Base
 
   default_scope order('created_at desc')
 
-  def self.sales_export_filename_for(organization)
-    "exports/Artfully-Ticket-Sales-Export-#{organization.id}.csv"
-  end
-
-  def self.donations_export_filename_for(organization)
-    "exports/Artfully-Donations-Export-#{organization.id}.csv"
-  end
-
   comma :donation do
-    created_at_local_to_organization("Date")
-
-    payment_method("Payment Method")
+    created_at_local_to_organization("Date")    
+    email("Email")                       
+    first_name("First Name")                    
+    last_name("Last Name")                
+    address1("Address1")                
+    address2("Address2")                      
+    city("City")                
+    state("State")             
+    zip("Zip")            
+    payment_method("Payment Method")                       
     price("Deductible Amount")                { |cents| ((cents || 0) / 100.00) }
     nongift_amount("Non-Deductible Amount")   { |cents| ((cents || 0) / 100.00) }
-    special_instructions("Special Instructions")
-    notes("Notes")
-
-    person("Email")           { |person| person.email }
-    person("Salutation")      { |person| person.salutation }
-    person("First Name")      { |person| person.first_name }
-    person("Middle Name")     { |person| person.middle_name }
-    person("Last Name")       { |person| person.last_name }
-    person("Suffix")          { |person| person.suffix }
-    person("Title")           { |person| person.title }
-    person("Type")            { |person| person.type }
-    person("Subtype")         { |person| person.subtype }
-    person("Company Name")    { |person| person.company_name }
-
-    person("Address 1")       { |person| person.address && person.address.address1 }
-    person("Address 2")       { |person| person.address && person.address.address2 }
-    person("City")            { |person| person.address && person.address.city }
-    person("State")           { |person| person.address && person.address.state }
-    person("Zip")             { |person| person.address && person.address.zip }
-    person("Country")         { |person| person.address && person.address.country }
-    person("Phone1 type")     { |person| person.phones[0] && person.phones[0].kind }
-    person("Phone1 number")   { |person| person.phones[0] && person.phones[0].number }
-    person("Phone2 type")     { |person| person.phones[1] && person.phones[1].kind }
-    person("Phone2 number")   { |person| person.phones[1] && person.phones[1].number }
-    person("Phone3 type")     { |person| person.phones[2] && person.phones[2].kind }
-    person("Phone3 number")   { |person| person.phones[2] && person.phones[2].number }
-    person("Website")         { |person| person.website }
-    person("Twitter Handle")  { |person| person.twitter_handle }
-    person("Facebook URL")    { |person| person.facebook_url }
-    person("Linked In Url")   { |person| person.linked_in_url }
-    person("Tags")            { |person| person.tags.join("|") }
-    person("Do Not Email")    { |person| person.do_not_email }
-    person("Do Not Call")     { |person| person.do_not_call }
-    person("Household Name")  { |person| person.household && person.household.name }
+    special_instructions("Special Instructions")         
+    notes("Notes")         
   end
 
   comma :ticket_sale do
-    created_at_local_to_organization("Date of Purchase")
-
-    event_name("Performance Title")
-    datetime_local_to_organization("Performance Date-Time")
-    payment_method("Payment Method")
+    created_at_local_to_organization("Date of Purchase")    
+    email("Email")                       
+    first_name("First Name")                    
+    last_name("Last Name")                
+    address1("Address1")                
+    address2("Address2")                      
+    city("City")                
+    state("State")             
+    zip("Zip")                   
+    event_name("Performance Title")              
+    datetime_local_to_organization("Performance Date-Time") 
+    payment_method("Payment Method")          
     price("Ticket Price") { |cents| number_to_currency(cents.to_f/100) }
-    special_instructions("Special Instructions")
-    notes("Notes")
-
-    person("Email")           { |person| person.email }
-    person("Salutation")      { |person| person.salutation }
-    person("First Name")      { |person| person.first_name }
-    person("Middle Name")     { |person| person.middle_name }
-    person("Last Name")       { |person| person.last_name }
-    person("Suffix")          { |person| person.suffix }
-    person("Title")           { |person| person.title }
-    person("Type")            { |person| person.type }
-    person("Subtype")         { |person| person.subtype }
-    person("Company Name")    { |person| person.company_name }
-
-    person("Address 1")       { |person| person.address && person.address.address1 }
-    person("Address 2")       { |person| person.address && person.address.address2 }
-    person("City")            { |person| person.address && person.address.city }
-    person("State")           { |person| person.address && person.address.state }
-    person("Zip")             { |person| person.address && person.address.zip }
-    person("Country")         { |person| person.address && person.address.country }
-    person("Phone1 type")     { |person| person.phones[0] && person.phones[0].kind }
-    person("Phone1 number")   { |person| person.phones[0] && person.phones[0].number }
-    person("Phone2 type")     { |person| person.phones[1] && person.phones[1].kind }
-    person("Phone2 number")   { |person| person.phones[1] && person.phones[1].number }
-    person("Phone3 type")     { |person| person.phones[2] && person.phones[2].kind }
-    person("Phone3 number")   { |person| person.phones[2] && person.phones[2].number }
-    person("Website")         { |person| person.website }
-    person("Twitter Handle")  { |person| person.twitter_handle }
-    person("Facebook URL")    { |person| person.facebook_url }
-    person("Linked In Url")   { |person| person.linked_in_url }
-    person("Tags")            { |person| person.tags.join("|") }
-    person("Do Not Email")    { |person| person.do_not_email }
-    person("Do Not Call")     { |person| person.do_not_call }
-    person("Household Name")  { |person| person.household && person.household.name }
-  end
-
-  comma :membership_sale do
-    created_at_local_to_organization("Date of Purchase")
-
-    item('Membership Type') { |item| item.product.membership_type.name }
-    payment_method("Payment Method")
-    price("Price") { |cents| number_to_currency(cents.to_f/100) }
-    special_instructions("Special Instructions")
-    notes("Notes")
-
-    person("Email")           { |person| person.email }
-    person("Salutation")      { |person| person.salutation }
-    person("First Name")      { |person| person.first_name }
-    person("Middle Name")     { |person| person.middle_name }
-    person("Last Name")       { |person| person.last_name }
-    person("Suffix")          { |person| person.suffix }
-    person("Title")           { |person| person.title }
-    person("Type")            { |person| person.type }
-    person("Subtype")         { |person| person.subtype }
-    person("Company Name")    { |person| person.company_name }
-
-    person("Address 1")       { |person| person.address && person.address.address1 }
-    person("Address 2")       { |person| person.address && person.address.address2 }
-    person("City")            { |person| person.address && person.address.city }
-    person("State")           { |person| person.address && person.address.state }
-    person("Zip")             { |person| person.address && person.address.zip }
-    person("Country")         { |person| person.address && person.address.country }
-    person("Phone1 type")     { |person| person.phones[0] && person.phones[0].kind }
-    person("Phone1 number")   { |person| person.phones[0] && person.phones[0].number }
-    person("Phone2 type")     { |person| person.phones[1] && person.phones[1].kind }
-    person("Phone2 number")   { |person| person.phones[1] && person.phones[1].number }
-    person("Phone3 type")     { |person| person.phones[2] && person.phones[2].kind }
-    person("Phone3 number")   { |person| person.phones[2] && person.phones[2].number }
-    person("Website")         { |person| person.website }
-    person("Twitter Handle")  { |person| person.twitter_handle }
-    person("Facebook URL")    { |person| person.facebook_url }
-    person("Linked In Url")   { |person| person.linked_in_url }
-    person("Tags")            { |person| person.tags.join("|") }
-    person("Do Not Email")    { |person| person.do_not_email }
-    person("Do Not Call")     { |person| person.do_not_call }
-  end
-
-  comma :pass_sale do
-    created_at_local_to_organization("Date of Purchase")
-
-    item('Pass Type') { |item| item.product.pass_type.name }
-    payment_method("Payment Method")
-    price("Price") { |cents| number_to_currency(cents.to_f/100) }
-    special_instructions("Special Instructions")
-    notes("Notes")
-
-    person("Email")           { |person| person.email }
-    person("Salutation")      { |person| person.salutation }
-    person("First Name")      { |person| person.first_name }
-    person("Middle Name")     { |person| person.middle_name }
-    person("Last Name")       { |person| person.last_name }
-    person("Suffix")          { |person| person.suffix }
-    person("Title")           { |person| person.title }
-    person("Type")            { |person| person.type }
-    person("Subtype")         { |person| person.subtype }
-    person("Company Name")    { |person| person.company_name }
-
-    person("Address 1")       { |person| person.address && person.address.address1 }
-    person("Address 2")       { |person| person.address && person.address.address2 }
-    person("City")            { |person| person.address && person.address.city }
-    person("State")           { |person| person.address && person.address.state }
-    person("Zip")             { |person| person.address && person.address.zip }
-    person("Country")         { |person| person.address && person.address.country }
-    person("Phone1 type")     { |person| person.phones[0] && person.phones[0].kind }
-    person("Phone1 number")   { |person| person.phones[0] && person.phones[0].number }
-    person("Phone2 type")     { |person| person.phones[1] && person.phones[1].kind }
-    person("Phone2 number")   { |person| person.phones[1] && person.phones[1].number }
-    person("Phone3 type")     { |person| person.phones[2] && person.phones[2].kind }
-    person("Phone3 number")   { |person| person.phones[2] && person.phones[2].number }
-    person("Website")         { |person| person.website }
-    person("Twitter Handle")  { |person| person.twitter_handle }
-    person("Facebook URL")    { |person| person.facebook_url }
-    person("Linked In Url")   { |person| person.linked_in_url }
-    person("Tags")            { |person| person.tags.join("|") }
-    person("Do Not Email")    { |person| person.do_not_email }
-    person("Do Not Call")     { |person| person.do_not_call }
+    special_instructions("Special Instructions")         
+    notes("Notes")                 
   end
-end
+end

data/app/models/database_views/order_view.rb

@@ -0,0 +1,34 @@
+class OrderView < ActiveRecord::Base
+  self.table_name = 'order_view'
+  self.primary_key = 'id'
+  has_many :items, :foreign_key => 'order_id'
+  
+  default_scope :order => 'created_at DESC'
+  scope :before, lambda { |time| where("created_at < ?", time) }
+  scope :after,  lambda { |time| where("created_at > ?", time) }
+  scope :imported, where("fa_id IS NOT NULL")
+  scope :not_imported, where("fa_id IS NULL")
+  scope :artfully, where("transaction_id IS NOT NULL")
+  
+  set_watch_for :created_at, :local_to => :self, :as => :admins
+  
+  def artfully?
+    !transaction_id.nil?
+  end
+
+
+  #
+  # If we can push these into the view (with an SQL case) then we can save having to join to items in Ruby
+  #
+  def has_ticket?
+    items.select(&:ticket?).present?
+  end
+
+  def has_donation?
+    items.select(&:donation?).present?
+  end
+  
+  def time_zone
+    "Eastern Time (US & Canada)"
+  end
+end

data/app/models/donation.rb

@@ -15,10 +15,6 @@ class Donation < ActiveRecord::Base
     0
   end
 
-  def realized_fee
-    self.class.realized_fee
-  end
-
   def order_summary_description
     "Donation"
   end

data/app/models/door_list.rb

@@ -7,7 +7,7 @@ class DoorList
   end
 
   def tickets
-    @tickets ||= Ticket.where(:show_id => show.id).includes(:buyer, :ticket_type, :items => :order).select(&:committed?)
+    @tickets ||= Ticket.where(:show_id => show.id).includes(:buyer, :section, :items => :order).select(&:committed?)
   end
 
   def items
@@ -17,7 +17,7 @@ class DoorList
   private
 
     class Item
-      attr_accessor :ticket, :buyer, :special_instructions, :notes, :payment_method, :order_id
+      attr_accessor :ticket, :buyer, :special_instructions, :notes, :payment_method
       
       comma do
         buyer("First Name")             { |buyer| buyer.first_name }
@@ -30,14 +30,11 @@ class DoorList
       end
 
       def initialize(ticket, buyer)
-        sold_item = ticket.sold_item
-
         self.ticket = ticket
         self.buyer = buyer
         self.special_instructions = ticket.special_instructions
         self.notes = ticket.notes
-        self.payment_method = sold_item.try(:order).try(:payment_method)
-        self.order_id = sold_item.try(:order).try(:id)
+        self.payment_method = ticket.sold_item.try(:order).try(:payment_method)
       end
 
       def <=>(obj)

data/app/models/event.rb

@@ -10,11 +10,8 @@ class Event < ActiveRecord::Base
   
   attr_accessible :name, :producer, :description, :contact_email, :contact_phone, :image, :venue_attributes,
                   :show_special_instructions, :special_instructions_caption, :public, :primary_category,
-                  :secondary_categories, :primary_category_other, :secondary_category_other, :members_only,
-                  :subtitle
-
-  store :cached_stats, :accessors => [ :on_sale, :off_sale, :sold, :sales_total ]
-
+                  :secondary_categories, :primary_category_other, :secondary_category_other, :members_only
+  
   belongs_to :organization
   belongs_to :venue
   belongs_to :import
@@ -23,13 +20,10 @@ class Event < ActiveRecord::Base
   has_many :shows, :order => :datetime
   has_many :tickets, :through => :shows
   has_many :discounts
-  has_many :events_pass_types
-  has_many :pass_types, :through => :events_pass_types
   validate :validate_contact_phone
   validates :contact_email, :presence => true, :email => true
   validates :name, :presence => true
   validates :organization_id, :presence => true
-  validate :subtitle, length: { maximum: 255 }
 
   has_attached_file :image,
     :storage => :s3,
@@ -47,7 +41,6 @@ class Event < ActiveRecord::Base
   validates_attachment_content_type :image, :content_type => ["image/jpeg", "image/gif", "image/png"]
 
   before_create :set_primary_category
-  before_create { self.public = true }
   after_create :create_default_chart
 
   serialize :secondary_categories, Array
@@ -58,38 +51,10 @@ class Event < ActiveRecord::Base
 
   delegate :time_zone, :to => :venue
 
-  ANY_EVENT_TEXT = "(Any Event)"
-  ANY_EVENT_ID   = "-1"
-
-  searchable do
-    text :name
-  end
-  include Ext::DelayedIndexing
-
-  #
-  # Run synchronously only with great care. 
-  #
-  
-  def refresh_stats
-    self.on_sale  = self.glance.available.on_sale
-    self.off_sale = self.glance.available.off_sale
-    self.sold     = self.glance.sold.total
-    self.sales_total     = self.glance.sales.total
-    self.save(:validate => false)
-    self.cached_stats
-  end
-
   def free?
     is_free?
   end
 
-  def applies_to_pass?(pass)
-    EventsPassType.active
-                  .where(:organization_id => self.organization_id)
-                  .where(:event_id => self.id)
-                  .where(:pass_type_id => pass.pass_type_id).count > 0
-  end
-
   def to_s
     name
   end
@@ -103,24 +68,14 @@ class Event < ActiveRecord::Base
     update_attribute(:deleted_at, Time.now)
   end
 
-  def single_show?
-    shows.length == 1
-  end
-
-  #
-  # The list of events do be deplayed on their event index
-  #
-  def self.for_event_storefront(organization, member = nil)
-    event_rel = organization.events.joins(:shows).where('shows.datetime > ?', DateTime.now).group(:event_id).public
+  def self.for_storefront(organization, member = nil)
+    event_rel = Event.joins(:shows).where(:organization_id => organization.id).where('shows.datetime > ?', DateTime.now).group(:event_id).public
     event_rel = event_rel.where(:members_only => false) if member.nil?
     event_rel.all
   end
 
-  #
-  # Find a single event for the single event storefront view
-  #
   def self.storefront_find(id, member = nil)
-    event_rel = Event.includes(:venue)
+    event_rel = Event.includes(:venue, :shows => [:chart => [:sections => :ticket_types]])
     event_rel = event_rel.where(:members_only => false) if member.nil?
     event_rel.find(id)
   end
@@ -156,18 +111,13 @@ class Event < ActiveRecord::Base
     charts.first
   end
 
-  def upcoming_shows_rel
-    shows.includes(:event => :venue).where('shows.datetime > ?', (DateTime.now - 1.hours))
-  end
-
   #
   # You'll almost always want upcoming_public_shows instead
   #
   def upcoming_shows(limit = 5)
-    shows_rel = upcoming_shows_rel
-    shows_rel = upcoming_shows_rel.limit(limit) unless limit == :all
-    @upcoming ||= shows_rel.all
-    @upcoming
+    @upcoming ||= shows.includes(:event => :venue).select { |show| show.datetime_local_to_event > (DateTime.now - 1.hours) }
+    return @upcoming if limit == :all
+    @upcoming.take(limit)
   end
 
   def played_shows(limit = 5)
@@ -192,11 +142,11 @@ class Event < ActiveRecord::Base
   end
 
   def as_widget_json(options = {})
-    as_json(options.merge({:methods => ['venue', 'uuid'], :except => [:members_only, :cached_stats]})).merge('performances' => upcoming_public_shows.as_json)
+    as_json(options.merge({:methods => ['venue', 'uuid'], :except => :members_only})).merge('performances' => upcoming_public_shows.as_json)
   end
 
   def as_full_calendar_json
-    shows.includes(:event).collect do |p|
+    shows.collect do |p|
       { :title  => '',
         :start  => p.datetime_local_to_event,
         :allDay => false,