artfully_ose 1.1.0 → 1.2.0.alpha.1

data/app/controllers/exchanges_controller.rb

@@ -1,19 +1,21 @@
 class ExchangesController < ArtfullyOseController
   def new
     @items = Item.includes(:product => [:show => [:event => :venue]]).where(:id => params[:items])
+    @order = @items.first.order
+    @person = @order.person
 
     if @items.all?(&:exchangeable?)
-      @events = current_organization.events
+      @events = current_organization.events.sort
 
       unless params[:event_id].blank?
         @event = Event.find(params[:event_id])
         @shows = @event.upcoming_shows(:all)
         unless params[:show_id].blank? || @event.blank?
-          @show = Show.includes(:event => :venue, :chart => :sections).find(params[:show_id])
-          unless params[:section_id].blank? || @show.blank?
-            @section = Section.find(params[:section_id])
-            @tickets = @show.tickets.unsold.where(:section_id => @section.id)
-            @free_upgrade = @tickets.first.price > @items.first.price unless @tickets.empty?
+          @show = Show.includes(:event => :venue, :chart => [:sections => :ticket_types]).find(params[:show_id])
+          unless params[:ticket_type_id].blank? || @show.blank?
+            @ticket_type = TicketType.find(params[:ticket_type_id])
+            @num_available_tickets = @ticket_type.available
+            @free_upgrade = @ticket_type.price > @items.first.price
           end
         end
       end
@@ -26,9 +28,10 @@ class ExchangesController < ArtfullyOseController
   def create
     order = Order.find(params[:order_id])
     items = params[:items].collect { |item_id| Item.find(item_id) }
-    tickets = Ticket.available({section_id: params[:section_id], show_id: params[:show_id]}, items.count)
+    ticket_type = TicketType.find(params[:ticket_type_id])
+    tickets = ticket_type.available_tickets(items.count)
     logger.debug("Beginning exchange")
-    @exchange = Exchange.new(order, items, tickets)
+    @exchange = Exchange.new(order, items, tickets, ticket_type, send_email_confirmation?)
 
     if tickets.nil?
       flash[:error] = "Please select tickets to exchange."
@@ -42,7 +45,12 @@ class ExchangesController < ArtfullyOseController
       redirect_to order_url(order), :notice => "Successfully exchanged #{self.class.helpers.pluralize(items.length, 'ticket')}"
     else
       flash[:error] = "Unable to process exchange."
+      Rails.logger.error("Unable to process exchange: #{@exchange.errors.full_messages.to_sentence}")
       redirect_to :back
     end
   end
+
+  def send_email_confirmation?
+    params[:send_email_confirmation] == "1"
+  end
 end

data/app/controllers/export_controller.rb

@@ -7,17 +7,25 @@ class ExportController < ArtfullyOseController
     send_data @csv_string, :filename => @filename, :type => "text/csv", :disposition => "attachment"
   end
 
+  #
+  # Artful.ly generates these nightly and provides links directly to s3
+  #
   def donations
     @organization = current_user.current_organization
     @filename = "Artfully-Donations-Export-#{DateTime.now.strftime("%m-%d-%y")}.csv"
-    @csv_string = @organization.donations.all.to_comma(:donation)
+    @items = ItemView.where(:organization_id => current_organization).where(:product_type => "Donation").all
+    @csv_string = @items.to_comma(:donation)  
     send_data @csv_string, :filename => @filename, :type => "text/csv", :disposition => "attachment"
   end
 
+  #
+  # Artful.ly generates these nightly and provides links directly to s3
+  #
   def ticket_sales
     @organization = current_user.current_organization
     @filename = "Artfully-Ticket-Sales-Export-#{DateTime.now.strftime("%m-%d-%y")}.csv"
-    @csv_string = @organization.ticket_sales.all.to_comma(:ticket_sale)
+    @items = ItemView.where(:organization_id => current_organization).where(:product_type => "Ticket").all
+    @csv_string = @items.to_comma(:ticket_sale)    
     send_data @csv_string, :filename => @filename, :type => "text/csv", :disposition => "attachment"
   end
 

