artfully_ose 1.2.0 → 1.3.0.pre1

data/app/controllers/converts_controller.rb

@@ -0,0 +1,21 @@
+class ConvertsController < ArtfullyOseController
+  def new
+    @order = Order.find(params[:order_id])
+    @items = params[:items].collect { |item_id| Item.find(item_id) }
+  end
+
+  def create
+    order = Order.find(params[:order_id])
+    items = params[:items].collect { |item_id| Item.find(item_id) }
+    @convert = Convert.new(order, items, current_user)
+    @convert.submit
+
+    if @convert.successful?
+      flash[:notice] = "Successfully returned #{@convert.items.size} tickets and converted them into a donation."
+    else
+      flash[:error] = "Unable to convert tickets.  Please contact support and we'll try to help!"
+    end
+
+    redirect_to order_url(order)
+  end
+end

data/app/controllers/delete_ticket_types_controller.rb

@@ -0,0 +1,35 @@
+class DeleteTicketTypesController < ArtfullyOseController
+  layout false
+  before_filter :find_ticket_type
+  before_filter :restrict_destroy, only: :update
+
+  attr_reader :ticket_type
+  helper_method :ticket_type, :can_destroy?
+
+
+  def show
+  end
+
+  def update
+    ticket_type.destroy!
+    redirect_to event_show_path(related_show.event_id, related_show), flash: {success: "Ticket type has been deleted."}
+  end
+
+  private
+
+    def find_ticket_type
+      @ticket_type = TicketType.find(params[:ticket_type_id])
+    end
+
+    def restrict_destroy
+      redirect_to event_show_path(related_show.event_id, related_show), flash: {error: "Sorry, this ticket type cannot be deleted."} unless can_destroy?(ticket_type)
+    end
+
+    def can_destroy?(ticket_type)
+      ticket_type.destroyable? && can?(:edit, related_show)
+    end
+
+    def related_show
+      ticket_type.show
+    end
+end

data/app/controllers/events_pass_types_controller.rb

@@ -18,10 +18,18 @@ class EventsPassTypesController < ArtfullyOseController
                                              .reject{|pt| @event.events_pass_types.collect(&:pass_type_id).include?(pt.id)}
                                              .collect{|pass_type| [pass_type.name, pass_type.id]}.sort{|a, b| a[0] <=> b[0]}
     
+    @pass_type_options.unshift ["", ""]
+    @selected_pass_type = params[:selected_pass_type]
+
     @pass_types = current_organization.pass_types.empty?
   end
 
   def create
+    if params[:events_pass_type][:pass_type].blank?
+      flash[:error] = "Please select a pass to add to this event."
+      redirect_to new_event_events_pass_type_path(@event) and return
+    end
+
     @events_pass_type = EventsPassType.new.tap do |ept|
       ept.organization = current_organization
       ept.event = @event
@@ -34,7 +42,7 @@ class EventsPassTypesController < ArtfullyOseController
 
     if @events_pass_type.ticket_types.empty?
       flash[:error] = "Please select at least one Ticket Type for this pass."
-      redirect_to new_event_events_pass_type_path(@event) and return
+      redirect_to new_event_events_pass_type_path(@event, :selected_pass_type => params[:events_pass_type][:pass_type]) and return
     end
 
     if @events_pass_type.save
@@ -42,7 +50,7 @@ class EventsPassTypesController < ArtfullyOseController
     else
       flash[:error] = @events_pass_type.errors.full_messages.to_sentence
     end
-    redirect_to event_events_pass_types_path(@event)
+    redirect_to event_events_pass_types_path(@event, :selected_pass_type => params[:events_pass_type][:pass_type])
   end
 
   def edit

data/app/controllers/export_controller.rb

@@ -1,10 +1,10 @@
 class ExportController < ArtfullyOseController
 
   def contacts
-    @organization = current_user.current_organization
-    @filename = "Artfully-People-Export-#{DateTime.now.strftime("%m-%d-%y")}.csv"
-    @csv_string = @organization.people.includes(:tags, :phones, :address).all.to_comma
-    send_data @csv_string, :filename => @filename, :type => "text/csv", :disposition => "attachment"
+    job_monitor = JobMonitor.enqueue(current_user.current_organization, 
+                                         ExportPeopleJob.new(current_user.id, current_user.current_organization.id), 
+                                         {:return_url => imports_path})
+    redirect_to monitor_path(job_monitor)
   end
 
   #

data/app/controllers/households_controller.rb

@@ -3,7 +3,8 @@ class HouseholdsController < ArtfullyOseController
   respond_to :html
 
   def new
