artfully_ose 1.2.0.beta.1 → 1.2.0.pre

data/app/models/orders/comp_order.rb

@@ -3,10 +3,6 @@ class CompOrder < Order
     
   def self.location
     "Artful.ly"
-  end  
-
-  def action_class
-    CompAction
   end
   
   def initialize

data/app/models/orders/imported_order.rb

@@ -1,10 +1,6 @@
 class ImportedOrder < ::Order
   include Unrefundable
   
-  def skip_confirmation_email?
-    true
-  end
-
   def location
     "Artful.ly"
   end

data/app/models/{order.rb → orders/order.rb}

@@ -25,7 +25,7 @@ class Order < ActiveRecord::Base
   has_many :items, :dependent => :destroy
   has_many :actions, :foreign_key => "subject_id", :dependent => :destroy
 
-  attr_accessor :skip_actions, :skip_email
+  attr_accessor :skip_actions
 
   set_watch_for :created_at, :local_to => :organization  
   set_watch_for :created_at, :local_to => :self, :as => :admins
@@ -33,8 +33,8 @@ class Order < ActiveRecord::Base
   validates_presence_of :person_id
   validates_presence_of :organization_id
 
-  after_create :sell_tickets
   after_create :process
+  after_create :sell_tickets
 
   before_save   :calculate_when_revenue_applies
   after_save    :calculate_lifetime_value
@@ -49,8 +49,6 @@ class Order < ActiveRecord::Base
   scope :csv_not_imported, where("import_id IS NULL")
   scope :artfully, where("transaction_id IS NOT NULL")
 
-  has_attached_file :pdf, ORDER_PDF_STORAGE
-
   searchable do
     text :details, :id, :type, :location, :transaction_id, :payment_method, :special_instructions
 
@@ -105,10 +103,6 @@ class Order < ActiveRecord::Base
     end
   end
 
-  def show
-    items.first.try(:show)
-  end
-
   def service_fee
     items.collect(&:service_fee).sum
   end
@@ -122,14 +116,6 @@ class Order < ActiveRecord::Base
     tickets.collect(&:discount).uniq.compact
   end
 
-  def pass_codes
-    tickets.collect(&:pass).uniq.compact
-  end
-  
-  def imported?
-    !self.import_id.nil?
-  end
-
   def total_discount
     tickets.collect(&:total_discount).sum
   end
@@ -183,19 +169,6 @@ class Order < ActiveRecord::Base
   def destroyable?
     ( (type.eql? "ApplicationOrder") || (type.eql? "ImportedOrder") ) && !is_fafs? && !artfully? && has_single_donation?
   end
-
-  def skip_confirmation_email?
-    skip_email || anonymous_purchase? || imported? || self.person.email.blank?
-  end
-
-  def process
-    @skip_actions ||= false
-    OrderProcessor.process(self, {:skip_actions => @skip_actions, :skip_email => self.skip_confirmation_email?})
-  end
-
-  def processor_class
-    OrderProcessor
-  end
   
   def assignable?
     anonymous_purchase? && parent.nil?
@@ -249,47 +222,6 @@ class Order < ActiveRecord::Base
   def memberships(reload=false)
     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
-
-  def self.membership_sale_search(search)
-    standard = ::Order.
-      joins(:items).
-      joins("INNER JOIN memberships ON (items.product_type = #{::Item.sanitize('Membership')} AND items.product_id = memberships.id)").
-      joins("INNER JOIN membership_types ON (membership_types.id = memberships.membership_type_id)").
-      includes([:organization, :person]).
-      group('orders.id')
-
-
-    standard = standard.after(search.start) if search.start
-    standard = standard.before(search.stop) if search.stop
-    standard = standard.where('orders.organization_id = ?', search.organization.id) if search.organization
-    standard = standard.where("membership_types.id = ?", search.membership_type.id) if search.membership_type if search.membership_type
-    standard.all
-  end
-
-  def self.pass_sale_search(search)
-    standard = ::Order.
-      where("orders.type != ?", ::Reseller::Order.name).
-      joins(:items).
-      joins("INNER JOIN passes ON (items.product_type = #{::Item.sanitize('Pass')} AND items.product_id = passes.id)").
-      joins("INNER JOIN pass_types ON (pass_types.id = passes.pass_type_id)").
-      includes([:organization, :person]).
-      group('orders.id')
-
-
-    standard = standard.after(search.start) if search.start
-    standard = standard.before(search.stop) if search.stop
-    standard = standard.where('orders.organization_id = ?', search.organization.id) if search.organization
-    standard = standard.where("pass_types.id = ?", search.pass_type.id) if search.pass_type if search.pass_type
-    standard.all
-  end
   
   def has_single_donation?
     (donations.size == 1) && tickets.empty?
