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

data/app/assets/stylesheets/sass/_event_list.sass

@@ -29,4 +29,15 @@ ul#event-list
         margin-bottom: 3px
         color: white
       a:hover
-        text-decoration: none
+        text-decoration: none
+
+  .no-events-found
+    h3
+      text-align: center
+
+.event-list-controls
+  .btn-group
+    margin-bottom: 0
+
+  form
+    margin-bottom: 0

data/app/assets/stylesheets/sass/cart.sass

@@ -34,12 +34,6 @@ a
     margin-top: 0
     margin-bottom: 0
 
-#controls
-  @extend .stack1of4
-
-#cart
-  @extend .stack3of4
-
 #total
   text-align: center
   font-weight: bold

data/app/assets/stylesheets/storefront.css

@@ -2,5 +2,6 @@
  *= require bootstrap
  *= require sass/cart
  *= require sass/store
+ *= require font-awesome
  *= require_self
  */

data/app/concerns/pdf_generation.rb

@@ -6,11 +6,14 @@ class PdfGeneration
   PDF_GET_URL      = "http://quick-pdf.geminisbs.net/pdfs/:id.json?api_key=:key"
   PDF_DOWNLOAD_URL = "http://quick-pdf.geminisbs.net/pdfs/:id/download?api_key=:key"
 
+  attr_accessor :pdf_options
+
   def initialize(pdfable, pdf_api_key = PDF_API_KEY, http_party = HTTParty, sleeper = Kernel)
     @pdfable      = pdfable
     @pdf_api_key  = pdf_api_key
     @http_party   = http_party
     @sleeper      = sleeper
+    @pdf_options  = {}
   end
 
   def generate
@@ -51,7 +54,7 @@ class PdfGeneration
             :margin_bottom => "0.5in",
             :margin_left => "0.5in",
             :margin_right => "0.5in"
-          }
+          }.merge(pdf_options)
         }
       }
     }

data/app/controllers/events_controller.rb

@@ -1,5 +1,5 @@
 class EventsController < ArtfullyOseController
-  respond_to :html, :json
+  respond_to :html, :json, :js
 
   before_filter :find_event, :only => [ :show, :edit, :update, :destroy, :widget, :image, :storefront_link, :prices, :messages, :resell, :wp_plugin, :passes ]
   before_filter :upcoming_shows, :only => :show
@@ -23,7 +23,16 @@ class EventsController < ArtfullyOseController
 
   def index
     authorize! :view, Event
-    @events = current_organization.events.includes(:shows, :tickets).order('updated_at DESC')
+
+    scope = Event.unscoped.where(:deleted_at => nil).where(:organization_id => current_organization.id).includes(:shows).order('name ASC')
+    scope = if params[:range].present? && params[:range] == 'all'
+      @all = scope
+    else
+      @upcoming = scope.where :id => current_organization.shows.unplayed.pluck(:event_id).uniq
+    end
+
+    scope   = scope.where('LOWER(name) LIKE ?', "%#{params[:query].downcase}%") unless params[:query].blank?
+    @events = scope
   end
 
   def show

data/app/controllers/events_pass_types_controller.rb

@@ -25,6 +25,7 @@ class EventsPassTypesController < ArtfullyOseController
     @events_pass_type = EventsPassType.new.tap do |ept|
       ept.organization = current_organization
       ept.event = @event
+      ept.limit_per_pass = params[:events_pass_type][:limit_per_pass]
       ept.pass_type = current_organization.pass_types.find(params[:events_pass_type][:pass_type])
       ept.ticket_types = Set.new(params[:events_pass_type][:ticket_types].reject!(&:blank?))
       ept.excluded_shows = Set.new(params[:events_pass_type][:excluded_shows].reject!(&:blank?))
@@ -45,6 +46,7 @@ class EventsPassTypesController < ArtfullyOseController
 
   def update 
     @events_pass_type = EventsPassType.find(params[:id])
+    @events_pass_type.limit_per_pass = params[:events_pass_type][:limit_per_pass]
     @events_pass_type.ticket_types = Set.new(params[:events_pass_type][:ticket_types].reject!(&:blank?))
     @events_pass_type.excluded_shows = Set.new(params[:events_pass_type][:excluded_shows].reject!(&:blank?))
     @events_pass_type.active = params[:events_pass_type][:active]

data/app/controllers/exchanges_controller.rb

@@ -5,7 +5,7 @@ class ExchangesController < ArtfullyOseController
     @person = @order.person
 
     if @items.all?(&:exchangeable?)