-    @household = Household.new
+    @household = current_organization.households.build
+    @household.name = params[:name]
     if params[:individuals]
       params[:individuals].each do |i|
         @household.individuals << current_organization.individuals.find(i)
@@ -32,23 +33,33 @@ class HouseholdsController < ArtfullyOseController
   end
 
   def create
-    @household = current_organization.households.create(params[:household])
-
-    # NOTE: No mind is paid to any household these people might already be in
-    params[:individuals].reject(&:empty?).each do |i|
-      @household.individuals << current_organization.individuals.find(i)
+    if params[:confirm].present?
+      create_household
+    else
+      confirm_household
     end
+  end
 
-    if @household.save
-      redirect_to @household
+  def destroy
+    household = current_organization.households.find(params[:id])
+    household.destroy
+    if household.persisted?
+      flash[:alert] = "There was an issue deleting the household."
+      redirect_to household_url(household)
     else
-      render :new
+      flash[:notice] = "Household deleted"
+      redirect_to root_url
     end
   end
 
   def show
     @household = current_organization.households.find(params[:id])
-    @actions = @household.actions.includes(:person, :organization).paginate(:page => params[:page], :per_page => 20)
+    @individuals = Individual.includes(:addresses, :phones).where(:household_id => @household).all
+    @taggings = ActsAsTaggableOn::Tagging.includes(:tag).where(:taggable_type => "Person").where(:taggable_id => @individuals.collect(&:id))
+    @actions = @household.actions
+                         .order('starred desc').order('occurred_at desc').order('created_at desc')
+                         .includes(:subject, :person, :organization)
+                         .paginate(:page => params[:page], :per_page => 20)
   end
 
   def index
@@ -57,15 +68,52 @@ class HouseholdsController < ArtfullyOseController
   end
 
   def suggested
-    hs = HouseholdSuggester.new(current_organization)
-    @by_address = hs.by_address
-    @by_spouse = hs.by_spouse
+    @suggested_households = current_organization.suggested_households.where(:ignored => false)
   end
 
   def ignore_suggested
-    suggested = SuggestedHousehold.find(params[:suggested_id])
-    suggested.update_attributes(:ignored => true)
+    suggested = current_organization.suggested_households.find(params[:suggested_id])
+    suggested.ignore!
     redirect_to suggested_households_path
   end
 
+  private
+    def create_household
+      @household = current_organization.households.build(:name => params[:name])
+
+      ids = params[:individuals].reject(&:empty?).sort.map(&:to_i)
+
+      ids.each do |i|
+        @household.individuals << current_organization.individuals.find(i)
+      end
+
+      if @household.save
+        current_organization.suggested_households.where(:ids => ids).destroy_all
+        redirect_to @household
+      else
+        render :new and return
+      end
+    end
+
+    def confirm_household
+      @household = current_organization.households.build
+      @household.name = params[:household][:name]
+      @ids = (params[:individuals] || []).reject(&:empty?).sort.map(&:to_i)
+
+      if !@household.valid?
+        flash[:error] = @household.errors.full_messages.to_sentence
+        redirect_to new_household_path(:name => @household.name, :individuals => @ids) and return
+      end
+
+      if @ids.empty?
+        flash[:error] = "Select some people to add to this household"
+        redirect_to new_household_path(:name => @household.name, :individuals => @ids) and return
+      end
+
+      @people = current_organization.individuals.where(:id => @ids)
+      @people_already_in_a_household = @people.select{ |p| p.household_id.present? }
+      @people_not_in_a_household = @people.select{ |p| p.household_id.blank? }
+      render :confirm and return
+    end
+
 end

data/app/controllers/imports_controller.rb

@@ -19,12 +19,12 @@ class ImportsController < ArtfullyOseController
   def show
     @import = organization.imports.find(params[:id])
 
-    #
-    # Building an import preview was just murdering us. The problem is way down in Array.index in parsed_row.load_value.
-    # Temporarily shutting it off for > 1000
-    #
     if @import.status == "pending"
-      @imported_rows    = @import.import_rows.paginate(:page => params[:page], :per_page => 50)
+      if @import.kind == "donations"
+        @imported_rows    = @import.import_rows
+      else
+        @imported_rows    = @import.import_rows.paginate(:page => params[:page], :per_page => 50)
+      end
     end
 
     @people   = Person.where(:import_id => @import.id).paginate(:page => params[:page], :per_page => 50) unless @import.id.nil?
