artfully_ose 1.2.0.pre.24 → 1.2.0.pre.26

data/app/helpers/sales_helper.rb

@@ -0,0 +1,29 @@
+module SalesHelper
+  def door_list_sort(person)
+    result = if person.last_name.present?
+      person.last_name
+    elsif person.first_name.present?
+      person.first_name
+    else
+      person.email
+    end
+
+    result.downcase
+  end
+
+  def door_list_grouped_attribute(door_list_items, attr)
+    door_list_items.map {|d| d.send(attr)}.uniq.select {|n| n.present? }.to_sentence
+  end
+
+  def door_list_name_and_company(person)
+    result            = []
+    result           << content_tag(:strong, person.first_name) if person.first_name.present?
+    result           << " #{person.last_name}"                  if person.last_name.present?
+    if person.company_name.present?
+      result         << ", " if result.any?
+      result         << person.company_name
+    end
+
+    safe_join(result)
+  end
+end

data/app/models/cart.rb

@@ -34,6 +34,11 @@ class Cart < ActiveRecord::Base
 
   delegate :empty?, :to => :items
 
+  #
+  # Note that this does return Item objects. It returns Tickets, Donations, Memberships, etc...
+  #
+  # TODO: Refactor this to another name to avoid confusion with Item
+  #
   def items
     self.tickets + self.donations + self.memberships + self.passes
   end
@@ -133,7 +138,7 @@ class Cart < ActiveRecord::Base
   end
 
   def generate_donations
-    organizations_from_tickets.collect do |organization|
+    organizations.collect do |organization|
       if organization.can?(:receive, Donation)
         donation = Donation.new
         donation.organization = organization

data/app/models/checkout.rb

@@ -2,23 +2,23 @@ class Checkout
   include ActiveSupport::Callbacks
   define_callbacks :payment
   define_callbacks :order
-  
+
   include Ext::Callbacks::Checkout
   include Ext::Preprocessor
-  
-  attr_accessor :cart, :payment, :error
+
+  attr_accessor :cart, :payment, :error, :notes
   attr_reader :order, :person
 
   def self.for(cart, payment)
     cart.checkout_class.new(cart, payment)
   end
-  
+
   def message
     message = @error || @payment.errors.full_messages.to_sentence.downcase
     message = message.gsub('customer', 'contact info')
     message = message.gsub('credit card is', 'payment details are')
     message = message[0].upcase + message[1..message.length] unless message.blank? #capitalize first word
-    
+
     if message.blank?
       if @fafs_success == true
         message = "We've processed your donation but could not reserve your tickets. Please check your information and try again or contact us to complete your purchase."
@@ -26,12 +26,13 @@ class Checkout
         message = "We had a problem validating your payment.  Wait a few moments and try again or contact us to complete your purchase."
       end
     end
-    
+
     message
   end
 
-  def initialize(cart, payment)
+  def initialize(cart, payment, notes=nil)
     @cart = cart
+    @notes = notes
     @payment = payment
     @customer = payment.customer
     @payment.amount = @cart.total
@@ -48,7 +49,7 @@ class Checkout
     unless (!!cart and !!payment and payment.valid?)
       return false
     end
-    
+
     true
   end
 
@@ -77,7 +78,7 @@ class Checkout
       void_payment if @payment_approved
       raise e
     end
-    
+
     capture_payment if @payment_approved
     @payment_approved || false
   end
@@ -85,7 +86,7 @@ class Checkout
   def log(message)
     Rails.logger.info "CHECKOUT: cart [#{cart.id}] #{message}"
   end
-  
+
   def pay
     log "authorizing"
     options = {}
@@ -99,7 +100,7 @@ class Checkout
   def capture_payment
     log "capturing payment [#{@transaction_id}]"
     payment.capture(@transaction_id, {})
-    log "payment captured" 
+    log "payment captured"
   end
 
   def void_payment
@@ -108,6 +109,10 @@ class Checkout
     log "payment voided"
   end
 
+  def checkout_name
+    "checkout"
+  end
+
   private
     def create_sub_orders(order_timestamp)
       created_orders = []
@@ -122,14 +127,14 @@ class Checkout
         attributes[:organization] = organization
 
         @person = Person.first_or_create(attributes)
-        CheckoutProcessor.process(@person, @customer, Address.from_payment(payment), payment.payment_phone_number, organization.time_zone)
+        CheckoutProcessor.process(@person, @customer, Address.from_payment(payment), payment.payment_phone_number, organization.time_zone, checkout_name)
         @order = new_order(organization, order_timestamp, @person)
         log(@order.save!)
         log("Created order [#{@order.id}]")
 
         created_orders << @order
       end