@@ -324,18 +256,6 @@ class Order < ActiveRecord::Base
     items.select(&:donation?).present?
   end
 
-  def has_membership?
-    items.select(&:membership?).present?
-  end
-
-  def has_pass?
-    items.select(&:pass?).present?
-  end
-
-  def items_that_used_pass
-    items.select{ |i| i.pass_id.present? }
-  end
-
   def sum_donations
     all_donations.collect{|item| item.total_price.to_i}.sum
   end
@@ -395,10 +315,6 @@ class Order < ActiveRecord::Base
     payment_method.eql? CashPayment.payment_method
   end
 
-  def check?
-    payment_method.eql? CheckPayment.payment_method
-  end
-
   def original_order
     if self.parent.nil?
       return self
@@ -437,11 +353,10 @@ class Order < ActiveRecord::Base
     self.person.calculate_lifetime_value
     self.person.calculate_lifetime_ticket_value
     self.person.calculate_lifetime_donations
-    self.person.calculate_lifetime_memberships
   end
 
-  def action_class
-    GetAction
+  def process
+    OrderProcessor.process(self, @skip_actions)
   end
 
   def purchase_action_class
@@ -494,30 +409,20 @@ class Order < ActiveRecord::Base
     end
   end
 
-  #
-  # Creates actions for collection_name
-  #
-  # For example, if we're creating actions for the passses on this order, call order.create_generic_action('passes')
-  # order.rb must respond to .send(collection_name) and the underlying class must implement to_sentence
-  #
-  # For example, order.create_generic_action('passes'), Pass.to_sentence must be implemented
-  #
-  def create_generic_action(collection_name)
-    action                  = self.action_class.new
-    action.person           = self.person
-    action.subject          = self
-    action.organization     = self.organization
-    action.details          = action_details(self.send(collection_name).collect(&:product)) + ". " + (self.notes || "")
-    action.occurred_at      = self.created_at
-
-    action.subtype          = action.subtype
-    action.save!
-    action      
-  end
-  
-  def action_details(collection)
-    klass = Kernel.const_get(collection.first.class.name)
-    klass.to_sentence(collection)
+  def create_membership_action
+    unless self.memberships.empty?
+      action                  = GetAction.new
+      action.person           = self.person
+      action.subject          = self
+      action.organization     = self.organization
+      action.details          = "#{pluralize(self.memberships.size, 'membership')}"
+      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 assign_person(person, create_actions = true)

data/app/models/orders/refund_order.rb

@@ -16,10 +16,6 @@ class RefundOrder < Order
     RefundAction
   end
 
-  def processor_class
-    RefundOrderProcessor
-  end
-
   def ticket_details
     "received refund for " + pluralize(num_tickets, "ticket")
   end

data/app/models/organization.rb

@@ -3,9 +3,9 @@ class Organization < ActiveRecord::Base
   include Valuation::LifetimeFees
   include Ext::Resellable::Organization
   include Ext::Integrations::Organization
-
-  attr_accessible :name, :time_zone, :ein, :legal_organization_name, :email, :receive_daily_sales_report, :country, :state, :zip, :phone_number, :website, :discipline, :cached_slug
-
+  
+  attr_accessible :name, :time_zone, :ein, :legal_organization_name, :email, :receive_daily_sales_report
+  
   has_many :events
   has_many :charts
   has_many :shows
@@ -14,37 +14,33 @@ class Organization < ActiveRecord::Base
 
   has_many :people
   has_many :segments
