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

data/app/models/database_views/item_view.rb

@@ -3,7 +3,7 @@ class ItemView < ActiveRecord::Base
   self.primary_key = 'id'
 
   has_many :items,  :foreign_key => 'order_id'
-  has_many :people, :foreign_key => 'person_id'
+  belongs_to :person, :foreign_key => 'person_id'
   has_many :shows,  :foreign_key => 'show_id'
 
   set_watch_for :created_at, :local_to => :self, :as => :organization
@@ -15,38 +15,88 @@ class ItemView < ActiveRecord::Base
     "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")    
-    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")         
+    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 }          
   end
 
   comma :ticket_sale do
     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")                 
+    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 }                
   end
 end

data/app/models/event.rb

@@ -20,6 +20,8 @@ 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
@@ -52,6 +54,9 @@ class Event < ActiveRecord::Base
 
   delegate :time_zone, :to => :venue
 
+  ANY_EVENT_TEXT = "(Any Event)"
+  ANY_EVENT_ID   = "-1"
+
   def free?
     is_free?
   end

data/app/models/events_pass_type.rb

@@ -0,0 +1,16 @@
+class EventsPassType < ActiveRecord::Base
+  include OhNoes::Destroy
+
+  belongs_to :organization
+  belongs_to :event 
+  belongs_to :pass_type
+
+  attr_accessible :event, :pass_type, :excluded_shows, :ticket_types
+
+  validates :event, :presence => true
+  validates :organization, :presence => true
+  validates :pass_type, :presence => true  
+
+  serialize :ticket_types, Set
+  serialize :excluded_shows, Set
+end

data/app/models/ext/integrations.rb

@@ -39,7 +39,7 @@ module Ext
       def self.included(base)
         base.class_eval do
           after_create do
-            [TicketingKit,RegularDonationKit,MembershipKit].each do |klass|
+            [TicketingKit,RegularDonationKit,MembershipKit,PassesKit].each do |klass|
               kit = klass.new
               kit.state = 'activated'
               kit.organization = self

data/app/models/ext/preprocessor.rb

@@ -1,6 +1,7 @@
 module Ext
   module Preprocessor
     def preprocess
+      true
     end
   end
 end

data/app/models/import.rb

@@ -171,21 +171,24 @@ class Import < ActiveRecord::Base
   end
 
   def create_person(parsed_row)
-   if !attach_person(parsed_row).naming_details_available?
-     person = self.organization.dummy
-   elsif !parsed_row.email.blank?
-     person = Person.first_or_create({:email => parsed_row.email, :organization => self.organization}.merge(parsed_row.person_attributes), {}) do |p|
-       p.import = self
-     end
-   else    
-     person = attach_person(parsed_row)
-     if !person.save
-       self.reload
-       fail!(RowError.new(person.errors.full_messages.join(", ")), parsed_row.row)
-     end 
-   end
-   person  
- end
+    if !attach_person(parsed_row).naming_details_available?
+      person = self.organization.dummy
+    elsif !parsed_row.email.blank?
+      person = Person.first_or_create({:email => parsed_row.email, :organization => self.organization}.merge(parsed_row.person_attributes), {}) do |p|
+        p.import = self
+      end
+      person.update_from_import(attach_person(parsed_row))
+      person.skip_commit = true
+      person.save
+    else    
+      person = attach_person(parsed_row)
+      if !person.save
+        self.reload
+        fail!(RowError.new(person.errors.full_messages.join(", ")), parsed_row.row)
+      end 
+    end
+    person  
+  end
 
   class RowError < ArgumentError
   end

data/app/models/imports/donations_import.rb

@@ -50,7 +50,7 @@ class DonationsImport < Import
   end
    
   def create_contribution(parsed_row, person)
-    Rails.logger.info("Import #{id} DONATION_IMPORT: Creating contribution")
+    Rails.logger.info("Processing Import [#{id}] DONATION_IMPORT: Creating contribution")
     validate_amounts(parsed_row)
     amount              = parsed_row.amount
     deductible_amount   = parsed_row.unparsed_deductible_amount.blank?  ? amount - parsed_row.nongift_amount     : parsed_row.deductible_amount

data/app/models/imports/events_import.rb

