Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enrollment Success #1507

Closed
wants to merge 1 commit into from
Closed

Enrollment Success #1507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions benefits/core/migrations/0001_initial.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,6 @@ class Migration(migrations.Migration):
("eligibility_confirmed_item_heading", models.TextField(null=True)),
("eligibility_confirmed_item_details", models.TextField(null=True)),
("enrollment_success_confirm_item_details", models.TextField()),
("enrollment_success_expiry_item_heading", models.TextField(null=True)),
("enrollment_success_expiry_item_details", models.TextField(null=True)),
(
"auth_provider",
models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to="core.authprovider"),
Expand Down
8 changes: 0 additions & 8 deletions benefits/core/migrations/0002_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,6 @@ def load_data(app, *args, **kwargs):
"enrollment.pages.index.login_gov.eligibility_confirmed_item.details%(transit_agency_short_name)s"
),
enrollment_success_confirm_item_details=_("enrollment.pages.success.login_gov.confirm_item.details"),
enrollment_success_expiry_item_heading=None,
enrollment_success_expiry_item_details=None,
)

mst_veteran_verifier = EligibilityVerifier.objects.create(
Expand All @@ -197,8 +195,6 @@ def load_data(app, *args, **kwargs):
unverified_title=_("eligibility.pages.unverified.title"),
unverified_blurb=_("eligibility.pages.unverified.p[0]"),
enrollment_success_confirm_item_details=_("enrollment.pages.success.veteran.confirm_item.details"),
enrollment_success_expiry_item_heading=None,
enrollment_success_expiry_item_details=None,
)

mst_courtesy_card_verifier = EligibilityVerifier.objects.create(
Expand Down Expand Up @@ -237,8 +233,6 @@ def load_data(app, *args, **kwargs):
eligibility_confirmed_item_heading=None,
eligibility_confirmed_item_details=None,
enrollment_success_confirm_item_details=_("enrollment.pages.success.mst_cc.confirm_item.details"),
enrollment_success_expiry_item_heading=_("enrollment.pages.success.mst_cc.expiry_item.heading"),
enrollment_success_expiry_item_details=_("enrollment.pages.success.mst_cc.expiry_item.details"),
)

sacrt_oauth_claims_verifier = EligibilityVerifier.objects.create(
Expand All @@ -264,8 +258,6 @@ def load_data(app, *args, **kwargs):
"enrollment.pages.index.login_gov.eligibility_confirmed_item.details%(transit_agency_short_name)s"
),
enrollment_success_confirm_item_details=_("enrollment.pages.success.login_gov.confirm_item.details"),
enrollment_success_expiry_item_heading=None,
enrollment_success_expiry_item_details=None,
)

PaymentProcessor = app.get_model("core", "PaymentProcessor")
Expand Down
2 changes: 0 additions & 2 deletions benefits/core/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,6 @@ class EligibilityVerifier(models.Model):
eligibility_confirmed_item_details = models.TextField(null=True)
# Fields for the dynamic enrollment success message
enrollment_success_confirm_item_details = models.TextField()
enrollment_success_expiry_item_heading = models.TextField(null=True)
enrollment_success_expiry_item_details = models.TextField(null=True)

def __str__(self):
return self.name
Expand Down
16 changes: 1 addition & 15 deletions benefits/enrollment/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,25 +189,11 @@ def success(request):
icon=viewmodels.Icon("happybus", pgettext("image alt text", "core.icons.happybus")),
details=[
_(verifier.enrollment_success_confirm_item_details),
format_html(_("enrollment.pages.success.helplink%(link)s") % {"link": f"{reverse(ROUTE_HELP)}"}),
_("enrollment.pages.success.details"),
],
)
media = [success_item]

if verifier.enrollment_success_expiry_item_heading or verifier.enrollment_success_expiry_item_details:
heading = (
_(verifier.enrollment_success_expiry_item_heading) if verifier.enrollment_success_expiry_item_heading else None
)
details = (
_(verifier.enrollment_success_expiry_item_details) if verifier.enrollment_success_expiry_item_details else None
)
expiry_item = viewmodels.MediaItem(
icon=viewmodels.Icon("calendarcheck", pgettext("image alt text", "core.icons.calendarcheck")),
heading=heading,
details=details,
)
media.insert(0, expiry_item)