-      
+
       created_orders
     end
 
@@ -147,9 +152,11 @@ class Checkout
         order.created_at                  = order_timestamp
         order.person                      = @person
         order.transaction_id              = @payment.transaction_id
+        order.check_number                = @payment.check_number if payment.kind_of?(CheckPayment)
         order.special_instructions        = @cart.special_instructions
         order.payment_method              = @payment.payment_method
         order.per_item_processing_charge  = @payment.per_item_processing_charge
+        order.notes                       = @notes
 
         order << @cart.tickets.select { |ticket| ticket.organization_id == organization.id }
         order << @cart.donations

data/app/models/comp.rb

@@ -1,5 +1,5 @@
 class Comp
-  include ActiveModel::Conversion 
+  include ActiveModel::Conversion
   include ActiveModel::Validations
   extend ActiveModel::Naming
 
@@ -9,26 +9,27 @@ class Comp
   attr_accessor :comped_count, :uncomped_count, :details
 
   #tickets can be an array of tickets_ids or an array of tickets
-  def initialize(show, tickets_or_ids, memberships, recipient, benefactor)
+  def initialize(show, tickets_or_ids, memberships, recipient, benefactor, notes=nil)
     @show = show
     @tickets = []
     @memberships = memberships
     load_tickets(tickets_or_ids)
     @recipient = Person.find(recipient) unless recipient.blank?
     @benefactor = benefactor
+    @notes      = notes
   end
-  
+
   def valid_recipient_and_benefactor
     if @recipient.nil?
       errors.add(:base, "Please select a person to comp to or create a new person record")
       return
     end
-    
+
     if @benefactor.nil?
       errors.add(:base, "Please select a benefactor")
       return
     end
-    
+
     unless @benefactor.current_organization.eql? @recipient.organization
       errors.add(:base, "Recipient and benefactor are from different organizations")
     end
@@ -44,7 +45,7 @@ class Comp
 
   def submit
     ActiveRecord::Base.transaction do
-      create_order(@tickets, @memberships, @recipient, @benefactor)
+      create_order(@tickets, @memberships, @recipient, @benefactor, @notes)
       self.comped_count    = tickets.size
       self.uncomped_count  = 0
     end
@@ -58,15 +59,15 @@ class Comp
         @tickets << t
       end
     end
-  
-    def create_order(comped_tickets, comped_memberships, recipient, benefactor)
+
+    def create_order(comped_tickets, comped_memberships, recipient, benefactor, notes)
       @order = CompOrder.new
       @order << comped_tickets
       @order << comped_memberships
       @order.person = recipient
       @order.organization = benefactor.current_organization
-      @order.details = order_details 
-      @order.notes   = order_notes
+      @order.details = order_details
+      @order.notes   = @notes
       @order.skip_email = true
       @order.to_comp!
       f = @order.save
@@ -74,10 +75,6 @@ class Comp
     end
 
     def order_details
-      "Comped by: #{@benefactor.email}" 
-    end
-
-    def order_notes
-      "#{@notes}" 
+      "Comped by: #{@benefactor.email}"
     end
-end
+end

data/app/models/console_sale.rb

@@ -0,0 +1,30 @@
+module ConsoleSale  
+  class Checkout < ::Checkout 
+    def order_class
+      ConsoleSale::Order
+    end
+
+    def checkout_name
+      "sales console"
+    end
+  end
+
+  class Cart < ::Cart 
+    def calculate_fees(obj)
+      FeeCalculator.apply(ConsoleSale::FeeStrategy.new).to(self)
+    end
+  end
+  
+  class Order < ::Order  
+    def self.location
+      "Sales Console"
+    end
+  end
+
+  class FeeStrategy < ::FeeStrategy
+    def apply_to_cart(cart)
+      return if cart.is_a? BoxOffice::Cart
+      cart.items.each {|i| i.update_column(:service_fee, 0)}
+    end
+  end
+end

data/app/models/database_views/item_view.rb

@@ -58,6 +58,7 @@ class ItemView < ActiveRecord::Base
     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
 
@@ -100,6 +101,7 @@ class ItemView < ActiveRecord::Base
     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
 
@@ -141,5 +143,6 @@ class ItemView < ActiveRecord::Base
     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 }
   end
 end

data/app/models/job/checkout_processor.rb

