artfully_ose 1.3.0.pre3 → 1.3.0.pre4

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

@@ -1,6 +1,5 @@
 @import "colors"
 @import "mixins"
-@import url(https://fonts.googleapis.com/css?family=Roboto:400,100,300)
 
 body
   padding-top: 10px
@@ -150,7 +149,7 @@ ul#shows, ul#memberships
         text-align: center
         .month
           text-transform: uppercase
-          font-size: 10px
+          font-size: 12px
         .day
           font-size: 30px
       .time
@@ -158,6 +157,7 @@ ul#shows, ul#memberships
         h4.day_and_month
           font-weight: bold
           margin-bottom: 5px
+          margin-top: 2px
     
     .sections
       margin-bottom: 20px
@@ -176,7 +176,6 @@ ul#shows, ul#memberships
           width: 100px
         input[type="submit"]
           margin-top: -8px
-
 ul#memberships
   li
     .title
@@ -193,12 +192,40 @@ ul#memberships
         font-size: 25px
         font-weight: bold
 
+.seat-row
+  margin-bottom: 3px
+  .seat
+    height: 24px
+    width: 24px
+    border-radius: 14px
+    border: 1px solid #CECECE
+    float: left
+    margin-left: 2px
+    background-repeat: no-repeat
+  .seat-mini
+    height: 16px
+    width: 16px
+    border-radius: 10px
+  .seat-chosen
+    background-color: orange
+  .empty
+    background-color: #479FFF
+  .filled
+    background-color: grey
+  .wheelchair
+    background-image: image_url('/assets/seating_temp/icon_43405.png')
+    background-position: 5px 3px
+    background-size: 18px 18px
+  .noseat
+    border: 0px
+    width: 26px 
+  .clear
+    clear: both
+  .member-off
+    opacity: 0.5
 
 .calendar-month
-  margin-bottom: 50px
-  float: left
-  margin-right: 30px
-  min-height: 250px
+  margin-bottom: 20px
   h3
     font-weight: bold
 
@@ -340,21 +367,12 @@ table.calendar
 
 .clean
   .navbar-inner
-    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2))
-    background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2)
-    background-image: -o-linear-gradient(top, #ffffff, #f2f2f2)
-    background-image: linear-gradient(to bottom, #ffffff, #f2f2f2)
     background-repeat: repeat-x
     border: 1px solid #d4d4d4
-    -webkit-border-radius: 4px
-    -moz-border-radius: 4px
-    border-radius: 4px
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0)
-    -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065)
-    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065)
-    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065)
+    background-image: none
   .brand-lite
-    color: #331
+    color: #fff
+    font-weight: 100
 
 .navbar .btn.primary, .btn.btn-orange 
   text-shadow: none
@@ -520,6 +538,18 @@ tr.no-border
         vertical-align: baseline
         margin-top: 0
 
+#stage
+  width: 200px
+  height: 50px
+  border: 1px solid #999
+  margin: 5px auto
+  background-color: #dfdfdf
+  text-align: center
+  #text
+    padding-top: 27px
+    color: #666
+    padding-top: 18px
+
 #event-header.side-section
   h4
     padding-bottom: 8px
@@ -528,3 +558,27 @@ tr.no-border
     font-weight: bold
     line-height: 1.4em
     font-size: 1em
+
+.add-to-cart-success
+  .add-to-cart-message
+    font-size: 24px
+    color: black
+    line-height: 24px
+    padding-top: 10px
+
+#loginNagModal
+  .modal-header
+    border-bottom: 3px double #ddd
+    h4 
+      font-size: 1.3em
+  .modal-body
+    .well
+      height: 160px
+    h6
+      font-size: 14px
+    .button-container
+      margin-top: 30px
+    form
+      margin-top: 20px
+  .center
+    text-align: center

data/app/assets/stylesheets/storefront.css

