artfully_ose 1.2.0 → 1.3.0.pre1

data/app/models/kits/membership_kit.rb

@@ -2,13 +2,16 @@ class MembershipKit < Kit
   include ActionView::Helpers::SanitizeHelper
 
   acts_as_kit :with_approval => true, :admin_only => true do
-    approve  :unless => :no_bank_account?
-
     self.configurable = true
 
-    state_machine do
-      state :cancelled, :enter => :kit_cancelled
-    end
+    #
+    # So, this is horrible. Sorry.
+    # Leaving "approve" out of this list sets the kit to auto-approve which is the
+    # opposite of what we want. So, this kludge is here to force the kit to 
+    # never approve until you call kit.admin_approve
+    #
+    approve  :if => :dont_approve
+    admin_approve :unless => :no_bank_account?
 
     when_active do |organization|
       organization.can :access, :membership
@@ -18,7 +21,8 @@ class MembershipKit < Kit
   before_save :initialize_accessors
   before_save :sanitize_accessors
 
-  ACCESSORS = [ :marketing_copy_heading, :marketing_copy_sidebar, :limit_per_transaction ]
+  ACCESSORS = [ :marketing_copy_heading, :marketing_copy_sidebar, :limit_per_transaction,
+                :membership_storefront ]
   
   ACCESSORS.each do |accessor|
     attr_accessible accessor
@@ -59,4 +63,8 @@ class MembershipKit < Kit
       self.send("#{accessor}=", (sanitize self.send(accessor)))
     end
   end
+
+  def has_active_storefront?
+    self.membership_storefront == '1' || self.membership_storefront == 1
+  end
 end

data/app/models/kits/passes_kit.rb

@@ -2,13 +2,16 @@ class PassesKit < Kit
   include ActionView::Helpers::SanitizeHelper
 
   acts_as_kit :with_approval => true, :admin_only => true do
-    approve  :unless => :no_bank_account?
-
     self.configurable = true
     
-    state_machine do
-      state :cancelled, :enter => :kit_cancelled
-    end
+    #
+    # So, this is horrible. Sorry.
+    # Leaving "approve" out of this list sets the kit to auto-approve which is the
+    # opposite of what we want. So, this kludge is here to force the kit to 
+    # never approve until you call kit.admin_approve
+    #
+    approve  :if => :dont_approve
+    admin_approve :unless => :no_bank_account?
 
     when_active do |organization|
       organization.can :access, :passes
@@ -18,7 +21,8 @@ class PassesKit < Kit
   before_save :initialize_accessors
   before_save :sanitize_accessors
 
-  ACCESSORS = [ :marketing_copy_heading, :marketing_copy_sidebar ]
+  ACCESSORS = [ :marketing_copy_heading, :marketing_copy_sidebar,
+                :passes_storefront ]
   
   ACCESSORS.each do |accessor|
     attr_accessible accessor
@@ -59,4 +63,8 @@ class PassesKit < Kit
       self.send("#{accessor}=", (sanitize self.send(accessor)))
     end
   end
+
+  def has_active_storefront?
+    self.passes_storefront == '1' || self.passes_storefront == 1
+  end
 end

data/app/models/kits/regular_donation_kit.rb

@@ -1,4 +1,6 @@
 class RegularDonationKit < Kit
+  before_save :set_image_url
+
   acts_as_kit :with_approval => true do
     self.configurable = true
 
@@ -22,14 +24,35 @@ class RegularDonationKit < Kit
   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,
+    :donation_instructions_text, :image, :image_orig, :image_thumb
   ]
 
   attr_accessible *ACCESSORS
 
   store :settings, :accessors => ACCESSORS
 
-  def dont_approve
-    false
+  attr_accessor :image_file_name, :image_file_size, :image_content_type
+  has_attached_file :image,
+                    :storage => :s3,
+                    :path => "kits/:id/:style.:extension",
+                    :bucket => Rails.configuration.s3.bucket,
+                    :s3_protocol => 'https',
+                    :s3_credentials => {
+                        :access_key_id => Rails.configuration.s3.access_key_id,
+                        :secret_access_key => Rails.configuration.s3.secret_access_key
+                    },
+                    :styles => {
+                        :thumb => "140x140#"
+                    }
+  validates_attachment_size :image, :less_than => 1.megabytes
+  validates_attachment_content_type :image, :content_type => ["image/jpeg", "image/gif", "image/png"]
+
+  def set_image_url
+    if image_file_name.present?
+      self.settings = {} unless self.settings.is_a?(Hash)
+      self.settings[:image_orig] = image.url
+      self.settings[:image_thumb] = image.url(:thumb)
+    end
   end
 
   def has_tax_info?
