Skip to content

Commit

Permalink
Merge develop -> main for new release ver 1.3.6 (#990)
Browse files Browse the repository at this point in the history
* collaps result summary in mobile

* title language fix

* changed date to 1900 to match error message

* Checking in tests

* force white background on select

* check benefit exists

* just to check deployment

* update title

* final test fixes.

* update

* change reference to ALWS

* change year to 1899

* initial commit

* Update build-and-push-dev.yml

* Update build-and-push-prod.yml

* Update build-and-push-dev.yml

* Update build-and-push-prod.yml

* fixing trigger and cleanup

* fix:updated rates for Q1 2024

* updated links and border color on focus

* fix:updated rates for Q1 2024

* fix: removed excess packages

* Adding pipeline secrets

* Use fieldDefinition instead of categoryMapping

* Adding values for variables, removing unused secrets

* ADO 134595: Refactor benefitHandler (#960)

* Undoing previous commit, cleaning up the variable names

* Using a new service principal

* July 2013 OAS deferral (#945)

Co-authored-by: VeroBr0~ <[email protected]>
Co-authored-by: Veronique B <[email protected]>

* updated link anchor for footer

* update width

* update

* Adding the NEXT_AUTH_SECRET variable

* Adding the EXPOSE instruction for the proper port of this app

* Revert "Q124 rate update"

* removing an underscore (#971)

* Pipeline underscore (#972)

* removing an underscore

* testing new home var

* Pipeline underscore2 (#974)

testing new home var

* Fix 143948

* fix for failing tests

* Pipeline updates (#977)

* Updating pipelines

* Updating pipelines

* Pipeline underscore (#973)

* removing an underscore

* testing new home var

* testing new home var

* clarify comment

* Pipeline updates (#978)

* Updating pipelines

* Updating pipelines

* Fixing a docker tag problem

---------

Co-authored-by: Jeremy Kennedy <[email protected]>
Co-authored-by: Marco <[email protected]>

* added condition for partner legal status

* updated dev yml

* hotfix typo

* fix:ran scraper

* fix:ran scraper

* Remove leading space in message, fix for 40 years not displaying

* added params to current result benefit handler

* super hotfix

* Merge main (#989)

* Updating pipelines

* Fixing pipeline files

* merge main

---------

Co-authored-by: shawn320 <[email protected]>
Co-authored-by: MarcoGoC <[email protected]>
Co-authored-by: Maxim Lam <[email protected]>
Co-authored-by: Marco <[email protected]>
Co-authored-by: Adam <[email protected]>
Co-authored-by: Maxim Lam <[email protected]>
Co-authored-by: Adam Andrews <[email protected]>
Co-authored-by: “Patrick“ <[email protected]>
Co-authored-by: VeroBr0~ <[email protected]>
Co-authored-by: Veronique B <[email protected]>
Co-authored-by: Jeremy Kennedy <[email protected]>
  • Loading branch information
12 people authored Dec 27, 2023
1 parent cd2284e commit 23d1d9b
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 46 deletions.
46 changes: 23 additions & 23 deletions utils/api/scrapers/data/oas-amounts-en.json
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
{
"lastupdatedYear": "2022",
"lastupdatedQuarter": "October to December 2023",
"lastupdatedQuarter": "January to March 2024",
"renewalYearGIS": "2023",
"oas": {
"average": "707.68",
"average75": "778.45",
"average": "713.34",
"average75": "784.67",
"maximum": "142,609",
"maximum75": "148,179",
"clawback": "86,912"
"clawback": "81,761"
},
"gis": {
"single-amount": "1,057.01",
"single-limit": "21,456",
"spouse-oas-amount": "636.26",
"spouse-oas-limit": "28,320",
"spouse-no-oas-amount": "1,057.01",
"spouse-no-oas-limit": "51,408",
"spouse-allowance-amount": "636.26",
"spouse-allowance-limit": "39,648"
"single-amount": "1,065.47",
"single-limit": "21,624",
"spouse-oas-amount": "641.35",
"spouse-oas-limit": "28,560",
"spouse-no-oas-amount": "1,065.47",
"spouse-no-oas-limit": "51,840",
"spouse-allowance-amount": "641.35",
"spouse-allowance-limit": "39,984"
},
"allowance": {
"spouse-gis-amount": "1,343.94",
"spouse-gis-limit": "39,648",
"survivor-amount": "1,602.07",
"survivor-limit": "28,872"
"spouse-gis-amount": "1,354.69",
"spouse-gis-limit": "39,984",
"survivor-amount": "1,614.89",
"survivor-limit": "29,112"
},
"topup": {
"single": "163.73",
"married": "46.39"
"single": "165.04",
"married": "46.76"
},
"delay": {
"oas66": "758.63",
"oas67": "809.59",
"oas68": "860.54",
"oas69": "911.49",
"oas70": "962.44"
"oas66": "764.70",
"oas67": "816.06",
"oas68": "867.42",
"oas69": "918.78",
"oas70": "970.14"
}
}
46 changes: 23 additions & 23 deletions utils/api/scrapers/output/legalValuesJson.json
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
{
"lastUpdatedYear": 2022,
"lastUpdatedQuarter": "October to December 2023",
"lastUpdatedQuarter": "January to March 2024",
"renewalYearGIS": 2023,
"oas": {
"amount": 707.68,
"amount75": 778.45,
"amount": 713.34,
"amount75": 784.67,
"incomeLimit": 142609,
"incomeLimit75": 148179,
"clawbackIncomeLimit": 86912
"clawbackIncomeLimit": 81761
},
"gis": {
"singleAmount": 1057.01,
"singleIncomeLimit": 21456,
"spouseOasAmount": 636.26,
"spouseOasIncomeLimit": 28320,
"spouseNoOasAmount": 1057.01,
"spouseNoOasIncomeLimit": 51408,
"spouseAlwAmount": 636.26,
"spouseAlwIncomeLimit": 39648
"singleAmount": 1065.47,
"singleIncomeLimit": 21624,
"spouseOasAmount": 641.35,
"spouseOasIncomeLimit": 28560,
"spouseNoOasAmount": 1065.47,
"spouseNoOasIncomeLimit": 51840,
"spouseAlwAmount": 641.35,
"spouseAlwIncomeLimit": 39984
},
"alw": {
"alwAmount": 1343.94,
"alwIncomeLimit": 39648,
"afsAmount": 1602.07,
"afsIncomeLimit": 28872
"alwAmount": 1354.69,
"alwIncomeLimit": 39984,
"afsAmount": 1614.89,
"afsIncomeLimit": 29112
},
"topUp": {
"single": 163.73,
"married": 46.39
"single": 165.04,
"married": 46.76
},
"delay": {
"oas66": 758.63,
"oas67": 809.59,
"oas68": 860.54,
"oas69": 911.49,
"oas70": 962.44
"oas66": 764.7,
"oas67": 816.06,
"oas68": 867.42,
"oas69": 918.78,
"oas70": 970.14
}
}

0 comments on commit 23d1d9b

Please sign in to comment.