artfully_ose 1.2.0.pre.23 → 1.2.0.pre.24

data/app/controllers/pass_types_controller.rb

@@ -33,6 +33,17 @@ class PassTypesController < ArtfullyOseController
     @pass_type = current_user.current_organization.pass_types.where(:id => params[:id]).first
   end
 
+  def destroy
+    @pass_type = current_user.current_organization.pass_types.where(:id => params[:id]).first
+    if @pass_type.destroyable?
+      @pass_type.destroy
+      flash[:notice] = "We've deleted this pass type"
+    else
+      flash[:error] = "Can't delete this pass type because you've sold some passes for this type."
+    end
+    redirect_to pass_types_path
+  end
+
   def update
     @pass_type = PassType.find(params[:id])
     @pass_type.update_attributes(params[:pass_type])

data/app/controllers/passes_controller.rb

@@ -3,11 +3,50 @@ class PassesController < ArtfullyOseController
   before_filter :load_tags, :only => [:index]
 
   def index
-    @passes = @person.passes.includes(:pass_type)
+    @passes = @person.passes.includes(:pass_type, :tickets).not_expired
+    @expired_passes = @person.passes.includes(:pass_type).expired
+  end
+
+  def bulk_update
+    @person = Person.find(params[:person_id])
+    authorize! :edit, @person
+    extend_passes(params)
+    redirect_to person_passes_path(@person)
+  end
+
+  def reminder
+    @person = Person.find(params[:person_id])
+    authorize! :edit, @person
+    @pass_ids = params['pass_ids']
+
+    if @pass_ids.blank?
+      flash[:error] = "Please select at least one pass to send a reminder for."
+    else
+      @passes = Pass.where(:organization_id => @person.organization.id)
+                    .where(:id => params[:pass_ids])
+                    .all
+      @person.delay.send_pass_summary_email(@passes)
+      flash[:notice] = "We'll get those pass codes out to #{@person} right away!"
+    end
+
+    redirect_to person_passes_path(@person)
   end
 
   private
     def find_person
       @person = current_organization.people.find(params[:person_id])
     end
+
+    def extend_passes(params)  
+      if params[:commit].eql? "Change Expiration"
+        if params[:pass_ids].blank?
+          flash[:error] = "Please select at least one pass to send a reminder for."
+        else
+          params[:pass_ids].each do |pass_id|
+            Pass.find(pass_id).adjust_expiration_to(params[:ends_at])
+          end
+          flash[:notice] = "Passes have been adjusted."
+        end
+      end
+    end
 end

data/app/controllers/people_controller.rb

@@ -50,20 +50,17 @@ class PeopleController < ArtfullyOseController
   def update
     @person = Person.find(params[:id])
     authorize! :edit, @person
-
-    #
-    # 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,{}))
-    results = @person.update_attributes(person_params)
+    flash[:notice] = []
+    results = @person.update_attributes(person_update_params)
+    @person.relationships.where(:inverse_id => nil).map(&:ensure_inverse)
 
     respond_to do |format|
       format.html do
         if results
           @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.full_messages.to_sentence
+          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
         end
         redirect_to_person(@person, params)
@@ -87,13 +84,13 @@ class PeopleController < ArtfullyOseController
 
     if is_search(params)
       @people = Person.search_index(params[:search].dup, current_user.current_organization)
-      @show_advanced_search_message = @people.length > 20      
+      @show_advanced_search_message = @people.length > 20
     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
@@ -115,10 +112,15 @@ class PeopleController < ArtfullyOseController
     authorize! :edit, @person
 
     type = params[:type]
-    starable = params[:type].classify.constantize.find(params[:action_id])
+    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.starred = ! starable.starred?
-    starable.save
   end
 
   def edit
@@ -173,8 +175,8 @@ class PeopleController < ArtfullyOseController
   private
     def is_search(params)
       params[:commit].present?
-    end    
-    
+    end
+
     def without_winner
       if params[:winner]
         @winner = Person.find(params[:winner])
@@ -184,4 +186,18 @@ 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

