artfully_ose 1.2.0 → 1.3.0.pre1

data/app/controllers/orders_controller.rb

@@ -1,6 +1,6 @@
 class OrdersController < ArtfullyOseController
   def index
-    authorize! :manage, Order
+    authorize! :view, Order
     request.format = :csv if params[:commit] == "Download"
     if params[:search]
       @results = search(params[:search]).sort{|a,b| b.created_at <=> a.created_at }
@@ -20,10 +20,21 @@ class OrdersController < ArtfullyOseController
   end
 
   def show
-    @order = Order.includes(:items => :discount).find(params[:id])
+    @order = Order.includes(:creator, :items => :discount).find(params[:id])
     authorize! :view, @order
     @person = Person.find(@order.person_id)
     @total = @order.total
+    
+    respond_to do |format|
+      format.html
+      format.pdf do
+        # I tried to use :handlers => [:erb] to avoid
+        # the deprecation warning but it passed :handlers
+        # down to wkhtmltopdf for some reason
+        render  :pdf      => "#{@order.id}",
+                :template => 'pdfs/order.html.erb'  
+      end
+    end
   end
 
   def update
@@ -38,10 +49,22 @@ class OrdersController < ArtfullyOseController
     redirect_to order_path(@order)
   end
 
+  def assign
+    selected_order = Order.find(params[:order_id])
+    selected_order.update_attribute(:parent_id, params[:id])
+    redirect_to order_path(params[:id])
+  end
+
+  def convert_to_pledge_payment
+    @order = Order.find(params[:id])
+    @order.update_attribute(:parent_id, params[:order_id]);
+    redirect_to order_path(@order)
+  end
+
   def resend
     authorize! :view, Order
     @order = Order.find(params[:id])
-    OrderMailer.delay.confirmation_for(@order)
+    (@order.class == ConvertOrder) ? OrderMailer.delay.convert_confirmation_for(@order) : OrderMailer.delay.confirmation_for(@order)
     
     flash[:notice] = "A copy of the order receipt has been sent to #{@order.person.email}"
     redirect_to order_url(@order)
@@ -156,16 +179,10 @@ class OrdersController < ArtfullyOseController
         end
       end
       format.csv do
-        filename = "Artfully-Ticket-Sales-Export-#{DateTime.now.strftime("%m-%d-%y")}.csv"
-        items = ItemView.where(:product_type => "Ticket")
-                             .where('created_at > ? ', search_terms[:start])
-                             .where('created_at < ?',  Sundial.midnightish(current_organization, search_terms[:stop]))
-                             .where('organization_id = ?', current_organization)
-                             .order('created_at desc')
-        items = items.where('event_id = ?', @event.id)  if @event
-        items = items.where('show_id = ?', @show.id)    if @show
-        csv_string = items.all.to_comma(:ticket_sale)
-        send_data csv_string, :filename => filename, :type => "text/csv", :disposition => "attachment"
+        job_monitor = JobMonitor.enqueue(@organization, 
+                                         OrderExportJob.new(@organization, search_terms), 
+                                         {:return_url => sales_orders_url(:search_terms=>search_terms)})
+        redirect_to monitor_path(job_monitor, :search_terms=>search_terms)
       end
     end
   end

data/app/controllers/organizations_controller.rb

@@ -4,6 +4,11 @@ class OrganizationsController < ArtfullyOseController
     redirect_to root_path
   end
 
+  before_filter do
+    @active_tab = params[:active_tab]
+    @ability ||= Ability.new(current_user)
+  end
+
   def index
     if current_user.is_in_organization?
       redirect_to organization_url(current_user.current_organization)
@@ -15,6 +20,9 @@ class OrganizationsController < ArtfullyOseController
   def show
     @organization = Organization.find(params[:id])
     authorize! :view, @organization
+    @kits = @organization.available_kits
+    @user_memberships = @organization.user_memberships.includes(:user, :organization)
+    @sorted_user_memberships = UserMembership.sort_by_permission(@user_memberships)
   end
 
   def new

