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/door_list.rb
CHANGED
@@ -17,16 +17,51 @@ class DoorList
|
|
17
17
|
private
|
18
18
|
|
19
19
|
class Item
|
20
|
-
attr_accessor :ticket, :buyer, :special_instructions, :notes, :payment_method, :order_id
|
20
|
+
attr_accessor :ticket, :buyer, :special_instructions, :notes, :payment_method, :order_id, :addresses, :phones
|
21
21
|
|
22
22
|
comma do
|
23
|
+
order_id "Order Number"
|
24
|
+
buyer("Email") { |buyer| buyer.email }
|
25
|
+
buyer("Salutation") { |buyer| buyer.salutation }
|
23
26
|
buyer("First Name") { |buyer| buyer.first_name }
|
27
|
+
buyer("Middle Name") { |buyer| buyer.middle_name }
|
24
28
|
buyer("Last Name") { |buyer| buyer.last_name }
|
25
|
-
buyer("
|
29
|
+
buyer("Suffix") { |buyer| buyer.suffix }
|
30
|
+
buyer("Title") { |buyer| buyer.title }
|
31
|
+
buyer("Type") { |buyer| buyer.type }
|
32
|
+
buyer("Sub Type") { |buyer| buyer.subtype }
|
33
|
+
buyer("Company Name") { |buyer| buyer.company_name }
|
34
|
+
|
35
|
+
('A'..'C').each_with_index do |letter, i|
|
36
|
+
addresses("Address#{letter} Type") { |addresses| addresses[i] && addresses[i].kind }
|
37
|
+
addresses("Address#{letter} Address 1") { |addresses| addresses[i] && addresses[i].address1 }
|
38
|
+
addresses("Address#{letter} Address 2") { |addresses| addresses[i] && addresses[i].address2 }
|
39
|
+
addresses("Address#{letter} City") { |addresses| addresses[i] && addresses[i].city }
|
40
|
+
addresses("Address#{letter} State") { |addresses| addresses[i] && addresses[i].state }
|
41
|
+
addresses("Address#{letter} Zip") { |addresses| addresses[i] && addresses[i].zip }
|
42
|
+
addresses("Address#{letter} Country") { |addresses| addresses[i] && addresses[i].country }
|
43
|
+
end
|
44
|
+
|
45
|
+
(1..3).each do |i|
|
46
|
+
phones("Phone#{i} type") { |phones| phones[i-1] && phones[i-1].kind }
|
47
|
+
phones("Phone#{i} number") { |phones| phones[i-1] && phones[i-1].number }
|
48
|
+
end
|
49
|
+
|
50
|
+
buyer("Website") { |buyer| buyer.website }
|
51
|
+
buyer("Twitter Handle") { |buyer| buyer.twitter_handle }
|
52
|
+
buyer("Facebook URL") { |buyer| buyer.facebook_url }
|
53
|
+
buyer("LinkedIn URL") { |buyer| buyer.linked_in_url }
|
54
|
+
buyer("Tags") { |buyer| buyer.tags.join("|") }
|
55
|
+
buyer("Do Not Email") { |buyer| buyer.do_not_email }
|
56
|
+
buyer("Do Not Call") { |buyer| buyer.do_not_call }
|
57
|
+
buyer("Birth Month") { |buyer| buyer.birth_month }
|
58
|
+
buyer("Birth Day") { |buyer| buyer.birth_day }
|
59
|
+
buyer("Birth Year") { |buyer| buyer.birth_year }
|
26
60
|
ticket("Ticket Type") { |ticket| ticket.ticket_type.name }
|
27
61
|
ticket("Price") { |ticket| DoorList.number_as_cents ticket.sold_price }
|
28
62
|
ticket("Special Instructions") { |ticket| ticket.special_instructions }
|
29
63
|
ticket("Notes") { |ticket| ticket.notes }
|
64
|
+
ticket("Went") { |ticket| ticket.validated }
|
30
65
|
end
|
31
66
|
|
32
67
|
def initialize(ticket, buyer)
|
@@ -38,6 +73,8 @@ class DoorList
|
|
38
73
|
self.notes = ticket.notes
|
39
74
|
self.payment_method = sold_item.try(:order).try(:payment_method)
|
40
75
|
self.order_id = sold_item.try(:order).try(:id)
|
76
|
+
self.addresses = buyer.addresses
|
77
|
+
self.phones = buyer.phones
|
41
78
|
end
|
42
79
|
|
43
80
|
def <=>(obj)
|
data/app/models/event.rb
CHANGED
@@ -4,14 +4,14 @@ class Event < ActiveRecord::Base
|
|
4
4
|
include Ext::Uuid
|
5
5
|
include Ticket::Reporting
|
6
6
|
include EventPresenter
|
7
|
+
include OhNoes::Destroy
|
7
8
|
require 'email_validator'
|
8
9
|
|
9
10
|
CATEGORIES = ["Dance", "Film & Electronic Media", "Literary Arts", "Music", "Theater", "Visual Arts", "Other"]
|
10
11
|
|
11
12
|
attr_accessible :name, :producer, :description, :contact_email, :contact_phone, :image, :venue_attributes,
|
12
13
|
:show_special_instructions, :special_instructions_caption, :public, :primary_category,
|
13
|
-
:secondary_categories, :primary_category_other, :secondary_category_other, :members_only,
|
14
|
-
:subtitle
|
14
|
+
:secondary_categories, :primary_category_other, :secondary_category_other, :members_only, :subtitle
|
15
15
|
|
16
16
|
store :cached_stats, :accessors => [ :on_sale, :off_sale, :sold, :sales_total ]
|
17
17
|
|
@@ -53,8 +53,10 @@ class Event < ActiveRecord::Base
|
|
53
53
|
serialize :secondary_categories, Array
|
54
54
|
|
55
55
|
default_scope where(:deleted_at => nil).order("events.created_at DESC")
|
56
|
+
scope :storefront, where(:deleted_at => nil).where(:public => true)
|
56
57
|
scope :published, includes(:shows).where(:shows => { :state => "published" })
|
57
58
|
scope :public, where(:public => true)
|
59
|
+
scope :not_deleted, where('deleted_at IS NULL')
|
58
60
|
|
59
61
|
delegate :time_zone, :to => :venue
|
60
62
|
|
@@ -97,23 +99,27 @@ class Event < ActiveRecord::Base
|
|
97
99
|
def artfully_ticketed
|
98
100
|
true
|
99
101
|
end
|
100
|
-
|
101
|
-
alias :destroy! :destroy
|
102
|
-
def destroy
|
103
|
-
update_attribute(:deleted_at, Time.now)
|
104
|
-
end
|
105
|
-
|
102
|
+
|
106
103
|
def single_show?
|
107
104
|
shows.length == 1
|
108
105
|
end
|
109
106
|
|
110
107
|
#
|
111
|
-
# The list of events
|
108
|
+
# The list of events to be displayed on their event index
|
112
109
|
#
|
113
110
|
def self.for_event_storefront(organization, member = nil)
|
114
|
-
|
115
|
-
|
116
|
-
|
111
|
+
event_ids = organization.shows
|
112
|
+
.published
|
113
|
+
.joins(:event)
|
114
|
+
.where('datetime > ?', DateTime.now)
|
115
|
+
.merge(Event.storefront)
|
116
|
+
.reorder('datetime asc')
|
117
|
+
.pluck(:event_id)
|
118
|
+
.uniq
|
119
|
+
events = []
|
120
|
+
event_ids.each {|id| events << Event.includes(:venue).find(id)}
|
121
|
+
events.reject!{|e| e.members_only} if member.nil?
|
122
|
+
events
|
117
123
|
end
|
118
124
|
|
119
125
|
#
|
@@ -163,10 +169,16 @@ class Event < ActiveRecord::Base
|
|
163
169
|
#
|
164
170
|
# You'll almost always want upcoming_public_shows instead
|
165
171
|
#
|
166
|
-
def upcoming_shows(limit = 5)
|
172
|
+
def upcoming_shows(limit = 5, reload = false)
|
167
173
|
shows_rel = upcoming_shows_rel
|
168
174
|
shows_rel = upcoming_shows_rel.limit(limit) unless limit == :all
|
169
|
-
|
175
|
+
|
176
|
+
if reload
|
177
|
+
@upcoming = shows_rel.all
|
178
|
+
else
|
179
|
+
@upcoming ||= shows_rel.all
|
180
|
+
end
|
181
|
+
|
170
182
|
@upcoming
|
171
183
|
end
|
172
184
|
|
@@ -180,8 +192,12 @@ class Event < ActiveRecord::Base
|
|
180
192
|
upcoming_public_shows.empty? ? nil : upcoming_public_shows.first
|
181
193
|
end
|
182
194
|
|
195
|
+
def next_show_include_unpublished
|
196
|
+
upcoming_shows.empty? ? nil : upcoming_shows.first
|
197
|
+
end
|
198
|
+
|
183
199
|
def upcoming_public_shows
|
184
|
-
upcoming_shows(:all).select(&:published?)
|
200
|
+
upcoming_shows(:all, true).select(&:published?)
|
185
201
|
end
|
186
202
|
|
187
203
|
def next_show
|
data/app/models/ext.rb
CHANGED
@@ -38,10 +38,10 @@ module Ext
|
|
38
38
|
module S3Link
|
39
39
|
def download_link_for(field)
|
40
40
|
s3 = AWS::S3.new(
|
41
|
-
:access_key_id =>
|
42
|
-
:secret_access_key =>
|
41
|
+
:access_key_id => Rails.configuration.s3.access_key_id,
|
42
|
+
:secret_access_key => Rails.configuration.s3.secret_access_key
|
43
43
|
)
|
44
|
-
bucket = s3.buckets[
|
44
|
+
bucket = s3.buckets[Rails.configuration.s3.bucket]
|
45
45
|
object = bucket.objects[self.send(field).path]
|
46
46
|
url = object.url_for(:read, :expires => 10*60)
|
47
47
|
url.to_s
|
@@ -8,17 +8,57 @@ module Ext
|
|
8
8
|
base.class_eval do
|
9
9
|
handle_asynchronously :solr_index
|
10
10
|
handle_asynchronously :solr_index!
|
11
|
-
after_commit {
|
11
|
+
after_commit :commit_to_index, :unless => lambda { @skip_commit == true }
|
12
12
|
end
|
13
13
|
end
|
14
14
|
|
15
15
|
module ClassMethods
|
16
16
|
def search_index(query, organization)
|
17
|
+
query_stripped_of_punctuation = query.gsub(/[^a-zA-Z0-9\@\.]/i, "")
|
18
|
+
query_stripped_of_non_letters_and_numbers = query.gsub(/[^a-zA-Z0-9]/, "")
|
19
|
+
|
20
|
+
if query_stripped_of_punctuation.length > 0 &&
|
21
|
+
query_stripped_of_punctuation.length == query_stripped_of_non_letters_and_numbers.length
|
22
|
+
|
23
|
+
query = query_stripped_of_non_letters_and_numbers
|
24
|
+
end
|
25
|
+
|
17
26
|
self.search do
|
18
27
|
fulltext query
|
19
28
|
with(:organization_id).equal_to(organization.id)
|
20
29
|
end.results
|
21
30
|
end
|
31
|
+
|
32
|
+
def commit_to_index
|
33
|
+
RedisManager.burst_job("sunspot:commit", 5) do
|
34
|
+
Sunspot.delay(:run_at => 5.seconds.from_now).commit
|
35
|
+
end
|
36
|
+
end
|
37
|
+
|
38
|
+
#
|
39
|
+
# Reindex a bunch of IndexedThings.
|
40
|
+
#
|
41
|
+
# Useful for when you've done some action that modifies a bunch of IndexedThings
|
42
|
+
# but didn't go through the IndexedThing to do it.
|
43
|
+
#
|
44
|
+
# This will kick off a DJ to index each thing. Calling this method synchronously
|
45
|
+
# is discouraged as it has to load all the things.
|
46
|
+
#
|
47
|
+
# If you do all this method asynchronously, **PLEASE NOTE** that if ids.length > 15000,
|
48
|
+
# you'll probably overrun the TEXT field of DelayedJob and cause the job to error on load
|
49
|
+
#
|
50
|
+
# Sunspot offers a Sunspot.index [thing1, thing2] method. We aren't using that
|
51
|
+
# because a large number of things (> 60) can overrun the TEXT column of delayed_jobs
|
52
|
+
# So, this method will slot in 1 Delayed::Job for each thing in ids.
|
53
|
+
#
|
54
|
+
def index_these(ids)
|
55
|
+
self.where(:id => ids).find_in_batches do |things|
|
56
|
+
things.each do |thing|
|
57
|
+
thing.solr_index
|
58
|
+
end
|
59
|
+
end
|
60
|
+
Sunspot.delay.commit
|
61
|
+
end
|
22
62
|
end
|
23
63
|
end
|
24
64
|
end
|
@@ -34,6 +34,8 @@ module Ext
|
|
34
34
|
.includes(:sections => :ticket_types)
|
35
35
|
.where('shows.id = ?', self.id)
|
36
36
|
.where("ticket_types.#{channel} = ?", true)
|
37
|
+
.where("ticket_types.deleted_at is null")
|
38
|
+
.order("ticket_types.price desc")
|
37
39
|
|
38
40
|
chart.first
|
39
41
|
end
|
@@ -58,6 +60,10 @@ module Ext
|
|
58
60
|
false
|
59
61
|
end
|
60
62
|
|
63
|
+
def administrator_limited?
|
64
|
+
false
|
65
|
+
end
|
66
|
+
|
61
67
|
def fsp
|
62
68
|
nil
|
63
69
|
end
|
data/app/models/household.rb
CHANGED
@@ -8,7 +8,7 @@ class Household < ActiveRecord::Base
|
|
8
8
|
|
9
9
|
accepts_nested_attributes_for :address, :allow_destroy => false
|
10
10
|
|
11
|
-
validates :name, :uniqueness =>
|
11
|
+
validates :name, :presence => true, :uniqueness => { :scope => :organization_id }
|
12
12
|
|
13
13
|
def lifetime_value
|
14
14
|
individuals.sum(:lifetime_value)
|
data/app/models/import.rb
CHANGED
@@ -10,6 +10,11 @@ class Import < ActiveRecord::Base
|
|
10
10
|
has_many :actions, :dependent => :destroy
|
11
11
|
has_many :events, :dependent => :destroy
|
12
12
|
has_many :orders, :dependent => :destroy
|
13
|
+
has_many :campaigns, :dependent => :destroy
|
14
|
+
has_many :appeals, :dependent => :destroy
|
15
|
+
has_many :members, :dependent => :destroy
|
16
|
+
has_many :memberships, :dependent => :destroy
|
17
|
+
has_many :membership_types, :dependent => :destroy
|
13
18
|
|
14
19
|
serialize :import_headers
|
15
20
|
|
@@ -30,6 +35,8 @@ class Import < ActiveRecord::Base
|
|
30
35
|
PeopleImport.new
|
31
36
|
when "donations"
|
32
37
|
DonationsImport.new
|
38
|
+
when "memberships"
|
39
|
+
MembershipsImport.new
|
33
40
|
else
|
34
41
|
nil
|
35
42
|
end
|
@@ -58,6 +65,8 @@ class Import < ActiveRecord::Base
|
|
58
65
|
self.people.destroy_all
|
59
66
|
self.import_errors.delete_all
|
60
67
|
|
68
|
+
before_import
|
69
|
+
|
61
70
|
rows.each_with_index do |row, index|
|
62
71
|
begin
|
63
72
|
Rails.logger.info("----- Import #{id} Processing row #{index} ------")
|
@@ -69,7 +78,11 @@ class Import < ActiveRecord::Base
|
|
69
78
|
end
|
70
79
|
self.imported!
|
71
80
|
end
|
72
|
-
|
81
|
+
|
82
|
+
def before_import
|
83
|
+
|
84
|
+
end
|
85
|
+
|
73
86
|
#
|
74
87
|
# This composes errors thrown *during* the import. For validation errors, see invalidate!
|
75
88
|
#
|
@@ -80,7 +93,7 @@ class Import < ActiveRecord::Base
|
|
80
93
|
failed!
|
81
94
|
rollback
|
82
95
|
end
|
83
|
-
|
96
|
+
|
84
97
|
#Subclasses must implement process and rollback
|
85
98
|
def process(parsed_row)
|
86
99
|
end
|
@@ -95,8 +108,8 @@ class Import < ActiveRecord::Base
|
|
95
108
|
def parsed_rows
|
96
109
|
return @parsed_rows if @parsed_rows
|
97
110
|
@parsed_rows = []
|
98
|
-
|
99
|
-
rows.
|
111
|
+
|
112
|
+
rows.each_with_index do |row, index|
|
100
113
|
@parsed_rows << ParsedRow.parse(headers, row)
|
101
114
|
end
|
102
115
|
@parsed_rows
|
@@ -117,13 +130,15 @@ class Import < ActiveRecord::Base
|
|
117
130
|
#TODO: Validate headers right here
|
118
131
|
self.save!
|
119
132
|
else
|
120
|
-
self.import_rows.create!(:content => row.to_a)
|
121
133
|
parsed_row = ParsedRow.parse(self.import_headers, row.to_a)
|
122
|
-
|
123
134
|
unless row_valid?(parsed_row)
|
124
|
-
self.invalidate!
|
135
|
+
self.invalidate!
|
125
136
|
return
|
126
137
|
end
|
138
|
+
|
139
|
+
import_row = index_parsed_row(parsed_row)
|
140
|
+
import_row.content = row.to_a
|
141
|
+
import_row.save!
|
127
142
|
end
|
128
143
|
end
|
129
144
|
|
@@ -142,6 +157,10 @@ class Import < ActiveRecord::Base
|
|
142
157
|
self.invalidate!
|
143
158
|
end
|
144
159
|
|
160
|
+
def index_parsed_row(parsed_row)
|
161
|
+
self.import_rows.build
|
162
|
+
end
|
163
|
+
|
145
164
|
def hash_address(parsed_row)
|
146
165
|
parsed_row.address_attributes
|
147
166
|
end
|
@@ -156,9 +175,21 @@ class Import < ActiveRecord::Base
|
|
156
175
|
person.type = "Individual"
|
157
176
|
end
|
158
177
|
|
159
|
-
person.build_address(hash_address(parsed_row))
|
160
178
|
person.tag_list = parsed_row.tags_list.join(", ")
|
161
179
|
|
180
|
+
|
181
|
+
('A'..'C').each do |n|
|
182
|
+
address = Address.new(address1: parsed_row.send("address#{n}_address1"),
|
183
|
+
address2: parsed_row.send("address#{n}_address2"),
|
184
|
+
city: parsed_row.send("address#{n}_city"),
|
185
|
+
state: parsed_row.send("address#{n}_state"),
|
186
|
+
zip: parsed_row.send("address#{n}_zip"),
|
187
|
+
country: parsed_row.send("address#{n}_country"),
|
188
|
+
kind: parsed_row.send("address#{n}_type"),
|
189
|
+
is_primary: (n == 'A'))
|
190
|
+
person.addresses << address unless address.blank?
|
191
|
+
end
|
192
|
+
|
162
193
|
1.upto(3) do |n|
|
163
194
|
kind = parsed_row.send("phone#{n}_type")
|
164
195
|
number = parsed_row.send("phone#{n}_number")
|
@@ -2,22 +2,46 @@ class DonationsImport < Import
|
|
2
2
|
include Imports::Rollback
|
3
3
|
include Imports::Validations
|
4
4
|
include ArtfullyOseHelper
|
5
|
-
|
5
|
+
|
6
|
+
|
6
7
|
def kind
|
7
8
|
"donations"
|
8
9
|
end
|
9
10
|
|
10
11
|
def process(parsed_row)
|
11
12
|
row_valid?(parsed_row)
|
12
|
-
person
|
13
|
-
|
13
|
+
person = create_person(parsed_row)
|
14
|
+
create_contribution(parsed_row, person)
|
14
15
|
end
|
15
16
|
|
16
17
|
def rollback
|
17
18
|
rollback_orders
|
18
19
|
rollback_people
|
20
|
+
rollback_campaigns
|
21
|
+
rollback_appeals
|
19
22
|
end
|
20
|
-
|
23
|
+
|
24
|
+
def before_import
|
25
|
+
# Delayed::Worker.logger.add(Logger::INFO, "--------------- before campaigns_data ---------")
|
26
|
+
@campaigns_hash = {} #{campaign_name => {start_date => xxx_date, end_date => xxx_date, goal => xxx_amount, id=xxx}}
|
27
|
+
parsed_rows.each do |parsed_row, index|
|
28
|
+
unless parsed_row.campaign.blank?
|
29
|
+
campaign = parsed_row.campaign
|
30
|
+
occurred_at = parsed_row.donation_date.blank? ? time_zone_parser.now : time_zone_parser.parse(parsed_row.donation_date)
|
31
|
+
amount = parsed_row.amount
|
32
|
+
|
33
|
+
if @campaigns_hash.has_key?(campaign)
|
34
|
+
@campaigns_hash[campaign][:start_date] = [occurred_at, @campaigns_hash[campaign][:start_date]].min
|
35
|
+
@campaigns_hash[campaign][:end_date] = [occurred_at, @campaigns_hash[campaign][:end_date]].max
|
36
|
+
@campaigns_hash[campaign][:goal] = @campaigns_hash[campaign][:goal] + amount
|
37
|
+
else
|
38
|
+
@campaigns_hash[campaign] = {:start_date => occurred_at, :end_date => occurred_at, :goal => amount}
|
39
|
+
end
|
40
|
+
end
|
41
|
+
end
|
42
|
+
|
43
|
+
end
|
44
|
+
|
21
45
|
def validate_amounts(parsed_row)
|
22
46
|
if !parsed_row.unparsed_nongift_amount.blank? && parsed_row.nongift_amount > parsed_row.amount
|
23
47
|
raise Import::RowError, "Non-deductible amount (#{parsed_row.unparsed_nongift_amount}) cannot be more than the total doantion amount (#{parsed_row.unparsed_amount})': #{parsed_row.row}"
|
@@ -39,6 +63,7 @@ class DonationsImport < Import
|
|
39
63
|
raise Import::RowError, "Please include a first name, last name, email, or company name in this row: #{parsed_row.row}" unless attach_person(parsed_row).naming_details_available?
|
40
64
|
raise Import::RowError, "Please include a payment method in this row: #{parsed_row.row}" if parsed_row.payment_method.blank?
|
41
65
|
raise Import::RowError, "Donation type must be 'Monetary' or 'In-Kind': #{parsed_row.row}" unless GiveAction.subtypes.include? (parsed_row.donation_type)
|
66
|
+
raise Import::RowError, "No Date included in this row: #{parsed_row.row}" unless parsed_row.donation_date
|
42
67
|
valid_date? parsed_row.donation_date
|
43
68
|
|
44
69
|
[:unparsed_amount, :unparsed_nongift_amount, :unparsed_deductible_amount].each do |amt|
|
@@ -48,37 +73,103 @@ class DonationsImport < Import
|
|
48
73
|
validate_amounts(parsed_row)
|
49
74
|
true
|
50
75
|
end
|
51
|
-
|
76
|
+
|
77
|
+
def create_campaign(parsed_row, params)
|
78
|
+
campaign_name = parsed_row.campaign
|
79
|
+
if campaign_name.present?
|
80
|
+
camp = self.organization.campaigns.where(:name => campaign_name).first_or_create do |campaign|
|
81
|
+
campaign.import = self
|
82
|
+
campaign.starts_at = @campaigns_hash[campaign_name] && @campaigns_hash[campaign_name][:start_date] ?
|
83
|
+
@campaigns_hash[campaign_name][:start_date] : time_zone_parser.now
|
84
|
+
campaign.ends_at = @campaigns_hash[campaign_name] && @campaigns_hash[campaign_name][:end_date] ?
|
85
|
+
@campaigns_hash[campaign_name][:end_date] : time_zone_parser.now
|
86
|
+
campaign.ends_at = nil if campaign.ends_at.to_s == campaign.starts_at.to_s
|
87
|
+
campaign.goal = @campaigns_hash[campaign_name] && @campaigns_hash[campaign_name][:goal] ?
|
88
|
+
@campaigns_hash[campaign_name][:goal] / 100 : 1000
|
89
|
+
campaign.status = 'active'
|
90
|
+
end
|
91
|
+
params[:campaign_id] = camp.id
|
92
|
+
camp
|
93
|
+
end
|
94
|
+
end
|
95
|
+
|
96
|
+
def create_appeal(parsed_row, campaign, params)
|
97
|
+
if parsed_row.appeal.present? && !campaign.nil?
|
98
|
+
a = campaign.appeals.where({:name => parsed_row.appeal, :organization_id => self.organization.id}).first_or_create do |appeal|
|
99
|
+
appeal.import = self
|
100
|
+
appeal.starts_at = campaign.starts_at
|
101
|
+
appeal.channel = 'email'
|
102
|
+
appeal.status = 'active'
|
103
|
+
end
|
104
|
+
params[:appeal_id] = a.id
|
105
|
+
end
|
106
|
+
end
|
107
|
+
|
108
|
+
def create_match_eligible(parsed_row, params)
|
109
|
+
matcher = parsed_row.match_eligible_matcher
|
110
|
+
eligible_amount = parsed_row.match_eligible_amount
|
111
|
+
if matcher.present? && matcher.include?("@") && eligible_amount > 0 # todo validate email
|
112
|
+
matcher_person = Person.first_or_create({:email => matcher, :organization => self.organization}) do |p|
|
113
|
+
p.import = self
|
114
|
+
end
|
115
|
+
|
116
|
+
params[:match_eligible] = 'true'
|
117
|
+
params[:matcher] = matcher_person.id
|
118
|
+
params[:eligible_amount] = eligible_amount
|
119
|
+
params[:ratio] = parsed_row.match_eligible_ratio.to_f if parsed_row.match_eligible_ratio.to_f > 0
|
120
|
+
params[:commitment_date] = time_zone_parser.now.to_s
|
121
|
+
end
|
122
|
+
end
|
123
|
+
|
124
|
+
def create_soft_credit(parsed_row, params)
|
125
|
+
soft_credit_email = parsed_row.soft_credit_email
|
126
|
+
soft_credit_first_name = parsed_row.soft_credit_first_name
|
127
|
+
soft_credit_last_name = parsed_row.soft_credit_last_name
|
128
|
+
soft_credit_amount = parsed_row.soft_credit_amount
|
129
|
+
|
130
|
+
if soft_credit_email.present? && soft_credit_email.include?("@") && soft_credit_amount > 0
|
131
|
+
sc_person = Person.first_or_create({:email => soft_credit_email, :organization => self.organization}) do |p|
|
132
|
+
p.import = self
|
133
|
+
p.first_name = soft_credit_first_name
|
134
|
+
p.last_name = soft_credit_last_name
|
135
|
+
end
|
136
|
+
params[:soft_credit] = {-Time.now.to_i => {:person_id => sc_person.id, :amount => soft_credit_amount}}
|
137
|
+
end
|
138
|
+
end
|
139
|
+
|
52
140
|
def create_contribution(parsed_row, person)
|
53
141
|
Rails.logger.info("Processing Import [#{id}] DONATION_IMPORT: Creating contribution")
|
54
|
-
|
142
|
+
params = {}
|
143
|
+
params[:creator_id] = self.user.id
|
144
|
+
params[:person_id] = person.id
|
145
|
+
|
55
146
|
amount = parsed_row.amount
|
56
147
|
deductible_amount = parsed_row.unparsed_deductible_amount.blank? ? amount - parsed_row.nongift_amount : parsed_row.deductible_amount
|
57
148
|
nongift_amount = parsed_row.unparsed_nongift_amount.blank? ? amount - deductible_amount : parsed_row.nongift_amount
|
58
149
|
|
59
150
|
occurred_at = parsed_row.donation_date.blank? ? time_zone_parser.now : time_zone_parser.parse(parsed_row.donation_date)
|
60
|
-
|
151
|
+
|
61
152
|
params[:subtype] = parsed_row.donation_type
|
62
|
-
params[:amount] = deductible_amount
|
153
|
+
params[:amount] = deductible_amount + nongift_amount
|
63
154
|
params[:nongift_amount] = nongift_amount
|
64
155
|
params[:payment_method] = parsed_row.payment_method
|
65
156
|
|
66
157
|
params[:organization_id] = self.organization.id
|
67
158
|
params[:occurred_at] = occurred_at.to_s
|
68
159
|
params[:details] = "Imported by #{user.email} on #{I18n.l self.created_at_local_to_organization, :format => :date}"
|
69
|
-
params[:person_id] = person.id
|
70
160
|
params[:creator_id] = user.id
|
71
|
-
|
161
|
+
|
162
|
+
params[:notes] = parsed_row.notes
|
163
|
+
params[:ack_sent_date] = parsed_row.ack_sent_date
|
164
|
+
params[:fiscal_year] = parsed_row.fiscal_year
|
165
|
+
|
166
|
+
campaign = create_campaign(parsed_row, params)
|
167
|
+
create_appeal(parsed_row, campaign, params)
|
168
|
+
create_match_eligible(parsed_row, params)
|
169
|
+
create_soft_credit(parsed_row, params)
|
170
|
+
|
72
171
|
contribution = Contribution.new(params)
|
73
|
-
contribution.save(ImportedOrder)
|
74
|
-
contribution.order.import_id = self.id
|
75
|
-
contribution.order.save
|
76
|
-
contribution.order.reload
|
77
|
-
contribution.action.import_id = self.id
|
78
|
-
contribution.action.creator = self.user
|
79
|
-
contribution.action.details = "Donated #{number_as_cents contribution.order.total}"
|
80
|
-
contribution.action.save
|
81
|
-
end
|
172
|
+
contribution.save(ImportedOrder, self.id)
|
82
173
|
contribution
|
83
174
|
end
|
84
175
|
end
|