artfully_ose 1.2.0.pre.23 → 1.2.0.pre.24

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

@@ -0,0 +1,13 @@
+- in_section :households
+- content_for :title do
+  Households
+- content_for :header do
+  %h1 Households
+
+.row
+  .span8.super-search-results
+    - if @households.empty?
+       
+    -else
+      = render :partial => 'list', :locals => { :households => @households } unless @households.empty?
+      = will_paginate @households, :inner_window => 2, :outer_window => 0

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

@@ -0,0 +1,14 @@
+- in_section :households
+- content_for :title do
+  New Household
+- content_for :header do
+  %h1 Create a New Household
+
+- content_for :custom_js do
+  = javascript_include_tag "households"
+
+.row{"ng-controller" => "NewHouseholdCtrl"}
+  .span6.offset3
+    = render :partial => "shared/error_messages", :locals => { :target => @household }
+    = render :partial => 'form', :locals => { :household => @household }
+

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

@@ -0,0 +1,72 @@
+- content_for :custom_js do
+  = javascript_include_tag "relationships"
+- in_section :households
+- content_for :title do
+  #{@household.name}
+
+= render "header"
+
+.row
+  .span4
+    %p
+      = link_to "Edit Household", '#edit-household', 'data-toggle' => 'modal'
+
+    = render(@household.address) if @household.address
+
+    %ul
+      - @household.individuals.each do |individual|
+        %li{:style => "padding-top: 0.5em;"}
+          = link_to(individual, polymorphic_url(individual))
+        - individual.phones.each do |phone|
+          %li
+            %span.muted= phone.kind
+            = phone.number
+
+  .span8
+    #notes
+    .row-fluid
+      .span3
+        %h3 Notes
+    %table.table-condensed.table#notes-list
+      %tbody
+        - notes = @household.notes.includes(:person)
+        - if notes.empty?
+          %tr
+            %td
+              No notes for individuals in this household
+        - else
+          = render :partial => 'households/note', :collection =>  notes[0..2]
+        - if notes[3]
+          %tr#more-notes-link
+            %td.triangle ▸
+            %td= link_to pluralize(notes.length-3, 'more note'), "#"
+          %tbody#more-notes{:style => 'display:none'}
+            = render :partial => 'households/note', :collection =>  notes[3..-1]
+
+    #actions
+      .row-fluid
+        .span3
+          %h3 Action Feed
+      %table.table-condensed.sortedstar.table#action-list
+        %thead
+          %tr
+            %th
+            %th{:style => 'width:60px;'} Date
+            %th{:style => 'width:25px'}
+            %th #{@household.name} individuals...
+        %tbody
+          - if @actions.empty?
+            %tr
+              %td
+              %td
+              %td
+              %td
+                No actions for individuals in this household
+          - else
+            = render :partial => 'households/action', :collection => @actions
+
+      = will_paginate @actions, :id => 'endless-scroll-pagination'
+
+%div{"ng-controller" => "EditHouseholdCtrl"}
+  = render 'edit_modal'
+  #edit-order-popup.modal

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

@@ -0,0 +1,38 @@
+.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|
+        - 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|
+              .well.span3
+                %h5= person
+
+          %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"

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

@@ -6,7 +6,7 @@
     %p To pause this import and come back later, click "Back"
 
     .btn-group
-      = icon_link_to "Back", new_import_path(:type => import.kind), 'icon-share-alt', 'btn', ''
+      = icon_link_to "Back", new_import_path(:type => import.kind), 'fa-share', 'btn', ''
       = link_to "Delete", import_path(import), :data => {:confirm => "Are you sure you want to delete this import?"}, :method => :delete, :class => "btn btn-danger"
 
   .span9

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

@@ -5,7 +5,7 @@
     %p To pause this import and come back later, click "Back"
 
     .btn-group
