artfully_ose 1.2.0 → 1.3.0.pre1

data/app/models/convert.rb

@@ -0,0 +1,62 @@
+class Convert
+  attr_accessor :order, :items, :user
+
+  def initialize(order, items, user)
+    self.order = order
+    self.items = items
+    self.user = user
+  end
+
+  def submit
+    ctb = create_contribution
+    if !ctb.valid?
+      return
+    end
+    state = items.first.try(:state)
+
+    ActiveRecord::Base.transaction do
+      @return = Return.new(order, items)
+      @return.submit
+      if @return.successful?
+        convert_action = build_convert_action(ctb.occurred_at - 1.second)
+        convert_action.save!
+        ctb.save(ConvertOrder, 0, false, state)
+        @success = true
+      end
+    end
+  end
+
+  def successful?
+    @success || false
+  end
+
+  private
+
+    def create_contribution
+      ctb = Contribution.new
+      ctb.occurred_at = DateTime.now.in_time_zone(user.current_organization.time_zone)
+      ctb.amount = items.collect(&:price).sum
+      ctb.payment_method = order.payment_method
+      ctb.check_number = order.check_number
+      ctb.person_id = order.person_id
+      ctb.order_parent_id = order.id
+      ctb.organization_id =  user.current_organization.id
+      ctb.creator_id = user.id
+      ctb.fiscal_year     = Time.now.year.to_s.sub!('20','FY')
+      ctb.ack_method = 'Email'
+      ctb.subtype = 'Monetary'
+      ctb
+    end
+
+    def build_convert_action(occurred_at)
+      action = ConvertAction.for_organization(user.current_organization)
+      action.occurred_at = occurred_at
+      action.subject = order
+      action.person_id = order.person_id
+      action.creator_id = user.id
+      action.subtype  = "Monetary"
+      action.details = "#{items.size} #{'ticket'.pluralize(items.size)} into a donation"
+      action
+    end
+
+end

data/app/models/daily_membership_report.rb

@@ -20,7 +20,7 @@ class DailyMembershipReport
       end
     end
 
-    @lapsed_memberships = organization.memberships.lapsed(@end_date, @start_date)
+    @lapsed_memberships = organization.memberships.lapsed(@end_date, @start_date).all
   end
 
   def send?

data/app/models/database_views/item_view.rb

@@ -1,10 +1,24 @@
+#
+# Hi, you probably don't want to use this class/view for anything.
+# This MySql view, when used with a where clause, like this...
+#
+# ItemView.where(...)
+#
+# ...causes MySQL to use a derived table. The where(...) clause is essentially
+# running against a temp table with *no* indexing. This makes selecting
+# against the items_view table prohibitively slow.
+#
+# In general, it's much faster to just select against the Item table
+# and join with Order and Person
+#
 class ItemView < ActiveRecord::Base
   self.table_name = 'items_view'
-  self.primary_key = 'id'
 
   has_many :items,  :foreign_key => 'order_id'
   belongs_to :person, :foreign_key => 'person_id'
   belongs_to :item
+  belongs_to :organization
+  belongs_to :order
   has_many :shows,  :foreign_key => 'show_id'
 
   set_watch_for :created_at, :local_to => :self, :as => :organization
@@ -29,29 +43,37 @@ class ItemView < ActiveRecord::Base
     special_instructions("Special Instructions")
     notes("Notes")
 
+    order("Creator")          { |order| order.creator && order.creator.email }
+
     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("Nickname")        { |person| person.nickname }
+    person("Listing Name")    { |person| person.listing_name }
+    person("Maiden Name")     { |person| person.maiden_name }
     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 }
