magfest / ubersystem

47%

master: 46%

LAST BUILD ON BRANCH fix-magdev254

branch: fix-magdev254

CHANGE BRANCH

x

Reset

• fix-magdev254
• 3247_fixes_public_staff_signups
• BlueHat-GURU-patch-1
• BlueHat-GURU-treasury-language-update-1
• Create-New-RockIsland.pdf
• MAGDEV-125_disables_promo_codes_for_minors
• MAGDEV-136_adds_consent_verbiage_to_panels_app
• MAGDEV-157_fixes_relative_download_urls
• MAGDEV-177_fixes_guest_merch
• MAGDEV-183_improves_pending_emails_ui
• MAGDEV-279_simplifies_panel_tech_needs
• MAGDEV-280_attendee_accessibility_services
• MAGDEV-83_jira_feedback_links
• MAGDEV-91_fixes_dept_permissions
• MAGDEV-92_adds_dept_link_to_email_staffers
• OFFICE-1304
• Replace-old-RockIsland.pdf
• Replace-rockisland.pdf
• accept-varied-badge-num
• accepted_games_export
• add-TO-ATTEND-NOT-VEND-to-badge_converted
• add-badge-count-info
• add-checkins-by-type
• add-confirmed-column
• add-email-report-by-kickin
• add-extra-donation-column
• add-form-group-scaffolding
• add-ical-schedule-export
• add-ledger-items
• add-mits-emails
• add-mits-feedback-email
• add-prepay-only-option
• add-promo-code-groups
• add-self-service-refunds
• add-stripe-receipts
• add-under-18-text
• add-vendor-badge-notification
• add-volunteer-hours-dynamic-export
• add-volunteers-with-shifts-mailto
• add_locust_load_tests
• add_nicer_group_not_found_error_msg
• add_pending_email_report
• add_profile_decorator
• add_url_to_link
• added_swadge_support
• adds_docstring_for_format_location
• adds_extra_15_to_setup_teardown
• adds_feature_signup_export
• adds_hotel_email_date
• adds_logistics_dept_checklist_item
• adds_missing_css
• adds_my_account_link
• adds_ribbons_back_to_api
• adds_shift_signup_ui_explaining_public_shifts
• adds_staff_checkbox
• adds_support_level_count_to_summary
• adds_test_for_basename_custom_tag
• alembic_auto_head
• allow-unapproval-of-dealers
• allow_swag_shirts_go_to_staff
• allows_admins_to_create_staff_badges
• allows_hotel_request_to_be_changed_before_email
• allows_weighted_setup_teardown_shifts
• api-patch
• api_efficiency_updates
• api_export_name_and_email
• api_http_status_codes
• api_staff_import
• armor_up_exception_handler
• assoc_list_fix
• attractions
• attractions_1
• attractions_3
• attractions_5
• attractions_6
• automated_dealer_conversion
• badge-transfer-message
• badge_hangar_super_supporter
• badges-ajax-animation
• badges_sold_estimate
• banner-fix
• barcode_barcode_barcode
• better404handling
• better_dealer_reg_checks
• better_email_preview_rendering
• better_error_handling_emails
• better_panel_info_collection
• better_volunteer_checklist_defaults
• birthday-summary-function
• bottom_attendee_pager
• bump_version_num-1
• cached_db_sessions
• change-refund-button-conditions
• changes_styling_on_delete_prereg_buttons
• check_my_pockets
• clear_legal_name_validation
• clears_legal_name_validation
• close_post_form_reg_loophole
• code_review_changes_from_pr_2754
• credit_card_armor_up
• csrf_fixes
• dealer-app-hotel-info
• dealer_reg_closed_page
• departments_improvements
• dept-checklist-email-postcon
• disable_badge_transfers
• display-shirt-size-2302
• drops_requested_any_dept
• edit_panelists_info
• edit_role_title
• email-disapproval-function
• email_pending_report_sent_to_dhs
• emergency_child_badge_fix
• ensure_dealear_reg_is_visible
• escape-popup-macro-quotes
• excel_export_support
• exclude_empty_staff_shirts
• feature_flags
• feed_of_db_changes_access
• fi-2867
• filter_junk
• final_revision_fix
• first-last-legal
• fix-1030
• fix-144
• fix-152
• fix-1632
• fix-1667
• fix-1816-checked-in-badge-at-con
• fix-185-hardcoded-shirt-deadline
• fix-195-gets-any-kind-of-shirt
• fix-1989
• fix-199-alembic-migration-branches
• fix-2104
• fix-2106
• fix-2113
• fix-2139
• fix-2257
• fix-2392
• fix-2402-grouped-campsite
• fix-2404-email-previews
• fix-2421-json-serialize-decimal
• fix-2433
• fix-2436
• fix-2437
• fix-2443
• fix-2454
• fix-2472
• fix-2487
• fix-2493
• fix-2507
• fix-2527
• fix-2533
• fix-2546
• fix-2577
• fix-2580
• fix-2587
• fix-2649
• fix-2653
• fix-2738
• fix-2739
• fix-2761
• fix-2764
• fix-2772
• fix-2775
• fix-2805
• fix-2904
• fix-2942
• fix-3019
• fix-3038
• fix-3066
• fix-3082
• fix-3170
• fix-500-error-personalized-badges
• fix-815
• fix-943
• fix-age-discount-display
• fix-at-con-staff-unset
• fix-date-defaults
• fix-dealer-edit
• fix-extra-donation
• fix-group-minor-badges
• fix-guest-email-error
• fix-human-error-shifts
• fix-magclassic-64-staff-get-food
• fix-magclassic-70-supporter-options-styling
• fix-magclassic-71-remove-django-reference
• fix-magdev138
• fix-magdev167
• fix-magdev185
• fix-magdev231
• fix-magdev252
• fix-magdev256
• fix-magdev275
• fix-magdev281
• fix-magdev282
• fix-magdev283
• fix-magdev284
• fix-magdev286
• fix-magdev291
• fix-magdev295
• fix-magdev296
• fix-magdev298
• fix-magdev301
• fix-magdev303
• fix-magdev306
• fix-magdev307
• fix-magdev308
• fix-magdev309
• fix-magdev310
• fix-magdev311
• fix-magdev313
• fix-magdev314
• fix-magdev316
• fix-magdev317
• fix-magdev320
• fix-magdev321
• fix-magdev325
• fix-magdev340
• fix-magdev341
• fix-magdev346
• fix-magdev348
• fix-magdev350
• fix-magdev352
• fix-magdev354
• fix-magdev358
• fix-magdev363
• fix-magdev365
• fix-magdev367
• fix-magdev372
• fix-magdev381
• fix-magdev382
• fix-magdev386
• fix-magdev388
• fix-magdev390
• fix-magdev400
• fix-magdev401
• fix-magdev402
• fix-magdev406
• fix-magdev407
• fix-magdev413
• fix-mits-500
• fix-mivs-emails
• fix-mivs-round-two-email
• fix-no-hacking
• fix-no-shirt-box-for-staff
• fix-old-shirt-reports
• fix-pep8
• fix-prereg-payment-errors
• fix-shift-review-email
• fix-shifts-whitespace
• fix-signups-calendar-behavior
• fix-spacing-in-refund-policy-template
• fix-staff-merch-flag
• fix_2482
• fix_2498_add_bootstrap_panel_bodies
• fix_2545
• fix_age_discountable_badge_types
• fix_bad_div_close
• fix_combined_css_sourcemap
• fix_csrf_token_errors
• fix_date_field_styling
• fix_email_resend
• fix_extra_donation_page
• fix_graph_dropoff
• fix_group_confirmation_email
• fix_group_payment_received_email
• fix_hotel_info_criteria
• fix_import_watch_list_csv
• fix_logger
• fix_magstock_119_add_boolean_column_sqlite
• fix_navbar_margins
• fix_remaining_badges
• fix_renderable_decorator_merge_error
• fix_tshirt_notice_text
• fix_watchlist_guessing_query
• fixes_103_adds_panels_to_attendee_form
• fixes_135_prereg_cache
• fixes_1547_adds_email_verification_field
• fixes_1789_preserves_got_merch_when_saving_regform
• fixes_1882_guess_attendee_watchlist
• fixes_1967_prereg_index_performance
• fixes_2506_adds_departments_to_shift_signups
• fixes_2510_adds_labels_for_checkboxes
• fixes_2519_accepts_empty_attrs_for_groups
• fixes_2524_better_promo_code_validation
• fixes_2535_prereg_layout
• fixes_2536_remove_dateparser
• fixes_2544
• fixes_2579_adds_hotel_step_to_prereg
• fixes_2585_toggle_regform_volunteer_fields
• fixes_2592_promo_code_expiration_date
• fixes_2620_group_update_grace_period
• fixes_2624_changes_dates_to_allow_email_approval
• fixes_2632_adds_hotel_booking_automated_email
• fixes_2640_setup_teardown_slots
• fixes_2652_3001_dealer_info_export
• fixes_2725_hotel_info_sender
• fixes_2729_group_badge_verbiage
• fixes_2732_group_ribbons
• fixes_2737_better_staff_shirt_description
• fixes_2770_legal_name_woes
• fixes_2780_promo_code
• fixes_2834_badge_num_none
• fixes_2871_adds_group_management_link_to_confirm_email
• fixes_2875
• fixes_2911_migration_chooses_wrong_downrevision
• fixes_2911_migration_downrevision_for_other_plugins
• fixes_2928
• fixes_2931
• fixes_2969
• fixes_2991_delinquent_checklist_email
• fixes_3016_adds_shift_visibility
• fixes_3073
• fixes_3105
• fixes_3172_promo_code_export
• fixes_3189
• fixes_3197
• fixes_85_prereg_updates
• fixes_MAGDEV-232
• fixes_admin_reg_form_delete
• fixes_badge_transfer_email
• fixes_celery_logger_indent
• fixes_cellphone_required_toggle_on_regform
• fixes_convert_to_absolute_url
• fixes_csrf_token_key_error
• fixes_dept_checklist_emails
• fixes_dev_git_info
• fixes_disabled_submit_button_with_invalid_email
• fixes_discountable_badge_types
• fixes_donation_swag_error
• fixes_extra15_on_staffer_signups
• fixes_html_email_preview
• fixes_int_options_custom_tag
• fixes_invalid_literal_for_int
• fixes_jumpy_legal_name_label
• fixes_magwest_20_hides_volunteer_free_food_reference
• fixes_mobile_toastr_messages
• fixes_pseudo_group_badge_reverting_to_attendee_badge
• fixes_readonly_badge_name
• fixes_readonly_staffing_checkbox_when_attendee_has_shifts
• fixes_register_group_member_hotel_info
• fixes_registration
• fixes_staff_badge_creation
• fixes_staff_shirt_email
• fixes_summary_departments
• fixes_swag_list_confusion
• fixes_total_cost
• fixes_travis_libcap
• fixes_unit_tests
• fixes_unpaid_badge_type_switch
• focus-group-search
• focus-keyword-field-for-fodc
• fodc-col-widths-try-2
• force-dept-head-ribbon
• force-magdev286
• forces_dept_head_ribbon_checkbox
• format-dealer-start-date
• guests-api
• handle_jinja_undefined
• handle_missing_id_errors
• hides_non_soliciting_depts_shifts
• hotel-checklist-update
• hotel-disclaimer-update
• hotel-email-text-update
• hotel-text-clarification
• hotel_assignment_performance
• hotel_email_date_again
• hotel_info_request_confirmation
• improve-printed-badge-deadlines
• improve_attendee_group_emails
• improves_automated_emails
• improves_dept_perms_granularity
• improves_max_badge_sales_comparison
• improves_toggle_checkbox_macro
• jcooter-patch-1
• js-refactor
• larger_dept_checklist_email_window
• less_annoying_messages
• lock-down-badge-status
• locks_down_database_feed
• logging_update
• make-food-optional
• make-prepay-only-more-thorough
• make.dealer.url.clickable
• make_dealers_always_get_hotel_info
• makes_attendance_graph_responsive
• makes_insert_admin_work_again
• makes_validation_messages_red
• master
• menu-priority-sorting
• menu_and_sitemap_performance_improvements
• merch_improvements
• merge_pending_report
• merge_plugins_2
• merge_plugins_3
• merge_plugins_4
• merge_plugins_5
• merge_plugins_6
• migration-support
• mits_migration_ordering
• mits_waiver_fix
• more_template_whitespace_fixes
• move_email_daemon_into_new_file
• move_schedule_menu_to_panels
• normalized_email_attendee_lookup
• old_style_super_supporter
• performance_improvements
• pin-requirements
• pin_cherrypy_version
• poc_and_checklist_admin_perms
• pre_pre_checkin_check_check
• pre_reggie
• prevent_loading_gif_from_punching_through_cache
• promo_code_generator
• reenable_badge_transfers
• reenable_notify_admins_of_any_pending_emails
• refactor_scheduling_page
• reggie
• reggie_1
• reggie_2
• remove-2d-barcode-button
• remove-ac-logo
• remove-baseadmin
• remove-group-payment-method
• remove-legal-name-check
• remove-state-secrets
• remove_test_imports_from_common_py
• removes_common_py
• removes_custom_ribbon_labels_property
• removes_hotel_info_email
• removes_required_attribute_from_regform_fields
• rename-bands-to-guests
• renames_attendance_graph
• replace-pass-with-badge
• replace_scheduling_system
• required_changes_for_magprime_unit_tests
• residue
• restore-arbitrary-link
• retina_merch_tier_icons
• revert-2532-fix-144
• revert-3401-patch-1
• revert_session_expunge_all
• rock_island
• safer_resave_all_staffers
• scheduled_tasks_process
• send-more-confirmation-emails
• send_sms_flag
• sep_cmd_db_initialization
• sessionized_defer_defaults
• set-denied-group-badges-to-base-price
• setup_teardown_exempt
• shift_importer
• show-pending-email-example
• speed-up-at-door-page
• stop-shifts-from-at-con-public
• summarize_all_donation_tiers
• super_2019_generic_theme
• support-dealer-reg-autoclose
• supporter_count_clarification
• supports_barcode_badge_num_search
• template_paranoia
• test-bitcoin-payment
• tests_for_mff_email_template_bug
• token_based_api_auth
• tox_test_defaults
• update-latest-readmes
• update-pytz
• update-sqlite-install
• update-test-docs
• update_watchlist_match_screen
• updates_disclaimer_urls
• updates_hotel_setup_dept_checklist
• updates_test_data
• updates_to_api
• vicki-wip-reset
• volunteer_agreement
• volunteer_checklists_summary_csv
• work-without-rock-island-groups
• year_fix

Build # 5496

Build Type

Pull #3261

travis-ci

Committed by web-flow

Commit Message

Make base_badge_price actually store correct price
Fixes MAGDEV-254.

One of the entire points of base_badge_price was to allow us to store what the badge WOULD have cost if it were a regular attendee badge... a purpose we completely undermined by putting discounted and overridden prices in the calculation we used for base_badge_price. Most noticeably, this led us to charging dealers whose apps had been rejected only the dealer price, not the attendee price at the time they applied. We've instead moved ALL discounts and overrides to calculate_badge_cost, so they get applied to any price except the "base" price.

Thank goodness for unit tests.

Pull Request Pull Request #3261: Make base_badge_price actually store correct price

Run Details

10 of 10 new or added lines in 1 file covered. (100.0%)

6264 of 13237 relevant lines covered (47.32%)

0.47 hits per line