artfully_ose 1.2.0 → 1.3.0.pre1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -13
- data/app/assets/images/actions/open.png +0 -0
- data/app/assets/images/actions/pledge.png +0 -0
- data/app/assets/images/actions/pledge.psd +0 -0
- data/app/assets/images/glyphish/gray/cancel.png +0 -0
- data/app/assets/images/loading_gray.gif +0 -0
- data/app/assets/javascripts/application.js +30 -4
- data/app/assets/javascripts/baseball_card.js.coffee +235 -0
- data/app/assets/javascripts/boxoffice.js +12 -49
- data/app/assets/javascripts/contributions.js +264 -0
- data/app/assets/javascripts/custom/advanced_searches.js +142 -0
- data/app/assets/javascripts/custom/endless-scroll.js +1 -1
- data/app/assets/javascripts/custom/job-monitor.js +73 -0
- data/app/assets/javascripts/custom/kits-config.js +0 -2
- data/app/assets/javascripts/custom/mailchimp.js +14 -0
- data/app/assets/javascripts/custom/people.js +31 -2
- data/app/assets/javascripts/custom/person-finder.js +34 -0
- data/app/assets/javascripts/custom/searches.js +12 -0
- data/app/assets/javascripts/custom/user-finder.js +111 -0
- data/app/assets/javascripts/households.js +12 -5
- data/app/assets/javascripts/ical.js +138 -0
- data/app/assets/javascripts/jquery-lib/jquery.timeago.js +221 -0
- data/app/assets/javascripts/locationselector.js +1 -1
- data/app/assets/javascripts/memberships.js +24 -0
- data/app/assets/javascripts/relationships.js +10 -0
- data/app/assets/javascripts/search.js +22 -0
- data/app/assets/javascripts/store/sliding-wizard.js +2 -2
- data/app/assets/javascripts/store/store.js +51 -6
- data/app/assets/javascripts/tags.js +44 -0
- data/app/assets/stylesheets/application.sass +331 -32
- data/app/assets/stylesheets/bootstrap-overrides.css +24 -9
- data/app/assets/stylesheets/boxoffice.css.scss +0 -4
- data/app/assets/stylesheets/sass/_campaigns.sass +43 -0
- data/app/assets/stylesheets/sass/_tags.sass +10 -1
- data/app/assets/stylesheets/sass/fa-color.css.scss +13 -0
- data/app/assets/stylesheets/sass/store.sass +7 -7
- data/app/concerns/cart_finder.rb +10 -0
- data/app/concerns/oh_noes.rb +1 -1
- data/app/controllers/actions_controller.rb +5 -5
- data/app/controllers/addresses_controller.rb +1 -1
- data/app/controllers/advanced_search_segments_controller.rb +97 -0
- data/app/controllers/advanced_searches_controller.rb +118 -0
- data/app/controllers/appeals_controller.rb +63 -0
- data/app/controllers/artfully_ose_controller.rb +20 -2
- data/app/controllers/campaigns_controller.rb +90 -0
- data/app/controllers/charts_controller.rb +8 -2
- data/app/controllers/console_sales_controller.rb +21 -23
- data/app/controllers/contributions_controller.rb +74 -43
- data/app/controllers/converts_controller.rb +21 -0
- data/app/controllers/delete_ticket_types_controller.rb +35 -0
- data/app/controllers/events_pass_types_controller.rb +10 -2
- data/app/controllers/export_controller.rb +4 -4
- data/app/controllers/households_controller.rb +63 -15
- data/app/controllers/imports_controller.rb +13 -10
- data/app/controllers/job_monitors_controller.rb +9 -0
- data/app/controllers/members/people_controller.rb +7 -5
- data/app/controllers/members/sessions_controller.rb +1 -0
- data/app/controllers/membership_comps_controller.rb +5 -20
- data/app/controllers/memberships_controller.rb +2 -2
- data/app/controllers/merges_controller.rb +7 -6
- data/app/controllers/mobile/users_controller.rb +18 -6
- data/app/controllers/notes_controller.rb +5 -1
- data/app/controllers/orders_controller.rb +30 -13
- data/app/controllers/organizations_controller.rb +8 -0
- data/app/controllers/passes_kits_controller.rb +2 -4
- data/app/controllers/people_controller.rb +105 -17
- data/app/controllers/pledges_controller.rb +64 -0
- data/app/controllers/preview_rows_controller.rb +29 -0
- data/app/controllers/regular_donation_kits_controller.rb +11 -6
- data/app/controllers/sales_controller.rb +72 -40
- data/app/controllers/searches_controller.rb +37 -6
- data/app/controllers/segments_controller.rb +33 -2
- data/app/controllers/settlements_controller.rb +13 -7
- data/app/controllers/shows_controller.rb +58 -24
- data/app/controllers/statements_controller.rb +2 -2
- data/app/controllers/store/checkouts_controller.rb +43 -26
- data/app/controllers/store/donations_controller.rb +27 -11
- data/app/controllers/store/memberships_controller.rb +37 -4
- data/app/controllers/store/orders_controller.rb +26 -10
- data/app/controllers/store/passes_controller.rb +30 -3
- data/app/controllers/tags_controller.rb +42 -0
- data/app/controllers/ticket_types_controller.rb +9 -2
- data/app/controllers/tickets_controller.rb +6 -4
- data/app/controllers/unacknowledged_gifts_controller.rb +45 -0
- data/app/controllers/user_memberships_controller.rb +47 -8
- data/app/helpers/advanced_searches_helper.rb +252 -0
- data/app/helpers/artfully_ose_helper.rb +33 -4
- data/app/helpers/checkouts_helper.rb +16 -0
- data/app/helpers/mailchimp_lists_for_search_helper.rb +21 -0
- data/app/helpers/orders_helper.rb +11 -0
- data/app/helpers/people_helper.rb +28 -1
- data/app/helpers/relationships_helper.rb +6 -0
- data/app/helpers/sales_helper.rb +3 -1
- data/app/helpers/searches_helper.rb +3 -1
- data/app/helpers/segments_helper.rb +3 -0
- data/app/mailers/order_mailer.rb +8 -1
- data/app/mailers/producer_mailer.rb +39 -0
- data/app/mailers/reports_mailer.rb +6 -1
- data/app/models/ability.rb +15 -8
- data/app/models/action.rb +33 -4
- data/app/models/actions/change_action.rb +3 -1
- data/app/models/actions/comp_action.rb +3 -1
- data/app/models/actions/convert_action.rb +19 -0
- data/app/models/actions/do_action.rb +3 -1
- data/app/models/actions/exchange_action.rb +3 -1
- data/app/models/actions/get_action.rb +3 -1
- data/app/models/actions/give_action.rb +8 -2
- data/app/models/actions/go_action.rb +3 -1
- data/app/models/actions/hear_action.rb +15 -1
- data/app/models/actions/join_action.rb +3 -1
- data/app/models/actions/mailchimp_hear_action.rb +17 -0
- data/app/models/actions/pledge_action.rb +19 -0
- data/app/models/actions/refund_action.rb +3 -1
- data/app/models/actions/say_action.rb +3 -1
- data/app/models/actions/system_action.rb +17 -0
- data/app/models/address.rb +76 -31
- data/app/models/advanced_search.rb +434 -0
- data/app/models/advanced_search_segment.rb +12 -0
- data/app/models/appeal.rb +106 -0
- data/app/models/box_office.rb +1 -1
- data/app/models/budget_restriction.rb +9 -0
- data/app/models/campaign.rb +141 -0
- data/app/models/cart.rb +39 -4
- data/app/models/chart.rb +2 -2
- data/app/models/checkout.rb +54 -10
- data/app/models/comp.rb +7 -5
- data/app/models/company.rb +2 -0
- data/app/models/console_sale.rb +26 -0
- data/app/models/contribution.rb +327 -62
- data/app/models/convert.rb +62 -0
- data/app/models/daily_membership_report.rb +1 -1
- data/app/models/database_views/item_view.rb +91 -49
- data/app/models/discount.rb +1 -1
- data/app/models/discounts/discount_type.rb +2 -1
- data/app/models/donation.rb +27 -2
- data/app/models/donation_search.rb +188 -10
- data/app/models/door_list.rb +39 -2
- data/app/models/event.rb +31 -15
- data/app/models/ext.rb +3 -3
- data/app/models/ext/delayed_indexing.rb +41 -1
- data/app/models/ext/integrations.rb +6 -0
- data/app/models/forwarding_job_monitor.rb +2 -0
- data/app/models/household.rb +1 -1
- data/app/models/import.rb +39 -8
- data/app/models/imports/donations_import.rb +110 -19
- data/app/models/imports/events_import.rb +3 -2
- data/app/models/imports/mappings.rb +991 -0
- data/app/models/imports/memberships_import.rb +218 -20
- data/app/models/imports/people_import.rb +9 -1
- data/app/models/imports/rollback.rb +9 -0
- data/app/models/imports/validations.rb +7 -0
- data/app/models/individual.rb +3 -1
- data/app/models/item.rb +55 -17
- data/app/models/job/acknowledge_job.rb +23 -0
- data/app/models/job/checkout_processor.rb +1 -1
- data/app/models/job/convert_order_processor.rb +14 -0
- data/app/models/job/daily_email_report_job.rb +1 -12
- data/app/models/job/destroy_show_job.rb +1 -6
- data/app/models/job/destroy_tag_job.rb +18 -0
- data/app/models/job/door_list_generator_job.rb +33 -0
- data/app/models/job/door_list_mailer_job.rb +15 -0
- data/app/models/job/email_organization_sales_report_job.rb +32 -0
- data/app/models/job/expire_ticket_job.rb +19 -2
- data/app/models/job/export_people_job.rb +47 -0
- data/app/models/job/export_settlements_job.rb +24 -0
- data/app/models/job/geocode_address_job.rb +2 -7
- data/app/models/job/mailchimp_sync_job.rb +61 -3
- data/app/models/job/merge_job.rb +19 -0
- data/app/models/job/order_export_job.rb +36 -0
- data/app/models/job/order_mailer_job.rb +1 -2
- data/app/models/job/order_processor.rb +17 -6
- data/app/models/job/person_lifetime_value_job.rb +1 -0
- data/app/models/job/search_export_job.rb +33 -0
- data/app/models/job/suggest_households_by_address_job.rb +29 -0
- data/app/models/job/suggest_households_by_spouse_job.rb +22 -0
- data/app/models/job_monitor.rb +14 -0
- data/app/models/kit.rb +35 -8
- data/app/models/kits/campaigns_kit.rb +27 -0
- data/app/models/kits/mailchimp_kit.rb +548 -124
- data/app/models/kits/membership_kit.rb +14 -6
- data/app/models/kits/passes_kit.rb +14 -6
- data/app/models/kits/regular_donation_kit.rb +29 -2
- data/app/models/{relationships_kit.rb → kits/relationships_kit.rb} +3 -7
- data/app/models/kits/scannable_tickets_kit.rb +0 -5
- data/app/models/kits/sponsored_donation_kit.rb +2 -12
- data/app/models/kits/ticketing_kit.rb +9 -1
- data/app/models/linking_job_monitor.rb +2 -0
- data/app/models/list_grouping.rb +10 -0
- data/app/models/member.rb +35 -23
- data/app/models/member_number_generator.rb +2 -0
- data/app/models/membership.rb +23 -14
- data/app/models/membership_change.rb +17 -1
- data/app/models/membership_comp.rb +48 -23
- data/app/models/membership_comp_job.rb +7 -0
- data/app/models/membership_type.rb +13 -7
- data/app/models/monitorable.rb +19 -0
- data/app/models/note.rb +10 -1
- data/app/models/order.rb +170 -21
- data/app/models/order_handler.rb +13 -2
- data/app/models/orders/convert_order.rb +11 -0
- data/app/models/organization.rb +87 -9
- data/app/models/parsed_row.rb +142 -67
- data/app/models/pass.rb +13 -7
- data/app/models/pass_type.rb +17 -4
- data/app/models/passes_report.rb +6 -3
- data/app/models/payment.rb +16 -6
- data/app/models/payments/cash_payment.rb +1 -0
- data/app/models/payments/check_payment.rb +1 -5
- data/app/models/payments/comp_payment.rb +0 -1
- data/app/models/payments/credit_card_payment.rb +2 -7
- data/app/models/permission.rb +28 -0
- data/app/models/person.rb +503 -94
- data/app/models/phone.rb +3 -0
- data/app/models/redis_manager.rb +39 -0
- data/app/models/relationship.rb +31 -4
- data/app/models/relationship_builder.rb +0 -3
- data/app/models/rolling_membership_type.rb +5 -1
- data/app/models/s3_coordinator.rb +21 -0
- data/app/models/sale.rb +7 -4
- data/app/models/scheduled_pledge_payment.rb +69 -0
- data/app/models/search.rb +236 -24
- data/app/models/section.rb +6 -4
- data/app/models/show.rb +21 -12
- data/app/models/show_validator.rb +45 -0
- data/app/models/soft_credit.rb +126 -0
- data/app/models/subscribed_list.rb +52 -0
- data/app/models/suggested_household.rb +8 -2
- data/app/models/ticket.rb +35 -10
- data/app/models/ticket/locker.rb +25 -0
- data/app/models/ticket_summary.rb +1 -1
- data/app/models/ticket_type.rb +14 -2
- data/app/models/user.rb +42 -3
- data/app/models/user_membership.rb +57 -3
- data/app/models/valuation/lifetime_donations.rb +2 -2
- data/app/models/valuation/lifetime_pledges.rb +35 -0
- data/app/models/valuation/lifetime_value.rb +5 -1
- data/app/models/valuation_query.rb +109 -0
- data/app/models/venue.rb +8 -0
- data/app/views/actions/_action.html.haml +1 -1
- data/app/views/actions/_form.html.haml +2 -2
- data/app/views/actions/give/_show.html.haml +1 -1
- data/app/views/actions/pledge/_show.html.haml +8 -0
- data/app/views/actions/shared/_show.html.haml +1 -1
- data/app/views/addresses/_address.html.haml +3 -1
- data/app/views/advanced_search_segments/_advanced_searches_results.html.haml +15 -0
- data/app/views/advanced_search_segments/index.html.haml +18 -0
- data/app/views/advanced_search_segments/show.html.haml +46 -0
- data/app/views/advanced_searches/_form.html.haml +61 -0
- data/app/views/advanced_searches/_hit.html.haml +10 -0
- data/app/views/advanced_searches/_household.html.haml +7 -0
- data/app/views/advanced_searches/_new_condition.html.haml +3 -0
- data/app/views/advanced_searches/_people_count.html.erb +3 -0
- data/app/views/advanced_searches/_people_list.html.haml +5 -0
- data/app/views/advanced_searches/filters/_action.html.haml +12 -0
- data/app/views/advanced_searches/filters/_birthday.html.haml +9 -0
- data/app/views/advanced_searches/filters/_discount_code.html.haml +7 -0
- data/app/views/advanced_searches/filters/_donated.html.haml +17 -0
- data/app/views/advanced_searches/filters/_email.html.haml +7 -0
- data/app/views/advanced_searches/filters/_has_purchased_for.html.haml +9 -0
- data/app/views/advanced_searches/filters/_keyword.html.haml +9 -0
- data/app/views/advanced_searches/filters/_lifetime_value.html.haml +13 -0
- data/app/views/advanced_searches/filters/_limit_results.html.haml +7 -0
- data/app/views/advanced_searches/filters/_location.html.haml +11 -0
- data/app/views/advanced_searches/filters/_mailchimp_group.html.haml +8 -0
- data/app/views/advanced_searches/filters/_mailchimp_list.html.haml +8 -0
- data/app/views/advanced_searches/filters/_membership_ended.html.haml +9 -0
- data/app/views/advanced_searches/filters/_membership_started.html.haml +9 -0
- data/app/views/advanced_searches/filters/_membership_status.html.haml +8 -0
- data/app/views/advanced_searches/filters/_membership_type.html.haml +8 -0
- data/app/views/advanced_searches/filters/_orders.html.haml +10 -0
- data/app/views/advanced_searches/filters/_pass_type.html.haml +9 -0
- data/app/views/advanced_searches/filters/_relationships.html.haml +8 -0
- data/app/views/advanced_searches/filters/_segment.html.haml +8 -0
- data/app/views/advanced_searches/filters/_tagging.html.haml +9 -0
- data/app/views/advanced_searches/new.html.haml +12 -0
- data/app/views/advanced_searches/show.html.haml +107 -0
- data/app/views/advanced_searches/shows_for_org.html.haml +1 -0
- data/app/views/advanced_searches/ticket_types_for_org.html.haml +1 -0
- data/app/views/advanced_searches/update.js.erb +9 -0
- data/app/views/appeals/_form.html.haml +113 -0
- data/app/views/appeals/_header.html.haml +6 -0
- data/app/views/appeals/_heard_action.html.haml +16 -0
- data/app/views/appeals/edit.html.haml +8 -0
- data/app/views/appeals/new.html.haml +6 -0
- data/app/views/campaigns/_campaign_donations.html.haml +19 -0
- data/app/views/campaigns/_campaign_stats.html.haml +28 -0
- data/app/views/campaigns/_form.html.haml +48 -0
- data/app/views/campaigns/_header.html.haml +6 -0
- data/app/views/campaigns/edit.html.haml +6 -0
- data/app/views/campaigns/index.html.haml +33 -0
- data/app/views/campaigns/new.html.haml +6 -0
- data/app/views/campaigns/show.html.haml +132 -0
- data/app/views/console_sales/_cart.html.haml +3 -2
- data/app/views/console_sales/_payment.html.haml +14 -1
- data/app/views/console_sales/new.html.haml +11 -6
- data/app/views/contributions/_form.html.haml +139 -37
- data/app/views/contributions/_header.html.haml +5 -0
- data/app/views/contributions/_match_eligible.html.haml +24 -0
- data/app/views/contributions/_pledge_payment.html.haml +22 -0
- data/app/views/contributions/_search.html.haml +30 -0
- data/app/views/contributions/_soft_credit.html.haml +25 -0
- data/app/views/contributions/edit.html.haml +5 -8
- data/app/views/contributions/find_person.html.haml +16 -15
- data/app/views/contributions/index.html.haml +61 -24
- data/app/views/contributions/new.html.haml +5 -5
- data/app/views/converts/_grouped_form.html.haml +11 -0
- data/app/views/converts/new.html.haml +35 -0
- data/app/views/delete_ticket_types/_cannot_destroy_modal.html.haml +11 -0
- data/app/views/delete_ticket_types/_cannot_destroy_modal.rb +0 -0
- data/app/views/delete_ticket_types/_confirm_destroy_modal.html.haml +13 -0
- data/app/views/delete_ticket_types/show.html.haml +4 -0
- data/app/views/discounts/_form.html.haml +1 -1
- data/app/views/events/_day_date_show.html.haml +4 -2
- data/app/views/events/_glance.html.haml +12 -12
- data/app/views/events/_header.html.haml +1 -1
- data/app/views/events/_list.html.haml +1 -1
- data/app/views/events/_menu.html.haml +26 -21
- data/app/views/events/_section_fields.html.haml +1 -1
- data/app/views/events/_tax_deductible_message.html.haml +3 -0
- data/app/views/events/_ticket_type_fields.html.haml +13 -3
- data/app/views/events/index.html.haml +2 -1
- data/app/views/events/messages.html.haml +12 -10
- data/app/views/events/show.html.haml +6 -6
- data/app/views/events/temp_discount_form.html.haml +1 -1
- data/app/views/events_pass_types/_form.html.haml +1 -1
- data/app/views/events_pass_types/new.html.haml +1 -2
- data/app/views/households/_edit_modal.html.haml +9 -4
- data/app/views/households/_form.html.haml +6 -1
- data/app/views/households/_header.html.haml +9 -18
- data/app/views/households/confirm.html.haml +43 -0
- data/app/views/households/new.html.haml +3 -1
- data/app/views/households/show.html.haml +2 -1
- data/app/views/households/suggested.html.haml +10 -27
- data/app/views/imports/_export_links.html.haml +2 -2
- data/app/views/imports/donations/_new.html.haml +49 -6
- data/app/views/imports/donations/_pending.html.haml +69 -22
- data/app/views/imports/donations/_preview.html.haml +23 -0
- data/app/views/imports/events/_new.html.haml +8 -8
- data/app/views/imports/index.html.haml +26 -21
- data/app/views/imports/memberships/_approved.html.haml +16 -0
- data/app/views/imports/memberships/_caching.html.haml +17 -0
- data/app/views/imports/memberships/_failed.html.haml +5 -0
- data/app/views/imports/memberships/_imported.html.haml +45 -0
- data/app/views/imports/memberships/_importing.html.haml +20 -0
- data/app/views/imports/memberships/_invalid.html.haml +5 -0
- data/app/views/imports/memberships/_new.html.haml +155 -0
- data/app/views/imports/memberships/_pending.html.haml +85 -0
- data/app/views/imports/memberships/_preview_rows.html.haml +38 -0
- data/app/views/imports/people/_new.html.haml +81 -15
- data/app/views/imports/shared/_inspect_modal.html.haml +10 -1
- data/app/views/imports/shared/_new_sidebar.html.haml +12 -0
- data/app/views/imports/show.html.haml +0 -3
- data/app/views/index/_action.html.haml +4 -3
- data/app/views/index/_recent_activity.html.haml +14 -7
- data/app/views/index/dashboard.html.haml +27 -14
- data/app/views/job_monitors/_job_monitor_show.html.haml +34 -0
- data/app/views/job_monitors/_linking_job_monitor_show.html.haml +31 -0
- data/app/views/job_monitors/show.html.haml +1 -0
- data/app/views/layouts/_google_analytics.html.haml +9 -11
- data/app/views/layouts/_menu.html.haml +5 -3
- data/app/views/layouts/application.html.haml +12 -4
- data/app/views/layouts/devise_layout.html.haml +1 -1
- data/app/views/layouts/storefront.html.haml +7 -10
- data/app/views/members/index/index.html.haml +82 -4
- data/app/views/members/mailer/_invitation_body.html.haml +2 -2
- data/app/views/members/passwords/new.html.haml +13 -0
- data/app/views/members/sessions/new.html.haml +1 -1
- data/app/views/membership_comps/confirm.html.haml +10 -8
- data/app/views/membership_comps/create.html.haml +1 -3
- data/app/views/membership_kits/edit.html.haml +6 -0
- data/app/views/membership_types/_form.html.haml +1 -1
- data/app/views/membership_types/index.html.haml +11 -3
- data/app/views/memberships/index.html.haml +122 -109
- data/app/views/merges/find_person.html.haml +5 -3
- data/app/views/merges/new.html.haml +13 -4
- data/app/views/notes/_note.html.haml +3 -3
- data/app/views/order_mailer/confirmation_for.html.haml +1 -0
- data/app/views/order_mailer/confirmation_for.text.haml +1 -0
- data/app/views/orders/_assignable_donations.html.haml +25 -0
- data/app/views/orders/_assignable_pledges.html.haml +26 -0
- data/app/views/orders/_item_table.haml +20 -8
- data/app/views/orders/_order_sidebar.html.haml +37 -7
- data/app/views/orders/membership.html.haml +2 -2
- data/app/views/orders/passes.html.haml +4 -4
- data/app/views/orders/sales.html.haml +5 -5
- data/app/views/orders/show.html.haml +26 -7
- data/app/views/organizations/_form.html.haml +0 -5
- data/app/views/pass_types/index.html.haml +13 -5
- data/app/views/passes/index.html.haml +50 -39
- data/app/views/passes_kits/edit.html.haml +6 -0
- data/app/views/passes_reports/index.html.haml +1 -1
- data/app/views/pdfs/member.html.haml +1 -1
- data/app/views/pdfs/member_card_generator/blanks_usa_idc6.html.haml +1 -1
- data/app/views/pdfs/order.html.haml +5 -3
- data/app/views/people/_address_fields.html.haml +40 -0
- data/app/views/people/_convert_to_company_modal.html.haml +3 -0
- data/app/views/people/_edit_modal.html.haml +121 -38
- data/app/views/people/_form.html.haml +8 -14
- data/app/views/people/_header.html.haml +11 -16
- data/app/views/people/_list.html.haml +3 -9
- data/app/views/people/_mailchimp_group.html.haml +3 -0
- data/app/views/people/_phone_fields.html.haml +1 -1
- data/app/views/people/_relationship_fields.html.haml +10 -5
- data/app/views/people/_work_with_menu.html.haml +14 -8
- data/app/views/people/index.html.haml +10 -9
- data/app/views/people/new.html.haml +18 -4
- data/app/views/people/pledges.html.haml +13 -0
- data/app/views/people/show.html.haml +96 -45
- data/app/views/pledges/_none_scheduled_payment_table.html.haml +17 -0
- data/app/views/pledges/_receive_pledge.html.haml +87 -0
- data/app/views/pledges/_scheduled_payments_table.html.haml +18 -0
- data/app/views/pledges/index.html.haml +47 -0
- data/app/views/preview_rows/index.html.haml +1 -0
- data/app/views/producer_mailer/donation_notification.html.haml +9 -0
- data/app/views/producer_mailer/donation_notification.text.erb +8 -0
- data/app/views/producer_mailer/door_list_notification.html.haml +10 -0
- data/app/views/producer_mailer/door_list_notification.text.erb +6 -0
- data/app/views/producer_mailer/mailchimp_kit_initial_sync_notification.html.haml +2 -2
- data/app/views/regular_donation_kits/edit.html.haml +29 -1
- data/app/views/relationships/index.html.haml +1 -1
- data/app/views/sales/_boxoffice.html.haml +15 -5
- data/app/views/sales/_doorlist.html.haml +2 -2
- data/app/views/sales/new.html.haml +2 -2
- data/app/views/searches/_company.html.haml +7 -0
- data/app/views/searches/_form.html.haml +75 -8
- data/app/views/searches/_household.html.haml +2 -2
- data/app/views/searches/_individual.html.haml +7 -0
- data/app/views/searches/show.html.haml +59 -23
- data/app/views/segments/index.html.haml +1 -1
- data/app/views/segments/show.html.haml +36 -1
- data/app/views/shared/_baseball_card.html.haml +40 -0
- data/app/views/shared/_tags.html.haml +10 -8
- data/app/views/shows/_empty_ticket_table.html.haml +12 -0
- data/app/views/shows/_sections_table.html.haml +78 -69
- data/app/views/shows/_ticket_table.html.haml +10 -7
- data/app/views/shows/index.html.haml +95 -85
- data/app/views/statements/_shows.html.haml +1 -1
- data/app/views/store/checkouts/_event_information.html.haml +89 -0
- data/app/views/store/checkouts/_shopping_cart_display.haml +8 -0
- data/app/views/store/checkouts/_thanks.html.haml +40 -0
- data/app/views/store/checkouts/create.html.haml +1 -0
- data/app/views/store/checkouts/shopping_cart_display/_discounts.haml +8 -0
- data/app/views/store/checkouts/shopping_cart_display/_donations.haml +15 -0
- data/app/views/store/checkouts/{_membership_info.html.haml → shopping_cart_display/_membership_info.html.haml} +0 -0
- data/app/views/store/checkouts/shopping_cart_display/_memberships.haml +8 -0
- data/app/views/store/checkouts/shopping_cart_display/_passes.haml +9 -0
- data/app/views/store/checkouts/shopping_cart_display/_tickets.haml +10 -0
- data/app/views/store/checkouts/shopping_cart_display/_total.haml +10 -0
- data/app/views/store/donations/index.html.haml +4 -0
- data/app/views/store/events/_contact_info.html.haml +8 -0
- data/app/views/store/events/_venue.html.haml +14 -7
- data/app/views/store/events/calendar.html.haml +2 -9
- data/app/views/store/events/show.html.haml +2 -9
- data/app/views/store/events/single_show.html.haml +3 -3
- data/app/views/store/memberships/index.html.haml +3 -3
- data/app/views/store/orders/blank.html.erb +34 -0
- data/app/views/store/orders/show.html.haml +15 -6
- data/app/views/store/passes/index.html.haml +3 -3
- data/app/views/store/shared/_small_donate_form.html.haml +21 -18
- data/app/views/tags/_edit_modal.html.haml +16 -0
- data/app/views/tags/index.html.haml +23 -0
- data/app/views/unacknowledged_gifts/_heard_action.html.haml +10 -0
- data/app/views/unacknowledged_gifts/index.html.haml +76 -0
- data/app/views/user_memberships/_list.html.haml +147 -24
- data/config/initializers/delayed_job_config.rb +10 -1
- data/config/routes.rb +85 -9
- data/db/migrate/20140422193345_add_email_copy_to_pass_type.rb +1 -1
- data/db/migrate/20140616045851_add_birthdate_to_search.rb +7 -0
- data/db/migrate/20140623131025_create_campaigns.rb +27 -0
- data/db/migrate/20140627120214_create_appeals.rb +28 -0
- data/db/migrate/20140630151406_add_deleted_at_to_campaigns.rb +9 -0
- data/db/migrate/20140701124100_add_segment_id_and_notes_to_appeals.rb +12 -0
- data/db/migrate/20140702115815_add_campaign_id_and_appeal_id_to_donations.rb +14 -0
- data/db/migrate/20140702121928_add_materials_to_appeals.rb +11 -0
- data/db/migrate/20140702150521_add_deleted_at_to_appeals.rb +9 -0
- data/db/migrate/20140709151816_add_campaign_id_and_appeal_id_to_orders.rb +14 -0
- data/db/migrate/20140723133850_remove_campaign_id_and_apeal_id_from_orders.rb +11 -0
- data/db/migrate/20140723134923_add_commitment_date_to_donations.rb +6 -0
- data/db/migrate/20140730141515_add_match_eligible_to_donations.rb +15 -0
- data/db/migrate/20140818141140_create_soft_credits.rb +12 -0
- data/db/migrate/20140903140113_add_pledge_to_donations.rb +9 -0
- data/db/migrate/20140904183953_add_destroyed_at_to_relationships.rb +7 -0
- data/db/migrate/20140905080503_create_scheduled_pledge_payments.rb +16 -0
- data/db/migrate/20140909150251_add_org_to_suggested_household.rb +7 -0
- data/db/migrate/20141007114614_add_order_id_to_donations.rb +15 -0
- data/db/migrate/20141021134013_add_lifetime_pledges_to_people.rb +5 -0
- data/db/migrate/20141027191307_default_overwrite_member_addresses_to_false.rb +5 -0
- data/db/migrate/20141031193839_update_relations.rb +9 -0
- data/db/migrate/20141126183258_add_mailchimp_status_fields_to_people.rb +6 -0
- data/db/migrate/20141126184811_add_processing_at_to_ticket.rb +5 -0
- data/db/migrate/20141127135743_add_import_to_campaigns.rb +6 -0
- data/db/migrate/20141128143944_add_fiscal_year_to_donations.rb +5 -0
- data/db/migrate/20141128151407_remove_fiscal_year_from_scheduled_pledge_payments.rb +3 -0
- data/db/migrate/20141204164400_add_more_indexes_to_actions.rb +7 -0
- data/db/migrate/20141204171612_add_indexes_to_charts.rb +12 -0
- data/db/migrate/20141204172658_add_hide_on_recent_activity_to_actions.rb +5 -0
- data/db/migrate/20141204173004_add_indexes_to_ept.rb +9 -0
- data/db/migrate/20141204211933_remove_membership_counts_from_members.rb +13 -0
- data/db/migrate/20141205202030_create_subscribed_lists.rb +19 -0
- data/db/migrate/20141208225228_add_mailchimp_lists_to_searches.rb +5 -0
- data/db/migrate/20141210162329_add_bounced_to_subscribed_lists.rb +5 -0
- data/db/migrate/20141211165307_add_external_reference_to_actions.rb +5 -0
- data/db/migrate/20141212172119_add_not_mailchimp_lists_to_searches.rb +5 -0
- data/db/migrate/20141229204605_normalize_states_in_addresses.rb +11 -0
- data/db/migrate/20150113091344_add_fiscal_to_organizations.rb +11 -0
- data/db/migrate/20150113091434_create_budget_restrictions.rb +14 -0
- data/db/migrate/20150113091503_add_budget_restriction_to_campaigns.rb +14 -0
- data/db/migrate/20150129091354_add_campaign_to_searches.rb +13 -0
- data/db/migrate/20150203174456_create_list_groupings.rb +12 -0
- data/db/migrate/20150203222451_add_groupings_to_searches.rb +6 -0
- data/db/migrate/20150219153827_add_roles_to_user_memberships.rb +13 -0
- data/db/migrate/20150223145657_add_daily_sales_to_user_membership.rb +13 -0
- data/db/migrate/20150318171857_create_advanced_searches.rb +16 -0
- data/db/migrate/20150319185940_add_org_id_index_to_orders.rb +5 -0
- data/db/migrate/20150325085516_add_received_amount_to_donations.rb +16 -0
- data/db/migrate/20150325173053_add_pass_index_to_tickets.rb +5 -0
- data/db/migrate/20150331084817_add_creator_id_to_orders.rb +11 -0
- data/db/migrate/20150406162656_index_tickets_on_action_id.rb +5 -0
- data/db/migrate/20150408123349_add_donor_instructions_to_orders.rb +9 -0
- data/db/migrate/20150408125600_add_index_to_imports.rb +5 -0
- data/db/migrate/20150414193419_add_index_to_phone.rb +5 -0
- data/db/migrate/20150414193646_add_index_to_taggings.rb +5 -0
- data/db/migrate/20150415113013_add_nickname_to_people.rb +11 -0
- data/db/migrate/20150420143707_add_indexes_to_donations.rb +7 -0
- data/db/migrate/20150421092302_add_kind_to_addresses.rb +11 -0
- data/db/migrate/20150513154513_add_name_to_advanced_search.rb +5 -0
- data/db/migrate/20150518131946_add_receive_donation_notification_to_user_memberships.rb +9 -0
- data/db/migrate/20150520182350_remove_name_from_advanced_search.rb +9 -0
- data/db/migrate/20150520202900_create_advanced_search_segments.rb +9 -0
- data/db/migrate/20150520210658_add_advanced_search_id_to_advanced_search_segment.rb +5 -0
- data/db/migrate/20150521183507_add_organization_id_to_advanced_search_segment.rb +5 -0
- data/db/migrate/20150602204548_add_index_on_deleted_at.rb +5 -0
- data/db/migrate/20150711143014_add_receive_door_list_to_user_memberships.rb +10 -0
- data/db/migrate/20150716000301_create_job_monitors_table.rb +12 -0
- data/db/migrate/20150807005404_re_refresh_show_stats.rb +8 -0
- data/db/migrate/20150810133417_convert_business_to_work.rb +5 -0
- data/db/migrate/20150812135205_update_notes_nulls.rb +9 -0
- data/db/migrate/20150813202745_index_household_id.rb +6 -0
- data/db/migrate/20150814075653_add_maiden_name_to_people.rb +9 -0
- data/db/migrate/20150911203530_normalize_countries_in_addresses.rb +11 -0
- data/db/migrate/20150922155253_add_advanced_search_segment_id_to_membership_types.rb +5 -0
- data/db/migrate/20150922155308_add_advanced_search_segment_id_to_pass_types.rb +5 -0
- data/db/migrate/20151006180702_add_deleted_at_to_ticket_types.rb +5 -0
- data/db/migrate/20151009175206_add_receipt_details_to_ticket_types.rb +5 -0
- data/db/migrate/20151112174723_index_list_groupings.rb +5 -0
- data/lib/artfully_ose/common_abilities.rb +80 -57
- data/lib/artfully_ose/version.rb +1 -1
- data/lib/tasks/artfully_ose.rake +46 -4
- data/spec/factories/action_factories.rb +2 -0
- data/spec/factories/address_factories.rb +2 -2
- data/spec/factories/advanced_search_factories.rb +45 -0
- data/spec/factories/advanced_search_segment_factories.rb +6 -0
- data/spec/factories/advanced_segment_factories.rb +6 -0
- data/spec/factories/campaign_factories.rb +20 -0
- data/spec/factories/cart_factories.rb +24 -0
- data/spec/factories/chart_factories.rb +4 -0
- data/spec/factories/event_factories.rb +6 -0
- data/spec/factories/item_factories.rb +23 -1
- data/spec/factories/kit_factories.rb +27 -3
- data/spec/factories/member_factories.rb +8 -1
- data/spec/factories/membership_factories.rb +12 -0
- data/spec/factories/membership_type_factories.rb +18 -0
- data/spec/factories/note_factories.rb +7 -0
- data/spec/factories/order_factories.rb +7 -0
- data/spec/factories/pass_factories.rb +6 -0
- data/spec/factories/payments_factories.rb +1 -1
- data/spec/factories/person_factories.rb +46 -4
- data/spec/factories/scheduled_pledge_payment_factories.rb +10 -0
- data/spec/factories/show_factories.rb +8 -3
- data/spec/factories/soft_credit_factories.rb +8 -0
- data/spec/factories/ticket_factories.rb +22 -9
- data/spec/factories/user_factories.rb +16 -8
- metadata +342 -59
- data/app/controllers/comps_controller.rb +0 -47
- data/app/models/household_suggester.rb +0 -58
- data/app/views/searches/_person.html.haml +0 -10
- data/app/views/store/checkouts/thanks.html.haml +0 -134
data/app/models/ticket/locker.rb
CHANGED
@@ -20,12 +20,18 @@ module Ticket::Locker
|
|
20
20
|
tickets
|
21
21
|
end
|
22
22
|
|
23
|
+
#
|
24
|
+
# Unlock all tickets in tickets. The cart will also be rejected so that the app can surface a message
|
25
|
+
# to the user that their cart has been modified.
|
23
26
|
#
|
24
27
|
# We pass cart so that we can ensure we're expiring the right transaction. The ticket could have moved
|
25
28
|
# carts since the job was queued.
|
26
29
|
#
|
27
30
|
# If we come along and expire it, the patron will be bitter.
|
28
31
|
#
|
32
|
+
# Calling this method directly is vastly discouraged. Please use ExpireTicketJob.new.perform
|
33
|
+
# to expire tickets.
|
34
|
+
#
|
29
35
|
def unlock(tickets, cart)
|
30
36
|
|
31
37
|
Ticket.where(:id => tickets)
|
@@ -40,6 +46,25 @@ module Ticket::Locker
|
|
40
46
|
:discount_id => nil
|
41
47
|
})
|
42
48
|
end
|
49
|
+
|
50
|
+
def any_processing?(tickets)
|
51
|
+
Ticket.where(:id => tickets)
|
52
|
+
.where("processing_at is not null")
|
53
|
+
.any?
|
54
|
+
end
|
55
|
+
|
56
|
+
def processing!(tickets, cart)
|
57
|
+
Ticket.where(:id => tickets)
|
58
|
+
.where(:cart_id => cart)
|
59
|
+
.uncommitted
|
60
|
+
.update_all({ :processing_at => DateTime.now })
|
61
|
+
end
|
62
|
+
|
63
|
+
def unprocessing!(tickets, cart)
|
64
|
+
Ticket.where(:id => tickets)
|
65
|
+
.where(:cart_id => cart)
|
66
|
+
.update_all({ :processing_at => nil })
|
67
|
+
end
|
43
68
|
end
|
44
69
|
|
45
70
|
#
|
data/app/models/ticket_type.rb
CHANGED
@@ -1,4 +1,6 @@
|
|
1
1
|
class TicketType < ActiveRecord::Base
|
2
|
+
include OhNoes::Destroy
|
3
|
+
|
2
4
|
belongs_to :section
|
3
5
|
belongs_to :show
|
4
6
|
belongs_to :membership_type
|
@@ -6,12 +8,13 @@ class TicketType < ActiveRecord::Base
|
|
6
8
|
has_many :tickets
|
7
9
|
|
8
10
|
after_save { self.chart.upgrade_event unless self.chart.nil? }
|
9
|
-
attr_accessible :name, :price, :limit, :description, :storefront, :box_office, :members,
|
10
|
-
:membership_type_id, :tickets_per_membership, :member_ticket
|
11
|
+
attr_accessible :name, :price, :limit, :description, :storefront, :box_office, :members,
|
12
|
+
:membership_type_id, :tickets_per_membership, :member_ticket, :receipt_details
|
11
13
|
|
12
14
|
before_save :clear_membership_type_id
|
13
15
|
|
14
16
|
validates :membership_type_id, :presence => true, :if => :member_ticket?
|
17
|
+
validates_presence_of :name
|
15
18
|
|
16
19
|
def as_json(options = {})
|
17
20
|
{
|
@@ -78,6 +81,11 @@ class TicketType < ActiveRecord::Base
|
|
78
81
|
end
|
79
82
|
|
80
83
|
def self.price_to_cents(price_in_dollars)
|
84
|
+
price_in_dollars ||= ""
|
85
|
+
|
86
|
+
#eliminate any $ or ,
|
87
|
+
price_in_dollars.gsub!(/[\$\,]/,"")
|
88
|
+
|
81
89
|
(price_in_dollars.to_f * 100).to_i
|
82
90
|
end
|
83
91
|
|
@@ -126,6 +134,10 @@ class TicketType < ActiveRecord::Base
|
|
126
134
|
tickets.select {|t| t.comped?}
|
127
135
|
end
|
128
136
|
|
137
|
+
def destroyable?
|
138
|
+
committed.none?
|
139
|
+
end
|
140
|
+
|
129
141
|
def self.set_show(show)
|
130
142
|
TicketType.joins(:section => :chart).where('charts.id = ?', show.chart_id).update_all(:show_id => show.id)
|
131
143
|
end
|
data/app/models/user.rb
CHANGED
@@ -14,14 +14,37 @@ class User < ActiveRecord::Base
|
|
14
14
|
has_many :user_memberships
|
15
15
|
has_many :organizations, :through => :user_memberships
|
16
16
|
|
17
|
+
serialize :cas_extra_attributes
|
18
|
+
|
17
19
|
scope :logged_in_more_than_once, where("users.sign_in_count > 1")
|
18
20
|
|
21
|
+
searchable do
|
22
|
+
text :first_name
|
23
|
+
text :last_name
|
24
|
+
text :email
|
25
|
+
|
26
|
+
text :full_name do
|
27
|
+
(first_name || "") + " " + (last_name || "")
|
28
|
+
end
|
29
|
+
|
30
|
+
text :organizations do
|
31
|
+
organizations.map {|org| org.name }.join(" ")
|
32
|
+
end
|
33
|
+
end
|
34
|
+
include Ext::DelayedIndexing
|
35
|
+
|
19
36
|
def self.generate_password
|
20
37
|
Devise.friendly_token
|
21
38
|
end
|
22
39
|
|
23
|
-
|
24
|
-
|
40
|
+
delegate :can?, :cannot?, :to => :ability
|
41
|
+
def ability
|
42
|
+
Ability.new(self)
|
43
|
+
end
|
44
|
+
|
45
|
+
attr_accessible :email, :password, :password_confirmation, :remember_me,
|
46
|
+
:user_agreement, :newsletter_emails, :first_name, :last_name,
|
47
|
+
:user_memberships_attributes, :fa_user_id, :cas_extra_attributes
|
25
48
|
|
26
49
|
def is_in_organization?
|
27
50
|
@is_in_organization ||= !!(user_memberships.any? && ! user_memberships.first.organization.new_record?)
|
@@ -32,7 +55,11 @@ class User < ActiveRecord::Base
|
|
32
55
|
end
|
33
56
|
|
34
57
|
def membership_in(organization)
|
35
|
-
|
58
|
+
if @membership && organization.id == @membership.organization_id
|
59
|
+
@membership
|
60
|
+
else
|
61
|
+
user_memberships.where(:organization_id => organization.id).limit(1).first
|
62
|
+
end
|
36
63
|
end
|
37
64
|
|
38
65
|
def self.like(query = "")
|
@@ -57,4 +84,16 @@ class User < ActiveRecord::Base
|
|
57
84
|
"No Name ##{id}"
|
58
85
|
end
|
59
86
|
end
|
87
|
+
|
88
|
+
def permission_in(organization)
|
89
|
+
membership_in(organization).try(:role_title)
|
90
|
+
end
|
91
|
+
|
92
|
+
def has_permission_in?(role, organization)
|
93
|
+
!!(membership_in(organization).try("#{Permission.database_column_for(role)}"))
|
94
|
+
end
|
95
|
+
|
96
|
+
def is_org_admin_of(organization)
|
97
|
+
!!(membership_in(organization) && membership_in(organization).organization_administrator?)
|
98
|
+
end
|
60
99
|
end
|
@@ -1,6 +1,7 @@
|
|
1
1
|
class UserMembership < ActiveRecord::Base
|
2
2
|
# Be careful here! :user needs to come out of this if we ever support update action on memberships controller
|
3
|
-
attr_accessible :user, :organization_attributes
|
3
|
+
attr_accessible :user, :organization_attributes,
|
4
|
+
:organization_administrator, :manager, :general_associate, :box_office_associate
|
4
5
|
|
5
6
|
belongs_to :user
|
6
7
|
belongs_to :organization
|
@@ -9,6 +10,47 @@ class UserMembership < ActiveRecord::Base
|
|
9
10
|
|
10
11
|
validates :user_id, :uniqueness => {:scope => :organization_id}
|
11
12
|
|
13
|
+
#
|
14
|
+
# These methods all depend on one-to-one user roles situation
|
15
|
+
#
|
16
|
+
def role_title
|
17
|
+
return Permission::ORGANIZATION_ADMINISTRATOR if organization_administrator?
|
18
|
+
return Permission::MANAGER if manager?
|
19
|
+
return Permission::GENERAL_ASSOCIATE if general_associate?
|
20
|
+
return Permission::BOX_OFFICE_ASSOCIATE if box_office_associate?
|
21
|
+
end
|
22
|
+
|
23
|
+
def self.sort_by_permission(user_memberships)
|
24
|
+
@sorted_user_memberships = []
|
25
|
+
@sorted_user_memberships << user_memberships.select(&:organization_administrator)
|
26
|
+
@sorted_user_memberships << user_memberships.select(&:manager)
|
27
|
+
@sorted_user_memberships << user_memberships.select(&:general_associate)
|
28
|
+
@sorted_user_memberships << user_memberships.select(&:box_office_associate)
|
29
|
+
@sorted_user_memberships.flatten
|
30
|
+
end
|
31
|
+
|
32
|
+
def self.set_role(user, organization, new_role)
|
33
|
+
@user_membership = UserMembership.where(:user_id => user.id, :organization_id => organization.id).first
|
34
|
+
|
35
|
+
return false if @user_membership.nil?
|
36
|
+
|
37
|
+
@user_membership.transaction do
|
38
|
+
return @user_membership.set_role!(new_role)
|
39
|
+
end
|
40
|
+
end
|
41
|
+
|
42
|
+
#
|
43
|
+
# Pass a Permission::ORGANIZATION_ADMINISTRATOR role or the like
|
44
|
+
#
|
45
|
+
def set_role!(new_role)
|
46
|
+
["organization_administrator", "manager", "general_associate", "box_office_associate"].each do |role|
|
47
|
+
self.send("#{role}=", false)
|
48
|
+
end
|
49
|
+
new_role = Permission.database_column_for(new_role)
|
50
|
+
self.send("#{new_role}=", true)
|
51
|
+
self.save
|
52
|
+
end
|
53
|
+
|
12
54
|
#
|
13
55
|
# Will promote new_owner to admin and demote any other owners
|
14
56
|
#
|
@@ -19,9 +61,21 @@ class UserMembership < ActiveRecord::Base
|
|
19
61
|
return false if @user_membership.nil?
|
20
62
|
|
21
63
|
@user_membership.transaction do
|
22
|
-
|
64
|
+
if organization.administrator_limited?
|
65
|
+
#Make all org admins a manager
|
66
|
+
UserMembership.where(:organization_id => organization.id)
|
67
|
+
.where(Permission.database_column_for(Permission::ORGANIZATION_ADMINISTRATOR).to_sym => true)
|
68
|
+
.update_all(Permission.database_column_for(Permission::MANAGER).to_sym => true)
|
69
|
+
|
70
|
+
#Turn off all admins if this organization is limited to 1 admin
|
71
|
+
UserMembership.where(:organization_id => organization.id)
|
72
|
+
.update_all(Permission.database_column_for(Permission::ORGANIZATION_ADMINISTRATOR).to_sym => false)
|
73
|
+
end
|
74
|
+
|
23
75
|
@user_membership.reload
|
24
|
-
|
76
|
+
|
77
|
+
#Make this user a manager
|
78
|
+
@user_membership.set_role!(Permission::ORGANIZATION_ADMINISTRATOR)
|
25
79
|
return @user_membership.save
|
26
80
|
end
|
27
81
|
end
|
@@ -25,8 +25,8 @@ module Valuation
|
|
25
25
|
#
|
26
26
|
def calculate_lifetime_donations
|
27
27
|
self.lifetime_donations = 0
|
28
|
-
lifetime_orders.each do |o|
|
29
|
-
o.donations.each { |i| self.lifetime_donations = self.lifetime_donations + i.total_price}
|
28
|
+
lifetime_orders.pledge(false).each do |o|
|
29
|
+
o.donations.reject { |i| i.dead?}.each { |i| self.lifetime_donations = self.lifetime_donations + i.total_price}
|
30
30
|
end
|
31
31
|
save
|
32
32
|
self.lifetime_donations
|
@@ -0,0 +1,35 @@
|
|
1
|
+
module Valuation
|
2
|
+
|
3
|
+
#
|
4
|
+
# Anything with a :lifetime_pledges column and has_many pledges can use this module.
|
5
|
+
#
|
6
|
+
module LifetimePledges
|
7
|
+
extend ActiveSupport::Concern
|
8
|
+
|
9
|
+
#
|
10
|
+
# Includers can define a method called lifetime_pledges which
|
11
|
+
# will override this method.
|
12
|
+
#
|
13
|
+
# lifetime_pledges should return the pledges that this model wants to include in the calculation
|
14
|
+
#
|
15
|
+
def lifetime_orders
|
16
|
+
orders
|
17
|
+
end
|
18
|
+
|
19
|
+
#
|
20
|
+
# Calculate the lifetime pledges of this model by summing the price of all pledges
|
21
|
+
# attached to orders attached to this person. Save the pledges in lifetime_pledges.
|
22
|
+
# Return the total
|
23
|
+
#
|
24
|
+
# This could be done (probably faster) in a single sql SELECT SUM suery
|
25
|
+
#
|
26
|
+
def calculate_lifetime_pledges
|
27
|
+
self.lifetime_pledges = 0
|
28
|
+
lifetime_orders.pledge.each do |o|
|
29
|
+
self.lifetime_pledges = self.lifetime_pledges + (o.fully_paid? ? 0 : o.outstanding_amount)
|
30
|
+
end
|
31
|
+
save
|
32
|
+
self.lifetime_pledges
|
33
|
+
end
|
34
|
+
end
|
35
|
+
end
|
@@ -22,7 +22,11 @@ module Valuation
|
|
22
22
|
# Return the value
|
23
23
|
#
|
24
24
|
def calculate_lifetime_value
|
25
|
-
self.lifetime_value = Item.
|
25
|
+
self.lifetime_value = Item.
|
26
|
+
joins('LEFT JOIN donations ON donations.id = items.product_id').
|
27
|
+
where('(donations.pledge = ? OR items.product_type != ?)', false, 'Donation').
|
28
|
+
where(:order_id => self.lifetime_orders).sum(Item.total_price_sql_sum).to_i
|
29
|
+
self.lifetime_value = self.lifetime_value + soft_credits.sum('amount').to_i * 100
|
26
30
|
self.save(:validate => false)
|
27
31
|
self.lifetime_value
|
28
32
|
end
|
@@ -0,0 +1,109 @@
|
|
1
|
+
class ValuationQuery
|
2
|
+
attr_accessor :people, :organization, :starts_at, :ends_at, :stats
|
3
|
+
|
4
|
+
def self.run_for(options={})
|
5
|
+
valuation = ValuationQuery.new
|
6
|
+
|
7
|
+
valuation.people = Array.wrap(options[:people])
|
8
|
+
valuation.organization = options[:organization]
|
9
|
+
valuation.starts_at = options[:starts_at]
|
10
|
+
valuation.ends_at = options[:ends_at]
|
11
|
+
|
12
|
+
#
|
13
|
+
# The plan: select org averages, then select all individual counts and averages
|
14
|
+
#
|
15
|
+
|
16
|
+
#
|
17
|
+
# TODO: This should be run in a nightly job and saved to the org row in the db
|
18
|
+
# Also note that this only excludes people.first because we can't run a NOT IN ()
|
19
|
+
#
|
20
|
+
org_average_sql = "select avg(ticket_sum) as tickets_avg , " +
|
21
|
+
"avg(donation_sum) as donations_avg , " +
|
22
|
+
"avg(pass_sum) as passes_avg , " +
|
23
|
+
"avg(membership_sum) as memberships_avg " +
|
24
|
+
"from ( " +
|
25
|
+
"(SELECT " +
|
26
|
+
"SUM(case when items.product_type='Ticket' then items.price else null end) AS ticket_sum, " +
|
27
|
+
"SUM(case when items.product_type='Donation' then items.price else null end) AS donation_sum, " +
|
28
|
+
"SUM(case when items.product_type='Pass' then items.price else null end) AS pass_sum, " +
|
29
|
+
"SUM(case when items.product_type='Membership' then items.price else null end) AS membership_sum, " +
|
30
|
+
"orders.person_id " +
|
31
|
+
"FROM `items` " +
|
32
|
+
"INNER JOIN orders on orders.id=items.order_id " +
|
33
|
+
"WHERE `orders`.`person_id` != #{valuation.people.first.id} " +
|
34
|
+
"AND `orders`.`organization_id` = #{valuation.organization.id} " +
|
35
|
+
"AND items.state NOT IN ('refunded', 'refund', 'exchanged', 'returned') "
|
36
|
+
|
37
|
+
if valuation.starts_at.present?
|
38
|
+
org_average_sql += "AND `orders`.`revenue_applies_at` >= '#{valuation.starts_at.to_formatted_s(:db)}' "
|
39
|
+
end
|
40
|
+
|
41
|
+
if valuation.ends_at.present?
|
42
|
+
org_average_sql += "AND `orders`.`revenue_applies_at` <= '#{valuation.ends_at.to_formatted_s(:db)}' "
|
43
|
+
end
|
44
|
+
org_average_sql += "GROUP BY person_id) "
|
45
|
+
org_average_sql += "something) "
|
46
|
+
org_average_result = ActiveRecord::Base.connection.select_all(org_average_sql)
|
47
|
+
|
48
|
+
#
|
49
|
+
# Sum and count
|
50
|
+
#
|
51
|
+
sum_and_count_sql = "select " +
|
52
|
+
"count(case when i.product_type='Ticket' then 1 else null end) as tickets_count, " +
|
53
|
+
"sum(case when i.product_type='Ticket' then i.price else null end) as tickets_total, " +
|
54
|
+
"count(case when i.product_type='Donation' then i.price else null end) as donations_count, " +
|
55
|
+
"sum(case when ((i.product_type='Donation') && (i.deleted_at IS NULL)) then i.price else null end) as donations_total, " +
|
56
|
+
"count(case when i.product_type='Pass' then i.price else null end) as passes_count, " +
|
57
|
+
"sum(case when i.product_type='Pass' then i.price else null end) as passes_total, " +
|
58
|
+
"count(case when i.product_type='Membership' then i.price else null end) as memberships_count, " +
|
59
|
+
"sum(case when i.product_type='Membership' then i.price else null end) as memberships_total " +
|
60
|
+
"from items i " +
|
61
|
+
"inner join orders o on i.order_id=o.id " +
|
62
|
+
"where o.person_id in (#{valuation.people.collect(&:id).join(",")}) " +
|
63
|
+
"AND i.state NOT IN ('refunded', 'refund', 'exchanged', 'returned') "
|
64
|
+
if valuation.starts_at.present?
|
65
|
+
sum_and_count_sql += "AND `o`.`revenue_applies_at` >= '#{valuation.starts_at.to_formatted_s(:db)}' "
|
66
|
+
end
|
67
|
+
|
68
|
+
if valuation.ends_at.present?
|
69
|
+
sum_and_count_sql +="AND `o`.`revenue_applies_at` <= '#{valuation.ends_at.to_formatted_s(:db)}' "
|
70
|
+
end
|
71
|
+
sum_and_count_result = ActiveRecord::Base.connection.select_all(sum_and_count_sql)
|
72
|
+
|
73
|
+
#
|
74
|
+
# Pack up valuation
|
75
|
+
#
|
76
|
+
valuation.stats = {}
|
77
|
+
|
78
|
+
[:tickets, :donations].each do |product, proc|
|
79
|
+
stats_hash = {}
|
80
|
+
stats_hash[:pretty_name] = product.to_s.humanize
|
81
|
+
stats_hash[:org_average_total] = org_average_result.first["#{product}_avg"] || 0
|
82
|
+
stats_hash[:individual_total] = sum_and_count_result.first["#{product}_total"] || 0
|
83
|
+
stats_hash[:individual_count] = sum_and_count_result.first["#{product}_count"] || 0
|
84
|
+
valuation.stats[product] = stats_hash
|
85
|
+
end
|
86
|
+
|
87
|
+
{:passes => :passes,:memberships => :membership}.each do |product, kit|
|
88
|
+
if valuation.organization.has_kit? kit
|
89
|
+
stats_hash = {}
|
90
|
+
stats_hash[:pretty_name] = product.to_s.humanize
|
91
|
+
stats_hash[:org_average_total] = org_average_result.first["#{product}_avg"] || 0
|
92
|
+
stats_hash[:individual_total] = sum_and_count_result.first["#{product}_total"] || 0
|
93
|
+
stats_hash[:individual_count] = sum_and_count_result.first["#{product}_count"] || 0
|
94
|
+
valuation.stats[product] = stats_hash
|
95
|
+
end
|
96
|
+
end
|
97
|
+
|
98
|
+
valuation.stats[:total] = {
|
99
|
+
:individual_total => valuation.stats.map {|k,v| valuation.stats[k][:individual_total] || 0 }.sum,
|
100
|
+
:org_average_total => valuation.stats.map {|k,v| valuation.stats[k][:org_average_total] || 0 }.sum,
|
101
|
+
:org_people_count => valuation.organization.people.count
|
102
|
+
}
|
103
|
+
|
104
|
+
valuation.stats[:starts_at] = valuation.starts_at
|
105
|
+
valuation.stats[:stops_at] = valuation.ends_at
|
106
|
+
|
107
|
+
valuation
|
108
|
+
end
|
109
|
+
end
|
data/app/models/venue.rb
CHANGED
@@ -13,6 +13,14 @@ class Venue < ActiveRecord::Base
|
|
13
13
|
after_save :run_geocode, :if => :address1_changed?
|
14
14
|
after_save :refresh_show_stats, :if => :time_zone_changed?
|
15
15
|
|
16
|
+
def name_and_address_as_string
|
17
|
+
string = ''
|
18
|
+
string = self.name
|
19
|
+
string += " -- " if (self.name? && self.address_as_string.present?)
|
20
|
+
string += address_as_string
|
21
|
+
string
|
22
|
+
end
|
23
|
+
|
16
24
|
def address_as_string
|
17
25
|
street_as_string + " " + city_state_zip_as_string
|
18
26
|
end
|
@@ -2,7 +2,7 @@
|
|
2
2
|
%td.starred.starable{"data-person-id" => @person.id, "data-type" => 'action', "data-action-id" => action.id, :class => (action.starred? ? "active" : "not-active") }
|
3
3
|
✭
|
4
4
|
%td
|
5
|
-
= action.
|
5
|
+
= action.occurred_at_local_to_organization.strftime("%D") unless action.occurred_at.nil?
|
6
6
|
%td.icon
|
7
7
|
= link_to action.action_type, '#', :class => "btn action-icon #{action.action_type.downcase}-icon", :onclick => "return false;"
|
8
8
|
|
@@ -7,7 +7,7 @@
|
|
7
7
|
= action_type_button(action, 'say', 'Said', "Record a communication #{target} initiated.")
|
8
8
|
= action_type_button(action, 'go', 'Went', "Record when #{target} attended an event.")
|
9
9
|
= action_type_button(action, 'do', 'Helped', "Record when #{target} volunteered")
|
10
|
-
= link_to 'Gave', new_contribution_path("contribution[person_id]" => target.id), :class => "btn edit-order-link weak"
|
10
|
+
= link_to 'Gave', new_contribution_path("contribution[person_id]" => target.id), :class => "btn edit-order-link weak"
|
11
11
|
-else
|
12
12
|
= action_type_button(action, 'hear', 'Heard', "Record a communication you sent to this group")
|
13
13
|
= action_type_button(action, 'say', 'Said', "Record a communication this group initiated")
|
@@ -23,11 +23,11 @@
|
|
23
23
|
.dollar-inputs.input-prepend{:style => (action.new_record? ? 'display:none;' : '')}
|
24
24
|
%span.add-on $
|
25
25
|
= form.text_field :dollar_amount, :placeholder => 'donation value', :class => 'input-small'
|
26
|
-
|
27
26
|
- details_text_area_options = {:size => "125x5", :class => 'input-xxlarge', :placeholder => "Select an action type above..."}
|
28
27
|
- details_text_area_options = details_text_area_options.merge(:disabled => 'disabled') if action.details.blank?
|
29
28
|
= form.text_area :details, details_text_area_options
|
30
29
|
- unless action.new_record?
|
30
|
+
%p= "Creator: #{action.creator || 'System'}"
|
31
31
|
= link_to "delete", "#delete-confirm-action-#{action.id}", :class => "delete-confirm-link delete-with-trash", "data-toggle" => "modal"
|
32
32
|
- if action.new_record?
|
33
33
|
= form.submit "Save", :class => "btn btn-primary artfully-tooltip new-action-save", :rel => "tooltip", :data => {"original-title" => "Pick an action type before saving.", :trigger => "hover", :placement => "left"}
|