data/app/controllers/relationships_controller.rb

@@ -0,0 +1,15 @@
+class RelationshipsController < ArtfullyOseController
+
+  before_filter :load_tags
+
+  def index
+    @person = Person.find(params_person_id)
+
+    if params[:relation_id].present?
+      @relationships = @person.relationships.where(:relation_id => params[:relation_id].to_i)
+    else
+      @relationships = @person.relationships
+    end
+  end
+
+end

data/app/controllers/sales_controller.rb

@@ -30,21 +30,21 @@ class SalesController < ArtfullyOseController
       render :js => "window.location = '#{new_event_show_sales_path(@event, @show)}'"
       return
     end
-    
+
     render :json => @sale.as_json
                          .merge(:total => @sale.cart.total)
                          .merge(:tickets_remaining => tickets_remaining)
-                         .merge(:door_list_rows => door_list_rows), 
+                         .merge(:door_list_rows => door_list_rows),
                          :status => 200
   end
 
   def checking_out?
     !params[:commit].blank?
   end
-  
+
   def door_list_rows
     door_list_rows = []
-    
+
     @sale.tickets.each_with_index do |ticket, i|
       ticket.reload
       if ticket.sold? || ticket.comped?
@@ -71,7 +71,7 @@ class SalesController < ArtfullyOseController
       end
       remaining
     end
-    
+
     def setup_defaults
       params[:anonymous]   = true
       params[:cash]        = true
@@ -108,13 +108,13 @@ class SalesController < ArtfullyOseController
 
       #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)
       end
-      
+
       @person
     end
 
@@ -124,7 +124,7 @@ class SalesController < ArtfullyOseController
         :first_name   =>  params[:person][:first_name],
         :last_name    =>  params[:person][:last_name],
         :email        =>  params[:person][:email],
-        :organization =>  current_organization   
+        :organization =>  current_organization
       }
     end
 
@@ -135,7 +135,7 @@ class SalesController < ArtfullyOseController
       params[:person][:email].blank?
     end
 
-    def payment                    
+    def payment
       if Swiper.can_parse? params[:credit_card][:number]
         swiped_data = Swiper.parse(params[:credit_card][:number])
         params[:credit_card][:name] = swiped_data.track1.cardholder_name
@@ -143,14 +143,14 @@ class SalesController < ArtfullyOseController
         params[:credit_card][:month] = swiped_data.track1.expiration_month
         params[:credit_card][:year] = swiped_data.track1.expiration_year
       end
-      
+
       params[:benefactor] = current_user
-      
+
       payment = Payment.create(params[:payment_method], params)
       payment.customer = person
       payment
     end
-  
+
     def has_card_info?
       params[:credit_card].present? and params[:credit_card][:card_number].present?
     end

data/app/controllers/searches_controller.rb

@@ -29,7 +29,7 @@ class SearchesController < ApplicationController
     prepare_form
     prepare_people
     respond_to do |format|
-      format.html { @people = @people.paginate(:page => params[:page], :per_page => 20) }
+      format.html { @people = @people.paginate(:page => params[:page], :per_page => (params[:per_page] || 20)) }
       format.csv  { render :csv => Person.where(:id => @people.collect(&:id)).includes(:phones, :address, :tags).order('lower(people.last_name)'), :filename => "#{@search.id}-#{DateTime.now.strftime("%m-%d-%y")}" }
     end
   end

data/app/controllers/shows_controller.rb

@@ -110,18 +110,19 @@ class ShowsController < ArtfullyOseController
     @show = Show.find(params[:id])
     authorize! :destroy, @show
 
-    if @show.destroy
+    if @show.delayed_destroy
       respond_to do |format|
         format.html do |f|
-          redirect_to event_shows_url(@show.event), :notice => 'Your show has been deleted.'
+          redirect_to event_shows_url(@show.event), :notice => 'Your show will be deleted in a few minutes.'
         end
         format.json { render :nothing => true, :status => 204 and return  }
       end
     else