data/app/controllers/passes_kits_controller.rb

@@ -4,16 +4,14 @@ class PassesKitsController < ApplicationController
     redirect_to root_path, :alert => exception.message
   end
 
-  before_filter do
-    authorize! :edit, current_user.current_organization
-  end
-
   def edit
     @kit = Kit.find(params[:id])
+    authorize! :edit, @kit
   end
 
   def update
     @kit = Kit.find(params[:id])
+    authorize! :edit, @kit
 
     if @kit.update_attributes(params[:passes_kit])
       redirect_to organization_path(@kit.organization)

data/app/controllers/people_controller.rb

@@ -1,10 +1,19 @@
 class PeopleController < ArtfullyOseController
   respond_to :html, :json
-  before_filter :load_tags, :only => [:show]
+  before_filter :load_tags, :only => [:show, :pledges]
 
   def new
     authorize! :create, Person
     @person = Person.new
+    
+    if params[:input].present?
+      @existing_people = Person.search_index(params[:input], current_user.current_organization, params[:field])
+    end
+    
+    respond_to do |format|
+      format.html
+      format.js { render :json => @existing_people }
+    end
   end
 
   def create
@@ -16,7 +25,6 @@ class PeopleController < ArtfullyOseController
     @person.last_name        = person[:last_name]         if person[:last_name].present?
     @person.email            = person[:email]             if person[:email].present?
     @person.company_name     = person[:company_name]      if person[:company_name].present?
-    @person.subscribed_lists = person[:subscribed_lists]  if person[:subscribed_lists].present?
     @person.do_not_email     = person[:do_not_email]      if person[:do_not_email].present?
     @person.do_not_call      = person[:do_not_call]       if person[:do_not_call].present?
     @person.type             = person[:type] || "Individual"
@@ -24,7 +32,7 @@ class PeopleController < ArtfullyOseController
     @person.organization_id  = current_user.current_organization.id
 
     if @person.valid? && @person.save!
-      @person.create_subscribed_lists_notes!(current_user)
+      @person.update_and_note_subscriptions!(current_user, person[:subscribed_lists], person[:groupings])
 
       respond_to do |format|
         format.html do
@@ -50,16 +58,24 @@ class PeopleController < ArtfullyOseController
 
   def update
     @person = Person.find(params[:id])
-    authorize! :edit, @person
+    authorize! :edit_basic, @person
     flash[:notice] = []
-    results = @person.update_attributes(person_update_params)
-    @person.relationships.where(:inverse_id => nil).map(&:ensure_inverse)
+    subscribed_lists = person_update_params.delete("subscribed_lists")
+    groupings = person_update_params.delete("groupings")
+    person_params = person_update_params.except("subscribed_lists", "groupings")
+    have_duplicate_addresses = remove_duplicate_addresses(person_params["addresses_attributes"])
+    if person_params["type"].present? && @person.type != person_params["type"]
+      @person = @person.become_a!(person_params["type"])
+    end
+    results = @person.update_person_attributes(person_params, current_user)
 
     respond_to do |format|
       format.html do
         if results
-          @person.create_subscribed_lists_notes!(current_user)
-          flash[:notice] << "Your changes have been saved"
+          single_optin = params.fetch("single_optin", false) == "true"
+          @person.update_and_note_subscriptions!(current_user, subscribed_lists, groupings, single_optin)
+          flash[:notice] << "Your changes have been saved." +
+              (have_duplicate_addresses ? " We didn’t save some addresses because they were duplicates." : "")
         else
           errs = [@person.errors.delete(:"relationships.base")].flatten + [@person.errors.full_messages.to_sentence].flatten
           flash[:alert] = errs.blank? ? "Sorry, we couldn't save your changes. Make sure you entered a first name, last name or email address." : errs.compact
