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

Sync for Main code freeze for release Beta 1.0.0 #778

Merged
merged 6 commits into from
Jun 21, 2023
Merged

Sync for Main code freeze for release Beta 1.0.0 #778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
39f245f
heml space fixes
MarcoGoC Jun 21, 2023
9cee7b7
heml testing fix
MarcoGoC Jun 21, 2023
2489131
heml testing fix
MarcoGoC Jun 21, 2023
a6b39d4
heml testing fix
MarcoGoC Jun 21, 2023
1492bf6
Merge pull request #777 from DTS-STN/129199-helm-v2
MarcoGoC Jun 21, 2023
0e775a0
Partner GIS card missing "partner may be eligible" (#774)
alex-solo Jun 21, 2023
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
1 change: 1 addition & 0 deletions helm/charts/eligibility-estimator/templates/prod_ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
{{- $fullName := include "fullname" . -}}
{{- $svcPort := .Values.service.port -}}
apiVersion: v1
kind: List
items:
- apiVersion: networking.k8s.io/v1
kind: Ingress
Expand Down
4 changes: 2 additions & 2 deletions helmfile/overrides/eligibility-estimator/eligibility-estimator.yaml.gotmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ extraEnv:
valueFrom:
secretKeyRef:
name: web-example-secret
key: example-secret-password
key: example-secret-password

*/}}
image:
Expand All @@ -34,7 +34,7 @@ ingress:
prod_enabled: {{ requiredEnv "PROD_ENABLED" }}
ssl_cert: service_canada_ca
prod_url: {{ requiredEnv "SUB_DOMAIN" }}.{{ requiredEnv "BASE_DOMAIN" }}
enabled: true
enabled: {{ requiredEnv "ALPHA_ENABLED" }}
annotations:
{{ if (eq .Environment.Name "prototype")}}
cert-manager.io/cluster-issuer: letsencrypt-prod-alpha-sc
Expand Down
9 changes: 9 additions & 0 deletions utils/api/benefitHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -876,6 +876,15 @@ export class BenefitHandler {
.calculatedBasedOnIndividualIncome
)

if (
!allResults.partner.gis.cardDetail.collapsedText.includes(
this.translations.detailWithHeading.partnerEligible
)
)
allResults.partner.gis.cardDetail.collapsedText.unshift(
this.translations.detailWithHeading.partnerEligible
)

// If client is eligible for ALW, need to recalculate estimate based on individual income
if (clientAlw.eligibility.result === 'eligible') {
if (
Expand Down