artfully_ose 1.2.0.beta.1 → 1.2.0.pre

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

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

data/app/assets/stylesheets/sass/_tags.sass

@@ -39,22 +39,11 @@ ul.tags
     
 .tag
   background-color: #f8930a
+  border-right: 1px solid #a85300
+  border-bottom: 1px solid #a85300
   padding: 2px 4px 2px 4px
   font-size: 10pt
   color: #EEEEEE
-.tag-member
-  background-color: #175c71
-  padding: 3px 5px 3px 5px
-  a 
-    font-weight: normal
-    color:white
-.tag-passholder
-  background-color: #8e0a34
-  padding: 3px 5px 3px 5px
-  font-weight: normal
-  a 
-    font-weight: normal
-    color:white
 
 .tag-error
   color: #991111

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

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

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

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

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

@@ -1,6 +1,5 @@
 @import "colors"
 @import "mixins"
-@import url(http://fonts.googleapis.com/css?family=Roboto:400,100,300)
 
 body
   padding-top: 10px
@@ -23,27 +22,6 @@ h4
   font-size: 1.25em
   margin-bottom: .5em
 
-#membership-storefront
-  h3
-    font-size: 1.3em
-    color: #666
-    margin-bottom: .5em
-  h4
-    color: #666
-    font-size: 1.25em
-    margin-bottom: .5em
-  h5
-    color: #666
-    font-size: 1.25em
-    margin-bottom: .5em
-    color: #99BABB
-  h6
-    color: #666
-    font-size: 1.25em
-    margin-bottom: .5em
-    color: #9d2235
-
-
 #venue
   line-height: 1.4em
   font-size: 1em
@@ -123,6 +101,8 @@ h4
 img#logo
   float: left
   margin-right: 10px
+
+h1#logo
   
 ul#shows, ul#memberships
   clear: both
@@ -160,6 +140,8 @@ ul#shows, ul#memberships
           margin-bottom: 5px
     
     .sections
+      padding: 10px
+      margin-left: 60px
       margin-bottom: 20px
       .section
         margin-bottom: 20px
@@ -198,7 +180,6 @@ ul#memberships
   margin-bottom: 50px
   float: left
   margin-right: 30px
-  min-height: 250px
   h3
     font-weight: bold
 
@@ -228,6 +209,56 @@ table.calendar
 #shopping-cart
   width: auto
   background-color: #e6e6e6 !important
+  #steps
+    display: none
+    position: static
+    background: #fff
+    position: static
+    width: 650px
+    margin: 0px auto
+    padding: 50px
+    padding-top: 10px
+    padding-bottom: 0
+    height: 380px
+    overflow: auto
+    ul#nav
+      width: 650px
+      margin: 0 auto
+      overflow: hidden
+      margin-bottom: 20px
+      li
+        float: left
+        list-style: none
+        letter-spacing: 0
+        font-family: "Helvetica", Arial, arial, sans-serif
+        word-spacing: normal
+        &.active a
+          background-color: $compliment_highlight
+          color: #fff
+          font-weight: normal
+        &.disabled a
+          color: #BBB
+          cursor: default
+        a
+          @include rounded-corners(15px, 15px, 15px, 15px)
+          font-size: 12px
+          padding-top: 8px
+          padding-bottom: 8px
+          margin-top: 4px
+          padding-right: 12px
+          padding-left: 12px
+          margin-right: 2px
+          line-height: 14px
+          display: block
+          color: #333
+          &:hover
+            text-decoration: none
+  lable.error
+    color: red
+  .tab-pane
+    display: none
+    &.active
+      display: block
 
   #cart
     width: 100%
@@ -360,17 +391,27 @@ table.calendar
   text-shadow: none
   color: #fff
   background-color: #a85300
-  background-image: none
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#f8930a), to(#a85300))
+  background-image: -moz-linear-gradient(top, #f8930a, #a85300)
+  background-image: -ms-linear-gradient(top, #f8930a, #a85300)
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f8930a), color-stop(100%, #a85300))
+  background-image: -webkit-linear-gradient(top, #f8930a, #a85300)
+  background-image: -o-linear-gradient(top, #f8930a, #a85300)
+  background-image: linear-gradient(top, #f8930a, #a85300)
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f8930a', endColorstr='#a85300', GradientType=0)
+  border-color: #a85300 #a85300 #003f81
 
 .navbar .btn.primary 
   margin-top: 3px
   padding-top: 5px
   padding-bottom: 5px
 
+.event-image
+  width: 135px
+  height: 200px
+
 .store-event-display
   margin-bottom: 20px
-  h1 
-    margin-top: 0px
 
 #shopping-cart-display
   table
@@ -431,100 +472,4 @@ tr.no-border
   .controls
     margin-left: 0px
     .control-label
-      padding-right: 18px
-
-#single-show-container
-  .title
-    display: none
-
-
-  .event-poster
-    padding: 3px
-    border: 1px solid #eee
-
-#event-header, #donate-now-header
-  h1
-    font-family: 'Roboto', sans-serif
-    font-weight: 300
-  h4
-    font-family: 'Roboto', sans-serif
-    font-weight: 100
-    margin: 0px 0px 2px 0px
-
-#donate-now-header
-  text-align: center
-  margin-bottom: 30px
-
-#donate-now-container
-  margin-top: -30px
-  padding: 50px 20px 60px 20px
-  box-shadow: 6px 5px 5px -5px #999, -6px 5px 5px -5px #999
-
-#donate-now
-  text-align: center
-  margin-top: 20px
-
-.available-ticket-type-table
-  form
-    margin: 0px
-  .ticket-type-description
-    padding: 0px 6px
-  .ticket-type-quantity
-    font-family: 'Roboto', sans-serif
-    font-weight: 100
-    margin-bottom: 0px
-  .ticket-type-name
-    font-family: 'Roboto', sans-serif
-    font-weight: 100
-    font-size: 12pt
-    padding-top: 13px
-  .ticket-type-price
-    font-family: 'Roboto', sans-serif
-    font-weight: 100
-    font-size: 12pt
-    padding-top: 13px
-
-.event-image
-  img
-    max-width: 290px
-
-#poster-modal
-  .modal-body
-    text-align: center
-
-.add-donation-to-cart
-  .preset-amount
-    float: left
-    width: 227px
-    // height: 28px
-    margin-bottom: 10px
-    text-align: left
-
-.add-donation-to-cart
-  .preset-amount.last
-    width: 455px
-
-.add-donation-to-cart
-  .preset-amount
-    label
-      margin: 0
-      padding: 0
-      // height: 28px
-      line-height: 28px
-
-.add-donation-to-cart
-  .preset-amount
-    label
-      input[type='radio']
-        float: none
-        vertical-align: baseline
-        margin-top: 0
-
-#event-header.side-section
-  h4
-    padding-bottom: 8px
-  #subtitle
-    padding-bottom: 8px
-    font-weight: bold
-    line-height: 1.4em
-    font-size: 1em
+      padding-right: 18px

data/app/assets/stylesheets/storefront.css

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

data/app/concerns/itemable.rb

@@ -1,6 +1,6 @@
 #
 # Include this method on objects that can be used to create items using Item.for
-# Ticket class doesn't need it because it defines its own sold_price method
+# Ticket class doesn't meed it because it defines its own sold_price method
 #
 module Itemable
   extend ActiveSupport::Concern

data/app/controllers/artfully_ose_controller.rb

@@ -1,34 +1,25 @@
 class ArtfullyOseController < ActionController::Base
-  include Ext::Integrations::ArtfullyOseController
 
   protect_from_forgery
 
   before_filter :authenticate_user!
   layout :specify_layout
   after_filter :set_csrf_cookie_for_angular
-  before_filter :require_more_info
 
   delegate :current_organization, :to => :current_user
 
   rescue_from CanCan::AccessDenied do |exception|
-    flash[:alert] = "Sorry, we couldn't find that page!"
-    redirect_to root_path
+    if current_user.is_in_organization?
+      flash[:alert] = "Sorry, we couldn't find that page!"
+      redirect_to root_path
+    else
+      flash[:notice] = "Wait, we need some more information from you first!"
+      redirect_to new_organization_path
+    end
   end
 
   protected
 
-    #
-    # don't appent "kit" to the name.
-    # Example requires_kit :membership
-    #
-    def self.requires_kit(kit)
-      before_filter do 
-        unless current_user.current_organization.has_kit? (kit)
-          raise CanCan::AccessDenied
-        end
-      end
-    end
-
     def to_plural(variable, word)
       self.class.helpers.pluralize(variable, word)
     end
@@ -89,17 +80,4 @@ class ArtfullyOseController < ActionController::Base
     def set_csrf_cookie_for_angular
       cookies['XSRF-TOKEN'] = form_authenticity_token if protect_against_forgery?
     end
-
-    def require_more_info
-      if need_more_info?
-        flash[:info] = "We need to collect more information about your organization before you continue."
-        redirect_to collect_info_signups_path
-      end
-    end
-
-    def keep_page_from_caching
-      response.headers["Cache-Control"] = "no-cache, no-store, max-age=0, must-revalidate"
-      response.headers["Pragma"] = "no-cache"
-      response.headers["Expires"] = "Fri, 01 Jan 1990 00:00:00 GMT"
-    end
 end

data/app/controllers/discounts_controller.rb

@@ -60,13 +60,6 @@ private
   end
 
   def grab_ticket_type_names
-    @ticket_type_names = []
-    @event.charts.includes(:sections => :ticket_types).each do |chart|
-      chart.sections.each do |section|
-        @ticket_type_names << section.ticket_types.collect{ |tt| tt.name }
-      end
-    end
-    @ticket_type_names = @ticket_type_names.flatten.uniq.sort
-    @ticket_type_names
+    @ticket_type_names = @event.charts.includes(:sections => :ticket_types).collect{|c| c.ticket_types.collect{|s| s.name}}.flatten.uniq.sort
   end
 end

data/app/controllers/events_controller.rb

@@ -1,7 +1,7 @@
 class EventsController < ArtfullyOseController
-  respond_to :html, :json, :js
+  respond_to :html, :json
 
-  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 ]
   before_filter :upcoming_shows, :only => :show
   before_filter { authorize! :view, @event if @event }
 
@@ -23,16 +23,7 @@ class EventsController < ArtfullyOseController
 
   def index
     authorize! :view, Event
-
-    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
+    @events = current_organization.events.includes(:shows, :venue).order('updated_at DESC')
   end
 
   def show
@@ -61,7 +52,7 @@ class EventsController < ArtfullyOseController
   def edit
     authorize! :edit, @event
   end
-
+  
   def image
     authorize! :edit, @event
   end
@@ -80,8 +71,18 @@ class EventsController < ArtfullyOseController
     authorize! :edit, @event
 
     if @event.update_attributes(params[:event])
-      build_flash_message
-      redirect_to redirect_path and return
+      if user_requesting_next_step?
+        if user_just_uploaded_an_image?
+          redirect_to messages_event_path(@event)
+        elsif user_set_special_instructions?
+          redirect_to event_shows_path(@event)
+        else
+          redirect_to edit_event_venue_path(@event)
+        end
+      else
+        flash[:notice] = "Your event has been updated."
+        redirect_to event_url(@event)
+      end
     else
       render :edit
     end
@@ -95,7 +96,6 @@ class EventsController < ArtfullyOseController
   end
 
   def widget
-    @donation_kit = current_user.current_organization.kit(:regular_donation)
   end
 
   def storefront_link
@@ -103,13 +103,28 @@ class EventsController < ArtfullyOseController
 
   def wp_plugin
   end
-
+  
   def prices
   end
 
-  def passes
+  def temp_discounts_index
+    find_event
   end
 
+  def temp_discount_form
+    find_event
+
+    @discount = TempDiscount.new
+    @discount.promotion_type = 'two-for-one'
+
+    @event.charts.collect(&:sections).flatten.each do |section|
+      @discount.discount_sections.new(
+        :section => section,
+        :price => section.price
+      )
+    end
+  end
+  
   def messages
   end
 
@@ -119,29 +134,6 @@ class EventsController < ArtfullyOseController
   end
 
   private
-  
-    def redirect_path
-      if user_requesting_next_step?
-        if user_just_uploaded_an_image?
-          messages_event_path(@event)
-        elsif user_set_special_instructions?
-          new_event_show_path(@event)
-        else
-          edit_event_venue_path(@event)
-        end
-      else
-        event_url(@event)
-      end
-    end
-    
-    def build_flash_message
-      if user_just_uploaded_an_image?
-        flash[:notice] = "We're processing your image and will have the new image up in a few minutes."
-      else
-        flash[:notice] = "Your event has been updated."
-      end
-    end
-    
     def find_event
       @event = Event.find(params[:id])
     end