artfully_ose 1.2.0 → 1.3.0.pre1

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

@@ -19,7 +19,8 @@
 
     .span4
       .pull-right
-        = link_to "Create Event", new_event_path, :class => "btn btn-primary"
+        -if current_user.can? :create, Event
+          = link_to "Create Event", new_event_path, :class => "btn btn-primary"
 
 .row
   .span8.offset2

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

@@ -9,16 +9,18 @@
   .span9
     = render "shared/error_messages", :target => @event
     = form_for( @event, :html => { :class => 'form-horizontal' } ) do |form|
-      .control-group
-        =form.label :name, "Ask for more information during checkout?", :class => 'control-label'
-        .controls
-          =form.check_box :show_special_instructions
-          
-      .control-group
-        =form.label :name, "Special Instructions Caption", :class => 'control-label'
-        .controls
-          =form.text_field :special_instructions_caption
-          
+      %fieldset
+        %legend Custom Question
+        .control-group
+          =form.label :show_special_instructions, "Ask for more information during checkout?", :class => 'control-label'
+          .controls
+            =form.check_box :show_special_instructions
+
+        .control-group
+          =form.label :name, "Special Instructions Caption", :class => 'control-label'
+          .controls
+            =form.text_field :special_instructions_caption
+
       .form-actions
         = render :partial => "shared/save_save_and_next", :locals => {:form => form}
 

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

@@ -11,14 +11,14 @@
         = render :partial => "glance", :locals => { :report => @event.glance }       
       .span6
         %h3 Next Show
-        = render :partial => "day_date_show", :locals => { :show => @event.next_public_show, :message => "There are no upcoming shows" }
+        = render :partial => "day_date_show", :locals => { :show => @event.next_show_include_unpublished, :message => "There are no upcoming shows" }
     .row-fluid
       .span6
         #description
           %h3 Description
-          -unless @event.description.blank?
+          -if @event.description.present?
             =simple_format @event.description  
-          -else
+          -elsif current_user.can? :manage, Event
             .no-image#add-a-description
               #text
                 =link_to 'Add an event description', edit_event_path(@event)
@@ -28,9 +28,9 @@
         %h3 Venue
         #venue.row-fluid
           .span6
-            -unless @event.venue.city.blank?
+            -if @event.venue.city.present?
               =link_to image_tag("http://maps.google.com/maps/api/staticmap?size=140x140&maptype=roadmap&markers=color:red|#{@event.venue.address_as_url_query}&sensor=false&zoom=15"), "http://maps.google.com/maps?q=#{@event.venue.address_as_url_query.html_safe}&z=15"
-            -else
+            -elsif current_user.can? :manage, Event
               .no-image#add-a-venue
                 #text
                   =icon_tag '07-map-marker'
@@ -42,7 +42,7 @@
             -unless @event.venue.address2.blank?
               %div=@event.venue.address2
             %div=@event.venue.city_state_zip_as_string
-    - if @event.destroyable?
+    - if @event.destroyable? && (current_user.can? :manage, Event)
       .row-fluid
         .span6
           #delete

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

@@ -50,7 +50,7 @@
 
       /   .control-group
       /     .controls
-      /       %i.fa.fa-plus-cirlce.icon-gray
+      /       %i.fa.fa-plus-circle.icon-gray
       /       = link_to_add_fields 'Add another Ticket Type', f, :discount_sections, "", "toggleAppropriateFieldsAccordingToPromotionType();"
 
 

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

@@ -19,7 +19,7 @@
   .control-group
     = f.label :excluded_shows, "Excluded Shows", :class => 'control-label'
     .controls
-      = f.select :excluded_shows, options_for_select(@event.shows.collect {|s| [l(DateTime.parse(s.local_datetime), :format => :day_time), s.id] }, @events_pass_type.excluded_shows.collect(&:to_i)), {}, {'data-placeholder' => "No Shows Selected", :class => 'input chosen', :multiple => true}
+      = f.select :excluded_shows, options_for_select(@event.shows.collect {|s| [l(DateTime.parse(s.local_datetime.to_s), :format => :day_time), s.id] }, @events_pass_type.excluded_shows.collect(&:to_i)), {}, {'data-placeholder' => "No Shows Selected", :class => 'input chosen', :multiple => true}
 
 - content_for :custom_js do
   = stylesheet_link_tag 'jquery/chosen'

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