context = {"media": media}
context.update(page.context_dict())

Expand Down
84 changes: 44 additions & 40 deletions benefits/locale/en/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#, fuzzy
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: https://github.com/cal-itp/benefits/issues \n"
"POT-Creation-Date: 2023-06-29 00:40+0000\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-07-07 05:08+0000\n"
"Language: English\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -171,15 +171,6 @@ msgstr ""
"You were not charged anything today. When boarding transit, pay with this "
"same physical card and you will automatically receive your new reduced fare."

msgid "enrollment.pages.success.mst_cc.expiry_item.heading"
msgstr "You may need to reapply for transit benefits at a later date"

msgid "enrollment.pages.success.mst_cc.expiry_item.details"
msgstr ""
"In the future, you may need to re-register for Benefits to continue using "
"contactless payment cards. You will also need to reapply if you choose to "
"change the bank card you use to pay for transit service."

msgid "eligibility.pages.index.p[0].mst"
msgstr ""
"You can tap your credit or debit card when you board an MST bus, and your "
Expand Down Expand Up @@ -529,27 +520,6 @@ msgctxt "image alt text"
msgid "core.icons.idcardcheck"
msgstr "Identification card icon with checkmark"

msgid "eligibility.pages.start.login_gov.required_items[0]"
msgstr "Your state-issued ID card"

msgid "eligibility.pages.start.login_gov.required_items[1]"
msgstr "Your Social Security number"

msgid "eligibility.pages.start.login_gov.required_items[2]"
msgstr "A phone number with a phone plan associated with your name"

msgid "eligibility.pages.start.veteran.required_items[0]"
msgstr "Login.gov"

msgid "eligibility.pages.start.veteran.required_items[1]"
msgstr "ID.me"

msgid "eligibility.pages.start.veteran.required_items[2]"
msgstr "DS Logon"

msgid "eligibility.pages.start.veteran.required_items[3]"
msgstr "My HealtheVet"

msgctxt "image alt text"
msgid "core.icons.bankcardcheck"
msgstr "Bank card icon with contactless symbol and checkmark"
Expand Down Expand Up @@ -618,12 +588,46 @@ msgstr "Success"
msgid "enrollment.pages.success.headline"
msgstr "Success! Your discount is now linked to your bank card."

#, python-format
msgid "enrollment.pages.success.helplink%(link)s"
msgstr ""
"Thank you for using Cal-ITP Benefits! For more information check out our <a "
"href=\"%(link)s\" rel=\"noopener noreferrer\">Help Page</a>."
msgid "enrollment.pages.success.details"
msgstr "Thank you for using Cal-ITP Benefits!"

msgctxt "image alt text"
msgid "core.icons.calendarcheck"
msgstr "A calendar page icon with a check mark"
#, fuzzy
#~| msgid "enrollment.pages.success.mst_cc.confirm_item.details"
#~ msgid "enrollment.pages.success.mst_cc.expiry_item.heading"
#~ msgstr ""
#~ "You were not charged anything today. When boarding transit, pay with this "
#~ "same physical card and you will automatically receive your new reduced "
#~ "fare."

#, fuzzy
#~| msgid "enrollment.pages.success.mst_cc.confirm_item.details"
#~ msgid "enrollment.pages.success.mst_cc.expiry_item.details"
#~ msgstr ""
#~ "You were not charged anything today. When boarding transit, pay with this "
#~ "same physical card and you will automatically receive your new reduced "
#~ "fare."

#~ msgid "eligibility.pages.start.login_gov.required_items[0]"
#~ msgstr "Your state-issued ID card"

#~ msgid "eligibility.pages.start.login_gov.required_items[1]"
#~ msgstr "Your Social Security number"

#~ msgid "eligibility.pages.start.login_gov.required_items[2]"
#~ msgstr "A phone number with a phone plan associated with your name"

#~ msgid "eligibility.pages.start.veteran.required_items[0]"
#~ msgstr "Login.gov"

#~ msgid "eligibility.pages.start.veteran.required_items[1]"
#~ msgstr "ID.me"

#~ msgid "eligibility.pages.start.veteran.required_items[2]"
#~ msgstr "DS Logon"

#~ msgid "eligibility.pages.start.veteran.required_items[3]"
#~ msgstr "My HealtheVet"

