artfully_ose 1.2.0.pre.27 → 1.2.0

data/app/models/sale_search.rb

@@ -1,7 +1,7 @@
 class SaleSearch
-
-  attr_reader :start, :stop
-  attr_reader :organization, :event, :show
+  include SearchByDates
+  
+  attr_reader :event, :show
 
   def initialize(terms)
     @organization = terms[:organization]
@@ -16,22 +16,4 @@ class SaleSearch
   def results
     @results ||= Order.sale_search(self).select(&:has_ticket?)
   end
-
-  private
-
-  def start_with(start)
-    start.present? ? DateTime.parse(start) : default_start
-  end
-
-  def stop_with(stop)
-    stop.present? ? Sundial.midnightish(@organization, stop) : default_stop
-  end
-
-  def default_start
-    DateTime.now.in_time_zone(@organization.time_zone).beginning_of_month
-  end
-
-  def default_stop
-    DateTime.now.in_time_zone(@organization.time_zone).end_of_day
-  end
 end

data/app/models/user.rb

@@ -3,8 +3,7 @@ class User < ActiveRecord::Base
   include Ext::DeviseConfiguration
   include Ext::Integrations::User
 
-  devise      :token_authenticatable,
-              :registerable
+  devise      :token_authenticatable
   before_save :ensure_authentication_token
 
   has_many :shows

data/app/serializers/show_serializer.rb

@@ -0,0 +1,15 @@
+class ShowSerializer < ActiveModel::Serializer
+  attributes :id, :uuid, :state, :show_time, :event, :tickets_validated, :tickets_sold, :time_zone, :iana_time_zone, :offset, :datetime
+
+  def tickets_sold
+    object.sold || 0
+  end
+
+  def event
+    EventSerializer.new(object.event, @options)
+  end
+
+  def include_event?
+    @options[:event]
+  end
+end

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

@@ -6,9 +6,9 @@
   = form_tag contributions_path, :method => :get, :class => 'well form-inline' do
     .pull-left
       = label_tag :start, "From", :class => "control-label"
-      = text_field_tag :start,"#{l @search.start, :format => :date_for_input}", :readonly => true, :class => 'datepicker input-small'
+      = text_field_tag :start,"#{l @search.start, :format => :date_for_input}", :class => 'datepicker input-small'
       = label_tag :stop, "To", :class => "control-label"
-      = text_field_tag :stop, "#{l @search.stop, :format => :date_for_input}", :readonly => true, :class => 'datepicker input-small'
+      = text_field_tag :stop, "#{l @search.stop, :format => :date_for_input}", :class => 'datepicker input-small'
     .pull-right
       = submit_tag "Search", :class => "btn"
       = submit_tag "Download", :class => "btn"

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

@@ -1,6 +1,7 @@
 .row
   .span8
     %h1= @event.name
+    %h3.subtitle= @event.subtitle if @event.subtitle.present?
   .span4#event-header-logo-container
     -if @event.image?
       =image_tag(@event.image.url(:thumb), :id => 'event-header-logo', :width => 75, :height => 75)

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

@@ -6,26 +6,42 @@
         =f.text_field :name, :class => 'span4'
 
     -with_kit :membership do
-      .control-group
-        =label_tag "Member ticket?", "Member ticket?", :class => 'control-label'
-        .controls
-          %label.radio.inline
-            = f.radio_button :member_ticket, true, :class => "member-ticket-yes"
-            Yes
-          %label.radio.inline
-            = f.radio_button :member_ticket, false, :class => "member-ticket-no"
-            No
-
-      .membership-fields{:style => "display: none"}
+      - if current_user.current_organization.membership_types.empty?
         .control-group
-          =f.label :membership_type_id, "Membership", :class => 'control-label'
+          =label_tag "Member ticket?", "Member ticket?", :class => 'control-label'
           .controls
