artfully_ose 1.2.0 → 1.3.0.pre1

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

@@ -1,4 +1,4 @@
-= form_for (person) do |form|
+= form_for (person), :id => :new_person do |form|
   %ul
     %li
       = form.hidden_field :type, value: "{{data.type}}"
@@ -6,27 +6,21 @@
         %button{:type => "button", :class => "btn btn-large", "ng-class" => "{active: data.type == 'Individual'}", "ng-click" => "data.type = 'Individual'"} Person
         %button{:type => "button", :class => "btn btn-large", "ng-class" => "{active: data.type == 'Company'}", "ng-click" => "data.type = 'Company'"} Company
     %li{"ng-show" => "data.type == 'Company'", :class => "ng-cloak"}
-      = form.hidden_field :subtype, value: "{{final_subtype()}}"
-      %label Company Type
-      .btn-group
-        %button{:type => "button", :class => "btn", "ng-class" => "{active: data.subtype == 'Business'}", "ng-click" => "data.subtype = 'Business'"} Business
-        %button{:type => "button", :class => "btn", "ng-class" => "{active: data.subtype == 'Foundation'}", "ng-click" => "data.subtype = 'Foundation'"} Foundation
-        %button{:type => "button", :class => "btn", "ng-class" => "{active: data.subtype == 'Government'}", "ng-click" => "data.subtype = 'Government'"} Government
-        %button{:type => "button", :class => "btn", "ng-class" => "{active: data.subtype == 'Nonprofit'}", "ng-click" => "data.subtype = 'Nonprofit'"} Nonprofit
-        %button{:type => "button", :class => "btn", "ng-class" => "{active: data.subtype == 'Other'}", "ng-click" => "data.subtype = 'Other'"} Other
+      = form.label :subtype, 'Company Type'
+      = form.select :subtype, options_for_select(Person::COMPANY_TYPE, params[:subtype])
     %li{"ng-show" => "data.type == 'Company'", :class => "ng-cloak"}
       = form.label :company_name, "Company Name"
-      = form.text_field :company_name
+      = form.text_field :company_name, :class => :span4, :data_field => :company_name
     %li{"ng-show" => "data.type == 'Individual'"}
       = form.label :first_name, "First Name"
-      = form.text_field :first_name
+      = form.text_field :first_name, :class => :span4, :data_field => :first_name
     %li{"ng-show" => "data.type == 'Individual'"}
       = form.label :last_name, "Last Name"
-      = form.text_field :last_name
+      = form.text_field :last_name, :class => :span4, :data_field => :last_name
     %li
       = form.label :email, "Contact Email", "ng-show" => "data.type == 'Company'"
       = form.label :email, "Email", "ng-show" => "data.type == 'Individual'"
-      = form.email_field :email
+      = form.email_field :email, :class => :span4, :data_field => :email
     - unless person.new_record?
       %li
         = form.label :title, "Title"
@@ -38,4 +32,4 @@
         = form.label :website, "Website"
         = form.text_field :website
   .form-actions
-    = render :partial => 'shared/submit_cancel', :locals => { :form => form, :cancel_path => people_path }
+    = render :partial => 'shared/submit_cancel', :locals => { :form => form, :cancel_path => people_path }

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

@@ -1,37 +1,32 @@
+- content_for :custom_js do
+  = javascript_include_tag "relationships"
+  = javascript_include_tag "baseball_card"
 .row
   .span12
-    .person-header
+    .person-header.clearfix
       .span2
         .person-avatar.row
           = person_avatar_with_fallback(@person, 150)
 
       .person-values-and-tags
-        %ul.person-values
-          %li#ticket-value
-            %h3= number_as_cents(@person.lifetime_ticket_value)
-            %h6= pluralize(@person.tickets.length, 'tickets')
-          %li#donation-value
-            %h3= number_as_cents(@person.lifetime_donations)
-            %h6= pluralize(Item.donations_by(@person).count, 'donation')
-          - with_kit(:membership) do
-            %li#membership-value
-              %h3=number_as_cents(@person.lifetime_memberships)
-              %h6=pluralize(@person.memberships.size, 'membership')
-          %li#lifetime-value
-            %h3= number_as_cents(@person.lifetime_value)
-            %h6 lifetime
+        =render :partial => "shared/baseball_card", :locals => { :people => [@person] }
 
         %ul.detailed-list.tags#badges
           -unless @person.member.nil?
             %li.tag.rounder.tag-member= link_to "Member", person_memberships_path(@person), :style => "color:white"
           -if @person.any_current_passes?
             %li.tag.rounder.tag-passholder= link_to "Passholder", person_passes_path(@person), :style => "color:white"