-      render :status => :forbidden and return
+      flash[:error] = "Sorry, this show can not be deleted. Contact support for further help."
+      redirect_to show_path(@show)
     end
   end
-
+  
   def door_list
     @show = Show.find(params[:id])
     @event = @show.event
@@ -137,6 +138,11 @@ class ShowsController < ArtfullyOseController
         @csv_string = @door_list.items.to_comma
         send_data @csv_string, :filename => @filename, :type => "text/csv", :disposition => "attachment"
       end
+      
+      format.pdf do
+        pdf = render_to_string :pdf => "door_list.pdf.haml"
+        send_data pdf, :filename => @filename, :type => "application/pdf", :disposition => "attachment"
+      end
     end
   end
 

data/app/controllers/slices_controller.rb

@@ -8,7 +8,8 @@ class SlicesController < ArtfullyOseController
                         ["Payment Method",          "payment_method_proc"],
                         ["Ticket Type",             "ticket_type_proc"],
                         ["Discount",                "discount_code_proc"],
-                        ["First time/Repeat",       "first_time_buyer_proc"]
+                        ["First time/Repeat",       "first_time_buyer_proc"],
+                        ["Validated",               "validated_proc"]
                       ]
   end
 
@@ -32,6 +33,6 @@ class SlicesController < ArtfullyOseController
     @show = Show.includes(:event, :tickets => [:items => :order]).find(params[:statement_id])
     @total_tickets = @show.tickets.select{|t| t.sold?}.size + @show.tickets.select{|t| t.comped?}.size
     authorize! :view, @show.event
-    @items = Item.includes(:product, :order, :show => :event).where(:show_id => params[:statement_id])
+    @items = Item.includes({:product => :ticket_type}, :discount, :order, :show => :event).where(:show_id => params[:statement_id])
   end
 end

data/app/controllers/statements_controller.rb

@@ -15,7 +15,7 @@ class StatementsController < ArtfullyOseController
   end
 
   def show
-    @show = ::Show.includes(:event => :venue, :items => [:order, :discount, :product => :section]).find(params[:id])
+    @show = ::Show.includes(:event => :venue, :items => [:order, :discount, :product => :ticket_type, :pass => :pass_type]).find(params[:id])
     authorize! :view, @show
     @event = @show.event
     @shows = @event.shows.includes(:event => :venue)

data/app/controllers/store/memberships_controller.rb

@@ -1,13 +1,16 @@
 class Store::MembershipsController < Store::StoreController
   def show
-    @membership_types = [MembershipType.find(params[:id])]
+    membership_type = MembershipType.sales_valid.find(params[:id])
+    @membership_types = [membership_type]
     @membership_kit = MembershipKit.where(:organization_id => store_organization.id).first
     render :index
+  rescue ActiveRecord::RecordNotFound 
+    raise ActionController::RoutingError.new("Not Found")
   end
 
   def index
     render :nothing => true unless store_organization.can? :access, :membership
-    @membership_types = store_organization.membership_types.storefront.order('price desc')
+    @membership_types = store_organization.membership_types.storefront.sales_valid.order('price desc')
     @membership_kit = MembershipKit.where(:organization_id => store_organization.id).first
   end
 end

data/app/controllers/store/orders_controller.rb

@@ -8,8 +8,7 @@ class Store::OrdersController < Store::StoreController
     handler.handle_donation(params, @store_organization)
     handler.handle_memberships(params, current_member)
     handler.handle_passes(params)
-    handler.handle_discount(params)
-    handler.apply_pass(params)
+    handler.handle_discount_or_pass_code(params)
 
     flash[:alert] = handler.error unless handler.error.blank?
 
@@ -26,20 +25,22 @@ class Store::OrdersController < Store::StoreController
       end
     end
 
-    if member_signed_in?
-      params[:first_name] ||= current_member.person.first_name
-      params[:last_name]  ||= current_member.person.last_name
-      params[:email]      ||= current_member.person.email
-      params[:phone]      ||= current_member.person.phones.first.try(:number)
+    person = current_member.try(:person) || current_cart.applied_pass.try(:person)     
+    if person.present?
+      params[:first_name] ||= person.first_name
+      params[:last_name]  ||= person.last_name
+      params[:email]      ||= person.email
+      params[:phone]      ||= person.phones.first.try(:number)
 
       params[:address]    ||= {}
