artfully_ose 1.2.0 → 1.3.0.pre1

data/app/controllers/appeals_controller.rb

@@ -0,0 +1,63 @@
+class AppealsController < ArtfullyOseController
+  requires_kit :campaigns
+
+  helper_method :current_campaign
+  helper_method :current_organization
+
+  def index
+    @appeals = current_campaign.appeals
+  end
+
+  def new
+    @appeal = current_campaign.appeals.new
+  end
+
+  def create
+    @appeal = current_campaign.appeals.new(params[:appeal])
+    @appeal.organization_id = current_organization.id
+
+    if @appeal.save
+      flash[:notice] = 'Appeal created successfully'
+      redirect_to current_campaign
+    else
+      render 'new'
+    end
+  end
+
+  def show
+    @appeal = current_campaign.appeals.find(params[:id])
+  end
+
+  def edit
+    @appeal = current_campaign.appeals.find(params[:id])
+  end
+
+  def update
+    @appeal = current_campaign.appeals.find(params[:id])
+
+    if @appeal.update_attributes(params[:appeal])
+      flash[:notice] = 'Appeal updated successfully'
+      redirect_to current_campaign
+    else
+      render 'edit'
+    end
+  end
+
+  def destroy
+    @appeal = current_campaign.appeals.find(params[:id])
+
+    if @appeal.destroy
+      flash[:notice] = 'Appeal successfully deleted'
+      redirect_to current_campaign
+    else
+      flash[:error] = 'Appeal cannot be deleted'
+      redirect_to edit_campaign_appeal_url(current_campaign, @appeal)
+    end
+  end
+
+  private
+
+  def current_campaign
+    @current_campaign ||= current_organization.campaigns.find(params[:campaign_id])
+  end
+end

data/app/controllers/artfully_ose_controller.rb

@@ -61,11 +61,17 @@ class ArtfullyOseController < ActionController::Base
     def verified_request?
       super || form_authenticity_token == request.headers['X_XSRF_TOKEN']
     end
+    
+    def current_user_org_admin?
+      current_user.is_org_admin_of(current_user.current_organization)
+    end
+    helper_method :current_user_org_admin?
 
   private
 
     def load_tags
-      @tags = current_user.current_organization.unique_tag_strings_for(:people)
+      @tags = current_user.current_organization.unique_tag_strings_for(:people).sort_by{|w| [w.downcase, w]}
+      Rails.logger.info(@tags)
       @tags_string = "\"" + @tags.join("\",\"") + "\""
     end
 
@@ -79,7 +85,7 @@ class ArtfullyOseController < ActionController::Base
     end
 
     def public_controller?
-      %w( devise/sessions devise/registrations devise/passwords devise/unlocks ).include?(params[:controller])
+      %w( devise/sessions devise/registrations devise/passwords devise/unlocks devise/cas_sessions ).include?(params[:controller])
     end
 
     def public_action?
@@ -92,6 +98,7 @@ class ArtfullyOseController < ActionController::Base
 
     def require_more_info
       if need_more_info?
+        current_user.reload
         flash[:info] = "We need to collect more information about your organization before you continue."
         redirect_to collect_info_signups_path
       end
@@ -102,4 +109,15 @@ class ArtfullyOseController < ActionController::Base
       response.headers["Pragma"] = "no-cache"
       response.headers["Expires"] = "Fri, 01 Jan 1990 00:00:00 GMT"
     end
+
+    def set_campaigns_and_appeals
+      @campaign_appeals = {}
+      current_organization.campaigns.active.each do |campaign|
+        @campaign_appeals[campaign.id] = {}
+        campaign.appeals.active.each do |appeal|
+          @campaign_appeals[campaign.id][appeal.id] = appeal.name
+        end
+      end
+    end
+
 end

data/app/controllers/campaigns_controller.rb

