From 18450015fcc5434236ef4fd1193975b434cb4d2a Mon Sep 17 00:00:00 2001 From: kristinmerbach <78749008+kristinmerbach@users.noreply.github.com> Date: Sat, 20 Jul 2024 15:42:43 -0700 Subject: [PATCH] Plan shopping review and submit (#4026) * more work on consumer flow * upgrade to bs4 base * revert temp changes for design review to trunk * personal information page redo * plan shopping page visuals work * more plan shopping styling * minor fixes * clean up from rebase * receipt page translations * upgrade to bs4 base * revert temp changes for design review to trunk * fix fonts, more ridp work started * plan shopping page visuals work * started review submitted plan page * started calculator plus lots of cleanup * session timeout * faa manage family fixes * fdsh error * no flash on waiting for elgi results * plan shopping tile * aptc minumum --------- Signed-off-by: kristinmerbach <78749008+kristinmerbach@users.noreply.github.com> Co-authored-by: Sarah Austin --- app/assets/javascripts/plan_shopping.js.erb | 68 ++++++++ .../insured/plan_shoppings_controller.rb | 16 +- app/javascript/css/_buttons.scss | 4 + app/javascript/css/colors.scss | 13 ++ app/javascript/css/main.scss | 61 +++++++ app/javascript/css/table.scss | 23 +++ app/models/benefit_coverage_period.rb | 5 +- .../insured/family_members/index.html.erb | 1 - .../_outstanding_ridp_documents.html.erb | 2 +- .../insured/group_selection/new.html.erb | 2 +- .../_individual_agreement.en.html.erb | 53 ++++++ .../_individual_coverage_information.html.erb | 12 +- .../plan_shoppings/_plan_details.html.erb | 158 +++++++++--------- .../insured/plan_shoppings/thankyou.html.erb | 111 ++++++++++++ app/views/layouts/application.html.erb | 3 - app/views/layouts/single_column.html.erb | 1 - .../shared/plan_shoppings/_sbc_link.html.erb | 8 +- .../bs4/v1/navs/_header.html.erb | 2 +- .../applications_controller.rb | 2 +- .../application_checklist.html.erb | 6 +- 20 files changed, 447 insertions(+), 104 deletions(-) diff --git a/app/assets/javascripts/plan_shopping.js.erb b/app/assets/javascripts/plan_shopping.js.erb index 8a9f8681ec3..0812d094e18 100644 --- a/app/assets/javascripts/plan_shopping.js.erb +++ b/app/assets/javascripts/plan_shopping.js.erb @@ -259,6 +259,74 @@ $(function() { } }); + $(document).on('change', 'input[name="elected_aptc_pct"]', function(){ + var max = parseFloat($('input#elected_aptc_value').attr('max')); + var elected_pct = $("input[name='elected_aptc_pct']").val() / 100; + var elected_amount = parseFloat($('#max_aptc').attr('value')).toFixed(2) * parseFloat(elected_pct).toFixed(2); + if (elected_amount <= 1) { + elected_amount = 1.00; + } + if (elected_amount > max) { + elected_amount = max; + $("input[name='elected_aptc_pct']").val(100); + } + $('#elected_aptc_value').val(elected_amount.toFixed(2)); + $('#elected_aptc_value').attr('value', elected_amount.toFixed(2)); + }); + + $(document).on('change', 'input#elected_aptc_value', function(){ + var elected_aptc = $(this).val(); + var max = $('input#elected_aptc_value').attr('max'); + var max_aptc = $('input#max_aptc').val(); + elected_pct = (elected_aptc/max_aptc).toFixed(2) * 100; + if (elected_pct <= 0) { + elected_amount = 0; + } + if (elected_pct > 100) { + elected_pct = 100; + $('#elected_aptc_value').val(max); + } + $("input[name='elected_aptc_pct']").val(elected_pct); + }); + + $("#updateAptc").on('click', function(){ + $(this).addClass('hidden'); + $('.aptc').removeClass('hidden'); + }); + + var USDollar = new Intl.NumberFormat('en-US', { + style: 'currency', + currency: 'USD', + }); + + $("#aptc_submit").on('click', function(){ + var elected_aptc = $("input#elected_aptc_value").val(); + var elected_pct = $("input[name='elected_aptc_pct']").val(); + var coverage_kind = $("input#coverage_kind").val(); + var market_kind = $("input#market_kind").val(); + var plan = $("input#plan").val(); + var enrollment = $("input#enrollment").val(); + $('.aptc-percentage').text(elected_pct); + $('.aptc-amount').text(USDollar.format(elected_aptc)); + $.ajax({ + type: "POST", + url: $('#set_elected_aptc_url').val(), + data: { + 'elected_aptc': elected_aptc, + 'market_kind': market_kind, + 'coverage_kind': coverage_kind, + 'plan': plan, + 'enrollment': enrollment + }, + success: function(data){ + response = JSON.parse(JSON.stringify(data)); + var amount = USDollar.format(data['responsible_amount']); + $('#resp-amount').text(amount); + }, + }); + }); + + $(document).on('click', '.all-filters-row .apply-btn', function(){ applyPlanFilters(); diff --git a/app/controllers/insured/plan_shoppings_controller.rb b/app/controllers/insured/plan_shoppings_controller.rb index 1548af2d96f..60b69f0b577 100644 --- a/app/controllers/insured/plan_shoppings_controller.rb +++ b/app/controllers/insured/plan_shoppings_controller.rb @@ -16,7 +16,7 @@ class Insured::PlanShoppingsController < ApplicationController before_action :validate_rating_address, only: [:show] before_action :check_enrollment_state, only: [:show, :thankyou] before_action :set_cache_headers, only: [:show, :thankyou] - before_action :enable_bs4_layout, only: [:show, :plans, :receipt] if EnrollRegistry.feature_enabled?(:bs4_consumer_flow) + before_action :enable_bs4_layout, only: [:show, :plans, :receipt, :thankyou] if EnrollRegistry.feature_enabled?(:bs4_consumer_flow) layout :resolve_layout @@ -240,8 +240,20 @@ def set_elected_aptc plan_comparision_obj = ::Services::CheckbookServices::PlanComparision.new(@hbx_enrollment) plan_comparision_obj.elected_aptc = session[:elected_aptc] checkbook_url = plan_comparision_obj.generate_url + + # for the thank you page will need member data returned to update table + if params[:plan].present? && params[:enrollment].present? + plan = BenefitMarkets::Products::Product.where(:id => params[:plan])&.first + enrollment = HbxEnrollment.find(params[:enrollment]) + if plan.present? && enrollment + decorated_plan = UnassistedPlanCostDecorator.new(plan, enrollment, session[:elected_aptc]) + responsible_amount = decorated_plan.total_employee_cost - enrollment.eligible_child_care_subsidy.to_f + amount = responsible_amount < 1 ? 0.00 : responsible_amount + end + end + respond_to do |format| - format.json { render json: {message: 'ok',checkbook_url: checkbook_url } } + format.json { render json: {message: 'ok',checkbook_url: checkbook_url, responsible_amount: amount } } end end diff --git a/app/javascript/css/_buttons.scss b/app/javascript/css/_buttons.scss index 9438d0fb036..35e0180d610 100644 --- a/app/javascript/css/_buttons.scss +++ b/app/javascript/css/_buttons.scss @@ -111,3 +111,7 @@ button.unstyled, button.close { color: var(--button-primary-active-color); } } + +button.short, .button.short, .btn.short { + padding: 6px 12px; +} diff --git a/app/javascript/css/colors.scss b/app/javascript/css/colors.scss index 9b09a7d97df..4809113a38f 100644 --- a/app/javascript/css/colors.scss +++ b/app/javascript/css/colors.scss @@ -31,6 +31,14 @@ --error-color: hsl(0, 69%, 38%); --error-tint: hsl(0, 80%, 86%); --body-divider: hsl(214, 16%, 80%); + --platinum-border: hsla(240, 2%, 37%, 1); + --platinum-bg: hsla(240, 1%, 84%, 1); + --gold-border: hsla(43, 96%, 54%, 1); + --gold-bg: hsla(44, 93%, 88%, 1); + --silver-border: hsla(0, 0%, 75%, 1); + --silver-bg: hsla(0, 0%, 94%, 1); + --bronze-border: hsla(30, 61%, 50%, 1); + --bronze-bg: hsla(31, 60%, 87%, 1); // May be unique colors, but used by all clients --bright-green: hsl(65, 100%, 42%); @@ -116,6 +124,11 @@ --button-error-color: var(--status-red); --button-error-hover-color: var(--status-red-hover); --button-error-active-color: var(--status-red-active); + + --badge-current-bg: hsla(206, 30%, 82%, 1); + --badge-current-border: hsla(206, 33%, 66%, 1); + --badge-standard-bg: hsla(321, 19%, 80%, 1); + --badge-standard-border: hsla(317, 33%, 38%, 1); } [data-theme='dc'] { diff --git a/app/javascript/css/main.scss b/app/javascript/css/main.scss index f2f8e92ec78..b7b00204240 100644 --- a/app/javascript/css/main.scss +++ b/app/javascript/css/main.scss @@ -209,6 +209,10 @@ ul.list-right-section { .sm-hide { display: none; } + + .sm-hide { + display: none; + } } .card { @@ -258,6 +262,47 @@ ul.list-right-section { } } +.badge-current-plan { + background-color: var(--badge-current-bg); + border: 1px solid var(--badge-current-border); + padding: 1px 8px; +} + +.badge-standard { + background-color: var(--badge-standard-bg); + border: 1px solid var(--badge-standard-border); +} + +.badge-platinum { + font-weight: 400; + background-color: var(--platinum-bg); + border: 1px solid var(--platinum-border); +} + +.badge-gold { + font-weight: 400; + background-color: var(--gold-bg); + border: 1px solid var(--gold-border); +} + +.badge-silver { + font-weight: 400; + background-color: var(--silver-bg); + border: 1px solid var(--silver-border); +} + +.badge-bronze { + font-weight: 400; + background-color: var(--bronze-bg); + border: 1px solid var(--bronze-border); +} + +.badge-catastrophic { + font-weight: 400; + background-color: var(--error-tint); + border: 1px solid var(--error-shade); +} + .float-end { float: inline-end; } @@ -545,8 +590,24 @@ a.disabled { font-weight: 600; } +.filter-input-block legend.bb, .sort-area legend { + padding-bottom: ($spacer / 2); + border-bottom: 1px solid var(--body-divider); +} .filter-input-block legend.bb, .sort-area legend { padding-bottom: ($spacer / 2); border-bottom: 1px solid var(--body-divider); } + +.plan-card { + background: var(--grey-010); + + .plan-footer { + a:not(.btn) { + text-decoration: none; + font-weight: 600; + color: var(--info-color); + } + } +} diff --git a/app/javascript/css/table.scss b/app/javascript/css/table.scss index 00522fd6e35..ea70478789c 100644 --- a/app/javascript/css/table.scss +++ b/app/javascript/css/table.scss @@ -82,3 +82,26 @@ table { font-weight: 600; } } + +.compare-table.table { + th, td { + border-top: none; + border-bottom: none; + } + tr.left-border-all td:nth-child(1n+1) { + border-right: 1px solid var(--grey-060); + } + tr:not(.left-border-all) td:nth-child(1n+1) { + border-right: 1px solid var(--grey-030); + } + tr:not(.left-border-all) td:nth-child(2n+1) { + border-right: 1px solid var(--grey-060); + } + tr.left-border-all td:last-of-type, tr:not(.left-border-all) td:last-of-type { + border-right: none; + } + th { + background: var(--grey-010); + font-weight: 600; + } +} diff --git a/app/models/benefit_coverage_period.rb b/app/models/benefit_coverage_period.rb index 9cddbef976c..551379e5b12 100644 --- a/app/models/benefit_coverage_period.rb +++ b/app/models/benefit_coverage_period.rb @@ -177,10 +177,7 @@ def elected_plans_by_enrollment_members(hbx_enrollment_members, coverage_kind, t 'csr_limited' end end - - ivl_bgs = get_benefit_packages({family_members: family_members, coverage_kind: coverage_kind, family: hbx_enrollment.family, american_indian_members: american_indian_members, - hbx_enrollment: hbx_enrollment, - effective_on: hbx_enrollment.effective_on, market: market, shopping_family_members_ids: shopping_family_member_ids, csr_kind: csr_kind }).uniq + ivl_bgs = get_benefit_packages({family_members: family_members, coverage_kind: coverage_kind, family: hbx_enrollment.family, american_indian_members: american_indian_members, hbx_enrollment: hbx_enrollment, effective_on: hbx_enrollment.effective_on, market: market, shopping_family_members_ids: shopping_family_member_ids, csr_kind: csr_kind }).uniq elected_product_ids = ivl_bgs.map(&:benefit_ids).flatten.uniq market = market.nil? || market == 'coverall' ? 'individual' : market product_entries({market: market, coverage_kind: coverage_kind, csr_kind: csr_kind, elected_product_ids: elected_product_ids, subcriber: subcriber, effective_on: hbx_enrollment.effective_on}) diff --git a/app/views/insured/family_members/index.html.erb b/app/views/insured/family_members/index.html.erb index d05ace0d636..63b7ce6486a 100644 --- a/app/views/insured/family_members/index.html.erb +++ b/app/views/insured/family_members/index.html.erb @@ -1,6 +1,5 @@ <% if @bs4 %> <%= render partial: 'shared/plan_shopping_progress', locals: { current_page: :household_info, nav_options: family_info_progress_hash } %> -
<%= render partial: 'family_members' %> diff --git a/app/views/insured/fdsh_ridp_verifications/_outstanding_ridp_documents.html.erb b/app/views/insured/fdsh_ridp_verifications/_outstanding_ridp_documents.html.erb index 3cc8a3db9b7..a2d8e229f5e 100644 --- a/app/views/insured/fdsh_ridp_verifications/_outstanding_ridp_documents.html.erb +++ b/app/views/insured/fdsh_ridp_verifications/_outstanding_ridp_documents.html.erb @@ -75,7 +75,7 @@ <% end %> <% if pundit_allow(HbxProfile, :can_delete_identity_application_documents?) %> - <%= h(link_to insured_ridp_document_path(ridp_doc, :person_id => @person.id), method: :delete, remote: true, class: "btn-error outline text-nowrap" do %> + <%= h(link_to(insured_ridp_document_path(ridp_doc, :person_id => @person.id), method: :delete, remote: true, class: "btn-error outline text-nowrap") do %> <%= l10n("insured.consumer_roles.upload_ridp_documents.remove") %> <% end)%> diff --git a/app/views/insured/group_selection/new.html.erb b/app/views/insured/group_selection/new.html.erb index 03198914a19..437edc884e6 100644 --- a/app/views/insured/group_selection/new.html.erb +++ b/app/views/insured/group_selection/new.html.erb @@ -125,7 +125,6 @@
<%= render partial: "shared/progress_navigation_buttons", locals: { previous_style: "outline", button_type: "submit" } %>
- <% end %>
@@ -288,6 +287,7 @@
<% if @change_plan.blank? && @market_kind == "individual" %> + <% if @enrollment_kind.blank? && is_under_open_enrollment? %> <%= render partial: 'shared/individual_progress', locals: {step: '3'} %> <% else %> diff --git a/app/views/insured/plan_shoppings/_individual_agreement.en.html.erb b/app/views/insured/plan_shoppings/_individual_agreement.en.html.erb index 838a487b3b2..7f6d6977c62 100644 --- a/app/views/insured/plan_shoppings/_individual_agreement.en.html.erb +++ b/app/views/insured/plan_shoppings/_individual_agreement.en.html.erb @@ -1,3 +1,55 @@ +<% if @bs4 %> +
+

<%= l10n("insured.individual_agreement.agreement.title") %>

+

<%= l10n("insured.individual_agreement.agreement.report_changes", contact_center_name: contact_center_name, contact_center_phone_number: contact_center_phone_number) %>

+

<%= l10n("insured.individual_agreement.agreement.i_am_signature") %>

+

<%= l10n("insured.individual_agreement.agreement.reviewed_info") %>

+ <% if EnrollRegistry.feature_enabled?(:extended_aptc_individual_agreement_message) && @plan.total_aptc_amount > 0 %> + <% cov_year = locals[:coverage_year] %> +

<%= l10n("insured.individual_agreement.agreement.aptc.on_my_behalf") %>

+
    +
  • <%= l10n("insured.individual_agreement.agreement.aptc.on_my_behalf.file_return", coverage_year: cov_year)%>
    • +
  • <%= l10n("insured.individual_agreement.agreement.aptc.on_my_behalf.if_married_file", coverage_year: cov_year) %>
    • +
+

<%= l10n("insured.individual_agreement.agreement.aptc.i_expect") %>

+
    +
  • <%= l10n("insured.individual_agreement.agreement.aptc.i_expect.not_dependent", coverage_year: cov_year) %>
    • +
  • <%= l10n("insured.individual_agreement.agreement.aptc.i_expect.claim_dependents", coverage_year: cov_year, site_short_name: site_short_name) %>
    • +
+

<%= l10n("insured.individual_agreement.agreement.aptc.if_changes") %>

+
    +
  • <%= l10n("insured.individual_agreement.agreement.aptc.if_changes.impact_credit") %>
    • +
  • <%= l10n("insured.individual_agreement.agreement.aptc.if_changes.irs_compares", coverage_year: cov_year) %>
    • +
+ <% end %> + +
+
+

<%= l10n("insured.individual_agreement.terms_conditions.title") %>

+

<%= l10n("insured.individual_agreement.terms_conditions.cant_change_terms") %>

+

<%= l10n("insured.individual_agreement.terms_conditions.limitations") %>

+

<%= l10n("insured.individual_agreement.terms_conditions.collect_info", aca_state_name: aca_state_name) %>

+

<%= l10n("insured.individual_agreement.terms_conditions.best_of_knowledge") %>

+

<%= l10n("insured.individual_agreement.terms_conditions.contract") %>

+

<%= l10n("insured.individual_agreement.terms_conditions.insurer_agreement") %>

+

<%= l10n("insured.individual_agreement.terms_conditions.fraud_warning") %>

+

<%= l10n("insured.individual_agreement.electronic_signature.title") %>

+

<%= l10n("insured.individual_agreement.electronic_signature.desc") %>

+
+
+ + <%= text_field_tag 'first_name_thank_you', "", :placeholder => l10n("first_name"), :class => "thank_you_field" %> +
+
+ + <%= text_field_tag 'last_name_thank_you', "", :placeholder => l10n("last_name"), :class => "thank_you_field" %> +
+
+ <% person = @enrollment.try(:household).try(:family).try(:primary_applicant).try(:person) || @person %> + <%= hidden_field_tag 'subscriber_first_name', person.first_name.downcase %> + <%= hidden_field_tag 'subscriber_last_name', person.last_name.downcase %> +
+<% else %>
@@ -61,3 +113,4 @@
+<% end %> diff --git a/app/views/insured/plan_shoppings/_individual_coverage_information.html.erb b/app/views/insured/plan_shoppings/_individual_coverage_information.html.erb index 610c04894f4..d60803cf7de 100644 --- a/app/views/insured/plan_shoppings/_individual_coverage_information.html.erb +++ b/app/views/insured/plan_shoppings/_individual_coverage_information.html.erb @@ -2,7 +2,7 @@ <% calculate = (defined? calculate) ? calculate : true %> <% family_tier_eligible = @enrollment.product&.family_based_rating? %> <% if @bs4 %> -
+
@@ -19,7 +19,7 @@ <% @enrollment.hbx_enrollment_members.each do |member| %> - + @@ -54,7 +54,7 @@ <% end %> <% end %> - + <% if osse_eligible %> @@ -62,13 +62,13 @@ <% end %> <% if calculate %> - + <% responsible_amount = @plan.total_employee_cost - @enrollment.eligible_child_care_subsidy.to_f %> <% else %> - + <% responsible_amount = @plan.total_premium - @enrollment.applied_aptc_amount.to_f - @enrollment.eligible_child_care_subsidy.to_f %> <% end %> - +
<%= member.person.full_name %> <%= member.primary_relationship.titleize %> <%= dob_in_words(member.person.age_on(TimeKeeper.date_of_record), member.person.dob) %>
<%= l10n("plans.plan_shopping.receipt.total").upcase %> <%= number_to_currency(@plan.total_premium) %><%= number_to_currency(@enrollment.eligible_child_care_subsidy.to_f) %><%= number_to_currency(@plan.total_aptc_amount) %><%= number_to_currency(@plan.total_aptc_amount) %><%= number_to_currency(@enrollment.applied_aptc_amount.to_f) %><%= number_to_currency(@enrollment.applied_aptc_amount.to_f) %><%= number_to_currency((responsible_amount < 1 ? 0.00 : responsible_amount)) %><%= number_to_currency((responsible_amount < 1 ? 0.00 : responsible_amount)) %>
diff --git a/app/views/insured/plan_shoppings/_plan_details.html.erb b/app/views/insured/plan_shoppings/_plan_details.html.erb index 39474ec37bf..ae4deb20cd1 100644 --- a/app/views/insured/plan_shoppings/_plan_details.html.erb +++ b/app/views/insured/plan_shoppings/_plan_details.html.erb @@ -1,6 +1,6 @@ <% plan_carrier = Caches::MongoidCache.lookup(BenefitSponsors::Organizations::Organization.issuer_profiles, plan.issuer_profile_id) { plan.issuer_profile } %> <% if @bs4 %> -
-
-
- <% if plan.try(:is_standard_plan) %> - - <%= plan.standard_plan_label.titleize %> - - <% end %> - - <% if true %> - <%# if @enrolled_hbx_enrollment_plan_ids.include?(plan.id) %> - +
+
+ +
+
+
+ <% if plan.try(:is_standard_plan) %> + + + Checkmark + + + + <%= plan.standard_plan_label.titleize %> + + <% end %> + <% if @enrolled_hbx_enrollment_plan_ids.include?(plan.id) %> + + + Star + + + + + + + + + <%= l10n("your_current_plan", year: plan.try(:active_year)) %> - <% end %> + <% end %> +
- +
+
-
<%= display_carrier_logo(Maybe.new(plan), {width: 80}) %>
-
+
<%= display_carrier_logo(Maybe.new(plan), {width: 100}) %>
+

<%= link_to summary_products_plans_path({:standard_component_id => plan.hios_id, hbx_enrollment_id: @hbx_enrollment.id, active_year: plan.try(:active_year), market_kind: @market_kind, coverage_kind: @coverage_kind}), {:remote => true} do %> <% if plan.is_csr?%> @@ -41,67 +64,56 @@ <% end %> <%= plan.name %> <% end %> -
- <%= plan_carrier.legal_name %>

-
-
+
+
+ <%= l10n("premium") %> <% if @tax_household.present? && params[:market_kind]=='individual' %> -

<%= number_to_currency(shopping_group_premium(plan.total_employee_cost, plan.total_ehb_premium, plan.total_childcare_subsidy_amount, plan.can_use_aptc?)) %>

+

<%= number_to_currency(shopping_group_premium(plan.total_employee_cost, plan.total_ehb_premium, plan.total_childcare_subsidy_amount, plan.can_use_aptc?)) %>

<% else %> -

<%= number_to_currency(plan.total_employee_cost - plan.total_childcare_subsidy_amount) %>

+

<%= number_to_currency(plan.total_employee_cost - plan.total_childcare_subsidy_amount) %>

<% end %> - /<%= l10n("month") %> + per <%= l10n("month") %>
-
- -
- - - - - - - - - - - - - - - - - -
<%= l10n("type") %><%= l10n("level") %><%= l10n("network") %><%= l10n("deductible") %>
<%= plan.product_type ? plan.product_type.upcase : "" %> - <% plan_level = plan.metal_level.titleize %> - - <%= plan_level != 'Dental' ? plan_level : display_dental_metal_level(plan).titleize %> - - - <% if offers_nationwide_plans? %> - <%= plan.network %> - <% else %> - <% if plan.network_information.present? %> - Network Notes - - <% end %> - <% end %> - <%= deductible_display(@hbx_enrollment, plan) %>
+
+
+
Carrier
+
<%= plan_carrier.legal_name %>
+
<%= l10n("network") %>
+
+ <% if offers_nationwide_plans? %> + <%= plan.network %> + <% else %> + <% if plan.network_information.present? %> + Network Notes + + <% end %> + <% end %> +
+
<%= l10n("deductible") %>
+
<%= deductible_display(@hbx_enrollment, plan) %>
+
+
+
<%= l10n("level") %>
+
+ <% plan_level = plan.metal_level.titleize %> + + <%= plan_level != 'Dental' ? plan_level : display_dental_metal_level(plan).titleize %> + +
+
<%= l10n("type") %>
+
<%= plan.product_type ? plan.product_type.upcase : "" %>
+
-
-
- - <%= l10n("compare") %> -
-
+
+
<%= render partial: "shared/plan_shoppings/sbc_link", locals: { plan: plan, custom_css: false } %> + <%= link_to l10n("see_details"), summary_products_plans_path({plan_id: plan.id, :standard_component_id => plan.hios_id, hbx_enrollment_id: @hbx_enrollment.id, market_kind: @market_kind, coverage_kind: @coverage_kind, enrollment_kind: @enrollment_kind, active_year: plan.try(:active_year)}), {:class => "primary-text ml-4", :remote => true} %>
-
<% if (@tax_household || @aptc_grants) && params[:market_kind]=='individual' && params[:coverage_kind] == 'health' %> <% if @csr_available && plan.metal_level != "silver" %> <%= link_to l10n("select_plan"), "javascript:void(0)", class: 'btn btn-default btn-right', data: {'toggle': 'modal', 'target': "#csrEligibleReminder-#{plan.id}"} %> @@ -113,8 +125,6 @@ <% else %> <%= link_to(l10n("select_plan"), "javascript:void(0)", {class: 'btn btn-default btn-right plan-select select', data: {url: thankyou_insured_plan_shopping_path(@hbx_enrollment, plan_id: plan.id, change_plan: @change_plan, market_kind: @market_kind, coverage_kind: @coverage_kind, enrollment_kind: @enrollment_kind)}}) %> <% end %> - <%= link_to l10n("see_details"), summary_products_plans_path({plan_id: plan.id, :standard_component_id => plan.hios_id, hbx_enrollment_id: @hbx_enrollment.id, market_kind: @market_kind, coverage_kind: @coverage_kind, enrollment_kind: @enrollment_kind, active_year: plan.try(:active_year)}), {:class => "btn btn-default", :remote => true} %> -
@@ -210,7 +220,7 @@
@@ -245,7 +255,7 @@ <% end %> <% end %> diff --git a/components/financial_assistance/app/controllers/financial_assistance/applications_controller.rb b/components/financial_assistance/app/controllers/financial_assistance/applications_controller.rb index 200e88b658d..b315e55f3ac 100644 --- a/components/financial_assistance/app/controllers/financial_assistance/applications_controller.rb +++ b/components/financial_assistance/app/controllers/financial_assistance/applications_controller.rb @@ -571,7 +571,7 @@ def submit_and_publish_application_redirect_path return { path: application_publish_error_application_path(@application), flash: { error: build_error_messages(@application) } } unless @application.complete? publish_result = determination_request_class.new.call(application_id: @application.id) - return { path: wait_for_eligibility_response_application_path(@application), flash: nil } if publish_result.success? + return { path: wait_for_eligibility_response_application_path(@application) } if publish_result.success? @application.unsubmit! if @application.may_unsubmit? diff --git a/components/financial_assistance/app/views/financial_assistance/applications/application_checklist.html.erb b/components/financial_assistance/app/views/financial_assistance/applications/application_checklist.html.erb index 3603d0ea796..614f4b5da88 100644 --- a/components/financial_assistance/app/views/financial_assistance/applications/application_checklist.html.erb +++ b/components/financial_assistance/app/views/financial_assistance/applications/application_checklist.html.erb @@ -64,12 +64,8 @@
- <% content_for :submit_button do %> - <%= h(link_to_with_noopener_noreferrer(l10n("faa.checklist.begin_application"), financial_assistance.edit_application_path(@application), class: 'button btn-continue', id: 'btn-continue')) %> - <% end %> <%= render partial: 'financial_assistance/shared/progress_navigation_buttons', locals: { - previous_link: application_checklist_previous_url(@application), - next_link: financial_assistance.edit_application_path(@application) + previous_link: application_checklist_previous_url(@application) } %> <% else %>