artfully_ose 1.2.0.beta.1 → 1.2.0.pre

data/app/controllers/refunds_controller.rb

@@ -9,10 +9,14 @@ class RefundsController < ArtfullyOseController
     @items = params[:items].collect { |item_id| Item.find(item_id) }
 
     @refund = Refund.new(@order, @items)
-    @refund.submit(:and_return => return_items?, :send_email_confirmation => send_email_confirmation?)
+    @refund.submit(:and_return => return_items?)
 
     if @refund.successful?
-      flash[:notice] = "Successfully refunded #{@refund.items.size} items."
+      if return_items?
+        flash[:notice] = "Successfully refunded and returned #{@refund.items.size} items."
+      else
+        flash[:notice] = "Successfully refunded #{@refund.items.size} items."
+      end
     else
       if @refund.message.nil?
         flash[:error] = "Unable to refund items.  Please contact support and we'll try to help!"
@@ -26,11 +30,7 @@ class RefundsController < ArtfullyOseController
 
   private
 
-  def send_email_confirmation?
-    params[:send_email_confirmation] == "1"
-  end
-
   def return_items?
-    params[:return_to_inventory] == "1"
+    @return_items ||= (params[:commit] == "Issue Refund and Return" and @items.all?(&:returnable?))
   end
 end

data/app/controllers/sales_controller.rb

@@ -1,77 +1,47 @@
 class SalesController < ArtfullyOseController
   include CartFinder
   before_filter :find_event, :find_show, :find_people, :find_dummy
-  before_filter :create_door_list, :only => ['show', 'new', 'door_list']
+  before_filter :create_door_list, :only => ['show', 'new']
 
   def show
-    redirect_to new_event_show_sales_path(@event,@show,:render => 'boxoffice')
+    redirect_to new_event_show_sales_path(@event, @show)
   end
 
   def new
     @person = Person.new
-    @sale = Sale.new(@show, @show.chart.ticket_types.box_office, current_box_office_cart, {})
+    @sale = Sale.new(@show, @show.chart.ticket_types.box_office, current_cart.becomes(BoxOffice::Cart), {})
     @tickets_remaining = tickets_remaining
     setup_defaults
-    response.headers["Cache-Control"] = "no-cache, no-store, max-age=0, must-revalidate" # http://stackoverflow.com/a/5493543/2063202
   end
 
   def create
-    current_box_office_cart.clear!
-
-    @sale = Sale.new(@show, @show.chart.ticket_types.box_office, current_box_office_cart, params[:quantities], params[:order_notes])
-
-    # handle donation
-    if params[:donation].present? && params[:donation].to_i > 0
-      donation                 = Donation.new
-      donation.amount          = params[:donation].to_i * 100
-      donation.organization_id = @event.organization_id
-      current_box_office_cart.donations << donation
-    end
-
-    # handle discount
-    begin
-      discount = Discount.find_by_code_and_event_id(params[:discount].upcase, @event)
-      discount.apply_discount_to_cart(current_box_office_cart)
-    rescue RuntimeError => e
-      discount_error = e.message
-    rescue NoMethodError => e
-      discount_error = "We could not find your discount. Please try again." if params[:discount].present?
-    end
-
+    current_cart.becomes(BoxOffice::Cart).clear!
+    @sale = Sale.new(@show, @show.chart.ticket_types.box_office, current_cart.becomes(BoxOffice::Cart), params[:quantities])
     if checking_out?
       if @sale.sell(payment)
-        @sale.message = "Sold #{self.class.helpers.pluralize(@sale.tickets.length, 'ticket')}.  Order total was #{self.class.helpers.number_as_cents @sale.order.total}"
-
-        if params[:auto_check_in].present?
-          @sale.tickets.map {|t| t.reload; t.validate_ticket!(current_user)}
-        end
+        @sale.message = "Sold #{self.class.helpers.pluralize(@sale.tickets.length, 'ticket')}.  Order total was #{self.class.helpers.number_as_cents @sale.cart.total}"
       end
     end
 
     unless @sale.errors.empty?
       @sale.error = "#{@sale.errors.full_messages.to_sentence.capitalize}."