@@ -0,0 +1,90 @@
+class CampaignsController < ArtfullyOseController
+  requires_kit :campaigns
+  before_filter :load_donation_data, :only => [:index]
+  before_filter :load_pledge_data, :only => [:index]
+
+
+  def index
+    @campaigns = current_organization.campaigns
+  end
+
+  def new
+    @campaign = current_organization.campaigns.new
+  end
+
+  def create
+    @campaign = current_organization.campaigns.new(params[:campaign])
+
+    if @campaign.save
+      flash[:notice] = 'Campaign created successfully'
+      redirect_to @campaign
+    else
+      render 'new'
+    end
+  end
+
+  def show
+    @campaign = current_organization.campaigns.find(params[:id])
+  end
+
+  def edit
+    @campaign = current_organization.campaigns.find(params[:id])
+  end
+
+  def update
+    @campaign = current_organization.campaigns.find(params[:id])
+
+    if @campaign.update_attributes(params[:campaign])
+      flash[:notice] = 'Campaign updated successfully'
+      redirect_to @campaign
+    else
+      render 'edit'
+    end
+  end
+
+  def destroy
+    @campaign = current_organization.campaigns.find(params[:id])
+
+    if @campaign.destroy
+      flash[:notice] = 'Campaign successfully deleted'
+      redirect_to campaigns_path
+    else
+      flash[:error] = 'Campaign cannot be deleted'
+      redirect_to @campaign
+    end
+  end
+
+  def copy
+    @campaign = current_organization.campaigns.find(params[:id])
+    @campaign = @campaign.dup
+    @campaign.name << ' (Copy)'
+
+    render 'new'
+  end
+
+  private
+  def load_donation_data
+    @campaigns_donations = {}
+    Donation.select('campaign_id, SUM(amount) received')
+      .where(:organization_id => current_organization.id)
+      .where('campaign_id IS NOT NULL')
+      .where('donations.created_at < ?', 0.seconds.ago)
+      .where(:pledge => false)
+      .group(:campaign_id).each do |row|
+      @campaigns_donations[row.campaign_id] = row.received.to_i
+    end
+  end
+
+  def load_pledge_data
+    @campaigns_pledges = {}
+    Donation.select('campaign_id, SUM(IF(amount > received_amount, amount - received_amount, 0)) outstanding')
+    .where(:organization_id => current_organization.id)
+    .where('campaign_id IS NOT NULL')
+    .where('donations.created_at < ?', 0.seconds.ago)
+    .where(:pledge => true)
+    .group(:campaign_id).each do |row|
+      @campaigns_pledges[row.campaign_id] = row.outstanding.to_i
+    end
+  end
+
+end

data/app/controllers/charts_controller.rb

@@ -2,8 +2,14 @@ class ChartsController < ApplicationController
   def update
     @chart = Chart.find(params[:id])
     authorize! :edit, @chart
-    @chart.update_attributes_from_params(Chart.polish_params(params[:chart]))
-    flash[:notice] = "Prices saved!"
+
+    if @chart.update_attributes_from_params(Chart.polish_params(params[:chart]))
+      flash[:notice] = "Prices saved."
+    else
+      flash[:error] = "Please name all of your ticket types."
+      redirect_to prices_event_url(@chart.event) and return
+    end
+
     if user_requesting_next_step?
       redirect_to image_event_path(@chart.event)
     else

data/app/controllers/console_sales_controller.rb

@@ -1,12 +1,14 @@
 class ConsoleSalesController < ArtfullyOseController
   before_filter :verify_person
+  before_filter :set_campaigns_and_appeals, :only => [:new]
   include CartFinder
 
   rescue_from ActiveRecord::RecordInvalid, :with => :checkout_error
 
   def new  
-    @events = Event.where(:id => current_organization.shows.unplayed.pluck(:event_id).uniq)
-    @membership_types = current_organization.membership_types.sales_valid
+    authorize! :manage, Sale
+    @events = Event.where(:id => current_organization.shows.unplayed.pluck(:event_id).uniq).sort
+    @membership_types = current_organization.membership_types.not_ended.sales_valid
 
     @membership_types_hash = {}
     @membership_types.each {|mt| @membership_types_hash[mt.id] = {:allow_multiple_memberships => mt.allow_multiple_memberships?,:formatted_ends_at => I18n.l(mt.ends_at, :format => :date_for_input)}}