-            =f.select :membership_type_id, options_from_collection_for_select(MembershipType.in_play(current_user.current_organization), 'id', 'name', f.object.membership_type_id), {}, :class => 'span4'
+            %label.radio.inline
+              = f.radio_button :member_ticket, true, :class => "member-ticket-yes", :disabled => "true"
+              Yes
+            %label.radio.inline
+              = f.radio_button :member_ticket, false, :class => "member-ticket-no", :disabled => "true"
+              No  
+            %p.muted
+              You need to create a membership before you can sell member tickets.
+              =link_to "Get started here.", new_membership_type_path
 
+      - else
         .control-group
-          =f.label :tickets_per_membership, "Tickets per Membership", :class => 'control-label'
+          =label_tag "Member ticket?", "Member ticket?", :class => 'control-label'
           .controls
-            =f.text_field :tickets_per_membership, :class => 'input-small'
+            %label.radio.inline
+              = f.radio_button :member_ticket, true, :class => "member-ticket-yes"
+              Yes
+            %label.radio.inline
+              = f.radio_button :member_ticket, false, :class => "member-ticket-no"
+              No
+
+        .membership-fields{:style => "display: none"}
+          .control-group
+            =f.label :membership_type_id, "Membership", :class => 'control-label'
+            .controls
+              =f.select :membership_type_id, options_from_collection_for_select(MembershipType.in_play(current_user.current_organization), 'id', 'name', f.object.membership_type_id), {}, :class => 'span4'
+
+          .control-group
+            =f.label :tickets_per_membership, "Tickets per Membership", :class => 'control-label'
+            .controls
+              =f.text_field :tickets_per_membership, :class => 'input-small'
+              %p.muted Leave blank for unlimited.
 
     .control-group
       =f.label :price, "Price", :class => 'control-label'

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

@@ -13,7 +13,12 @@
         =form.label :name, "Event name", :class => 'control-label'
         .controls
           =form.text_field :name, :class => 'input-xlarge', :placeholder=>"Event name"
-          
+
+      .control-group
+        =form.label :subtitle, :class => 'control-label'
+        .controls
+          = form.text_field :subtitle, :class => 'input-xlarge', :placeholder=>"Event subtitle"
+
       .control-group
         =form.label :producer, "Producer", :class => 'control-label'
         .controls

data/app/views/imports/_export_links.html.haml

@@ -0,0 +1,3 @@
+%p= link_to "Export People", contacts_export_index_path, :class => "btn btn3"
+%p= link_to "Export Donations", donations_export_index_path, :class => "btn btn3"
+%p= link_to "Export Sales", ticket_sales_export_index_path, :class => "btn btn3"

data/app/views/imports/donations/_pending.html.haml

@@ -17,9 +17,27 @@
           Click "Approve" to import this data into Artful.ly
         .span3
           = link_to "Approve", approve_import_path(import), :data => {:confirm => "Are you sure you want to approve this import?"}, :class => "btn btn-success btn-large"
-    
-    %center
-      .alert.alert-info
-        Import previews are temporarily not available.  
-        %br
-        You can still apporve your import by clicking the green "Approve" button above.
+
+    %table.table.table-bordered.table-striped
+      %tr
+        %th Email
+        %th First
+        %th Last
+        %th Date
+        %th Amount
+        %th Type
+        %th
+
+      - @imported_rows.each_with_index do |imported_row, index|
+        - row = ParsedRow.new(@import.headers, imported_row.content)
+        %tr
+          %td=row.email
+          %td=row.first
+          %td=row.last
+          %td=row.donation_date
+          %td=number_as_cents row.amount
+          %td=row.donation_type
+          %td
+            =icon_link_to("", "#row#{index}", 'fa-search-plus', '', '', {'data-toggle' => 'modal'})
+            =render :partial => "imports/shared/inspect_modal", :locals => {:row => row, :index => index, :keys => ParsedRow::DONATION_FIELDS.keys }
+    = will_paginate @imported_rows

data/app/views/imports/events/_pending.html.haml

@@ -17,8 +17,19 @@
         .span3
           = link_to "Approve", approve_import_path(import), :data => {:confirm => "Are you sure you want to approve this import?"}, :class => "btn btn-success btn-large"
     