data/app/controllers/households_controller.rb

@@ -0,0 +1,71 @@
+class HouseholdsController < ArtfullyOseController
+
+  respond_to :html
+
+  def new
+    @household = Household.new
+    if params[:individuals]
+      params[:individuals].each do |i|
+        @household.individuals << current_organization.individuals.find(i)
+      end
+    end
+  end
+
+  def update
+    @household = current_organization.households.find(params[:id])
+    flash[:notice] = []
+
+    unless params[:individual_ids].nil?
+      @household.individuals << current_organization.individuals.find(params[:individual_ids])
+    end
+
+    @household.update_attributes(params[:household])
+    @household.update_member_addresses if @household.overwrite_member_addresses
+
+    if @household.save
+      flash[:notice] = "Your changes have been saved"
+    else
+      flash[:alert] = @household.errors.full_messages.to_sentence
+    end
+
+    redirect_to(@household)
+  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)
+    end
+
+    if @household.save
+      redirect_to @household
+    else
+      render :new
+    end
+  end
+
+  def show
+    @household = current_organization.households.find(params[:id])
+    @actions = @household.actions.includes(:person, :organization).paginate(:page => params[:page], :per_page => 20)
+  end
+
+  def index
+    @households = current_organization.households.order(:created_at)
+    @households = @households.paginate(:page => params[:page], :per_page => 20)
+  end
+
+  def suggested
+    hs = HouseholdSuggester.new(current_organization)
+    @by_address = hs.by_address
+    @by_spouse = hs.by_spouse
+  end
+
+  def ignore_suggested
+    suggested = SuggestedHousehold.find(params[:suggested_id])
+    suggested.update_attributes(:ignored => true)
+    redirect_to suggested_households_path
+  end
+
+end

data/app/controllers/imports_controller.rb

@@ -4,7 +4,8 @@ class ImportsController < ArtfullyOseController
   before_filter :set_import_type
 
   def index
-    @imports = organization.imports.order('created_at desc').all
+    @imports = organization.imports.includes(:user, :organization).order('created_at desc').all
+    @sales_csv_download_link, @donations_csv_download_link = download_links
   end
 
   def approve
@@ -17,9 +18,18 @@ class ImportsController < ArtfullyOseController
 
   def show
     @import = organization.imports.find(params[:id])
-    @parsed_rows = @import.parsed_rows.paginate(:page => params[:page], :per_page => 50)
-    
-    @people = Person.where(:import_id => @import.id).paginate(:page => params[:page], :per_page => 50) unless @import.id.nil?
+
+    #
+    # 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
+    #
+    @under_limit = @import.import_rows.count < 1000
+    if @import.status == "pending" && @under_limit
+      @parsed_rows = @import.parsed_rows.paginate(:page => params[:page], :per_page => 50)
+    end
+
+    @people   = Person.where(:import_id => @import.id).paginate(:page => params[:page], :per_page => 50) unless @import.id.nil?
+    @messages = ImportMessage.where(:import_id => @import.id).paginate(:page => params[:messages_page], :per_page => 10) unless @import.id.nil?
   end
 
   def new
@@ -59,11 +69,13 @@ class ImportsController < ArtfullyOseController
   def template   
     case @type
     when "events"
-      fields = ParsedRow::EVENT_FIELDS
+      fields = ParsedRow::EVENT_FIELDS.merge(ParsedRow::PEOPLE_FIELDS).merge(ParsedRow::ADDRESS_FIELDS)
     when "people"
-      fields = ParsedRow::PEOPLE_FIELDS
+      fields = ParsedRow::PEOPLE_FIELDS.merge(ParsedRow::ADDRESS_FIELDS)
     when "donations"
-      fields = ParsedRow::DONATION_FIELDS
+      fields = ParsedRow::DONATION_FIELDS.merge(ParsedRow::PEOPLE_FIELDS).merge(ParsedRow::ADDRESS_FIELDS)
+    else
+      raise "Unknown import type."
     end
     
     columns = fields.map { |field, names| names.first }