-      params[:address][:address1] = current_member.person.address.try(:address1)
-      params[:address][:country] = current_member.person.address.try(:country)
-      params[:address][:city] = current_member.person.address.try(:city)
-      params[:address][:state] = current_member.person.address.try(:state)
-      params[:address][:zip] = current_member.person.address.try(:zip)
-
+      params[:address][:address1] = person.address.try(:address1)
+      params[:address][:country] =  person.address.try(:country)
+      params[:address][:city] =     person.address.try(:city)
+      params[:address][:state] =    person.address.try(:state)
+      params[:address][:zip] =      person.address.try(:zip)
     end
+    
+    @enter_code_string = (store_organization.can?(:access, :passes) ? "Use Discount or Pass Code" : "Use Discount Code")
   end
 
   def destroy

data/app/controllers/store/retrievals_controller.rb

@@ -0,0 +1,29 @@
+class Store::RetrievalsController < Store::StoreController
+  def index
+
+  end
+
+  def create
+    @person = @store_organization.people.where(:email => params[:email]).first
+
+    return fail if @person.nil?
+
+    @passes = Pass.where(:organization_id => @store_organization.id)
+                    .where(:person_id => @person.id)
+                    .not_expired
+                    .all
+    
+    return fail if @passes.empty?
+
+    @person.delay.send_pass_summary_email(@passes)
+
+    flash[:notice] = "Your reminder has been sent"
+    render "index"
+  end
+
+  private
+    def fail
+      flash[:error] = "We couldn't send a reminder email because we can't find your pass. If you think this is an error then please email us at #{@store_organization.email}"
+      render "index"
+    end
+end

data/app/helpers/artfully_ose_helper.rb

@@ -72,13 +72,13 @@ module ArtfullyOseHelper
     selected_object.try(:id) == menu_object.id ? "active" : "unselected"
   end
   
-  #For use with Bootstraps icon %i classes
+  #For use with Font Awesome icon %i classes
   def icon_link_to(text, href, icon, class_names, id, html_attributes={})
     s = "<a href='#{href}' class='#{class_names}' id='#{id}' "
     html_attributes.each do |k,v|
       s = s + " #{k}=#{v} "  
     end
-    s = s + "><i class='#{icon}'></i> #{text}</a>"
+    s = s + "><i class='fa #{icon}'></i> #{text}</a>"
     s.html_safe
   end
   
@@ -221,7 +221,6 @@ module ArtfullyOseHelper
     options =
       [
         content_tag(:option, " --- All Events --- ", :value => ""),
-        content_tag(:option, "", :value => ""),
         options_from_collection_for_select(events, :id, :name, default)
       ].join
 
@@ -232,7 +231,6 @@ module ArtfullyOseHelper
     options =
       [
         content_tag(:option, " --- All Shows --- ", :value => ""),
-        content_tag(:option, "", :value => ""),
         shows.map do |show|
           selected = "selected" if show.id == default.to_i
           content_tag(:option, l(show.datetime_local_to_event), :value => show.id, :selected => selected)
@@ -241,6 +239,16 @@ module ArtfullyOseHelper
 
     select_tag show_id, raw(options), :class => "span3"
   end
+  
+  def select_membership_type_for_sales_search(membership_types, membership_type_id, default)
+    options =
+      [
+        content_tag(:option, " --- All Membership Types --- ", :value => ""),
+        options_from_collection_for_select(membership_types, :id, :name, default)
+      ].join
+
+    select_tag membership_type_id, raw(options), :class => "span3"
+  end
 
   def nav_dropdown(text, link='#')
     link_to ERB::Util.html_escape(text) + ' <b class="caret"></b>'.html_safe, link, :class => 'dropdown-toggle', 'data-toggle' => 'dropdown'