@@ -7,20 +7,21 @@
 #
 # This class WILL NOT RUN ASYNC in test envs
 #
-class CheckoutProcessor < Struct.new(:person, :first_name, :last_name, :address_hash, :phone, :time_zone)
+class CheckoutProcessor < Struct.new(:person, :first_name, :last_name, :address_hash, :phone, :time_zone, :checkout_name)
   QUEUE = "checkout"
 
-  def initialize(person, customer, address, phone, time_zone)
+  def initialize(person, customer, address, phone, time_zone, checkout_name = "checkout")
     self.person         = person
     self.first_name     = customer.first_name
     self.last_name      = customer.last_name
     self.address_hash   = address.attributes.to_options unless address.nil?
     self.phone          = phone
     self.time_zone      = time_zone
+    self.checkout_name  = checkout_name
   end
 
-  def self.process(person, customer, address, phone, time_zone)
-    job = CheckoutProcessor.new(person, customer, address, phone, time_zone)
+  def self.process(person, customer, address, phone, time_zone, checkout_name)
+    job = CheckoutProcessor.new(person, customer, address, phone, time_zone, checkout_name)
     
     if job.run_now?
       job.perform
@@ -31,11 +32,15 @@ class CheckoutProcessor < Struct.new(:person, :first_name, :last_name, :address_
 
   def perform
     self.person.update_name(self.first_name, self.last_name)
-    self.person.update_address(self.address_hash, self.time_zone, nil, "checkout")
+    self.person.update_address(self.address_hash, self.time_zone, nil, checkout_name) if address_exists?
     self.person.add_phone_if_missing(self.phone)
   end
 
   def run_now?
     Rails.env.test?
   end
+
+  def address_exists?
+    self.address_hash.present? && self.address_hash.values.select{|values| values.present?}.any?
+  end
 end

data/app/models/kits/mailchimp_kit.rb

@@ -7,6 +7,7 @@ class MailchimpKit < Kit
 
     state_machine do
       state :cancelled, :enter => :kit_cancelled
+      event(:submit_for_approval) { transitions :from => :fresh, :to => :pending }
     end
 
     when_active do
@@ -312,7 +313,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 = "Email (Sent)"
+      hear_action.subtype = "Mailchimp (Sent)"
       hear_action.person = person
       hear_action.save
     end

data/app/models/kits/passes_kit.rb

@@ -5,7 +5,7 @@ class PassesKit < Kit
     approve  :unless => :no_bank_account?
 
     self.configurable = true
-
+    
     state_machine do
       state :cancelled, :enter => :kit_cancelled
     end

data/app/models/kits/scannable_tickets_kit.rb

@@ -1,12 +1,11 @@
 class ScannableTicketsKit < Kit
 
-  acts_as_kit :admin_only => true do
-    approve  :unless => :no_bank_account?
-
+  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|
@@ -16,7 +15,7 @@ class ScannableTicketsKit < Kit
 
   def friendly_name
     "Scannable Tickets"
-  end  
+  end    
 
   def pitch
     "Your patrons will receive barcoded tickets that you can scan at the door."

data/app/models/membership.rb

@@ -4,6 +4,7 @@
 #
 class Membership < ActiveRecord::Base
   include Extendable
+  extend ActionView::Helpers::TextHelper
 
   belongs_to :organization
   belongs_to :member
@@ -20,9 +21,10 @@ class Membership < ActiveRecord::Base
   # Make sure you're scoping when you use these. 
   # organization.memberships.lapsed
   #
-  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 :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) }
 
   belongs_to :changed_membership, :class_name => "Membership"
   has_one    :changed_to, :class_name => "Membership", :foreign_key => "changed_membership_id"
@@ -64,6 +66,19 @@ class Membership < ActiveRecord::Base
     self.membership_type.hide_fee? ? self.cart_price * MembershipType::SERVICE_FEE : 0
   end
 
+  def self.to_sentence(memberships)
+    if memberships.any?
+      membership_types = memberships.collect(&:membership_type).uniq
+      if membership_types.length > 1
+        "multiple memberships"
+      else
+        pluralize(memberships.length, "#{memberships.first.membership_type.membershipize}")
+      end
+    else
+      "No memberships"
+    end
+  end
+
   def expired?
     ends_at < Time.now
   end

data/app/models/membership_change.rb

@@ -176,7 +176,7 @@ class MembershipChange
   class Order < ::Order
     before_create :set_details
 
-    def membership_action_class
+    def action_class
       ChangeAction
     end