@@ -8,13 +8,12 @@
     =render :partial=>'events/menu'
   .span9
     %h3="Add a Pass to #{@event.name}"
-
     = form_for( [@event, @events_pass_type], :html => { :class => 'form-horizontal' }) do |f|
       %fieldset
         .control-group
           = f.label :pass_type, "Pass", :class => 'control-label'
           .controls
-            = f.select :pass_type, options_for_select(@pass_type_options)
+            = f.select :pass_type, options_for_select(@pass_type_options, @selected_pass_type)
 
       = render :partial => "form", :locals => {:f => f, :discount => @discount}
           

data/app/views/households/_edit_modal.html.haml

@@ -64,6 +64,8 @@
                 #add-to-household-search
                   = text_field_tag :search, "", :placeholder => "Email, name, or tag...", :class => "span6 query-string"
                   = link_to "Search", "#", :class => 'btn', :onclick => "performSearch($('#add-to-household-search .query-string')); return false;"
+                .tip.muted 
+                  Start typing a name. If you select an individual who is already in a household, he or she will be removed from that household and added to this one.
 
               %table.table.search-results
                  
@@ -116,10 +118,13 @@
 
         $.each(people, function (i, person) {
           person = cleanJsonPerson(person)
-          responsePeople[i]  = "<tr>"
-          responsePeople[i] += "  <td class='controls'><input name='individual_ids[]' value='" + person.id + "' type='checkbox' id='add-individual-" + person.id + "' data-add-individual='" + person.id + "'/></td>"
-          responsePeople[i] += "  <td class='name'><label for='add-individual-" + person.id + "'>" + person.first_name + " " + person.last_name + "</label><br/>" + person.email + "</td>"
-          responsePeople[i] += "</tr>"
+          if (person.company_name == "" && person.first_name != "") {
+            response  = "<tr>"
+            response += "  <td class='controls'><input name='individual_ids[]' value='" + person.id + "' type='checkbox' id='add-individual-" + person.id + "' data-add-individual='" + person.id + "'/></td>"
+            response += "  <td class='name'><label for='add-individual-" + person.id + "'>" + person.first_name + " " + person.last_name + "</label><br/>" + person.email + "</td>"
+            response += "</tr>"
+            responsePeople.push(response)
+          }
         });
         $("#add-individual .search-results").html(responsePeople);
       });

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

@@ -4,6 +4,7 @@
       = form.label :name, "Household Name"
       = form.text_field :name
     %li
+      = form.label "", "Household Members"
       - household.individuals.each do |individual|
         .fields.individual-fields
           .control-group
@@ -23,4 +24,8 @@
           = link_to_add_fields 'Add another individual', form, :individuals
 
   .form-actions
-    = render :partial => 'shared/submit_cancel', :locals => { :form => form, :cancel_path => households_path }
+    .btn-toolbar
+      .btn-group
+        = form.submit "Review...", :class => 'btn btn-primary'
+      .btn-group
+        = link_to "Cancel", households_path, :class => 'btn'

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

@@ -1,25 +1,16 @@
 .row
   .span12
-    .household-header
-      .household-avatar
-        = image_tag "household-default-avatar.png"
+    .household-header.clearfix
+      .span2
+        .household-avatar.row
+          = image_tag "household-default-avatar.png"
 
-      .household-values-and-tags
-        %ul.household-values
-          %li
-            %h3= number_as_cents(@household.lifetime_ticket_value)
-            %h6= pluralize(@household.lifetime_ticket_count, 'tickets')
-          %li
-            %h3= number_as_cents(@household.lifetime_donations)
-            %h6= pluralize(@household.lifetime_donations_count, 'donation')
-          %li
-            %h3= number_as_cents(@household.lifetime_value)
-            %h6 lifetime
+      .person-values-and-tags.household-values-and-tags
+        =render :partial => "shared/baseball_card", :locals => { :people => @individuals }
 
