artfully_ose 1.2.0.pre.5 → 1.2.0.pre.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTNiMTJkMGJiNWE1NzAxNTExYWVhMDljYzBkMjAxNmEyMzM3NjU4OQ==
+    ZWQ0MjYyODBmMjg3NzRjZTczNzY1N2U1MDM0NTNiNzU3N2ZlYTZhNw==
   data.tar.gz: !binary |-
-    Yjk2N2QzZmY2YjY0NjBiMzUyZDdmMjUwMzBhMTRhMWM1ODA2ZDQ0YQ==
+    MjkwZmFiMmY3Njg0ZmQxMDU3YzBkZDYyMDEyOWJjYzhkNzFlOWJjMg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YzljNTZhZTUyZWNiNzFhNzE5YTc5MjIyYTVhZmE2ZTdjNmYzZGI3MWJlZjkx
-    ZmMxZWNkYzgwYTY2YmVjM2IyMjQ0ODJkYWM2MDc0NzhiZTgzYzI1ZGY2NGVi
-    YjRlODk1MGJmZWEzOTY1M2U4NDUzNTEwNWRkYzRlYzJmODIxOTE=
+    OWMyYWMwZjU4MDc4N2Q5ZjJjM2M2NzU2OTYzZmZlODY2M2ZjY2FmMDcwMTRj
+    Y2Q5NTMyNGRjYjQxZmEyNWExOGE2NjlkMDZkNTYzMWZjYTUwMTFjNGEyY2Y0
+    OGVkZTkzYjBjNTIwMjA0ZjkxOWU5YzEzNDVmYTYxNGE4MTJlMjc=
   data.tar.gz: !binary |-
-    Y2IyYWFmMzBhNzE5YTJhMDY1ZjcyMTA2ZThhMDBhN2Q1ZDQzN2M2Mzc0ZTM5
-    MDI2NjNmNjAzZWZiNjYwZWEwMjY0MTNkMjdiNDkzZWM5YmVkNDk5Y2U5NzUz
-    YzY2OTIxNjFkNWE5YTAxNDdmZTU1NGI2ZDczZWZkY2UxNTFhODI=
+    NDNiYmFmMWIwNmM5ZmZhODE3MzljNTZiMDllMWZlZTZiYWM2NmUxZDg1Zjc4
+    MjI5ODM0OGNkMDJhNWQ0YmNmOGQzOTU0M2U3NTkxODJlOTA3YjkzNGY1ZDI3
+    N2UwNDBlNjZiOTA1NmJlZWNmNDMyNjI0OTFjZDVkYThmYjUxN2E=

data/app/assets/stylesheets/sass/box-office.sass

@@ -17,8 +17,9 @@
 
 #total
   .price
-    font-size: 28px
+    font-size: 38px
     font-weight: bold
+    padding-top: 10px
 
 ul.ui-autocomplete
   li.ui-menu-item

data/app/assets/stylesheets/sass/store.sass

@@ -508,3 +508,9 @@ tr.no-border
     padding-top: 13px
 
 .event-image
+  img
+    max-width: 290px
+
+#poster-modal
+  .modal-body
+    text-align: center

data/app/controllers/sales_controller.rb

@@ -9,14 +9,14 @@ class SalesController < ArtfullyOseController
 
   def new
     @person = Person.new
-    @sale = Sale.new(@show, @show.chart.ticket_types.box_office, current_cart.becomes(BoxOffice::Cart), {})
+    @sale = Sale.new(@show, @show.chart.ticket_types.box_office, current_box_office_cart, {})
     @tickets_remaining = tickets_remaining
     setup_defaults
   end
 
   def create
-    current_cart.becomes(BoxOffice::Cart).clear!
-    @sale = Sale.new(@show, @show.chart.ticket_types.box_office, current_cart.becomes(BoxOffice::Cart), params[:quantities])
+    current_box_office_cart.clear!
+    @sale = Sale.new(@show, @show.chart.ticket_types.box_office, current_box_office_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.cart.total}"
@@ -25,7 +25,6 @@ class SalesController < ArtfullyOseController
 
     unless @sale.errors.empty?
       @sale.error = "#{@sale.errors.full_messages.to_sentence.capitalize}."
-      ExpireTicketJob.new(@sale.cart.tickets).perform
     end
     
     render :json => @sale.as_json

data/app/controllers/shows_controller.rb

