artfully_ose 1.0.0.rc4 → 1.1.0.rc1

data/app/controllers/shows_controller.rb

@@ -10,7 +10,7 @@ class ShowsController < ArtfullyOseController
 
   def index
     authorize! :manage, @event
-    @shows = Show.where(:event_id => @event.id).includes(:tickets).includes(:chart).order('datetime ASC')
+    @shows = Show.where(:event_id => @event.id).includes(:tickets, :chart, :event => :venue).order('datetime ASC')
   end
 
   def duplicate
@@ -29,28 +29,39 @@ class ShowsController < ArtfullyOseController
   def create
     @event = Event.find(params[:event_id])
     @show = @event.next_show
-    
-    chart_params = params[:show].delete(:chart)    
-    if(chart_params.nil? || chart_params.empty?)
-      flash[:error] = "Please specify at least one price level for your show."
-      render :new and return
+    (render :new and return) unless valid_datetime?
+    ActiveRecord::Base.transaction do
+      chart_params = params[:show].delete(:chart) 
+      if(chart_params.nil? || chart_params.empty?)
+        flash[:error] = "Please specify at least one ticket type for your show."
+        render :new and return
+      end
+      
+      #clear the sections and replace them with whatever they entered
+      @show.chart.sections = []
+      @show.chart.update_attributes_from_params(chart_params)
+      @show.update_attributes(params[:show])
+      @show.organization = current_organization
+      @show.chart_id = @show.chart.id
+      @show.datetime = ActiveSupport::TimeZone.create(@event.time_zone).parse(params[:show][:datetime])
+
+      if @show.go!(publishing_show?)      
+        flash[:notice] = "Show created on #{l @show.datetime_local_to_event, :format => :date_at_time}"
+        redirect_to event_show_path(@event, @show)
+      else      
+        flash[:error] = "There was a problem creating your show: #{@show.errors.full_messages.reject{|e| e.end_with? "be blank"}.to_sentence}"
+        render :new
+        raise ActiveRecord::Rollback
+      end
     end
-    
-    #clear the sections and replace them with whatever they entered
-    @show.chart.sections = []
-    @show.chart.update_attributes_from_params(chart_params)
-    @show.update_attributes(params[:show])
-    @show.organization = current_organization
-    @show.chart_id = @show.chart.id
-    @show.datetime = ActiveSupport::TimeZone.create(@event.time_zone).parse(params[:show][:datetime])
-
-    if @show.go!(publishing_show?)      
-      flash[:notice] = "Show created on #{l @show.datetime_local_to_event, :format => :date_at_time}"
-      redirect_to event_show_path(@event, @show)
-    else  
-      flash[:error] = "There was a problem creating your show: #{@show.errors.full_messages.reject{|e| e.end_with? "be blank"}.to_sentence}"
-      render :new
+  end
+
+  def valid_datetime?
+    if ActiveSupport::TimeZone.create(@event.time_zone).parse(params[:show][:datetime]) < Time.now
+      flash[:error] = "Please pick a date and time that is in the future."
+      return false
     end
+    true
   end
   
   def publishing_show?
@@ -58,11 +69,9 @@ class ShowsController < ArtfullyOseController
   end
 
   def show
-    @show = Show.find(params[:id])
+    @show = Show.includes(:event => :venue, :tickets => :section).find(params[:id])
     authorize! :view, @show
-
-    @show.tickets = @show.tickets
-    @tickets = @show.tickets.includes(:section)
+    @tickets = @show.tickets
   end
 
   def edit
@@ -125,7 +134,7 @@ class ShowsController < ArtfullyOseController
       @show.publish!
       respond_to do |format|
         format.html { redirect_to event_show_url(@show.event, @show), :notice => 'Your show is now published.' }
-        format.json { render :json => @show.as_json.merge('glance' => @show.glance.as_json) }
+        format.json { render :json => @show.as_json }
       end
     end
   end
@@ -138,7 +147,7 @@ class ShowsController < ArtfullyOseController
       @show.unpublish!
       respond_to do |format|
         format.html { redirect_to event_show_url(@show.event, @show), :notice => 'Your show is now unpublished.' }