@@ -36,7 +38,8 @@ class ConsoleSalesController < ArtfullyOseController
 
     @checkout = ConsoleSale::Checkout.new(current_sales_console_cart, payment, params[:order_notes])
     
-    if @checkout.valid? && @checkout.finish
+    if @checkout.process
+      subscribe_user_to_list
       @order = @checkout.order
       flash[:notice] = success_flash_message(@order, @checkout.person.email)
       redirect_to new_console_sale_path
@@ -56,15 +59,14 @@ class ConsoleSalesController < ArtfullyOseController
 
   def shows
     @show = current_organization.shows.find(params[:show_id])
-    @ticket_types = @show.chart.sections.first.ticket_types_for(nil)
+    @ticket_types = @show.chart.ticket_types.box_office
     render :partial => "shows"
   end
 
   private
     def checkout_error(e = nil)
-      Exceptional.context(:params => filter(params))
       unless e.nil? 
-        Exceptional.handle(e, "Sales console checkout")
+        notify_airbrake(e)
         Rails.logger.error(e.backtrace)
         Rails.logger.error(e.message)
       end
@@ -94,6 +96,11 @@ class ConsoleSalesController < ArtfullyOseController
         return false
       end
 
+      if current_sales_console_cart.memberships.any? && payment.is_a?(CompPayment)
+        flash[:error] = "Sorry, we can't process this comp because we can't comp memberships. To comp a membership, please go to the person's record and select Work With -> Comp Membership."
+        return false
+      end
+
       true
     end
 
@@ -153,24 +160,9 @@ class ConsoleSalesController < ArtfullyOseController
       end
     end
 
-    def person
-      return @person unless @person.nil?
-      Person.first_or_create(person_attributes)
-    end
-
-    def person_attributes
-      {
-        :id                => params[:customer][:id],
-        :first_name        => params[:customer][:first_name],
-        :last_name         => params[:customer][:last_name],
-        :email             => params[:customer][:email],
-        :phones_attributes => params[:customer][:phones_attributes],
-        :organization      => current_organization
-      }
-    end
-
     def payment
       @payment ||= Payment.create(params[:payment_method], params)
+      @payment.benefactor = current_user
       @payment
     end
 
@@ -179,4 +171,10 @@ class ConsoleSalesController < ArtfullyOseController
       f = ActionDispatch::Http::ParameterFilter.new filters
       f.filter params
     end
-end
+
+    def subscribe_user_to_list
+      if params[:subscribe] && @checkout.person
+        @checkout.person.subscribe_to_default_mailchimp_list!
+      end
+    end
+end

data/app/controllers/contributions_controller.rb

@@ -1,60 +1,63 @@
 class ContributionsController < ArtfullyOseController
+  before_filter :set_campaigns_and_appeals, :only => [:new, :create, :edit, :update, :index]
+
   def index
-    authorize! :manage, Order
-    request.format = :csv if params[:commit] == "Download"
+    authorize! :view, Order
+    request.format = :csv if params[:commit] == 'Download'
+    @report = DonationSearch.new(current_organization, params.merge(:has_default_range => true))
+    @rows = @report.rows.paginate(:page => params[:page], :per_page => 20)
 
-    #
-    # I hate doing this search two different ways but the CSV just wasn't working with DonationSearch
-    # TODO: make these two methods of getting donations the same
-    #
     respond_to do |format|
-      format.html do
-        @search = DonationSearch.new(params[:start], params[:stop], current_user.current_organization) do |results|
-          #TODO: This sort has got to hurt. Move it into DonationSearch
-          results.sort!{|a,b| b.created_at <=> a.created_at }
-          results.paginate(:page => params[:page], :per_page => 25)
-        end
-      end
+      format.html
+
       format.csv do
         filename = "Artfully-Donations-Export-#{DateTime.now.strftime("%m-%d-%y")}.csv"
