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
@@ -0,0 +1,23 @@
|
|
1
|
+
%table.table.table-bordered.table-striped
|
2
|
+
%tr
|
3
|
+
%th Email
|
4
|
+
%th First
|
5
|
+
%th Last
|
6
|
+
%th Date
|
7
|
+
%th Amount
|
8
|
+
%th Type
|
9
|
+
%th Notes
|
10
|
+
%th Fiscal Year
|
11
|
+
|
12
|
+
- rows.each do |row|
|
13
|
+
%tr
|
14
|
+
%td=row.email
|
15
|
+
%td=row.first
|
16
|
+
%td=row.last
|
17
|
+
%td=l(row.donation_date.to_date, :format => '%m/%d/%Y')
|
18
|
+
%td=number_as_cents row.amount
|
19
|
+
%td=row.donation_type
|
20
|
+
%td=row.notes
|
21
|
+
%td=row.fiscal_year
|
22
|
+
-#= will_paginate rows
|
23
|
+
|
@@ -42,6 +42,14 @@
|
|
42
42
|
  Show date must be in one of the following formats
|
43
43
|
=render :partial => "imports/shared/date_format"
|
44
44
|
If you do not include a time, we'll set it to 8pm.
|
45
|
+
%tr
|
46
|
+
%td.field-slim Order Date
|
47
|
+
%td
|
48
|
+
%span.label.label-success
|
49
|
+
Important!
|
50
|
+
  Order date must be in one of the following formats
|
51
|
+
=render :partial => "imports/shared/date_format"
|
52
|
+
You may omit the time.
|
45
53
|
|
46
54
|
%h3 Please include one of the following
|
47
55
|
%p If all of these fields are omitted, the sale will be credited to an anonymous record.
|
@@ -69,14 +77,6 @@
|
|
69
77
|
%span.label.label-success
|
70
78
|
Important!
|
71
79
|
  Include only dollars and cents. Don't include a "$" or other currency symbols.
|
72
|
-
%tr
|
73
|
-
%td.field-slim Order Date
|
74
|
-
%td
|
75
|
-
%span.label.label-success
|
76
|
-
Important!
|
77
|
-
  Show date must be in one of the following formats