-      flash[:error] = @sale.error
-      Ticket.unlock(@sale.tickets, @sale.cart)
-      render :js => "window.location = '#{new_event_show_sales_path(@event,@show,:render => 'boxoffice')}'"
-      return
+      ExpireTicketJob.new(@sale.cart.tickets).perform
     end
-
+    
     render :json => @sale.as_json
                          .merge(:total => @sale.cart.total)
                          .merge(:tickets_remaining => tickets_remaining)
-                         .merge(:door_list_rows => door_list_rows)
-                         .merge(:discount_error => discount_error)
-                         .merge(:discount_amount => current_box_office_cart.discount_amount),
+                         .merge(:door_list_rows => door_list_rows), 
                          :status => 200
   end
 
   def checking_out?
-    params[:commit].present?
+    !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?
@@ -88,22 +58,17 @@ class SalesController < ArtfullyOseController
     door_list_rows
   end
 
-  def door_list
-    # create_door_list
-    render :partial => "sales/doorlist"
-  end
-
   private
 
     # TODO: this should be pulled into TicketTypeSerializer
     def tickets_remaining
       remaining = {}
       @sale.ticket_types.each do |ticket_type|
-        remaining[ticket_type.id] = ticket_type.available("box_office")
+        remaining[ticket_type.id] = ticket_type.available
       end
       remaining
     end
-
+    
     def setup_defaults
       params[:anonymous]   = true
       params[:cash]        = true
@@ -136,28 +101,29 @@ class SalesController < ArtfullyOseController
     end
 
     def person
+      Rails.logger.debug("~~~~~~~~~~~~~~~~~~~~~~~~ PERSON ID: [#{params[:person][:id]}]")
+
       return @person unless @person.nil?
 
       #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
 
     def person_attributes
       {
-        :id                => params[:person][:id],
-        :first_name        => params[:person][:first_name],
-        :last_name         => params[:person][:last_name],
-        :email             => params[:person][:email],
-        :phones_attributes => params[:person][:phones_attributes],
-        :organization      => current_organization
+        :id           =>  params[:person][:id],
+        :first_name   =>  params[:person][:first_name],
+        :last_name    =>  params[:person][:last_name],
+        :email        =>  params[:person][:email],
+        :organization =>  current_organization   
       }
     end
 
@@ -168,7 +134,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
@@ -176,19 +142,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
-
-      # set payment as cash if total is 0 (e.g. free tickets)
-      if params[:payment_method].blank? && params[:total] == '0'
-        payment = Payment.create('cash', params)
-      else
-        payment = Payment.create(params[:payment_method], params)
-      end
+      
+      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

@@ -6,9 +6,8 @@ class SearchesController < ApplicationController
   def new
     authorize! :view, Search
     @search = Search.new(params[:search])
-    @membership_types = current_user.current_organization.membership_types.all
-    @pass_types       = current_user.current_organization.pass_types.all
-    prepare_form
+    @membership_types = MembershipType.all
+    prepare_search_and_people
   end
 
   def create
@@ -23,15 +22,13 @@ class SearchesController < ApplicationController
     @search = Search.find(params[:id])
     authorize! :view, @search
     @segment = Segment.new
-    @membership_types = current_user.current_organization.membership_types.all
-    @pass_types       = current_user.current_organization.pass_types.all
+    @membership_types = MembershipType.all
     session[:return_to] ||= request.referer # Record the current page, in case creating a list segment fails.
-    prepare_form
-    prepare_people
+    prepare_search_and_people
     respond_to do |format|
-      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
+     format.html
+     format.csv { render :csv => @search.people, :filename => "#{@search.id}-#{DateTime.now.strftime("%m-%d-%y")}" }
+   end
   end
 
   def tag
