artfully_ose 1.2.0.beta.1 → 1.2.0.pre

data/app/controllers/exchanges_controller.rb

@@ -1,11 +1,9 @@
 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.sort
+      @events = current_organization.events
 
       unless params[:event_id].blank?
         @event = Event.find(params[:event_id])
@@ -31,7 +29,7 @@ class ExchangesController < ArtfullyOseController
     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, ticket_type, send_email_confirmation?)
+    @exchange = Exchange.new(order, items, tickets, ticket_type)
 
     if tickets.nil?
       flash[:error] = "Please select tickets to exchange."
@@ -49,8 +47,4 @@ class ExchangesController < ArtfullyOseController
       redirect_to :back
     end
   end
-
-  def send_email_confirmation?
-    params[:send_email_confirmation] == "1"
-  end
 end

data/app/controllers/export_controller.rb

@@ -7,9 +7,6 @@ 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"
@@ -18,9 +15,6 @@ 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 ticket_sales
     @organization = current_user.current_organization
     @filename = "Artfully-Ticket-Sales-Export-#{DateTime.now.strftime("%m-%d-%y")}.csv"

data/app/controllers/imports_controller.rb

@@ -5,7 +5,6 @@ class ImportsController < ArtfullyOseController
 
   def index
     @imports = organization.imports.includes(:user, :organization).order('created_at desc').all
-    @sales_csv_download_link, @donations_csv_download_link = download_links
   end
 
   def approve
@@ -104,22 +103,4 @@ 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/members/index_controller.rb

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

data/app/controllers/members/members_controller.rb

@@ -1,9 +1,4 @@
 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 
+  before_filter      :authenticate_member!
 end

data/app/controllers/membership_awards_controller.rb

@@ -0,0 +1,58 @@
+class MembershipAwardsController < ArtfullyOseController
+  def new
+    Rails.cache.delete(cache_key)
+
+    @membership_types = MembershipType.all
+    @membership_types_hash = {}
+    @membership_types.each {|mt| @membership_types_hash[mt.id] = I18n.l(mt.ends_at, :format => :date_for_input)}
+
+    @membership_award = MembershipAward.new
+    @membership_award.membership_type             ||= @membership_types.first
+    @membership_award.ends_at                     ||= I18n.l(@membership_types.first.ends_at, :format => :date_for_input)
+    @membership_award.send_email                  ||= true
+    @membership_award.number_of_memberships       ||= 1
+    @membership_award.people = find_people
+  end
+
+  def create
+    if params[:membership_award][:confirm].present?
+      @membership_award = from_params(params)
+      Membership.for_award(@membership_award)
+      render 'create' and return
+    else
+      @membership_award = from_params(params)
+
+      #TODO: Validate that these people are all the same org as this user
+
+      render "confirm" and return
+    end
+  end
+
+  private 
+    def from_params(params)
+      membership_award                       = MembershipAward.new
+      membership_award_params                = params[:membership_award]
+      membership_award.membership_type       = MembershipType.find(membership_award_params[:membership_type])
+      membership_award.ends_at               = membership_award_params[:ends_at]
+      membership_award.send_email            = membership_award_params[:send_email]
+      membership_award.number_of_memberships = membership_award_params[:number_of_memberships]
+      membership_award.message               = membership_award_params[:message]
+      membership_award.people                = find_people
+      membership_award
+    end
+
+    def cache_key
+      current_user.id.to_s + "membership_award_person_ids"
+    end
+
+    def find_people
+      ids = Rails.cache.fetch(cache_key) do
+        if params[:person_id].present?
+          Array.wrap(params[:person_id])
+        else
+          []
+        end
+      end
+      Array.wrap(Person.find(ids))
+    end
+end

data/app/controllers/membership_types_controller.rb

@@ -1,57 +1,20 @@
 class MembershipTypesController < ArtfullyOseController
-  requires_kit :membership
-
   def index
     @membership_types = current_organization.membership_types.paginate(:page => params[:page], :per_page => 50)
