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
@@ -8,36 +8,234 @@ class MembershipsImport < Import
|
|
8
8
|
|
9
9
|
def row_valid?(parsed_row)
|
10
10
|
raise Import::RowError, "No Amount included in this row: #{parsed_row.row}" if parsed_row.unparsed_amount.blank?
|
11
|
-
raise Import::RowError, "
|
11
|
+
raise Import::RowError, "No Email included in this row: #{parsed_row.row}" unless attach_person(parsed_row).email.present?
|
12
12
|
raise Import::RowError, "Please include a payment method in this row: #{parsed_row.row}" if parsed_row.payment_method.blank?
|
13
|
-
valid_amount?
|
14
|
-
valid_date?
|
13
|
+
valid_amount? parsed_row.unparsed_amount unless parsed_row.unparsed_amount.blank?
|
14
|
+
valid_date? parsed_row.order_date unless parsed_row.order_date.blank?
|
15
|
+
|
16
|
+
case detect_membership_type(parsed_row.membership_type).to_s
|
17
|
+
when RollingMembershipType.to_s
|
18
|
+
valid_date? parsed_row.start_date
|
19
|
+
raise Import::RowError, "Please include a 'Period' for Rolling membership: #{parsed_row.row}" if parsed_row.period.blank?
|
20
|
+
raise Import::RowError, "Please include a 'Duration' for Rolling membership: #{parsed_row.row}" if parsed_row.duration.blank?
|
21
|
+
when SeasonalMembershipType.to_s
|
22
|
+
valid_date? parsed_row.start_date
|
23
|
+
valid_date? parsed_row.end_date
|
24
|
+
end
|
25
|
+
|
15
26
|
true
|
16
27
|
end
|
17
|
-
|
28
|
+
|
29
|
+
def new_membership_types
|
30
|
+
self.import_rows.select('membership_name, membership_type, count(id) as member_count').where(membership_type_exists: false).group('membership_name')
|
31
|
+
end
|
32
|
+
|
33
|
+
def existing_membership_types
|
34
|
+
self.import_rows.select('membership_name, membership_type, count(id) as member_count').where(membership_type_exists: true).group('membership_name')
|
35
|
+
end
|
36
|
+
|
37
|
+
def index_parsed_row(parsed_row)
|
38
|
+
import_row = super
|
39
|
+
import_row.membership_type = parsed_row.membership_type
|
40
|
+
import_row.membership_name = parsed_row.membership_name
|
41
|
+
import_row.membership_type_exists = find_membership_type(parsed_row).present?
|
42
|
+
import_row
|
43
|
+
end
|
44
|
+
|
18
45
|
def process(parsed_row)
|
19
46
|
row_valid?(parsed_row)
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
47
|
+
person = create_person(parsed_row)
|
48
|
+
member = create_member(person)
|
49
|
+
membership_type = create_membership_type(parsed_row)
|
50
|
+
order = create_order(parsed_row, person, member, membership_type)
|
51
|
+
end
|
52
|
+
|
53
|
+
def create_person(parsed_row)
|
54
|
+
new_person = attach_person(parsed_row)
|
55
|
+
|
56
|
+
existing_person = Person.first_or_initialize( {:email => new_person.email, :organization => self.organization} ) do |p|
|
57
|
+
p.type = new_person.type
|
58
|
+
p.subtype = new_person.subtype
|
59
|
+
end
|
60
|
+
|
61
|
+
if existing_person.new_record?
|
62
|
+
existing_person.import = self
|
63
|
+
else
|
64
|
+
message(nil, parsed_row, existing_person, "#{existing_person.email} exists. Will merge records.")
|
65
|
+
end
|
66
|
+
|
67
|
+
existing_person.update_from_import(new_person)
|
68
|
+
existing_person.skip_commit = true
|
69
|
+
|
70
|
+
unless existing_person.save
|
71
|
+
message = []
|
72
|
+
message << "#{parsed_row.email}: " unless parsed_row.email.blank?
|
73
|
+
message << person.errors.full_messages.join(', ')
|
74
|
+
raise Import::RowError, message.join('')
|
75
|
+
end
|
76
|
+
|
77
|
+
existing_person
|
78
|
+
end
|
79
|
+
|
80
|
+
def create_member(person)
|
81
|
+
member = self.members.where(:person_id => person.id, :organization_id => self.organization_id).first
|
82
|
+
|
83
|
+
unless member
|
84
|
+
member = self.members.build
|
85
|
+
member.email = person.email
|
86
|
+
member.password = Devise.friendly_token.first(15)
|
87
|
+
member.person = person
|
88
|
+
member.organization = self.organization
|
89
|
+
member.save!
|
90
|
+
end
|
91
|
+
|
92
|
+
member
|
24
93
|
end
|
25
94
|
|
26
95
|
def create_membership_type(parsed_row)
|
27
|
-
membership_type =
|
28
|
-
|
29
|
-
|
30
|
-
|
96
|
+
membership_type = find_membership_type(parsed_row)
|
97
|
+
|
98
|
+
unless membership_type
|
99
|
+
klass = detect_membership_type(parsed_row.membership_type)
|
100
|
+
membership_type = klass.new
|
101
|
+
membership_type.import_id = self.id
|
102
|
+
membership_type.name = parsed_row.membership_name
|
103
|
+
membership_type.description = parsed_row.membership_name
|
104
|
+
membership_type.organization = self.organization
|
105
|
+
membership_type.price = parsed_row.amount
|
106
|
+
|
107
|
+
case klass.to_s
|
108
|
+
when SeasonalMembershipType.to_s
|
109
|
+
membership_type.starts_at = DateTime.parse(parsed_row.start_date)
|
110
|
+
membership_type.ends_at = DateTime.parse(parsed_row.end_date)
|
111
|
+
when RollingMembershipType.to_s
|
112
|
+
membership_type.starts_at = DateTime.parse(parsed_row.start_date)
|
113
|
+
membership_type.duration = parsed_row.duration
|
114
|
+
membership_type.period = parsed_row.period
|
115
|
+
else
|
116
|
+
raise Import::RowError, "Unknown membership type #{klass}"
|
117
|
+
end
|
118
|
+
|
119
|
+
membership_type.save(:validate => false)
|
120
|
+
end
|
121
|
+
|
31
122
|
membership_type
|
32
123
|
end
|
33
124
|
|
34
|
-
def
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
125
|
+
def find_membership_type(parsed_row)
|
126
|
+
membership_type = MembershipType.where(
|
127
|
+
:name => parsed_row.membership_name,
|
128
|
+
:organization_id => self.organization.id
|
129
|
+
).first
|
130
|
+
end
|
131
|
+
|
132
|
+
def create_membership(parsed_row, member, membership_type)
|
133
|
+
membership = self.memberships.build
|
134
|
+
membership.organization = self.organization
|
135
|
+
membership.membership_type = membership_type
|
136
|
+
membership.member = member
|
137
|
+
membership.price = parsed_row.amount
|
138
|
+
membership.sold_price = parsed_row.amount
|
139
|
+
membership.cart_price = parsed_row.amount
|
140
|
+
membership.total_paid = parsed_row.amount
|
141
|
+
|
142
|
+
membership.starts_at = DateTime.parse(parsed_row.start_date)
|
143
|
+
|
144
|
+
case membership_type.type
|
145
|
+
when SeasonalMembershipType.to_s
|
146
|
+
membership.ends_at = DateTime.parse(parsed_row.end_date)
|
147
|
+
when RollingMembershipType.to_s
|
148
|
+
membership.ends_at = membership.starts_at + membership_type.duration_in_seconds
|
149
|
+
else
|
150
|
+
raise Import::RowError, "Failed to create a membership of type: #{membership_type}"
|
151
|
+
end
|
152
|
+
|
153
|
+
membership.save!
|
154
|
+
membership
|
155
|
+
end
|
156
|
+
|
157
|
+
def existing_order(person, membership_type, payment_method)
|
158
|
+
# lookup order ids:
|
159
|
+
# for membership(s):
|
160
|
+
# + of the same membership type
|
161
|
+
# + with the same payment method
|
162
|
+
# + and the same buyer
|
163
|
+
existing_orders = ImportedOrder.joins(:items).where orders: {
|
164
|
+
import_id: self.id,
|
165
|
+
person_id: person.id,
|
166
|
+
payment_method: payment_method
|
167
|
+
},
|
168
|
+
|
169
|
+
items: {
|
170
|
+
product_type: 'Membership',
|
171
|
+
product_id: membership_type.id
|
172
|
+
}
|
173
|
+
order = existing_orders.last
|
174
|
+
ImportedOrder.find(order.id) if order
|
175
|
+
end
|
176
|
+
|
177
|
+
def create_order(parsed_row, person, member, membership_type)
|
178
|
+
order = existing_order(person, membership_type, parsed_row.payment_method) || ImportedOrder.new
|
179
|
+
|
180
|
+
order.organization = self.organization
|
181
|
+
order.payment_method = parsed_row.payment_method
|
182
|
+
order.person = person
|
183
|
+
order.details = "Imported by #{user.email} on #{I18n.l self.created_at_local_to_organization, :format => :date}"
|
184
|
+
order.import = self
|
185
|
+
|
186
|
+
product = create_membership(parsed_row, member, membership_type)
|
187
|
+
|
188
|
+
item = Item.for(product, order)
|
189
|
+
item.state = "settled"
|
190
|
+
order.items << item
|
191
|
+
|
192
|
+
order.skip_actions = true
|
193
|
+
order.save
|
194
|
+
unless parsed_row.order_date.blank?
|
195
|
+
date_in_zone = DateTime.parse(parsed_row.order_date)
|
196
|
+
order_date = date_in_zone - time_zone_parser.utc_offset.seconds
|
197
|
+
|
198
|
+
order.update_attribute(:created_at, order_date)
|
199
|
+
end
|
200
|
+
|
201
|
+
order.create_generic_action(:memberships, self.id)
|
202
|
+
order.actions.where(:type => 'GetAction').first.update_attribute(:occurred_at, order.created_at)
|
203
|
+
|
204
|
+
order
|
205
|
+
end
|
206
|
+
|
207
|
+
def detect_membership_type(type)
|
208
|
+
case type.to_s.downcase
|
209
|
+
when /seasonal/
|
210
|
+
SeasonalMembershipType
|
211
|
+
when /rolling/
|
212
|
+
RollingMembershipType
|
213
|
+
else
|
214
|
+
raise Import::RowError, "Unknown Membership Type: #{type}"
|
215
|
+
end
|
216
|
+
end
|
217
|
+
|
218
|
+
def rollback
|
219
|
+
rollback_orders
|
220
|
+
rollback_actions
|
221
|
+
rollback_memberships
|
222
|
+
rollback_membership_types
|
223
|
+
rollback_people
|
224
|
+
end
|
225
|
+
|
226
|
+
def rollback_members
|
227
|
+
Member.where(:import_id => self.id).destroy_all
|
228
|
+
end
|
229
|
+
|
230
|
+
def rollback_memberships
|
231
|
+
Membership.where(:import_id => self.id).destroy_all
|
232
|
+
end
|
233
|
+
|
234
|
+
def rollback_membership_types
|
235
|
+
MembershipType.where(:import_id => self.id).destroy_all
|
236
|
+
end
|
237
|
+
|
238
|
+
def rollback_actions
|
239
|
+
Action.where(:import_id => self.id).destroy_all
|
42
240
|
end
|
43
241
|
end
|
@@ -38,6 +38,14 @@ class PeopleImport < Import
|
|
38
38
|
#We're doing this here because the error message for naming_details_available? is very bad
|
39
39
|
raise Import::RowError, "Please include a first name, last name, or email in this row: #{parsed_row.row}" unless attach_person(parsed_row).naming_details_available?
|
40
40
|
|
41
|
+
if parsed_row.birth_month.present?
|
42
|
+
raise Import::RowError, "Incorrect month: '#{parsed_row.birth_month}' in this row: #{parsed_row.row}" unless parsed_row.birth_month.to_i.between?(1,12)
|
43
|
+
end
|
44
|
+
|
45
|
+
if parsed_row.birth_day.present?
|
46
|
+
raise Import::RowError, "Incorrect day: '#{parsed_row.birth_day}' in this row: #{parsed_row.row}" unless parsed_row.birth_day.to_i.between?(1,31)
|
47
|
+
end
|
48
|
+
|
41
49
|
#We're bypassing the valid? check that used to be here because we're allowing dupe emails (they get merged later)
|
42
50
|
true
|
43
51
|
end
|
@@ -66,4 +74,4 @@ class PeopleImport < Import
|
|
66
74
|
end
|
67
75
|
existing_person
|
68
76
|
end
|
69
|
-
end
|
77
|
+
end
|
@@ -12,5 +12,14 @@ module Imports
|
|
12
12
|
Rails.logger.debug result
|
13
13
|
end
|
14
14
|
end
|
15
|
+
|
16
|
+
def rollback_campaigns
|
17
|
+
Campaign.where(:import_id => self.id).where(:organization_id => self.organization.id).all.each {|o| o.destroy(:with_prejudice => true)}
|
18
|
+
end
|
19
|
+
|
20
|
+
def rollback_appeals
|
21
|
+
Appeal.where(:import_id => self.id).where(:organization_id => self.organization.id).all.each {|o| o.destroy(:with_prejudice => true)}
|
22
|
+
end
|
23
|
+
|
15
24
|
end
|
16
25
|
end
|
@@ -16,6 +16,13 @@ module Imports
|
|
16
16
|
rescue
|
17
17
|
raise Import::RowError, "Invalid date: #{date_str} Make sure the date is in the format YEAR/MONTH/DAY (2012/04/18) or DAY-MONTH-YEAR (18-Apr-12)."
|
18
18
|
end
|
19
|
+
|
20
|
+
parsed_date = DateTime.parse(date_str)
|
21
|
+
|
22
|
+
if(parsed_date.year < 1900)
|
23
|
+
raise Import::RowError, "Invalid date: #{date_str} Make sure the date is in the format YEAR/MONTH/DAY (2012/04/18) or DAY-MONTH-YEAR (18-Apr-12)."
|
24
|
+
end
|
25
|
+
|
19
26
|
true
|
20
27
|
end
|
21
28
|
|
data/app/models/individual.rb
CHANGED
@@ -1,6 +1,8 @@
|
|
1
1
|
class Individual < Person
|
2
2
|
|
3
|
-
after_destroy
|
3
|
+
after_destroy do |record|
|
4
|
+
Delayed::Job.enqueue(CleanupSuggestedHouseholdsJob.new(record.id), :queue => :suggested_households)
|
5
|
+
end
|
4
6
|
|
5
7
|
def to_s
|
6
8
|
if first_name.present? || last_name.present?
|
data/app/models/item.rb
CHANGED
@@ -15,13 +15,19 @@ class Item < ActiveRecord::Base
|
|
15
15
|
belongs_to :pass
|
16
16
|
|
17
17
|
attr_accessible :order_id, :product_type, :state, :price, :realized_price, :net, :nongift_amount
|
18
|
-
|
18
|
+
|
19
19
|
#This is a lambda used to by the items to calculate their net
|
20
20
|
attr_accessor :per_item_processing_charge
|
21
21
|
|
22
|
+
#A float value used to calculate how much of a product's realized fee applies to this item
|
23
|
+
attr_accessor :realized_fee_modifier
|
24
|
+
|
22
25
|
validates_presence_of :product_type, :price, :realized_price, :net
|
23
26
|
validates_inclusion_of :product_type, :in => %( Ticket Donation Membership Pass)
|
24
27
|
|
28
|
+
after_save { order.solr_index! if order }
|
29
|
+
after_destroy { order.solr_index! if order }
|
30
|
+
|
25
31
|
scope :donation, where(:product_type => 'Donation')
|
26
32
|
scope :membership, where(:product_type => 'Membership')
|
27
33
|
scope :ticket, where(:product_type => 'Ticket')
|
@@ -48,13 +54,39 @@ class Item < ActiveRecord::Base
|
|
48
54
|
product_type == "Pass"
|
49
55
|
end
|
50
56
|
|
51
|
-
def self.
|
52
|
-
|
57
|
+
def self.donations_count_by(person)
|
58
|
+
self.select('(COUNT(DISTINCT orders.parent_id) + SUM(orders.parent_id IS NULL)) AS donations_count')
|
59
|
+
.joins(:order)
|
60
|
+
.joins('LEFT JOIN donations ON donations.id = items.product_id')
|
61
|
+
.where(:product_type => 'Donation')
|
62
|
+
.where('donations.pledge' => false)
|
63
|
+
.where("items.state != 'refund' AND items.state != 'refunded'")
|
64
|
+
.where('orders.person_id' => person.id).first.donations_count.to_i
|
65
|
+
|
66
|
+
end
|
67
|
+
|
68
|
+
#
|
69
|
+
# realized_fee is the fee charged to the producer by withholding it
|
70
|
+
# from any settlements.
|
71
|
+
#
|
72
|
+
# Note that thisis different from the (now poorly named) service_fee which is
|
73
|
+
# money we've charged to the patron at checkout time
|
74
|
+
#
|
75
|
+
def realized_fee
|
76
|
+
price - realized_price
|
77
|
+
end
|
78
|
+
|
79
|
+
def total_fee
|
80
|
+
realized_fee + service_fee
|
81
|
+
end
|
82
|
+
|
83
|
+
def producer_liability
|
84
|
+
self.price - realized_fee
|
53
85
|
end
|
54
86
|
|
55
87
|
#
|
56
88
|
# If the product that this item points to (a ticket, for instance) gets refunded or returned
|
57
|
-
# then re-sold to someone else, this item will still show up on the original purchaser's
|
89
|
+
# then re-sold to someone else, this item will still show up on the original purchaser's
|
58
90
|
# action feed
|
59
91
|
#
|
60
92
|
def order_summary_description
|
@@ -88,10 +120,11 @@ class Item < ActiveRecord::Base
|
|
88
120
|
1
|
89
121
|
end
|
90
122
|
|
91
|
-
def self.for(prod,
|
123
|
+
def self.for(prod, order)
|
92
124
|
Item.new.tap do |i|
|
93
|
-
i.per_item_processing_charge =
|
94
|
-
i.
|
125
|
+
i.per_item_processing_charge = order.try(:per_item_processing_charge) || lambda { |item| 0 }
|
126
|
+
i.realized_fee_modifier = order.try(:realized_fee_modifier) || 1
|
127
|
+
i.product = prod
|
95
128
|
end
|
96
129
|
end
|
97
130
|
|
@@ -128,6 +161,11 @@ class Item < ActiveRecord::Base
|
|
128
161
|
(not dead?) and product and product.returnable?
|
129
162
|
end
|
130
163
|
|
164
|
+
def convertable?
|
165
|
+
(not dead?) and product and product.convertable?
|
166
|
+
end
|
167
|
+
|
168
|
+
|
131
169
|
#
|
132
170
|
# This looks bad, but here's what's going on
|
133
171
|
# the item that gets refunded is state="refunded"
|
@@ -158,7 +196,7 @@ class Item < ActiveRecord::Base
|
|
158
196
|
self.original_price = item_that_this_is_being_exchanged_for.original_price
|
159
197
|
self.price = item_that_this_is_being_exchanged_for.price
|
160
198
|
self.realized_price = item_that_this_is_being_exchanged_for.realized_price
|
161
|
-
self.net = item_that_this_is_being_exchanged_for.net
|
199
|
+
self.net = item_that_this_is_being_exchanged_for.net
|
162
200
|
self.service_fee = item_that_this_is_being_exchanged_for.service_fee
|
163
201
|
self.state = item_that_this_is_being_exchanged_for.state
|
164
202
|
end
|
@@ -181,10 +219,10 @@ class Item < ActiveRecord::Base
|
|
181
219
|
self.original_price = 0
|
182
220
|
self.price = 0
|
183
221
|
self.realized_price = 0
|
184
|
-
self.net = 0
|
222
|
+
self.net = 0
|
185
223
|
self.service_fee = 0
|
186
224
|
self.discount = nil
|
187
|
-
save
|
225
|
+
save
|
188
226
|
end
|
189
227
|
|
190
228
|
def modified?
|
@@ -194,7 +232,7 @@ class Item < ActiveRecord::Base
|
|
194
232
|
def dead?
|
195
233
|
refunded? || refund? || exchanged? || return?
|
196
234
|
end
|
197
|
-
|
235
|
+
|
198
236
|
def return?
|
199
237
|
state.eql? "returned"
|
200
238
|
end
|
@@ -205,23 +243,23 @@ class Item < ActiveRecord::Base
|
|
205
243
|
def settled?
|
206
244
|
state.eql? "settled"
|
207
245
|
end
|
208
|
-
|
246
|
+
|
209
247
|
def purchased?
|
210
248
|
state.eql? "purchased"
|
211
249
|
end
|
212
|
-
|
250
|
+
|
213
251
|
def comped?
|
214
252
|
state.eql? "comped"
|
215
253
|
end
|
216
|
-
|
254
|
+
|
217
255
|
def refund?
|
218
256
|
state.eql? "refund"
|
219
257
|
end
|
220
|
-
|
258
|
+
|
221
259
|
def refunded?
|
222
260
|
state.eql? "refunded"
|
223
261
|
end
|
224
|
-
|
262
|
+
|
225
263
|
def exchanged?
|
226
264
|
state.eql? "exchanged"
|
227
265
|
end
|
@@ -276,7 +314,7 @@ class Item < ActiveRecord::Base
|
|
276
314
|
def set_prices_from(prod)
|
277
315
|
self.original_price = prod.price
|
278
316
|
self.price = (prod.sold_price || prod.cart_price || prod.price)
|
279
|
-
self.realized_price = self.price - prod.realized_fee
|
317
|
+
self.realized_price = self.price - ((self.realized_fee_modifier || 1) * prod.realized_fee)
|
280
318
|
self.net = (self.realized_price - (per_item_processing_charge || lambda { |item| 0 }).call(self)).floor
|
281
319
|
self.service_fee = prod.service_fee || 0
|
282
320
|
end
|