artfully_ose 1.2.0.beta.1 → 1.2.0.pre
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +9 -9
- data/app/assets/fonts/FontAwesome.otf +0 -0
- data/app/assets/fonts/fontawesome-webfont.eot +0 -0
- data/app/assets/fonts/fontawesome-webfont.svg +252 -472
- data/app/assets/fonts/fontawesome-webfont.ttf +0 -0
- data/app/assets/fonts/fontawesome-webfont.woff +0 -0
- data/app/assets/images/person-default-avatar.psd +0 -0
- data/app/assets/javascripts/application.js +10 -163
- data/app/assets/javascripts/box-office.js +262 -0
- data/app/assets/javascripts/custom/inline-people-search.js +40 -40
- data/app/assets/javascripts/custom/people.js +5 -68
- data/app/assets/javascripts/custom/prices.js +0 -1
- data/app/assets/javascripts/custom/show.js +8 -18
- data/app/assets/javascripts/jquery-lib/jquery.mask-money.js +0 -1
- data/app/assets/javascripts/locationselector.js +1 -1
- data/app/assets/javascripts/store/jquery.validate.additional-methods.js +159 -476
- data/app/assets/javascripts/store/jquery.validate.js +406 -449
- data/app/assets/javascripts/store/store.js +5 -29
- data/app/assets/stylesheets/application.sass +60 -223
- data/app/assets/stylesheets/bootstrap-overrides.css +3 -13
- data/app/assets/stylesheets/bootstrap.css +0 -1
- data/app/assets/stylesheets/font-awesome.sass +759 -0
- data/app/assets/stylesheets/sass/_event_list.sass +1 -12
- data/app/assets/stylesheets/sass/_tags.sass +2 -13
- data/app/assets/stylesheets/sass/box-office.sass +1 -2
- data/app/assets/stylesheets/sass/cart.sass +6 -0
- data/app/assets/stylesheets/sass/store.sass +68 -123
- data/app/assets/stylesheets/storefront.css +1 -2
- data/app/concerns/itemable.rb +1 -1
- data/app/controllers/artfully_ose_controller.rb +7 -29
- data/app/controllers/discounts_controller.rb +1 -8
- data/app/controllers/events_controller.rb +33 -41
- data/app/controllers/exchanges_controller.rb +2 -8
- data/app/controllers/export_controller.rb +0 -6
- data/app/controllers/imports_controller.rb +0 -19
- data/app/controllers/members/index_controller.rb +1 -1
- data/app/controllers/members/members_controller.rb +1 -6
- data/app/controllers/membership_awards_controller.rb +58 -0
- data/app/controllers/membership_types_controller.rb +3 -40
- data/app/controllers/memberships_controller.rb +4 -6
- data/app/controllers/orders_controller.rb +2 -86
- data/app/controllers/organizations_controller.rb +3 -4
- data/app/controllers/people_controller.rb +23 -54
- data/app/controllers/refunds_controller.rb +7 -7
- data/app/controllers/sales_controller.rb +28 -67
- data/app/controllers/searches_controller.rb +9 -15
- data/app/controllers/sections_controller.rb +2 -2
- data/app/controllers/segments_controller.rb +4 -4
- data/app/controllers/shows_controller.rb +49 -79
- data/app/controllers/slices_controller.rb +2 -3
- data/app/controllers/statements_controller.rb +1 -1
- data/app/controllers/store/checkouts_controller.rb +3 -8
- data/app/controllers/store/donations_controller.rb +1 -19
- data/app/controllers/store/events_controller.rb +1 -14
- data/app/controllers/store/memberships_controller.rb +1 -12
- data/app/controllers/store/orders_controller.rb +17 -36
- data/app/controllers/store/passes_controller.rb +0 -9
- data/app/controllers/store/store_controller.rb +2 -7
- data/app/controllers/tickets_controller.rb +2 -2
- data/app/helpers/artfully_ose_helper.rb +21 -79
- data/app/helpers/link_helper.rb +2 -12
- data/app/mailers/order_mailer.rb +1 -28
- data/app/mailers/reports_mailer.rb +4 -5
- data/app/models/ability.rb +0 -1
- data/app/models/action.rb +1 -1
- data/app/models/actions/go_action.rb +2 -3
- data/app/{concerns → models/actions}/immutable_action.rb +0 -0
- data/app/models/address.rb +11 -32
- data/app/models/{cart.rb → carts/cart.rb} +37 -46
- data/app/models/carts/cart_finder.rb +33 -0
- data/app/models/checkout.rb +41 -85
- data/app/models/comp.rb +17 -24
- data/app/models/company.rb +1 -1
- data/app/models/contribution.rb +0 -1
- data/app/models/database_views/item_view.rb +28 -169
- data/app/models/database_views/order_view.rb +34 -0
- data/app/models/donation.rb +0 -4
- data/app/models/door_list.rb +3 -6
- data/app/models/event.rb +10 -60
- data/app/models/exchange.rb +5 -7
- data/app/models/{ext.rb → ext/ext.rb} +1 -14
- data/app/models/ext/integrations.rb +21 -39
- data/app/models/fee_strategy.rb +1 -47
- data/app/models/import.rb +2 -22
- data/app/models/imports/donations_import.rb +19 -1
- data/app/models/imports/events_import.rb +51 -43
- data/app/models/individual.rb +1 -3
- data/app/models/item.rb +11 -28
- data/app/models/job/daily_email_report_job.rb +6 -20
- data/app/models/job/mailchimp_sync_job.rb +3 -1
- data/app/models/job/order_processor.rb +12 -78
- data/app/models/job/show_creator.rb +3 -8
- data/app/models/kit.rb +4 -2
- data/app/models/kits/mailchimp_kit.rb +10 -18
- data/app/models/kits/regular_donation_kit.rb +8 -38
- data/app/models/member.rb +17 -152
- data/app/models/membership.rb +23 -59
- data/app/models/membership_award.rb +23 -0
- data/app/models/membership_type.rb +2 -44
- data/app/models/note.rb +1 -1
- data/app/models/order_handler.rb +39 -100
- data/app/models/orders/comp_order.rb +0 -4
- data/app/models/orders/imported_order.rb +0 -4
- data/app/models/{order.rb → orders/order.rb} +18 -113
- data/app/models/orders/refund_order.rb +0 -4
- data/app/{concerns → models/orders}/unrefundable.rb +0 -0
- data/app/models/organization.rb +15 -55
- data/app/models/organization_ability.rb +0 -1
- data/app/models/parsed_row.rb +3 -58
- data/app/models/payments/cash_payment.rb +1 -3
- data/app/models/payments/comp_payment.rb +1 -3
- data/app/models/payments/credit_card_payment.rb +23 -44
- data/app/models/{payment.rb → payments/payment.rb} +1 -29
- data/app/models/person.rb +36 -140
- data/app/models/phone.rb +8 -0
- data/app/models/refund.rb +2 -5
- data/app/models/sale.rb +10 -14
- data/app/models/sale_search.rb +21 -3
- data/app/models/search.rb +67 -320
- data/app/models/section.rb +2 -18
- data/app/models/show.rb +20 -67
- data/app/models/slices.rb +8 -25
- data/app/models/statement.rb +5 -32
- data/app/models/ticket.rb +15 -50
- data/app/models/ticket/locker.rb +1 -2
- data/app/models/ticket/pricing.rb +1 -11
- data/app/models/ticket/reports.rb +0 -16
- data/app/models/ticket/sale_transitions.rb +0 -4
- data/app/models/ticket/template.rb +0 -1
- data/app/models/ticket/transfers.rb +2 -12
- data/app/models/ticket_summary.rb +1 -7
- data/app/models/ticket_type.rb +7 -59
- data/app/models/user.rb +5 -18
- data/app/models/user_membership.rb +3 -21
- data/app/models/valuation/lifetime_ticket_value.rb +1 -1
- data/app/models/venue.rb +7 -21
- data/app/presenters/event_presenter.rb +1 -1
- data/app/views/actions/_form.html.haml +6 -6
- data/app/views/actions/get/_show.html.haml +13 -2
- data/app/views/actions/give/_show.html.haml +1 -1
- data/app/views/actions/shared/_show.html.haml +1 -1
- data/app/views/addresses/_address.html.haml +6 -7
- data/app/views/contributions/_form.html.haml +1 -1
- data/app/views/contributions/index.html.haml +2 -2
- data/app/views/discounts/_discount_section_fields.html.haml +1 -1
- data/app/views/discounts/_form.html.haml +1 -1
- data/app/views/discounts/index.html.haml +1 -1
- data/app/views/events/_day_date_show.html.haml +2 -2
- data/app/views/events/_discount_section_fields.html.haml +1 -1
- data/app/views/events/_header.html.haml +0 -1
- data/app/views/events/_list.html.haml +5 -10
- data/app/views/events/_menu.html.haml +15 -6
- data/app/views/events/_section_fields.html.haml +1 -1
- data/app/views/events/_share_and_sell.haml +2 -3
- data/app/views/events/_ticket_type_fields.html.haml +4 -43
- data/app/views/events/edit.html.haml +1 -6
- data/app/views/events/image.html.haml +1 -2
- data/app/views/events/index.html.haml +3 -20
- data/app/views/events/show.html.haml +1 -3
- data/app/views/events/temp_discount_form.html.haml +1 -1
- data/app/views/events/temp_discounts_index.html.haml +1 -1
- data/app/views/exchanges/new.html.haml +28 -51
- data/app/views/imports/donations/_pending.html.haml +1 -1
- data/app/views/imports/events/_pending.html.haml +1 -1
- data/app/views/imports/index.html.haml +3 -6
- data/app/views/imports/people/_imported.html.haml +2 -2
- data/app/views/imports/people/_new.html.haml +8 -20
- data/app/views/imports/people/_pending.html.haml +2 -2
- data/app/views/imports/people/_recalled.html.haml +1 -1
- data/app/views/imports/shared/_sidebar.html.haml +1 -1
- data/app/views/index/dashboard.html.haml +4 -4
- data/app/views/layouts/_flash.html.haml +3 -3
- data/app/views/layouts/_google_analytics.html.haml +2 -5
- data/app/views/layouts/_menu.html.haml +5 -9
- data/app/views/layouts/application.html.haml +2 -2
- data/app/views/layouts/devise_layout.html.haml +2 -2
- data/app/views/layouts/members.html.haml +1 -1
- data/app/views/layouts/storefront.html.haml +15 -27
- data/app/views/members/index/index.html.haml +13 -7
- data/app/views/membership_awards/confirm.html.haml +59 -0
- data/app/views/membership_awards/create.html.haml +1 -0
- data/app/views/membership_awards/new.html.haml +74 -0
- data/app/views/membership_types/_form.html.haml +19 -67
- data/app/views/membership_types/index.html.haml +14 -15
- data/app/views/memberships/index.html.haml +50 -116
- data/app/views/merges/find_person.html.haml +1 -1
- data/app/views/notes/_note.html.haml +4 -4
- data/app/views/order_mailer/confirmation_for.html.haml +21 -33
- data/app/views/order_mailer/confirmation_for.text.haml +3 -6
- data/app/views/orders/_item_table.haml +8 -25
- data/app/views/orders/_order_sidebar.html.haml +4 -2
- data/app/views/orders/sales.html.haml +3 -3
- data/app/views/organizations/_connection_form.html.haml +1 -1
- data/app/views/organizations/_form.html.haml +20 -25
- data/app/views/organizations/edit.html.haml +2 -2
- data/app/views/organizations/show.html.haml +16 -22
- data/app/views/people/_edit_modal.html.haml +28 -48
- data/app/views/people/_header.html.haml +9 -18
- data/app/views/people/_phone_fields.html.haml +1 -1
- data/app/views/people/index.html.haml +6 -18
- data/app/views/people/new.html.haml +1 -1
- data/app/views/people/show.html.haml +24 -71
- data/app/views/refunds/new.html.haml +27 -45
- data/app/views/reports_mailer/daily.html.haml +21 -86
- data/app/views/sales/new.html.haml +125 -33
- data/app/views/searches/_form.html.haml +50 -115
- data/app/views/searches/_person.html.haml +2 -5
- data/app/views/searches/new.html.haml +1 -1
- data/app/views/searches/show.html.haml +6 -17
- data/app/views/segments/show.html.haml +4 -7
- data/app/views/shared/_error_messages.html.haml +1 -1
- data/app/views/shared/_tags.html.haml +2 -2
- data/app/views/shows/_controls.html.haml +20 -4
- data/app/views/shows/_glance.html.haml +5 -1
- data/app/views/shows/_sections_table.html.haml +6 -8
- data/app/views/shows/_ticket_table.html.haml +3 -3
- data/app/views/shows/_work_with.html.haml +5 -5
- data/app/views/shows/door_list.html.haml +2 -2
- data/app/views/shows/index.html.haml +19 -88
- data/app/views/shows/new.html.haml +11 -10
- data/app/views/shows/show.html.haml +2 -2
- data/app/views/slices/index.html.haml +1 -2
- data/app/views/statements/_discounts_table.html.haml +1 -1
- data/app/views/statements/_order_location_table.html.haml +1 -1
- data/app/views/statements/_payment_method_table.haml +1 -1
- data/app/views/statements/_ticket_type_table.haml +2 -5
- data/app/views/statements/show.html.haml +2 -5
- data/app/views/store/checkouts/thanks.html.haml +16 -38
- data/app/views/store/donations/index.html.haml +2 -19
- data/app/views/store/events/_calendar.html.haml +4 -1
- data/app/views/store/events/index.html.haml +4 -11
- data/app/views/store/events/show.html.haml +19 -10
- data/app/views/store/memberships/index.html.haml +17 -17
- data/app/views/store/orders/show.html.haml +22 -33
- data/app/views/store/shared/_donate_form.html.haml +12 -31
- data/app/views/store/shows/_show.html.haml +29 -37
- data/app/views/user_memberships/_list.html.haml +29 -28
- data/app/views/users/invitations/edit.html.haml +9 -19
- data/app/views/users/mailer/invitation_instructions.html.erb +8 -0
- data/app/views/users/passwords/edit.html.haml +2 -2
- data/app/views/users/registrations/edit.html.erb +3 -3
- data/app/views/users/sessions/new.html.haml +2 -2
- data/app/views/venues/edit.html.haml +1 -3
- data/config/initializers/devise.rb +5 -2
- data/config/locales/devise.en.yml +1 -1
- data/config/locales/devise_invitable.en.yml +1 -1
- data/config/locales/en.yml +3 -18
- data/config/routes.rb +12 -101
- data/lib/artfully_ose.rb +4 -6
- data/lib/artfully_ose/common_abilities.rb +2 -8
- data/lib/artfully_ose/engine.rb +10 -34
- data/lib/artfully_ose/version.rb +1 -1
- metadata +45 -349
- data/README.md +0 -28
- data/app/assets/images/household-default-avatar.png +0 -0
- data/app/assets/javascripts/angular-resource.js +0 -546
- data/app/assets/javascripts/angular.js +0 -20311
- data/app/assets/javascripts/bootstrap-wysihtml5.js +0 -511
- data/app/assets/javascripts/boxoffice.js +0 -558
- data/app/assets/javascripts/change-membership.js +0 -152
- data/app/assets/javascripts/custom/kits-config.js +0 -33
- data/app/assets/javascripts/households.js +0 -59
- data/app/assets/javascripts/jquery-migrate-1.2.1.min.js +0 -2
- data/app/assets/javascripts/relationships.js +0 -63
- data/app/assets/javascripts/sales-console.js +0 -158
- data/app/assets/javascripts/wysihtml5-0.3.0.min.js +0 -261
- data/app/assets/stylesheets/bootstrap-wysihtml5.css +0 -102
- data/app/assets/stylesheets/boxoffice.css.scss +0 -258
- data/app/assets/stylesheets/font-awesome.css.scss +0 -1566
- data/app/assets/stylesheets/pages/bootstrap-responsive.css +0 -1109
- data/app/assets/stylesheets/wysiwyg-color.css +0 -67
- data/app/concerns/cart_finder.rb +0 -50
- data/app/concerns/pdf_generation.rb +0 -64
- data/app/concerns/search_by_dates.rb +0 -20
- data/app/controllers/console_sales_controller.rb +0 -182
- data/app/controllers/events_pass_types_controller.rb +0 -87
- data/app/controllers/households_controller.rb +0 -71
- data/app/controllers/member_cards_controller.rb +0 -44
- data/app/controllers/members/invitations_controller.rb +0 -7
- data/app/controllers/members/passwords_controller.rb +0 -10
- data/app/controllers/members/people_controller.rb +0 -17
- data/app/controllers/members/sessions_controller.rb +0 -14
- data/app/controllers/membership_cancellations_controller.rb +0 -46
- data/app/controllers/membership_changes_controller.rb +0 -39
- data/app/controllers/membership_comps_controller.rb +0 -102
- data/app/controllers/membership_kits_controller.rb +0 -25
- data/app/controllers/mobile/dashboard_controller.rb +0 -17
- data/app/controllers/mobile/events_controller.rb +0 -16
- data/app/controllers/mobile/orders_controller.rb +0 -61
- data/app/controllers/mobile/shows_controller.rb +0 -39
- data/app/controllers/mobile/tickets_controller.rb +0 -114
- data/app/controllers/mobile/users_controller.rb +0 -30
- data/app/controllers/pass_types_controller.rb +0 -53
- data/app/controllers/passes_controller.rb +0 -52
- data/app/controllers/passes_kits_controller.rb +0 -25
- data/app/controllers/passes_reports_controller.rb +0 -25
- data/app/controllers/regular_donation_kits_controller.rb +0 -32
- data/app/controllers/relationships_controller.rb +0 -15
- data/app/controllers/store/retrievals_controller.rb +0 -29
- data/app/controllers/users/sessions_controller.rb +0 -3
- data/app/helpers/households_helper.rb +0 -7
- data/app/helpers/membership_types_helper.rb +0 -22
- data/app/helpers/relationships_helper.rb +0 -26
- data/app/helpers/sales_helper.rb +0 -29
- data/app/helpers/searches_helper.rb +0 -13
- data/app/helpers/suggested_households_helper.rb +0 -5
- data/app/mailers/pass_mailer.rb +0 -17
- data/app/models/actions/change_action.rb +0 -13
- data/app/models/actions/comp_action.rb +0 -15
- data/app/models/console_sale.rb +0 -30
- data/app/models/daily_membership_report.rb +0 -50
- data/app/models/daily_pass_report.rb +0 -48
- data/app/models/events_pass_type.rb +0 -18
- data/app/models/ext/preprocessor.rb +0 -7
- data/app/models/extendable.rb +0 -6
- data/app/models/household.rb +0 -61
- data/app/models/household_suggester.rb +0 -58
- data/app/models/imports/memberships_import.rb +0 -43
- data/app/models/job/checkout_processor.rb +0 -46
- data/app/models/job/cleanup_suggested_households_job.rb +0 -17
- data/app/models/job/destroy_show_job.rb +0 -10
- data/app/models/job/geocode_address_job.rb +0 -11
- data/app/models/job/order_mailer_job.rb +0 -8
- data/app/models/job/refund_order_processor.rb +0 -16
- data/app/models/kits/membership_kit.rb +0 -62
- data/app/models/kits/passes_kit.rb +0 -62
- data/app/models/kits/scannable_tickets_kit.rb +0 -23
- data/app/models/member_card_generator.rb +0 -63
- data/app/models/member_walkup.rb +0 -150
- data/app/models/membership_cancellation.rb +0 -80
- data/app/models/membership_change.rb +0 -187
- data/app/models/membership_comp.rb +0 -105
- data/app/models/membership_comp_job.rb +0 -32
- data/app/models/membership_sale_search.rb +0 -18
- data/app/models/pass.rb +0 -197
- data/app/models/pass_sale_search.rb +0 -18
- data/app/models/pass_summary.rb +0 -18
- data/app/models/pass_type.rb +0 -46
- data/app/models/passes_report.rb +0 -117
- data/app/models/payments/check_payment.rb +0 -33
- data/app/models/relation.rb +0 -27
- data/app/models/relation_builder.rb +0 -32
- data/app/models/relationship.rb +0 -55
- data/app/models/relationship_builder.rb +0 -12
- data/app/models/relationship_validator.rb +0 -46
- data/app/models/relationships_kit.rb +0 -31
- data/app/models/rolling_membership_type.rb +0 -11
- data/app/models/seasonal_membership_type.rb +0 -3
- data/app/models/suggested_household.rb +0 -24
- data/app/models/ticket/qr_code.rb +0 -21
- data/app/models/valuation/lifetime_memberships.rb +0 -24
- data/app/serializers/show_serializer.rb +0 -15
- data/app/views/console_sales/_aloha.html.haml +0 -26
- data/app/views/console_sales/_cart.html.haml +0 -60
- data/app/views/console_sales/_payment.html.haml +0 -111
- data/app/views/console_sales/_shows.html.haml +0 -24
- data/app/views/console_sales/new.html.haml +0 -143
- data/app/views/events_pass_types/_form.html.haml +0 -42
- data/app/views/events_pass_types/edit.html.haml +0 -22
- data/app/views/events_pass_types/index.html.haml +0 -47
- data/app/views/events_pass_types/new.html.haml +0 -22
- data/app/views/households/_action.html.haml +0 -24
- data/app/views/households/_edit_modal.html.haml +0 -143
- data/app/views/households/_form.html.haml +0 -26
- data/app/views/households/_header.html.haml +0 -25
- data/app/views/households/_individual_fields.html.haml +0 -8
- data/app/views/households/_list.html.haml +0 -10
- data/app/views/households/_note.html.haml +0 -33
- data/app/views/households/edit.html.haml +0 -1
- data/app/views/households/index.html.haml +0 -13
- data/app/views/households/new.html.haml +0 -14
- data/app/views/households/show.html.haml +0 -72
- data/app/views/households/suggested.html.haml +0 -38
- data/app/views/imports/_export_links.html.haml +0 -3
- data/app/views/kits/_list.html.haml +0 -9
- data/app/views/members/invitations/edit.html.haml +0 -17
- data/app/views/members/invitations/new.html.erb +0 -14
- data/app/views/members/mailer/_invitation_body.html.haml +0 -18
- data/app/views/members/mailer/invitation_instructions.html.haml +0 -6
- data/app/views/members/mailer/reset_password_instructions.html.erb +0 -8
- data/app/views/members/passwords/edit.html.haml +0 -18
- data/app/views/members/sessions/new.html.haml +0 -19
- data/app/views/membership_cancellations/_form.html.haml +0 -39
- data/app/views/membership_cancellations/_modal.html.haml +0 -2
- data/app/views/membership_cancellations/_processing.html.haml +0 -12
- data/app/views/membership_cancellations/create.js.erb +0 -3
- data/app/views/membership_cancellations/new.js.erb +0 -3
- data/app/views/membership_comps/confirm.html.haml +0 -86
- data/app/views/membership_comps/create.html.haml +0 -20
- data/app/views/membership_comps/new.html.haml +0 -95
- data/app/views/membership_kits/edit.html.haml +0 -52
- data/app/views/membership_mailer/cancellation_confirmation.html.haml +0 -9
- data/app/views/membership_mailer/cancellation_confirmation.text.haml +0 -6
- data/app/views/membership_mailer/refund_problem.html.haml +0 -18
- data/app/views/membership_mailer/refund_problem.text.haml +0 -14
- data/app/views/membership_types/_membership_type_fees.html.haml +0 -0
- data/app/views/membership_types/_rolling_membership_type_form.html.haml +0 -5
- data/app/views/membership_types/_seasonal_membership_type_form.html.haml +0 -8
- data/app/views/membership_types/type.html.haml +0 -19
- data/app/views/memberships/_membership_scripts.js.erb +0 -15
- data/app/views/order_mailer/confirmation_for_exchange.html.haml +0 -34
- data/app/views/order_mailer/confirmation_for_exchange.text.haml +0 -26
- data/app/views/order_mailer/confirmation_for_refund.html.haml +0 -36
- data/app/views/order_mailer/confirmation_for_refund.text.haml +0 -22
- data/app/views/orders/membership.html.haml +0 -100
- data/app/views/orders/passes.html.haml +0 -97
- data/app/views/pass_mailer/pass_info_for.html.haml +0 -21
- data/app/views/pass_types/_form.html.haml +0 -76
- data/app/views/pass_types/_pass_type_fees.html.haml +0 -0
- data/app/views/pass_types/edit.html.haml +0 -4
- data/app/views/pass_types/index.html.haml +0 -34
- data/app/views/pass_types/new.html.haml +0 -4
- data/app/views/passes/index.html.haml +0 -108
- data/app/views/passes_kits/edit.html.haml +0 -30
- data/app/views/passes_reports/index.html.haml +0 -80
- data/app/views/pdfs/member.html.haml +0 -66
- data/app/views/pdfs/member_card_generator/blanks_usa_idc6.html.haml +0 -109
- data/app/views/pdfs/order.html.haml +0 -84
- data/app/views/people/_household_fields.html.haml +0 -5
- data/app/views/people/_relationship_fields.html.haml +0 -14
- data/app/views/people/_work_with_menu.html.haml +0 -39
- data/app/views/producer_mailer/donation_kit_notification.html.haml +0 -8
- data/app/views/producer_mailer/donation_kit_notification.text.erb +0 -8
- data/app/views/producer_mailer/mailchimp_kit_initial_sync_notification.html.haml +0 -21
- data/app/views/producer_mailer/ticket_offer_accepted.html.haml +0 -7
- data/app/views/producer_mailer/ticket_offer_accepted.text.erb +0 -7
- data/app/views/producer_mailer/ticket_offer_rejected.html.haml +0 -11
- data/app/views/producer_mailer/ticket_offer_rejected.text.erb +0 -13
- data/app/views/regular_donation_kits/edit.html.haml +0 -140
- data/app/views/relationships/index.html.haml +0 -32
- data/app/views/sales/_boxoffice.html.haml +0 -141
- data/app/views/sales/_doorlist.html.haml +0 -79
- data/app/views/searches/_household.html.haml +0 -7
- data/app/views/shared/_show_time_and_calendar.html.haml +0 -21
- data/app/views/shows/door_list.pdf.haml +0 -29
- data/app/views/statements/_passes_table.html.haml +0 -22
- data/app/views/store/checkouts/_membership_info.html.haml +0 -12
- data/app/views/store/events/_venue.html.haml +0 -9
- data/app/views/store/events/calendar.html.haml +0 -50
- data/app/views/store/events/single_show.html.haml +0 -45
- data/app/views/store/passes/index.html.haml +0 -33
- data/app/views/store/retrievals/index.html.haml +0 -11
- data/app/views/store/shared/_small_donate_form.html.haml +0 -21
- data/app/views/users/mailer/invitation_instructions.html.haml +0 -14
- data/config/initializers/paperclip.rb +0 -69
- data/db/migrate/20130411162346_add_country_zip_state_phone_number_discipline_to_organizations.rb +0 -9
- data/db/migrate/20130412184415_add_first_name_and_last_name_to_users.rb +0 -6
- data/db/migrate/20130722153731_add_autentication_token_to_users.rb +0 -5
- data/db/migrate/20130723212712_add_qr_code_to_tickets.rb +0 -9
- data/db/migrate/20130820011240_add_uuid_to_tickets.rb +0 -13
- data/db/migrate/20130820025134_make_ticket_uuid_not_null.rb +0 -11
- data/db/migrate/20130823191625_add_pdf_to_orders.rb +0 -5
- data/db/migrate/20130916194547_add_relationships.rb +0 -21
- data/db/migrate/20131002191646_create_show_stats_view.rb +0 -16
- data/db/migrate/20131003134821_add_relationships_to_search.rb +0 -7
- data/db/migrate/20131003200508_add_starred_to_relationships.rb +0 -5
- data/db/migrate/20131007141421_add_counters_to_member.rb +0 -7
- data/db/migrate/20131007144456_remove_expires_at_from_membership.rb +0 -6
- data/db/migrate/20131011154027_add_purchased_to_searches.rb +0 -5
- data/db/migrate/20131013144010_add_type_to_membership_type.rb +0 -5
- data/db/migrate/20131013150230_add_duration_to_membership_type.rb +0 -6
- data/db/migrate/20131013192807_change_number_of_shows_to_tickets.rb +0 -5
- data/db/migrate/20131015151550_add_households.rb +0 -18
- data/db/migrate/20131022183913_add_search_output_options.rb +0 -24
- data/db/migrate/20131023200559_add_admin_to_user_memberships.rb +0 -14
- data/db/migrate/20131025162155_default_search_filter_values.rb +0 -10
- data/db/migrate/20131025180139_unique_household_names.rb +0 -8
- data/db/migrate/20131029173612_add_sales_start_to_membership_typ.rb +0 -6
- data/db/migrate/20131106191847_add_suggested_households.rb +0 -13
- data/db/migrate/20131127162818_add_buyer_id_index_to_tickets.rb +0 -5
- data/db/migrate/20131127164000_member_tickets.rb +0 -9
- data/db/migrate/20131204162642_add_shared_address.rb +0 -9
- data/db/migrate/20131206153323_add_membership_kit.rb +0 -5
- data/db/migrate/20131206175325_add_marketing_to_membership_type.rb +0 -6
- data/db/migrate/20131210212342_add_show_fee_to_memberhsip_type.rb +0 -5
- data/db/migrate/20131210222814_add_renewal_price_to_membership_type.rb +0 -6
- data/db/migrate/20131212164553_add_copy_to_individuals_option.rb +0 -5
- data/db/migrate/20131223215615_goodbye_order_view.rb +0 -6
- data/db/migrate/20140114011856_add_welcome_message_to_memberships.rb +0 -5
- data/db/migrate/20140114212127_add_send_email_to_memberships.rb +0 -5
- data/db/migrate/20140125183606_index_memberships_and_types.rb +0 -6
- data/db/migrate/20140128213101_add_pdf_to_members.rb +0 -5
- data/db/migrate/20140128223140_add_uuid_to_member.rb +0 -6
- data/db/migrate/20140128223948_add_qr_code_to_member.rb +0 -9
- data/db/migrate/20140207135731_update_items_view.rb +0 -38
- data/db/migrate/20140210154723_add_cached_stats.rb +0 -5
- data/db/migrate/20140218202726_cache_stats.rb +0 -7
- data/db/migrate/20140304171625_passes_ahoy.rb +0 -52
- data/db/migrate/20140304174807_add_passes_kit.rb +0 -5
- data/db/migrate/20140307144454_add_events_pass_types.rb +0 -9
- data/db/migrate/20140307193350_add_pass_id_to_cart.rb +0 -7
- data/db/migrate/20140314162422_add_total_paid_to_membership.rb +0 -13
- data/db/migrate/20140319191237_add_show_dates_to_advanced_search.rb +0 -6
- data/db/migrate/20140328172333_add_cols_to_events_pass_types.rb +0 -6
- data/db/migrate/20140328174217_add_deleted_at_to_ept.rb +0 -9
- data/db/migrate/20140328185432_add_active_to_ept.rb +0 -5
- data/db/migrate/20140328192612_add_pass_type_id_to_search.rb +0 -5
- data/db/migrate/20140415212841_add_min_max_start_dates_to_searches.artfully_ose_engine.rb +0 -6
- data/db/migrate/20140422193345_add_email_copy_to_pass_type.rb +0 -5
- data/db/migrate/20140423181639_add_min_max_end_dates_to_searches.artfully_ose_engine.rb +0 -6
- data/db/migrate/20140423185921_add_cached_stats_to_event.rb +0 -9
- data/db/migrate/20140424174423_add_lifetime_memberships_to_people.artfully_ose_engine.rb +0 -5
- data/db/migrate/20140506155241_add_lpt_to_membership_type.rb +0 -5
- data/db/migrate/20140507184646_add_bday_attributes_to_person.rb +0 -7
- data/db/migrate/20140507201048_add_check_number_to_orders.rb +0 -5
- data/db/migrate/20140515143651_remove_show_stats_view.rb +0 -6
- data/db/migrate/20140521195853_add_deleted_at_to_pass_type.rb +0 -5
- data/db/migrate/20140522205554_add_limit_to_events_pass_types.rb +0 -5
- data/db/migrate/20140523180444_remove_tickets_purchased_from_passes.rb +0 -5
- data/db/migrate/20140603200735_add_subtitle_to_events.rb +0 -5
- data/db/migrate/20140619194127_add_do_not_call_to_people.artfully_ose_engine.rb +0 -5
- data/db/migrate/20140623160543_add_index_to_items.rb +0 -7
- data/spec/factories/action_factories.rb +0 -19
- data/spec/factories/address_factories.rb +0 -11
- data/spec/factories/cart_factories.rb +0 -26
- data/spec/factories/chart_factories.rb +0 -52
- data/spec/factories/discount_factories.rb +0 -11
- data/spec/factories/donation_factories.rb +0 -14
- data/spec/factories/event_factories.rb +0 -29
- data/spec/factories/household_factories.rb +0 -8
- data/spec/factories/import_factories.rb +0 -61
- data/spec/factories/item_factories.rb +0 -51
- data/spec/factories/kit_factories.rb +0 -33
- data/spec/factories/member_factories.rb +0 -19
- data/spec/factories/membership_factories.rb +0 -9
- data/spec/factories/membership_type_factories.rb +0 -18
- data/spec/factories/order_factories.rb +0 -40
- data/spec/factories/organization_factories.rb +0 -48
- data/spec/factories/pass_type_factories.rb +0 -11
- data/spec/factories/payments_factories.rb +0 -97
- data/spec/factories/person_factories.rb +0 -47
- data/spec/factories/phone_factories.rb +0 -6
- data/spec/factories/section_factories.rb +0 -21
- data/spec/factories/segment_factories.rb +0 -6
- data/spec/factories/show_factories.rb +0 -33
- data/spec/factories/ticket_factories.rb +0 -57
- data/spec/factories/ticket_offer_factories.rb +0 -16
- data/spec/factories/ticket_type_factories.rb +0 -8
- data/spec/factories/user_factories.rb +0 -24
@@ -29,15 +29,4 @@ ul#event-list
|
|
29
29
|
margin-bottom: 3px
|
30
30
|
color: white
|
31
31
|
a:hover
|
32
|
-
text-decoration: none
|
33
|
-
|
34
|
-
.no-events-found
|
35
|
-
h3
|
36
|
-
text-align: center
|
37
|
-
|
38
|
-
.event-list-controls
|
39
|
-
.btn-group
|
40
|
-
margin-bottom: 0
|
41
|
-
|
42
|
-
form
|
43
|
-
margin-bottom: 0
|
32
|
+
text-decoration: none
|
@@ -39,22 +39,11 @@ ul.tags
|
|
39
39
|
|
40
40
|
.tag
|
41
41
|
background-color: #f8930a
|
42
|
+
border-right: 1px solid #a85300
|
43
|
+
border-bottom: 1px solid #a85300
|
42
44
|
padding: 2px 4px 2px 4px
|
43
45
|
font-size: 10pt
|
44
46
|
color: #EEEEEE
|
45
|
-
.tag-member
|
46
|
-
background-color: #175c71
|
47
|
-
padding: 3px 5px 3px 5px
|
48
|
-
a
|
49
|
-
font-weight: normal
|
50
|
-
color:white
|
51
|
-
.tag-passholder
|
52
|
-
background-color: #8e0a34
|
53
|
-
padding: 3px 5px 3px 5px
|
54
|
-
font-weight: normal
|
55
|
-
a
|
56
|
-
font-weight: normal
|
57
|
-
color:white
|
58
47
|
|
59
48
|
.tag-error
|
60
49
|
color: #991111
|
@@ -1,6 +1,5 @@
|
|
1
1
|
@import "colors"
|
2
2
|
@import "mixins"
|
3
|
-
@import url(http://fonts.googleapis.com/css?family=Roboto:400,100,300)
|
4
3
|
|
5
4
|
body
|
6
5
|
padding-top: 10px
|
@@ -23,27 +22,6 @@ h4
|
|
23
22
|
font-size: 1.25em
|
24
23
|
margin-bottom: .5em
|
25
24
|
|
26
|
-
#membership-storefront
|
27
|
-
h3
|
28
|
-
font-size: 1.3em
|
29
|
-
color: #666
|
30
|
-
margin-bottom: .5em
|
31
|
-
h4
|
32
|
-
color: #666
|
33
|
-
font-size: 1.25em
|
34
|
-
margin-bottom: .5em
|
35
|
-
h5
|
36
|
-
color: #666
|
37
|
-
font-size: 1.25em
|
38
|
-
margin-bottom: .5em
|
39
|
-
color: #99BABB
|
40
|
-
h6
|
41
|
-
color: #666
|
42
|
-
font-size: 1.25em
|
43
|
-
margin-bottom: .5em
|
44
|
-
color: #9d2235
|
45
|
-
|
46
|
-
|
47
25
|
#venue
|
48
26
|
line-height: 1.4em
|
49
27
|
font-size: 1em
|
@@ -123,6 +101,8 @@ h4
|
|
123
101
|
img#logo
|
124
102
|
float: left
|
125
103
|
margin-right: 10px
|
104
|
+
|
105
|
+
h1#logo
|
126
106
|
|
127
107
|
ul#shows, ul#memberships
|
128
108
|
clear: both
|
@@ -160,6 +140,8 @@ ul#shows, ul#memberships
|
|
160
140
|
margin-bottom: 5px
|
161
141
|
|
162
142
|
.sections
|
143
|
+
padding: 10px
|
144
|
+
margin-left: 60px
|
163
145
|
margin-bottom: 20px
|
164
146
|
.section
|
165
147
|
margin-bottom: 20px
|
@@ -198,7 +180,6 @@ ul#memberships
|
|
198
180
|
margin-bottom: 50px
|
199
181
|
float: left
|
200
182
|
margin-right: 30px
|
201
|
-
min-height: 250px
|
202
183
|
h3
|
203
184
|
font-weight: bold
|
204
185
|
|
@@ -228,6 +209,56 @@ table.calendar
|
|
228
209
|
#shopping-cart
|
229
210
|
width: auto
|
230
211
|
background-color: #e6e6e6 !important
|
212
|
+
#steps
|
213
|
+
display: none
|
214
|
+
position: static
|
215
|
+
background: #fff
|
216
|
+
position: static
|
217
|
+
width: 650px
|
218
|
+
margin: 0px auto
|
219
|
+
padding: 50px
|
220
|
+
padding-top: 10px
|
221
|
+
padding-bottom: 0
|
222
|
+
height: 380px
|
223
|
+
overflow: auto
|
224
|
+
ul#nav
|
225
|
+
width: 650px
|
226
|
+
margin: 0 auto
|
227
|
+
overflow: hidden
|
228
|
+
margin-bottom: 20px
|
229
|
+
li
|
230
|
+
float: left
|
231
|
+
list-style: none
|
232
|
+
letter-spacing: 0
|
233
|
+
font-family: "Helvetica", Arial, arial, sans-serif
|
234
|
+
word-spacing: normal
|
235
|
+
&.active a
|
236
|
+
background-color: $compliment_highlight
|
237
|
+
color: #fff
|
238
|
+
font-weight: normal
|
239
|
+
&.disabled a
|
240
|
+
color: #BBB
|
241
|
+
cursor: default
|
242
|
+
a
|
243
|
+
@include rounded-corners(15px, 15px, 15px, 15px)
|
244
|
+
font-size: 12px
|
245
|
+
padding-top: 8px
|
246
|
+
padding-bottom: 8px
|
247
|
+
margin-top: 4px
|
248
|
+
padding-right: 12px
|
249
|
+
padding-left: 12px
|
250
|
+
margin-right: 2px
|
251
|
+
line-height: 14px
|
252
|
+
display: block
|
253
|
+
color: #333
|
254
|
+
&:hover
|
255
|
+
text-decoration: none
|
256
|
+
lable.error
|
257
|
+
color: red
|
258
|
+
.tab-pane
|
259
|
+
display: none
|
260
|
+
&.active
|
261
|
+
display: block
|
231
262
|
|
232
263
|
#cart
|
233
264
|
width: 100%
|
@@ -360,17 +391,27 @@ table.calendar
|
|
360
391
|
text-shadow: none
|
361
392
|
color: #fff
|
362
393
|
background-color: #a85300
|
363
|
-
background-image:
|
394
|
+
background-image: -khtml-gradient(linear, left top, left bottom, from(#f8930a), to(#a85300))
|
395
|
+
background-image: -moz-linear-gradient(top, #f8930a, #a85300)
|
396
|
+
background-image: -ms-linear-gradient(top, #f8930a, #a85300)
|
397
|
+
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f8930a), color-stop(100%, #a85300))
|
398
|
+
background-image: -webkit-linear-gradient(top, #f8930a, #a85300)
|
399
|
+
background-image: -o-linear-gradient(top, #f8930a, #a85300)
|
400
|
+
background-image: linear-gradient(top, #f8930a, #a85300)
|
401
|
+
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f8930a', endColorstr='#a85300', GradientType=0)
|
402
|
+
border-color: #a85300 #a85300 #003f81
|
364
403
|
|
365
404
|
.navbar .btn.primary
|
366
405
|
margin-top: 3px
|
367
406
|
padding-top: 5px
|
368
407
|
padding-bottom: 5px
|
369
408
|
|
409
|
+
.event-image
|
410
|
+
width: 135px
|
411
|
+
height: 200px
|
412
|
+
|
370
413
|
.store-event-display
|
371
414
|
margin-bottom: 20px
|
372
|
-
h1
|
373
|
-
margin-top: 0px
|
374
415
|
|
375
416
|
#shopping-cart-display
|
376
417
|
table
|
@@ -431,100 +472,4 @@ tr.no-border
|
|
431
472
|
.controls
|
432
473
|
margin-left: 0px
|
433
474
|
.control-label
|
434
|
-
padding-right: 18px
|
435
|
-
|
436
|
-
#single-show-container
|
437
|
-
.title
|
438
|
-
display: none
|
439
|
-
|
440
|
-
|
441
|
-
.event-poster
|
442
|
-
padding: 3px
|
443
|
-
border: 1px solid #eee
|
444
|
-
|
445
|
-
#event-header, #donate-now-header
|
446
|
-
h1
|
447
|
-
font-family: 'Roboto', sans-serif
|
448
|
-
font-weight: 300
|
449
|
-
h4
|
450
|
-
font-family: 'Roboto', sans-serif
|
451
|
-
font-weight: 100
|
452
|
-
margin: 0px 0px 2px 0px
|
453
|
-
|
454
|
-
#donate-now-header
|
455
|
-
text-align: center
|
456
|
-
margin-bottom: 30px
|
457
|
-
|
458
|
-
#donate-now-container
|
459
|
-
margin-top: -30px
|
460
|
-
padding: 50px 20px 60px 20px
|
461
|
-
box-shadow: 6px 5px 5px -5px #999, -6px 5px 5px -5px #999
|
462
|
-
|
463
|
-
#donate-now
|
464
|
-
text-align: center
|
465
|
-
margin-top: 20px
|
466
|
-
|
467
|
-
.available-ticket-type-table
|
468
|
-
form
|
469
|
-
margin: 0px
|
470
|
-
.ticket-type-description
|
471
|
-
padding: 0px 6px
|
472
|
-
.ticket-type-quantity
|
473
|
-
font-family: 'Roboto', sans-serif
|
474
|
-
font-weight: 100
|
475
|
-
margin-bottom: 0px
|
476
|
-
.ticket-type-name
|
477
|
-
font-family: 'Roboto', sans-serif
|
478
|
-
font-weight: 100
|
479
|
-
font-size: 12pt
|
480
|
-
padding-top: 13px
|
481
|
-
.ticket-type-price
|
482
|
-
font-family: 'Roboto', sans-serif
|
483
|
-
font-weight: 100
|
484
|
-
font-size: 12pt
|
485
|
-
padding-top: 13px
|
486
|
-
|
487
|
-
.event-image
|
488
|
-
img
|
489
|
-
max-width: 290px
|
490
|
-
|
491
|
-
#poster-modal
|
492
|
-
.modal-body
|
493
|
-
text-align: center
|
494
|
-
|
495
|
-
.add-donation-to-cart
|
496
|
-
.preset-amount
|
497
|
-
float: left
|
498
|
-
width: 227px
|
499
|
-
// height: 28px
|
500
|
-
margin-bottom: 10px
|
501
|
-
text-align: left
|
502
|
-
|
503
|
-
.add-donation-to-cart
|
504
|
-
.preset-amount.last
|
505
|
-
width: 455px
|
506
|
-
|
507
|
-
.add-donation-to-cart
|
508
|
-
.preset-amount
|
509
|
-
label
|
510
|
-
margin: 0
|
511
|
-
padding: 0
|
512
|
-
// height: 28px
|
513
|
-
line-height: 28px
|
514
|
-
|
515
|
-
.add-donation-to-cart
|
516
|
-
.preset-amount
|
517
|
-
label
|
518
|
-
input[type='radio']
|
519
|
-
float: none
|
520
|
-
vertical-align: baseline
|
521
|
-
margin-top: 0
|
522
|
-
|
523
|
-
#event-header.side-section
|
524
|
-
h4
|
525
|
-
padding-bottom: 8px
|
526
|
-
#subtitle
|
527
|
-
padding-bottom: 8px
|
528
|
-
font-weight: bold
|
529
|
-
line-height: 1.4em
|
530
|
-
font-size: 1em
|
475
|
+
padding-right: 18px
|
data/app/concerns/itemable.rb
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
#
|
2
2
|
# Include this method on objects that can be used to create items using Item.for
|
3
|
-
# Ticket class doesn't
|
3
|
+
# Ticket class doesn't meed it because it defines its own sold_price method
|
4
4
|
#
|
5
5
|
module Itemable
|
6
6
|
extend ActiveSupport::Concern
|
@@ -1,34 +1,25 @@
|
|
1
1
|
class ArtfullyOseController < ActionController::Base
|
2
|
-
include Ext::Integrations::ArtfullyOseController
|
3
2
|
|
4
3
|
protect_from_forgery
|
5
4
|
|
6
5
|
before_filter :authenticate_user!
|
7
6
|
layout :specify_layout
|
8
7
|
after_filter :set_csrf_cookie_for_angular
|
9
|
-
before_filter :require_more_info
|
10
8
|
|
11
9
|
delegate :current_organization, :to => :current_user
|
12
10
|
|
13
11
|
rescue_from CanCan::AccessDenied do |exception|
|
14
|
-
|
15
|
-
|
12
|
+
if current_user.is_in_organization?
|
13
|
+
flash[:alert] = "Sorry, we couldn't find that page!"
|
14
|
+
redirect_to root_path
|
15
|
+
else
|
16
|
+
flash[:notice] = "Wait, we need some more information from you first!"
|
17
|
+
redirect_to new_organization_path
|
18
|
+
end
|
16
19
|
end
|
17
20
|
|
18
21
|
protected
|
19
22
|
|
20
|
-
#
|
21
|
-
# don't appent "kit" to the name.
|
22
|
-
# Example requires_kit :membership
|
23
|
-
#
|
24
|
-
def self.requires_kit(kit)
|
25
|
-
before_filter do
|
26
|
-
unless current_user.current_organization.has_kit? (kit)
|
27
|
-
raise CanCan::AccessDenied
|
28
|
-
end
|
29
|
-
end
|
30
|
-
end
|
31
|
-
|
32
23
|
def to_plural(variable, word)
|
33
24
|
self.class.helpers.pluralize(variable, word)
|
34
25
|
end
|
@@ -89,17 +80,4 @@ class ArtfullyOseController < ActionController::Base
|
|
89
80
|
def set_csrf_cookie_for_angular
|
90
81
|
cookies['XSRF-TOKEN'] = form_authenticity_token if protect_against_forgery?
|
91
82
|
end
|
92
|
-
|
93
|
-
def require_more_info
|
94
|
-
if need_more_info?
|
95
|
-
flash[:info] = "We need to collect more information about your organization before you continue."
|
96
|
-
redirect_to collect_info_signups_path
|
97
|
-
end
|
98
|
-
end
|
99
|
-
|
100
|
-
def keep_page_from_caching
|
101
|
-
response.headers["Cache-Control"] = "no-cache, no-store, max-age=0, must-revalidate"
|
102
|
-
response.headers["Pragma"] = "no-cache"
|
103
|
-
response.headers["Expires"] = "Fri, 01 Jan 1990 00:00:00 GMT"
|
104
|
-
end
|
105
83
|
end
|
@@ -60,13 +60,6 @@ private
|
|
60
60
|
end
|
61
61
|
|
62
62
|
def grab_ticket_type_names
|
63
|
-
@ticket_type_names =
|
64
|
-
@event.charts.includes(:sections => :ticket_types).each do |chart|
|
65
|
-
chart.sections.each do |section|
|
66
|
-
@ticket_type_names << section.ticket_types.collect{ |tt| tt.name }
|
67
|
-
end
|
68
|
-
end
|
69
|
-
@ticket_type_names = @ticket_type_names.flatten.uniq.sort
|
70
|
-
@ticket_type_names
|
63
|
+
@ticket_type_names = @event.charts.includes(:sections => :ticket_types).collect{|c| c.ticket_types.collect{|s| s.name}}.flatten.uniq.sort
|
71
64
|
end
|
72
65
|
end
|
@@ -1,7 +1,7 @@
|
|
1
1
|
class EventsController < ArtfullyOseController
|
2
|
-
respond_to :html, :json
|
2
|
+
respond_to :html, :json
|
3
3
|
|
4
|
-
before_filter :find_event, :only => [ :show, :edit, :update, :destroy, :widget, :image, :storefront_link, :prices, :messages, :resell, :wp_plugin
|
4
|
+
before_filter :find_event, :only => [ :show, :edit, :update, :destroy, :widget, :image, :storefront_link, :prices, :messages, :resell, :wp_plugin ]
|
5
5
|
before_filter :upcoming_shows, :only => :show
|
6
6
|
before_filter { authorize! :view, @event if @event }
|
7
7
|
|
@@ -23,16 +23,7 @@ class EventsController < ArtfullyOseController
|
|
23
23
|
|
24
24
|
def index
|
25
25
|
authorize! :view, Event
|
26
|
-
|
27
|
-
scope = Event.unscoped.where(:deleted_at => nil).where(:organization_id => current_organization.id).includes(:shows).order('name ASC')
|
28
|
-
scope = if params[:range].present? && params[:range] == 'all'
|
29
|
-
@all = scope
|
30
|
-
else
|
31
|
-
@upcoming = scope.where :id => current_organization.shows.unplayed.pluck(:event_id).uniq
|
32
|
-
end
|
33
|
-
|
34
|
-
scope = scope.where('LOWER(name) LIKE ?', "%#{params[:query].downcase}%") unless params[:query].blank?
|
35
|
-
@events = scope
|
26
|
+
@events = current_organization.events.includes(:shows, :venue).order('updated_at DESC')
|
36
27
|
end
|
37
28
|
|
38
29
|
def show
|
@@ -61,7 +52,7 @@ class EventsController < ArtfullyOseController
|
|
61
52
|
def edit
|
62
53
|
authorize! :edit, @event
|
63
54
|
end
|
64
|
-
|
55
|
+
|
65
56
|
def image
|
66
57
|
authorize! :edit, @event
|
67
58
|
end
|
@@ -80,8 +71,18 @@ class EventsController < ArtfullyOseController
|
|
80
71
|
authorize! :edit, @event
|
81
72
|
|
82
73
|
if @event.update_attributes(params[:event])
|
83
|
-
|
84
|
-
|
74
|
+
if user_requesting_next_step?
|
75
|
+
if user_just_uploaded_an_image?
|
76
|
+
redirect_to messages_event_path(@event)
|
77
|
+
elsif user_set_special_instructions?
|
78
|
+
redirect_to event_shows_path(@event)
|
79
|
+
else
|
80
|
+
redirect_to edit_event_venue_path(@event)
|
81
|
+
end
|
82
|
+
else
|
83
|
+
flash[:notice] = "Your event has been updated."
|
84
|
+
redirect_to event_url(@event)
|
85
|
+
end
|
85
86
|
else
|
86
87
|
render :edit
|
87
88
|
end
|
@@ -95,7 +96,6 @@ class EventsController < ArtfullyOseController
|
|
95
96
|
end
|
96
97
|
|
97
98
|
def widget
|
98
|
-
@donation_kit = current_user.current_organization.kit(:regular_donation)
|
99
99
|
end
|
100
100
|
|
101
101
|
def storefront_link
|
@@ -103,13 +103,28 @@ class EventsController < ArtfullyOseController
|
|
103
103
|
|
104
104
|
def wp_plugin
|
105
105
|
end
|
106
|
-
|
106
|
+
|
107
107
|
def prices
|
108
108
|
end
|
109
109
|
|
110
|
-
def
|
110
|
+
def temp_discounts_index
|
111
|
+
find_event
|
111
112
|
end
|
112
113
|
|
114
|
+
def temp_discount_form
|
115
|
+
find_event
|
116
|
+
|
117
|
+
@discount = TempDiscount.new
|
118
|
+
@discount.promotion_type = 'two-for-one'
|
119
|
+
|
120
|
+
@event.charts.collect(&:sections).flatten.each do |section|
|
121
|
+
@discount.discount_sections.new(
|
122
|
+
:section => section,
|
123
|
+
:price => section.price
|
124
|
+
)
|
125
|
+
end
|
126
|
+
end
|
127
|
+
|
113
128
|
def messages
|
114
129
|
end
|
115
130
|
|
@@ -119,29 +134,6 @@ class EventsController < ArtfullyOseController
|
|
119
134
|
end
|
120
135
|
|
121
136
|
private
|
122
|
-
|
123
|
-
def redirect_path
|
124
|
-
if user_requesting_next_step?
|
125
|
-
if user_just_uploaded_an_image?
|
126
|
-
messages_event_path(@event)
|
127
|
-
elsif user_set_special_instructions?
|
128
|
-
new_event_show_path(@event)
|
129
|
-
else
|
130
|
-
edit_event_venue_path(@event)
|
131
|
-
end
|
132
|
-
else
|
133
|
-
event_url(@event)
|
134
|
-
end
|
135
|
-
end
|
136
|
-
|
137
|
-
def build_flash_message
|
138
|
-
if user_just_uploaded_an_image?
|
139
|
-
flash[:notice] = "We're processing your image and will have the new image up in a few minutes."
|
140
|
-
else
|
141
|
-
flash[:notice] = "Your event has been updated."
|
142
|
-
end
|
143
|
-
end
|
144
|
-
|
145
137
|
def find_event
|
146
138
|
@event = Event.find(params[:id])
|
147
139
|
end
|