artfully_ose 1.2.0.beta.1 → 1.2.0.pre

data/app/models/individual.rb

@@ -1,7 +1,5 @@
 class Individual < Person
 
-  after_destroy { |record| Delayed::Job.enqueue(CleanupSuggestedHouseholdsJob.new(record.id), :queue => :suggested_households) }
-
   def to_s
     if first_name.present? || last_name.present?
       [salutation, first_name, middle_name, last_name, suffix].reject(&:blank?).join(" ")
@@ -17,4 +15,4 @@ class Individual < Person
   def naming_details_available?
     first_name.present? || last_name.present? || email.present?
   end
-end
+end

data/app/models/item.rb

@@ -12,7 +12,6 @@ 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
   
@@ -20,12 +19,9 @@ 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 Pass)
+  validates_inclusion_of :product_type, :in => %( Ticket Donation Membership )
 
-  scope :donation,        where(:product_type => 'Donation')
-  scope :membership,      where(:product_type => 'Membership')
-  scope :ticket,          where(:product_type => 'Ticket')
-  scope :sold_or_comped,  where("state in ('purchased','comped','settled')")
+  scope :donation, where(:product_type => "Donation")
 
   scope :imported, joins(:order).merge(Order.imported)
   scope :not_imported, joins(:order).merge(Order.not_imported)
@@ -44,17 +40,9 @@ 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
-
   #
   # If the product that this item points to (a ticket, for instance) gets refunded or returned
-  # then re-sold to someone else, this item will still show up on the original purchaser's 
+  # then re-sold to someone else, this item wil stil lshow up on the original purchaser's 
   # action feed
   #
   def order_summary_description
@@ -102,8 +90,7 @@ class Item < ActiveRecord::Base
   def product=(product)
     set_product_details_from product
     set_prices_from product
-    set_discount_from product
-    set_pass_from product
+    set_discount_from product if product.respond_to? :discount
     set_show_from product if product.respond_to? :show_id
     self.state = "purchased"
     self.product_id = if product then product.id end
@@ -117,15 +104,15 @@ class Item < ActiveRecord::Base
   end
 
   def refundable?
-    (not settlement_issued?) and (not dead?) and product and product.refundable?
+    (not settlement_issued?) and product and product.refundable?
   end
 
   def exchangeable?
-    (not settlement_issued?) and (not dead?) and product and product.exchangeable?
+    (not settlement_issued?) and product and product.exchangeable?
   end
 
   def returnable?
-    (not dead?) and product and product.returnable?
+    product and product.returnable?
   end
 
   #
@@ -192,7 +179,7 @@ class Item < ActiveRecord::Base
   end
 
   def dead?
-    refunded? || refund? || exchanged? || return?
+    refunded? || refund? || return?
   end
   
   def return?
@@ -225,7 +212,7 @@ class Item < ActiveRecord::Base
   def exchanged?
     state.eql? "exchanged"
   end
-
+  
   #TODO: This isn't used anymore.  It needs to go
   def exchangee?
     state.eql? "exchangee"
@@ -266,17 +253,13 @@ class Item < ActiveRecord::Base
     end
 
     def set_discount_from(prod)
-      self.discount = prod.discount if prod.respond_to?(:discount)
-    end
-
-    def set_pass_from(prod)
-      self.pass = prod.pass if prod.respond_to?(:pass)
+      self.discount = prod.discount
     end
 
     def set_prices_from(prod)
       self.original_price = prod.price
       self.price          = (prod.sold_price || prod.cart_price || prod.price)
-      self.realized_price = self.price - prod.realized_fee
+      self.realized_price = self.price - prod.class.realized_fee
       self.net            = (self.realized_price - (per_item_processing_charge || lambda { |item| 0 }).call(self)).floor
       self.service_fee    = prod.service_fee || 0
     end

data/app/models/job/daily_email_report_job.rb

@@ -3,30 +3,16 @@ 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? && 
-              pass_report.rows.empty? && 
-              !membership_report.send?
-      ReportsMailer.delay.daily(tickets, donations, membership_report, pass_report)
-    end
-  end
-
-  def organization_ids_to_email(date)
     #
     # We have to go back two days here intentionally to account for orgs across different time zones
     # We'll re-select the correct orders in the respective jobs
     #
     org_ids = Order.csv_not_imported.after(date-1.day).before(DateTime.now).pluck(:organization_id).uniq
