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/comp.rb
CHANGED
@@ -5,14 +5,14 @@ class Comp
|
|
5
5
|
|
6
6
|
validate :valid_recipient_and_benefactor
|
7
7
|
|
8
|
-
attr_accessor :
|
8
|
+
attr_accessor :tickets, :memberships, :passes, :recipient, :benefactor, :order, :notes
|
9
9
|
attr_accessor :comped_count, :uncomped_count, :details
|
10
10
|
|
11
11
|
#tickets can be an array of tickets_ids or an array of tickets
|
12
|
-
def initialize(
|
13
|
-
@show = show
|
12
|
+
def initialize(tickets_or_ids, memberships, passes, recipient, benefactor, notes=nil)
|
14
13
|
@tickets = []
|
15
14
|
@memberships = memberships
|
15
|
+
@passes = passes
|
16
16
|
load_tickets(tickets_or_ids)
|
17
17
|
@recipient = Person.find(recipient) unless recipient.blank?
|
18
18
|
@benefactor = benefactor
|
@@ -45,7 +45,7 @@ class Comp
|
|
45
45
|
|
46
46
|
def submit
|
47
47
|
ActiveRecord::Base.transaction do
|
48
|
-
create_order(@tickets, @memberships, @recipient, @benefactor, @notes)
|
48
|
+
create_order(@tickets, @memberships, @passes, @recipient, @benefactor, @notes)
|
49
49
|
self.comped_count = tickets.size
|
50
50
|
self.uncomped_count = 0
|
51
51
|
end
|
@@ -60,12 +60,14 @@ class Comp
|
|
60
60
|
end
|
61
61
|
end
|
62
62
|
|
63
|
-
def create_order(comped_tickets, comped_memberships, recipient, benefactor, notes)
|
63
|
+
def create_order(comped_tickets, comped_memberships, comped_passes, recipient, benefactor, notes)
|
64
64
|
@order = CompOrder.new
|
65
65
|
@order << comped_tickets
|
66
66
|
@order << comped_memberships
|
67
|
+
@order << comped_passes
|
67
68
|
@order.person = recipient
|
68
69
|
@order.organization = benefactor.current_organization
|
70
|
+
@order.creator_id = benefactor.try(:id)
|
69
71
|
@order.details = order_details
|
70
72
|
@order.notes = @notes
|
71
73
|
@order.skip_email = true
|
data/app/models/company.rb
CHANGED
data/app/models/console_sale.rb
CHANGED
@@ -7,6 +7,21 @@ module ConsoleSale
|
|
7
7
|
def checkout_name
|
8
8
|
"sales console"
|
9
9
|
end
|
10
|
+
|
11
|
+
def finish
|
12
|
+
case payment
|
13
|
+
when CompPayment
|
14
|
+
attributes = person_attributes.merge({:organization => cart.organizations.first})
|
15
|
+
@person = Person.first_or_create(attributes)
|
16
|
+
@comp = Comp.new(cart.tickets, cart.memberships, cart.passes, @person, payment.benefactor, self.notes)
|
17
|
+
@comp.submit
|
18
|
+
@order = @comp.order
|
19
|
+
self.cart.approve!
|
20
|
+
true
|
21
|
+
else
|
22
|
+
super
|
23
|
+
end
|
24
|
+
end
|
10
25
|
end
|
11
26
|
|
12
27
|
class Cart < ::Cart
|
@@ -19,6 +34,17 @@ module ConsoleSale
|
|
19
34
|
def self.location
|
20
35
|
"Sales Console"
|
21
36
|
end
|
37
|
+
|
38
|
+
#
|
39
|
+
# 1 if realized_fee should be charged
|
40
|
+
# 0 otherwise
|
41
|
+
#
|
42
|
+
# This is used when setting realized_price on item
|
43
|
+
# at order creation time.
|
44
|
+
#
|
45
|
+
def realized_fee_modifier
|
46
|
+
0
|
47
|
+
end
|
22
48
|
end
|
23
49
|
|
24
50
|
class FeeStrategy < ::FeeStrategy
|
data/app/models/contribution.rb
CHANGED
@@ -1,109 +1,289 @@
|
|
1
1
|
class Contribution
|
2
2
|
extend ActiveModel::Naming
|
3
|
+
extend ::ArtfullyOseHelper
|
3
4
|
include ActiveModel::Conversion
|
5
|
+
include ActiveModel::Validations
|
4
6
|
|
5
|
-
|
6
|
-
|
7
|
-
|
7
|
+
require 'set'
|
8
|
+
|
9
|
+
attr_accessor :contributor,
|
10
|
+
:order,
|
11
|
+
:donation,
|
12
|
+
:item,
|
13
|
+
:action,
|
14
|
+
:ack_action,
|
15
|
+
:soft_credits,
|
16
|
+
:pledge_payments,
|
17
|
+
:person_id,
|
18
|
+
:subtype, #Monetary, In-kind
|
8
19
|
:payment_method, #Cash, Check, Credit card, Other
|
9
|
-
:occurred_at,
|
10
|
-
:
|
11
|
-
:organization_id,
|
12
|
-
:creator_id,
|
13
|
-
:
|
14
|
-
:
|
15
|
-
|
20
|
+
:occurred_at,
|
21
|
+
:notes,
|
22
|
+
:organization_id,
|
23
|
+
:creator_id,
|
24
|
+
:campaign_id,
|
25
|
+
:appeal_id,
|
26
|
+
:check_number,
|
27
|
+
:commitment_date,
|
28
|
+
:ack_sent_date,
|
29
|
+
:ack_method,
|
30
|
+
:match_eligible,
|
31
|
+
:matcher,
|
32
|
+
:matcher_name,
|
33
|
+
:eligible_amount,
|
34
|
+
:ratio,
|
35
|
+
:first_name,
|
36
|
+
:last_name,
|
37
|
+
:email,
|
38
|
+
:company_name,
|
39
|
+
:pledge,
|
40
|
+
:order_parent_id,
|
41
|
+
:fiscal_year
|
42
|
+
|
16
43
|
#
|
17
44
|
# Standard for the app is (total_donation_amount = amount + nongift_amount)
|
18
45
|
# For example, if someone wrote a check for $100 for event with $25 FMV, amount = $75 and nongift_amount = $25
|
19
46
|
#
|
20
|
-
attr_accessor :amount,
|
47
|
+
attr_accessor :amount,
|
21
48
|
:nongift_amount
|
22
49
|
|
23
50
|
set_watch_for :occurred_at, :local_to => :organization
|
51
|
+
set_watch_for :commitment_date, :local_to => :organization
|
52
|
+
set_watch_for :ack_sent_date, :local_to => :organization
|
53
|
+
|
54
|
+
|
55
|
+
validates :amount, :numericality => {
|
56
|
+
:only_integer => true,
|
57
|
+
:greater_than => 0,
|
58
|
+
:message => '^Total Gift Amount must be greater than $0'
|
59
|
+
}
|
60
|
+
|
61
|
+
validate :nongift_is_less_than_total
|
62
|
+
|
63
|
+
validates :eligible_amount, :numericality => {
|
64
|
+
:only_integer => true,
|
65
|
+
:greater_than => 0,
|
66
|
+
:message => '^Match Eligible Amount must be greater than $0',
|
67
|
+
:if => lambda {|u| matcher.to_i > 0} #present eligible_amount if matcher is presented
|
68
|
+
}
|
69
|
+
|
70
|
+
validates :matcher, :numericality => {
|
71
|
+
:only_integer => true,
|
72
|
+
:greater_than => 0,
|
73
|
+
:message => '^Matcher must be selected to save a match eligible gift',
|
74
|
+
:if => lambda {|u| eligible_amount.to_i > 0} #present matcher if eligible amount is presented
|
75
|
+
}
|
76
|
+
|
24
77
|
|
25
78
|
def initialize(params = {})
|
26
79
|
load(params)
|
27
80
|
@contributor = find_contributor
|
28
81
|
end
|
29
|
-
|
82
|
+
|
30
83
|
#hacks to make form_for work
|
31
84
|
def id
|
32
85
|
self.order.try(:id)
|
33
86
|
end
|
34
|
-
|
87
|
+
|
35
88
|
def persisted?
|
36
89
|
!self.order.nil? && self.order.persisted?
|
37
90
|
end
|
38
|
-
|
91
|
+
|
39
92
|
def organization
|
40
93
|
@organization ||= Organization.find(self.organization_id)
|
41
94
|
end
|
42
|
-
|
43
|
-
def self.
|
44
|
-
|
95
|
+
|
96
|
+
def campaign(campaign_id = self.campaign_id)
|
97
|
+
@campaign ||= campaign_id.present? ? Campaign.find(campaign_id) : nil
|
98
|
+
end
|
99
|
+
|
100
|
+
def self.for(order)
|
101
|
+
item = order.donations.first
|
102
|
+
donation = Donation.find(item.product_id)
|
103
|
+
action = (donation.pledge ? PledgeAction : GiveAction).where(:subject_id => order.id).where(:subject_type => "Order").first
|
104
|
+
ack_action = HearAction.where(:subject_id => order.id).where(:subject_type => "Order").first if donation.ack_sent_date.present?
|
105
|
+
|
106
|
+
soft_credits = SoftCredit.find_all_by_donation_id_and_organization_id(donation.id, donation.organization_id)
|
107
|
+
soft_credits = Array.wrap(SoftCredit.default_soft_credit) if soft_credits.empty?
|
108
|
+
|
109
|
+
pledge_payments = ScheduledPledgePayment.find_all_by_order_id(order.id)
|
110
|
+
pledge_payments = Array.wrap(ScheduledPledgePayment.default_pledge_payment) if pledge_payments.empty?
|
111
|
+
|
45
112
|
Contribution.new.tap do |contribution|
|
46
|
-
contribution.order = order
|
47
113
|
contribution.contributor = order.person
|
48
114
|
contribution.occurred_at = order.created_at
|
49
|
-
contribution.amount = order.
|
50
|
-
contribution.nongift_amount = order.
|
115
|
+
contribution.amount = order.donations.first.price + order.donations.first.nongift_amount.to_i
|
116
|
+
contribution.nongift_amount = order.donations.first.nongift_amount
|
51
117
|
contribution.payment_method = order.payment_method
|
52
|
-
|
53
|
-
contribution.subtype = action.subtype
|
54
|
-
contribution.details = action.details
|
118
|
+
contribution.check_number = order.check_number
|
55
119
|
contribution.organization_id = order.organization_id
|
120
|
+
contribution.notes = order.notes
|
121
|
+
contribution.person_id = contribution.contributor.id
|
122
|
+
|
123
|
+
contribution.subtype = action.subtype
|
56
124
|
contribution.creator_id = action.creator_id
|
125
|
+
|
126
|
+
contribution.campaign_id = donation.campaign_id
|
127
|
+
contribution.appeal_id = donation.appeal_id
|
128
|
+
contribution.commitment_date = donation.commitment_date || DateTime.now
|
129
|
+
contribution.ack_sent_date = donation.ack_sent_date
|
130
|
+
contribution.ack_method = ack_action.subtype if ack_action.present?
|
131
|
+
contribution.match_eligible = donation.match_eligible
|
132
|
+
contribution.matcher = donation.matcher
|
133
|
+
contribution.matcher_name = Person.find_by_id(donation.matcher) if donation.matcher
|
134
|
+
contribution.eligible_amount = donation.eligible_amount
|
135
|
+
contribution.ratio = donation.ratio
|
136
|
+
contribution.pledge = donation.pledge
|
137
|
+
contribution.fiscal_year = donation.fiscal_year
|
138
|
+
|
139
|
+
contribution.order = order
|
140
|
+
contribution.donation = donation
|
141
|
+
contribution.item = item
|
57
142
|
contribution.action = action
|
58
|
-
contribution.
|
143
|
+
contribution.ack_action = ack_action
|
144
|
+
contribution.soft_credits = soft_credits
|
145
|
+
contribution.pledge_payments = pledge_payments
|
59
146
|
end
|
60
147
|
end
|
61
148
|
|
62
|
-
def save(order_klass = ApplicationOrder,
|
63
|
-
@order = build_order(order_klass)
|
149
|
+
def save(order_klass = ApplicationOrder, import_id = 0, skip_email = true, state = 'settled')
|
64
150
|
Order.transaction do
|
151
|
+
@order = build_order(order_klass, skip_email)
|
152
|
+
@order.import_id = import_id if import_id > 0
|
65
153
|
@order.save!
|
66
|
-
|
67
|
-
@
|
154
|
+
|
155
|
+
@donation = build_donation
|
156
|
+
@donation.order_id = @order.id
|
157
|
+
@donation.save!
|
158
|
+
|
159
|
+
@item = build_item(@order, @amount.to_i - @nongift_amount.to_i, @nongift_amount, state)
|
160
|
+
@item.product_id = @donation.id
|
68
161
|
@item.save!
|
69
|
-
|
162
|
+
|
163
|
+
if @ack_sent_date.present?
|
164
|
+
@ack_action = build_ack_action(@order, @amount, @ack_sent_date, @ack_method)
|
165
|
+
@ack_action.save!
|
166
|
+
end
|
167
|
+
|
70
168
|
@action = build_action
|
169
|
+
@action.import_id = import_id if import_id > 0
|
71
170
|
@action.save!
|
171
|
+
|
172
|
+
SoftCredit.save_all(@soft_credits, @donation.id, @organization_id)
|
173
|
+
ScheduledPledgePayment.save_all(@pledge_payments, @organization_id, @order.id, @donation.id, @person_id)
|
174
|
+
pledge_for_matching_gift(self, @order.id).save(order_klass, import_id) if @match_eligible && @matcher.to_i > 0
|
175
|
+
|
176
|
+
|
177
|
+
@soft_credits.each do |sc|
|
178
|
+
next if sc.person_id.to_i <= 0
|
179
|
+
sc_action = sc.build_sc_action(self, @order)
|
180
|
+
sc_action.save!
|
181
|
+
end
|
182
|
+
|
72
183
|
end
|
73
184
|
yield(self) if block_given?
|
74
185
|
@order
|
75
186
|
end
|
76
187
|
|
77
|
-
|
78
|
-
contributor.present?
|
79
|
-
end
|
80
|
-
|
188
|
+
|
81
189
|
def update(new_contribution)
|
82
190
|
order = self.order
|
83
|
-
item = self.
|
191
|
+
item = self.item
|
192
|
+
donation = self.donation
|
84
193
|
action = self.action
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
194
|
+
ack_action = self.ack_action
|
195
|
+
|
196
|
+
if order.editable?
|
197
|
+
item.price = new_contribution.amount.to_i - new_contribution.nongift_amount.to_i
|
198
|
+
item.nongift_amount = new_contribution.nongift_amount
|
199
|
+
item.realized_price = item.price
|
200
|
+
item.net = item.price
|
201
|
+
end
|
202
|
+
|
203
|
+
action.details = action_details(new_contribution.amount, campaign(new_contribution.campaign_id), new_contribution.soft_credits, order.type, order.parent_id)
|
92
204
|
action.subtype = new_contribution.subtype
|
93
|
-
|
205
|
+
action.person_id = new_contribution.person_id
|
206
|
+
action.occurred_at = new_contribution.occurred_at
|
207
|
+
|
208
|
+
order.person_id = new_contribution.person_id
|
94
209
|
order.created_at = new_contribution.occurred_at
|
95
|
-
order.payment_method = new_contribution.payment_method
|
96
|
-
order.
|
97
|
-
|
210
|
+
order.payment_method = new_contribution.payment_method if !new_contribution.pledge
|
211
|
+
order.notes = new_contribution.notes
|
212
|
+
|
213
|
+
if !new_contribution.pledge && new_contribution.payment_method == 'Check'
|
214
|
+
order.check_number = new_contribution.check_number
|
215
|
+
end
|
216
|
+
|
217
|
+
orig_match_eligible = donation.match_eligible && donation.matcher.to_i > 0
|
218
|
+
db_soft_credits = SoftCredit.find_all_by_donation_id_and_organization_id(donation.id, donation.organization_id)
|
219
|
+
db_pledge_payments = ScheduledPledgePayment.find_all_by_order_id(order.id)
|
220
|
+
|
221
|
+
donation.amount = new_contribution.amount
|
222
|
+
donation.campaign_id = new_contribution.campaign_id
|
223
|
+
donation.appeal_id = new_contribution.appeal_id
|
224
|
+
donation.created_at = new_contribution.occurred_at
|
225
|
+
donation.commitment_date = new_contribution.commitment_date
|
226
|
+
donation.ack_sent_date = new_contribution.ack_sent_date
|
227
|
+
donation.match_eligible = new_contribution.match_eligible
|
228
|
+
donation.matcher = new_contribution.matcher
|
229
|
+
donation.eligible_amount = new_contribution.eligible_amount
|
230
|
+
donation.ratio = new_contribution.ratio
|
231
|
+
donation.pledge = new_contribution.pledge
|
232
|
+
donation.fiscal_year = new_contribution.fiscal_year
|
233
|
+
|
234
|
+
|
235
|
+
if new_contribution.ack_sent_date.present? && ack_action.present?
|
236
|
+
ack_action.occurred_at = new_contribution.ack_sent_date
|
237
|
+
ack_action.subtype = new_contribution.ack_method
|
238
|
+
elsif new_contribution.ack_sent_date.present?
|
239
|
+
ack_action = build_ack_action(order, new_contribution.amount, new_contribution.ack_sent_date, new_contribution.ack_method)
|
240
|
+
end
|
241
|
+
|
98
242
|
ActiveRecord::Base.transaction do
|
99
|
-
|
243
|
+
donation.save
|
244
|
+
item.save if order.editable?
|
100
245
|
order.save
|
246
|
+
ack_action.save if ack_action.present?
|
101
247
|
action.save
|
248
|
+
sc_hash = SoftCredit.update_soft_credits(db_soft_credits, new_contribution.soft_credits, donation.id, @organization_id)
|
249
|
+
SoftCredit.update_sc_actions(new_contribution, order, sc_hash)
|
250
|
+
ScheduledPledgePayment.update_pledge_payments(db_pledge_payments, new_contribution.pledge_payments, donation.organization_id, order.id, donation.id, new_contribution.person_id)
|
251
|
+
pledge_for_matching_gift(new_contribution, order.id).save if !orig_match_eligible && donation.match_eligible && donation.matcher.to_i > 0
|
102
252
|
end
|
103
|
-
|
253
|
+
|
104
254
|
true
|
105
255
|
end
|
106
256
|
|
257
|
+
def pledge_for_matching_gift(contr, order_id)
|
258
|
+
ctb = Contribution.new
|
259
|
+
|
260
|
+
ctb.creator_id = contr.creator_id
|
261
|
+
ctb.amount = contr.eligible_amount
|
262
|
+
ctb.occurred_at = contr.occurred_at
|
263
|
+
ctb.commitment_date = contr.commitment_date
|
264
|
+
ctb.fiscal_year = contr.fiscal_year
|
265
|
+
ctb.person_id = contr.matcher
|
266
|
+
ctb.order_parent_id = order_id
|
267
|
+
ctb.organization_id = contr.organization_id
|
268
|
+
ctb.campaign_id = contr.campaign_id
|
269
|
+
ctb.appeal_id = contr.appeal_id
|
270
|
+
ctb.subtype = 'Monetary'
|
271
|
+
ctb.pledge = true
|
272
|
+
ctb
|
273
|
+
end
|
274
|
+
|
275
|
+
def has_contributor?
|
276
|
+
contributor.present?
|
277
|
+
end
|
278
|
+
|
279
|
+
def receive_pledge(pledge_id, parent_donation)
|
280
|
+
ActiveRecord::Base.transaction do
|
281
|
+
save
|
282
|
+
ScheduledPledgePayment.update(pledge_id, :amount_received => @amount.to_i/100) if pledge_id.to_i > 0
|
283
|
+
Donation.update(parent_donation.id, :received_amount => parent_donation.received_amount.to_i + self.amount.to_i) unless parent_donation.nil?
|
284
|
+
end
|
285
|
+
end
|
286
|
+
|
107
287
|
private
|
108
288
|
|
109
289
|
def load(params)
|
@@ -112,56 +292,141 @@ class Contribution
|
|
112
292
|
@amount = params[:amount]
|
113
293
|
@nongift_amount = params[:nongift_amount]
|
114
294
|
@organization_id = params[:organization_id]
|
295
|
+
@campaign_id = params[:campaign_id]
|
296
|
+
@appeal_id = params[:appeal_id]
|
115
297
|
@occurred_at = ActiveSupport::TimeZone.create(Organization.find(@organization_id).time_zone).parse(params[:occurred_at]) if params[:occurred_at].present?
|
116
|
-
@
|
298
|
+
@notes = params[:notes]
|
117
299
|
@person_id = params[:person_id]
|
118
300
|
@creator_id = params[:creator_id]
|
301
|
+
@check_number = params[:check_number]
|
302
|
+
@commitment_date = ActiveSupport::TimeZone.create(Organization.find(@organization_id).time_zone).parse(params[:commitment_date]) if params[:commitment_date].present?
|
303
|
+
@ack_sent_date = ActiveSupport::TimeZone.create(Organization.find(@organization_id).time_zone).parse(params[:ack_sent_date]) if params[:ack_sent_date].present?
|
304
|
+
@ack_method = params[:ack_method]
|
305
|
+
@match_eligible = params[:match_eligible] == 'true'
|
306
|
+
@matcher = params[:matcher]
|
307
|
+
@eligible_amount = params[:eligible_amount]
|
308
|
+
@matcher_name = Person.find_by_id(@matcher) if @match_eligible && @matcher
|
309
|
+
@ratio = params[:ratio]
|
310
|
+
@first_name = params[:first_name]
|
311
|
+
@last_name = params[:last_name]
|
312
|
+
@email = params[:email]
|
313
|
+
@company_name = params[:company_name]
|
314
|
+
@pledge = params[:pledge] == 'true'
|
315
|
+
@soft_credits = params[:soft_credit] ? SoftCredit.build_soft_credits(params[:soft_credit]) : Array.wrap(SoftCredit.default_soft_credit)
|
316
|
+
@pledge_payments = params[:scheduled_pledge_payment] ? ScheduledPledgePayment.build_pledge_payments(params[:scheduled_pledge_payment]) : Array.wrap(ScheduledPledgePayment.default_pledge_payment)
|
317
|
+
@fiscal_year = params[:fiscal_year]
|
119
318
|
end
|
120
319
|
|
121
320
|
def find_contributor
|
122
321
|
Person.find(@person_id) unless @person_id.blank?
|
123
322
|
end
|
124
323
|
|
324
|
+
def build_donation
|
325
|
+
donation = Donation.new
|
326
|
+
donation.amount = @amount
|
327
|
+
donation.organization_id = @organization_id
|
328
|
+
donation.campaign_id = @campaign_id
|
329
|
+
donation.appeal_id = @appeal_id
|
330
|
+
donation.created_at = @occurred_at
|
331
|
+
donation.commitment_date = @commitment_date
|
332
|
+
donation.ack_sent_date = @ack_sent_date
|
333
|
+
donation.match_eligible = @match_eligible
|
334
|
+
donation.matcher = @matcher
|
335
|
+
donation.eligible_amount = @eligible_amount
|
336
|
+
donation.ratio = @ratio
|
337
|
+
donation.pledge = @pledge
|
338
|
+
donation.fiscal_year = @fiscal_year
|
339
|
+
|
340
|
+
donation
|
341
|
+
end
|
342
|
+
|
125
343
|
def build_action
|
126
|
-
|
127
|
-
action = GiveAction.for_organization(self.organization)
|
344
|
+
action = (@pledge ? PledgeAction : GiveAction).for_organization(self.organization)
|
128
345
|
|
346
|
+
action.person = Person.find(@person_id)
|
347
|
+
action.subject = @order
|
129
348
|
action.occurred_at = @occurred_at
|
130
349
|
action.subtype = @subtype
|
131
|
-
action.details = @details
|
132
|
-
|
133
|
-
action.person = person
|
134
|
-
action.subject = person
|
135
|
-
|
136
350
|
action.creator_id = @creator_id
|
137
|
-
|
351
|
+
|
352
|
+
action.details = action_details(@amount, campaign, @soft_credits, @order.try(:type), @order_parent_id)
|
138
353
|
action
|
139
354
|
end
|
140
355
|
|
141
|
-
def build_order(order_klass = ApplicationOrder)
|
356
|
+
def build_order(order_klass = ApplicationOrder, skip_email = true)
|
142
357
|
attributes = {
|
143
358
|
:person_id => @person_id,
|
144
359
|
:organization_id => @organization_id,
|
145
|
-
:
|
360
|
+
:notes => @notes
|
146
361
|
}
|
147
362
|
|
148
363
|
order = order_klass.new(attributes).tap do |order|
|
149
364
|
order.payment_method = @payment_method
|
365
|
+
order.creator_id = @creator_id
|
366
|
+
order.created_at = @occurred_at
|
150
367
|
order.skip_actions = true
|
151
|
-
order.skip_email =
|
368
|
+
order.skip_email = skip_email
|
369
|
+
order.parent_id = @order_parent_id if @order_parent_id.present?
|
370
|
+
|
371
|
+
if !@pledge
|
372
|
+
order.payment_method = @payment_method
|
373
|
+
if @payment_method == 'Check'
|
374
|
+
order.check_number = @check_number
|
375
|
+
end
|
376
|
+
end
|
377
|
+
|
152
378
|
end
|
153
379
|
end
|
154
380
|
|
155
|
-
def build_item(order, price, nongift_amount = 0)
|
381
|
+
def build_item(order, price, nongift_amount = 0, state = 'settled')
|
156
382
|
nongift_amount ||= 0
|
157
383
|
Item.new({
|
158
384
|
:order_id => order.id,
|
159
385
|
:product_type => "Donation",
|
160
|
-
:state =>
|
386
|
+
:state => state,
|
161
387
|
:price => price,
|
162
388
|
:nongift_amount => nongift_amount,
|
163
389
|
:realized_price => price,
|
164
390
|
:net => price
|
165
391
|
})
|
166
392
|
end
|
167
|
-
|
393
|
+
|
394
|
+
def action_details(amount, campaign, soft_credits, order_type, order_parent_id = 0)
|
395
|
+
details = ''
|
396
|
+
if order_parent_id.to_i > 0
|
397
|
+
parent_order = Order.find(order_parent_id)
|
398
|
+
unless parent_order.nil? || (order_type.eql? 'RefundOrder') || (order_type.eql? 'ConvertOrder')
|
399
|
+
details << "to match " << parent_order.person.to_s << "'s "
|
400
|
+
end
|
401
|
+
end
|
402
|
+
|
403
|
+
details << Contribution.number_as_cents(amount)
|
404
|
+
details << ' for ' << campaign.name if campaign
|
405
|
+
|
406
|
+
sc_person_names = []
|
407
|
+
soft_credits.each do |sc|
|
408
|
+
next if sc.person_id.to_i <= 0
|
409
|
+
sc_person_names << Person.find(sc.person_id)
|
410
|
+
end
|
411
|
+
details << ' (' << sc_person_names.to_sentence << ' received soft credit)' if sc_person_names.any?
|
412
|
+
|
413
|
+
details
|
414
|
+
end
|
415
|
+
|
416
|
+
def build_ack_action(order, amount, ack_sent_date, ack_method)
|
417
|
+
action = HearAction.for_organization(self.organization)
|
418
|
+
|
419
|
+
action.person = order.person
|
420
|
+
action.subject = order
|
421
|
+
action.subtype = ack_method
|
422
|
+
action.occurred_at = ack_sent_date
|
423
|
+
action.creator_id = @creator_id
|
424
|
+
action.details = "Gift acknowledgement sent for #{Contribution.number_as_cents(amount)} #{order.gift_type.downcase}. Order ##{order.id}"
|
425
|
+
action
|
426
|
+
end
|
427
|
+
|
428
|
+
def nongift_is_less_than_total
|
429
|
+
errors.add(:nongift_amount, "^Nondeductible Amount can not exceed Total Gift Amount") if amount.to_i > 0 && nongift_amount.to_i > amount.to_i
|
430
|
+
end
|
431
|
+
|
432
|
+
end
|