-        csv_string = ItemView.where(:product_type => "Donation")
-                             .where('created_at > ? ', params[:start])
-                             .where('created_at < ?',  Sundial.midnightish(current_organization, params[:stop]))
-                             .where('organization_id = ?', current_organization)
-                             .all
-                             .to_comma(:donation)
-        send_data csv_string, :filename => filename, :type => "text/csv", :disposition => "attachment"
-      end      
+        with_campaigns = current_organization.has_kit?(:campaigns)
+        send_data @report.rows.to_comma(with_campaigns ? :with_campaigns : :default),
+                  :filename => filename, :type => "text/csv", :disposition => "attachment"
+      end
+
     end
   end
 
   def new
     @contribution = create_contribution
-    if @contribution.has_contributor?
-      render :new, :layout => false
-    else
-      @contributors = contributors
-      render :find_person
+    @cancel_path = contributions_path
+    if params[:campaign_id].present?
+      @campaign = Campaign.find(params[:campaign_id])
+      @cancel_path = campaign_path(@campaign)
+    elsif @contribution.has_contributor?
+      @cancel_path = person_path(@contribution.contributor)
     end
   end
-  
+
   def edit
     @order = Order.find(params[:id])
     authorize! :edit, @order
     @contribution = Contribution.for(@order)
-    render :layout => false
   end
-  
+
   def update
     @order = Order.find(params[:order_id])
     authorize! :edit, @order
     @contribution = Contribution.for(@order)
     new_contribution = Contribution.new(params[:contribution])
+
+    if !new_contribution.valid?
+      flash[:error] = new_contribution.errors.full_messages.to_sentence
+      render :edit and return
+    end
+
+    person = build_person(new_contribution)
+    if person.valid? && person.save!
+      new_contribution.person_id = person.id #newly created person has precedence over the old one
+    end
+
     @contribution.update(new_contribution)
     flash[:notice] = "Your edits have been saved"
-    redirect_to request.referer
+    redirect_to order_path(@order)
   end
-  
+
   def destroy
     @order = Order.find(params[:id])
     authorize! :edit, @order
@@ -65,28 +68,56 @@ class ContributionsController < ArtfullyOseController
 
   def create
     @contribution = create_contribution
-    @contribution.save
-    redirect_to person_path params_contribution_person_id
-  end
-
-  private
+    if !@contribution.valid?
+      @campaign = Campaign.find(params[:campaign_id]) if params[:campaign_id].present?
+      flash[:error] = @contribution.errors.full_messages.to_sentence
+      render :new and return
+    end
 
-  def contributors
-    if params[:terms].present?
-      people = Person.search_index(params[:terms].dup, current_user.current_organization)
-      flash[:error] = "No people matched your search terms." if people.empty?
+    person = build_person(@contribution)
+    if person.valid? && person.save!
+      @contribution.person_id = person.id #newly created person has precedence over the old one
+    elsif !@contribution.has_contributor?
+      @campaign = Campaign.find(params[:campaign_id]) if params[:campaign_id].present?
+      flash[:error] = person.errors.full_messages.to_sentence
+      render :new and return
     end
-    people || []
+
+    @contribution.save
+    redirect_to params[:campaign_id].present? ? campaign_path(params[:campaign_id]) : person_path(@contribution.person_id)
   end
 
+
   def create_contribution
     params[:contribution] ||= {}
-    contribution = Contribution.new(params[:contribution].merge(:organization_id => current_user.current_organization.id))
+    contribution = Contribution.new(params[:contribution].merge(:organization_id => current_organization.id))
     contribution.occurred_at ||= DateTime.now
+    contribution.commitment_date ||= DateTime.now
     contribution
   end
 
   def params_contribution_person_id
     params[:contribution][:person_id] || params[:contribution][:individual_id] || params[:contribution][:company_id]
   end
-end
+
+  def build_person(contribution)
+    if contribution.first_name.blank? && contribution.last_name.blank? && contribution.company_name.present?
+      Person.new({
+                     :type            => "Company",
+                     :subtype         => "Other",
+                     :email           => contribution.email,
+                     :company_name    => contribution.company_name,
+                     :organization_id => contribution.organization_id
+                 })
+    else
+      Person.new({
+                   :first_name      => contribution.first_name,
+                   :last_name       => contribution.last_name,
+                   :email           => contribution.email,
+                   :company_name    => contribution.company_name,
+                   :organization_id => contribution.organization_id
+               })
+    end
+  end
+
+end