-    orgs_with_lapsed_memberships = Membership.lapsed.pluck(:organization_id).uniq
-    org_ids = (org_ids + orgs_with_lapsed_memberships).uniq    
-    org_ids
+    Organization.where(:id => org_ids).receiving_sales_email.each do |org|
+      tickets = DailyTicketReport.new(org, date)
+      donations = DailyDonationReport.new(org, date)
+      next if tickets.rows.empty? && donations.rows.empty? && tickets.exchange_rows.empty?
+      ReportsMailer.daily(tickets, donations).deliver
+    end
   end
 end

data/app/models/job/mailchimp_sync_job.rb

@@ -33,8 +33,10 @@ class MailchimpSyncJob < Struct.new(:mailchimp_kit, :options)
     mailchimp_kit.sync_merged_winner_to_mailchimp(options[:winner_id], options[:new_lists])
   end
 
+  #
+  # Noop.  We don't respond to this yet.
+  #
   def webhook_cleaned
-    mailchimp_kit.sync_mailchimp_webhook_cleaned(list_id, data)
   end
 
   def webhook_subscribe

data/app/models/job/order_processor.rb

@@ -1,94 +1,28 @@
 #
-# This class manages all the patron-related things we need to do after an order is placed
+# This class manages all the things we need to do after a sale is made
 #
-# * Create donation, purchase actions
-# * Process memberships
-# * Send confirmation emails if skip_email is true
+# TODO: Add sending email.
 #
-# options can include:
-#   :skip_actions. If set to true, no actions will be generated for this action
-#   :skip_email.   If set to true, no email confirmation will be sent
-#
-class OrderProcessor < Struct.new(:order, :options)
+class OrderProcessor < Struct.new(:order, :skip_actions)
   include ActionView::Helpers::TextHelper
   QUEUE = "order"
 
-  def initialize(order, options = {})
-    self.options  = options
-    self.order    = order
-  end
-
-  def self.process(order, options = {})
-    job = order.processor_class.new(order, options)
+  def self.process(order, skip_actions = false)
+    job = OrderProcessor.new(order, skip_actions)
     Delayed::Job.enqueue job, :queue => QUEUE
   end
 
   def perform
-    ActiveRecord::Base.transaction do
-      self.order.create_donation_actions unless skip_actions
-      self.order.create_purchase_action  unless skip_actions
-      process_memberships
-      process_passes
-    end
-
-    generate_qr_codes_and_pdf
-    send_confirmation
-  end
+    self.order.create_donation_actions unless self.skip_actions
+    self.order.create_purchase_action  unless self.skip_actions
 
-  def generate_qr_codes_and_pdf
-    begin
-      order.tickets.each do |item|
-        item.product.generate_qr_code_without_delay
-        generate_pdf if order.organization.can? :access, :scannable_tickets
-      end
-    rescue Exception => e
-      Exceptional.context(:order_id => order.id)
-      Exceptional.handle(e, "Could not generate PDF for order")
-    end
-  end
-
-  def send_confirmation
-    begin
-      OrderMailer.confirmation_for(order).deliver unless skip_email
-    rescue Exception => e
-      Exceptional.context(:order_id => order.id)
-      Exceptional.handle(e, "Could not send order confirmation for order")
-    end
-  end
-
-  def skip_actions
-    self.options[:skip_actions] == true
-  end
-
-  def skip_email
-    self.options[:skip_email] == true
+    process_memberships
   end
 
   def process_memberships
-    unless self.order.memberships.empty?
-      self.order.memberships.each do |membership_item|
-        Member.for(membership_item.product, self.order.person)
-      end
-      self.order.create_generic_action("memberships")
+    self.order.memberships.each do |membership_item|
+      Member.for(membership_item.product)
     end
+    self.order.create_membership_action
   end
-
-  def process_passes
-    unless self.order.passes.empty? || order.is_a?(RefundOrder)
-      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")
-      PassMailer.pass_info_for(self.order.person, self.order.organization.email,self.order.passes.collect(&:product)).deliver
-    end
-  end
-
-  def generate_pdf
-    pdf = PdfGeneration.new(order).generate
-    file = Tempfile.new(["#{order.id}", '.pdf'])
-    file << pdf.force_encoding("UTF-8")
-    order.pdf = file
-    order.save
-  end
-end
+end