+          - if @person.outstanding_pledges.any?
+            %li.tag.rounder.tag-pledges= link_to "Pledge", person_pledges_path(@person), :style => "color:white"
+
 
         .person-tags
           = render :partial=>'shared/tags', :locals => { :tags => @person.tag_list, :subject => @person }
 
 
       %h1 #{@person}
+      - if @person.nickname.present?
+        %h6.person-and-nickname= 'aka "' + @person.nickname + '"'
       - unless @person.kind_of? Company
         %h6.company-and-title= [@person.title, @person.company_name].select {|s| s.present? }.join(', ')
 
@@ -45,6 +40,6 @@
         -if @person.facebook_url.present?
           %li= link_to @person.facebook_url, full_url(@person.facebook_url, 'http://facebook.com/'), :class => 'facebook'
         -if @person.linked_in_url.present?
-          %li= link_to @person.linked_in_url, full_url(@person.linked_in_url, 'http://linkedin.com/in/'), :class => 'linked-in'
+          %li= link_to @person.linked_in_url, full_url(@person.linked_in_url, 'http://linkedin.com/'), :class => 'linked-in'
         -unless @person.member.blank?
           %li= link_to @person.member.member_number, person_memberships_path(@person), :class => 'member-number'

data/app/views/people/_list.html.haml

@@ -1,12 +1,6 @@
-- if people.empty?
+- if results.empty?
   %p No results found.
 - else
   %table.table.people-list
-    - people.each do |person|
-      %tr
-        %td.name
-          = link_to_person person
-          %br
-          = person.email
-        %td.tags
-          = render :partial => 'shared/tags_uneditable', :locals => { :tag_list => person.tag_list }
+    - results.each do |row|
+      = render :partial => "searches/#{row.class.name.downcase}", :locals => { :object => row }

data/app/views/people/_mailchimp_group.html.haml

@@ -0,0 +1,3 @@
+= label_tag "", :class => "checkbox" do
+  = check_box_tag "person[groupings][#{list[:list_id]}][#{grouping["id"]}][]", group["name"], @person.in_group?(list[:list_id], grouping["id"], group["name"]), :data => { :group => true }
+  %span= group["name"]

data/app/views/people/_phone_fields.html.haml

@@ -2,7 +2,7 @@
   .control-group
     = f.label :number, 'Number', :class => 'control-label'
     .controls
-      = f.select :kind, options_for_select(Phone.kinds), {}, {:class => 'input-small'}
+      = f.select :kind, Phone.kinds, {}, :class => 'input-small'
       = f.text_field :number, :placeholder => "555-123-1234", :class => 'input-medium'
       %span.remove-fields-link
         = f.hidden_field :_destroy

data/app/views/people/_relationship_fields.html.haml

@@ -2,13 +2,18 @@
   .control-group
     = label_tag nil, @person, :class => 'control-label', :style => 'width: 120px;'
     .controls
-      = f.select :relation_id, options_from_collection_for_select(Relation.for_type(@person.type).order(:description).uniq(:description), :id, :description, f.object.relation_id), {}, {:class => 'input-medium',:readonly => (!f.object.nil? && f.object.persisted?)}
+      = f.select :relation_id, options_from_collection_for_select(Relation.for_type(@person.type).order(:description).uniq(:description), :id, :description, f.object.relation_id), {}, {:class => 'input-medium',:readonly => (!f.object.nil? && f.object.persisted?),:disabled => (!f.object.nil? && f.object.persisted?)}
       - if !f.object.nil? && f.object.persisted?
         = text_field_tag :other, f.object.other, :class => 'input-medium other-input', :readonly => true
       - else
-        = text_field_tag "", "", :placeholder => "Individual or Company", :class => 'input-medium other-input'
+        = text_field_tag "", "", :placeholder => "Individual or Company", :class => 'input-medium other-input relationship-person-input'
       = f.hidden_field(:other_id, :class => 'other-id')
-      %span.remove-fields-link
+      %span.remove-fields-link.pull-right
         = f.hidden_field :_destroy
-        %i.fa.fa-minus-circle.icon-gray
-        = link_to_remove_fields "remove", f
+        = link_to_remove_fields "<i class='fa fa-minus-circle icon-gray'></i>".html_safe, f
+    .row-fluid
+      .span9.offset3
+        .relation-error.hidden
+          .muted
+            %i.fa.fa-search-plus
+            Start typing a name. We can't save this relationship until you select a matching person.