-      @events = current_organization.events
+      @events = current_organization.events.sort
 
       unless params[:event_id].blank?
         @event = Event.find(params[:event_id])

data/app/controllers/households_controller.rb

@@ -0,0 +1,71 @@
+class HouseholdsController < ArtfullyOseController
+
+  respond_to :html
+
+  def new
+    @household = Household.new
+    if params[:individuals]
+      params[:individuals].each do |i|
+        @household.individuals << current_organization.individuals.find(i)
+      end
+    end
+  end
+
+  def update
+    @household = current_organization.households.find(params[:id])
+    flash[:notice] = []
+
+    unless params[:individual_ids].nil?
+      @household.individuals << current_organization.individuals.find(params[:individual_ids])
+    end
+
+    @household.update_attributes(params[:household])
+    @household.update_member_addresses if @household.overwrite_member_addresses
+
+    if @household.save
+      flash[:notice] = "Your changes have been saved"
+    else
+      flash[:alert] = @household.errors.full_messages.to_sentence
+    end
+
+    redirect_to(@household)
+  end
+
+  def create
+    @household = current_organization.households.create(params[:household])
+
+    # NOTE: No mind is paid to any household these people might already be in
+    params[:individuals].reject(&:empty?).each do |i|
+      @household.individuals << current_organization.individuals.find(i)
+    end
+
+    if @household.save
+      redirect_to @household
+    else
+      render :new
+    end
+  end
+
+  def show
+    @household = current_organization.households.find(params[:id])
+    @actions = @household.actions.includes(:person, :organization).paginate(:page => params[:page], :per_page => 20)
+  end
+
+  def index
+    @households = current_organization.households.order(:created_at)
+    @households = @households.paginate(:page => params[:page], :per_page => 20)
+  end
+
+  def suggested
+    hs = HouseholdSuggester.new(current_organization)
+    @by_address = hs.by_address
+    @by_spouse = hs.by_spouse
+  end
+
+  def ignore_suggested
+    suggested = SuggestedHousehold.find(params[:suggested_id])
+    suggested.update_attributes(:ignored => true)
+    redirect_to suggested_households_path
+  end
+
+end

data/app/controllers/member_cards_controller.rb

@@ -0,0 +1,45 @@
+class MemberCardsController < ArtfullyOseController
+  requires_kit :membership
+
+  before_filter :find_members
+
+  def new
+    generator = MemberCardGenerator::BlanksUsaIdc6.new(@members)
+    generator.generate
+    redirect_to generator.download_url
+  end
+
+  private
+  def find_members
+    @members = if params[:search_id].present?
+      search = Search.where(:id => params[:search_id]).first
+      if search
+        load_members search.people.map { |person| person.memberships.current.first.member_id }
+      else
+        raise CanCan::AccessDenied
+      end
+    elsif params[:start].present?
+      members_from_sales_search
+    else
+      raise CanCan::AccessDenied
+    end
+  end
+
+  def load_members(member_ids)
+    Member.find Array.wrap(member_ids).flatten
+  end
+
+  def members_from_sales_search
+    membership_type = MembershipType.find_by_id(params[:membership_type_id]) if params[:membership_type_id].present?
+    search          = MembershipSaleSearch.new :start           => params[:start],
+                                               :stop            => params[:stop],
+                                               :organization    => current_organization,
+                                               :membership_type => membership_type
+
+    load_members search.results.map { |order| order.items.select(&:membership?).first.product.member_id }
+  end
+
+  def sales_params?
+    params[:start].present?
+  end
+end

data/app/controllers/members/sessions_controller.rb

@@ -0,0 +1,14 @@
+class Members::SessionsController < Devise::SessionsController
+  layout 'devise_layout'
+
+  def new
+    # Store the referrer so we can send them back
+    # where they started after successful sign in.
+    session[:continue] = request.referrer
+    super
+  end
+
+  def after_sign_in_path_for(resource_or_scope)
+    stored_location_for(resource_or_scope) || session.delete(:continue) || signed_in_root_path(resource_or_scope)
+  end
+end

data/app/controllers/membership_comps_controller.rb

@@ -4,7 +4,7 @@ class MembershipCompsController < ArtfullyOseController
   def new
     @membership_types = current_organization.membership_types.all
     @membership_types_hash = {}
-    @membership_types.each {|mt| @membership_types_hash[mt.id] = I18n.l(mt.ends_at, :format => :date_for_input)}
+    @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)}}
 
     @membership_comp = MembershipComp.new
     @membership_comp.membership_type             ||= @membership_types.first
@@ -30,6 +30,11 @@ class MembershipCompsController < ArtfullyOseController
       @membership_comp.award
       render 'create' and return
     else