-  has_many :households
 
   has_many :user_memberships
   has_many :orders
   has_many :items
 
   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'
+  has_many :users, :through => :user_memberships
   has_many :kits, :before_add => :check_for_duplicates,
                   :after_add => lambda { |u,k| k.activate! unless k.activated? }
 
   has_many :imports
 
+  validates_presence_of :name, :email
+  validates :ein, :presence => true, :if => :updating_tax_info
+  validates :legal_organization_name, :presence => true, :if => :updating_tax_info
+
   scope :receiving_sales_email, where(:receive_daily_sales_report => true)
 
   is_sluggable :name, :editable => true
-  validates    :cached_slug,
-               :exclusion => { :in => %w(orders tickets admin artfully statements settlements search searches store event events show shows reseller members mobile member resellers merges people phones refunds exchanges),
-                               :message => "we can't set your Storefront URL to \"%{value}\"" },
-               :uniqueness => { :message => "\"%{value}\" has already been taken"}
   def to_param
     self.id
   end
 
+
   #
   # We aren't interested in FAFS donations, so override lifetime_orders
   # to only include Artfully orders  see: Valuation::LifetimeValue
@@ -57,10 +53,10 @@ class Organization < ActiveRecord::Base
   # Returns Tag objects.  For an array of tag strings, call unique_tag_strings_for
   #
   # This has been supersceded by tags_on and tag_counts_on in acts_as_taggable_on
-  # But those methods have not been added to an acts_as_taggable_on release yet.
+  # But those methods have not been added to a release yet.
   #
   def tags_for(tagged_association)
-
+    
     #Yak
     begin
       self.send(tagged_association.to_sym)
@@ -69,7 +65,7 @@ class Organization < ActiveRecord::Base
     end
 
     table_name = Kernel.const_get(tagged_association.to_s.classify).table_name
-
+    
     ActsAsTaggableOn::Tag.joins("INNER JOIN taggings ON tags.id = taggings.tag_id")
                          .joins("INNER JOIN #{table_name} ON #{table_name}.id = taggings.taggable_id")
                          .joins("INNER JOIN organizations ON organizations.id = #{table_name}.organization_id")
@@ -80,22 +76,8 @@ class Organization < ActiveRecord::Base
     self.tags_for(tagged_association).all.map(&:name).uniq
   end
 
-  #
-  # Will promote user to owner and demote any other owners
-  #
-  def make_owner(user)
-    UserMembership.promote(user, self)
-  end
-
-  #
-  # In service of the user_memberships.owner migration.
-  #
-  def previous_owner
-    users.order('user_memberships.id asc').first
-  end
-
   def owner
-    @owner ||= UserMembership.includes(:user).where(:organization_id => self.id).where(:owner => true).first.try(:user)
+    users.first
   end
 
   def dummy
@@ -106,14 +88,6 @@ class Organization < ActiveRecord::Base
     name
   end
 
-  def membership_kit
-    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)
@@ -151,24 +125,10 @@ class Organization < ActiveRecord::Base
     Item.includes(:show => [:event => :venue], :order => [:person => :address]).where(:product_type => "Ticket", :orders => { :organization_id => id })
   end
 
-  def kit(name)
-    name = "#{name.to_s.camelize.gsub(/Kit$/, '')}Kit"
-    kits.select { |k| k.class.name == name }.first
-  end
-
   def has_kit?(name)
-    name = "#{name.to_s.camelize.gsub(/Kit$/, '')}Kit"
-    kits.select { |k| k.class.name == name && k.activated? }.any?
-  end
-
-  def individuals
-    people.where(:type => 'Individual')
+    kits.where(:state => "activated").map(&:class).map(&:name).include?(name.to_s.camelize + "Kit")
   end
-
-  def has_active_donation_only_storefront?
-    self.has_kit?(:regular_donation) && self.kit(:regular_donation).donation_only_storefront == '1'
-  end
-
+  
   private
 
     def check_for_duplicates(kit)

data/app/models/organization_ability.rb

@@ -13,7 +13,6 @@ class OrganizationAbility
     can :manage, Person, :organization_id => organization.id
     can :manage, Segment, :organization_id => organization.id
     can :manage, Order, :organization_id => organization.id