data/app/views/people/_work_with_menu.html.haml

@@ -2,12 +2,18 @@
   =icon_link_to('Work with...', "#menu#bulkactions", 'fa-asterisk', 'dropdown-toggle dropdown btn', '')
 
   %ul.dropdown-menu
-    %li= link_to "Edit #{@person.possessive} Info", '#edit-person', 'data-toggle' => 'modal', :id => "edit_link"
+    - if @person.individual?
+      - edit_link = "edit_link"
+    - else
+      - edit_link = "company_edit_link"
+    %li= link_to "Edit #{@person.possessive} Info", '#edit-person', 'data-toggle' => 'modal', :id => "#{edit_link}"
+    
     -with_kit (:membership) do
-      -if person.email.blank? || person.company?
-        %li= link_to "Comp Membership", "#comp-membership", 'data-toggle' => 'modal'
-      -else
-        %li= link_to "Comp Membership", new_person_membership_comp_path(person)
+      -if (current_user.can? :manage, @person) && (current_user.can? :manage, Sale)
+        -if person.email.blank? || person.company?
+          %li= link_to "Comp Membership", "#comp-membership", 'data-toggle' => 'modal'
+        -else
+          %li= link_to "Comp Membership", new_person_membership_comp_path(person)
       
       -unless @person.member.nil?
         %li= link_to "View Memberships", person_memberships_path(@person)
@@ -16,12 +22,12 @@
       -unless @person.passes.empty?
         %li= link_to "View Passes", person_passes_path(@person)
 
-    %li= link_to "Merge", new_merge_path(:loser => person.id)
+    %li= permission_link_to [:manage, @person], "Merge", new_merge_path(:loser => person.id)
 
     - if @person.destroyable?
-      %li= link_to "Delete", @person, :method => :delete, :confirm => "Are you sure you want to delete #{@person}?"
+      %li= permission_link_to [:manage, @person], "Delete", @person, :method => :delete, :confirm => "Are you sure you want to delete #{@person}?"
 
-    %li= link_to "Sell To", new_console_sale_path(:person_id => person.id)
+    %li= permission_link_to [:manage, Sale], "Sell To", new_console_sale_path(:person_id => person.id)
 
 -if person.email.blank? || person.company?
   -with_kit (:membership) do

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

@@ -13,13 +13,13 @@
           = text_field_tag :search, params[:search], :placeholder => "Email, name, or tag...", :class => "input-medium search-query"
       .control
         = submit_tag "Search", :class => 'btn'
-        = link_to "Advanced Search", new_search_path
+        = link_to "Advanced Search", new_advanced_search_path
   .span8.super-search-results
 
-    - if @people.empty?
+    - if @results.empty?
        
-    -else    
-      - if @show_advanced_search_message 
+    -else
+      - if @show_advanced_search_message
         .well
           .row-fluid
             .span2
@@ -27,10 +27,11 @@
                 =icon_tag '06-magnify@2x'
             .span10
               %strong
-                Looks like you've got a lot of results here so we only returned the top 40. 
+                Looks like you've got a lot of results here so we only returned the top 40.
                 %br
-                Try 
-                =link_to "Advanced Search", new_search_path 
+                Try
+                =link_to "Advanced Search", new_advanced_search_path
                 for more refined searching and results.
-      = render :partial => 'list', :locals => { :people => @people } unless @people.empty?
-      = will_paginate @people, :inner_window => 2, :outer_window => 0
+
+      = render :partial => 'list', :locals => { :results => @results }
+      = will_paginate @results, :inner_window => 2, :outer_window => 0

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

@@ -1,10 +1,24 @@
 - in_section :people
 - content_for :title do
   New Contact
-- content_for :header do
-  %h1 Create a New Contact
-
+  
+%h1 Create a New Contact
 .row{"ng-controller" => "NewPersonCtrl"}
-  .span6.offset3
+  .span4.offset1
+    
     = render :partial => "shared/error_messages", :locals => { :target => @person }
     = render :partial => 'form', :locals => { :person => @person }
+  .span4.people-menu
+
+- content_for :custom_js do
+
+  :javascript 
+    $(document).ready(function(){
+      new UserFinder('form#new_person', '.people-menu');
+      
+      $(document).on('click', '.people-menu > .person-link', function() {
+        var person = $(this);
+        window.location = '/people/' + person.attr('data-person-id')
+      });
+    });
+  