@@ -65,6 +88,10 @@ class RegularDonationKit < Kit
     ProducerMailer.donation_kit_notification(self, organization.owner).deliver
   end
 
+  def has_active_storefront?
+    self.donation_only_storefront == '1' || self.donation_only_storefront == 1
+  end
+
   def suggested_gifts=(value)
     value = value.values if value.is_a?(Hash)
 

data/app/models/{relationships_kit.rb → kits/relationships_kit.rb}

@@ -1,12 +1,8 @@
 class RelationshipsKit < Kit
 
-  acts_as_kit :admin_only => true do
+  acts_as_kit :with_approval => false, :admin_only => true do
     self.configurable = false
 
-    state_machine do
-      state :cancelled, :enter => :kit_cancelled
-    end
-
     when_active do |organization|
       organization.can :access, :relationships
     end
@@ -14,7 +10,7 @@ class RelationshipsKit < Kit
 
   def friendly_name
     "Relationships"
-  end  
+  end
 
   def pitch
     "Track Relationships!"
@@ -28,4 +24,4 @@ class RelationshipsKit < Kit
     settings[:membership_state] = "configured"
     save
   end
-end
+end

data/app/models/kits/scannable_tickets_kit.rb

@@ -3,11 +3,6 @@ class ScannableTicketsKit < Kit
   acts_as_kit do
     self.configurable = false
 
-    state_machine do
-      state :cancelled, :enter => :kit_cancelled
-      event(:submit_for_approval) { transitions :from => :fresh, :to => :pending }
-    end
-
     when_active do |organization|
       organization.can :access, :scannable_tickets
     end

data/app/models/kits/sponsored_donation_kit.rb

@@ -1,21 +1,11 @@
 class SponsoredDonationKit < Kit
-  acts_as_kit :with_approval => true do
+  acts_as_kit :with_approval => true, :activate_without_prejudice => true, :cancel_with_authority => true do
     activate :if => :connected?
     activate :if => :has_active_fiscally_sponsored_project
 
     when_active do |organization|
       organization.can :receive, Donation
     end
-
-    state_machine do
-      event :activate_without_prejudice do
-        transitions :from => [:fresh, :activated, :pending, :cancelled], :to => :activated
-      end
-
-      event :cancel_with_authority do
-        transitions :from => [:fresh, :pending, :activated, :cancelled], :to => :cancelled
-      end
-    end
   end
 
   def has_active_fiscally_sponsored_project
@@ -47,7 +37,7 @@ class SponsoredDonationKit < Kit
   end
 
   def self.setup_state_machine
-    state_machine do
+    state_machine :auto_scopes => true do
       state :fresh
       state :pending, :enter => :on_pending
       state :activated, :enter => :on_activation

data/app/models/kits/ticketing_kit.rb

@@ -1,7 +1,15 @@
 class TicketingKit < Kit
   acts_as_kit :with_approval => true do
     activate :unless => :no_owner?
-    approve :unless => :no_bank_account?
+
+    #
+    # So, this is horrible. Sorry.
+    # Leaving "approve" out of this list sets the kit to auto-approve which is the
+    # opposite of what we want. So, this kludge is here to force the kit to 
+    # never approve until you call kit.admin_approve
+    #
+    approve  :if => :dont_approve
+    admin_approve :unless => :no_bank_account?
 
     when_active do |organization|
       organization.can :access, :paid_ticketing

data/app/models/linking_job_monitor.rb

@@ -0,0 +1,2 @@
+class LinkingJobMonitor < JobMonitor
+end

data/app/models/list_grouping.rb

