Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
mhieta committed Nov 25, 2024
2 parents c26de65 + 327325e commit 21ae404
Show file tree
Hide file tree
Showing 13 changed files with 332 additions and 49 deletions.
11 changes: 8 additions & 3 deletions .env.template
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,15 @@ INSTALL_PRECOMMIT=True
WAIT_FOR_IT_ADDRESS=parking-permits-database:5432

# OIDC auth settings
TOKEN_AUTH_ACCEPTED_AUDIENCE=https://api.hel.fi/auth/parkingpermits
TOKEN_AUTH_ACCEPTED_SCOPE_PREFIX=parkingpermits
TOKEN_AUTH_AUTHSERVER_URL=https://tunnistamo.test.hel.ninja/openid
TOKEN_AUTH_ACCEPTED_AUDIENCE=parking-permits-api-dev
TOKEN_AUTH_ACCEPTED_SCOPE_PREFIX=access,gdprquery,gdprdelete
TOKEN_AUTH_AUTHSERVER_URL=https://tunnistus.test.hel.ninja/auth/realms/helsinki-tunnistus
TOKEN_AUTH_REQUIRE_SCOPE_PREFIX=True
TOKEN_AUTH_API_AUTHORIZATION_FIELD=authorization.permissions.scopes
GDPR_API_QUERY_SCOPE=parkingpermitsapitest.gdprquery
GDPR_API_DELETE_SCOPE=parkingpermitsapitest.gdprdelete
HELUSERS_BACK_CHANNEL_LOGOUT_ENABLED=True
HELUSERS_USER_MIGRATE_ENABLED=False

# DVV integration
DVV_PERSONAL_INFO_URL=
Expand Down
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [1.4.0] - 2024-11-25

### Added