@@ -16,6 +16,11 @@ class EventsImport < Import
     order       = create_order(parsed_row, person, event, show, ticket)
     actions     = create_actions(parsed_row, person, event, show, order)
   end
+
+  def imported!
+    @imported_shows.values.each {|show| show.delay.refresh_stats}
+    super
+  end
   
   def rollback_events
     Event.where(:import_id => self.id).all.each {|e| e.destroy}
@@ -28,7 +33,7 @@ class EventsImport < Import
   end
   
   def row_valid?(parsed_row)
-    Rails.logger.info("Import #{id} EVENT_IMPORT: Validating Row")
+    Rails.logger.info("Processing Import [#{id}] EVENT_IMPORT: Validating Row")
     raise Import::RowError, "No Event Name included in this row: #{parsed_row.row}" unless parsed_row.event_name 
     raise Import::RowError, "No Show Date included in this row: #{parsed_row.row}" unless parsed_row.show_date
     raise Import::RowError, "Please include a payment method in this row: #{parsed_row.row}" if parsed_row.payment_method.blank?
@@ -39,34 +44,34 @@ class EventsImport < Import
   end
   
   def create_chart(parsed_row, event, show)
-    Rails.logger.info("Import #{id} EVENT_IMPORT: Creating chart")
+    Rails.logger.info("Processing Import [#{id}] EVENT_IMPORT: Creating chart")
     chart = show.chart || show.create_chart({ :name => event.name, :skip_create_first_section => true })   
-    Rails.logger.info("Import #{id} EVENT_IMPORT: Using chart:")
-    Rails.logger.info("Import #{id} EVENT_IMPORT: #{chart.inspect}")
+    Rails.logger.info("Processing Import [#{id}] EVENT_IMPORT: Using chart:")
+    Rails.logger.info("Processing Import [#{id}] EVENT_IMPORT: #{chart.inspect}")
     amount = parsed_row.amount || 0
-    Rails.logger.info("Import #{id} EVENT_IMPORT: Amount is [#{amount}]")
+    Rails.logger.info("Processing Import [#{id}] EVENT_IMPORT: Amount is [#{amount}]")
     section = chart.sections.first || chart.sections.build(:name => event.name, :capacity => 1)
     section.skip_create_first_ticket_type = true
-    Rails.logger.info("Import #{id} EVENT_IMPORT: Using section:")
-    Rails.logger.info("Import #{id} EVENT_IMPORT: #{section.inspect}")
-    Rails.logger.info("Import #{id} EVENT_IMPORT: Bumping section capacity")
+    Rails.logger.info("Processing Import [#{id}] EVENT_IMPORT: Using section:")
+    Rails.logger.info("Processing Import [#{id}] EVENT_IMPORT: #{section.inspect}")
+    Rails.logger.info("Processing Import [#{id}] EVENT_IMPORT: Bumping section capacity")
     section.capacity = section.capacity + 1 unless section.new_record?
-    Rails.logger.info("Import #{id} EVENT_IMPORT: Saving section")
+    Rails.logger.info("Processing Import [#{id}] EVENT_IMPORT: Saving section")
     section.save
     ticket_type = section.ticket_types.where(:price => amount).first || section.ticket_types.create({:name => event.name, :price => amount, :limit => 0})
     ticket_type.limit = ticket_type.limit + 1
     ticket_type.save    
-    Rails.logger.info("Import #{id} EVENT_IMPORT: #{section.inspect}")
-    Rails.logger.info("Import #{id} EVENT_IMPORT: Saving chart")
+    Rails.logger.info("Processing Import [#{id}] EVENT_IMPORT: #{section.inspect}")
+    Rails.logger.info("Processing Import [#{id}] EVENT_IMPORT: Saving chart")
     chart.save
-    Rails.logger.info("Import #{id} EVENT_IMPORT: #{show.inspect}")
+    Rails.logger.info("Processing Import [#{id}] EVENT_IMPORT: #{show.inspect}")
     saved = show.save(:validate => false)
-    Rails.logger.info("Import #{id} EVENT_IMPORT: Show saved[#{saved}]")
+    Rails.logger.info("Processing Import [#{id}] EVENT_IMPORT: Show saved[#{saved}]")
     chart
   end
 
   def create_event(parsed_row, person)