data/app/models/job/show_creator.rb

@@ -15,7 +15,7 @@ class ShowCreator < Struct.new(:datetimes, :show_params, :chart_params, :event,
 
   def perform
     ActiveRecord::Base.transaction do
-      datetimes.each do |datetime_string|     
+      datetimes.each do |f|     
         @show = self.event.next_show 
         
         #clear the sections and replace them with whatever they entered
@@ -25,15 +25,10 @@ class ShowCreator < Struct.new(:datetimes, :show_params, :chart_params, :event,
         @show.organization = organization
         @show.chart_id = @show.chart.id
 
-        @show.datetime = DateTime.parse(datetime_string).change(:offset => offset(datetime_string, event.time_zone))
-        @show.go!(publish)    
-        @show.refresh_stats  
+        @show.datetime = ActiveSupport::TimeZone.create(self.event.time_zone).parse(DateTime.parse(f).to_s)
+        @show.go!(publish)      
       end
     end
   end
 
-  def offset(datetime_string, time_zone)
-    ActiveSupport::TimeZone.create(event.time_zone).parse(datetime_string).formatted_offset
-  end
-
 end

data/app/models/kit.rb

@@ -28,6 +28,8 @@ class Kit < ActiveRecord::Base
       event(:activate_without_pending) { transitions :from => [:fresh, :pending, :cancelled], :to => :activated }
     end
 
+    
+
     if self.requires_approval
       state_machine do
         event(:submit_for_approval) { transitions :from => :fresh, :to => :pending }
@@ -37,7 +39,7 @@ class Kit < ActiveRecord::Base
     class_eval(&block)
     self
   end
-
+  
   def self.activate(options)
     activation_requirements[:unless] << options.delete(:unless) if options.has_key?(:unless)
     activation_requirements[:if] << options.delete(:if) if options.has_key?(:if)
@@ -61,7 +63,7 @@ class Kit < ActiveRecord::Base
   end
 
   def self.subklasses
-    @subklasses ||= [ TicketingKit, RegularDonationKit, SponsoredDonationKit, ResellerKit, MailchimpKit, MembershipKit, PassesKit, ScannableTicketsKit, RelationshipsKit ].freeze
+    @subklasses ||= [ TicketingKit, RegularDonationKit, SponsoredDonationKit, ResellerKit, MailchimpKit ].freeze
   end
 
   def self.pad_with_new_kits(kits = [])

data/app/models/kits/mailchimp_kit.rb

@@ -7,7 +7,6 @@ class MailchimpKit < Kit
 
     state_machine do
       state :cancelled, :enter => :kit_cancelled
-      event(:submit_for_approval) { transitions :from => :fresh, :to => :pending }
     end
 
     when_active do
@@ -52,7 +51,7 @@ class MailchimpKit < Kit
   end
 
   def lists
-    gibbon.lists({:start => 0, :limit=> 100})["data"].map do |list|
+    gibbon.lists["data"].map do |list|
       [list["name"], list["id"]]
     end
   end
@@ -132,9 +131,7 @@ class MailchimpKit < Kit
         :email => member["Email Address"],
         :skip_sync_to_mailchimp => true,
         :subscribed_lists => [list_id]
-      }) do |person|
-        person.skip_commit = true
-      end
+      })
       note = person.notes.build({
         :text => "Imported from MailChimp",
         :occurred_at => Time.now
@@ -256,16 +253,6 @@ class MailchimpKit < Kit
     person
   end
 
-  def sync_mailchimp_webhook_cleaned(list_id, data)
-    person = organization.people.find_by_email(data["email"])
-    return if person.nil?
-
-    reason = (data["reason"] == "hard" ? "a hard bounce" : "abuse")
-    person.subscribed_lists.delete(list_id)
-    person.new_note("MailChimp cleaned #{person.email} from #{list_name(list_id)} because of #{reason}.", Time.now, nil, organization_id)
-    person.save
-  end
-
   def sync_mailchimp_webhook_update_person_email(list_id, data)
     person = organization.people.find_by_email(data["old_email"])
     return if person.nil? || person.do_not_email?
@@ -290,7 +277,12 @@ class MailchimpKit < Kit
   def sync_mailchimp_webhook_member_unsubscribe(list_id, data)
     person = organization.people.find_by_email(data["email"])
     return unless person
-    person.new_note("Unsubscribed in MailChimp from #{list_name(list_id)}", Time.now, nil, organization_id)
+    note = person.notes.build({
+      :text => "Unsubscribed in MailChimp from #{list_name(list_id)}",
+      :occurred_at => Time.now
+    })
+    note.organization_id = organization_id
+    note.save
     person.subscribed_lists.delete(list_id)
     person.save
   end
@@ -313,7 +305,7 @@ class MailchimpKit < Kit
       hear_action = HearAction.for_organization(organization)
       hear_action.details = %{"#{data["subject"].truncate(25)}" delivered to #{list_name(list_id)} MailChimp list.}
       hear_action.occurred_at = occurred_at
-      hear_action.subtype = "Mailchimp (Sent)"
+      hear_action.subtype = "Email (Sent)"
       hear_action.person = person
       hear_action.save
     end
@@ -376,7 +368,7 @@ class MailchimpKit < Kit
       member_hash = {}
 
       mailchimp_attributes.inject({}) do |member_hash, attribute|
-        member_hash[attribute] = member[headers.index(attribute)] unless headers.index(attribute).nil?
+        member_hash[attribute] = member[headers.index(attribute)]
         member_hash
       end
     end

data/app/models/kits/regular_donation_kit.rb

@@ -1,7 +1,5 @@
 class RegularDonationKit < Kit
   acts_as_kit :with_approval => true do
-    self.configurable = true
-
     activate :if => :has_tax_info?
     activate :if => :exclusive?
     approve :unless => :no_bank_account?
@@ -11,36 +9,27 @@ class RegularDonationKit < Kit
     end
   end
 
-  ACCESSORS = [
-    :about_organization_text, :donation_ask_text, :donate_now_text, :donation_nudge_text,
-    :suggested_gifts, :open_gift_field, :thanks_msg_text, :email_msg_text, :donation_only_storefront,
-  ]
-
-  attr_accessible *ACCESSORS
-
-  store :settings, :accessors => ACCESSORS
-
   def has_tax_info?
-    errors.add(:requirements, 'Your organization\'s tax information is missing or incomplete. Please complete it in order to active this kit.') unless organization.has_tax_info?
+    errors.add(:requirements, "Your organization's tax information is missing or incomplete. Please complete it in order to active this kit.") unless organization.has_tax_info?
     organization.has_tax_info?
   end
-
+  
   def friendly_name
-    '501(c)(3) Donations'
+    "Charity Donations"
   end
-
+  
   def pitch
-    'Receive donations for a 501(c)(3)'
+    "Receive donations for a 501(c)(3)"
   end
 
   def exclusive?
     exclusive = !organization.kits.where(:type => alternatives.collect(&:to_s)).any?
-    errors.add(:requirements, 'You have already activated a mutually exclusive kit.') unless exclusive
+    errors.add(:requirements, "You have already activated a mutually exclusive kit.") unless exclusive
     exclusive
   end
 
   def no_bank_account?
-    errors.add(:requirements, 'Your organization needs bank account information first.') if organization.bank_account.nil?
+    errors.add(:requirements, "Your organization needs bank account information first.") if organization.bank_account.nil?
     organization.bank_account.nil?
   end
 
@@ -52,23 +41,4 @@ class RegularDonationKit < Kit
     AdminMailer.donation_kit_notification(self).deliver
     ProducerMailer.donation_kit_notification(self, organization.owner).deliver
   end
-
-  def suggested_gifts=(value)
-    value = value.values if value.is_a?(Hash)
-
-    value = value.map do |suggested_gift|
-      suggested_gift = { :amount => suggested_gift } if [String, Fixnum, Bignum, Float, BigDecimal].any? { |klass| suggested_gift.is_a?(klass) }
-      suggested_gift[:amount] = suggested_gift[:amount].to_i
-      suggested_gift.delete :level_name if suggested_gift[:level_name].blank?
-      suggested_gift.with_indifferent_access
-    end.reject do |suggested_gift|
-      suggested_gift[:amount].to_i <= 0
-    end.sort do |l, r|
-      l[:amount] <=> r[:amount]
-    end
-
-    self.settings = {} unless self.settings.is_a?(Hash)
-    self.settings[:suggested_gifts] = value
-    self.settings_will_change!
-  end
-end
+end