-      = icon_link_to "Back", new_import_path(:type => import.kind), 'icon-share-alt', 'btn', ''
+      = icon_link_to "Back", new_import_path(:type => import.kind), 'fa-share', 'btn', ''
       = link_to "Delete", import_path(import), :data => {:confirm => "Are you sure you want to delete this import?"}, :method => :delete, :class => "btn btn-danger"
 
   .span9

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

@@ -24,7 +24,7 @@
               %td=message.person.email
               %td=message.person.first_name
               %td=message.person.last_name
-              %td=icon_link_to "", person_path(message.person), 'icon-share-alt', '', ''
+              %td=icon_link_to "", person_path(message.person), 'fa-share', '', ''
       = will_paginate @messages, :param_name => 'messages_page'
 
     - unless @people.empty?
@@ -41,7 +41,7 @@
             %td=row.email
             %td=row.first_name
             %td=row.last_name
-            %td=icon_link_to "", person_path(row), 'icon-share-alt', '', ''
+            %td=icon_link_to "", person_path(row), 'fa-share', '', ''
             
       = will_paginate @people
 

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

@@ -64,19 +64,19 @@
         %td The person's country
       %tr
         %td.field-slim Phone 1 type
-        %td Work, Home, Cell or Fax
+        %td Work, Home, Cell, Fax, or Other
       %tr
         %td.field-slim Phone 1
         %td The person's first phone number
       %tr
         %td.field-slim Phone 2 type
-        %td Work, Home, Cell or Fax
+        %td Work, Home, Cell, Fax, or Other
       %tr
         %td.field-slim Phone 2
         %td The person's second phone number
       %tr
         %td.field-slim Phone 3 type
-        %td Work, Home, Cell or Fax
+        %td Work, Home, Cell, Fax, or Other
       %tr
         %td.field-slim Phone 3
         %td The person's third phone number

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

@@ -6,7 +6,7 @@
     %p To pause this import and come back later, click "Back"
 
     .btn-group
-      = icon_link_to "Back", new_import_path(:type => import.kind), 'icon-share-alt', 'btn', ''
+      = icon_link_to "Back", new_import_path(:type => import.kind), 'fa-share', 'btn', ''
       = link_to "Delete", import_path(import), :data => {:confirm => "Are you sure you want to delete this import?"}, :method => :delete, :class => "btn btn-danger"
 
   .span9
@@ -34,7 +34,7 @@
             %td=row.company
             %td=row.website
             %td
-              =icon_link_to("", "#row#{index}", ' icon-zoom-in', '', '', {'data-toggle' => 'modal'})
+              =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    

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

@@ -21,5 +21,5 @@
               %td=message.person.email
               %td=message.person.first_name
               %td=message.person.last_name
-              %td=icon_link_to "", person_path(message.person), 'icon-share-alt', '', ''
+              %td=icon_link_to "", person_path(message.person), 'fa-share', '', ''
       = will_paginate @messages, :param_name => 'messages_page'

data/app/views/imports/shared/_sidebar.html.haml

@@ -1,5 +1,5 @@
 %p This import was created at: <br> #{l import.created_at_local_to_organization}
 
 .btn-group
-  = icon_link_to "Back", new_import_path(:type => import.kind), 'icon-share-alt', 'btn', ''
+  = icon_link_to "Back", new_import_path(:type => import.kind), 'fa-share', 'btn', ''
   = link_to "Delete", import_path(import), :data => {:confirm => "Are you sure you want to delete this import?"}, :method => :delete, :class => "btn btn-danger"

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

@@ -31,9 +31,9 @@
                 .span8
                   %h4.event-link= link_to event.name, event_path(event), :title => 'event-name'
                   %ul.mini-stats
-                    %li= "#{pluralize event.glance.sold.total, 'ticket'} sold"
-                    %li= "#{pluralize event.glance.available.total, 'ticket'} on sale"
-                    %li= "#{number_as_cents(event.glance.sales.total)} total sales"
+                    %li= "#{pluralize event.sold, 'ticket'} sold"
+                    %li= "#{pluralize event.on_sale, 'ticket'} on sale"
+                    %li= "#{number_as_cents(event.sales_total)} total sales"
 
     -if @events.blank?
       .no-image#add-a-description