@@ -44,13 +41,10 @@ class SearchesController < ApplicationController
 
   private
 
-    def prepare_form
+    def prepare_search_and_people
       @event_options = Event.options_for_select_by_organization(@current_user.current_organization)
-      @event_options.unshift(["Any Event", Search::ANY_EVENT])
-    end
-
-    def prepare_people
       @people = @search.people
+      @people = @people.paginate(:page => params[:page], :per_page => 20)
     end
 
     def load_discount_codes

data/app/controllers/sections_controller.rb

@@ -34,7 +34,7 @@ class SectionsController < ArtfullyOseController
     @qty = params[:quantity].to_i
     @section = Section.find(params[:id])
     @section.put_on_sale @qty
-    flash[:notice] = "Tickets are now on sale"
+    flash[:notice] = "Tickets in section #{@section.name} are now on sale"
     redirect_to event_show_path(@section.chart.show.event, @section.chart.show)
   end
   
@@ -42,7 +42,7 @@ class SectionsController < ArtfullyOseController
     @qty = params[:quantity].to_i
     @section = Section.find(params[:id])
     @section.take_off_sale @qty
-    flash[:notice] = "Tickets are now off sale"
+    flash[:notice] = "Tickets in section #{@section.name} are now off sale"
     redirect_to event_show_path(@section.chart.show.event, @section.chart.show)
   end
 

data/app/controllers/segments_controller.rb

@@ -9,11 +9,11 @@ class SegmentsController < ArtfullyOseController
   def show
     @segment = Segment.find(params[:id])
     authorize! :view, @segment
-    @people = @segment.people
+    @people = @segment.people.paginate(:page => params[:page], :per_page => 20)
     respond_to do |format|
-      format.html { @people = @people.paginate(:page => params[:page], :per_page => 20) }
-      format.csv  { render :csv => Person.where(:id => @people.collect(&:id)).includes(:phones, :address, :tags).order('lower(people.last_name)'), :filename => "#{@segment.name}-#{DateTime.now.strftime("%m-%d-%y")}" }
-    end
+     format.html
+     format.csv { render :csv => @segment.people, :filename => "#{@segment.name}-#{DateTime.now.strftime("%m-%d-%y")}" }
+   end
   end
 
   def create

data/app/controllers/shows_controller.rb

@@ -1,34 +1,16 @@
 class ShowsController < ArtfullyOseController
-  before_filter :find_event, :only => [ :index, :calendar, :show, :new, :edit, :duplicate, :on_sale, :off_sale, :destroy ]
+  before_filter :find_event, :only => [ :index, :calendar, :show, :new, :edit, :duplicate ]
   before_filter :check_for_charts, :only => [ :index, :new ]
+  before_filter :upcoming_shows, :only => [ :index, :show ]
 
   rescue_from CanCan::AccessDenied do |exception|
     flash[:alert] = exception.message
-    redirect_to event_url(@event)
+    redirect_to event_url(@show.event)
   end
 
   def index
     authorize! :manage, @event
-    set_page_vars
-
-    @month_years =  @event.shows.pluck(:datetime).group_by {|d| d.strftime "%b %Y"}.keys
-
-    shows_rel = Show.where(:event_id => @event.id)
-    page_size = 25
-
-
-    if monthly? && valid_month?
-      start = DateTime.now
-                      .change(:year => year, :month => month, :day => 1, :offset => offset)
-                      .beginning_of_day
-      shows_rel = shows_rel.where('datetime > ?', start).where('datetime < ?', start + 1.month)
-      page_size = 1000
-    elsif upcoming?
-      shows_rel = shows_rel.where('datetime > ?', Time.now - 2.days)
-    end
-
-    @shows = shows_rel.order('datetime ASC')
-                      .paginate(:page => params[:page], :per_page => page_size)
+    @shows = Show.where(:event_id => @event.id).includes(:tickets, :chart, :event => :venue).order('datetime ASC')
   end
 
   def new