@@ -79,32 +95,65 @@ class PeopleController < ArtfullyOseController
   end
 
   def index
-    authorize! :manage, Person
+    authorize! :view_basic, Person
     @people = []
     @show_advanced_search_message = false
 
     if is_search(params)
-      @people = Person.search_index(params[:search].dup, current_user.current_organization)
-      @show_advanced_search_message = @people.length > 20
+      @results = Person.search_index(params[:search].dup, current_user.current_organization)
+      @results += Household.where("name like ?", "%#{params[:search]}%")
+      @show_advanced_search_message = @results.length > 20
     else
-      @people = Person.recent(current_user.current_organization)
+      @results = Person.recent(current_user.current_organization)
     end
 
-    @people = @people.paginate(:page => params[:page], :per_page => 20)
+    @results = @results.paginate(:page => params[:page], :per_page => 20)
 
     respond_with do |format|
       format.html { render :index }
-      format.json { render :json => @people } #inline people search depends on json response
+      format.json { render :json => @results } #inline results search depends on json response
     end
   end
 
   def show
     @person = Person.find(params[:id])
     @notes = @person.notes.order('starred desc').order('updated_at desc')
-    @actions = @person.actions.includes(:subject).order('starred desc').order('occurred_at desc').page(params[:page]).per_page(20)
-    @person.build_address unless @person.address
+    @actions = @person.actions.includes(:subject, :organization).order('starred desc').order('occurred_at desc').order('created_at desc').page(params[:page]).per_page(20)
     @new_action = Action.for_organization(current_user.current_organization)
-    authorize! :view, @person
+    authorize! :view_basic, @person
+  end
+
+  def stats
+    @people = current_organization.people.find(params[:people])
+    
+    authorize! :view, @people.first
+
+    if params[:timespan].present? && params[:timespan] != 'lifetime'
+      begin
+        starts_at, ends_at = params[:timespan].split('-')
+        format    = '%m/%d/%y'
+        format    = '%m/%d/%Y' if starts_at.split('/').last.length > 2
+        starts_at = DateTime.strptime(starts_at, format)
+        format    = '%m/%d/%y'
+        format    = '%m/%d/%Y' if ends_at.split('/').last.length > 2
+        ends_at   = DateTime.strptime(ends_at, format).end_of_day
+
+        stats_timespan_error && return if starts_at > ends_at
+      rescue
+        stats_timespan_error && return
+      end
+    end
+
+    session[:baseball_card_timespan] = params[:timespan]
+
+    @valuation = ValuationQuery.run_for(
+      :people       => @people,
+      :organization => current_user.current_organization,
+      :starts_at    => (starts_at || nil),
+      :ends_at      => (ends_at   || nil)
+    )
+
+    render :json => @valuation.stats
   end
 
   def star
@@ -158,6 +207,15 @@ class PeopleController < ArtfullyOseController
     render :nothing => true
   end
 
+  def tags
+    @person = Person.find(params_person_id)
+    render :json => @person.tag_list
+  end
+
+  def pledges
+    @person = Person.find(params_person_id)
+    @scheduled_pledge_payments = @person.scheduled_pledge_payments
+  end
   #
   # Weird to put here, but otherwise it'll collide with Devise's MembersController
   #
@@ -196,9 +254,39 @@ class PeopleController < ArtfullyOseController
 
       person_params = params.fetch((:person),{}).merge(company_params).merge(individual_params)
 
+      if person_params.has_key?("subscribed_lists")
+        person_params["subscribed_lists"].reject! { |id| id.blank? }
+      end
+
       relationships_attributes = individual_params["relationships_attributes"] || company_params["relationships_attributes"] || {}
       person_params["relationships_attributes"] = relationships_attributes.reject { |k,v| v["other_id"].empty? }
 
       person_params
     end