data/app/views/people/pledges.html.haml

@@ -0,0 +1,13 @@
+- in_section :people
+- content_for :title do
+  #{@person}
+
+=render "people/header"
+
+.row
+  .span12
+    .row-fluid
+      .span6
+      .span6.right
+        = icon_link_to("View Record", person_path(@person), 'fa-share', 'btn', '')
+    = render :partial => 'pledges/scheduled_payments_table', :locals => {:scheduled_pledge_payments => @person.scheduled_and_non_scheduled_pledges}

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

@@ -1,5 +1,3 @@
-- content_for :custom_js do
-  = javascript_include_tag "relationships"
 - in_section :people
 - content_for :title do
   #{@person}
@@ -10,14 +8,19 @@
   .span4
 
     -unless @person.dummy?
-      %p= render :partial => 'work_with_menu', :locals => {:person => @person}
-      = render @person.address unless @person.address.new_record?
+      = render :partial => 'work_with_menu', :locals => {:person => @person}
 
-      %ul
-        - @person.phones.each do |phone|
-          %li
-            %span.muted= phone.kind
-            = phone.number
+      - if @person.addresses.any?
+        %h5 Address
+        = render @person.addresses
+
+      - if @person.phones.any?
+        %h5 Phone
+        %ul
+          - @person.phones.each do |phone|
+            %li
+              %span.muted= phone.kind
+              = phone.number
 
       -with_kit(:relationships) do
         %section
@@ -31,29 +34,29 @@
                     ✭
                   %span.muted
                   = link_to(individual, polymorphic_url(individual))
-
-          %h5 Relationships
           - struct = relationships_struct(@person)
-          %ul
-            - struct[:starred].each do |relationship|
-              %li
-                %span.starred.starable{"data-person-id" => relationship.person.id, "data-type" => 'relationship', "data-action-id" => relationship.id, :class => (relationship.starred? ? "active" : "not-active") }
-                  ✭
-                %span.muted= relationship.relation.description.humanize
-                = link_to(relationship.other(@person), polymorphic_url(relationship.other(@person)))
-
-            - @person.relationships.unstarred.where(:relation_id => struct[:single]).each do |relationship|
-              %li
-                %span.starred.starable{"data-person-id" => relationship.person.id, "data-type" => 'relationship', "data-action-id" => relationship.id, :class => (relationship.starred? ? "active" : "not-active") }
-                  ✭
-                %span.muted= relationship.relation.description.humanize
-                = link_to(relationship.other(@person), polymorphic_url(relationship.other(@person)))
-            - struct[:grouped].each do |group|
-              %li
-                %span.starable-spacer
-                  ✭
-                %span.muted
-                  == #{Relation.find(group[:relation]).description.titleize.pluralize} (#{group[:count]}) #{link_to("View All", polymorphic_url([@person, :relationships], :relation_id => group[:relation]))} >
+          -unless no_relationships_in?(struct)
+            %h5 Relationships
+            %ul
+              - struct[:starred].each do |relationship|
+                %li
+                  %span.starred.starable{"data-person-id" => relationship.person.id, "data-type" => 'relationship', "data-action-id" => relationship.id, :class => (relationship.starred? ? "active" : "not-active") }
+                    ✭
+                  %span.muted= relationship.relation.description.humanize
+                  = link_to(relationship.other(@person), polymorphic_url(relationship.other(@person)))
+
+              - @person.relationships.unstarred.where(:relation_id => struct[:single]).each do |relationship|
+                %li
+                  %span.starred.starable{"data-person-id" => relationship.person.id, "data-type" => 'relationship', "data-action-id" => relationship.id, :class => (relationship.starred? ? "active" : "not-active") }
+                    ✭
+                  %span.muted= relationship.relation.description.humanize
+                  = link_to(relationship.other(@person), polymorphic_url(relationship.other(@person)))
+              - struct[:grouped].each do |group|
+                %li
+                  %span.starable-spacer
+                    ✭
+                  %span.muted
+                    == #{Relation.find(group[:relation]).description.humanize} (#{group[:count]}) #{link_to("View All", polymorphic_url([@person, :relationships], :relation_id => group[:relation]))} >
 
       %h5 Preferences
       %section#communication-preference
@@ -76,9 +79,32 @@
               - mailchimp_kit = @person.organization.kits.mailchimp
               = hidden_field_tag "person[subscribed_lists][]", nil, :id => "person_subscribed_lists_empty"
               - mailchimp_kit.attached_lists.each do |list|