-    Rails.logger.info("Import #{id} EVENT_IMPORT: Creating event")
+    Rails.logger.info("Processing Import [#{id}] EVENT_IMPORT: Creating event")
     event = Event.where(:name => parsed_row.event_name).where(:organization_id => self.organization).first
     return event if event
       
@@ -80,9 +85,9 @@ class EventsImport < Import
     event.contact_email = self.organization.email || self.user.email
     event.import = self
     event.save!
-    Rails.logger.info("Import #{id} EVENT_IMPORT: Created event #{event.inspect}")
+    Rails.logger.info("Processing Import [#{id}] EVENT_IMPORT: Created event #{event.inspect}")
     unless event.charts.empty?
-      Rails.logger.info("Import #{id} EVENT_IMPORT: Default event chart created #{event.charts.first.inspect}") 
+      Rails.logger.info("Processing Import [#{id}] EVENT_IMPORT: Default event chart created #{event.charts.first.inspect}") 
     end
     event
   end
@@ -92,7 +97,7 @@ class EventsImport < Import
   end
   
   def existing_show(show_date, event_name)
-    Rails.logger.info("Import #{id} EVENT_IMPORT: Checking existing show")
+    Rails.logger.info("Processing Import [#{id}] EVENT_IMPORT: Checking existing show")
     @imported_shows ||= {}
     show = @imported_shows[show_key(show_date, event_name)]    
   end
@@ -108,26 +113,26 @@ class EventsImport < Import
   end
   
   def new_show(parsed_row, event)
-    Rails.logger.info("Import #{id} EVENT_IMPORT: Creating new show")
+    Rails.logger.info("Processing Import [#{id}] EVENT_IMPORT: Creating new show")
     show = Show.new
     show.datetime = time_zone_parser.parse(eight_pm?(parsed_row.show_date))
     show.event = event
     show.organization = self.organization
     show.state = "unpublished"                      #Hacky end-around state machine here because we don't have a chart yet
     show.save(:validate => false)
-    Rails.logger.info("Import #{id} EVENT_IMPORT: Show saved #{show.inspect}")
+    Rails.logger.info("Processing Import [#{id}] EVENT_IMPORT: Show saved #{show.inspect}")
     
     @imported_shows[show_key(parsed_row.show_date, event.name)] = show
     show    
   end
   
   def create_show(parsed_row, event)
-    Rails.logger.info("Import #{id} EVENT_IMPORT: Creating show")
+    Rails.logger.info("Processing Import [#{id}] EVENT_IMPORT: Creating show")
     return existing_show(parsed_row.show_date, event) || new_show(parsed_row, event)
   end
   
   def create_actions(parsed_row, person, event, show, order)
-    Rails.logger.info("Import #{id} EVENT_IMPORT: Creating actions")
+    Rails.logger.info("Processing Import [#{id}] EVENT_IMPORT: Creating actions")
     go_action = GoAction.for(show, person) do |go_action|
       go_action.import = self
       go_action.save
@@ -141,28 +146,28 @@ class EventsImport < Import
   end
   
   def create_ticket(parsed_row, person, event, show, chart)
-    Rails.logger.info("Import #{id} EVENT_IMPORT: Creating ticket")
+    Rails.logger.info("Processing Import [#{id}] EVENT_IMPORT: Creating ticket")
     amount = parsed_row.amount || 0
-    Rails.logger.info("Import #{id} EVENT_IMPORT: Amount is [#{amount}]")
+    Rails.logger.info("Processing Import [#{id}] EVENT_IMPORT: Amount is [#{amount}]")
     section = chart.sections.first
-    Rails.logger.info("Import #{id} EVENT_IMPORT: Section is [#{section.inspect}]")
+    Rails.logger.info("Processing Import [#{id}] EVENT_IMPORT: Section is [#{section.inspect}]")
     ticket_type = section.ticket_types.where(:price => amount).first
     
     raise Import::RuntimeError, 'No section found for ticket' unless section
     
     ticket = Ticket.build_one(show, section,1, true)
     ticket.ticket_type = ticket_type