-    %center
-      .alert.alert-info
-        Import previews are temporarily not available.  
-        %br
-        You can still apporve your import by clicking the green "Approve" button above.
+    - @import.parse_and_hash(@imported_rows).each_with_index do |(event_key, event_rows), event_index|
+      %table.table.table-bordered.table-striped.table-topper
+        %tr
+          %th{:colspan => "3", :style => 'width: 400px'}
+            =event_rows.first.event_name
+            %br
+            =event_rows.first.venue_name
+            %br
+            =l DateTime.parse(@import.eight_pm?(event_rows.first.show_date)), :format => :short
+        -event_rows.each_with_index do |row, index|
+          %tr
+            %td="#{row.first} #{row.last}"
+            %td{:style => 'width:100px'}=number_as_cents row.amount
+            %td{:style => 'width:50px'}
+              =icon_link_to("", "#row#{event_index}_#{index}", 'fa-search-plus', '', '', {'data-toggle' => 'modal'})
+              =render :partial => "imports/shared/inspect_modal", :locals => {:row => row, :index => "#{event_index}_#{index}", :keys => ParsedRow::EVENT_FIELDS.keys }

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

@@ -41,7 +41,9 @@
   .span3       
     .well{:style => "text-align: center"}   
       %h3 Exports
-      %p= link_to "Export People", contacts_export_index_path, :class => "btn btn3"
-      %p= link_to "Export Donations", @donations_csv_download_link, :class => "btn btn3"
-      %p= link_to "Export Sales", @sales_csv_download_link, :class => "btn btn3"
-      %p Sales and Donations exports are prepared nightly and will not reflect sales made today.
+      =render :partial => "export_links"
+      %div{:style => 'font-weight:bold; text-align:left; font-size:.9em;'}
+        = "Need something more specific?"
+        %br
+          ="Export from"
+          =link_to("Advanced Search", new_search_path)

data/app/views/imports/people/_pending.html.haml

@@ -17,29 +17,24 @@
           Click "Approve" to import this data into Artful.ly
         .span3
           = link_to "Approve", approve_import_path(import), :data => {:confirm => "Are you sure you want to approve this import?"}, :class => "btn btn-success btn-large"
-    -if @under_limit
-      %table.table.table-bordered.table-striped
+
+    %table.table.table-bordered.table-striped
+      %tr
+        %th Email
+        %th First
+        %th Last
+        %th Company
+        %th Website
+        %th
+      - @imported_rows.each_with_index do |imported_row, index|
+        - row = ParsedRow.new(@import.headers, imported_row.content)
         %tr
-          %th Email
-          %th First
-          %th Last
-          %th Company
-          %th Website
-          %th 
-        - @parsed_rows.each_with_index do |row, index|
-          %tr
-            %td=row.email
-            %td=row.first
-            %td=row.last
-            %td=row.company
-            %td=row.website
-            %td
-              =icon_link_to("", "#row#{index}", ' fa-search-plus', '', '', {'data-toggle' => 'modal'})
-              =render :partial => "imports/shared/inspect_modal", :locals => {:row => row, :index => index, :keys => ParsedRow::PEOPLE_FIELDS.merge(ParsedRow::ADDRESS_FIELDS).keys}
-      = will_paginate @parsed_rows
-    -else    
-      %center
-        .alert.alert-info
-          Import previews are temporarily not available.  
-          %br
-          You can still apporve your import by clicking the green "Approve" button above.
+          %td=row.email
+          %td=row.first
+          %td=row.last
+          %td=row.company
+          %td=row.website
+          %td
+            =icon_link_to("", "#row#{index}", ' fa-search-plus', '', '', {'data-toggle' => 'modal'})
+            =render :partial => "imports/shared/inspect_modal", :locals => {:row => row, :index => index, :keys => ParsedRow::PEOPLE_FIELDS.merge(ParsedRow::ADDRESS_FIELDS).keys}
+    = will_paginate @imported_rows

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