@@ -1,6 +1,8 @@
 /*
  *= require bootstrap
+ *= require jquery/fullcalendar.css
  *= require sass/cart
+ *= require sass/seat-chart
  *= require sass/store
  *= require font-awesome
  *= require_self

data/app/concerns/pdf_generation.rb

@@ -2,17 +2,11 @@ require 'json'
 require 'digest/md5'
 
 class PdfGeneration
-  PDF_POST_URL     = "http://quick-pdf.geminisbs.net/pdfs.json"
-  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)
+  def initialize(pdfable)
     @pdfable      = pdfable
-    @pdf_api_key  = pdf_api_key
-    @http_party   = http_party
-    @sleeper      = sleeper
     @pdf_options  = {}
   end
 
@@ -53,12 +47,4 @@ class PdfGeneration
   def filename
     "#{Digest::MD5.hexdigest pdfable.id.to_s}.pdf"
   end
-
-  def status_url(json)
-    PDF_GET_URL.gsub(":id", json["id"].to_s).gsub(":key", pdf_api_key)
-  end
-
-  def download_url(json)
-    PDF_DOWNLOAD_URL.gsub(":id", json["id"].to_s).gsub(":key", pdf_api_key)
-  end
 end

data/app/controllers/advanced_searches_controller.rb

@@ -11,8 +11,6 @@ class AdvancedSearchesController < ApplicationController
       redirect_to new_search_path and return
     end
 
-    @search = AdvancedSearch.new(params[:search])
-
     respond_to do |format|
       format.html
       format.js { render json: { shows: @shows, ticket_types: @ticket_types }}
@@ -39,7 +37,7 @@ class AdvancedSearchesController < ApplicationController
 
     respond_to do |format|
       format.html
-      format.csv  { render :csv => Person.where(id: @search.people_ids(1, AdvancedSearch::MAX_SOLR_RESULTS)).includes(:phones, :address, :tags).order('lower(people.last_name)'), :filename => "#{@search.id}-#{DateTime.now.strftime("%m-%d-%y")}" }
+      format.csv  { render :csv => Person.where(id: @search.people_ids(1, AdvancedSearch::MAX_SOLR_RESULTS)).includes(:phones, :addresses, :tags).order('lower(people.last_name)'), :filename => "#{@search.id}-#{DateTime.now.strftime("%m-%d-%y")}" }
     end
   end
 

data/app/controllers/charts_controller.rb

@@ -1,19 +1,21 @@
 class ChartsController < ApplicationController
   def update
-    @chart = Chart.find(params[:id])
-    authorize! :edit, @chart
 
-    if @chart.update_attributes_from_params(Chart.polish_params(params[:chart]))
-      flash[:notice] = "Prices saved."
-    else
-      flash[:error] = "Please name all of your ticket types."
-      redirect_to prices_event_url(@chart.event) and return
-    end
+    assigned_chart = current_user.current_organization.charts.find(params[:id])
 
-    if user_requesting_next_step?
-      redirect_to image_event_path(@chart.event)
+    if params[:assigned_chart].present?
+      assigned_chart.update_attributes(params[:assigned_chart])
     else
-      redirect_to prices_event_url(@chart.event)
+      assigned_chart.sync(JSON.parse params[:chart])
     end
+    
+    #reload the chart so we can ensure tickets and ticket_Types are included
+    assigned_chart = Chart.includes(assigned_chart.class.included_models).find(assigned_chart)
+    render :partial => "seating/chart", :locals => { :chart => assigned_chart }, :layout => false
+  end
+
+  def show
+    assigned_chart = current_user.current_organization.charts.find(params[:id])
+    render :partial => "seating/chart", :locals => { :chart => assigned_chart }, :layout => false
   end
-end
+end

data/app/controllers/console_sales_controller.rb

@@ -14,11 +14,58 @@ class ConsoleSalesController < ArtfullyOseController
     @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)}}
 
     @pass_types = current_organization.pass_types.all
+
+    if selling_for_seat?
+      @seat = Seat.joins(:chart)
+                  .where('charts.organization_id = ?',current_organization.id)
+                  .find(params[:seat_id])
+
+      chart = @seat.chart
+      ticket = @seat.ticket
+
+      if ticket.sold?
+        flash[:error] = "We can't put this ticket in your cart because this ticket has already been sold."
+        return
+      end
+
+      @ticket_type = chart.ticket_types.find(params[:ticket_type_id])
+      OrderHandler.new(current_sales_console_cart, nil).add_tickets(ticket, @ticket_type)
+
+      params[:person_id] = @seat.held_for if @seat.held_for.present?
+      verify_person
+
+      if add_all_for_hold?
+        seats = Seat.joins(:chart)
+                    .where('charts.organization_id = ?',current_organization.id)
+                    .where(:held_for_id => @seat.held_for_id)
+
+        tickets = current_organization.tickets
+                                      .uncommitted
+                                      .where(:seat_id => seats.collect(&:id))
+                                      .where('cart_id is null')
+
+        OrderHandler.new(current_sales_console_cart, nil).add_tickets(tickets, @ticket_type)
+
+      else
+        unless @person.nil?
+          @other_seats_are_being_held = Seat.where(:chart_id => @seat.chart_id)
+                                          .where(:held_for_id => @seat.held_for_id)
+                                          .joins(:ticket)
+                                          .where('tickets.cart_id is null')
+                                          .count > 0
+        end
+      end
+    end
   end
 
   def update
     handler = OrderHandler.new(current_sales_console_cart, nil)
     handler.handle(params, current_organization)
+
+    unless current_sales_console_cart.applied_pass.nil?
+      @person = Person.find(current_sales_console_cart.applied_pass.person_id)
+    end
+
     flash[:alert] = handler.error unless handler.error.blank?
     redirect_to new_console_sale_path(:person_id => @person.try(:id))
   end
@@ -150,6 +197,14 @@ class ConsoleSalesController < ArtfullyOseController
       str
     end
 
+    def selling_for_seat?
+      params[:seat_id].present?
+    end
+
+    def add_all_for_hold?
+      params[:add_all].present? && params[:add_all] == "true"
+    end
+
     def verify_person
       @person_id = params[:person_id]
       if @person_id.present?

data/app/controllers/event_calendars_controller.rb

@@ -0,0 +1,15 @@
+class EventCalendarsController < ArtfullyOseController
+  def index
+    respond_to do |format|
+      format.json do
+        starts_at = Time.at(params[:start].to_i).to_datetime
+        ends_at = Time.at(params[:end].to_i).to_datetime
+        render :json => Event.as_full_calendar_json(current_user.current_organization, starts_at, ends_at)
+      end
+
+      format.html do
+        render :index
+      end
+    end
+  end
+end

data/app/controllers/events_controller.rb

@@ -1,17 +1,25 @@
 class EventsController < ArtfullyOseController
   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 :find_event, :only => [ :show, :edit, :update, :destroy, :widget, :image, :storefront_link, :prices, :messages, :resell, :wp_plugin, :passes, :seating ]
   before_filter :upcoming_shows, :only => :show
   before_filter { authorize! :view, @event if @event }
 
   def create
     @event = Event.new(params[:event])
-    @templates = current_organization.charts.template
     @event.organization_id = current_organization.id
     @event.is_free = !(current_organization.can? :access, :paid_ticketing)
-    @event.venue.organization_id = current_organization.id
-    @event.venue.time_zone = current_organization.time_zone
+
+    venue = Venue.most_recently_named(current_organization, params[:event][:venue_attributes][:name])
+
+    if venue
+      @event.venue = venue.dup
+      @event.set_default_chart(venue.default_chart.dup!({:save => true}))
+    else
+      @event.venue.organization_id = current_organization.id
+      @event.venue.time_zone = current_organization.time_zone
+    end
+
     @event.contact_email = current_organization.try(:email) || current_user.email
 
     if @event.save
@@ -54,8 +62,8 @@ class EventsController < ArtfullyOseController
   def new
     @event = current_organization.events.build(:producer => current_organization.name)
     @event.venue = Venue.new
+    @venue_names = current_organization.venues.pluck(:name).uniq.sort
     authorize! :new, @event
-    @templates = current_organization.charts.template
   end
 
   def edit
@@ -107,6 +115,9 @@ class EventsController < ArtfullyOseController
   def prices
   end
 
+  def seating
+  end
+
   def passes
   end
 

data/app/controllers/exchanges_controller.rb

@@ -5,13 +5,15 @@ class ExchangesController < ArtfullyOseController
     @person = @order.person
 
     if @items.all?(&:exchangeable?)
-      @events = current_organization.events.sort
+      @events = upcoming_events
 
       unless params[:event_id].blank?
         @event = Event.find(params[:event_id])
         @shows = @event.upcoming_shows(:all)
         unless params[:show_id].blank? || @event.blank?
-          @show = Show.includes(:event => :venue, :chart => [:sections => :ticket_types]).find(params[:show_id])
+          @show = Show.includes(:event => :venue).find(params[:show_id])
+          @chart = Chart.find(@show.chart_id)
+          @chart = Chart.includes(@chart.class.included_models).find(@show.chart_id)
           unless params[:ticket_type_id].blank? || @show.blank?
             @ticket_type = TicketType.find(params[:ticket_type_id])
             @num_available_tickets = @ticket_type.available
@@ -29,14 +31,25 @@ class ExchangesController < ArtfullyOseController
     order = Order.find(params[:order_id])
     items = params[:items].collect { |item_id| Item.find(item_id) }
     ticket_type = TicketType.find(params[:ticket_type_id])
-    tickets = ticket_type.available_tickets(items.count)
+
+    if params[:seat_id].present?
+      @tickets = current_organization.tickets.includes(:seat).where(:seat_id => params[:seat_id])
+      @seats = @tickets.collect(&:seat)
+      @selected_tickets_available = @seats.collect(&:available_for_purchase).reduce{|r,e| r && e}
+    else
+      @tickets, error = ticket_type.available_tickets(items.count)
+    end
+
     logger.debug("Beginning exchange")
-    @exchange = Exchange.new(order, items, tickets, ticket_type, send_email_confirmation?)
+    @exchange = Exchange.new(order, items, @tickets, ticket_type, send_email_confirmation?)
 
-    if tickets.nil?
+    if @tickets.nil?
       flash[:error] = "Please select tickets to exchange."
       redirect_to :back
-    elsif tickets.size != items.size
+    elsif !@selected_tickets_available
+      flash[:error] = "Sorry, one or more of your seats is not available for this ecahnge. Please select different seats."
+      redirect_to :back
+    elsif @tickets.size != items.size
       flash[:error] = "There were not enough tickets available for this show. (#{items.size} needed, #{tickets.size} available.)"
       redirect_to :back
     elsif @exchange.valid?
@@ -50,7 +63,17 @@ class ExchangesController < ArtfullyOseController
     end
   end
 
-  def send_email_confirmation?
-    params[:send_email_confirmation] == "1"
-  end
+  private
+    def send_email_confirmation?
+      params[:send_email_confirmation] == "1"
+    end
+
+    def upcoming_events
+      Event.unscoped.where(:deleted_at => nil)
+                            .where(:organization_id => current_organization.id)
+                            .where(:id => current_organization.shows.unplayed.pluck(:event_id).uniq)
+                            .joins(:shows)
+                            .order('name ASC')
+                            .uniq
+    end
 end

data/app/controllers/export_controller.rb

@@ -29,4 +29,12 @@ class ExportController < ArtfullyOseController
     send_data @csv_string, :filename => @filename, :type => "text/csv", :disposition => "attachment"
   end
 
+  def all_sales
+    @organization = current_user.current_organization
+    @filename = "Artfully-Sales-Export-#{DateTime.now.strftime("%m-%d-%y")}.csv"
+    @items = ItemView.where(:organization_id => current_organization).where("product_type in('Ticket', 'Pass', 'Membership')").all
+    @csv_string = @items.to_comma(:all_sales)
+    send_data @csv_string, :filename => @filename, :type => "text/csv", :disposition => "attachment"
+  end
+
 end