+
+    #
+    # Modify the person params if there are any duplicate addresses
+    # Return true if any duplicate is removed, otherwise false
+    #
+    # this method will do nothing is addresses_hash is empty
+    #
+    def remove_duplicate_addresses(addresses_hash = {})
+      return if addresses_hash.nil?
+      all_addresses_length = addresses_hash.length
+      addresses_array = []
+      addresses_hash.each do |key, address|
+        next if address['_destroy'] == 'true' || address['_destroy'] == '1'
+        if addresses_array.include?(Address.unhash(address)) && address['is_primary'] != '1'
+          addresses_hash.delete(key)
+        else
+          addresses_array << Address.unhash(address)
+        end
+      end
+      all_addresses_length > addresses_hash.length
+    end
+
+    def stats_timespan_error
+      session[:baseball_card_timespan] = nil
+      head 400
+    end
 end

data/app/controllers/pledges_controller.rb

@@ -0,0 +1,64 @@
+class PledgesController < ApplicationController
+  requires_kit :campaigns
+
+  def index
+    @orders = current_user.current_organization.orders.includes(:person, :parent => [:person, :donation], :donation => [:campaign])
+    @orders = @orders.where("EXISTS(SELECT 1 FROM items WHERE items.order_id = orders.id AND items.product_type = 'Donation' AND items.state != 'refund')")
+    @orders = @orders.where('people.id in (?)', Person.search_index(params[:search].dup, current_user.current_organization).collect(&:id)) if params[:search].present?
+    @orders = @orders.where('donations.pledge=?', true)
+    @orders = @orders.where('donations.amount > donations.received_amount')
+    @orders = @orders.reorder('orders.id DESC')
+    @orders = @orders.reject { |o| (params[:type] == 'match' && o.parent.nil?) || (params[:type] == 'pledge' && !o.parent.nil?) }
+
+    @orders = @orders.paginate(:page => params[:page], :per_page => 20)
+  end
+
+  def receive
+    spp_id = params[:scheduled_pledge_payment_id]
+
+    ctb = Contribution.new
+    ctb.occurred_at = ActiveSupport::TimeZone.create(current_user.current_organization.time_zone).parse(params[:occurred_at][spp_id])
+    ctb.ack_sent_date = params[:ack_sent_date][spp_id]
+    ctb.ack_method = params[:ack_method]
+    ctb.subtype         = params[:subtype]
+    ctb.commitment_date = DateTime.now
+    ctb.amount = params[:amount]
+    ctb.nongift_amount = params[:nongift_amount]
+    ctb.payment_method = params[:payment_method]
+    ctb.check_number = params[:check_number]
+    ctb.fiscal_year     = params[:fiscal_year]
+    ctb.notes     = params[:notes]
+    ctb.person_id = params[:person_id]
+    ctb.order_parent_id = params[:order_id]
+    ctb.organization_id =  current_organization.id
+    ctb.subtype = params[:subtype]
+    ctb.pledge = false
+
+    donation = Donation.find_by_order_id(ctb.order_parent_id)
+
+    unless donation.nil?
+      ctb.campaign_id = donation.campaign_id
+      ctb.appeal_id = donation.appeal_id
+    end
+
+    add_soft_credit_for_matching_gift(ctb.soft_credits, ctb.order_parent_id)
+
+    if ctb.valid?
+      ctb.receive_pledge(spp_id, donation)
+    else
+      flash[:error] = ctb.errors.full_messages.to_sentence
+    end
+
+    redirect_to params[:from_path]
+  end
+
+  private
+    def add_soft_credit_for_matching_gift(soft_credits, order_id)
+      pledge_order = Order.find(order_id)
+      match_gift_order = pledge_order.parent
+      unless match_gift_order.nil?
+        donation = Donation.find_by_order_id(match_gift_order.id)
+        soft_credits << SoftCredit.new({:person_id  => match_gift_order.person_id, :amount   => (donation.eligible_amount / 100)})
+      end
+    end
+end

data/app/controllers/preview_rows_controller.rb

