artfully_ose 1.1.0 → 1.2.0.alpha.1

data/app/views/reports_mailer/daily.text.erb

@@ -1,14 +1,14 @@
-Your Daily Order Report for <%= @tix.organization.name %>.
-<%= @tix.date.to_s(:long) %>
+Your Daily Order Report for <%= @tix.organization.name.html_safe %>.
+<%= l @tix.start_date, :format => :date %>
 
 <% if ! @tix.rows.empty? %>
-<%= @tix.to_table.to_table(first_row_is_head: true, last_row_is_foot: true) %>
+<%= raw @tix.to_table.to_table(first_row_is_head: true, last_row_is_foot: true) %>
 <% else %>
-There were no orders placed.
+There were no ticket orders placed.
 <% end %>
 
 <% if ! @donations.rows.empty? %>
-<%= @donations.to_table.to_table(first_row_is_head: true, last_row_is_foot: true) %>
+<%= raw @donations.to_table.to_table(first_row_is_head: true, last_row_is_foot: true) %>
 <% elsif @donations.organization.has_kit?("RegularDonationKit") %>
 There were no donations made.
 <% end %>

data/app/views/sales/_boxoffice.html.haml

@@ -0,0 +1,141 @@
+= form_tag event_show_sales_path, :class => 'boxoffice-form' do |f|
+  .row
+    .span2
+      %h6.padded-left 1. Tickets
+    .span10
+      .ticket-list
+        // unavailable tickets at the bottom
+        - @sale.ticket_types.sort_by { |t| -@tickets_remaining[t.id] }.each do |ticket_type|
+          .ticket{:class => ('unavailable' if @tickets_remaining[ticket_type.id] < 1), 'data-ticket-id' => ticket_type.id}
+            %a.ticket-quantity-button.subtract -
+            = number_field_tag "quantities[#{ticket_type.id}]", 0, :class => 'ticket-quantity', 'data-remaining' => @tickets_remaining[ticket_type.id], 'data-ticket-price' => number_to_dollars(ticket_type.price), :disabled => (@tickets_remaining[ticket_type.id] < 1)
+            %a.ticket-quantity-button.add +
+            %span.lead.ticket-type
+              %strong= ticket_type.name
+              = number_as_cents(ticket_type.price, cents_if_needed:true)
+              %span.muted
+                (#{content_tag :span, @tickets_remaining[ticket_type.id], :class => 'remaining', 'data-ticket-id' => ticket_type.id} remaining)
+
+        - if @event.organization.authorization_hash[:authorized]
+          .ticket
+            .input-prepend
+              %span.add-on $
+              = number_field_tag 'donation', nil, :placeholder => '0.00', :id => 'order-donation', :class => 'order-donation'
+              %span.lead
+                %strong
+                  Donation
+
+        - if Discount.where(event_id:@event.id).any?
+          .discount
+            .ticket
+              .input
+                = text_field_tag 'discount', nil, :id => 'order-discount', :class => 'order-discount'
+                %span.lead
+                  %strong
+                    Discount Code
+
+            .ticket
+              .input
+                %span.lead.message
+
+        #order-total
+          %h3
+            .loading.hide
+              #{image_tag('loading.gif')} calculating total...
+            .message
+              $0.00 Total
+          = hidden_field_tag 'total'
+  .row.row-blue-padded
+    .span2
+      .row-blue-padded-left
+        %h6 2. Payment
+    .span10
+      .control-group
+        .btn-toolbar.payment-select
+          .btn-group
+            %a.btn{'data-payment-select' => 'cash'}
+              Cash
+            %a.btn{'data-payment-select' => 'credit'}
+              Credit
+            %a.btn{'data-payment-select' => 'check'}
+              Check
+            %a.btn{'data-payment-select' => 'comp'}
+              Comp
+        = hidden_field_tag 'payment_method'
+      #credit-fields.payment-fields{:style => 'display:none;'}
+        .control-group
+          %label
+            Card Number
+            %span.muted.required (required)
+          .controls= text_field_tag("credit_card[number]", params[:credit_card][:card_number], :placeholder => "XXXX-XXXX-XXXX-XXXX", :class => 'input-medium credit_card_number')
+        .control-group
+          %label
+            Card Expiration
+            %span.muted.required (required)
+          .date_field.controls
+            = select_tag("credit_card[month]", options_for_select(1..12, params[:credit_card]["month"]), :class => 'input-small inline')
+            = select_tag("credit_card[year]", options_for_select(Time.now.year..Time.now.year + 10, params[:credit_card]["year"]), :class => 'input-small inline')
+      #check-fields.payment-fields{:style => 'display:none;'}
+        .control-group
+          = label_tag("check[number]", "Check Number")
+          .controls= text_field_tag("check[number]", params[:check].try([:number]), :class => 'input-medium')
+
+  .row
+    .span2
+      %h6.padded-left 3. Buyer Info
+    .span10
+      #user-info
+        #existing-user-popover
+        = hidden_field_tag(:person_id, "", :name => "person[id]")
+        .control-group
+          %label
+            First Name
+            %span.muted.required.name-required{:style => 'display:none;'} (required)
+          .controls
+            = text_field_tag(:person_first_name, "", :id => "person_first_name", :name => "person[first_name]", :placeholder => "First name", :class => 'person_first_name')
+        .control-group
+          %label
+            Last Name
+            %span.muted.required.name-required{:style => 'display:none;'} (required)
+          .controls
+            = text_field_tag(:person_last_name, "", :id => "person_last_name", :name => "person[last_name]", :placeholder => "Last name", :class => 'person_last_name')
+        .control-group
+          %label
+            Email
+            %span.muted.required.contact-required{:style => 'display:none;'} (required or phone)
+          .controls= email_field_tag(:person_email, "", :id => "person_email", :name => "person[email]", :placeholder => "example@email.com", :class => 'person_email')
+        .control-group
+          %label
+            Phone Number
+            %span.muted.required.contact-required{:style => 'display:none;'} (required or email)
+          .controls
+            = text_field_tag(:person_phone, "", :id => "person_phone", :name => "person[phones_attributes][][number]", :placeholder => "(XXX) XXX-XXXX", :class => 'person_phone')
+        .control-group
+          %label
+            Order Notes
+            %span.muted.required
+          .controls= text_area_tag(:order_notes, "", :id => "order_notes", :name => "order_notes")
+
+  .row.row-blue-padded
+    .span2
+      .row-blue-padded-left
+        %h6 4. Check in
+    .span10
+      .control-group
+        %label.checkbox
+          = check_box_tag "auto_check_in"
+          Mark tickets as received on doorlist.
+
+  .row
+    .span10.offset2
+      = submit_tag 'Checkout', :class => 'btn btn-large', :disabled => 'disabled', :id => 'checkout-now-button'
+
+#submit-confirmation.modal.hide.fade
+  .modal-header
+    %button.close.modal-close.hide{'type' => 'button', 'data-dismiss' => 'modal'} x
+    %h3 Processing...
+  .modal-body
+    .loading= image_tag('loading.gif')
+    .content
+  .modal-footer
+    %button.btn.btn-primary.modal-close.hide{'data-dismiss' => 'modal'} Close

data/app/views/sales/_doorlist.html.haml

@@ -0,0 +1,79 @@
+.row.row-blue-padded
+  .span4.relative
+    .row-blue-padded-left
+      .progress.progress-doorlist
+        .bar.bar-doorlist
+  .span8
+    .row-blue-padded-right
+      .btn-group.download-door-list
+        %a.btn.dropdown-toggle{'data-toggle' => 'dropdown', 'href' => '#'}
+          %i.fa.fa-arrow-circle-down
+          Download Door List
+        %ul.dropdown-menu
+          %li= link_to 'CSV Download', door_list_event_show_path(@event, @show, :format => :csv)
+          %li= link_to 'PDF Download', door_list_event_show_path(@event, @show, :format => :pdf)
+      %span.search-container
+        = search_field_tag :live_search, nil, :placeholder => 'Search Door List', :class => 'span7', :class => 'search-doorlist'
+
+.row
+  .span4.relative
+    #buyer-details
+  .span8
+    #door-list-table
+      %table#door-list.table
+        %tbody
+          - tickets_grouped_by_buyer = @door_list.items.group_by {|i| i.buyer }.sort_by { |buyer, door_list_items| door_list_sort(buyer) }
+          - tickets_grouped_by_buyer.each do |buyer, door_list_items|
+            - special_instructions = door_list_grouped_attribute(door_list_items, :special_instructions)
+            - order_notes = door_list_grouped_attribute(door_list_items, :notes)
+            %tr.buyer{'data-buyer-id' => buyer.id, :id => "buyer-#{buyer.id}", 'data-search-blob' => "#{buyer.first_name} #{buyer.last_name} #{special_instructions} #{order_notes}"}
+              %td
+                %h4
+                  - if door_list_items.select {|d| !d.ticket.validated? }.empty?
+                    %i.remaining-ticket-indicator.fa.fa-circle
+                  - elsif door_list_items.select {|d| d.ticket.validated? }.any?
+                    %i.remaining-ticket-indicator.fa.fa-adjust
+                  - else
+                    %i.remaining-ticket-indicator.fa.fa-circle-o
+                  = door_list_name_and_company(buyer)
+                  - if special_instructions.present? || order_notes.present?
+                    %i.fa.fa-file
+              %td.buyer-ticket-count
+                %strong= door_list_items.length
+                ticket#{'s' unless door_list_items.length == 1}
+              %td.buyer-total
+                - amount = door_list_items.map {|d| d.ticket.sold_price }.inject(:+)
+                = number_as_cents(amount, cents_if_needed:true)
+                %br
+                = door_list_items.map {|d| d.payment_method }.uniq.to_sentence
+                .buyer-details-hidden{:style => 'display:none;', :id => "buyer-details-#{buyer.id}"}
+                  %h1= link_to buyer.to_s, buyer
+                  .content
+                    %ul
+                      - door_list_items.sort_by {|d| d.ticket.ticket_type }.each do |door_list_item|
+                        %li
+                          %p
+                            %label.lead
+                              = check_box_tag "validated", "validated", door_list_item.ticket.validated, :class => 'door-list-checkbox', 'data-ticket-id' => door_list_item.ticket.id, 'data-buyer-id' => buyer.id
+                              %strong
+                                = door_list_item.ticket.ticket_type.name
+                              = number_as_cents(door_list_item.ticket.sold_price, cents_if_needed:true)
+                              = door_list_item.payment_method
+                    %p
+                      -# We don't modify tickets after the show date, so there's the posibility that the
+                      -# ticket can be refunded after the show. The ticket remains "sold" but has no sold_item
+                      -# and it appears to the door list that it has no order. This is why we
+                      -# .select on the end of this statement.
+                      - order_ids = door_list_items.collect(&:order_id).uniq.select{|order| order.present?}
+                      %strong.muted Order#{'s' if order_ids.count > 1}:
+                      = safe_join(order_ids.map{|o| link_to o, order_path(o)}, ', ')
+
+                    - if special_instructions.present?
+                      %p
+                        %strong.muted Special Instructions:
+                        = special_instructions
+
+                    - if order_notes.present?
+                      %p
+                        %strong.muted Notes:
+                        = order_notes

data/app/views/sales/new.html.haml

@@ -1,129 +1,37 @@
+= stylesheet_link_tag 'boxoffice'
 - content_for :custom_js do
-  = javascript_include_tag "box-office"
-- in_section :events
-- content_for :header do
-  %h1 Box Office
+  = javascript_include_tag 'boxoffice'
+  :javascript
+    $(document).ready(function() {
+      // we wait to do this transition so
+      // users can see they have 2 nav options
+      setTimeout(
+        function(){
+          if(#{params[:render].present?}) {
+            switchBetweenBoxofficeAndDoorlist('#' + '#{params[:render]}');
+          } else {
+            // show doorlist
+            switchBetweenBoxofficeAndDoorlist('#doorlist');
+          }
+        }, 500)
+    })
 
-= form_tag event_show_sales_path, :remote => true, :class => 'box-office-form' do
-  = hidden_field_tag :commit, ""
-  #showtime-total-and-checkout.row-fluid
-    .row-fluid.span8
-      #event-image.span2
-        = render :partial => 'shared/event_image_icon', :locals => { :event => @event }
-      #showtime.span4
-        %strong="#{@event.name}"
-        %br
-        ="#{l(@show.datetime_local_to_event, :format => :long_with_day)}"
-        %br
-        =icon_link_to("Return to show", event_show_path(@show.event, @show), 'icon-share-alt', 'btn', '')
-    #total-and-checkout.span4{:style => 'text-align:right' }
-      .row-fluid
-        .span6
-          #total.total
-            .price= number_as_cents 0
-        .span6
-          #checkout-now
-            %button.btn.btn-large.btn-success#checkout-now-button{:style => 'width:100%'}
-              Checkout
-  .row
-    .span4
-      %h6 Tickets
-      - @sale.sections.each do |section|
-        .row-fluid
-          .span9.section-description
-            .name= label_tag "quantities[#{section.id}]", "#{truncate(section.name, :length => 25)} #{number_as_cents(section.price)}"
-            .description{:id => "remaining_#{section.id}"}="#{@tickets_remaining[section.id]} remaining"
-          .span3
-            = select_tag "quantities[#{section.id}]", options_for_select(0..20, @sale.quantities[section.id]), :class => @tickets_remaining[section.id] > 0 ? 'ticket-quantity-select input-mini' : 'hidden ticket-quantity-select input-mini'
-            .sold-out{:id => "sold_out_#{section.id}", :class => @tickets_remaining[section.id] > 0 ? 'hidden' : ''}
-              %span.label.label-success
-                sold-out
+.row
+  .span12
+    %h3.event-name
+      = link_to @event.name, @event
+      %span.event-time= link_to l(@show.datetime_local_to_event, :format => :day_time), event_show_path(@event,@show)
+    %ul.nav.nav-pills.page-nav
+      %li= link_to 'Door List', '#doorlist'
+      %li= link_to 'Sell Tickets', '#boxoffice'
 
-    .span4
-      %h6 Customer
-      .controls#the-details
-        = hidden_field_tag(:person_id, @dummy.id, :id => "person_id")
-        = text_field_tag(:search, params[:search], :id => "search", :placeholder => "First, last, or email...")
-        %p= link_to 'Create new person', '#new-person-popup', 'data-toggle' => 'modal', :id => 'new-person-link'
-        
-      .picked-person
-        .picked-person-name.picked-person-clear
-        .picked-person-email.picked-person-clear
-        .picked-person-company-name.picked-person-clear
-
-    .span4
-      %h6 Payment
-      #payment-controls.controls
-        %label.radio
-          = radio_button_tag(:payment_method, :cash, true, :class => 'payment-method', :disabled => 'true', :humanized_value => 'Cash')
-          Cash
-        %label.radio
-          = radio_button_tag(:payment_method, :comp, false, :class => 'payment-method', :disabled => 'true', :humanized_value => 'Comp')
-          Comp
-        -unless @event.is_free
-          %label.radio
-            = radio_button_tag(:payment_method, :credit_card_swipe, false, :class => 'payment-method', :disabled => 'true', :humanized_value => 'Credit card')
-            Credit (Swipe)
-          %label.radio
-            = radio_button_tag(:payment_method, :credit_card_manual, false, :class => 'payment-method', :disabled => 'true', :humanized_value => 'Credit card')
-            Credit (Manual)
-      #payment-info.hidden
-        .control-group
-          = label_tag("credit_card[cardholder_name]", "Name on Card")
-          .controls= text_field_tag("credit_card[name]", params[:credit_card][:cardholder_name])
-        .control-group
-          = label_tag("credit_card[card_number]", "Card Number")
-          .controls= text_field_tag("credit_card[number]", params[:credit_card][:card_number])
-        .control-group
-          = label_tag("credit_card[expiration_date]", "Expiration Date")
-          .date_field.controls
-            = select_tag("credit_card[month]", options_for_select(1..12, params[:credit_card]["month"]), :class => 'input-small inline')
-            = select_tag("credit_card[year]", options_for_select(Time.now.year..Time.now.year + 10, params[:credit_card]["year"]), :class => 'input-small inline')
-            
-
-#door-list
-  %h3 Door List
-  = render :partial => 'shared/door_list_table', :locals => { :door_list_items => @door_list.items}
-            
-= render "shared/new_person_popup"
-            
-#sell-popup.modal
-  .modal-header
-    %h2 Checkout
-  .modal-body
-    #sell-total.total.block
-      %h3 Total
-      %strong.price= number_as_cents 0
-      
-    .block
-      %h3 Buyer
-      .picked-person
-        #picket-person-name-in-popup.picked-person-name.picked-person-clear
-          No buyer information
-        .picked-person-email.picked-person-clear
-      
-    .block  
-      %h3 Payment Method
-      #payment-method-popup
-        Cash
-      
-    .block  
-      %h3 Tickets
-      #popup-ticket-list
-        %table.table
-          %thead
-            %tr
-              %th
-                Section
-              %th
-                Price
-          %tbody
-        
-  .modal-footer
-    %button#sell-button.btn.btn-large.btn-success{:name => 'commit', :label => 'true'}
-      Sell
-    %button#cancel-button.btn.btn-large
-      Cancel
-    %br  
-    %input#hack-cc-number.hidden{:name=>'hack-cc-number'}
+:css
+  .footer {
+    display:none;
+  }
 
+#page-holder
+  #doorlist.page{'data-partial-href' => "#{door_list_event_show_sales_path(@event,@show)}"}
+    = render 'doorlist'
+  #boxoffice.page
+    = render 'boxoffice'

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

@@ -1,43 +1,189 @@
 = form_for search, url: searches_path, method: "POST", html: {class: 'form-vertical advanced-search'} do |f|
   = hidden_field :commit, "Search"
-  %h3 Tag
-  = f.text_field :tagging, placeholder: "Tag Name", :class => "typeahead", "data-provide"=>"typeahead", "data-items"=>"10", "data-source"=>"[" + @tags_string.html_safe + "]"
-  %h3 Events
-  = f.select :event_id, options_for_select(@event_options, selected: search.event_id), include_blank: ""
 
-  %h3 Donations
-  = f.label :min_donations_amount, "Total Donations"
-  .control
-    .input-prepend
-      %span.add-on $
-      = f.text_field :min_donations_amount, placeholder: "min", class: "input-small"
-    %span.range-separator to
-    .input-prepend
-      %span.add-on $
-      = f.text_field :max_donations_amount, placeholder: "max", class: "input-small"
-  .control
-    = 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")
+  %h4 People
+  .accordion#accordion2
+    .accordion-group
+      .accordion-heading
+        %a.accordion-toggle{"data-toggle"=>"collapse","data-parent"=>"#accordion2",:href=>"#collapseOne"}
+          Tag
+      #collapseOne.accordion-body.collapse
+        .accordion-inner
+          = f.text_field :tagging, placeholder: "Tag Name", :class => "typeahead", "data-provide"=>"typeahead", "data-items"=>"10", "data-source"=>"[" + @tags_string.html_safe + "]"
 
-  %h3 Value
-  = f.label :min_lifetime_value, "Lifetime Value (Purchases and Donations)"
-  .control
-    .input-prepend
-      %span.add-on $
-      = f.text_field :min_lifetime_value, :placeholder => "min", class: "input-small"
-    %span.range-separator to
-    .input-prepend
-      %span.add-on $
-      = f.text_field :max_lifetime_value, :placeholder => "max", class: "input-small"
+    .accordion-group
+      .accordion-heading
+        %a.accordion-toggle{"data-toggle"=>"collapse","data-parent"=>"#accordion2",:href=>"#collapseTwo"}
+          Tickets
+      #collapseTwo.accordion-body.collapse
+        .accordion-inner
+          = f.select :has_purchased_for, options_for_select([["Purchased tickets for", true], ["Have not purchased for", false]], selected: search.has_purchased_for)
+          = f.select :event_id, options_for_select(@event_options, selected: search.event_id), include_blank: ""
+          %h5 For Shows Between
+          .control
+            = date_field_tag "search[show_date_start]", search.show_date_start.try(:strftime, "%F")
+            %span.range-separator through
+            = date_field_tag "search[show_date_end]", search.show_date_end.try(:strftime, "%F")
+
+    .accordion-group
+      .accordion-heading
+        %a.accordion-toggle{"data-toggle"=>"collapse","data-parent"=>"#accordion2",:href=>"#collapseThree"}
+          Donations
+      #collapseThree.accordion-body.collapse
+        .accordion-inner
+          .control
+            .input-prepend
+              %span.add-on $
+              = f.text_field :min_donations_amount, placeholder: "min", class: "input-mini"
+            %span.range-separator to
+            .input-prepend
+              %span.add-on $
+              = f.text_field :max_donations_amount, placeholder: "max", class: "input-mini"
+          .control
+            = 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"=>"#accordion2",:href=>"#collapseFour"}
+          Value
+      #collapseFour.accordion-body.collapse
+        .accordion-inner
+          .input-prepend
+            %span.add-on $
+            = f.text_field :min_lifetime_value, :placeholder => "min", class: "input-mini"
+          %span.range-separator to
+          .input-prepend
+            %span.add-on $
+            = f.text_field :max_lifetime_value, :placeholder => "max", class: "input-mini"
+
+    .accordion-group
+      .accordion-heading
+        %a.accordion-toggle{"data-toggle"=>"collapse","data-parent"=>"#accordion2",:href=>"#collapseFive"}
+          Discount Code
+      #collapseFive.accordion-body.collapse
+        .accordion-inner
+          = f.select :discount_code, options_for_select(@discount_codes, search.discount_code), {:include_blank => true}
+
+
+    .accordion-group
+      .accordion-heading
+        %a.accordion-toggle{"data-toggle"=>"collapse","data-parent"=>"#accordion2",:href=>"#collapseSix"}
+          Location
+      #collapseSix.accordion-body.collapse
+        .accordion-inner
+          = 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"}
+
+    -with_kit(:relationships) do
+      .accordion-group
+        .accordion-heading
+          %a.accordion-toggle{"data-toggle"=>"collapse","data-parent"=>"#accordion2",:href=>"#collapseSeven"}
+            Relationships
+        #collapseSeven.accordion-body.collapse
+          .accordion-inner
+            = f.select :relation_id, options_from_collection_for_select(Relation.order(:description), :id, :description), {include_blank: ""}, {class: "input-medium"}
+
+    .accordion-group
+      .accordion-heading
+        %a.accordion-toggle{"data-toggle"=>"collapse","data-parent"=>"#accordion2",:href=>"#collapseEight"}
+          Output
+      #collapseEight.accordion-body.collapse
+        .accordion-inner
+          .control-group
+            .controls
+              = f.label :output_indiduals, nil, :class => "checkbox" do
+                = f.check_box :output_individuals, {"ng-model" => "data.output_individuals", "ng-init" => "data.output_individuals = #{search.output_individuals}"}
+                Individuals
+            -with_kit(:relationships) do
+              .controls
+                = f.label :output_indiduals, nil, :class => "checkbox" do
+                  = f.check_box :output_households, {"ng-model" => "data.output_households", "ng-init" => "data.output_households = #{search.output_households}"}
+                  Households
+            .controls
+              = f.label :output_indiduals, nil, :class => "checkbox" do
+                = f.check_box :output_companies, {"ng-model" => "data.output_companies", "ng-init" => "data.output_companies = #{search.output_companies}"}
+                Companies
+
+              = f.label :person_subtype, "Company Type", "ng-show" => "data.output_companies == true", :class => "ng-cloak"
+              = f.select :person_subtype, options_for_select(["Business", "Foundation", "Government", "Nonprofit", "Other"]), {include_blank: ""}, {"ng-model" => "data.person_subtype", "ng-show" => "data.output_companies == true", :class => "ng-cloak", "ng-init" => "data.person_subtype = '#{search.person_subtype}'"}
+
+
+  -with_kit(:membership) do
+    %h4 Membership
+    .accordion#accordion3
+      .accordion-group
+        .accordion-heading
+          %a.accordion-toggle{"data-toggle"=>"collapse","data-parent"=>"#accordionOrders",:href=>"#collapseMembershipStarts"}
+            Starts
+        #collapseMembershipStarts.accordion-body.collapse
+          .accordion-inner
+            .control
+              %h5 From
+              = date_field_tag "search[min_membership_start_date]", search.min_membership_start_date.try(:strftime, "%F")
+
+              %h5 To
+              = date_field_tag "search[max_membership_start_date]", search.max_membership_start_date.try(:strftime, "%F")
+
+      .accordion-group
+        .accordion-heading
+          %a.accordion-toggle{"data-toggle"=>"collapse","data-parent"=>"#accordionOrders",:href=>"#collapseMembershipEnds"}
+            Ends
+        #collapseMembershipEnds.accordion-body.collapse
+          .accordion-inner
+            .control
+              %h5 From
+              = date_field_tag "search[min_membership_end_date]", search.min_membership_end_date.try(:strftime, "%F")
+
+              %h5 To
+              = date_field_tag "search[max_membership_end_date]", search.max_membership_end_date.try(:strftime, "%F")
+
+      .accordion-group
+        .accordion-heading
+          %a.accordion-toggle{"data-toggle"=>"collapse","data-parent"=>"#accordion3",:href=>"#collapseTwelve"}
+            Status
+        #collapseTwelve.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=>"#collapseEleven"}
+            Type
+        #collapseEleven.accordion-body.collapse
+          .accordion-inner
+            = f.select :membership_type_id, search_membership_type_options(@membership_types, @search.membership_type_id), 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")
 
-  %h3 Discounts
-  = f.select :discount_code, options_for_select(@discount_codes, search.discount_code), {:include_blank => true}
+      / .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: ""
 
-  %h3 Location
-  = 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"}
+  -with_kit(:passes) do
+    %h4 Passes
+    .accordion#accordion4
+      .accordion-group
+        .accordion-heading
+          %a.accordion-toggle{"data-toggle"=>"collapse","data-parent"=>"#accordion4",:href=>"#collapseEighty"}
+            Type
+        #collapseEighty.accordion-body.collapse
+          .accordion-inner
+            = f.select :pass_type_id, options_from_collection_for_select(@pass_types, 'id', 'name', @search.pass_type_id), include_blank: ""
 
   .control
-    = f.submit "Search", :class => 'btn'
+    = f.submit "Search", :id => "advanced-search-submit", :class => 'btn'
     = link_to "Simple Search", people_path