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
@@ -39,9 +39,7 @@
|
|
39
39
|
= form.text_field :zip
|
40
40
|
|
41
41
|
.control-group
|
42
|
-
=form.label :time_zone, :class => 'control-label'
|
43
|
-
"Time Zone"
|
44
|
-
.tip.muted Changing your time zone will change your existing show times.
|
42
|
+
=form.label :time_zone, "Time Zone", :class => 'control-label'
|
45
43
|
.controls
|
46
44
|
= form.time_zone_select :time_zone, ActiveSupport::TimeZone.us_zones, {:default => current_user.current_organization.time_zone}, {:class => 'input-xlarge'}
|
47
45
|
|
@@ -8,6 +8,9 @@ Devise.setup do |config|
|
|
8
8
|
config.use_salt_as_remember_token = true
|
9
9
|
config.reset_password_within = 24.hours
|
10
10
|
|
11
|
+
# Configure the class responsible to send e-mails.
|
12
|
+
# config.mailer = "Devise::Mailer"
|
13
|
+
|
11
14
|
# ==> ORM configuration
|
12
15
|
# Load and configure the ORM. Supports :active_record (default) and
|
13
16
|
# :mongoid (bson_ext recommended) by default. Other ORMs may be
|
@@ -37,7 +40,7 @@ Devise.setup do |config|
|
|
37
40
|
# ==> Configuration for :database_authenticatable
|
38
41
|
# For bcrypt, this is the cost for hashing the password and defaults to 10. If
|
39
42
|
# using other encryptors, it sets how many times you want the password re-encrypted.
|
40
|
-
config.stretches =
|
43
|
+
config.stretches = 10
|
41
44
|
|
42
45
|
# Define which will be the encryption algorithm. Devise also supports encryptors
|
43
46
|
# from others authentication tools as :clearance_sha1, :authlogic_sha512 (then
|
@@ -127,7 +130,7 @@ Devise.setup do |config|
|
|
127
130
|
# Configure sign_out behavior.
|
128
131
|
# By default sign_out is scoped (i.e. /users/sign_out affects only :user scope).
|
129
132
|
# In case of sign_out_all_scopes set to true any logout action will sign out all active scopes.
|
130
|
-
config.sign_out_all_scopes =
|
133
|
+
config.sign_out_all_scopes = false
|
131
134
|
|
132
135
|
# ==> Navigation configuration
|
133
136
|
# Lists the formats that should be treated as navigational. Formats like
|
@@ -10,7 +10,7 @@ en:
|
|
10
10
|
unauthenticated: 'Please sign in.'
|
11
11
|
unconfirmed: 'You have to confirm your account before continuing.'
|
12
12
|
locked: 'Your account is locked.'
|
13
|
-
invalid: 'Invalid
|
13
|
+
invalid: 'Invalid email or password.'
|
14
14
|
invalid_token: 'Invalid authentication token.'
|
15
15
|
timeout: 'Your session expired, please sign in again to continue.'
|
16
16
|
inactive: 'Your account has been suspended.'
|
@@ -2,7 +2,7 @@ en:
|
|
2
2
|
devise:
|
3
3
|
invitations:
|
4
4
|
send_instructions: 'An invitation email has been sent to %{email}.'
|
5
|
-
invitation_token_invalid: 'The invitation token provided is not valid!'
|
5
|
+
invitation_token_invalid: 'The invitation token provided is not valid! WTF MAN'
|
6
6
|
updated: 'Your password was set successfully. You are now signed in.'
|
7
7
|
no_invitations_remaining: "No invitations remaining"
|
8
8
|
mailer:
|
data/config/locales/en.yml
CHANGED
@@ -22,15 +22,13 @@
|
|
22
22
|
time:
|
23
23
|
formats:
|
24
24
|
default: "%B %d, %Y %I:%M %p"
|
25
|
-
short: "%m/%d/%Y %
|
25
|
+
short: "%m/%d/%Y %I:%M %p"
|
26
26
|
slashed_date: "%m/%d/%Y"
|
27
27
|
day_time: "%a, %b %d %l:%M %P"
|
28
28
|
day_time_at: "%a, %b %d at %I:%M %P"
|
29
29
|
date: "%B %d, %Y"
|
30
30
|
long_date: "%B %d, %Y %I:%M %p"
|
31
|
-
long_with_day: "%A, %b %d %Y %
|
32
|
-
long_with_abbrviated_day: "%a, %b %d %Y %l:%M %p"
|
33
|
-
abbreviated_day: "%a"
|
31
|
+
long_with_day: "%A, %b %d %Y %I:%M %p"
|
34
32
|
time: "%I:%M %p"
|
35
33
|
day: "%A"
|
36
34
|
date_for_input: "%Y-%m-%d"
|
@@ -178,18 +176,6 @@
|
|
178
176
|
even: "must be even"
|
179
177
|
|
180
178
|
activerecord:
|
181
|
-
attributes:
|
182
|
-
seasonal_membership_type:
|
183
|
-
starts_at: "Membership begins"
|
184
|
-
ends_at: "Membership ends"
|
185
|
-
pass_type:
|
186
|
-
tickets_allowed: "Number of Tickets"
|
187
|
-
starts_at: "Pass Starts"
|
188
|
-
ends_at: "Pass Ends"
|
189
|
-
organization:
|
190
|
-
# Blithering hack to get around Rails' miserable validation message handling
|
191
|
-
cached_slug: "Sorry,"
|
192
|
-
|
193
179
|
errors:
|
194
180
|
template:
|
195
181
|
header:
|
@@ -210,7 +196,6 @@
|
|
210
196
|
athena_performance:
|
211
197
|
datetime: "Date and time"
|
212
198
|
|
213
|
-
|
214
199
|
athena_performance:
|
215
200
|
state:
|
216
201
|
pending: "Pending"
|
@@ -218,7 +203,7 @@
|
|
218
203
|
on_sale: "In Widget"
|
219
204
|
off_sale: "Not in Widget"
|
220
205
|
|
221
|
-
regular_donation_kit: "
|
206
|
+
regular_donation_kit: "Charity Donation Kit"
|
222
207
|
sponsored_donation_kit: "Sponsored Donation Kit"
|
223
208
|
ticketing_kit: "Paid Event Ticketing Kit"
|
224
209
|
reseller_kit: "Reseller Kit"
|
data/config/routes.rb
CHANGED
@@ -1,38 +1,5 @@
|
|
1
1
|
Rails.application.routes.draw do
|
2
2
|
|
3
|
-
namespace :mobile do
|
4
|
-
resources :users, :only => [] do
|
5
|
-
collection do
|
6
|
-
post :sign_in
|
7
|
-
end
|
8
|
-
end
|
9
|
-
resource :dashboard, :only => :show, :controller => :dashboard
|
10
|
-
resources :organizations, :only => [] do
|
11
|
-
resources :events, :only => :index
|
12
|
-
end
|
13
|
-
resources :events, :only => [:index] do
|
14
|
-
resources :shows, :only => :index
|
15
|
-
end
|
16
|
-
resources :shows, :only => [:index, :show] do
|
17
|
-
resources :orders, :only => :index
|
18
|
-
end
|
19
|
-
resources :orders, :only => [:index, :show] do
|
20
|
-
collection { post :validate }
|
21
|
-
member { post :validate }
|
22
|
-
end
|
23
|
-
resources :tickets, :only => [:show] do
|
24
|
-
collection do
|
25
|
-
post :validate
|
26
|
-
post :unvalidate
|
27
|
-
end
|
28
|
-
member do
|
29
|
-
post :validate
|
30
|
-
post :unvalidate
|
31
|
-
get :order
|
32
|
-
end
|
33
|
-
end
|
34
|
-
end
|
35
|
-
|
36
3
|
namespace :api do
|
37
4
|
resources :events, :only => :show
|
38
5
|
resources :tickets, :only => :index
|
@@ -47,13 +14,9 @@ Rails.application.routes.draw do
|
|
47
14
|
scope ':organization_slug' do
|
48
15
|
namespace :store do
|
49
16
|
resources :events, :only => [:show, :index]
|
50
|
-
resources :memberships, :only =>
|
51
|
-
resources :passes, :only => [:show, :index]
|
52
|
-
resources :rolling_membership_types, :controller => :membership_types
|
53
|
-
resources :seasonal_membership_types, :controller => :membership_types
|
17
|
+
resources :memberships, :only => :index
|
54
18
|
resources :shows, :only => :show
|
55
19
|
resource :checkout, :only => :create
|
56
|
-
resources :retrievals, :only => [:index, :create]
|
57
20
|
|
58
21
|
resource :order, :only => :destroy
|
59
22
|
get "order", :to => "orders#show"
|
@@ -67,21 +30,17 @@ Rails.application.routes.draw do
|
|
67
30
|
namespace :store do
|
68
31
|
resources :events, :only => :show, :as => :old_storefront_event
|
69
32
|
resources :shows, :only => :show
|
70
|
-
|
71
|
-
resource :checkout, :only => :create do
|
72
|
-
get "dook", :to => "checkouts#dook"
|
73
|
-
end
|
33
|
+
resource :checkout, :only => :create
|
74
34
|
end
|
75
35
|
|
76
|
-
devise_for :members
|
77
|
-
devise_for :users
|
36
|
+
devise_for :members
|
37
|
+
devise_for :users
|
78
38
|
devise_scope :user do
|
79
39
|
get "sign_up", :to => "devise/registrations#new"
|
80
40
|
end
|
81
41
|
|
82
42
|
namespace :members do
|
83
43
|
root :to => "index#index"
|
84
|
-
resources :people, :only => :update
|
85
44
|
end
|
86
45
|
|
87
46
|
resources :organizations do
|
@@ -117,12 +76,6 @@ Rails.application.routes.draw do
|
|
117
76
|
get :requirements, :on => :collection
|
118
77
|
end
|
119
78
|
|
120
|
-
resources :membership_kits, :only => [ :edit, :update ]
|
121
|
-
resources :passes_kits, :only => [ :edit, :update ]
|
122
|
-
resources :passes_reports, :only => [:index]
|
123
|
-
|
124
|
-
resources :regular_donation_kits, :only => [ :edit, :update ]
|
125
|
-
|
126
79
|
resources :reports, :only => :index
|
127
80
|
resources :statements, :only => [ :index, :show ] do
|
128
81
|
resources :slices, :only => [ :index ] do
|
@@ -134,29 +87,14 @@ Rails.application.routes.draw do
|
|
134
87
|
|
135
88
|
def people_actions
|
136
89
|
resources :actions
|
137
|
-
resources :passes, :only => [:index] do
|
138
|
-
collection do
|
139
|
-
post :bulk_update
|
140
|
-
post :reminder
|
141
|
-
end
|
142
|
-
end
|
143
|
-
|
144
|
-
resources :relationships, :only => :index
|
145
90
|
resources :memberships do
|
146
91
|
collection do
|
147
92
|
post :bulk_update
|
148
93
|
end
|
149
94
|
end
|
150
|
-
|
151
|
-
member do
|
152
|
-
post :reset_password
|
153
|
-
end
|
154
|
-
resources :membership_comps, :only => :new
|
155
|
-
resources :membership_cancellations, :only => [:new, :create]
|
156
|
-
resources :membership_changes, :only => :create
|
95
|
+
resources :membership_awards, :only => :new
|
157
96
|
|
158
97
|
["get_action",
|
159
|
-
"change_action",
|
160
98
|
"refund_action",
|
161
99
|
"join_action",
|
162
100
|
"hear_action",
|
@@ -184,16 +122,9 @@ Rails.application.routes.draw do
|
|
184
122
|
people_actions
|
185
123
|
end
|
186
124
|
|
187
|
-
resources :households do
|
188
|
-
collection do
|
189
|
-
get :suggested
|
190
|
-
put "suggested/:suggested_id" => "households#ignore_suggested", :as => "ignore_suggested"
|
191
|
-
end
|
192
|
-
end
|
193
|
-
|
194
125
|
def shared_search_segment_routes
|
195
126
|
resources :actions, :only => [:new, :create]
|
196
|
-
resources :
|
127
|
+
resources :membership_awards, :only => :new
|
197
128
|
|
198
129
|
member do
|
199
130
|
post :tag
|
@@ -211,13 +142,6 @@ Rails.application.routes.draw do
|
|
211
142
|
shared_search_segment_routes
|
212
143
|
end
|
213
144
|
|
214
|
-
resources :console_sales do
|
215
|
-
collection do
|
216
|
-
get "/events/:event_id", :action => :events
|
217
|
-
get "/shows/:show_id", :action => :shows
|
218
|
-
end
|
219
|
-
end
|
220
|
-
|
221
145
|
resources :events do
|
222
146
|
member do
|
223
147
|
get :widget
|
@@ -229,22 +153,17 @@ Rails.application.routes.draw do
|
|
229
153
|
get :messages
|
230
154
|
end
|
231
155
|
resources :discounts
|
232
|
-
resources :events_pass_types
|
233
156
|
resources :shows do
|
234
|
-
resource :sales, :only => [:new, :create, :show, :update]
|
235
|
-
get :door_list, :on => :collection
|
236
|
-
end
|
157
|
+
resource :sales, :only => [:new, :create, :show, :update]
|
237
158
|
member do
|
238
159
|
get :door_list
|
239
160
|
post :published
|
240
161
|
post :unpublished
|
241
|
-
post :on_sale
|
242
|
-
post :off_sale
|
243
162
|
end
|
244
163
|
collection do
|
245
|
-
|
246
|
-
|
247
|
-
get
|
164
|
+
post :built
|
165
|
+
post :on_sale
|
166
|
+
get :calendar
|
248
167
|
end
|
249
168
|
end
|
250
169
|
resource :venue, :only => [:edit, :update]
|
@@ -256,7 +175,7 @@ Rails.application.routes.draw do
|
|
256
175
|
put :validated
|
257
176
|
put :unvalidated
|
258
177
|
end
|
259
|
-
|
178
|
+
|
260
179
|
collection do
|
261
180
|
delete :delete
|
262
181
|
put :on_sale
|
@@ -285,8 +204,6 @@ Rails.application.routes.draw do
|
|
285
204
|
resources :orders do
|
286
205
|
resource :assignment, :only => [ :new, :create ]
|
287
206
|
collection do
|
288
|
-
get :membership
|
289
|
-
get :passes
|
290
207
|
get :sales
|
291
208
|
end
|
292
209
|
member do
|
@@ -301,12 +218,8 @@ Rails.application.routes.draw do
|
|
301
218
|
resources :returns, :only => :create
|
302
219
|
resources :comps, :only => [ :new, :create ]
|
303
220
|
resources :merges, :only => [ :new, :create ]
|
304
|
-
resources :pass_types
|
305
221
|
resources :membership_types
|
306
|
-
resources :
|
307
|
-
resources :seasonal_membership_types, :controller => :membership_types
|
308
|
-
resources :membership_comps, :only => :create
|
309
|
-
resources :member_cards, :only => :new
|
222
|
+
resources :membership_awards, :only => :create
|
310
223
|
|
311
224
|
resources :imports do
|
312
225
|
member do
|
@@ -323,10 +236,8 @@ Rails.application.routes.draw do
|
|
323
236
|
match '/recent_activity' => 'index#recent_activity', :as => :recent_activity
|
324
237
|
match '/events/:event_id/charts/' => 'events#assign', :as => :assign_chart, :via => "post"
|
325
238
|
match '/dashboard' => 'index#dashboard', :constraints => lambda{|r| r.env["warden"].authenticate?}
|
326
|
-
match ':organization_slug/whats-my-pass', :controller => 'store/retrievals', :action => 'index'
|
327
239
|
|
328
240
|
get ':organization_slug/:controller(/:action(/:id))', controller: /store\/[^\/]+/
|
329
|
-
match '/:organization_slug' => 'store/events#index', :as => :store_organization_events
|
330
241
|
|
331
242
|
root :to => 'index#dashboard'
|
332
243
|
|
data/lib/artfully_ose.rb
CHANGED
@@ -1,11 +1,11 @@
|
|
1
|
-
require "devise"
|
2
|
-
require "devise_invitable"
|
3
|
-
require "devise_suspendable"
|
4
1
|
require "artfully_ose/engine"
|
5
2
|
require "artfully_ose/common_abilities"
|
6
3
|
require "artfully_ose/core_ext"
|
7
4
|
require "transitions"
|
8
5
|
require "active_record/transitions"
|
6
|
+
require "devise"
|
7
|
+
require "devise_invitable"
|
8
|
+
require "devise_suspendable"
|
9
9
|
require "slugged"
|
10
10
|
|
11
11
|
require "active_merchant"
|
@@ -44,7 +44,5 @@ require "set_watch_for"
|
|
44
44
|
require "swiper"
|
45
45
|
require "slicer"
|
46
46
|
|
47
|
-
require 'rqrcode_png'
|
48
|
-
|
49
47
|
module ArtfullyOse
|
50
|
-
end
|
48
|
+
end
|
@@ -69,18 +69,12 @@ module ArtfullyOse
|
|
69
69
|
|
70
70
|
def person_abilities_for(user)
|
71
71
|
can :manage, Person do |person|
|
72
|
-
user.current_organization.can? :manage, person
|
72
|
+
(user.current_organization.can? :manage, person) || (current_member.person.id == person.id)
|
73
73
|
end
|
74
74
|
|
75
75
|
can :manage, Segment do |segment|
|
76
76
|
user.current_organization.can?(:manage, segment)
|
77
77
|
end
|
78
78
|
end
|
79
|
-
|
80
|
-
def household_abilities_for(user)
|
81
|
-
can :manage, Household do |household|
|
82
|
-
(user.current_organization.can? :manage, household)
|
83
|
-
end
|
84
|
-
end
|
85
79
|
end
|
86
|
-
end
|
80
|
+
end
|
data/lib/artfully_ose/engine.rb
CHANGED
@@ -1,21 +1,12 @@
|
|
1
1
|
module ArtfullyOse
|
2
2
|
class Engine < ::Rails::Engine
|
3
|
-
|
4
|
-
if Rails.env.test?
|
5
|
-
initializer 'artfully_ose.factories', :after => 'factory_girl.set_factory_paths' do
|
6
|
-
puts 'ArtfullyOse: Setting up additional FactoryGirl paths'
|
7
|
-
FactoryGirl.definition_file_paths << File.expand_path('../../../spec/factories', __FILE__) if defined?(FactoryGirl)
|
8
|
-
end
|
9
|
-
end
|
10
|
-
|
11
3
|
initializer "artfully_ose.braintree_config" do |app|
|
12
4
|
puts "ArtfullyOse: Initializing Braintree config"
|
13
|
-
BraintreeConfig
|
5
|
+
BraintreeConfig = Struct.new(:merchant_id, :public_key, :private_key)
|
14
6
|
app.config.braintree = BraintreeConfig.new
|
15
|
-
app.config.braintree.
|
16
|
-
app.config.braintree.
|
17
|
-
app.config.braintree.
|
18
|
-
app.config.braintree.private_key = ENV['BRAINTREE_PRIVATE_KEY']
|
7
|
+
app.config.braintree.merchant_id = ENV['BRAINTREE_MERCHANT_ID']
|
8
|
+
app.config.braintree.public_key = ENV['BRAINTREE_PUBLIC_KEY']
|
9
|
+
app.config.braintree.private_key = ENV['BRAINTREE_PRIVATE_KEY']
|
19
10
|
end
|
20
11
|
|
21
12
|
initializer "artfully_ose.s3_config" do |app|
|
@@ -29,7 +20,6 @@ module ArtfullyOse
|
|
29
20
|
|
30
21
|
initializer "artfully_ose.payment_model_paths" do |app|
|
31
22
|
puts "ArtfullyOse: Initializing payment model paths"
|
32
|
-
puts config.root
|
33
23
|
app.config.payment_model_paths = []
|
34
24
|
app.config.payment_model_paths += Dir["#{config.root}/app/models/payments/*.rb"]
|
35
25
|
end
|
@@ -42,31 +32,17 @@ module ArtfullyOse
|
|
42
32
|
|
43
33
|
initializer "artfully_ose.google_analytics_config" do |app|
|
44
34
|
puts "ArtfullyOse: Initializing Google Analytics config"
|
45
|
-
GoogleAnalytcsConfig = Struct.new(:account, :
|
46
|
-
app.config.google_analytics
|
47
|
-
app.config.google_analytics.account
|
48
|
-
app.config.google_analytics.
|
49
|
-
app.config.google_analytics.domain = ENV['GA_DOMAIN']
|
35
|
+
GoogleAnalytcsConfig = Struct.new(:account, :domain)
|
36
|
+
app.config.google_analytics = GoogleAnalytcsConfig.new
|
37
|
+
app.config.google_analytics.account = ENV['GA_ACCOUNT']
|
38
|
+
app.config.google_analytics.domain = ENV['GA_DOMAIN']
|
50
39
|
end
|
51
40
|
|
52
41
|
initializer "artfully_ose.autoload_paths", :before => :set_autoload_paths do |app|
|
53
|
-
# First level sub-directories only
|
54
|
-
model_paths = [
|
55
|
-
"#{config.root}/app/models/actions",
|
56
|
-
"#{config.root}/app/models/database_views",
|
57
|
-
"#{config.root}/app/models/discounts",
|
58
|
-
"#{config.root}/app/models/imports",
|
59
|
-
"#{config.root}/app/models/job",
|
60
|
-
"#{config.root}/app/models/kits",
|
61
|
-
"#{config.root}/app/models/orders",
|
62
|
-
"#{config.root}/app/models/payments",
|
63
|
-
]
|
64
|
-
|
65
42
|
puts "ArtfullyOse: Setting up additional autoload paths"
|
66
|
-
app.config.autoload_paths +=
|
67
|
-
|
43
|
+
app.config.autoload_paths += Dir["#{config.root}/app/models/**/"]
|
68
44
|
end
|
69
|
-
|
45
|
+
|
70
46
|
config.generators do |g|
|
71
47
|
g.test_framework :rspec, :view_specs => false
|
72
48
|
end
|
data/lib/artfully_ose/version.rb
CHANGED