@@ -7,19 +7,23 @@
   %body
     .navbar.navbar-fixed-top
       .navbar-inner
-        .container   
+        .container
           = link_to @store_organization.name, store_organization_events_url(@store_organization.cached_slug), :class => 'brand'
           %ul.nav#main-menu-options
             %li= link_to "Buy Tickets", store_events_path(@store_organization.cached_slug)
-            -with_kit(:passes) do
+            - if @store_organization.has_kit?(:passes)
               %li= link_to "Buy Passes", store_passes_path(@store_organization.cached_slug)
-            -with_kit(:membership) do 
+            - if @store_organization.has_kit?(:membership)
               -if member_signed_in?
                 %li= link_to "Buy Memberships", store_memberships_path(@store_organization.cached_slug)
               -else
                 %li= link_to "Become a Member", store_memberships_path(@store_organization.cached_slug)
-            -# %li= link_to "Donate Now", store_donate_path(@store_organization.cached_slug), :class => "btn btn-small btn-warning primary"
-          -with_kit(:membership) do 
+            - if @store_organization.has_active_donation_only_storefront?
+              -if @store_organization.kit(:regular_donation).donate_now_text.present?
+                %li= link_to @store_organization.kit(:regular_donation).donate_now_text, store_donate_path(@store_organization.cached_slug), :class => "btn btn-small btn-warning primary"
+              -else
+                %li= link_to "Donate Now", store_donate_path(@store_organization.cached_slug), :class => "btn btn-small btn-warning primary"
+          - if @store_organization.has_kit?(:membership)
             %ul.nav.pull-right#menu-member-login
               -if member_signed_in?
                 %li.dropdown

data/app/views/order_mailer/confirmation_for.html.haml

@@ -14,8 +14,6 @@
   %br
   = "Payment method: #{@order.payment_method}"
   %br
-  = "Service fee: $#{format("%.2f", (@order.service_fee.to_i/100.0))}"
-  %br
 
 - unless @order.tickets.empty?
   - @order.ticket_summary.rows.each do |row|
@@ -29,9 +27,9 @@
       -unless row.show.event.contact_phone.blank?
         ="Event contact phone: #{row.show.event.contact_phone}"
         %br
-    -row.ticket_type_hash.keys.each do |ticket_type|
+    -row.ticket_type_hash.each do |ticket_type, tickets|
       %ul.ticket-list
-        -ticket_type.tickets.each do |ticket|
+        -tickets.each do |ticket|
           %li
             %span.price= "#{ticket.ticket_type.name}: $#{format("%.2f", (ticket.sold_price/100.0))}"
         %li{:style => 'list-style-type:none'}=ticket_type.description
@@ -52,9 +50,17 @@
         %span.price= "$#{format("%.2f", (item.price/100.00))}:"
         %span.name= "Donation to #{@order.organization.name_for_donations}"
 
+- unless @order.passes.empty?
+  %h4 Passes
+  %ul.pass-list
+    - @order.passes.each do |item|
+      %li
+        %span.price= "$#{format("%.2f", (item.price/100.00))}:"
+        %span.name= "#{item.product.pass_type.passerize}: #{item.product.pass_code}"
+
 - unless @order.memberships.empty?
   %h4 Memberships
-  %ul.donation-list
+  %ul.membership-list
     - @order.memberships.each do |item|
       %li
         %span.price= "$#{format("%.2f", (item.price/100.00))}:"

data/app/views/order_mailer/confirmation_for_refund.html.haml

@@ -1,11 +1,15 @@
 %h1 Refund Confirmation
 
 %p
-  Order number: #{@order.id}
+  Order Number: #{@order.id}
   %br
   Refund Date: #{l(@order.created_at_local_to_organization)}
   %br
-  Refund total:  -$#{format("%.2f", (@order.total.abs/100.0))}
+  Item Total:  -$#{format("%.2f", (@order.total.abs/100.0))}
+  %br
+  Service Fees:  -$#{format("%.2f", (@order.service_fee.abs.to_i/100.0))}
+  %br
+  Refund Total:  -$#{format("%.2f", (@order.total_with_service_fee.abs/100.0))}
   %br
   %br
   -if @order.original_order.credit?