@@ -44,7 +44,7 @@
     -else
       = link_to "Create Event", new_event_path, :class => "btn btn-primary"
       %span.pull-right
-        =icon_link_to("View All Events", events_path, 'icon-arrow-right', 'btn', '')
+        =icon_link_to("View All Events", events_path, 'fa-arrow-right', 'btn', '')
 
   .span8
     =render :partial => 'recent_activity'

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

@@ -1,5 +1,5 @@
 - [:notice, :success, :error, :alert, :info].each do |type|
-  - if flash[type]
+  - if flash[type].present?
     .flash{ "data-alert" => "alert", :class => [bootstrapped_type(type), type, 'alert'] }
       .close{ "data-dismiss" => "alert"} ×
-      = flash[type]
+      = [flash[type]].flatten.join('<br/>').html_safe

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

@@ -20,6 +20,7 @@
             %li= link_to "List Segments", segments_path
             %li= link_to "Import", new_import_path(:type => :people)
             %li= link_to "Export", imports_path
+            %li= link_to "Suggested Households", suggested_households_path
 
         %li{ :class => "dropdown #{active?(:reports)}" }
           = nav_dropdown "Reports"
@@ -35,6 +36,7 @@
           %ul.dropdown-menu
             %li= link_to "Tickets", sales_orders_path
             %li= link_to "Donations", contributions_path
+            %li= link_to "Memberships", membership_orders_path
             %li= link_to "Search All", orders_path
 
         %li.divider-vertical

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

@@ -36,7 +36,7 @@
         .pull-right
           %ul.nav.nav-pills
             %li.active
-              =icon_link_to("#{current_cart.id}    Checkout Now", store_order_path(@store_organization.cached_slug), 'icon-shopping-cart', '', '')
+              =icon_link_to("#{current_cart.items.size}    Checkout Now", store_order_path(@store_organization.cached_slug), 'fa-shopping-cart', '', '')
 
       = render :partial => 'layouts/flash', :locals => { :flash => flash }
       - flash.discard

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

@@ -38,4 +38,4 @@
       -# =current_member.organization.phone
 
 #edit-address-modal.modal.hide
-  =render :partial => 'people/edit_modal', :locals => { :url => members_person_path(current_member.person), :header => "Edit Your Information", :except => [:convert, :social, :merge, :delete], :return_to => members_root_path } 
+  =render :partial => 'people/edit_modal', :locals => { :url => members_person_path(current_member.person), :header => "Edit Your Information", :except => [:convert, :relationships, :households, :social, :merge, :delete], :return_to => members_root_path } 

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

@@ -6,9 +6,10 @@
         %tr
           %td Type
           %td#confirm-membership-type-name=@membership_comp.membership_type.name
-        %tr
-          %td Number of Memberships
-          %td#confirm-number-of-memberships=@membership_comp.number_of_memberships
+        -if @membership_comp.membership_type.allow_multiple_memberships?
+          %tr
+            %td Number of Memberships
+            %td#confirm-number-of-memberships=@membership_comp.number_of_memberships
         %tr
           %td Expires On
           %td#confirm-ends-at=@membership_comp.ends_at

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

@@ -9,9 +9,9 @@
       .control-group
         = form.label "Membership Type", :class => 'control-label'
         .controls
-          = form.select :membership_type, options_from_collection_for_select(@membership_types, 'id', 'name', @membership_comp.membership_type)
+          = form.select :membership_type, options_from_collection_for_select(@membership_types, 'id', 'name', @membership_comp.membership_type), :include_blank => true
 
-      .control-group
+      .control-group#number_of_memberships_control_group{:style => "display:none"}
         = form.label :number_of_memberships, "Number of Memberships", :class => 'control-label'
         .controls
           = form.text_field :number_of_memberships