-        format.json { render :json => @show.as_json.merge('glance' => @show.glance.as_json) }
+        format.json { render :json => @show.as_json }
       end
     end
   end
@@ -192,7 +201,7 @@ class ShowsController < ArtfullyOseController
 
   private
     def find_event
-      @event = Event.includes(:shows).find(params[:event_id])
+      @event = Event.includes(:shows => [:event => :venue]).find(params[:event_id])
     end
 
     def upcoming_shows

data/app/controllers/slices_controller.rb

@@ -0,0 +1,37 @@
+class SlicesController < ArtfullyOseController
+  before_filter :load_statement
+
+  def index
+    @select_options = [ 
+                        ["", ""],
+                        ["Location",                "order_location_proc"],
+                        ["Payment Method",          "payment_method_proc"],
+                        ["Ticket Type",             "ticket_type_proc"],
+                        ["Discount",                "discount_code_proc"],
+                        ["First time/Repeat",       "first_time_buyer_proc"]
+                      ]
+  end
+
+  #
+  # TODO TODO TODO
+  # - Dollar amounts on ticket types
+  # - Select all drop downs then de-select them
+  #
+
+  def data    
+    # convert URL string slice[] into procs
+    slices = Array.wrap(params[:slice]).map { |s| Slices.send(s) }
+    data = Slicer.slice(Slice.new("All Sales"), @items, slices)
+
+    respond_to do |format|
+      format.json { render :json => data.children }
+    end
+  end
+
+  def load_statement
+    @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])
+  end
+end

data/app/controllers/statements_controller.rb

@@ -5,7 +5,7 @@ class StatementsController < ArtfullyOseController
     if params[:event_id].present?
       @event = Event.find(params[:event_id])
       authorize! :view, @event
-      @played = @event.played_shows(:all)
+      @shows = @event.shows
       @statement = nil
       render :show and return
     else
@@ -15,11 +15,11 @@ class StatementsController < ArtfullyOseController
   end
 
   def show
-    @show = Show.find(params[:id])
+    @show = ::Show.includes(:event => :venue, :items => [:order, :discount, :product => :section]).find(params[:id])
     authorize! :view, @show
     @event = @show.event
-    @played = @event.played_shows(:all)
-    @statement = Statement.for_show(@show, current_user.current_organization)
+    @shows = @event.shows.includes(:event => :venue)
+    @statement = Statement.for_show(@show, @show.imported?)
   end
 
 end

data/app/controllers/store/checkouts_controller.rb

@@ -8,23 +8,25 @@ class Store::CheckoutsController < Store::StoreController
 
     @payment = CreditCardPayment.new(params[:payment])
     @payment.user_agreement = params[:payment][:user_agreement]
-    current_cart.special_instructions = params[:special_instructions] 
+    current_cart.special_instructions = params[:special_instructions]
     
     @checkout = Checkout.new(current_cart, @payment)
 
     if @checkout.valid? && @checkout.finish
       render :json => @checkout.to_json
-    else
-      message = @payment.errors.full_messages.to_sentence.downcase
-      message = message.gsub('customer', 'contact info')
-      message = message.gsub('credit card is', 'payment details are')
-      message = message[0].upcase + message[1..message.length] unless message.blank? #capitalize first word
-      
-      if message.blank?
-        message = "We had a problem contacting our payment processor.  Wait a few moments and try again or contact us to complete your purchase"
-      end
-      
-      render :json => message, :status => :unprocessable_entity
+    else      
+      render :json => @checkout.message, :status => :unprocessable_entity
     end
+  rescue Exception => e
+    Exceptional.context(:params => filter(params))
+    Exceptional.handle(e, "Checkout failed!")
+    message = "We're sorry but we could not process the sale.  Please make sure all fields are filled out accurately"
+    render :json => message, :status => :unprocessable_entity
+  end
+
+  def filter(params)
+    filters = Rails.application.config.filter_parameters
+    f = ActionDispatch::Http::ParameterFilter.new filters
+    f.filter params
   end
 end

