artfully_ose 1.2.0.beta.1 → 1.2.0.pre

data/app/controllers/slices_controller.rb

@@ -8,8 +8,7 @@ class SlicesController < ArtfullyOseController
                         ["Payment Method",          "payment_method_proc"],
                         ["Ticket Type",             "ticket_type_proc"],
                         ["Discount",                "discount_code_proc"],
-                        ["First time/Repeat",       "first_time_buyer_proc"],
-                        ["Validated",               "validated_proc"]
+                        ["First time/Repeat",       "first_time_buyer_proc"]
                       ]
   end
 
@@ -33,6 +32,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 => :ticket_type}, :discount, :order, :show => :event).where(:show_id => params[:statement_id])
+    @items = Item.includes(:product, :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 => :ticket_type, :pass => :pass_type]).find(params[:id])
+    @show = ::Show.includes(:event => :venue, :items => [:order, :discount, :product => :section]).find(params[:id])
     authorize! :view, @show
     @event = @show.event
     @shows = @event.shows.includes(:event => :venue)

data/app/controllers/store/checkouts_controller.rb

@@ -24,9 +24,9 @@ class Store::CheckoutsController < Store::StoreController
     Exceptional.handle(e, "Checkout failed!")    
     Rails.logger.error(e.backtrace)
     Rails.logger.error(e.message)
-    flash[:error]  = "We're sorry but we could not process the sale.  Please make sure all fields are filled out accurately"
-    flash[:notice] = "We've processed your donation, however we could not process your tickets." if @fafs_success
-    redirect_to store_order_path    
+    
+    flash[:error] = "We're sorry but we could not process the sale.  Please make sure all fields are filled out accurately"
+    redirect_to store_order_path
   end
 
   def filter(params)
@@ -35,11 +35,6 @@ class Store::CheckoutsController < Store::StoreController
     f.filter params
   end
 
-  def dook
-    @order = Order.find(18975)
-    render :thanks
-  end
-
   private
     def special_instructions
       instructions = []

data/app/controllers/store/donations_controller.rb

@@ -1,22 +1,4 @@
 class Store::DonationsController < Store::StoreController
-  rescue_from ActiveRecord::RecordNotFound do
-    render :text          => File.read("#{Rails.root}/public/404.html"),
-           :content_type  => Mime::HTML,
-           :status        => :not_found
-  end
-
   def index
-    # If there is no kit at all, NotFound
-    raise ActionController::RoutingError.new('Not Found') unless @store_organization.has_kit?(:regular_donation)
-
-    # If there's a kit, and they're logged in, show them a preview if the kit is off
-    if current_user && current_user.current_organization == @store_organization
-      if !@store_organization.has_active_donation_only_storefront?
-        flash[:notice] = "You are seeing a preview of your donation-only storefront. To make this page visible to the general public, go to your 501(c)(3) kit configuration and check \"Display Donation-Only Storefront\""
-      end
-    else
-      # show everyone else NotFound
-      raise ActionController::RoutingError.new('Not Found') unless @store_organization.has_active_donation_only_storefront?
-    end
   end
-end
+end  

data/app/controllers/store/events_controller.rb

@@ -1,23 +1,10 @@
 class Store::EventsController < Store::StoreController
   def show
     session[:last_event_id] = params[:id]
-    
     @event = Event.storefront_find(params[:id], current_member)
-    @shows = @event.upcoming_shows_rel.published
-
-    if @shows.count < 5
-      @shows = @shows.includes(:event, :chart => [:sections => :ticket_types])
-    elsif 
-      dates = @shows.collect(&:datetime_local_to_event).map {|d| d.to_date}
-      @dates_by_month = dates.group_by {|d| d.strftime("%B %Y")}
-    end
-
-    render :single_show and return if @event.single_show?
-    render :calendar    and return if @event.upcoming_public_shows.length > 4
-    render :show
   end
 
   def index
-    @events = Event.for_event_storefront(store_organization, current_member)
+    @events = Event.for_storefront(@store_organization, current_member)
   end
 end

data/app/controllers/store/memberships_controller.rb

@@ -1,16 +1,5 @@
 class Store::MembershipsController < Store::StoreController
-  def show
-    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.sales_valid.order('price desc')
-    @membership_kit = MembershipKit.where(:organization_id => store_organization.id).first
+    @membership_types = store_organization.membership_types.on_sale
   end
 end

data/app/controllers/store/orders_controller.rb