-
-    respond_to do |format|
-      format.html
-
-      format.csv do
-        @filename = 'membership_types.csv'
-        @csv_string = @membership_types.to_comma
-        send_data @csv_string, :filename => @filename, :type => 'text/csv', :disposition => 'attachment'
-      end
-    end
   end
 
   def new
-    with_type_selected do
-      @membership_type = Kernel.const_get(params[:type].camelize).new
-      @membership_type.hide_fee = true
-    end
+    @membership_type = MembershipType.new
   end
 
   def create
-    @membership_type = Kernel.const_get(params[:membership_type][:type].camelize).new(params[:membership_type])
+    @membership_type = MembershipType.new(params[:membership_type])
     @membership_type.organization = current_organization
-    unless @membership_type.save
-      flash[:error] = @membership_type.errors.full_messages.to_sentence
-      # @membership_type = Kernel.const_get(params[:membership_type][:type].camelize).new
-      render "new" and return
-    end
+    @membership_type.save
     redirect_to membership_types_path
   end
 
   def edit
     @membership_type = MembershipType.find(params[:id])
   end
-
-  def update
-    @membership_type = MembershipType.find(params[:id])
-    
-    if @membership_type.update_attributes(params[:membership_type])
-      flash[:notice] = "Your changes have been saved"
-      redirect_to membership_types_path
-    else
-      flash[:error] = @membership_type.errors.full_messages.to_sentence
-      render "edit" and return
-    end
-  end
-
-  private
-    def with_type_selected
-      render :type and return if params[:type].blank?
-      yield
-    end
 end

data/app/controllers/memberships_controller.rb

@@ -2,13 +2,11 @@ class MembershipsController < ArtfullyOseController
   before_filter :load_tags, :only => [:index]
 
   def index
-    @person = current_organization.people.find(params[:person_id])
-    @expired_count = @person.memberships.lapsed.count
-    @membership_types = current_organization.membership_types
+    @person = Person.find(params[:person_id])
   end
 
   def bulk_update
-    @person = current_organization.people.find(params[:person_id])
+    @person = Person.find(params[:person_id])
     extend_memberships(params)
     redirect_to person_memberships_path(@person)
   end
@@ -18,9 +16,9 @@ class MembershipsController < ArtfullyOseController
     def extend_memberships(params)
       
       #I hate how these are tied to the button text
-      if params[:commit].eql? "Change Expiration"
+      if params[:commit].eql? "Extend Memberships"
         params[:membership_ids].each do |membership_id|
-          current_organization.memberships.find(membership_id).adjust_expiration_to(params[:ends_at])
+          Membership.find(membership_id).adjust_expiration_to(params[:ends_at])
         end
         flash[:notice] = "Memberships have been adjusted."
       end

data/app/controllers/orders_controller.rb

@@ -47,96 +47,12 @@ class OrdersController < ArtfullyOseController
     redirect_to order_url(@order)
   end
 