- Allow draft permit creation in admin resolvers ([be80a24](https://github.com/City-of-Helsinki/parking-permits/commit/be80a2403783b471658240323aa15756f75f758f))

### Changed

- Keycloak backend integration ([d8ed26d](https://github.com/City-of-Helsinki/parking-permits/commit/d8ed26d01e5fe0d403270226e87be59d96e2b60b))
- Enable helusers migration ([8e3bc92](https://github.com/City-of-Helsinki/parking-permits/commit/8e3bc92cf2089f0c5b0fcf8f1fff6f2db38abb70))

### Fixed

- Update helsinki profile to use POST requests ([0b10293](https://github.com/City-of-Helsinki/parking-permits/commit/0b10293f3239f255f2beaa256eeab950f0801dac))
- Send email to customer when extension is created ([24b6adf](https://github.com/City-of-Helsinki/parking-permits/commit/24b6adfe03a9e4f7518f9f3e5ed4b1b013c6b098))

## [1.3.0] - 2024-11-14

### Added
Expand Down
62 changes: 56 additions & 6 deletions locale/fi/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-06-19 11:02+0300\n"
"POT-Creation-Date: 2024-11-22 08:50+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -92,7 +92,7 @@ msgstr ""
"voimassa oleva jatkuvaveloitteinen tunnus"

msgid "Vehicle registration number is mandatory for the permit"
msgstr "Ajoneuvon rekisterinumero on pakollinen tietd"
msgstr "Ajoneuvon rekisterinumero on pakollinen tieto"

msgid "User already has a valid permit for the given vehicle."
msgstr "Sinulla on jo voimassa oleva pysäköintitunnus kyseiselle ajoneuvolle."
Expand Down Expand Up @@ -341,9 +341,6 @@ msgstr "Palautukset"
msgid "Refund ID"
msgstr "Palautusnumero"

msgid "incl. VAT"
msgstr "sis. ALV"

msgid "Extra info"
msgstr "Lisätiedot"

Expand Down Expand Up @@ -626,6 +623,9 @@ msgstr "Nykyisen jakson jälkeen"
msgid "Previous day end"
msgstr "Edellisen päivän loppu"

msgid "Preliminary"
msgstr "Alustava"

msgid "Payment in progress"
msgstr "Maksussa"

Expand All @@ -645,7 +645,10 @@ msgid "Bypass Traficom validation"
msgstr "Ohita Traficom-tarkistus"

msgid "Vehicle changed date"
msgstr "Ajoneuvon tietojen muuttamispäivä"
msgstr "Ajoneuvon tietojen muutospäivä"

msgid "Address changed date"
msgstr "Osoitteen vaihdon muutospäivä"

msgid "Contract type"
msgstr "Sopimustyyppi"
Expand Down Expand Up @@ -724,6 +727,14 @@ msgstr "Tunnuksen jatko #%(ext_request_id)s peruutettu"
msgid "Permit #%(permit_id)s created"
msgstr "Tunnus #%(permit_id)s luotu"

#, python-format
msgid "Permit #%(permit_id)s draft created"
msgstr "Tunnuksen #%(permit_id)s luonnos luotu"

#, python-format
msgid "Permit #%(permit_id)s draft updated"
msgstr "Tunnuksen #%(permit_id)s luonnos päivitetty"

#, python-format
msgid "Permit #%(permit_id)s updated"
msgstr "Tunnus #%(permit_id)s päivitetty"
Expand Down Expand Up @@ -768,6 +779,39 @@ msgstr "Kuukausittainen"
msgid "Pieces"
msgstr "Osat"

msgid "Active from"
msgstr "Voimassa alkaen"

msgid "Company code"
msgstr "Yrityskoodi"

msgid "VAT code"
msgstr "ALV-koodi"

msgid "Internal order"
msgstr "Sisäinen tilaus"

msgid "Profit center"
msgstr "Kustannuspaikka"

msgid "Balance profit center"
msgstr "Tulosyksikkö"

msgid "Project"
msgstr "Projekti"

msgid "Operation area"
msgstr "Toiminta-alue"

msgid "Main ledger account"
msgstr "Pääkirjan tili"

msgid "Accounting"
msgstr "Kirjanpito"

msgid "Accountings"
msgstr "Kirjanpidot"

msgid "Product catalog error, please report to admin"
msgstr "Tuotetietojen virhe, raportoi ylläpitäjälle"

Expand All @@ -780,6 +824,9 @@ msgstr "alue"
msgid "Unit"
msgstr "Yksikkö"

msgid "Next accounting"
msgstr "Seuraava kirjanpito"

msgid "Products"
msgstr "Tuotteet"

Expand Down Expand Up @@ -1113,6 +1160,9 @@ msgstr ""
msgid "Total refundable amount"
msgstr "Palautettava summa yhteensä"

msgid "incl. VAT"
msgstr "sis. ALV"

msgid ""
"You are entitled to a refund and it has been registered. You will receive a "
"separate notification when the return has been approved."
Expand Down
62 changes: 56 additions & 6 deletions locale/sv/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-06-19 11:02+0300\n"
"POT-Creation-Date: 2024-11-22 08:50+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -337,9 +337,6 @@ msgstr "Återbetalning"
msgid "Refund ID"
msgstr "Återbetalning ID"

msgid "incl. VAT"
msgstr "inkl. MOMS"

msgid "Extra info"
msgstr "Ytterligare uppgifter"

Expand Down Expand Up @@ -622,6 +619,9 @@ msgstr "Efter nuvarande period"
msgid "Previous day end"
msgstr "Föregående dags slut"

msgid "Preliminary"
msgstr "Preliminär"

msgid "Payment in progress"
msgstr "Betalning pågår"

Expand All @@ -643,6 +643,9 @@ msgstr "Bypass Traficom-validering"
msgid "Vehicle changed date"
msgstr "Fordonet ändringdatum"

msgid "Address changed date"
msgstr "Adress ändringdatum"

msgid "Contract type"
msgstr "Kontraktstyp"

Expand Down Expand Up @@ -720,9 +723,17 @@ msgstr "Begäran om förlängning av tillstånd #%(ext_request_id)s avbruten"
msgid "Permit #%(permit_id)s created"
msgstr "Tillstånd #%(permit_id)s skapat"

#, python-format
msgid "Permit #%(permit_id)s draft created"
msgstr "Tillstånd #%(permit_id)s utkast skapat"

#, python-format
msgid "Permit #%(permit_id)s draft updated"
msgstr "Tillstånd #%(permit_id)s utkast uppdaterat"

#, python-format
msgid "Permit #%(permit_id)s updated"
msgstr "Tillstånd #%(permit_id)s har uppdaterats"
msgstr "Tillstånd #%(permit_id)s uppdaterat"

#, python-format
msgid "Permit #%(permit_id)s ended"
Expand All @@ -749,7 +760,7 @@ msgid "Area (2D)"
msgstr "Zone (2D)"

msgid "Parking zones"
msgstr "Parkeringzon"
msgstr "Parkering zoner"

msgid "Pending"
msgstr "Öppen"
Expand All @@ -766,6 +777,39 @@ msgstr "Månatlig"
msgid "Pieces"
msgstr "St"

msgid "Active from"
msgstr "Aktiv från"

msgid "Company code"
msgstr "Företagskod"

msgid "VAT code"
msgstr "MOMS-kod"

msgid "Internal order"
msgstr "Intern beställning"

msgid "Profit center"
msgstr "Profit center"

msgid "Balance profit center"
msgstr "Balans profit center"

msgid "Project"
msgstr "Projekt"

msgid "Operation area"
msgstr "Operation area"

msgid "Main ledger account"
msgstr "Huvudbokskonto"

msgid "Accounting"
msgstr "Redovisning"

msgid "Accountings"
msgstr "Redovisningar"

msgid "Product catalog error, please report to admin"
msgstr "Fel i produktinformation. Rapportera till underhåll tack."

Expand All @@ -778,6 +822,9 @@ msgstr "zon"
msgid "Unit"
msgstr "Enhet"

msgid "Next accounting"
msgstr "Nästa redovisning"

msgid "Products"
msgstr "Produkter"

Expand Down Expand Up @@ -1117,6 +1164,9 @@ msgstr ""
msgid "Total refundable amount"
msgstr "Totalt återbetalningsbart belopp"

msgid "incl. VAT"
msgstr "inkl. MOMS"

msgid ""
"You are entitled to a refund and it has been registered. You will receive a "
"separate notification when the return has been approved."
Expand Down
Loading

0 comments on commit 21ae404

Please sign in to comment.