@@ -1,29 +1,17 @@
 class Store::OrdersController < Store::StoreController
   include ActionView::Helpers::TextHelper
   include ArtfullyOseHelper
-
+  
   def update
-    handler = OrderHandler.new(current_cart, current_member)
-    handler.handle_tickets(params)
+    handler = OrderHandler.new(current_cart)
+    handler.handle_tickets(params)    
     handler.handle_donation(params, @store_organization)
-    handler.handle_memberships(params, current_member)
-    handler.handle_passes(params)
-    handler.handle_discount_or_pass_code(params)
-
-    if handler.error.present?
-      flash[:alert] = handler.error unless handler.error.blank?
+    handler.handle_memberships(params)
+    handler.handle_discount(params)
 
-      redirect_url = case params[:_source]
-      when 'storefront'
-        store_donate_path
-      else
-        store_order_path
-      end
+    flash[:alert] = handler.error unless handler.error.blank?
 
-      redirect_to redirect_url
-    else
-      redirect_to store_order_path
-    end
+    redirect_to store_order_path
   end
 
   def show
@@ -35,23 +23,6 @@ class Store::OrdersController < Store::StoreController
         @special_instructions_hash[event.id] = event.special_instructions_caption
       end
     end
-
-    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] = 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
@@ -61,6 +32,16 @@ class Store::OrdersController < Store::StoreController
   end
 
   private
+
+    #
+    # The storefront javascript depends on this total_string to determine 
+    # if this is a free order or not. Don't re-word this string without also
+    # addressing the javascript in store.js
+    #
+    def total_string
+      "#{pluralize(current_cart.items.length, 'item')}, #{number_as_cents current_cart.total}"
+    end
+
     def event
       current_cart.tickets.first.event
     end

data/app/controllers/store/passes_controller.rb

@@ -1,13 +1,4 @@
 class Store::PassesController < Store::StoreController
-  def show
-    @pass_types = [PassType.find(params[:id])]
-    @passes_kit = PassesKit.where(:organization_id => store_organization.id).first
-    render :index
-  end
-
   def index
-    render :nothing => true unless store_organization.can? :access, :passes
-    @pass_types = store_organization.pass_types.storefront.order('price desc')
-    @passes_kit = PassesKit.where(:organization_id => store_organization.id).first
   end
 end

data/app/controllers/store/store_controller.rb

@@ -7,14 +7,9 @@ class Store::StoreController < ActionController::Base
     @store_organization ||= load_store_organization
   end
 
-  #
-  # Raises ActionController::RoutingError if a bad organization_slug is passed
-  #
   def load_store_organization
     if params[:organization_slug].present?
-      org = Organization.find_using_slug(params[:organization_slug])
-      raise ActionController::RoutingError.new("Not Found") if org.nil?
-      org
+      Organization.find_using_slug(params[:organization_slug])
     elsif params[:controller].end_with? "events"
       Event.find(params[:id]).organization
     elsif params[:controller].end_with? "shows"
@@ -23,6 +18,6 @@ class Store::StoreController < ActionController::Base
       current_member.organization
     else
       nil
-    end 
+    end      
   end
 end

data/app/controllers/tickets_controller.rb

@@ -15,7 +15,7 @@ class TicketsController < ArtfullyOseController
 
   def validated
     authorize! :edit, Ticket
-    Ticket.find(params[:id]).validate_ticket!(current_user)
+    Ticket.find(params[:id]).validate_ticket(current_user)
     respond_to do |format|
       format.json { head :ok }
     end
@@ -23,7 +23,7 @@ class TicketsController < ArtfullyOseController
 
   def unvalidated
     authorize! :edit, Ticket
-    Ticket.find(params[:id]).unvalidate_ticket!
+    Ticket.find(params[:id]).unvalidate_ticket
     respond_to do |format|
       format.json { head :ok }
     end

data/app/helpers/artfully_ose_helper.rb

@@ -13,27 +13,14 @@ module ArtfullyOseHelper
     end
   end
 
-  def with_kit(kit, organization = nil)
-    organization = organization || current_user.try(:current_organization) || @store_organization
-    if organization.has_kit? kit
-      yield
-    end
-  end
-
-  def thanks_message(person)
-    message = "Thanks"
-    message += ", #{person.first_name}" unless person.first_name.blank?
-    message += "!"
-  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)
     case channel.to_s
     when "members"
@@ -44,7 +31,7 @@ module ArtfullyOseHelper
       channel.to_s.humanize
     end
   end