@@ -73,10 +73,13 @@ class ImportsController < ArtfullyOseController
       fields = ParsedRow::PEOPLE_FIELDS.merge(ParsedRow::ADDRESS_FIELDS)
     when "donations"
       fields = ParsedRow::DONATION_FIELDS.merge(ParsedRow::PEOPLE_FIELDS).merge(ParsedRow::ADDRESS_FIELDS)
+      fields = fields.except(*ParsedRow::CAMPAIGN_FIELDS.keys) unless organization.has_kit?(:campaigns)
+    when "memberships"
+      fields = ParsedRow::MEMBERSHIP_FIELDS.merge(ParsedRow::PEOPLE_FIELDS)
     else
       raise "Unknown import type."
     end
-    
+
     columns = fields.map { |field, names| names.first }
     csv_string = CSV.generate { |csv| csv << columns }
     send_data csv_string, :filename => "Artfully-Import-Template.csv", :type => "text/csv", :disposition => "attachment"
@@ -105,15 +108,15 @@ class ImportsController < ArtfullyOseController
 
     def download_links
       s3 = AWS::S3.new(
-          :access_key_id     => ENV['S3_ACCESS_KEY_ID'],
-          :secret_access_key => ENV['S3_SECRET_ACCESS_KEY']
+          :access_key_id     => Rails.configuration.s3.access_key_id,
+          :secret_access_key => Rails.configuration.s3.secret_access_key
       )
-      bucket = s3.buckets[ENV['S3_BUCKET']]
+      bucket = s3.buckets[Rails.configuration.s3.bucket]
       object = bucket.objects[ItemView.sales_export_filename_for(current_organization)]
       url    = object.url_for(:read, :expires => 10*60)
       sales_link = url.to_s
 
-      bucket = s3.buckets[ENV['S3_BUCKET']]
+      bucket = s3.buckets[Rails.configuration.s3.bucket]
       object = bucket.objects[ItemView.donations_export_filename_for(current_organization)]
       url    = object.url_for(:read, :expires => 10*60)
       donations_link = url.to_s

data/app/controllers/job_monitors_controller.rb

@@ -0,0 +1,9 @@
+class JobMonitorsController < ArtfullyOseController
+  def show
+    @job_monitor = current_organization.job_monitors.find(params[:id])
+
+    if request.xhr?
+      render :json => @job_monitor
+    end
+  end
+end

data/app/controllers/members/people_controller.rb

@@ -1,11 +1,7 @@
 class Members::PeopleController < Members::MembersController
   def update
-    address = Address.unhash(person_params.delete("address_attributes"))
     @person = current_member.person
-    results = @person.update_attributes(person_params)
-    @person.delay.new_note("Member made the following changes from their dashboard: #{@person.previous_changes_sentence}", Time.now, nil, current_member.organization.id)
-    @person.address.update_with_note(@person, nil, address, current_member.organization.time_zone, "member dashboard")
-    
+    @person.update_attributes(person_params)
     flash[:notice] = "Your changes have been saved."
     redirect_to members_root_path
   end
@@ -13,5 +9,11 @@ class Members::PeopleController < Members::MembersController
   private
     def person_params
       @person_params ||= params.fetch((:person),{}).merge(params.fetch(:company, {})).merge(params.fetch(:individual,{}))
+      unless @person_params['addresses_attributes'].nil?
+        @person_params['addresses_attributes'].each do |key, address|
+          address[:member_update] = '1'
+        end
+      end
+      @person_params
     end
 end

data/app/controllers/members/sessions_controller.rb

@@ -2,6 +2,7 @@ class Members::SessionsController < Devise::SessionsController
   layout 'devise_layout'
 
   def new
+    @org = Organization.find_by_name(params[:org_name])
     # Store the referrer so we can send them back
     # where they started after successful sign in.
     session[:continue] = request.referrer

data/app/controllers/membership_comps_controller.rb

@@ -14,7 +14,8 @@ class MembershipCompsController < ArtfullyOseController
     @membership_comp.person_id                    = params[:person_id]
     @membership_comp.segment_id                    = params[:segment_id]
     @membership_comp.search_id                    = params[:search_id]
-    @membership_comp.people = find_people
+    @membership_comp.organization                 = current_user.current_organization
+    @membership_comp.find_people
   end
 
   def index
@@ -71,32 +72,16 @@ class MembershipCompsController < ArtfullyOseController
       membership_comp.notes                 = membership_comp_params[:notes]
       membership_comp.person_id             = membership_comp_params[:person_id]
       membership_comp.search_id             = membership_comp_params[:search_id]
+      membership_comp.advanced_search_id    = membership_comp_params[:advanced_search_id]
       membership_comp.segment_id            = membership_comp_params[:segment_id]