-                = label_tag "", :class => "checkbox" do
-                  = check_box_tag "person[subscribed_lists][]", list[:list_id], @person.subscribed_lists.include?(list[:list_id]), :class => "mail-chimp-list", :disabled => @person.do_not_email
-                  %span= list[:list_name]
+                .list
+                  = label_tag "", :class => "checkbox" do
+                    = check_box_tag "person[subscribed_lists][]", list[:list_id], @person.subscribed_to_list?(list[:list_id]), :class => "mail-chimp-list", :disabled => mailchimp_list_disabled_for?(@person, list[:list_id])
+                    %span= list[:list_name]
+                    - if @person.opted_out_of_list?(list[:list_id])
+                      %span.opted-out (Opted Out)
+                    - if @person.unconfirmed_on_list?(list[:list_id])
+                      %span.unconfirmed (U)
+                    - if @person.bounced_on_list?(list[:list_id])
+                      %span.bounced (Bounced)
+                  - if mailchimp_show_groupings?(@person, list)
+                    = link_to "▸".html_safe, "#", :class => "show-all"
+                    %ul.groupings
+                      - list.fetch(:groups, []).each do |grouping|
+                        %li.grouping
+                          - active_groups = mailchimp_active_groups(list, grouping, @person)
+                          - inactive_groups = mailchimp_inactive_groups(list, grouping, @person)
+                          .name.hidden
+                            = grouping["name"]
+                          %ul.active
+                            - active_groups.each do |group|
+                              = render 'mailchimp_group', :list => list, :grouping => grouping, :group => group
+                          %ul.inactive
+                            - inactive_groups.each do |group|
+                              = render 'mailchimp_group', :list => list, :grouping => grouping, :group => group
+
             = form.submit "Save", :class => 'btn btn-primary hidden'
 
   .span8
@@ -142,18 +168,43 @@
       = will_paginate @actions, :id => 'endless-scroll-pagination'
 
 %div{"ng-controller" => "EditPersonCtrl"}
-  = render 'edit_modal', :header => "Edit #{@person.possessive} Info"
+  - if current_user.can? :manage, @person
+    - @excepts = []
+  - else
+    - @excepts = [:convert, :relationships, :households, :merge, :delete]
+  = render 'edit_modal', :header => "Edit #{@person.possessive} Info", :except => @excepts
   = render 'convert_to_company_modal'
   #edit-order-popup.modal
 
 -with_kit(:mailchimp) do
-  - if current_user.current_organization.kits.mailchimp
-    .modal#subscribe-modal(role="dialog")
-      .modal-header
-        %button(type="button" class="close" data-dismiss="modal" aria-hidden="true") ×
-        %h3 MailChimp List Subscription
-      .modal-body
-        %p #{@person} will receive an email from MailChimp confirming their addition to this list
-      .modal-footer
-        %button(class="btn" data-dismiss="modal" aria-hidden="true") Cancel
-        %button(class="btn btn-primary") OK
+  .modal#subscribe-modal(role="dialog")
+    .modal-header
+      %button(type="button" class="close" data-dismiss="modal" aria-hidden="true") ×
+      %h3 MailChimp Subscription
+    .modal-body
+      %label
+        = radio_button_tag "single_optin", "true", false
+        %b #{@person.first_name} gave me permission to be added to this list.
+      %p
+        #{@person.first_name} will not receive a confirmation email from MailChimp. Since you're adding this subscriber manually, #{@person.first_name} won't have an opt-in IP address or date in your records, so be extra sure you have permission first. Learn more at #{link_to "MailChimp", "http://kb.mailchimp.com/accounts/compliance-tips/guidelines-for-list-compliance"}.
+
+      %p OR
+
+      %label
+        = radio_button_tag "single_optin", "false", true
+        %b I want to send #{@person.first_name} an invitation to join this list.
+
+      %p
+        #{@person.first_name} will receive an email from MailChimp to confirm that he or she would like to subscribe to this list. #{@person.first_name} will not be subscribed to this list until the invitation is accepted.
+
+    .modal-footer
+      %button(class="btn btn-primary") Save
+      %button(class="btn" data-dismiss="modal" aria-hidden="true") Cancel
+
+-content_for :custom_js do
+  :javascript
+    $('#create-relationship-link').click(function(e) {
+      e.preventDefault();
+      $('#edit-person').modal('show')
+      $('.tab-relationships a:first').tab('show')
+    })