@@ -0,0 +1,10 @@
+class ListGrouping < ActiveRecord::Base
+  attr_accessible :mailchimp_id, :name, :group
+
+  belongs_to :subscribed_list
+
+  validates :mailchimp_id, :name, :group, :presence => true, :uniqueness => { :scope => [:subscribed_list_id, :mailchimp_id, :name, :group] }
+
+  after_save { subscribed_list.person.solr_index! if subscribed_list && subscribed_list.person }
+  after_destroy { subscribed_list.person.solr_index! if subscribed_list && subscribed_list.person }
+end

data/app/models/member.rb

@@ -1,6 +1,11 @@
 class Member < ActiveRecord::Base
+  devise :database_authenticatable,
+         :recoverable,
+         :rememberable,
+         :trackable,
+         :suspendable,
+         :invitable
 
-  include Ext::DeviseConfiguration
   include Ext::Integrations::Member
   include Ext::Uuid
   include Ext::S3Link
@@ -9,20 +14,27 @@ class Member < ActiveRecord::Base
   belongs_to  :organization
   belongs_to  :person
 
-  validates :organization,  :presence => true
+  validates :email,     :presence     => { :if => :email_required? },
+                        :uniqueness   => { :scope => :organization_id, :allow_blank => true, :if => :email_changed? },
+                        :format       => { :with  => Devise.email_regexp, :allow_blank => true, :if => :email_changed? }
+
+  validates :password,  :presence     => { :if => :password_required? },
+                        :confirmation => { :if => :password_required?},
+                        :length       => { :within => Devise.password_length, :allow_blank => true}
+
+  validates :organization,   :presence => true
   validates :member_number,  :presence => true
 
   before_validation :set_member_number, :unless => :persisted?
 
+  after_save { person.solr_index! if person }
+  after_destroy { person.solr_index! if person }
+
   CURRENT = :current
   LAPSED  = :lapsed
   PAST    = :past
   NONE    = :none
 
-  scope :current, where("current_memberships_count > 0")
-  scope :lapsed,  where("lapsed_memberships_count > 0").where("current_memberships_count = 0")
-  scope :past,    where("past_memberships_count > 0").where("lapsed_memberships_count = 0").where("current_memberships_count = 0")
-
   has_attached_file :pdf, MEMBER_PDF_STORAGE
   has_attached_file :qr_code, MEMBER_QR_STORAGE
   delegate :url, :to => :qr_code, :prefix => true
@@ -33,7 +45,10 @@ class Member < ActiveRecord::Base
   def headers_for(action)
     case action.to_s
     when "invitation_instructions"
-      {:from => self.organization.email}
+      {
+        :from => self.organization.email,
+        :subject => self.organization.name + ' Membership Instructions'
+      }
     else
       {}
     end
@@ -70,17 +85,6 @@ class Member < ActiveRecord::Base
           .where('ticket_types.member_ticket = 1')
   end
 
-  #
-  # This is always run DJ'd
-  #
-  def count_memberships
-    self.current_memberships_count  = self.memberships.current.count
-    self.lapsed_memberships_count   = self.memberships.lapsed.count
-    self.past_memberships_count     = self.memberships.past.count
-    self.save
-  end
-  handle_asynchronously :count_memberships
-
   #
   # Intentionally did not use a state machine for this for a few reasons
   # 1) I'm not all that happy with transitions
@@ -94,9 +98,9 @@ class Member < ActiveRecord::Base
   # Note that this method uses the cached values for current_memberships, lapsed_memberships, and past_memberships
   #
   def state
-    return CURRENT if self.current_memberships_count > 0
-    return LAPSED  if self.lapsed_memberships_count  > 0
-    return PAST    if self.past_memberships_count    > 0
+    return CURRENT if self.memberships.select { |membership| membership.current? } != []
+    return LAPSED  if self.memberships.select { |membership| membership.lapsed? } != []
+    return PAST    if self.memberships.select { |membership| membership.past? } != []
     return NONE
   end
 
@@ -151,7 +155,7 @@ class Member < ActiveRecord::Base
                                :person => person,
                                :password => SecureRandom.hex(32)}, :without_protection => true)
 
-      member.person.create_address if member.person.address.nil?
+      member.person.addresses.create if member.person.address.nil?
 
       membership.member = member
       membership.save
@@ -188,4 +192,12 @@ class Member < ActiveRecord::Base
 
     file.close
   end