-    Rails.logger.info("Import #{id} EVENT_IMPORT: Ticket built [#{ticket.inspect}]")
+    Rails.logger.info("Processing Import [#{id}] EVENT_IMPORT: Ticket built [#{ticket.inspect}]")
     ticket.sell_to person
-    Rails.logger.info("Import #{id} EVENT_IMPORT: Ticket sold to [#{person.inspect}]")
+    Rails.logger.info("Processing Import [#{id}] EVENT_IMPORT: Ticket sold to [#{person.inspect}]")
     ticket.sold_price = amount
     ticket.save
-    Rails.logger.info("Import #{id} EVENT_IMPORT: Ticket saved [#{ticket.inspect}]")
+    Rails.logger.info("Processing Import [#{id}] EVENT_IMPORT: Ticket saved [#{ticket.inspect}]")
     ticket
   end
    
   def create_order(parsed_row, person, event, show, ticket)
-    Rails.logger.info("Import #{id} EVENT_IMPORT: Creating order")
+    Rails.logger.info("Processing Import [#{id}] EVENT_IMPORT: Creating order")
     order_key = [show.id.to_s,person.id.to_s,parsed_row.payment_method].join('-')
     @imported_orders ||= {}
     order = @imported_orders[order_key] || ImportedOrder.new

data/app/models/item.rb

@@ -12,6 +12,7 @@ class Item < ActiveRecord::Base
   belongs_to :reseller_order, :class_name => "Reseller::Order"
   belongs_to :product, :polymorphic => true
   belongs_to :discount
+  belongs_to :pass
 
   attr_accessible :order_id, :product_type, :state, :price, :realized_price, :net, :nongift_amount
   
@@ -19,7 +20,7 @@ class Item < ActiveRecord::Base
   attr_accessor :per_item_processing_charge
 
   validates_presence_of :product_type, :price, :realized_price, :net
-  validates_inclusion_of :product_type, :in => %( Ticket Donation Membership )
+  validates_inclusion_of :product_type, :in => %( Ticket Donation Membership Pass)
 
   scope :donation, where(:product_type => "Donation")
 
@@ -40,6 +41,10 @@ class Item < ActiveRecord::Base
     product_type == "Membership"
   end
 
+  def pass?
+    product_type == "Pass"
+  end
+
   def self.donations_by(person)
     Item.donation.joins(:order).where('orders.person_id' => person.id)
   end
@@ -94,7 +99,8 @@ class Item < ActiveRecord::Base
   def product=(product)
     set_product_details_from product
     set_prices_from product
-    set_discount_from product if product.respond_to? :discount
+    set_discount_from product
+    set_pass_from product
     set_show_from product if product.respond_to? :show_id
     self.state = "purchased"
     self.product_id = if product then product.id end
@@ -257,7 +263,11 @@ class Item < ActiveRecord::Base
     end
 
     def set_discount_from(prod)
-      self.discount = prod.discount
+      self.discount = prod.discount if prod.respond_to?(:discount)
+    end
+
+    def set_pass_from(prod)
+      self.pass = prod.pass if prod.respond_to?(:pass)
     end
 
     def set_prices_from(prod)

data/app/models/job/daily_email_report_job.rb

@@ -4,12 +4,18 @@ class DailyEmailReportJob
     date ||= 1.day.ago
 
     Organization.where(:id => organization_ids_to_email(date)).receiving_sales_email.each do |org|
+      Rails.logger.info("DAILY SALES for org [#{org.id}]")
       tickets           = DailyTicketReport.new(org, date)
       donations         = DailyDonationReport.new(org, date)
       membership_report = DailyMembershipReport.new(org, date)
+      pass_report       = DailyPassReport.new(org, date)
 
-      next if tickets.rows.empty? && donations.rows.empty? && tickets.exchange_rows.empty? && !membership_report.send?
-      ReportsMailer.daily(tickets, donations, membership_report).deliver
+      next if tickets.rows.empty? && 
+              donations.rows.empty? && 
+              tickets.exchange_rows.empty? && 
+              pass_report.rows.empty? && 
+              !membership_report.send?
+      ReportsMailer.delay.daily(tickets, donations, membership_report, pass_report)
     end
   end