+    ('A'..'C').each_with_index do |letter, i|
+      person("Address#{letter} Type")        { |person| person.addresses[i] && person.addresses[i].kind }
+      person("Address#{letter} Address 1")   { |person| person.addresses[i] && person.addresses[i].address1 }
+      person("Address#{letter} Address 2")   { |person| person.addresses[i] && person.addresses[i].address2 }
+      person("Address#{letter} City")        { |person| person.addresses[i] && person.addresses[i].city }
+      person("Address#{letter} State")       { |person| person.addresses[i] && person.addresses[i].state }
+      person("Address#{letter} Zip")         { |person| person.addresses[i] && person.addresses[i].zip }
+      person("Address#{letter} Country")     { |person| person.addresses[i] && person.addresses[i].country }
+    end
+
+    (1..3).each do |i|
+      person("Phone#{i} type")          { |person| person.phones[i-1] && person.phones[i-1].kind }
+      person("Phone#{i} number")        { |person| person.phones[i-1] && person.phones[i-1].number }
+    end
+
     person("Website")         { |person| person.website }
     person("Twitter Handle")  { |person| person.twitter_handle }
     person("Facebook URL")    { |person| person.facebook_url }
@@ -72,29 +94,37 @@ class ItemView < ActiveRecord::Base
     special_instructions("Special Instructions")
     notes("Notes")
 
+    order("Creator")          { |order| order.creator && order.creator.email }
+
     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("Nickname")        { |person| person.nickname }
+    person("Listing Name")    { |person| person.listing_name }
+    person("Maiden Name")     { |person| person.maiden_name }
     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 }
+    ('A'..'C').each_with_index do |letter, i|
+      person("Address#{letter} Type")        { |person| person.addresses[i] && person.addresses[i].kind }
+      person("Address#{letter} Address 1")   { |person| person.addresses[i] && person.addresses[i].address1 }
+      person("Address#{letter} Address 2")   { |person| person.addresses[i] && person.addresses[i].address2 }
+      person("Address#{letter} City")        { |person| person.addresses[i] && person.addresses[i].city }
+      person("Address#{letter} State")       { |person| person.addresses[i] && person.addresses[i].state }
+      person("Address#{letter} Zip")         { |person| person.addresses[i] && person.addresses[i].zip }
+      person("Address#{letter} Country")     { |person| person.addresses[i] && person.addresses[i].country }
+    end
+
+    (1..3).each do |i|
+      person("Phone#{i} type")          { |person| person.phones[i-1] && person.phones[i-1].kind }
+      person("Phone#{i} number")        { |person| person.phones[i-1] && person.phones[i-1].number }
+    end
+
     person("Website")         { |person| person.website }
     person("Twitter Handle")  { |person| person.twitter_handle }
     person("Facebook URL")    { |person| person.facebook_url }
@@ -120,23 +150,29 @@ class ItemView < ActiveRecord::Base
     person("Middle Name")     { |person| person.middle_name }
     person("Last Name")       { |person| person.last_name }
     person("Suffix")          { |person| person.suffix }
+    person("Nickname")        { |person| person.nickname }
+    person("Listing Name")    { |person| person.listing_name }
+    person("Maiden Name")     { |person| person.maiden_name }
     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 }
+    ('A'..'C').each_with_index do |letter, i|
+      person("Address#{letter} Type")        { |person| person.addresses[i] && person.addresses[i].kind }
+      person("Address#{letter} Address 1")   { |person| person.addresses[i] && person.addresses[i].address1 }
+      person("Address#{letter} Address 2")   { |person| person.addresses[i] && person.addresses[i].address2 }
+      person("Address#{letter} City")        { |person| person.addresses[i] && person.addresses[i].city }
+      person("Address#{letter} State")       { |person| person.addresses[i] && person.addresses[i].state }
+      person("Address#{letter} Zip")         { |person| person.addresses[i] && person.addresses[i].zip }
+      person("Address#{letter} Country")     { |person| person.addresses[i] && person.addresses[i].country }
+    end
+
+    (1..3).each do |i|
+      person("Phone#{i} type")          { |person| person.phones[i-1] && person.phones[i-1].kind }
+      person("Phone#{i} number")        { |person| person.phones[i-1] && person.phones[i-1].number }
+    end
+
     person("Website")         { |person| person.website }
     person("Twitter Handle")  { |person| person.twitter_handle }
     person("Facebook URL")    { |person| person.facebook_url }
@@ -161,23 +197,29 @@ class ItemView < ActiveRecord::Base
     person("Middle Name")     { |person| person.middle_name }
     person("Last Name")       { |person| person.last_name }
     person("Suffix")          { |person| person.suffix }