-        .household-tags
-          %ul.detailed-list.tags
-            - @household.individuals.map(&:tag_list).flatten.uniq.each do |tag_name|
-              %li.tag.rounder= tag_name
+        %ul.detailed-list.tags
+          - @taggings.each do |tagging|
+            %li.tag.rounder= tagging.tag.name
 
       %h1
         = @household.name

data/app/views/households/confirm.html.haml

@@ -0,0 +1,43 @@
+- in_section :households
+- content_for :title do
+  Confirm Household
+- content_for :header do
+  %h1 Confirm Household
+
+.row{"ng-controller" => "NewHouseholdCtrl"}
+  .span8.offset2
+    %h2=@household.name
+
+    %h4 These people will be added to the household
+    %table.table
+      %tr
+        %th Name
+        %th Email
+        %th Location
+      - @people_not_in_a_household.each do |person|
+        %tr
+          %td=person
+          %td=person.email
+          %td=person.primary_address.try(:city_state)
+
+    - unless @people_already_in_a_household.empty?
+      %h4 These people are already in a household
+      %p If you continue adding them to this household, they'll be removed from their existing household
+      %table.table
+        %tr
+          %th Name
+          %th Email
+          %th Location
+        - @people_already_in_a_household.each do |person|
+          %tr
+            %td=person
+            %td=person.email
+            %td=person.primary_address.try(:city_state)
+
+    = form_for(@household, :html => {:class => 'form-vertical'}) do |form|  
+      = hidden_field_tag :confirm, true   
+      = hidden_field_tag :name, @household.name 
+      -@people.each do |p|
+        = hidden_field_tag "individuals[]", p.id, :class => 'individual-id' 
+      .form-actions 
+        = render :partial => 'shared/submit_cancel', :locals => { :form => form, :cancel_path => new_household_path(:individuals => @ids, :name => @household.name) }

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

@@ -8,7 +8,9 @@
   = javascript_include_tag "households"
 
 .row{"ng-controller" => "NewHouseholdCtrl"}
-  .span6.offset3
+  .span6.offset2
+    .well
+      You can add individuals to a household if they already have a record. Individuals in a household already will be moved into this household.
     = render :partial => "shared/error_messages", :locals => { :target => @household }
     = render :partial => 'form', :locals => { :household => @household }
 

data/app/views/households/show.html.haml

@@ -1,5 +1,6 @@
 - content_for :custom_js do
   = javascript_include_tag "relationships"
+  = javascript_include_tag "baseball_card"
 - in_section :households
 - content_for :title do
   #{@household.name}
@@ -14,7 +15,7 @@
     = render(@household.address) if @household.address
 
     %ul
-      - @household.individuals.each do |individual|
+      - @individuals.each do |individual|
         %li{:style => "padding-top: 0.5em;"}
           = link_to(individual, polymorphic_url(individual))
         - individual.phones.each do |phone|

data/app/views/households/suggested.html.haml

@@ -1,38 +1,21 @@
 .suggested-households
-  - if @by_address.count < 1 && @by_spouse.count < 1
-    %h3 Suggested Households
-    %p
-      There are no suggested households.
-
-  - if @by_address.count > 0
-    %h4 Similar Addresses
-    %table.by-address.table
-      - @by_address.each do |row|
+  %h3 Suggested Households
+  - if @suggested_households.present?
+    %table.table
+      - @suggested_households.each do |row|
         - next if row.individuals.empty?
         %tr
           %td.people