@@ -0,0 +1,29 @@
+class PreviewRowsController < ArtfullyOseController
+  before_filter :find_import
+
+  def index
+    authorize! :manage, @import
+
+    @imported_rows = imported_rows
+    @preview_template = preview_template
+  end
+
+  private
+  def find_import
+    @import = Import.find(params[:import_id])
+  end
+
+  def current_page
+    params[:page] || 1
+  end
+
+  def imported_rows
+    options = {}
+    options[:membership_name] = params[:membership_name] if @import.kind.include?('membership')
+    @import.import_rows.where(options).paginate(page: current_page, per_page: 20)
+  end
+
+  def preview_template
+    ['imports', @import.kind, 'preview_rows'].join '/'
+  end
+end

data/app/controllers/regular_donation_kits_controller.rb

@@ -3,19 +3,24 @@ class RegularDonationKitsController < ApplicationController
     flash[:alert] = exception.message
     redirect_to root_path, :alert => exception.message
   end
-
-  before_filter do
-    authorize! :edit, current_user.current_organization
-  end
-
+  
   def edit
     @kit = Kit.find(params[:id])
+    authorize! :edit, @kit
   end
 
   def update
     @kit = Kit.find(params[:id])
+    authorize! :edit, @kit
 
-    if @kit.update_attributes(kit_params)
+    if params[:commit] == 'Upload'
+      if kit_params.blank? || kit_params[:image].blank?
+        flash[:error] = 'Please select an image to upload.'
+      elsif @kit.update_attributes(kit_params)
+        flash[:notice] = 'Your image was uploaded.'
+      end
+      render :edit
+    elsif @kit.update_attributes(kit_params)
       flash[:notice] = 'Your changes have been saved.'
       redirect_to organization_path(@kit.organization)
     else

data/app/controllers/sales_controller.rb

@@ -8,47 +8,35 @@ class SalesController < ArtfullyOseController
   end
 
   def new
+    authorize! :manage, Sale
     @person = Person.new
     @sale = Sale.new(@show, @show.chart.ticket_types.box_office, current_box_office_cart, {})
     @tickets_remaining = tickets_remaining
+    @show_discount_field, @discount_caption = discount_field
     setup_defaults
     response.headers["Cache-Control"] = "no-cache, no-store, max-age=0, must-revalidate" # http://stackoverflow.com/a/5493543/2063202
   end
 
   def create
+    authorize! :manage, Sale
     current_box_office_cart.clear!
+    handler = OrderHandler.new(current_box_office_cart, nil)
 
     @sale = Sale.new(@show, @show.chart.ticket_types.box_office, current_box_office_cart, params[:quantities], params[:order_notes])
 
-    # handle donation
-    if params[:donation].present? && params[:donation].to_i > 0
-      donation                 = Donation.new
-      donation.amount          = params[:donation].to_i * 100
-      donation.organization_id = @event.organization_id
-      current_box_office_cart.donations << donation
-    end
+    #
+    # OrderHandler calls should really be pushed down into Sale
+    #
+    handler.handle_donation(params, @current_user.current_organization)
+    handler.handle_discount_or_pass_code(params)
+    discount_error = handler.error unless handler.error.blank?
 
-    # handle discount
-    begin
-      discount = Discount.find_by_code_and_event_id(params[:discount].upcase, @event)
-      discount.apply_discount_to_cart(current_box_office_cart)
-    rescue RuntimeError => e
-      discount_error = e.message
-    rescue NoMethodError => e
-      discount_error = "We could not find your discount. Please try again." if params[:discount].present?
+    if checking_out? && @sale.sell(payment)
+      prep_messages
+      subscribe_user_to_list
     end
 