@@ -71,6 +83,15 @@ class ImportsController < ArtfullyOseController
     send_data csv_string, :filename => "Artfully-Import-Template.csv", :type => "text/csv", :disposition => "attachment"
   end
 
+  def recall
+    @import = organization.imports.find(params[:id])
+    raise "Can't recall imports other than people imports." unless @import.is_a?(PeopleImport)
+
+    Delayed::Job.enqueue RecallImportJob.new(@import.id)
+    flash[:notice] = "The import is currently being recalled. Reload this page to see progress or check back in a few minutes."
+    redirect_to imports_path
+  end
+
   protected
 
     def organization
@@ -83,4 +104,22 @@ class ImportsController < ArtfullyOseController
       @type = (params[:type] || session[:type])
     end
 
+    def download_links
+      s3 = AWS::S3.new(
+          :access_key_id     => ENV['S3_ACCESS_KEY_ID'],
+          :secret_access_key => ENV['S3_SECRET_ACCESS_KEY']
+      )
+      bucket = s3.buckets[ENV['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']]
+      object = bucket.objects[ItemView.donations_export_filename_for(current_organization)]
+      url    = object.url_for(:read, :expires => 10*60)
+      donations_link = url.to_s
+
+      [sales_link, donations_link]
+    end
+
 end

data/app/controllers/index_controller.rb

@@ -10,10 +10,15 @@ class IndexController < ArtfullyOseController
     redirect_to root_path
   end
 
+  def recent_activity
+    @recent_actions = Action.recent(current_user.current_organization).where('import_id is null').page(params[:page]).per_page(10)
+    render 'index/_recent_activity', :layout => false
+  end
+
   def dashboard
     if current_user.is_in_organization?
       @events = current_user.current_organization.events.includes(:shows, :venue).order('updated_at DESC').limit(4)
-      @recent_actions = Action.recent(current_user.current_organization, 10).where('import_id is null')
+      @recent_actions = Action.recent(current_user.current_organization).where('import_id is null').page(params[:page]).per_page(10)
     end
   end
 

data/app/controllers/member_cards_controller.rb

@@ -0,0 +1,45 @@
+class MemberCardsController < ArtfullyOseController
+  requires_kit :membership
+
+  before_filter :find_members
+
+  def new
+    generator = MemberCardGenerator::BlanksUsaIdc6.new(@members)
+    generator.generate
+    redirect_to generator.download_url
+  end
+
+  private
+  def find_members
+    @members = if params[:search_id].present?
+      search = Search.where(:id => params[:search_id]).first
+      if search
+        load_members search.people.map { |person| person.memberships.current.first.member_id }
+      else
+        raise CanCan::AccessDenied
+      end
+    elsif params[:start].present?
+      members_from_sales_search
+    else
+      raise CanCan::AccessDenied
+    end
+  end
+
+  def load_members(member_ids)
+    Member.find Array.wrap(member_ids).flatten
+  end
+
+  def members_from_sales_search
+    membership_type = MembershipType.find_by_id(params[:membership_type_id]) if params[:membership_type_id].present?
+    search          = MembershipSaleSearch.new :start           => params[:start],
+                                               :stop            => params[:stop],
+                                               :organization    => current_organization,
+                                               :membership_type => membership_type
+
+    load_members search.results.map { |order| order.items.select(&:membership?).first.product.member_id }
+  end
+
+  def sales_params?
+    params[:start].present?
+  end
+end

data/app/controllers/members/index_controller.rb

@@ -0,0 +1,4 @@
+class Members::IndexController < Members::MembersController
+  def index
+	end
+end

data/app/controllers/members/invitations_controller.rb

@@ -0,0 +1,7 @@
+class Members::InvitationsController < Devise::InvitationsController
+  layout 'devise_layout'
+
+  def after_accept_path_for(resource)
+    members_root_path
+  end
+end