@@ -60,23 +60,36 @@
 
 - content_for :custom_js do 
   :javascript
-    var ends_at_data = #{@membership_types_hash.to_json}
+    var membership_type_hash = #{@membership_types_hash.to_json}
     $('#membership_comp_membership_type').change(function () {
-      $('#membership_comp_ends_at').val(ends_at_data[$('#membership_comp_membership_type').val()])
+      mt = membership_type_hash[$('#membership_comp_membership_type').val()]
+
+      if (mt == undefined) {
+        $('#number_of_memberships_control_group').hide()
+        return;
+      }
+
+      $('#membership_comp_ends_at').val(mt['formatted_ends_at'])
+      allow_multiple_memberships = mt['allow_multiple_memberships']
+      if (allow_multiple_memberships == true) {
+        $('#number_of_memberships_control_group').show()
+      } else {
+        $('#number_of_memberships_control_group').hide()
+      }
     })
 
     $('#membership_comp_send_email_false').click(function () {
-      $('#membership_comp_message').hide()
+      $('#membership_comp_welcome_message').hide()
     })
 
     $('#membership_comp_send_email_true').click(function () {
-      $('#membership_comp_message').show()
+      $('#membership_comp_welcome_message').show()
     })
 
     $(document).ready(function() {
       if ($('input[name="membership_comp[send_email]"]:checked').val() == true) {
-        $('#membership_comp_message').show()
+        $('#membership_comp_welcome_message').hide()
       } else {
-        $('#membership_comp_message').false()
+        $('#membership_comp_welcome_message').show()
       }
     })

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

@@ -70,6 +70,17 @@
       .controls
         %label
           = f.check_box :on_sale
+
+    .control-group
+      = f.label :limit_per_transaction, :class => 'control-label' do
+        Limit Per Transaction
+        .tip.muted   
+          %span.label.label-success
+            Advanced
+          This is the number of memberships a patron can purchase in a single transaction. If you're not sure what this means, leave it set to 1.
+          =link_to "More", "https://artfully.zendesk.com/entries/64035707-How-many-memberships-should-I-allow-a-patron-to-buy", :target => "_blank"
+      .span9
+        = f.select :limit_per_transaction, (1..10), {}, :class => "span2"
     .form-actions
       =f.submit "Save", :class => "btn btn-primary"
       =link_to "Cancel", membership_types_path, :class => "btn"

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

@@ -3,7 +3,7 @@
 
 .row.bottom-room
   .pull-right
-    =icon_link_to("New Membership Type", new_membership_type_path, 'icon-plus', 'btn','')
+    =icon_link_to("New Membership Type", new_membership_type_path, 'fa-plus', 'btn','')
     =link_to "Download CSV", membership_types_path(:format => "csv"), :class => "btn"
 
 %table.table#membership-types-table
@@ -25,4 +25,4 @@
           %span.badge{:class => "#{'badge-success' if membership_type.on_sale?}"}="S"
 
       %td.right
-        = link_to('Store link', membership_type_storefront_path(membership_type))
+        =icon_link_to("Store link", membership_type_storefront_path(membership_type), 'fa-shopping-cart', 'btn btn-mini', '')

data/app/views/membership_types/type.html.haml

@@ -5,12 +5,15 @@
       .span6
         %h4 Season
         %p
-          Do your members sign up for a theatrical season or other fixed-expiration?
-        .style-selection.center
-          =link_to "Setup Seasonal Membership", new_membership_type_path(:type => "SeasonalMembershipType"), :class => :btn
+          Members sign up and receive benefits for your theatrical season, a calendar year, or some other term with a fixed end date. Here sign-ups and renewals are focused at a certain time of year.
       .span6
         %h4 Rolling
         %p