+      unless params[:membership_comp][:membership_type].present?
+        flash[:error] = "Please select a membership type"
+        redirect_to :back and return
+      end
+
       @number_without_emails  =  @membership_comp.people.select{ |person| person.email.blank? }.length
       @number_of_companies    =  @membership_comp.people.select{ |person| person.company? }.length
       @email_preview          =  generate_invitation_preview_for(@membership_comp)
@@ -58,7 +63,7 @@ class MembershipCompsController < ArtfullyOseController
     def from_params(params)
       membership_comp                       = MembershipComp.new
       membership_comp_params                = params[:membership_comp]
-      membership_comp.membership_type       = MembershipType.find(membership_comp_params[:membership_type])
+      membership_comp.membership_type       = MembershipType.find(membership_comp_params[:membership_type]) if membership_comp_params[:membership_type].present?
       membership_comp.ends_at               = membership_comp_params[:ends_at]
       membership_comp.send_email            = membership_comp_params[:send_email] == "true"
       membership_comp.number_of_memberships = membership_comp_params[:number_of_memberships]

data/app/controllers/membership_types_controller.rb

@@ -39,9 +39,14 @@ class MembershipTypesController < ArtfullyOseController
 
   def update
     @membership_type = MembershipType.find(params[:id])
-    @membership_type.update_attributes(params[:membership_type])
-    flash[:notice] = "Your changes have been saved"
-    redirect_to membership_types_path
+    
+    if @membership_type.update_attributes(params[:membership_type])
+      flash[:notice] = "Your changes have been saved"
+      redirect_to membership_types_path
+    else
+      flash[:error] = @membership_type.errors.full_messages.to_sentence
+      render "edit" and return
+    end
   end
 
   private

data/app/controllers/mobile/orders_controller.rb

@@ -30,7 +30,8 @@ class Mobile::OrdersController < ApplicationController
   def index
     organization = current_user.organizations.find(params[:organization_id])
     show = organization.shows.find(params[:show_id])
-    orders = show.items.map(&:order).uniq
+    door_list = DoorList.new(show)
+    orders = Order.find(door_list.items.collect(&:order_id).uniq)
     render :json => orders, :each_serializer => OrderSerializer
   end
 
@@ -55,6 +56,6 @@ class Mobile::OrdersController < ApplicationController
       end
     end
 
-    render :json => order, :serializer => OrderSerializer
+    render :json => order, :serializer => OrderValidationSerializer
   end
 end

data/app/controllers/mobile/shows_controller.rb

@@ -18,6 +18,12 @@ class Mobile::ShowsController < ApplicationController
     end
   end
 
+  def show
+    organization = current_user.organizations.find(params[:organization_id])
+    show = organization.shows.find(params[:id])
+    render :json => show, :serializer => ShowSerializer
+  end
+
   def index
     organization = current_user.organizations.find(params[:organization_id])
     event = organization.events.find(params[:event_id])

data/app/controllers/mobile/tickets_controller.rb

@@ -38,6 +38,24 @@ class Mobile::TicketsController < ApplicationController
     }, :status => 400
   end
 
+  rescue_from MemberWalkup::TicketTypeNotFound do |e|
+    error = {
+      :error => 'Could not find member only ticket type',
+      :reason => e.message,
+      :code => 9
+    }
+    render :json => error, :status => 404
+  end
+
+  rescue_from MemberWalkup::TicketsNotAvailable do |e|
+    error = {
+      :error => 'Could not find available tickets',
+      :reason => e.message,
+      :code => 10
+    }
+    render :json => error, :status => 404
+  end
+
   def show
     organization = current_user.organizations.find_by_id(params[:organization_id])
     raise OrganizationNotFound, "Could not load ticket" if !organization
@@ -60,14 +78,25 @@ class Mobile::TicketsController < ApplicationController
   def validate
     organization = current_user.organizations.find_by_id(params[:organization_id])
     raise OrganizationNotFound, "Could not update ticket" if !organization
+
     ticket = organization.tickets.where(:show_id => params[:show_id], :uuid => params[:id]).first
-    raise TicketNotFound, "Could not update ticket" if !ticket
+    if !ticket
+      # Try a member walkup
+      walkup = MemberWalkup.new(:show_id => params[:show_id], :member_uuid => params[:id])
+
+      if walkup.valid?
+        walkup.save
+        ticket = walkup.ticket
+      end
+
+      raise TicketNotFound, "Could not update ticket" unless ticket
+    end
 
     if !ticket.validate_ticket!(current_user)
       raise TicketAlreadyValidated
     end
 