#~ msgctxt "image alt text"
#~ msgid "core.icons.calendarcheck"
#~ msgstr "A calendar page icon with a check mark"
73 changes: 29 additions & 44 deletions benefits/locale/es/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#, fuzzy
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: https://github.com/cal-itp/benefits/issues \n"
"POT-Creation-Date: 2023-06-29 00:40+0000\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-07-07 05:06+0000\n"
"Language: Español\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -175,18 +175,6 @@ msgstr ""
"No te cobraron nada hoy. Al abordar el tránsito, pague con esta misma "
"tarjeta física y automáticamente recibirá su nueva tarifa reducida."

msgid "enrollment.pages.success.mst_cc.expiry_item.heading"
msgstr ""
"Es posible que deba volver a solicitar los beneficios de tránsito en una "
"fecha posterior"

msgid "enrollment.pages.success.mst_cc.expiry_item.details"
msgstr ""
"En el futuro, es posible que tenga que volver a registrarse para Beneficios "
"para continuar usando las tarjetas de pago sin contacto. También tendrá que "
"volver a presenter una solicitud si elige cambiar la tarjeta bancaria que "
"usa para pagar el servicio de tránsito."

msgid "eligibility.pages.index.p[0].mst"
msgstr ""
"Puede acercar su tarjeta de crédito o débito cuando aborde un autobús de MST "
Expand Down Expand Up @@ -545,27 +533,6 @@ msgctxt "image alt text"
msgid "core.icons.idcardcheck"
msgstr "Icono de tarjeta de identificación con marca de verificación"

msgid "eligibility.pages.start.login_gov.required_items[0]"
msgstr "Su tarjeta de identificación emitida por el estado"

msgid "eligibility.pages.start.login_gov.required_items[1]"
msgstr "Su número de Seguro Social"

msgid "eligibility.pages.start.login_gov.required_items[2]"
msgstr "Un número de teléfono con un plan de teléfono asociado con su nombre"

msgid "eligibility.pages.start.veteran.required_items[0]"
msgstr "Login.gov"

msgid "eligibility.pages.start.veteran.required_items[1]"
msgstr "ID.me"

msgid "eligibility.pages.start.veteran.required_items[2]"
msgstr "DS Logon"

msgid "eligibility.pages.start.veteran.required_items[3]"
msgstr "My HealtheVet"

msgctxt "image alt text"
msgid "core.icons.bankcardcheck"
msgstr ""
Expand Down Expand Up @@ -640,13 +607,31 @@ msgstr "Éxito"
msgid "enrollment.pages.success.headline"
msgstr "¡Felicidades! Su descuento ahora está vinculado a su tarjeta bancaria."

#, python-format
msgid "enrollment.pages.success.helplink%(link)s"
msgstr ""
"Gracias por usar los Beneficios de Cal-ITP. Para más información, consulte "
"nuestro our <a href=\"%(link)s\" rel=\"noopener noreferrer\">Página de "
"Ayuda</a>."
msgid "enrollment.pages.success.details"
msgstr "¡Gracias por usar los Beneficios de Cal-ITP!"

msgctxt "image alt text"
msgid "core.icons.calendarcheck"
msgstr "Icono de página de calendario con una marca de verificación"
#~ msgid "eligibility.pages.start.login_gov.required_items[0]"
#~ msgstr "Su tarjeta de identificación emitida por el estado"

#~ msgid "eligibility.pages.start.login_gov.required_items[1]"
#~ msgstr "Su número de Seguro Social"

#~ msgid "eligibility.pages.start.login_gov.required_items[2]"
#~ msgstr ""
#~ "Un número de teléfono con un plan de teléfono asociado con su nombre"

#~ msgid "eligibility.pages.start.veteran.required_items[0]"
#~ msgstr "Login.gov"

#~ msgid "eligibility.pages.start.veteran.required_items[1]"
#~ msgstr "ID.me"

#~ msgid "eligibility.pages.start.veteran.required_items[2]"
#~ msgstr "DS Logon"

#~ msgid "eligibility.pages.start.veteran.required_items[3]"
#~ msgstr "My HealtheVet"

#~ msgctxt "image alt text"
#~ msgid "core.icons.calendarcheck"
#~ msgstr "Icono de página de calendario con una marca de verificación"