-            - row.individuals.each do |person|
-              .well.span3
-                %h5= person
-                = person.address
-
-          %td.controls{:style => "width: 80px;"}
-            = link_to "Join", suggested_household_new_household_path(row), :class => "btn btn-primary btn-block"
-            %br
-            = link_to "Ignore", ignore_suggested_households_path(row), :method => :put, :class => "btn btn-danger btn-block"
-
-
-  - if @by_spouse.count > 0
-    %h4 Spouses
-    %table.by-spouse.table
-      - @by_spouse.each do |row|
-        %tr
-          %td.people
-            - row.individuals.each do |person|
+            - row.individuals.includes(:addresses).each do |person|
               .well.span3
                 %h5= person
+                = person.addresses.first
 
           %td.controls{:style => "width: 80px;"}
             = link_to "Join", suggested_household_new_household_path(row), :class => "btn btn-primary btn-block"
             %br
             = link_to "Ignore", ignore_suggested_households_path(row), :method => :put, :class => "btn btn-danger btn-block"
+  - else
+    .no-image#add-a-description
+      #text
+        There are no suggested households.

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

@@ -1,3 +1,3 @@
-%p= link_to "Export People", contacts_export_index_path, :class => "btn btn3"
+%p= link_to "Export People", contacts_export_index_path, :class => "btn btn3", :method => :post
 %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"
+%p= link_to "Export Sales", ticket_sales_export_index_path, :class => "btn btn3"

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

@@ -21,7 +21,7 @@
         %td
           %span.label.label-success
             Important!
-          &nbsp Show date must be in one of the following formats
+          &nbsp Donation date must be in one of the following formats
           =render :partial => "imports/shared/date_format"
           Time of day is not required.
       %tr 
@@ -65,7 +65,7 @@
         %td
           If this is a company record, the name of the company. Otherwise,
           it's the name of the company that the person works for.
-      
+
     %h3 Optional Fields
     %table.table.table-bordered.table-striped.docs
       %tr 
@@ -73,13 +73,56 @@
         %td
           %span.label.label-success
             Important!
-          &nbsp The tax-deductible amount of the donation (usually the total amount received, unless the donor <a href='http://www.irs.gov/publications/p526/ar02.html#en_US_2011_publink1000229650' target=_blank>received something in return</a>).  If this is not included, the deductible amount will be equal to the value in Amount minus any value in Non-Deductible.  Don't include a '$' or other currency symbols.  
-      %tr 
-        %td.field-slim Non-Deductible Amount
+          &nbsp The tax-deductible amount of the donation (usually the total amount received, unless the donor <a href='http://www.irs.gov/publications/p526/ar02.html#en_US_2011_publink1000229650' target=_blank>received something in return</a>).  If this is not included, the deductible amount will be equal to the value in Amount minus any value in Nondeductible.  Don't include a '$' or other currency symbols.
+      %tr
+        %td.field-slim Nondeductible Amount
         %td
           %span.label.label-success
             Important!
-          &nbsp This is the non-deductible portion of the donation (i.e. the fair market value of <a href='http://www.irs.gov/publications/p526/ar02.html#en_US_2011_publink1000229650' target=_blank>something the donor received in return</a>).  If this is not included, the non-deductible amount will be equal to the value in Amount minus any value in Deductible.  Don't include a '$' or other currency symbols.   
+          &nbsp This is the nondeductible portion of the donation (i.e. the fair market value of <a href='http://www.irs.gov/publications/p526/ar02.html#en_US_2011_publink1000229650' target=_blank>something the donor received in return</a>).  If this is not included, the nondeductible amount will be equal to the value in Amount minus any value in Deductible.  Don't include a '$' or other currency symbols.
+      %tr
+        %td.field-slim Notes
+        %td The donations's notes
+      %tr
+        %td.field-slim Fiscal Year
+        %td The donation's fiscal year (FY13, FY14, etc...)
+
+      -with_kit(:campaigns) do
+        %tr
+          %td.field-slim Campaign
+          %td
+            %span.label.label-success
+              Important!
+            &nbsp Campaign Name. Please review and modify details(Starts Date, Budgeted Goal, etc...) if needed when imported!
+        %tr
+          %td.field-slim Appeal
+          %td
+            %span.label.label-success
+              Important!
+            &nbsp Appeal Name. Please review and modify details(Starts Date, Channel, etc...) if needed when imported!
+        %tr
+          %td.field-slim Acknowledgement Sent Date
+          %td
+            %span.label.label-success
+              Important!
+            &nbsp Acknowledgement Sent Date must be in one of the following formats
+            =render :partial => "imports/shared/date_format"
+            Time of day is not required.
+        %tr
+          %td.field-slim Matcher
+          %td The email address of the match eligible person. If you're importing an email address that has already been assigned to a person, we'll merge the data for you
+        %tr
+          %td.field-slim Ratio
+          %td Matching Gift Ratio
+        %tr
+          %td.field-slim Match Eligible Amount
+          %td Include only dollars and cents. Don't include a "$" or other currency symbols.
+        %tr
+          %td.field-slim Soft Credit Person
+          %td The email address of the soft credit person. If you're importing an email address that has already been assigned to a person, we'll merge the data for you
+        %tr
+          %td.field-slim Soft Credit Amount
+          %td Include only dollars and cents. Don't include a "$" or other currency symbols.
     %p You can also use all of the field names in People imports.
   
   .span3

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