-    render :json => ticket.sold_item.try(:order), :serializer => OrderSerializer
+    render :json => ticket.sold_item.try(:order), :serializer => OrderValidationSerializer
   end
 
   def unvalidate
@@ -80,6 +109,6 @@ class Mobile::TicketsController < ApplicationController
       raise TicketNotValidated
     end
 
-    render :json => ticket.sold_item.try(:order), :serializer => OrderSerializer
+    render :json => ticket.sold_item.try(:order), :serializer => OrderValidationSerializer
   end
 end

data/app/controllers/mobile/users_controller.rb

@@ -1,25 +1,23 @@
 class Mobile::UsersController < ApplicationController
   skip_before_filter :authenticate_user!, :only => :sign_in
 
-  rescue_from ActiveRecord::RecordNotFound do
-    error = {
-      :error => "Could not sign in",
-      :reason => "Organization could not be found",
-      :code => 2
-    }
-    render :json => error, :status => 404
-  end
-
   def sign_in
     user = User.find_by_email(params[:email])
 
     if user && user.valid_password?(params[:password])
-      if params[:organization_id]
-        now = Time.parse(params[:now]) rescue Time.zone.now
-        organization = user.organizations.find(params[:organization_id])
+
+      if user.organizations.empty?
+        error = {
+          :error => "Could not sign in",
+          :reason => "User is not a member of any organizations",
+          :code => 2
+        }
+        render :json => error, :status => 422 and return
       end
 
-      render :json => user, :auth_token => true, :organization => organization, :now => now
+      now = Time.parse(params[:now]) rescue Time.zone.now
+
+      render :json => user, :auth_token => true, :organization => user.organizations.first, :now => now
     else
       error = {
         :error => "Could not sign in",

data/app/controllers/orders_controller.rb

@@ -47,12 +47,54 @@ class OrdersController < ArtfullyOseController
     redirect_to order_url(@order)
   end
 
+  def membership
+    authorize! :view, Order
+
+    @organization = current_organization
+    @membership_type  = MembershipType.find_by_id(params[:membership_type_id]) if params[:membership_type_id].present?
+    @membership_types = @organization.membership_types
+
+    request.format = :csv if params[:commit] == "Download"
+
+    search_terms = {
+      :start        => params[:start],
+      :stop         => params[:stop],
+      :organization => @organization,
+      :membership_type => @membership_type
+    }
+
+    @search = MembershipSaleSearch.new(search_terms) do |results|
+      results.paginate(:page => params[:page], :per_page => 25)
+    end
+
+    respond_to do |format|
+      format.html
+      format.csv do
+        filename = "Artfully-Membership-Sales-Export-#{DateTime.now.strftime("%m-%d-%y")}.csv"
+        items = ItemView.where(:product_type => "Membership")
+                             .where('items_view.created_at > ? ', @search.start)
+                             .where('items_view.created_at < ?',  @search.stop)
+                             .where('items_view.organization_id = ?', current_organization)
+                             .order('items_view.created_at desc')
+        if @membership_type
+          items = items.joins(:item).
+            joins("INNER JOIN memberships ON (items.product_type = #{::Item.sanitize('Membership')} AND items.product_id = memberships.id)").
+            joins("INNER JOIN membership_types ON (membership_types.id = memberships.membership_type_id)").
+            where(:membership_types => {:id => @membership_type}).
+            group('items_view.order_id')
+        end
+        csv_string = items.all.to_comma(:membership_sale)
+        send_data csv_string, :filename => filename, :type => "text/csv", :disposition => "attachment"
+      end
+    end
+  end
+
   def sales
     authorize! :view, Order
 
     @organization = current_organization
     @event = Event.find_by_id(params[:event_id]) if params[:event_id].present?
-    @events = @organization.events
+    @events = @organization.events.sort
     @show = @event.shows.find_by_id(params[:show_id]) if @event && params[:show_id].present?
     @shows = @event.shows if @event
     request.format = :csv if params[:commit] == "Download"
@@ -74,7 +116,7 @@ class OrdersController < ArtfullyOseController
       format.csv do
         filename = "Artfully-Ticket-Sales-Export-#{DateTime.now.strftime("%m-%d-%y")}.csv"
         items = ItemView.where(:product_type => "Ticket")
-                             .where('created_at > ? ', search_terms[:start]) 
+                             .where('created_at > ? ', search_terms[:start])
                              .where('created_at < ?',  Sundial.midnightish(current_organization, search_terms[:stop]))
                              .where('organization_id = ?', current_organization)
                              .order('created_at desc')