data/app/views/order_mailer/confirmation_for_refund.text.haml

@@ -1,9 +1,10 @@
 Refund Confirmation
 
-
-Order number: #{@order.id}
+Order Number: #{@order.id}
 Refund Date: #{l(@order.created_at_local_to_organization)}
-Refund total:  -$#{format("%.2f", (@order.total.abs/100.0))}
+Item Total:  -$#{format("%.2f", (@order.total.abs/100.0))}
+Service Fees:  -$#{format("%.2f", (@order.service_fee.abs.to_i/100.0))}
+Refund Total:  -$#{format("%.2f", (@order.total_with_service_fee.abs/100.0))}
 
 -if @order.original_order.credit?
   This refund was credited to the credit card you used as payment for this order.

data/app/views/orders/membership.html.haml

@@ -2,26 +2,16 @@
 - content_for :header do
   %h1 Membership Orders
 
-#print-cards.modal.hide.fade
-  .modal-header
-    .close{'data-dismiss'=>'modal'} x
-    %h3 Generating Member Cards
-  .modal-body
-    %p
-      A PDF is being generated and will automatically begin downloading when ready...
-    .progress.progress-success.progress-striped.active
-      .bar{:style => 'width: 90%'}
-
 #donations-search
 
   .control-group.well
-    = form_tag membership_orders_path, :method => :get, :class => 'form-inline' do
+    = form_tag membership_orders_path, :method => :get, :id => 'memberships-date-search-form', :class => 'form-inline' do
       .pull-left
         = label_tag :start, "From", :class => "control-label"
-        = text_field_tag :start,"#{l @search.start, :format => :date_for_input}", :readonly => true, :class => 'datepicker input-small'
+        = text_field_tag :start,"#{l @search.start, :format => :date_for_input}", :class => 'datepicker input-small'
 
         = label_tag :stop, "To", :class => "control-label"
-        = text_field_tag :stop, "#{l @search.stop, :format => :date_for_input}", :readonly => true, :class => 'datepicker input-small'
+        = text_field_tag :stop, "#{l @search.stop, :format => :date_for_input}", :class => 'datepicker input-small'
 
         - if @membership_types.present?
           = label_tag :membership_type_id, nil, :class => "control-label"
@@ -41,7 +31,7 @@
                   = link_to 'Export to CSV', params.merge(:format => 'csv').delete_if {|k,v| :commit == k.to_sym }
                 - with_kit(:membership) do
                   %li
-                    =link_to 'Print Member Cards', new_member_card_path({:start => @search.start, :stop => @search.stop, :membership_type_id => @search.membership_type.try(:id)}), :onclick => "$('#print-cards').modal();"
+                    =link_to 'Print Member Cards', new_member_card_path({:start => @search.start, :stop => @search.stop, :membership_type_id => @search.membership_type.try(:id)})
 
 
 - if @search.results.present?
@@ -59,16 +49,22 @@
       %tbody
         - @search.results.each do |order|
           - order.items.select(&:membership?).each_with_index do |item, index|
-            %tr
-              - if index == 0
+            - if index == 0
+              %tr{:id => "order_#{order.id}"}
                 - rowspan = order.items.select(&:membership?).size
                 %td{:rowspan => rowspan}= link_to order.id, order_path(order.id)
                 %td{:rowspan => rowspan}= l(order.created_at_local_to_organization, :format => :short)
                 %td{:rowspan => rowspan}= link_to_person(order.person)
                 %td{:rowspan => rowspan}= (order.payment_method || "")
-              %td 
-                ="#{item.product.membership_type.name}"
-              %td= number_as_cents item.price
+                %td 
+                  ="#{item.product.membership_type.name}"
+                %td= number_as_cents item.price
+            - else
+              %tr
+                %td 
+                  ="#{item.product.membership_type.name}"
+                %td= number_as_cents item.price
+
     = will_paginate(@search.results)
 
 - else