@@ -1,16 +1,17 @@
 class ShowsController < ArtfullyOseController
   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(@show.event)
+    redirect_to event_url(@event)
   end
 
   def index
     authorize! :manage, @event
-    @shows = Show.where(:event_id => @event.id).includes(:tickets, :chart, :event => :venue).order('datetime ASC')
+    shows_rel = Show.where(:event_id => @event.id)
+    shows_rel = shows_rel.where('datetime > ?', Time.now - 2.days) unless all?
+    @shows = shows_rel.includes(:show_stats_view, :event).order('datetime ASC').paginate(:page => params[:page], :per_page => 20)
   end
 
   def new
@@ -191,12 +192,12 @@ class ShowsController < ArtfullyOseController
   end
 
   private
-    def find_event
-      @event = Event.includes(:shows => [:event => :venue]).find(params[:event_id])
+    def all?
+      @all ||= (params[:range].present? && params[:range] == :all)
     end
 
-    def upcoming_shows
-      @upcoming = @event.upcoming_shows
+    def find_event
+      @event = Event.includes(:shows => [:event => :venue]).find(params[:event_id])
     end
 
     def with_confirmation

data/app/controllers/store/events_controller.rb

@@ -7,6 +7,5 @@ class Store::EventsController < Store::StoreController
 
   def index
     @events = Event.for_storefront(@store_organization, current_member)
-    @events = []
   end
 end

data/app/controllers/users/sessions_controller.rb

@@ -0,0 +1,3 @@
+class Users::SessionsController < Devise::SessionsController
+  layout 'devise_layout'
+end

data/app/helpers/link_helper.rb

@@ -3,7 +3,7 @@ module LinkHelper
     "active" if content_for(:_active_section) == section.to_s || content_for(:_active_sub_section) == section.to_s
   end
 
-  def in?(section)
+  def in_section?(section)
     "in" if content_for(:_active_section) == section.to_s || content_for(:_active_sub_section) == section.to_s
   end
 

data/app/models/carts/cart_finder.rb

@@ -9,17 +9,21 @@ module CartFinder
     c.helper_method :current_cart
   end
 
-  def current_cart
-    (!session_cart || session_cart.approved?) ? create_new_cart : session_cart
+  def current_box_office_cart
+    current_cart(BoxOffice::Cart)
   end
 
-  def session_cart
-    @current_cart ||= Cart.find_by_id(session[:cart_id])
+  def current_cart(klass = Cart)
+    (!session_cart(klass) || session_cart(klass).approved?) ? create_new_cart(klass) : session_cart(klass)
   end
 
-  def create_new_cart
-    @current_cart = Cart.create
-    session[:cart_id] = @current_cart ? @current_cart.id : nil
+  def session_cart(klass = Cart)
+    @current_cart ||= Cart.find_by_id(session[session_key(klass)])
+  end
+
+  def create_new_cart(klass = Cart)
+    @current_cart = klass.create
+    session[session_key(klass)] = @current_cart ? @current_cart.id : nil
     @current_cart
   end
 
@@ -30,4 +34,12 @@ module CartFinder
   def current_cart=(cart)
     @current_cart = cart
   end
+
+  def cart_name(klass = Cart)
+    klass.name.gsub("::","").underscore
+  end
+
+  def session_key(klass)
+    (cart_name(klass) + "_id").to_sym
+  end
 end

data/app/models/event.rb

@@ -72,11 +72,17 @@ class Event < ActiveRecord::Base
     shows.length == 1
   end
 
-  def self.for_storefront(member = nil)
+  def self.for_storefront(organization, member = nil)
     event_rel = Event.joins(:shows).where(:organization_id => organization.id).where('shows.datetime > ?', DateTime.now).group(:event_id).public
     event_rel = event_rel.where(:members_only => false) if member.nil?
     event_rel.all
   end
+
+  def self.storefront_find(id, member = nil)
+    event_rel = Event.includes(:venue, :shows => [:chart => [:sections => :ticket_types]])
+    event_rel = event_rel.where(:members_only => false) if member.nil?
+    event_rel.find(id)
+  end
   
   def destroyable?
     items.blank?
@@ -144,7 +150,7 @@ class Event < ActiveRecord::Base
   end
 
   def as_full_calendar_json