@@ -18,26 +18,73 @@
         .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"
 
-    %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)
+
+    - existing_campaigns = {}
+    - new_campaigns = {}
+    - no_campaigns = []
+    - @imported_rows.each_with_index do |imported_row, index|
+      - row = ParsedRow.new(@import.headers, imported_row.content)
+      - if row.campaign.present?
+        - if existing_campaigns.has_key?(row.campaign)
+          - existing_campaigns[row.campaign] << row
+        - elsif new_campaigns.has_key?(row.campaign)
+          - new_campaigns[row.campaign] << row
+        - elsif Campaign.exists?(:name => row.campaign, :organization_id => current_user.current_organization.id )
+          - existing_campaigns[row.campaign] = [row]
+        - else
+          - new_campaigns[row.campaign] = [row]
+      - else
+        - no_campaigns << row
+
+
+    - if new_campaigns.any?
+      %h2 New Campaigns
+      %legend These campaigns will be added to your account along with their donations
+      %table.table.table-bordered.table-striped
         %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
+          %th Name
+          %th # of Donations
+          %th
+        - new_campaigns.each_with_index do |(campaign, rows), index|
+          %tr
+            %td=campaign
+            %td
+              %span.round_tag{:style => 'background-color: #357EC7'} #{rows.length}
+            %td
+              =link_to "Preview", "#new_campaign_#{index}", 'data-toggle' => 'modal', :class => "btn btn-small"
+              .modal{:id => "new_campaign_#{index}"}
+                .modal-header
+                  .close{'data-dismiss'=>'modal'} x
+                  &nbsp;
+                .modal-body
+                  =render :partial => "imports/donations/preview", :locals => {:rows => rows }
+      %br
+
+    - if existing_campaigns.any?
+      %h2 Existing Campaigns
+      %legend These campaigns already exist and new donations will be added
+      %table.table.table-bordered.table-striped
+        %tr
+          %th Name
+          %th # of Donations
+          %th
+        - existing_campaigns.each_with_index do |(campaign, rows), index|
+          %tr
+            %td=campaign
+            %td
+              %span.round_tag{:style => 'background-color: #357EC7'} #{rows.length}
+            %td
+              =link_to "Preview", "#existing_campaign_#{index}", 'data-toggle' => 'modal', :class => "btn btn-small"
+              .modal{:id => "existing_campaign_#{index}"}
+                .modal-header
+                  .close{'data-dismiss'=>'modal'} x
+                  &nbsp;
+                .modal-body
+                  =render :partial => "imports/donations/preview", :locals => {:rows => rows}
+      %br
+
+    - if no_campaigns.any?
+      %h2 Unclassified Donations
+      - no_campaigns = no_campaigns.paginate(:page => params[:page], :per_page => 50)
+      =render :partial => "imports/donations/preview", :locals => {:rows => no_campaigns}
+      =will_paginate no_campaigns