artfully_ose 1.2.0 → 1.3.0.pre1

data/app/assets/stylesheets/bootstrap-overrides.css

@@ -14,6 +14,8 @@
   background-image: -o-linear-gradient(top, #2086a6, #175c71);
   background-image: linear-gradient(top, #2086a6, #175c71);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#2086a6', endColorstr='#175c71', GradientType=0);
+  border: 0;
+  border-radius: 0;
 }
 
 .navbar-inner-admin {
@@ -40,9 +42,9 @@
   background-image: url('/assets/pages/logo-white-topbar.png');
   background-repeat: no-repeat;
   background-position: 18px 7px;
-  text-indent: 5000px;
   display: block;
   width: 85px;
+  color: transparent;
 }
 
 .navbar .brand {
@@ -62,12 +64,9 @@
 }
 
 .feedback-footer .navbar-inner .container, .navbar.marketing .navbar-inner .container {
-  background-image: url('/assets/falogo_footer.png');
-  background-repeat: no-repeat;
-  background-position: 0px center;
   padding-top: 9px;
   padding-bottom: 11px;
-  padding-left: 95px;
+  padding-left: 65px;
 }
 
 .feedback-footer .navbar-inner a {
@@ -92,10 +91,6 @@
   display: inline;
 }
 
-body {
-  padding-top: 60px;
-}
-
 section {
   margin-bottom: 30px;
 }
@@ -379,3 +374,23 @@ input[type="radio"], input[type="checkbox"] {
 [class^="icon-"],[class*=" icon-"] {
   background-image:url("/assets/glyphicons-halflings.png") !important
 }
+
+.add-to-calendar {
+  padding-top:10px;
+  text-align: center;
+  vertical-align: middle;
+}
+
+.calendar-label {
+  margin-bottom: 0px !important;
+  padding-top: 5px;
+  padding-bottom: 5px;
+  width: 360px;
+  text-align: center;
+  vertical-align: middle;
+}
+
+.ical-link {
+    display: none;
+}
+

data/app/assets/stylesheets/boxoffice.css.scss

@@ -35,9 +35,6 @@ span.event-time a{
 a {
   color: #2086a6;
 }
-body {
-  padding-top: 30px;
-}
 #page-holder {
   position: relative;
   overflow: hidden;
@@ -210,7 +207,6 @@ table#door-list {
 #buyer-details {
   width: 300px;
   position: fixed;
-  top: 200px;
   .content {
     overflow-y: scroll;
   }

data/app/assets/stylesheets/sass/_campaigns.sass

@@ -0,0 +1,43 @@
+.campaign-display
+  margin: 0 0 50px 0
+
+  .big
+    font-size: 24px
+    font-weight: normal
+
+.campaign-stats
+  position: relative
+  width: 620px
+
+  .campaign-stat
+    float: left
+    width: 100px
+    text-align: right
+
+    span
+      font-size: 13px
+      text-transform: uppercase
+      color: #666666
+
+    strong
+      font-size: 14pt
+      font-weight: 400
+
+  .campaign-stat-left
+    position: absolute
+    left: 40%
+
+  .campaign-stat-left-left
+    text-align: left
+
+  .campaign-stat-right
+    float: right
+
+  .progress
+    // just in case
+    width: 620px
+    height: 28px
+    margin: 5px 0
+
+  .totals
+    font-size: 14pt

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

@@ -42,6 +42,7 @@ ul.tags
   padding: 2px 4px 2px 4px
   font-size: 10pt
   color: #EEEEEE
+  font-weight: normal
 .tag-member
   background-color: #175c71
   padding: 3px 5px 3px 5px
@@ -57,4 +58,12 @@ ul.tags
     color:white
 
 .tag-error
-  color: #991111
+  color: #991111
+
+.tag-pledges
+  background-color: #E54628
+  padding: 3px 5px 3px 5px
+  font-weight: normal
+  a
+    font-weight: normal
+    color: white

data/app/assets/stylesheets/sass/fa-color.css.scss

@@ -0,0 +1,13 @@
+// primary
+$fa-red: #AF292F;
+$fa-blue: #7EA3AE;
+$fa-yellow: #D4BB33;
+$fa-green: #99A84B;
+$fa-grey: #7B7D6D;
+
+// secondary
+$fa-purple: #696C89;
+$fa-green2: #6F824E;
+$fa-brown: #906D3F;
+$fa-red2: #65181A;
+

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

@@ -1,6 +1,6 @@
 @import "colors"
 @import "mixins"
-@import url(http://fonts.googleapis.com/css?family=Roboto:400,100,300)
+@import url(https://fonts.googleapis.com/css?family=Roboto:400,100,300)
 
 body
   padding-top: 10px
@@ -182,13 +182,13 @@ ul#memberships
     .title
       padding: 20px
       .price
-        width: 100px
+        width: 180px
         float: right
         margin-right: 10px
         text-align: center
         font-size: 30px
         text-align: right
-      .membership_type_name
+      .type_name
         float: left
         font-size: 25px
         font-weight: bold
@@ -448,7 +448,7 @@ tr.no-border
     font-weight: 300
   h4
     font-family: 'Roboto', sans-serif
-    font-weight: 100
+    font-weight: 300
     margin: 0px 0px 2px 0px
 
 #donate-now-header
@@ -471,16 +471,16 @@ tr.no-border
     padding: 0px 6px
   .ticket-type-quantity
     font-family: 'Roboto', sans-serif
-    font-weight: 100
+    font-weight: 400
     margin-bottom: 0px
   .ticket-type-name
     font-family: 'Roboto', sans-serif
-    font-weight: 100
+    font-weight: 300
     font-size: 12pt
     padding-top: 13px
   .ticket-type-price
     font-family: 'Roboto', sans-serif
-    font-weight: 100
+    font-weight: 300
     font-size: 12pt
     padding-top: 13px
 

data/app/concerns/cart_finder.rb

@@ -32,6 +32,16 @@ module CartFinder
     @current_cart
   end
 
+  #
+  # Used when a user is dropping out of the widget (token-based cart)
+  # and into the storefront (session-based)
+  #
+  def attach_cart_with_token(cart_token)
+    @current_cart = Cart.find_or_create(cart_token, nil)
+    session[session_key(Cart)] = @current_cart.id
+    @current_cart
+  end
+
   #
   # Use with care. Only assign updated carts (in the case of discounts)
   # TODO: Enforce that this isn't used to actually switch to another cart object

data/app/concerns/oh_noes.rb

@@ -8,13 +8,13 @@ module OhNoes
   
     # options:
     # :with_prejudice => true, will not check destroyable?
-    delegate :destroy!, :to => :destroy
     def destroy(options = {})
       return false unless destroyable? || !!options[:with_prejudice]
       run_callbacks :destroy do
         update_column(:deleted_at, Time.now)
       end
     end
+    alias :destroy! :destroy
     
     def destroyable?
       true

data/app/controllers/actions_controller.rb

@@ -12,7 +12,7 @@ class ActionsController < ArtfullyOseController
 
   def create
     return apply_to_person if params_person_id
-    return apply_to_search if params[:search_id] || params[:segment_id]
+    return apply_to_search if params[:advanced_search_id] || params[:segment_id]
   end
 
   def update
@@ -72,14 +72,14 @@ class ActionsController < ArtfullyOseController
     end
 
     def apply_to_search
-      @search = params[:search_id] ? Search.find(params[:search_id]) : Segment.find(params[:segment_id]).search
+      @search = params[:advanced_search_id] ? AdvancedSearch.find(params[:advanced_search_id]) : Segment.find(params[:segment_id]).search
       authorize! :edit, @search
       @action = Action.create_of_type(params[:action_type])
       @action.set_creator(current_user)
-      @action.set_params(params[:artfully_action], nil) 
-      @search.attach_action(@action)  
+      @action.set_params(params[:artfully_action], nil)
+      @search.attach_action(@action)
       flash[:notice] = "We're setting actions on all those people and will be done in just a few minutes."
-      redirect_to params[:search_id] ? search_url(@search) : segment_url(Segment.find(params[:segment_id]))
+      redirect_to params[:advanced_search_id] ? advanced_search_url(@search) : segment_url(Segment.find(params[:segment_id]))
     end
 
 end

data/app/controllers/addresses_controller.rb

@@ -12,7 +12,7 @@ class AddressesController < ArtfullyOseController
   end
 
   def update
-    if @person.update_address(params[:address], current_user.current_organization.time_zone, current_user)
+    if @person.update_address(params[:address])
       flash[:notice] = "Successfully updated the address for #{@person}."
     else
       flash[:error] = "There was a problem updating this address."

data/app/controllers/advanced_search_segments_controller.rb

@@ -0,0 +1,97 @@
+class AdvancedSearchSegmentsController < ApplicationController
+
+  before_filter :load_discount_codes, :only => [:show]
+  before_filter :load_tags, :only => [:show]
+  before_filter :load_org_scope_objects, :only => [:new, :show]
+  before_filter :load_shows_and_ticket_types, :only => [:new, :show]
+
+  def index
+    unless ([2,70,1395].include? current_user.current_organization.id)
+      redirect_to segments_path and return
+    end
+
+    @advanced_search_segments = current_organization.advanced_search_segments.paginate(:page => params[:page], :per_page => 10)
+  end
+
+  def show
+    @advanced_search_segment = AdvancedSearchSegment.find(params[:id])
+    @search = @advanced_search_segment.advanced_search
+    @people = @advanced_search_segment.advanced_search.try(:people_hits) || []
+    prepare_form
+  end
+
+  def create
+    @advanced_search_segment = AdvancedSearchSegment.new(params[:advanced_search_segment])
+    search = @advanced_search_segment.advanced_search
+
+    if @advanced_search_segment.save
+      flash[:notice] = "Segment created."
+      redirect_to @advanced_search_segment
+    else
+      flash[:error] = "Name your list segment."
+      redirect_to search
+    end
+  end
+
+  def destroy
+    @advanced_search_segment = AdvancedSearchSegment.find(params[:id])
+    search = @advanced_search_segment.advanced_search
+    @advanced_search_segment.destroy
+    redirect_to search
+  end
+
+  def subscribe
+    @advanced_search_segment = AdvancedSearchSegment.find(params[:id])
+    authorize! :subscribe, AdvancedSearchSegment
+    job = MailchimpSyncJob.new(@advanced_search_segment.organization.kits.mailchimp, {
+      :type => "subscribe_advanced_search_segment",
+      :advanced_search_segment_id => @advanced_search_segment.id,
+      :list_id => params[:list_id],
+    })
+    Delayed::Job.enqueue(job, :queue => "mailchimp")
+    flash[:notice] = "We're subscribing new people now and we'll be done shortly."
+    redirect_to @advanced_search_segment
+  end
+
+  def add_group
+    @advanced_search_segment = AdvancedSearchSegment.find(params[:id])
+    authorize! :subscribe, AdvancedSearchSegment
+    job = MailchimpSyncJob.new(@advanced_search_segment.organization.kits.mailchimp, {
+      :type => "add_group_advanced_search_segment",
+      :advanced_search_segment_id => @advanced_search_segment.id,
+      :grouping => params[:grouping],
+    })
+    Delayed::Job.enqueue(job, :queue => "mailchimp")
+    flash[:notice] = "We're adding new people now and we'll be done shortly."
+    redirect_to @advanced_search_segment
+  end
+
+  private
+
+    def prepare_form
+      @event_options = Event.options_for_select_by_organization(@current_user.current_organization)
+      @event_options.unshift(["Any Event", AdvancedSearch::ANY_EVENT])
+    end
+
+    def load_discount_codes
+      @discount_codes = Discount.where(:organization_id => current_user.current_organization)
+    end
+
+    def load_org_scope_objects
+      @membership_types = current_user.current_organization.membership_types.all
+      @pass_types       = current_user.current_organization.pass_types.all
+      @segments         = current_user.current_organization.advanced_search_segments.all
+    end
+
+    def load_shows_and_ticket_types
+      if params[:event_id].present?
+        @event = current_organization.events.find(params[:event_id])
+        @shows = @event.shows
+      end
+
+      if params[:show_id].present?
+        @show = current_organization.shows.find(params[:show_id])
+        @ticket_types = @show.chart.sections.first.ticket_types_for(nil)
+      end
+    end
+end

data/app/controllers/advanced_searches_controller.rb

@@ -0,0 +1,118 @@
+class AdvancedSearchesController < ApplicationController
+
+  before_filter :load_discount_codes
+  before_filter :load_tags, :only => [:new, :create, :show]
+  before_filter :load_org_scope_objects, :only => [:new, :create, :show]
+
+  def new
+    authorize! :view, AdvancedSearch
+
+    unless ([2,70,1395].include? current_user.current_organization.id)
+      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 }}
+    end
+  end
+
+  def create
+    authorize! :create, AdvancedSearch
+    @search = AdvancedSearch.new(search_parameters: params[:search])
+    @search.organization_id = current_user.current_organization.id
+
+    if @search.save
+      redirect_to @search
+    else
+      render :new
+    end
+  end
+
+  def show
+    @search = AdvancedSearch.find(params[:id])
+    authorize! :view, @search
+    session[:return_to] ||= request.referer # Record the current page, in case creating a list segment fails.
+    prepare_people_hits
+
+    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")}" }
+    end
+  end
+
+  def tag
+    @search = AdvancedSearch.find(params[:id])
+    authorize! :tag, Segment
+    @search.tag(params[:name])
+    flash[:notice] = "We're tagging all the people and we'll be done shortly.  Refresh this page in a minute or two."
+    redirect_to @search
+  end
+
+  def update
+    @search = AdvancedSearch.find(params[:id])
+    @search.update_attribute(:search_parameters, params[:search])
+    prepare_people_hits
+  end
+
+  def subscribe
+    @search = AdvancedSearch.find(params[:id])
+    authorize! :subscribe, AdvancedSearch
+    job = MailchimpSyncJob.new(@search.organization.kits.mailchimp, {
+      :type => "subscribe_advanced_search",
+      :advanced_search_id => @search.id,
+      :list_id => params[:list_id],
+    })
+    Delayed::Job.enqueue(job, :queue => "mailchimp")
+    flash[:notice] = "We're subscribing new people now and we'll be done shortly."
+    redirect_to @search
+  end
+
+  def add_group
+    @search = AdvancedSearch.find(params[:id])
+    authorize! :subscribe, AdvancedSearch
+    job = MailchimpSyncJob.new(@search.organization.kits.mailchimp, {
+      :type => "add_group_advanced_search",
+      :advanced_search_id => @search.id,
+      :grouping => params[:grouping],
+    })
+    Delayed::Job.enqueue(job, :queue => "mailchimp")
+    flash[:notice] = "We're adding new people now and we'll be done shortly."
+    redirect_to @search
+  end
+
+  def shows_for_org
+    unless params[:event_id] == AdvancedSearch::ANY_EVENT
+      @event_id = params[:event_id]
+    end
+
+    render 'shows_for_org', layout: false
+  end
+
+  def ticket_types_for_org
+    unless params[:show_id] == AdvancedSearch::ANY_SHOW
+      @show_id = params[:show_id]
+    end
+
+    render 'ticket_types_for_org', layout: false
+  end
+
+  private
+
+    def prepare_people_hits
+      @people = @search.empty_search? ? [] : @search.people_hits(params[:page], (params[:per_page] || 20))
+    end
+
+    def load_discount_codes
+      @discount_codes = Discount.where(:organization_id => current_user.current_organization)
+    end
+
+    def load_org_scope_objects
+      @membership_types = current_user.current_organization.membership_types.all
+      @pass_types       = current_user.current_organization.pass_types.all
+      @segments         = current_user.current_organization.advanced_search_segments.all
+    end
+
+end