-    shows.collect do |p|
+    shows.includes(:event).collect do |p|
       { :title  => '',
         :start  => p.datetime_local_to_event,
         :allDay => false,

data/app/models/member.rb

@@ -12,6 +12,15 @@ class Member < ActiveRecord::Base
 
   before_create :set_member_number
 
+  CURRENT = :current
+  LAPSED  = :lapsed
+  PAST    = :past
+  NONE    = :none
+
+  scope CURRENT, where("current_memberships_count > 0")
+  scope LAPSED,  where("lapsed_memberships_count > 0").where("current_memberships_count = 0")
+  scope PAST,    where("past_memberships_count > 0").where("lapsed_memberships_count = 0").where("current_memberships_count = 0")
+
   #
   # devise_invitable needs this otherwise it can't set the :from param in an email
   #
@@ -24,12 +33,42 @@ class Member < ActiveRecord::Base
     end
   end
 
-  def self.generate_password
-    Devise.friendly_token
+  #
+  # This is always run DJ'd
+  #
+  def count_memberships
+    self.current_memberships_count  = self.memberships.current.count
+    self.lapsed_memberships_count   = self.memberships.lapsed.count
+    self.past_memberships_count     = self.memberships.past.count
+    self.save
   end
+  handle_asynchronously :count_memberships
 
-  def active_memberships
-    memberships.select{ |m| m.starts_at < DateTime.now && m.ends_at > DateTime.now }
+  #
+  # Intentionally did not use a state machine for this for a few reasons
+  # 1) I'm not all that happy with transitions
+  # 2) Can't find another statre machine that I like and is worth the cost of switching to
+  # 3) This works just fine. I prefer calculating state on the fly here because we're couning the memberships
+  #    on this member anyway
+  # 4) Determining a lapsed or past member is a touch more complicated than it sounds
+  #    A lapsed member is a member with lapsed memberships *and no current memberships*
+  #    It's that last bit that makes grabbing all last members quite difficult in SQL
+  #
+  # Note that this method uses the cached values for current_memberships, lapsed_memberships, and past_memberships
+  #
+  def state
+    return CURRENT if self.current_memberships_count > 0
+    return LAPSED  if self.lapsed_memberships_count  > 0
+    return PAST    if self.past_memberships_count    > 0
+    return NONE
+  end
+
+  def self.states
+    [CURRENT, LAPSED, PAST, NONE]
+  end
+
+  def self.generate_password
+    Devise.friendly_token
   end
 
   def set_member_number

data/app/models/membership.rb

@@ -5,6 +5,16 @@ class Membership < ActiveRecord::Base
   belongs_to :membership_type
   has_many :items, :as => :product
 
+  # Same callbacks that fire before Rails' built-in counter_cache
+  #Except before_destroy is replaced with after_destroy
+  after_create    :update_member_counters
+  after_destroy   :update_member_counters
+  after_update    :update_member_counters
+
+  scope :current,      lambda { |time = Time.now| where("ends_at > ?", time) }
+  scope :lapsed,       lambda { |time = Time.now| where("ends_at < ?", time).where("ends_at > ?", time - 1.year) }
+  scope :past,         lambda { |time = Time.now| where("ends_at < ?", time - 1.year) }
+
   def self.for(membership_type)
     new.tap do |membership|
       membership.membership_type  = membership_type
@@ -15,10 +25,13 @@ class Membership < ActiveRecord::Base
     end
   end
 
+  def update_member_counters
+    self.member.count_memberships
+  end
+
   # TODO: DJ this. Could be thousands of people.
   def self.for_award(membership_award)
     membership_award.people.each do |people|
-      Rails.logger.debug("                              MEMBERSHIP FOR #{people}")
       membership              = Membership.for(membership_award.membership_type)
       membership.ends_at      = membership_award.ends_at
       membership.sold_price   = membership_award.sold_price
@@ -28,6 +41,7 @@ class Membership < ActiveRecord::Base
     end
   end
 
+
   def adjust_expiration_to(new_ends_at)
     self.ends_at = new_ends_at
     self.save
@@ -60,5 +74,4 @@ class Membership < ActiveRecord::Base
   def order_summary_description
     self.membership_type.name
   end
-
 end

data/app/models/sale.rb

@@ -69,6 +69,7 @@ class Sale
       @comp = Comp.new(tickets.first.show, tickets, payment.customer, payment.benefactor)
       @comp.submit
       @buyer = @comp.recipient
+      self.cart.approve!
       true
     end
     

data/app/models/search.rb

@@ -12,7 +12,7 @@ class Search < ActiveRecord::Base
                   :min_donations_date, :max_donations_date, :discount_code,
                   :membership_status, :passholder, :membership_type_id, :membership_type
 
-  attr_accessor :membership_status, :passholder
+  attr_accessor :passholder
 
   def length
     people.length
@@ -77,6 +77,16 @@ class Search < ActiveRecord::Base
       conditions << string
     end
 
+    if membership_status.present?
+      state_str = (membership_status == "None") ? "not" : membership_status.downcase
+      conditions << "Are #{state_str} members"
+    end
+
+    if membership_type_id.present?
+      people = people.joins(:member => [:memberships => [:membership_type]])
+      people = people.where('membership_types.id = ?', membership_type_id)
+    end
+
     String.new.tap do |s|
       if conditions.blank?
         if person_type == "Company"
@@ -143,9 +153,21 @@ class Search < ActiveRecord::Base
       people = people.having("SUM(items.price + items.nongift_amount) <= ?", max_donations_amount * 100.0) unless max_donations_amount.blank?
     end
 
-    unless membership_type_id.blank?
+    ### MEMBERSHIP ##
+
+    if membership_status.present?
+      #Necessary because we need a left join for the "Not" condition to work
+      people = people.joins('left join members on members.person_id = people.id')
+      
+      people = people.merge(Member.current)  if membership_status == "Current"
+      people = people.merge(Member.lapsed)   if membership_status == "Lapsed"
+      people = people.merge(Member.past)     if membership_status == "Past"
+      people = people.where("members.id is null")     if membership_status == "Not"
+    end
+
+    if membership_type_id.present?
       people = people.joins(:member => [:memberships => [:membership_type]])
-                     .where('membership_types.id = ?', membership_type_id)
+      people = people.where('membership_types.id = ?', membership_type_id)
     end
 
     people.select(column_names).uniq

data/app/models/show.rb

@@ -17,6 +17,12 @@ class Show < ActiveRecord::Base
   has_many :settlements
   has_many :items
   has_many :ticket_types
+
+  #
+  # Because we need to use alias, you'll need to .includes(:show_stats_view) instead of .includes(:stats)
+  #
+  has_one  :show_stats_view
+  alias :stats :show_stats_view
   
   before_destroy  :destroyable?
   after_create    :update_ticket_types
@@ -187,6 +193,9 @@ class Show < ActiveRecord::Base
     settleables
   end
 
+  #
+  # Horribly inefficient. Don't use with a list of shows.
+  #
   def destroyable?
     (tickets_comped + tickets_sold).empty? && items.empty?
   end

data/app/models/ticket.rb

@@ -42,6 +42,9 @@
   scope :uncommitted,   where("state != 'sold'").where("state != 'comped'")
 
   state_machine do
+    #
+    # show_stats_view depends on these states
+    #
     state :off_sale
     state :on_sale
     state :sold

data/app/models/user.rb

@@ -23,11 +23,11 @@
   attr_accessible :email, :password, :password_confirmation, :remember_me, :user_agreement, :newsletter_emails, :first_name, :last_name, :user_memberships_attributes
 
   def is_in_organization?
-    !!(user_memberships.any? && ! user_memberships.first.organization.new_record?)
+    @is_in_organization ||= !!(user_memberships.any? && ! user_memberships.first.organization.new_record?)
   end
 
   def current_organization
-    is_in_organization? ? user_memberships.first.organization : Organization.new
+    @current_organization ||= is_in_organization? ? user_memberships.first.organization : Organization.new
   end
 
   def membership_in(organization)

data/app/views/events/_menu.html.haml

@@ -5,7 +5,7 @@
   .accordion-group
     .accordion-heading
       = link_to "Event Details", '#collapseEventDetails', :class => 'accordion-toggle', 'data-toggle' => 'collapse', 'data-parent'=>'#event-accordion'
-    #collapseEventDetails.accordion-body.collapse{:class => in?(:details)}
+    #collapseEventDetails.accordion-body.collapse{:class => in_section?(:details)}
       .accordion-inner
         %ul.accordion-menu
           = active_link_to 'About', edit_event_path(@event)
@@ -16,7 +16,7 @@
   .accordion-group
     .accordion-heading
       = link_to 'Shows', "#collapseShowList", :class => 'accordion-toggle', 'data-toggle' => 'collapse', 'data-parent'=>'#event-accordion'
-    #collapseShowList.accordion-body.collapse{:class => in?(:shows)}
+    #collapseShowList.accordion-body.collapse{:class => in_section?(:shows)}
       .accordion-inner
         %ul.accordion-menu
           %li.add

data/app/views/events/_share_and_sell.haml

@@ -1,7 +1,7 @@
 .accordion-group
   .accordion-heading
     = link_to 'Share & Sell', "#collapseShareSell", :class => 'accordion-toggle', 'data-toggle' => 'collapse', 'data-parent'=>'#event-accordion'
-  #collapseShareSell.accordion-body.collapse{:class => in?(:share)}
+  #collapseShareSell.accordion-body.collapse{:class => in_section?(:share)}
     .accordion-inner
       %ul.accordion-menu
         = active_link_to 'Storefront', storefront_link_event_path(event)

data/app/views/events/image.html.haml

@@ -19,6 +19,7 @@
               ="Spruce up this event with an image! This image will be displayed on both #{link_to "your Storefront", store_event_url(@event)} (where patrons will purchase tickets) and within your Artful.ly management pages.".html_safe
             %ul{:style => "list-style-type: circle;"}
               %li Image size is limited to 1 MB
+              %li We recommend your image be at least 300 pixels wide
               %li Only .jpg, .jpeg, .gif, and .png file formats are supported
               %li Your image will be displayed with equal height and width
               %li You can come back to this page to change the image at any time

data/app/views/events/show.html.haml

@@ -38,7 +38,9 @@
                   =link_to 'Add venue address', edit_event_venue_path(@event)
           .span6
             %strong=@event.venue.name
-            %div=@event.venue.street_as_string
+            %div=@event.venue.address1
+            -unless @event.venue.address2.blank?
+              %div=@event.venue.address2
             %div=@event.venue.city_state_zip_as_string
     - if @event.destroyable?
       .row-fluid

data/app/views/layouts/storefront.html.haml

@@ -21,6 +21,8 @@
                 %ul.dropdown-menu
                   %li= link_to "My Membership", members_root_path
                   %li= link_to "Sign Out", destroy_member_session_path
+            -else
+              %li= link_to "Member Login", new_member_session_path
 
 
     .content.container

data/app/views/members/index/index.html.haml

@@ -12,13 +12,13 @@
           %td TODO
         %tr
           %td Member Through
-          %td=l current_member.active_memberships.first.ends_at, :format => :date
+          %td=l current_member.memberships.current.first.ends_at, :format => :date
         %tr
           %td Membership
-          %td=current_member.active_memberships.first.membership_type.name
+          %td=current_member.memberships.current.first.membership_type.name
         %tr
           %td Memberhsips
-          %td=current_member.active_memberships.length
+          %td=current_member.memberships.current.count
         %tr
           %td Auto-renewal
           %td 

data/app/views/searches/_form.html.haml

@@ -83,42 +83,42 @@
           = f.number_field :zip, in: 00001..99999, placeholder: "Zipcode", class: "input-small"
           = f.select :state, options_for_select(sorted_us_state_names, selected: search.state), {include_blank: "State"}, {class: "input-medium"}
 
-  / %h4 Membership
-  / .accordion#accordion3
-  /   .accordion-group
-  /     .accordion-heading
-  /       %a.accordion-toggle{"data-toggle"=>"collapse","data-parent"=>"#accordion3",:href=>"#collapseSeven"}
-  /         Status
-  /     #collapseSeven.accordion-body.collapse
-  /       .accordion-inner
-  /         = f.select :membership_status, ["Current", "Lapsed", "Past", "Never"], include_blank: ""
+  %h4 Membership
+  .accordion#accordion3
+    .accordion-group
+      .accordion-heading
+        %a.accordion-toggle{"data-toggle"=>"collapse","data-parent"=>"#accordion3",:href=>"#collapseSeven"}
+          Status
+      #collapseSeven.accordion-body.collapse
+        .accordion-inner
+          = f.select :membership_status, Member.states.collect(&:capitalize), include_blank: ""
 
-  /   .accordion-group
-  /     .accordion-heading
-  /       %a.accordion-toggle{"data-toggle"=>"collapse","data-parent"=>"#accordion3",:href=>"#collapseEight"}
-  /         Type
-  /     #collapseEight.accordion-body.collapse
-  /       .accordion-inner
-  /         = f.select :membership_type_id, options_from_collection_for_select(@membership_types, 'id', 'name', @search.membership_type), include_blank: ""
+    .accordion-group
+      .accordion-heading
+        %a.accordion-toggle{"data-toggle"=>"collapse","data-parent"=>"#accordion3",:href=>"#collapseEight"}
+          Type
+      #collapseEight.accordion-body.collapse
+        .accordion-inner
+          = f.select :membership_type_id, options_from_collection_for_select(@membership_types, 'id', 'name', @search.membership_type), include_blank: ""
 
-  /   .accordion-group
-  /     .accordion-heading
-  /       %a.accordion-toggle{"data-toggle"=>"collapse","data-parent"=>"#accordion3",:href=>"#collapseNine"}
-  /         Start/End
-  /     #collapseNine.accordion-body.collapse
-  /       .accordion-inner
-  /         = date_field_tag "search[min_donations_date]", search.min_donations_date.try(:strftime, "%F"), max: Time.now.strftime("%F")
-  /         %span.range-separator to
-  /         = date_field_tag "search[max_donations_date]", search.max_donations_date.try(:strftime, "%F"), max: Time.now.strftime("%F")
+    / .accordion-group
+    /   .accordion-heading
+    /     %a.accordion-toggle{"data-toggle"=>"collapse","data-parent"=>"#accordion3",:href=>"#collapseNine"}
+    /       Start/End
+    /   #collapseNine.accordion-body.collapse
+    /     .accordion-inner
+    /       = date_field_tag "search[min_donations_date]", search.min_donations_date.try(:strftime, "%F"), max: Time.now.strftime("%F")
+    /       %span.range-separator to
+    /       = date_field_tag "search[max_donations_date]", search.max_donations_date.try(:strftime, "%F"), max: Time.now.strftime("%F")
 
-  /   .accordion-group
-  /     .accordion-heading
-  /       %a.accordion-toggle{"data-toggle"=>"collapse","data-parent"=>"#accordion3",:href=>"#collapseTen"}
-  /         Year
-  /     #collapseTen.accordion-body.collapse
-  /       .accordion-inner
-  /         = f.select :membership_status, ["2013", "2012", "2010", "2009"], include_blank: ""
+    / .accordion-group
+    /   .accordion-heading
+    /     %a.accordion-toggle{"data-toggle"=>"collapse","data-parent"=>"#accordion3",:href=>"#collapseTen"}
+    /       Year
+    /   #collapseTen.accordion-body.collapse
+    /     .accordion-inner
+    /       = f.select :membership_status, ["2013", "2012", "2010", "2009"], include_blank: ""
 
   .control
-    = f.submit "Search", :class => 'btn'
+    = f.submit "Search", :id => "advanced-search-submit", :class => 'btn'
     = link_to "Simple Search", people_path

data/app/views/shows/_controls.html.haml

@@ -1,27 +1,11 @@
 
 - if not show.played?
-  = form_tag built_event_shows_path(@event), :remote => true, :'data-type' => :json, :class => "sprited pending" do
-    = hidden_field_tag :show_id, show.id
-    = submit_tag "Create Tickets", :class => [ 'btn', 'btn-mini' ]
-
-  = form_tag on_sale_event_shows_path(@event), :remote => true, :'data-type' => :json, :class => "sprited built" do
-    = hidden_field_tag :show_id, show.id
-    = submit_tag "Put On Sale", :class => [ 'btn', 'btn-mini' ]
-    .confirmation.dialog
-      %p= "You are about to put all tickets for the #{l show.datetime_local_to_event} showing of #{show.event.name} on sale and make it public."
-
   = form_tag unpublished_event_show_path(show.event, show), :remote => true, :'data-type' => :json, :class => "sprited published", :id => "show_#{show.id}" do
     = submit_tag "Unpublish", :class => [ 'btn', 'btn-mini' ]
     .confirmation.dialog
-      %p= "You are unpublishing the #{l show.datetime_local_to_event} showing of #{show.event.name}."
+      %p= "You are unpublishing the #{l show.stats.datetime_local_to_event} show."
 
   = form_tag published_event_show_path(show.event, show), :remote => true, :'data-type' => :json, :class => "sprited built unpublished" do
     = submit_tag "Publish", :class => [ 'btn', 'btn-mini' ]
     .confirmation.dialog
-      %p= "You are publishing the #{l show.datetime_local_to_event} showing of #{show.event.name}."
-
-  = form_tag event_show_path(@event, show), :method => :delete, :remote => true, :'data-type' => :json, :class => "sprited destroyable" do
-    = hidden_field_tag :show_id, show.id
-    = submit_tag "Delete", :class => [ 'btn', 'btn-mini', 'btn-danger' ]
-    .confirmation.dialog
-      %p= "Are you sure you want to delete this show?  Any tickets that have been created will also be deleted."
+      %p= "You are publishing the #{l show.stats.datetime_local_to_event} show."

data/app/views/shows/index.html.haml

@@ -9,31 +9,36 @@
   .span9
     = render "shared/error_messages", :target => @event
     .row-fluid
-      .span3
-        %h3 Shows List
-      .span9
-        =icon_link_to("Add", new_event_show_path(@event, @show), 'icon-plus-sign', 'btn', '')
+      .span12
+        .btn-group.pull-right
+          =link_to "Upcoming", event_shows_path(@event), :class => "btn #{"active" if !@all}"
+          =link_to "All", all_event_shows_path(@event), :class => "btn #{"active" if @all}"
     %table.table
       %thead
-        %th Date/Time
+        %th{:colspan => 2} Date/Time
         %th
-        %th On sale
-        %th Sold
-        %th Comped
+        %th.right On sale
+        %th.right Sold
+        %th.right Comped
       %tbody
         -if @shows.empty?
           %tr
-            %td{:colspan => 5}
+            %td{:colspan => 6}
               .no-image.full
                 #text
-                  =link_to 'You have no shows scheduled.  Add one now.', new_event_show_path(@event, @show)
+                  =link_to 'You have no upcoming shows scheduled.', new_event_show_path(@event, @show)
         -@shows.each do |show|
-          %tr.sprited-container{ :class => [show.state, show.destroyable? ? "destroyable" : "" ] }
+          %tr.sprited-container{ :class => [show.state] }
             %td
-              =link_to l(show.datetime_local_to_event, :format => :short), event_show_path(@event, show), :title => 'show-datetime'
+              =link_to l(show.stats.datetime_local_to_event, :format => :abbreviated_day), event_show_path(@event, show), :title => 'show-datetime'
+            %td
+              =link_to l(show.stats.datetime_local_to_event, :format => :short), event_show_path(@event, show), :title => 'show-datetime'
             %td{:style => 'text-align:right'}
               =render :partial => "shows/controls", :locals => { :show => show }
-            %td.available_value= show.glance.available_total
-            %td.gross_value= show.glance.sold_total
-            %td.comped_value= show.glance.comped_total
+
+            %td.right.available_value= show.stats.on_sale
+            %td.right.gross_value= show.stats.sold
+            %td.right.comped_value= show.stats.comped
+
+    =will_paginate @shows
                   

data/app/views/store/events/_venue.html.haml

@@ -3,5 +3,7 @@
   =link_to image_tag("https://maps.google.com/maps/api/staticmap?size=140x140&maptype=roadmap&markers=color:red|#{event.venue.address_as_url_query}&sensor=false&zoom=15"), "https://maps.google.com/maps?q=#{event.venue.address_as_url_query.html_safe}&z=15"
   %div
     %strong=event.venue.name
-  %div=event.venue.street_as_string
+  %div=event.venue.address1
+  -unless event.venue.address2.blank?
+    %div=event.venue.address2
   %div=event.venue.city_state_zip_as_string

data/app/views/store/events/single_show.html.haml

@@ -7,9 +7,8 @@
 
       #event-header.side-section
         %h1#logo= @event.name
-        %h4= @event.shows.first.show_time
         %h4= @event.producer
-        %h4= @event.venue.city_state_zip_as_string
+        %h4= @event.shows.first.show_time
 
       #about-event.side-section
         #description

data/config/locales/en.yml

@@ -22,13 +22,15 @@
   time:
     formats:
       default: "%B %d, %Y %I:%M %p"
-      short: "%m/%d/%Y %I:%M %p"
+      short: "%m/%d/%Y %l:%M %p"
       slashed_date: "%m/%d/%Y"
       day_time: "%a, %b %d %l:%M %P"
       day_time_at: "%a, %b %d at %I:%M %P"
       date: "%B %d, %Y"
       long_date: "%B %d, %Y %I:%M %p"
-      long_with_day: "%A, %b %d %Y %I:%M %p"
+      long_with_day: "%A, %b %d %Y %l:%M %p"
+      long_with_abbrviated_day: "%a, %b %d %Y %l:%M %p"
+      abbreviated_day: "%a"
       time: "%I:%M %p"
       day: "%A"
       date_for_input: "%Y-%m-%d"

data/config/routes.rb

@@ -85,8 +85,6 @@ Rails.application.routes.draw do
     end
   end
 
-  resources :memberships, :only => :index
-
   def people_actions
     resources :actions
     resources :memberships do
@@ -166,6 +164,8 @@ Rails.application.routes.draw do
         post :built
         post :on_sale
         get :calendar
+        get :all, :to => :index, :range => :all
+        get :upcoming
       end
     end
     resource :venue, :only => [:edit, :update]

data/db/migrate/20131002191646_create_show_stats_view.rb

@@ -0,0 +1,16 @@
+class CreateShowStatsView < ActiveRecord::Migration
+  def change
+    execute "CREATE OR REPLACE VIEW show_stats_view as select " + 
+              "shows.id, shows.id as show_id, shows.event_id as event_id, shows.organization_id as organization_id, shows.datetime, shows.state as state, count(tickets.id) as capacity, venues.time_zone as time_zone,  " + 
+              "SUM(CASE WHEN tickets.state='sold' then 1 else 0 end) as sold, " + 
+              "SUM(CASE WHEN tickets.state='comped' then 1 else 0 end) as comped, " + 
+              "SUM(CASE WHEN tickets.state='on_sale' then 1 else 0 end) as on_sale, " + 
+              "SUM(CASE WHEN tickets.state='off_sale' then 1 else 0 end) as off_sale, " + 
+              "SUM(CASE WHEN tickets.state='on_sale' or tickets.state='off_sale' then 1 else 0 end) as 'open' "  + 
+              "from shows " + 
+              "left join tickets on shows.id = tickets.show_id " + 
+              "left join events on shows.event_id = events.id " + 
+              "left join venues on events.venue_id = venues.id " +
+              "group by shows.id"
+  end
+end

data/db/migrate/20131007141421_add_counters_to_member.rb

@@ -0,0 +1,7 @@
+class AddCountersToMember < ActiveRecord::Migration
+  def change
+    add_column :members, :current_memberships_count,  :integer, :default => 0
+    add_column :members, :lapsed_memberships_count,   :integer, :default => 0
+    add_column :members, :past_memberships_count,     :integer, :default => 0
+  end
+end

data/db/migrate/20131007144456_remove_expires_at_from_membership.rb

@@ -0,0 +1,6 @@
+class RemoveExpiresAtFromMembership < ActiveRecord::Migration
+  def change
+    #Use ends_at instead
+    remove_column :memberships, :expires_at
+  end
+end

data/lib/artfully_ose/version.rb

@@ -1,3 +1,3 @@
 module ArtfullyOse
-  VERSION = "1.2.0.pre.5"
+  VERSION = "1.2.0.pre.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: artfully_ose
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre.5
+  version: 1.2.0.pre.6
 platform: ruby
 authors:
 - Artful.ly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-01 00:00:00.000000000 Z
+date: 2013-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1902,6 +1902,7 @@ files:
 - app/controllers/ticket_types_controller.rb
 - app/controllers/tickets_controller.rb
 - app/controllers/user_memberships_controller.rb
+- app/controllers/users/sessions_controller.rb
 - app/controllers/venues_controller.rb
 - app/helpers/artfully_ose_helper.rb
 - app/helpers/devise_helper.rb
@@ -2385,6 +2386,9 @@ files:
 - db/migrate/20130827190839_add_fee_to_tickets_and_donations.rb
 - db/migrate/20130829015011_migrate_fees_to_items.rb
 - db/migrate/20130917165559_add_service_fee_to_memberships.rb
+- db/migrate/20131002191646_create_show_stats_view.rb
+- db/migrate/20131007141421_add_counters_to_member.rb
+- db/migrate/20131007144456_remove_expires_at_from_membership.rb
 - lib/artfully_ose/common_abilities.rb
 - lib/artfully_ose/core_ext.rb
 - lib/artfully_ose/engine.rb