-          Do your members sign up for monthly or yearly memberships?
+          Members sign up and receive benefits for a number of months or years from their sign-up date. Here members can start at any time and renewal takes place whenever an individual's membership expires.
+    .row-fluid
+      .span6
+        .style-selection.center
+          =link_to "Setup Seasonal Membership", new_membership_type_path(:type => "SeasonalMembershipType"), :class => :btn
+      .span6
         .style_selection.center
           =link_to "Setup Rolling Membership", new_membership_type_path(:type => "RollingMembershipType"), :class => :btn

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

@@ -10,7 +10,7 @@
       .span6
         %ul.in-table{'ng-controller' => 'MembershipActionsCtrl'}
           %li.dropdown{:id => "#menu#bulkactions"}
-            =icon_link_to('Work with...', "#menu#bulkactions", 'icon-asterisk', 'dropdown-toggle dropdown btn', '')
+            =icon_link_to('Work with...', "#menu#bulkactions", 'fa-asterisk', 'dropdown-toggle dropdown btn', '')
             =image_tag "loading.gif", :class => 'loading-indicator', 'ng-show' => 'loading'
             .alert{'ng-show' => 'error'}
               %button.close{'ng-click' => 'error = false'}
@@ -26,7 +26,7 @@
               %li
                 = link_to "Cancel Membership", "#cancel", 'ng-click' => 'cancel($event)'
       .span6.right
-        = icon_link_to("View Record", person_path(@person), 'icon-share-alt', 'btn', '')
+        = icon_link_to("View Record", person_path(@person), 'fa-share-alt', 'btn', '')
         -# = link_to "Log In", "#", 'data-toggle' => 'modal', :class => 'btn'
         = link_to "Reset Password", "#reset-password-modal", 'data-toggle' => 'modal', :class => 'btn btn-danger'
 
@@ -73,17 +73,17 @@
               =hidden_field_tag "ends_at", ""
         .modal-footer
           =submit_tag "Change Expiration", :class => "btn btn-success"
-          =link_to "Cancel", "#", :class => "btn", 'data-dismiss'=>'modal' 
+          =link_to "Cancel", "#", :class => "btn", 'data-dismiss'=>'modal'
 
     #full-refund.modal
       .modal-header
         .close{'data-dismiss'=>'modal'} x
         %h3 Refund Membership
       .modal-body
-        %p="#{@person} will receive a full refund for these memberships"  
+        %p="#{@person} will receive a full refund for these memberships"
       .modal-footer
         =link_to "Process Refund", "#", :class => "btn btn-success", 'data-dismiss'=>'modal'
-        =link_to "Cancel", "#", :class => "btn btn-danger", 'data-dismiss'=>'modal' 
+        =link_to "Cancel", "#", :class => "btn btn-danger", 'data-dismiss'=>'modal'
 
     #change.modal{'ng-controller' => 'ChangeMembershipController'}
       =form_tag person_membership_changes_path, :class => "form-horizontal", 'novalidate' => 'novalidate', 'name' => 'changeForm', :method => :post do
@@ -144,7 +144,7 @@
           %label Enter refund amount:
           .controls
             =text_field_tag "whatever", "", :class => "currency"
-        %p="#{@person} will receive a partial refund for the above amount and these memberships will be cancelled."  
+        %p="#{@person} will receive a partial refund for the above amount and these memberships will be cancelled."
       .modal-footer
         =link_to "Process Refund", "#", :class => "btn btn-success", 'data-dismiss'=>'modal'
         =link_to "Cancel", "#", :class => "btn btn-danger", 'data-dismiss'=>'modal'
@@ -154,7 +154,7 @@
         .close{'data-dismiss'=>'modal'} x
         %h3 Reset Password
       .modal-body
-        %p="This member will receive an email with a link to reset their password so they can log in to their member dashboard."  
+        %p="This member will receive an email with a link to reset their password so they can log in to their member dashboard."
       .modal-footer
         =link_to "Send Password Reset", reset_password_person_path(@person), :class => "btn btn-primary", 'data-dismiss'=>'modal', :method => :post
         =link_to "Cancel", "#", :class => "btn", 'data-dismiss'=>'modal'