data/app/controllers/store/events_controller.rb

@@ -1,5 +1,5 @@
 class Store::EventsController < Store::StoreController
   def show
-    @event = Event.find(params[:id])
+    @event = Event.includes(:venue, :shows => [:chart => :sections]).find(params[:id])
   end
 end

data/app/controllers/store/orders_controller.rb

@@ -25,18 +25,37 @@ class Store::OrdersController < Store::StoreController
       order_params = order_params.merge(:tickets => ticket_ids) if ticket_ids.any?
     end
     order_params = order_params.merge(:donation => params[:donation]) if params[:donation]
+
     handle_order(order_params)
+    if params[:discount].present?
+      begin
+        handle_discount(params)
+      rescue RuntimeError => e
+        discount_error = e.message
+        params[:discount] = nil
+        @discount_amount = 0
+      rescue NoMethodError => e
+        discount_error = "We could not find your discount. Please try again."
+        params[:discount] = nil
+        @discount_amount = 0
+      end
+    end
 
     response = current_cart.as_json
     response = response.merge(:total => current_cart.total)
     response = response.merge(:service_charge => current_cart.fee_in_cents)
-    response = response.merge(:over_section_limit => over_section_limit).to_json
-    render :json => response
+    response = response.merge(:over_section_limit => over_section_limit)
+    response = response.merge(:discount_error => discount_error)
+    if params[:discount].present? && discount_error.blank?
+      response = response.merge(:discount_name => params[:discount])
+      response = response.merge(:discount_amount => current_cart.discount_amount)
+    end
+    render :json => response.to_json
   end
 
   private
 
-    def handle_order(params)        
+    def handle_order(params)
       handle_tickets(params[:tickets]) if params.has_key? :tickets
       handle_donation(params[:donation]) if params.has_key? :donation
 
@@ -45,6 +64,12 @@ class Store::OrdersController < Store::StoreController
       end
     end
 
+    def handle_discount(params)
+      discount = Discount.find_by_code_and_event_id(params[:discount].upcase, event.id)
+      discount.apply_discount_to_cart(current_cart)
+      current_cart = discount.cart
+    end
+
     def handle_tickets(ids)
       Ticket.find(ids).each do |ticket|
         if current_cart.can_hold? ticket
@@ -62,10 +87,12 @@ class Store::OrdersController < Store::StoreController
       end
       
       donation = Donation.new
-
       donation.amount = data[:amount]
       donation.organization = Organization.find(data.delete(:organization_id))
-
       current_cart.donations << donation
     end
+
+    def event
+      current_cart.tickets.first.event
+    end
 end

data/app/controllers/store/store_controller.rb

@@ -14,6 +14,10 @@ class Store::StoreController < ActionController::Base
     @current_cart
   end
 
+  def current_cart=(cart)
+    @current_cart = cart
+  end
+
   private
     def create_current_cart(reseller_id)
       if reseller_id.blank?

data/app/controllers/venues_controller.rb

@@ -10,6 +10,10 @@ class VenuesController < ArtfullyOseController
     authorize! :edit, @event
     @venue = @event.venue
     @venue.update_attributes(params[:venue])
-    redirect_to event_url(@event)
+    if params[:commit].try(:downcase) =~ /next/
+      redirect_to prices_event_path(@event)
+    else
+      redirect_to event_url(@event)
+    end
   end
-end
+end

data/app/helpers/artfully_ose_helper.rb

@@ -12,6 +12,18 @@ module ArtfullyOseHelper
         "✓".html_safe
     end
   end
+
+  def build_order_location(order)
+    order.location
+  end
+  
+  def channel_checkbox(channel)
+    channel.to_s.eql?("storefront") ? "Storefront & Widgets" : channel.to_s.humanize
+  end
+  
+  def channel_text(channel)
+    channel.to_s.humanize
+  end
   
   #
   # For use with the nav-pills to select an intem based on a current selection
@@ -36,12 +48,18 @@ module ArtfullyOseHelper
   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} "