-
+  
   def build_action_path(target, action)
     action_path_name = action.new_record? ? "actions" : "actions"
     "#{target.class.name.downcase}_#{action_path_name}_path"
@@ -55,12 +42,6 @@ module ArtfullyOseHelper
     "#{time_ago_in_words(t)} #{qualifier}"
   end
 
-  def clean_full_error_messages(errors)
-    string = errors.full_messages.collect {|m| m.downcase.gsub(/.*organization/, 'organization')}.to_sentence
-    string = string.slice(0,1).capitalize + string.slice(1..-1)
-    string = string + "."
-  end
-
   #
   # For use with the nav-pills to select an intem based on a current selection
   # Will protect against nil by using try on the object
@@ -71,17 +52,17 @@ module ArtfullyOseHelper
   def get_selected_class(selected_object, menu_object)
     selected_object.try(:id) == menu_object.id ? "active" : "unselected"
   end
-
-  #For use with Font Awesome icon %i classes
+  
+  #For use with Bootstraps 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} "
+      s = s + " #{k}=#{v} "  
     end
-    s = s + "><i class='fa #{icon}'></i> #{text}</a>"
+    s = s + "><i class='#{icon}'></i> #{text}</a>"
     s.html_safe
   end
-
+  
   #
   # just name the image, this method will prepend the path and append the .png
   # icon_tag('111-logo')
@@ -93,12 +74,12 @@ module ArtfullyOseHelper
   def time_zone_description(tz)
     ActiveSupport::TimeZone.create(tz)
   end
-
+  
   #This is for the widget generator, DO NOT use anywhere else
   def fully_qualified_asset_path(asset)
     "#{asset_path(asset, :digest => false)}"
   end
-
+  
   def events_to_options(selected_event_id = nil)
     @events = current_user.current_organization.events
     @events_array = @events.map { |event| [event.name, event.id] }
@@ -129,19 +110,17 @@ module ArtfullyOseHelper
 
   def amount_and_nongift(item)
     str = number_as_cents item.total_price
-    str += " (#{number_as_cents item.nongift_amount} Non-deductible)" unless item.nongift_amount.nil? || item.nongift_amount == 0
+    str += " (#{number_as_cents item.nongift_amount} Non-deductible)" unless item.nongift_amount.nil?
     str
   end
-
+  
   #This method will not prepend the $
   def number_to_dollars(cents)
     cents.to_i / 100.00
   end
 
   def number_as_cents(cents, options = {})
-    result = number_to_currency(number_to_dollars(cents), options)
-    result = result.split('.').first if result.split('.').last == '00' && options[:cents_if_needed] == true
-    result
+    number_to_currency(number_to_dollars(cents), options)
   end
 
   def sorted_us_state_names
@@ -223,6 +202,7 @@ module ArtfullyOseHelper
     options =
       [
         content_tag(:option, " --- All Events --- ", :value => ""),
+        content_tag(:option, "", :value => ""),
         options_from_collection_for_select(events, :id, :name, default)
       ].join
 
@@ -233,6 +213,7 @@ 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)
@@ -242,30 +223,10 @@ 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 select_pass_type_for_sales_search(pass_types, pass_type_id, default)
-    options =
-      [
-        content_tag(:option, " --- All Pass Types --- ", :value => ""),
-        options_from_collection_for_select(pass_types, :id, :name, default)
-      ].join
-
-    select_tag pass_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'
   end
-
+  
   def bootstrapped_type(type)
     case type
     when :notice then "alert alert-info"
@@ -278,7 +239,7 @@ module ArtfullyOseHelper
   def link_to_remove_fields(name, f)
     f.hidden_field(:_destroy) + link_to(name, "#", :onclick => "remove_fields(this); return false;")
   end
-
+  
   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|
@@ -288,37 +249,18 @@ module ArtfullyOseHelper
     end
     link_to name, "#", :onclick => "add_fields(this, \"#{association}\", \"#{escape_javascript(fields)}\"); #{additional_javascript} return false;"
   end
-
+  
   def ticket_seller_name(ticket)
   end
-
+  
   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
-
-  def refund_header(items)
-    str = ""
-    if items.select(&:ticket?).any?
-      str = "Tickets"
-    end
-
-    if items.select(&:ticket?).any? && items.select(&:donation?).any?
-      str += " & "
-    end
-
-    if items.select(&:donation?).any?
-      str += "Donations"
-    end
-  end
-
-  def pluralize_word(count, singular, plural = nil)
-    ((count == 1 || count == '1') ? singular : (plural || singular.pluralize))
-  end
 end