@@ -110,19 +92,18 @@ class ShowsController < ArtfullyOseController
     @show = Show.find(params[:id])
     authorize! :destroy, @show
 
-    if @show.delayed_destroy
+    if @show.destroy
       respond_to do |format|
         format.html do |f|
-          redirect_to event_shows_url(@show.event), :notice => 'Your show will be deleted in a few minutes.'
+          redirect_to event_shows_url(@show.event), :notice => 'Your show has been deleted.'
         end
         format.json { render :nothing => true, :status => 204 and return  }
       end
     else
-      flash[:error] = "Sorry, this show can not be deleted. Contact support for further help."
-      redirect_to event_path(@event)
+      render :status => :forbidden and return
     end
   end
-  
+
   def door_list
     @show = Show.find(params[:id])
     @event = @show.event
@@ -138,11 +119,6 @@ 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
 
@@ -168,53 +144,59 @@ class ShowsController < ArtfullyOseController
     end
   end
 
-  def on_sale
-    @qty = params[:quantity].to_i
-    @show = Show.find(params[:id])
-    @section = @show.chart.sections.first
-    @section.put_on_sale @qty
-    @show.refresh_stats
-    flash[:notice] = "Tickets are now on sale"
-    redirect_to request.referer
-  end
-  
-  def off_sale
-    @qty = params[:quantity].to_i
-    @show = Show.find(params[:id])
-    @section = @show.chart.sections.first
-    @section.take_off_sale @qty
-    @show.refresh_stats
-    flash[:notice] = "Tickets are now off sale"
-    redirect_to request.referer
-  end
+  def built
+    @show = Show.find(params[:show_id])
+    authorize! :edit, @show
 
-  private
+    @event = @show.event
+    authorize! :create_tickets, @show.chart.sections
 
-    #view needs these variables set
-    def set_page_vars
-      all?
-      upcoming?
-      monthly?
-    end
+    @show.build!
 
-    def all?
-      @all ||= (params[:range].present? && params[:range].to_sym == :all)
+    respond_to do |format|
+      format.html { redirect_to event_show_url(@event, @show) }
+      format.json { render :json => @show.as_json.merge('glance' => @show.glance.as_json) }
     end
+  end
 
-    def upcoming?
-      @upcoming ||= !params[:range].present? && !params[:year].present?
-    end
+  def on_sale
+    authorize! :bulk_edit, Ticket
+    with_confirmation do
+      @show = Show.find(params[:show_id])
+
+      if @show.bulk_on_sale(:all)
+        @show.publish!
+        notice = "Put all tickets on sale."
+      else
+        error = "Tickets that have been sold or comped can't be put on or taken off sale. A ticket that is already on sale or off sale can't be put on or off sale again."
+      end
+
+      respond_to do |format|
+        format.html do
+          flash[:notice] = notice
+          flash[:error] = error
+          redirect_to event_show_url(@show.event, @show)
+        end
+
+        format.json do
+          if error.blank?
+            render :json => @show.as_json.merge('glance' => @show.glance.as_json)
+          else
+            render :json => { :errors => [ error ] }, :status => 409
+          end
+        end
 
-    def monthly?
-      @monthly ||= params[:year].present? && params[:month].present?
+      end
     end
+  end
 
+  private
     def find_event
       @event = Event.includes(:shows => [:event => :venue]).find(params[:event_id])
     end
 
-    def valid_month?
-      Date::MONTHNAMES.reject{|m| m.nil?}.map{|m| m[0..2] unless m.nil?}.include?(params[:month])
+    def upcoming_shows
+      @upcoming = @event.upcoming_shows
     end
 
     def with_confirmation
@@ -235,16 +217,4 @@ class ShowsController < ArtfullyOseController
       end
     end
 
-    def year
-      params[:year].to_i
-    end
-
-    def month
-      DateTime.parse(params[:month]).month
-    end
-
-    def offset
-      ActiveSupport::TimeZone.create(@event.time_zone).formatted_offset
-    end
-
 end