-    can :manage, Household, :organization_id => organization.id
 
     can :manage, Organization, :id => organization.id
   end

data/app/models/parsed_row.rb

@@ -40,23 +40,7 @@ class ParsedRow
     :linkedin_page    => [ "Linked in url", "LinkedIn url", "LinkedIn", "LinkedIn address", "LinkedIn page" ],
     :tags             => [ "Tags" ],
     :do_not_email     => [ "Do Not Email" ],
-    :do_not_call      => [ "Do Not Call" ],
-    :subtype          => [ "Type", "Subtype" ],
-    :birth_month      => [ "Birth Month" ],
-    :birth_day        => [ "Birth Day" ],
-    :birth_year       => [ "Birth Year" ]
-  })
-  
-  MEMBERSHIP_FIELDS = SHARED_FIELDS.merge( {
-    :membership_name       => [ "Membership Name", "Membership", "Name" ],
-    :membership_plan       => [ "Membership Plan", "Plan"],           #PAYG, ALL IN ONE, OTHER
-    :start_date            => [ "Start Date" ],
-    :end_date              => [ "End Date" ],
-    :amount                => [ "Amount" ],
-    :payment_method        => [ "Payment Method" ],
-    :order_date            => [ "Order Date", "Date" ],
-
-    :number_of_memberships => [ "Quantity" ]
+    :subtype          => [ "Type", "Subtype" ]
   })
   
   EVENT_FIELDS = SHARED_FIELDS.merge( {
@@ -81,7 +65,7 @@ class ParsedRow
     #TODO: Total contribution sanity check
   })
   
-  FIELDS = PEOPLE_FIELDS.merge(ADDRESS_FIELDS).merge(EVENT_FIELDS).merge(DONATION_FIELDS).merge(MEMBERSHIP_FIELDS)
+  FIELDS = PEOPLE_FIELDS.merge(ADDRESS_FIELDS).merge(EVENT_FIELDS).merge(DONATION_FIELDS)
 
   # Enumerated columns default to the last value if the data value is not valid.
   #
@@ -117,7 +101,6 @@ class ParsedRow
   def load_value(field, column)
     index = @header_hash[column]
     value = @row[index] if index
-    
     exist = self.instance_variable_get("@#{field}")
 
     if exist.blank?
@@ -176,10 +159,6 @@ class ParsedRow
     @deductible_amount
   end
   
-  def birth_month
-    month_to_number(@birth_month) if @birth_month.present?
-  end
-  
   def importing_event?
     !self.event_name.blank?
   end
@@ -192,35 +171,6 @@ class ParsedRow
     Hash[ADDRESS_FIELDS.keys.map{|k| [k, self.send(k)]}]
   end
   
-  def month_to_number(input)
-    case input
-    when "January"   then "1"
-    when "February"  then "2"
-    when "March"     then "3"
-    when "April"     then "4"
-    when "May"       then "5"
-    when "June"      then "6"
-    when "July"      then "7"
-    when "August"    then "8"
-    when "September" then "9"
-    when "October"   then "10"
-    when "November"  then "11"
-    when "December"  then "12"
-    when "Jan" then "1"
-    when "Feb" then "2"
-    when "Mar" then "3"
-    when "Apr" then "4"
-    when "May" then "5"
-    when "Jun" then "6"
-    when "Jul" then "7"
-    when "Aug" then "8"
-    when "Sep" then "9"
-    when "Oct" then "10"
-    when "Nov" then "11"
-    when "Dec" then "12"
-    end
-  end
-  
   #
   # These are also used in person.update_from_import
   #
@@ -238,12 +188,7 @@ class ParsedRow
         :twitter_handle  => self.twitter_username,
         :facebook_url    => self.facebook_page,
         :linked_in_url   => self.linkedin_page,
-        :subtype         => self.subtype,
-        :do_not_email    => self.do_not_email,
-        :do_not_call     => self.do_not_call,
-        :birth_month     => self.birth_month,
-        :birth_day       => self.birth_day,
-        :birth_year      => self.birth_year
+        :subtype         => self.subtype
       }
   end