+    person("Nickname")        { |person| person.nickname }
+    person("Listing Name")    { |person| person.listing_name }
+    person("Maiden Name")     { |person| person.maiden_name }
     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 }
+    ('A'..'C').each_with_index do |letter, i|
+      person("Address#{letter} Type")        { |person| person.addresses[i] && person.addresses[i].kind }
+      person("Address#{letter} Address 1")   { |person| person.addresses[i] && person.addresses[i].address1 }
+      person("Address#{letter} Address 2")   { |person| person.addresses[i] && person.addresses[i].address2 }
+      person("Address#{letter} City")        { |person| person.addresses[i] && person.addresses[i].city }
+      person("Address#{letter} State")       { |person| person.addresses[i] && person.addresses[i].state }
+      person("Address#{letter} Zip")         { |person| person.addresses[i] && person.addresses[i].zip }
+      person("Address#{letter} Country")     { |person| person.addresses[i] && person.addresses[i].country }
+    end
+
+    (1..3).each do |i|
+      person("Phone#{i} type")          { |person| person.phones[i-1] && person.phones[i-1].kind }
+      person("Phone#{i} number")        { |person| person.phones[i-1] && person.phones[i-1].number }
+    end
+
     person("Website")         { |person| person.website }
     person("Twitter Handle")  { |person| person.twitter_handle }
     person("Facebook URL")    { |person| person.facebook_url }

data/app/models/discount.rb

@@ -118,7 +118,7 @@ private
 
   def ensure_discount_is_allowed
     raise "Discount is not active." unless self.active?
-    raise "Discount won't work for this show." unless @cart.tickets.first.try(:event) == self.event
+    raise "Discount won't work for this show." unless @cart.tickets.each{|t| t.try(:event) == self.event}.present?
     raise "You need at least #{self.minimum_ticket_count} tickets for this discount." unless @cart.tickets.count >= self.minimum_ticket_count
     raise "Discount not valid for these shows or tickets." unless eligible_tickets.count > 0
     raise "Discount has been maxed out." unless tickets_fit_within_limit

data/app/models/discounts/discount_type.rb

@@ -52,7 +52,8 @@ class DiscountType
 
   def eligible_tickets
     is_in = ->(element, list){list.blank? || !! list.find_index(element)}
-    tix = tickets.find_all {|t| is_in.call(t.show.id, @discount.show_ids)}
+    tix = tickets.find_all { |t| t.event.discount_ids.include?(@discount.id)}
+    tix = tix.find_all {|t| is_in.call(t.show.id, @discount.show_ids)}
     tix = tix.find_all{|t| is_in.call(t.ticket_type.name, @discount.ticket_types)}
     return tix
   end

data/app/models/donation.rb

@@ -1,7 +1,19 @@
 class Donation < ActiveRecord::Base
   include Itemable
+
   belongs_to :cart
   belongs_to :organization
+  belongs_to :campaign
+  belongs_to :appeal
+
+  attr_accessible :received_amount
+
+  GIFT_TYPES = {
+      nil               => 'Any',
+      :donation         => 'Donation',
+      :pledge           => 'Pledge',
+      :pledge_payment   => 'Pledge Payment'
+  }.with_indifferent_access
 
   validates_numericality_of :amount, :greater_than => 0
   validates_presence_of :organization
@@ -20,7 +32,7 @@ class Donation < ActiveRecord::Base
   end
 
   def order_summary_description
-    "Donation"
+    'Donation'
   end
 
   def expired?
@@ -38,4 +50,17 @@ class Donation < ActiveRecord::Base
   def returnable?
     false
   end
-end
+
+  def convertable?
+    false
+  end
+
+
+  def item
+    @_item ||= Item.where(:product_type => self.class.name, :product_id => self.id).first
+  end
+
+  def order
+    @_order ||= self.item.order rescue nil
+  end
+end

data/app/models/donation_search.rb

@@ -1,26 +1,204 @@
 class DonationSearch
+  extend ::ArtfullyOseHelper
 
-  attr_reader :start, :stop
+  attr_reader :start, :stop, :type, :campaign_id, :appeal_id, :only_unacknowledged, :search
+  attr_accessor  :rows
 