-end
+
+  def password_required?
+    !persisted? || !password.nil? || !password_confirmation.nil?
+  end
+
+  def email_required?
+    true
+  end
+end

data/app/models/member_number_generator.rb

@@ -1,5 +1,7 @@
 class MemberNumberGenerator
   def self.next_number_for(organization)
+    return nil unless organization
+
     next_number = organization.last_member_number + 1
     organization.update_column(:last_member_number, next_number)
     padded_number = "%05d" % next_number

data/app/models/membership.rb

@@ -10,20 +10,17 @@ class Membership < ActiveRecord::Base
   belongs_to :membership_type
   has_many :items, :as => :product
 
-  # Same callbacks that fire before Rails' built-in counter_cache
-  #Except before_destroy is replaced with after_destroy
-  after_create    :update_member_counters
-  after_destroy   :update_member_counters
-  after_update    :update_member_counters
+  after_save { member.person.solr_index! if member && member.person }
+  after_destroy { member.person.solr_index! if member && member.person }
 
   #
-  # Make sure you're scoping when you use these. 
+  # Make sure you're scoping when you use these.
   # organization.memberships.lapsed
   #
   scope :expired, lambda { |time = Time.now| where("ends_at < ?", time) }
-  scope :current, lambda { |time = Time.now| where("ends_at > ?", time) }
-  scope :lapsed,  lambda { |time = Time.now, since = (time - 1.year)| where("ends_at < ?", time).where("ends_at > ?", since.midnight) }
-  scope :past,    lambda { |time = Time.now| where("ends_at < ?", time - 1.year) }
+  scope :current, lambda { |time = Time.now| where("memberships.ends_at > ?", time) }
+  scope :lapsed,  lambda { |time = Time.now, since = (time - 1.year)| where("memberships.ends_at < ?", time).where("memberships.ends_at > ?", since.midnight) }
+  scope :past,    lambda { |time = Time.now| where("memberships.ends_at < ?", time - 1.year) }
 
   belongs_to :changed_membership, :class_name => "Membership"
   has_one    :changed_to, :class_name => "Membership", :foreign_key => "changed_membership_id"
@@ -49,10 +46,6 @@ class Membership < ActiveRecord::Base
     self.changed_membership.present?
   end
 
-  def update_member_counters
-    self.member.try(:count_memberships)
-  end
-
   def item
     items.first
   end
@@ -61,7 +54,7 @@ class Membership < ActiveRecord::Base
     0
   end
 
-  def realized_fee 
+  def realized_fee
     self.membership_type.hide_fee? ? self.cart_price * MembershipType::SERVICE_FEE : 0
   end
 
@@ -78,6 +71,18 @@ class Membership < ActiveRecord::Base
     end
   end
 
+  def current?
+    ends_at > Time.now
+  end
+
+  def lapsed?
+    ends_at < Time.now && ends_at > Time.now - 1.year
+  end
+
+  def past?
+    ends_at < Time.now - 1.year
+  end
+
   def expired?
     ends_at < Time.now
   end
@@ -94,6 +99,10 @@ class Membership < ActiveRecord::Base
     false
   end
 
+  def convertable?
+    false
+  end
+
   def order_summary_description
     self.membership_type.name
   end

data/app/models/membership_change.rb

@@ -99,7 +99,6 @@ class MembershipChange
           membership.cart_price = price
           membership.sold_price = price
           membership.total_paid = old.total_paid + price
-          membership.member     = person.member
 
           membership.changed_membership = old
 
@@ -149,6 +148,12 @@ class MembershipChange
       changing_memberships.each do |old|
         old.adjust_expiration_to(expiration)
       end
+
+      # Assign the new memberships
+      new_memberships.each do |n|
+        n.member_id = person.member.id
+        n.save!
+      end
     end
     true
   rescue MembershipChange::Error => e
@@ -183,5 +188,16 @@ class MembershipChange
     def set_details
       self.details = "Membership type change."
     end
+
+    #
+    # 1 if realized_fee should be charged
+    # 0 otherwise
+    #
+    # This is used when setting realized_price on item
+    # at order creation time.
+    #
+    def realized_fee_modifier
+      0
+    end
   end
 end