-  def membership
-    authorize! :view, Order
-
-    @organization = current_organization
-    @membership_type  = MembershipType.find_by_id(params[:membership_type_id]) if params[:membership_type_id].present?
-    @membership_types = @organization.membership_types
-
-    request.format = :csv if params[:commit] == "Download"
-
-    search_terms = {
-      :start        => params[:start],
-      :stop         => params[:stop],
-      :organization => @organization,
-      :membership_type => @membership_type
-    }
-
-    @search = MembershipSaleSearch.new(search_terms) do |results|
-      results.paginate(:page => params[:page], :per_page => 25)
-    end
-
-    respond_to do |format|
-      format.html
-      format.csv do
-        filename = "Artfully-Membership-Sales-Export-#{DateTime.now.strftime("%m-%d-%y")}.csv"
-        items = ItemView.where(:product_type => "Membership")
-                             .where('items_view.created_at > ? ', @search.start)
-                             .where('items_view.created_at < ?',  @search.stop)
-                             .where('items_view.organization_id = ?', current_organization)
-                             .order('items_view.created_at desc')
-        if @membership_type
-          items = items.joins(:item).
-            joins("INNER JOIN memberships ON (items.product_type = #{::Item.sanitize('Membership')} AND items.product_id = memberships.id)").
-            joins("INNER JOIN membership_types ON (membership_types.id = memberships.membership_type_id)").
-            where(:membership_types => {:id => @membership_type}).
-            group('items_view.order_id')
-        end
-        csv_string = items.all.to_comma(:membership_sale)
-        send_data csv_string, :filename => filename, :type => "text/csv", :disposition => "attachment"
-      end
-    end
-  end
-
-  def passes
-    authorize! :view, Order
-
-    @organization = current_organization
-    @pass_type  = PassType.find_by_id(params[:pass_type_id]) if params[:pass_type_id].present?
-    @pass_types = @organization.pass_types
-
-    request.format = :csv if params[:commit] == "Download"
-
-    search_terms = {
-      :start        => params[:start],
-      :stop         => params[:stop],
-      :organization => @organization,
-      :pass_type    => @pass_type
-    }
-
-    @search = PassSaleSearch.new(search_terms) do |results|
-      results.paginate(:page => params[:page], :per_page => 25)
-    end
-
-    respond_to do |format|
-      format.html
-      format.csv do
-        filename = "Artfully-Pass-Sales-Export-#{DateTime.now.strftime("%m-%d-%y")}.csv"
-        items = ItemView.where(:product_type => "Pass")
-                             .where('items_view.created_at > ? ', @search.start)
-                             .where('items_view.created_at < ?',  @search.stop)
-                             .where('items_view.organization_id = ?', current_organization)
-                             .order('items_view.created_at desc')
-        if @pass_type
-          items = items.joins(:item).
-            joins("INNER JOIN passes ON (items.product_type = #{::Item.sanitize('Pass')} AND items.product_id = passes.id)").
-            joins("INNER JOIN pass_types ON (pass_types.id = passes.pass_type_id)").
-            where(:pass_types => {:id => @pass_type}).
-            group('items_view.order_id')
-        end
-        csv_string = items.all.to_comma(:pass_sale)
-        send_data csv_string, :filename => filename, :type => "text/csv", :disposition => "attachment"
-      end
-    end
-  end
-
   def sales
     authorize! :view, Order
 
     @organization = current_organization
     @event = Event.find_by_id(params[:event_id]) if params[:event_id].present?
-    @events = @organization.events.sort
+    @events = @organization.events
     @show = @event.shows.find_by_id(params[:show_id]) if @event && params[:show_id].present?
     @shows = @event.shows if @event
     request.format = :csv if params[:commit] == "Download"
@@ -158,7 +74,7 @@ class OrdersController < ArtfullyOseController
       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 > ? ', search_terms[:start]) 
                              .where('created_at < ?',  Sundial.midnightish(current_organization, search_terms[:stop]))
                              .where('organization_id = ?', current_organization)
                              .order('created_at desc')

data/app/controllers/organizations_controller.rb

@@ -22,7 +22,7 @@ class OrganizationsController < ArtfullyOseController
       flash[:error] = "You can only join one organization at this time."
       redirect_to organizations_url
     end
-
+    
     if Organization.all.length > 0
       flash[:error] = "There is already an organization created for this installation."
     end
@@ -35,12 +35,11 @@ class OrganizationsController < ArtfullyOseController
       flash[:error] = "There is already an organization created for this installation."
       redirect_to new_organization_path and return
     end
-
+    
     @organization = Organization.new(params[:organization])
 
     if @organization.save
       @organization.users << current_user
-      @organization.make_owner(current_user)
       redirect_to organizations_url, :notice => "#{@organization.name} has been created"
     else
       render :new
@@ -62,5 +61,5 @@ class OrganizationsController < ArtfullyOseController
     else
       render :show
     end
-  end
+  end   
 end

data/app/controllers/people_controller.rb