+      s = s + " #{k}=#{v} "  
     end
     s = s + "><i class='#{icon}'></i> #{text}</a>"
     s.html_safe
   end
   
+  def action_and_subtype(action)
+    s = "#{action.action_type.capitalize}"
+    s = s + " - #{action.subtype}" unless action.subtype.nil?
+    s
+  end
+  
   #
   # just name the image, this method will prepend the path and append the .png
   # icon_tag('111-logo')
@@ -56,7 +74,7 @@ module ArtfullyOseHelper
   
   #This is for the widget generator, DO NOT use anywhere else
   def fully_qualified_asset_path(asset)
-    "#{request.protocol}#{request.host_with_port}#{asset_path(asset, :digest => false)}"
+    "#{asset_path(asset, :digest => false)}"
   end
   
   def events_to_options(selected_event_id = nil)
@@ -216,17 +234,17 @@ module ArtfullyOseHelper
   end
 
   def link_to_remove_fields(name, f)
-    f.hidden_field(:_destroy) + link_to_function(name, "remove_fields(this)")
+    f.hidden_field(:_destroy) + link_to(name, "#", :onclick => "remove_fields(this); return false;")
   end
   
-  def link_to_add_fields(name, f, association, view_path = '')
+  def link_to_add_fields(name, f, association, view_path = '', additional_javascript=nil)
     new_object = f.object.class.reflect_on_association(association).klass.new
     fields = f.fields_for(association, new_object, :child_index => "new_#{association}") do |builder|
       view_path = view_path + '/' unless view_path.blank?
       template_path = view_path + association.to_s.singularize + "_fields"
       render(template_path, :f => builder)
     end
-    link_to_function(name, "add_fields(this, \"#{association}\", \"#{escape_javascript(fields)}\")")
+    link_to name, "#", :onclick => "add_fields(this, \"#{association}\", \"#{escape_javascript(fields)}\"); #{additional_javascript} return false;"
   end
   
   def ticket_seller_name(ticket)
@@ -234,4 +252,12 @@ module ArtfullyOseHelper
   
   def credit_card_message
   end
+  
+  def date_field_tag(name, value = nil, options = {})
+    text_field_tag(name, value, options.stringify_keys.update("type" => "date"))
+  end
+  
+  def datetime_field_tag(name, value = nil, options = {})
+    text_field_tag(name, value, options.stringify_keys.update("type" => "datetime"))
+  end
 end

data/app/helpers/discounts_helper.rb

@@ -0,0 +1,3 @@
+module DiscountsHelper
+
+end

data/app/helpers/people_helper.rb

@@ -1,22 +1,5 @@
-module PeopleHelper
-  def relationship_name_display(person)
-    link_to person.first_name + ' ' + person.last_name, person_path(person)
-  end
-  
-  def display_name(person)
-    if person.nil?
-      "(none)"
-    elsif person.dummy?
-      "Anonymous"
-    elsif person.last_name.blank? && person.first_name.blank?
-      person.email
-    else
-      "#{person.first_name} #{person.last_name}"
-    end
-  end
-  
-  #yuck
+module PeopleHelper  
   def link_to_person(person)
-    link_to display_name(person), person_path(person)
+    link_to person, person
   end
 end

data/app/mailers/order_mailer.rb

@@ -1,12 +1,30 @@
 class OrderMailer < ActionMailer::Base
-  default :from => "support@artful.ly"
   layout "mail"
 
-  # TODO: Send using only information from Order
   def confirmation_for(order)
     @order = order
     @person = order.person
+    options = Hash.new.tap do |o|
+      o[:to] = @person.email
+      o[:from] = from(@order)
+      o[:subject] = "Your Order"
+      if order.contact_email.present?
+        o[:reply_to] = order.contact_email
+      end
+    end
+    
+    mail(options)
+  end
+
+private
 
-    mail :to => @person.email, :subject => "Your Order"
+  def from(order)
+    if ARTFULLY_CONFIG[:contact_email].present?
+      ARTFULLY_CONFIG[:contact_email]
+    elsif order.contact_email.present?
+      order.contact_email
+    else
+      order.organization.email
+    end
   end
 end