-  def initialize(start, stop, organization)
+  def initialize(organization, params)
     @organization = organization
-    @start = start_with(start)
-    @stop  = stop_with(stop)
-    @results = yield(results) if block_given?
+
+    @start = start_with(params[:start], params[:has_default_range])
+    @stop  = stop_with(params[:stop], params[:has_default_range])
+    @type = params[:type]
+    @campaign_id = params[:campaign_id]
+    @appeal_id = params[:appeal_id]
+    @search = params[:search]
+    @only_unacknowledged = params[:only_unacknowledged]
+
+    self.rows = results
   end
 
+
   def results
-    @results ||= Order.in_range(@start, @stop, @organization.id).select(&:has_donation?).sort_by(&:created_at)
+    orders = @organization.orders.includes(:person, :donation => [:campaign, :appeal])
+    orders = orders.where("EXISTS(SELECT 1 FROM items WHERE items.order_id = orders.id AND items.product_type = 'Donation')")
+    orders = orders.where('donations.campaign_id=?', @campaign_id) if @campaign_id.to_i > 0
+    orders = orders.where('donations.appeal_id=?', @appeal_id) if @appeal_id.to_i > 0
+    orders = orders.where('donations.pledge=?', true) if @type == 'pledge'
+    orders = orders.where('donations.pledge=? AND orders.parent_id IS NULL', false) if @type == 'donation'
+    orders = orders.where('donations.pledge=? AND orders.parent_id IS NOT NULL', false) if @type == 'pledge_payment'
+    orders = orders.where('donations.ack_sent_date is null') if @only_unacknowledged
+    orders = orders.where('people.id in (?)', Person.search_index(@search.dup, @organization).collect(&:id)) if @search.present?
+
+    rows = []
+    orders.each do |order|
+      row = Row.new(@organization, order)
+      rows << row if  (@start.blank? || row.date >= @start) && (@stop.blank? || row.date <= @stop)
+    end
+
+    rows
+  end
+
+  def campaign(campaign_id = self.campaign_id)
+    @campaign ||= (campaign_id.present? && campaign_id.to_i > 0) ? Campaign.find(campaign_id) : nil
+  end
+
+
+  class Row
+    attr_accessor :order, :donation, :person, :type, :date
+
+    def initialize(organization, order)
+      @organization = organization
+      self.order = order
+      self.donation = order.donation || Donation.new
+      self.person = order.person
+
+      self.type = order.gift_type
+      if self.type == 'Pledge'
+        date = donation.commitment_date || order.created_at
+      else
+        date = order.created_at
+      end
+
+      self.date = ActiveSupport::TimeZone.create(@organization.time_zone).utc_to_local(date)
+    end
+
+    def self.find_person_email(person_id)
+      p = Person.find(person_id) if person_id.to_i > 0
+      p.email if p
+    end
+
+    def self.soft_credit_amount(donation_id)
+      soft_credit = SoftCredit.find_by_donation_id(donation_id)
+      soft_credit.amount.to_i unless soft_credit.nil?
+    end
+
+    def self.soft_credit_person(donation_id)
+      soft_credit = SoftCredit.find_by_donation_id(donation_id)
+      Person.find(soft_credit.person_id) unless soft_credit.nil?
+    end
+
+    comma do
+      order("Order Date")                 { |order| order.created_at }
+      order("Payment Method")             { |order| order.payment_method }
+      order("Amount")                     { |order| order.sum_donations.to_i / 100.00 }
+      order("Non Deductible Amount")      { |order| order.nongift_amount.to_i / 100.00 }
+      order("Donation Type")              { |order| order.actions.select{|action| action.subject_type == 'Order'}.first.subtype }
+      order("Notes")                      { |order| order.notes }
+      order("Creator")                    { |order| order.creator && order.creator.email }
+      donation("Fiscal Year")             { |donation| donation.fiscal_year}
+
+      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 }
+
+      ('A'..'C').each_with_index do |letter, i|
+        person("Address#{letter} Type")        { |person| person.addresses[i] && person.addresses[i].kind }
+        person("Address#{letter} Address 1")   { |person| person.addresses[i] && person.addresses[i].address1 }
+        person("Address#{letter} Address 2")   { |person| person.addresses[i] && person.addresses[i].address2 }
+        person("Address#{letter} City")        { |person| person.addresses[i] && person.addresses[i].city }
+        person("Address#{letter} State")       { |person| person.addresses[i] && person.addresses[i].state }
+        person("Address#{letter} Zip")         { |person| person.addresses[i] && person.addresses[i].zip }
+        person("Address#{letter} Country")     { |person| person.addresses[i] && person.addresses[i].country }
+      end
+
+      (1..3).each do |i|
+        person("Phone#{i} type")          { |person| person.phones[i-1] && person.phones[i-1].kind }
+        person("Phone#{i} number")        { |person| person.phones[i-1] && person.phones[i-1].number }
+      end
+
+      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 :with_campaigns do
+      order("Order Date")                 { |order| order.created_at }
+      order("Payment Method")             { |order| order.payment_method }
+      order("Amount")                     { |order| order.sum_donations.to_i / 100.00 }
+      order("Non Deductible Amount")      { |order| order.nongift_amount.to_i / 100.00 }
+      order("Donation Type")              { |order| order.actions.select{|action| action.subject_type == 'Order'}.first.subtype }
+      order("Notes")                      { |order| order.notes }
+      order("Creator")                    { |order| order.creator && order.creator.email }
+
+      donation("Campaign")                { |donation| donation.campaign.name unless donation.campaign.nil?}
+      donation("Appeal")                  { |donation| donation.appeal.name unless donation.appeal.nil?}
+      donation("Acknowledgement")         { |donation| donation.ack_sent_date}
+      donation("Match Eligible Matcher")  { |donation| Row.find_person_email(donation.matcher)}
+      donation("Match Eligible Ratio")    { |donation| donation.ratio}
+      donation("Match Eligible Amount")   { |donation| donation.eligible_amount.to_i / 100.00}
+      donation("Soft Credit Email")       { |donation| Row.soft_credit_person(donation.id).email unless Row.soft_credit_person(donation.id).nil?}
+      donation("Soft Credit First Name")  { |donation| Row.soft_credit_person(donation.id).first_name unless Row.soft_credit_person(donation.id).nil?}
+      donation("Soft Credit Last Name")   { |donation| Row.soft_credit_person(donation.id).last_name unless Row.soft_credit_person(donation.id).nil?}
+      donation("Soft Credit Amount")      { |donation| Row.soft_credit_amount(donation.id)}
+      donation("Fiscal Year")             { |donation| donation.fiscal_year}
+
+      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 }
+
+      ('A'..'C').each_with_index do |letter, i|
+        person("Address#{letter} Type")        { |person| person.addresses[i] && person.addresses[i].kind }
+        person("Address#{letter} Address 1")   { |person| person.addresses[i] && person.addresses[i].address1 }
+        person("Address#{letter} Address 2")   { |person| person.addresses[i] && person.addresses[i].address2 }
+        person("Address#{letter} City")        { |person| person.addresses[i] && person.addresses[i].city }
+        person("Address#{letter} State")       { |person| person.addresses[i] && person.addresses[i].state }
+        person("Address#{letter} Zip")         { |person| person.addresses[i] && person.addresses[i].zip }
+        person("Address#{letter} Country")     { |person| person.addresses[i] && person.addresses[i].country }
+      end
+
+      (1..3).each do |i|
+        person("Phone#{i} type")          { |person| person.phones[i-1] && person.phones[i-1].kind }
+        person("Phone#{i} number")        { |person| person.phones[i-1] && person.phones[i-1].number }
+      end
+
+      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
+
   end
 
   private
 
-  def start_with(start)
-    start.present? ? DateTime.parse(start) : default_start
+  def start_with(start, has_default_range)
+    if start.present?
+      DateTime.parse(start)
+    else
+      has_default_range ? default_start : nil
+    end
   end
 
-  def stop_with(stop)
-    stop.present? ? Sundial.midnightish(@organization, stop) : default_stop
+  def stop_with(stop, has_default_range)
+    if stop.present?
+      Sundial.midnightish(@organization, stop)
+    else
+      has_default_range ? default_stop : nil
+    end
   end
 
   def default_start