@@ -18,7 +18,6 @@ class PeopleController < ArtfullyOseController
     @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"
     @person.subtype          = person[:subtype] || "Individual"
     @person.organization_id  = current_user.current_organization.id
@@ -51,18 +50,24 @@ class PeopleController < ArtfullyOseController
   def update
     @person = Person.find(params[:id])
     authorize! :edit, @person
-    flash[:notice] = []
-    results = @person.update_attributes(person_update_params)
-    @person.relationships.where(:inverse_id => nil).map(&:ensure_inverse)
+
+    #
+    # The mailchimp form POSTS params as person[] regardless of individual or company
+    #
+    person_params = params.fetch((:person),{}).merge(params.fetch(:company, {})).merge(params.fetch(:individual,{}))
+
+    address = Address.unhash(person_params.delete("address_attributes"))
+    results = @person.update_attributes(person_params)
 
     respond_to do |format|
       format.html do
         if results
+          @person.address.update_with_note(@person, current_user, address, current_organization.time_zone, current_member.try(:email))
           @person.create_subscribed_lists_notes!(current_user)
-          flash[:notice] << "Your changes have been saved"
+          flash[:notice] = "Your changes have been saved"
         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
+          errs = @person.errors.full_messages.to_sentence
+          flash[:alert] = errs.blank? ? "Sorry, we couldn't save your changes. Make sure you entered a first name, last name or email address." : errs
         end
         redirect_to_person(@person, params)
       end
@@ -81,27 +86,25 @@ class PeopleController < ArtfullyOseController
   def index
     authorize! :manage, 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
+      respond_with do |format|
+        format.csv  { render :csv => @people, :filename => "SearchResults-#{DateTime.now.strftime("%m-%d-%y")}.csv" }
+        format.html { render :partial => 'list', :layout => false, :locals => { :people => @people } if request.xhr? }
+        format.json { render :json => @people }
+      end
     else
       @people = Person.recent(current_user.current_organization)
     end
 
     @people = @people.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
-    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)
+    @actions = @person.actions.order('starred desc').order('occurred_at desc').page(params[:page]).per_page(20)
     @person.build_address unless @person.address
     @new_action = Action.for_organization(current_user.current_organization)
     authorize! :view, @person
@@ -113,15 +116,10 @@ class PeopleController < ArtfullyOseController
     authorize! :edit, @person
 
     type = params[:type]
-    starable = type.classify.constantize.find(params[:action_id])
-
-    if type == 'relationship'
-      starable.starred ? starable.unstar! : starable.star!
-    else
-      starable.starred = ! starable.starred?
-      starable.save
-    end
+    starable = params[:type].classify.constantize.find(params[:action_id])
 
+    starable.starred = ! starable.starred?
+    starable.save
   end
 
   def edit
@@ -158,26 +156,11 @@ class PeopleController < ArtfullyOseController
     render :nothing => true
   end
 
-  #
-  # Weird to put here, but otherwise it'll collide with Devise's MembersController
-  #
-  def reset_password
-    @person = Person.find(params[:id])
-    authorize! :view, @person
-    @member = @person.member
-
-    return if @member.nil?
-
-    @member.delay.send_reset_password_instructions
-    flash[:notice] = "We'll get that password reset email out to #{@member.email} right away!"
-    redirect_to person_memberships_path(@member.person)
-  end
-
   private
     def is_search(params)
       params[:commit].present?
-    end
-
+    end    
+    
     def without_winner
       if params[:winner]
         @winner = Person.find(params[:winner])
@@ -187,18 +170,4 @@ class PeopleController < ArtfullyOseController
       end
     end
 
-    def person_update_params
-      #
-      # The mailchimp form POSTS params as person[] regardless of individual or company
-      #
-      individual_params = params.fetch(:individual, {})
-      company_params = params.fetch(:company, {})
-
-      person_params = params.fetch((:person),{}).merge(company_params).merge(individual_params)
-
-      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
 end