+      membership_comp.organization          = current_user.current_organization
 
       membership_comp.organization          = current_user.current_organization
-      membership_comp.people                = find_people(membership_comp_params)
+      membership_comp.find_people
       membership_comp
     end
 
     def cache_key
       current_user.id.to_s + "membership_comp_person_ids"
     end
-
-    def find_people(p = params)
-
-      return @people unless @people.nil?
-
-      if p[:person_id].present?
-        @ids = Array.wrap(p[:person_id])
-      elsif p[:segment_id].present?
-        @ids = current_user.current_organization.segments.where(:id => p[:segment_id]).first.people.collect(&:id)
-      elsif p[:search_id].present?
-        @ids = current_user.current_organization.searches.where(:id => p[:search_id]).first.people.collect(&:id)
-      else
-        []
-      end
-
-      @people = Array.wrap(Person.find(@ids))
-      @people
-    end
 end

data/app/controllers/memberships_controller.rb

@@ -3,8 +3,8 @@ class MembershipsController < ArtfullyOseController
 
   def index
     @person = current_organization.people.find(params[:person_id])
-    @expired_count = @person.memberships.lapsed.count
-    @membership_types = current_organization.membership_types
+    @expired_count = @person.memberships.expired.count
+    @membership_types = MembershipType.in_play(current_user.current_organization)
   end
 
   def bulk_update

data/app/controllers/merges_controller.rb

@@ -15,14 +15,15 @@ class MergesController < ArtfullyOseController
   end
   
   def create
-    @winner = Person.find(params[:winner])
-    @loser = Person.find(params[:loser])
+    @winner = current_organization.people.find(params[:winner])
+    @loser = current_organization.people.find(params[:loser])
+
     if @winner.type == @loser.type
-      @result = Person.merge(@winner, @loser)
-      flash[:notice] = "#{@loser} has been merged into this record"
-      redirect_to person_path(:id => @winner.id)
+      job_monitor = LinkingJobMonitor.enqueue(current_organization, 
+                                      MergeJob.new(@winner, @loser))
+      redirect_to monitor_path(job_monitor)
     else
-      flash[:error] = "Both records must be the same time. A company cannot merge with an individual."
+      flash[:error] = "Both records must be the same type. A company cannot merge with an individual."
       redirect_to new_merge_path(:loser => @person)
     end
   end

data/app/controllers/mobile/users_controller.rb

@@ -1,15 +1,27 @@
 class Mobile::UsersController < ApplicationController
   skip_before_filter :authenticate_user!, :only => :sign_in
+  include Ext::MobileAuthenticator
 
   def sign_in
-    user = User.find_by_email(params[:email])
+    Rails.logger.debug("------- MOBILE LOGIN -------")
 
-    if user && user.valid_password?(params[:password])
+    if response = valid_login?
+      @user = User.find_by_fa_user_id(response["extra_attributes"]["id"])
 
-      if user.organizations.empty?
+      if @user.nil?
         error = {
           :error => "Could not sign in",
-          :reason => "User is not a member of any organizations",
+          :reason => "Please go to fracturedatlas.org to activate your artful.ly organization",
+          :code => 2
+        }
+        render :json => error, :status => 422 and return
+      end
+
+
+      if @user.organizations.empty?
+        error = {
+          :error => "Could not sign in",
+          :reason => "You are not a member of any organizations",
           :code => 2
         }
         render :json => error, :status => 422 and return
@@ -17,11 +29,11 @@ class Mobile::UsersController < ApplicationController
 
       now = Time.parse(params[:now]) rescue Time.zone.now
 
-      render :json => user, :auth_token => true, :organization => user.organizations.first, :now => now
+      render :json => @user, :auth_token => true, :organization => @user.organizations.first, :now => now
     else
       error = {
         :error => "Could not sign in",
-        :reason => "Invalid email/password",
+        :reason => "Invalid email and password",
         :code => 1
       }
       render :json => error, :status => 422

data/app/controllers/notes_controller.rb

@@ -11,6 +11,7 @@
     note = @person.notes.build(params[:note])
     note.user = current_user
     note.organization = current_user.current_organization
+    note.occurred_at = DateTime.now
     note.save
     redirect_to @person
   end
@@ -32,8 +33,11 @@
 
   def update
     @note = Note.find params[:id]
+    @note.text = params[:note][:text]
+    @note.occurred_at = ActiveSupport::TimeZone.create(current_user.current_organization.time_zone).
+        parse(params[:note][:occurred_at])
 
-    if @note.update_attributes(params[:note])
+    if @note.save
       flash[:notice] = "Note updated successfully!"
       redirect_to person_url(@person)
     else