-    if checking_out?
-      if @sale.sell(payment)
-        @sale.message = "Sold #{self.class.helpers.pluralize(@sale.tickets.length, 'ticket')}.  Order total was #{self.class.helpers.number_as_cents @sale.order.total}"
-
-        if params[:auto_check_in].present?
-          @sale.tickets.map {|t| t.reload; t.validate_ticket!(current_user)}
-        end
-      end
-    end
-
-    unless @sale.errors.empty?
+    if @sale.errors.present?
       @sale.error = "#{@sale.errors.full_messages.to_sentence.capitalize}."
       flash[:error] = @sale.error
       Ticket.unlock(@sale.tickets, @sale.cart)
@@ -56,6 +44,7 @@ class SalesController < ArtfullyOseController
       return
     end
 
+
     render :json => @sale.as_json
                          .merge(:total => @sale.cart.total)
                          .merge(:tickets_remaining => tickets_remaining)
@@ -95,6 +84,47 @@ class SalesController < ArtfullyOseController
 
   private
 
+    def prep_messages
+      str = "Order submitted successfully."
+      str += "<br/>Sold #{self.class.helpers.pluralize(@sale.tickets.length, 'ticket')}." 
+      str += "<br/>Order total was #{self.class.helpers.number_as_cents @sale.order.total}."
+      str += "<br/>Order number is <a target='_blank' href='#{Rails.application.routes.url_helpers.order_path(@sale.order)}'>#{@sale.order.id}</a>."
+
+      if @sale.order.person.email.blank?
+        str += "<br/>No confirmation email was sent because we don't have an email on file for this patron."  
+      else
+        str += "<br/>A confirmation email was sent to #{@sale.order.person.email}."
+      end
+      @sale.message = str
+      if params[:auto_check_in].present?
+        @sale.tickets.map {|t| t.reload; t.validate_ticket!(current_user)}
+      end
+    end
+
+    def discount_field
+      discount_active = Discount.where(:event_id => @event.id).any?
+      pass_active = EventsPassType.where(:event_id => @event.id).any?
+      pass_kit = @current_user.current_organization.has_kit?(:passes)
+
+      discount_caption = ""
+      show_discount_field = false
+
+      if discount_active && pass_kit && pass_active
+        discount_caption = "Discount or Pass Code"
+        show_discount_field = true
+      elsif pass_kit && pass_active
+        discount_caption = "Pass Code"
+        show_discount_field = true
+      elsif discount_active
+        discount_caption = "Discount Code"
+        show_discount_field = true
+      else
+        discount_caption = ""
+      end
+
+      [show_discount_field, discount_caption]
+    end
+
     # TODO: this should be pulled into TicketTypeSerializer
     def tickets_remaining
       remaining = {}
@@ -136,27 +166,24 @@ class SalesController < ArtfullyOseController
     end
 
     def person
-      return @person unless @person.nil?
-
-      #if there's a person_id, use find
-      @person = Person.find(params[:person][:id]) unless params[:person][:id].blank?
-
-      if user_entered_nothing?
-        @person = @dummy
-      else
-        @person = Person.first_or_create(person_attributes)
+      return @_p if @_p
+
+      @_p = Person.first_or_create(person_attributes)
+        
+      ActiveRecord::Base.transaction do
+        @_p.phones.find_or_create_by_number_and_person_id(params[:person][:phones_attributes].first[:number], @_p.id) do |phone|
+          phone.person_id   = @_p.id
+          phone.number      = params[:person][:phones_attributes].first[:number]
+        end
       end
-
-      @person
+      @_p
     end
-
+    
     def person_attributes
       {
-        :id                => params[:person][:id],
         :first_name        => params[:person][:first_name],
         :last_name         => params[:person][:last_name],
         :email             => params[:person][:email],
-        :phones_attributes => params[:person][:phones_attributes],
         :organization      => current_organization
       }
     end
@@ -193,4 +220,9 @@ class SalesController < ArtfullyOseController
       params[:credit_card].present? and params[:credit_card][:card_number].present?
     end
 
+    def subscribe_user_to_list
+      if params[:subscribe] && person
+        person.subscribe_to_default_mailchimp_list!
+      end
+    end
 end