|
78
|
-
=render :partial => "imports/shared/date_format"
|
79
|
-
You may omit the time. If you omit the date entirely, the order will be recorded with today's date.
|
80
80
|
%p You can also use all of the field names in People imports.
|
81
81
|
|
82
82
|
.span3
|
@@ -4,28 +4,35 @@
|
|
4
4
|
|
5
5
|
.row
|
6
6
|
|
7
|
-
.
|
7
|
+
.span9
|
8
8
|
.bottom-room
|
9
9
|
%h3 Imports
|
10
10
|
.row-fluid
|
11
|
-
.
|
11
|
+
.span3
|
12
12
|
%h4 People
|
13
13
|
%p Do you have a database of contacts already? Import those contacts into Artful.ly!
|
14
|
-
.
|
14
|
+
.span3
|
15
15
|
%h4 Events
|
16
16
|
%p Import sales from events not ticketed by Artful.ly
|
17
|
-
.
|
17
|
+
.span3
|
18
18
|
%h4 Donations
|
19
19
|
%p Import a list of past donations to your organization.
|
20
|
+
- with_kit(:membership) do
|
21
|
+
.span3
|
22
|
+
%h4 Memberships
|
23
|
+
%p Import past and present memberships.
|
20
24
|
.row-fluid
|
21
|
-
.
|
25
|
+
.span3
|
22
26
|
= link_to "Import People", new_import_path(:type => :people), :class => "btn"
|
23
|
-
.
|
27
|
+
.span3
|
24
28
|
= link_to "Import Events", new_import_path(:type => :events), :class => "btn"
|
25
|
-
.
|
29
|
+
.span3
|
26
30
|
= link_to "Import Donations", new_import_path(:type => :donations), :class => "btn"
|
27
|
-
|
28
|
-
|
31
|
+
- with_kit(:membership) do
|
32
|
+
.span3
|
33
|
+
= link_to "Import Memberships", new_import_path(:type => :memberships), :class => "btn"
|
34
|
+
|
35
|
+
.bottom-room
|
29
36
|
-unless @imports.empty?
|
30
37
|
%h3 Import History
|
31
38
|
%table.table.table-condensed
|
@@ -35,15 +42,13 @@
|
|
35
42
|
%td= import.user.email
|
36
43
|
%td= l import.created_at_local_to_organization, :format => :short
|
37
44
|
%td= import.status.capitalize
|
38
|
-
.
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
="Export from"
|
49
|
-
=link_to("Advanced Search", new_search_path)
|
45
|
+
.span3
|
46
|
+
- if current_user.can? :manage, :export
|
47
|
+
.well{:style => "text-align: center"}
|
48
|
+
%h3 Exports
|
49
|
+
=render :partial => "export_links"
|
50
|
+
%div{:style => 'font-weight:bold; text-align:left; font-size:.9em;'}
|
51
|
+
= "Need something more specific?"
|
52
|
+
%br
|
53
|
+
="Export from"
|
54
|
+
=link_to("Advanced Search", new_advanced_search_path)
|
@@ -0,0 +1,16 @@
|
|
1
|
+
.row
|
2
|
+
.span4
|
3
|
+
%h3 Pending Contacts
|
4
|
+
|
5
|
+
%p This import was created at: <br> #{l import.created_at}
|
6
|
+
|
7
|
+
%p= link_to "Back to imports/exports", imports_path, :class => "btn"
|
8
|
+
|
9
|
+
.span8
|
10
|
+
%h3 This file is waiting to be imported into Artful.ly.
|
11
|
+
|
12
|
+
:javascript
|
13
|
+
|
14
|
+
setTimeout(function () {
|
15
|
+
window.location.reload();
|
16
|
+
}, 5000);
|
@@ -0,0 +1,17 @@
|
|
1
|
+
.row
|
2
|
+
.span4
|
3
|
+
%h3 Importing Memberships
|
4
|
+
|
5
|
+
%p This import was created at: <br> #{l import.created_at}
|
6
|
+
|
7
|
+
%p= link_to "Back to imports/exports", imports_path, :class => "btn"
|
8
|
+
|
9
|
+
.span8
|
10
|
+
%h3 This file is currently being processed by Artful.ly.
|
11
|
+
%p This may take a little while. Thank you for your patience.
|
12
|
+
|
13
|
+
:javascript
|
14
|
+
|
15
|
+
setTimeout(function () {
|
16
|
+
window.location.reload();
|
17
|
+
}, 5000);
|
@@ -0,0 +1,45 @@
|
|
1
|
+
.row
|
2
|
+
.span4
|
3
|
+
%p This import was created at: <br> #{l import.created_at}
|
4
|
+
%p= link_to "Back to imports/exports", imports_path, :class => "btn"
|
5
|
+
|
6
|
+
.span8
|
7
|
+
.well
|
8
|
+
%h3 This file has been imported into Artful.ly.
|
9
|
+
%p="This import file had #{pluralize @import.rows.count, "membership"}."
|
10
|
+
|
11
|
+
-unless @messages.empty?
|
12
|
+
%h4 Merged
|
13
|
+
%p These people already existed, so we merged the records for you.
|
14
|
+
%table.table.table-bordered.table-striped
|
15
|
+
%tr
|
16
|
+
%th{:width => 250} Email
|
17
|
+
%th First
|
18
|
+
%th Last
|
19
|
+
%th
|
20
|
+
- @messages.each_with_index do |message, index|
|
21
|
+
- unless message.person.nil?
|
22
|
+
%tr
|
23
|
+
%td=message.person.email
|
24
|
+
%td=message.person.first_name
|
25
|
+
%td=message.person.last_name
|
26
|
+
%td=icon_link_to "", person_path(message.person), 'fa-share', '', ''
|
27
|
+
= will_paginate @messages, :param_name => 'messages_page'
|
28
|
+
|
29
|
+
- unless @people.empty?
|
30
|
+
%h4 Imported
|
31
|
+
%p These people were imported.
|
32
|
+
%table.table.table-bordered.table-striped
|
33
|
+
%tr
|
34
|
+
%th{:width => 250} Email
|
35
|
+
%th First
|
36
|
+
%th Last
|
37
|
+
%th
|
38
|
+
- @people.each_with_index do |row, index|
|
39
|
+
%tr
|
40
|
+
%td=row.email
|
41
|
+
%td=row.first_name
|
42
|
+
%td=row.last_name
|
43
|
+
%td=icon_link_to "", person_path(row), 'fa-share', '', ''
|
44
|
+
|
45
|
+
= will_paginate @people
|
@@ -0,0 +1,20 @@
|
|
1
|
+
.row
|
2
|
+
|
3
|
+
.span4
|
4
|
+
%h3 Importing Memberships
|
5
|
+
|
6
|
+
%p This import was created at #{@import.created_at}
|
7
|
+
|
8
|
+
%p= link_to "Back to imports/exports", imports_path, :class => "btn"
|
9
|
+
|
10
|
+
.span8
|
11
|
+
|
12
|
+
%h3 This file is being imported into Artful.ly.
|
13
|
+
%p This may take a little while. Thank you for your patience.
|
14
|
+
|
15
|
+
|
16
|
+
:javascript
|
17
|
+
|
18
|
+
setTimeout(function () {
|
19
|
+
window.location.reload();
|
20
|
+
}, 5000);
|
@@ -0,0 +1,155 @@
|
|
1
|
+
- in_section :imports
|
2
|
+
- content_for :header do
|
3
|
+
%h1 Import Memberships
|
4
|
+
|
5
|
+
.row
|
6
|
+
.span3
|
7
|
+
%h2
|
8
|
+
%span.badge.badge-big.badge-info 1
|
9
|
+
Template
|
10
|
+
#{link_to 'Download an empty CSV file', template_imports_path(:type => "memberships")} with these headers already filled in.
|
11
|
+
|
12
|
+
.span6
|
13
|
+
%h2
|
14
|
+
%span.badge.badge-big.badge-info 2
|
15
|
+
Format
|
16
|
+
%h3 Required Fields
|
17
|
+
.bottom-room= render :partial => "imports/shared/knowledge_base"
|
18
|
+
|
19
|
+
%h3 Each of these fields...
|
20
|
+
%table.table.table-bordered.table-striped.docs
|
21
|
+
%tr
|
22
|
+
%td.field-slim Email
|
23
|
+
%td="The email address of the person. People in Artful.ly have unique email addresses, so if you're importing an email address that has already been assigned to a person, we'll merge the data for you. #{link_to "Read more", "#merging", {'data-toggle' => 'modal'}}".html_safe
|
24
|
+
%tr
|
25
|
+
%td.field-slim Membership Name
|
26
|
+
%td The name of the membership.
|
27
|
+
%tr
|
28
|
+
%td.field-slim Membership Type
|
29
|
+
%td
|
30
|
+
%p Seasonal memberships have a fixed end date. Rolling memberships are monthly/yearly/etc.
|
31
|
+
%span.label.label-success
|
32
|
+
Important!
|
33
|
+
  Valid options are:
|
34
|
+
%br
|
35
|
+
%br
|
36
|
+
%strong Seasonal, Rolling
|
37
|
+
|
38
|
+
%tr
|
39
|
+
%td.field-slim Start Date
|
40
|
+
%td
|
41
|
+
%i For seasonal and rolling memberships.
|
42
|
+
Start date must be in one of the following formats:
|
43
|
+
|
44
|
+
=render :partial => "imports/shared/date_format"
|
45
|
+
You may omit the time.
|
46
|
+
|
47
|
+
%tr
|
48
|
+
%td.field-slim End Date
|
49
|
+
%td
|
50
|
+
%i For seasonal memberships only.
|
51
|
+
End date must be in one of the following formats:
|
52
|
+
=render :partial => "imports/shared/date_format"
|
53
|
+
You may omit the time.
|
54
|
+
|
55
|
+
|
56
|
+
%tr
|
57
|
+
%td.field-slim Duration
|
58
|
+
%td
|
59
|
+
%i For rolling memberships only.
|
60
|
+
The number of periods the membership type covers.
|
61
|
+
|
62
|
+
%tr
|
63
|
+
%td.field-slim Period
|
64
|
+
%td
|
65
|
+
%i For rolling memberships only.
|
66
|
+
The membership period.
|
67
|
+
|
68
|
+
%br
|
69
|
+
%br
|
70
|
+
|
71
|
+
%span.label.label-success
|
72
|
+
Important!
|
73
|
+
  Valid options are:
|
74
|
+
%br
|
75
|
+
%br
|
76
|
+
%strong Months, Years
|
77
|
+
%tr
|
78
|
+
%td.field-slim Price Paid
|
79
|
+
%td
|
80
|
+
%span.label.label-success
|
81
|
+
Important!
|
82
|
+
  Include only dollars and cents. Don't include a "$" or other currency symbols.
|
83
|
+
%tr
|
84
|
+
%td.field-slim Payment Method
|
85
|
+
%td
|
86
|
+
%span.label.label-success
|
87
|
+
Important!
|
88
|
+
  Valid options are:
|
89
|
+
%br
|
90
|
+
%br
|
91
|
+
%b Cash, Credit card, Check, Comp, Other, Unknown.
|
92
|
+
|
93
|
+
%h3 Optional Fields
|
94
|
+
%table.table.table-bordered.table-striped.docs
|
95
|
+
%tr
|
96
|
+
%td.field-slim First Name
|
97
|
+
%td The first name of the person.
|
98
|
+
%tr
|
99
|
+
%td.field-slim Last Name
|
100
|
+
%td The last name of the person.
|
101
|
+
%tr
|
102
|
+
%td.field-slim Company Name
|
103
|
+
%td
|
104
|
+
If this is a company record, the name of the company. Otherwise,
|
105
|
+
it's the name of the company that the person works for.
|
106
|
+
%tr
|
107
|
+
%td.field-slim Order Date
|
108
|
+
%td
|
109
|
+
%span.label.label-success
|
110
|
+
Important!
|
111
|
+
  Order date must be in one of the following formats