data/app/controllers/members/members_controller.rb

@@ -0,0 +1,9 @@
+class Members::MembersController < Store::StoreController
+  before_filter      :authenticate_member!
+  skip_before_filter :authenticate_user!
+  skip_filter        :require_more_info 
+
+  def update
+    address = Address.unhash(person_params.delete("address_attributes"))
+  end 
+end

data/app/controllers/members/passwords_controller.rb

@@ -0,0 +1,10 @@
+class Members::PasswordsController < Devise::PasswordsController
+  layout 'devise_layout'
+
+  protected
+    
+    #This method changed from devise 2.0 and 3.0
+    def after_sign_in_path_for(resource)
+      members_root_path
+    end
+end

data/app/controllers/members/people_controller.rb

@@ -0,0 +1,17 @@
+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")
+    
+    flash[:notice] = "Your changes have been saved."
+    redirect_to members_root_path
+  end
+
+  private
+    def person_params
+      @person_params ||= params.fetch((:person),{}).merge(params.fetch(:company, {})).merge(params.fetch(:individual,{}))
+    end
+end

data/app/controllers/members/sessions_controller.rb

@@ -0,0 +1,14 @@
+class Members::SessionsController < Devise::SessionsController
+  layout 'devise_layout'
+
+  def new
+    # Store the referrer so we can send them back
+    # where they started after successful sign in.
+    session[:continue] = request.referrer
+    super
+  end
+
+  def after_sign_in_path_for(resource_or_scope)
+    stored_location_for(resource_or_scope) || session.delete(:continue) || signed_in_root_path(resource_or_scope)
+  end
+end

data/app/controllers/membership_cancellations_controller.rb

@@ -0,0 +1,46 @@
+class MembershipCancellationsController < ApplicationController
+  before_filter :set_person
+  before_filter :require_membership_ids
+  before_filter :require_memberships_for_person
+
+  respond_to :js
+
+  def new
+    @cancellation = MembershipCancellation.new(params[:membership_ids])
+    respond_with
+  end
+
+  def create
+    @membership_count = params[:membership_ids].count
+    MembershipCancellation.enqueue(params[:membership_ids])
+  end
+
+  private
+
+  def require_membership_ids
+    if params[:membership_ids].present?
+      true
+    else
+      render :text => ' ', :status => :bad_request
+      false
+    end
+  end
+
+  def require_memberships_for_person
+    # Count memberships for this person that match the given membership ids
+    query = Membership.where(id: params[:membership_ids], member_id: @person.member.id)
+
+    # This is true if the person owns ALL of the given membership ids
+    if query.count == params[:membership_ids].count
+      true
+    else
+      render :text => 'This person does not own the memberships.', :status => :unauthorized
+      false
+    end
+  end
+
+  def set_person
+    @person = Person.find(params[:person_id])
+    true
+  end
+end

data/app/controllers/membership_changes_controller.rb

@@ -0,0 +1,39 @@
+class MembershipChangesController < ApplicationController
+  before_filter :set_person, :only => [:create]
+
+  def create
+    change = MembershipChange.new(membership_change_params)
+    if change.save
+      # Success!
+      flash[:success] = 'Memberships have been successfully changed.'
+    else
+      # Error!
+      flash[:error] = error_message
+    end
+  rescue Exception => e
+    Rails.logger.info(e.message)
+    Rails.logger.info(e.backtrace.join("\n"))
+
+    flash[:error] = error_message
+  ensure
+    redirect_to person_memberships_path(@person)
+  end
+
+  private
+  def error_message
+    "We're sorry but we could not process the change.  Please make sure all fields are filled out accurately."
+  end
+
+  def membership_change_params
+    permitted = [:membership_ids, :membership_type_id, :price, :payment_method, :credit_card_info, :person_id]
+    permitted.reduce({}) do |all,key|
+      all[key] = params[key] if params[key].present?
+      all
+    end
+  end
+
+  def set_person
+    @person = Person.find(params[:person_id])
+    true
+  end
+end