|
112
|
+
=render :partial => "imports/shared/date_format"
|
113
|
+
You may omit the time. If you omit the date entirely, the order will be recorded with today's date.
|
114
|
+
|
115
|
+
.alert.alert-info
|
116
|
+
%strong Tip!
|
117
|
+
You can also use all of the field names in People imports.
|
118
|
+
|
119
|
+
.span3
|
120
|
+
%h2
|
121
|
+
%span.badge.badge-big.badge-info 3
|
122
|
+
Upload
|
123
|
+
%p
|
124
|
+
Please only upload
|
125
|
+
%b Comma Separated Values (CSV)
|
126
|
+
files. We cannot process
|
127
|
+
%b XLS
|
128
|
+
or
|
129
|
+
%b XLSX
|
130
|
+
files.
|
131
|
+
%p
|
132
|
+
= render :partial => "shared/error_messages", :locals => { :target => @import }
|
133
|
+
= raw s3_http_upload_tag :key => "imports/#{UUID.new.generate}",
|
134
|
+
:content_type => "text/csv",
|
135
|
+
:redirect => new_import_url,
|
136
|
+
:acl => "public-read",
|
137
|
+
:max_filesize => 50.megabytes,
|
138
|
+
:submit_button => '<input type="hidden" value="people"/><div class="cancel-submit"><input id="import_submit" class="btn" name="commit" type="submit" value="Import"></div>'
|
139
|
+
|
140
|
+
#merging.modal
|
141
|
+
.modal-header
|
142
|
+
.close{'data-dismiss'=>'modal'} x
|
143
|
+
%h3 Merging People
|
144
|
+
.modal-body
|
145
|
+
%p
|
146
|
+
If you're importing a record whose email address already exists in Artful.ly, Artful.ly will record the new information only when it does not exist already in Artful.ly. New data will not overwrite existing data.
|
147
|
+
%p
|
148
|
+
For example, consider that jim@example.com is in Artful.ly with a first name of Jim but no last name. If you import a file with jim@example.com in it, and a first name of Bill and a last name of Smith, the merged record will be:
|
149
|
+
%p
|
150
|
+
%ul
|
151
|
+
%li Email: jim@example.com
|
152
|
+
%li First: Jim
|
153
|
+
%li Last: Smith
|
154
|
+
.modal-footer
|
155
|
+
%button.btn.btn-success{'data-dismiss'=>'modal'} OK
|
@@ -0,0 +1,85 @@
|
|
1
|
+
.row
|
2
|
+
.span3
|
3
|
+
%h2= t(".heading", :default => "Import")
|
4
|
+
|
5
|
+
%p
|
6
|
+
%span.label.label-info Created
|
7
|
+
%span.muted= import.created_at.strftime('%b %d, %Y %l:%M%P')
|
8
|
+
|
9
|
+
%p To discard this import and start over, click "Delete"
|
10
|
+
%p To pause this import and come back later, click "Back"
|
11
|
+
|
12
|
+
.btn-group
|
13
|
+
= icon_link_to "Back", new_import_path(:type => import.kind), 'fa-share', 'btn', ''
|
14
|
+
= link_to "Delete", import_path(import), :data => {:confirm => "Are you sure you want to delete this import?"}, :method => :delete, :class => "btn btn-danger"
|
15
|
+
|
16
|
+
.span9
|
17
|
+
.row-fluid
|
18
|
+
%h2 New Membership Types
|
19
|
+
%p.lead These are new and will be added to your account.
|
20
|
+
|
21
|
+
- if import.new_membership_types.blank?
|
22
|
+
.well
|
23
|
+
%h5.text-center.muted - None -
|
24
|
+
- else
|
25
|
+
%table.table.table-bordered.table-hover
|
26
|
+
%tr
|
27
|
+
%th.span4 Name
|
28
|
+
%th.span3 Type
|
29
|
+
%th.span2 # of Members
|
30
|
+
%th
|
31
|
+
|
32
|
+
- import.new_membership_types.each do |new_type|
|
33
|
+
%tr
|
34
|
+
%td
|
35
|
+
= new_type.membership_name
|
36
|
+
%td
|
37
|
+
= new_type.membership_type
|
38
|
+
%td
|
39
|
+
%span.badge.badge-info= new_type.member_count
|
40
|
+
%td
|
41
|
+
= link_to 'Preview', import_preview_rows_path(@import, :membership_name => new_type.membership_name), :class => 'btn btn-small btn-success'
|
42
|
+
|
43
|
+
.row-fluid
|
44
|
+
%h2 Existing Membership Types
|
45
|
+
%p.lead These already exist and will have new members added.
|
46
|
+
|
47
|
+
- if import.existing_membership_types.blank?
|
48
|
+
.well
|
49
|
+
%h5.text-center.muted - None -
|
50
|
+
- else
|
51
|
+
%table.table.table-bordered.table-hover
|
52
|
+
%tr
|
53
|
+
%th.span4 Name
|
54
|
+
%th.span3 Type
|
55
|
+
%th.span2 # of Members
|
56
|
+
%th
|
57
|
+
|
58
|
+
- import.existing_membership_types.each do |existing_type|
|
59
|
+
%tr
|
60
|
+
%td
|
61
|
+
= existing_type.membership_name
|
62
|
+
%td
|
63
|
+
= existing_type.membership_type
|
64
|
+
%td
|
65
|
+
%span.badge.badge-info= existing_type.member_count
|
66
|
+
%td
|
67
|
+
= link_to 'Preview', import_preview_rows_path(@import, :membership_name => existing_type.membership_name), :class => 'btn btn-small btn-success'
|
68
|
+
|
69
|
+
.row-fluid
|
70
|
+
.page-header
|
71
|
+
%h3
|
72
|
+
This import is pending your approval
|
73
|
+
|
74
|
+
.alert.alert-block
|
75
|
+
%button.close{:data => 'dismiss-alert'} ×
|
76
|
+
%strong Important:
|
77
|
+
Review the details of this import using the "Preview" buttons above. This import cannot be undone later.
|
78
|
+
|
79
|
+
%br
|
80
|
+
|
81
|
+
%p.muted Click "Approve" to import into Artful.ly
|
82
|
+
%p
|
83
|
+
= link_to approve_import_path(import), :data => {:confirm => "Are you sure you want to approve this import?"}, :class => "btn btn-large", :disabled => true do
|
84
|
+
%i.fa.fa-thumbs-up
|
85
|
+
Approve
|