Skip to content

Commit 21ae404

Browse files
committed
Merge branch 'develop'
2 parents c26de65 + 327325e commit 21ae404

File tree

13 files changed

+332
-49
lines changed

13 files changed

+332
-49
lines changed

.env.template

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,15 @@ INSTALL_PRECOMMIT=True
104104
WAIT_FOR_IT_ADDRESS=parking-permits-database:5432
105105

106106
# OIDC auth settings
107-
TOKEN_AUTH_ACCEPTED_AUDIENCE=https://api.hel.fi/auth/parkingpermits
108-
TOKEN_AUTH_ACCEPTED_SCOPE_PREFIX=parkingpermits
109-
TOKEN_AUTH_AUTHSERVER_URL=https://tunnistamo.test.hel.ninja/openid
107+
TOKEN_AUTH_ACCEPTED_AUDIENCE=parking-permits-api-dev
108+
TOKEN_AUTH_ACCEPTED_SCOPE_PREFIX=access,gdprquery,gdprdelete
109+
TOKEN_AUTH_AUTHSERVER_URL=https://tunnistus.test.hel.ninja/auth/realms/helsinki-tunnistus
110110
TOKEN_AUTH_REQUIRE_SCOPE_PREFIX=True
111+
TOKEN_AUTH_API_AUTHORIZATION_FIELD=authorization.permissions.scopes
112+
GDPR_API_QUERY_SCOPE=parkingpermitsapitest.gdprquery
113+
GDPR_API_DELETE_SCOPE=parkingpermitsapitest.gdprdelete
114+
HELUSERS_BACK_CHANNEL_LOGOUT_ENABLED=True
115+
HELUSERS_USER_MIGRATE_ENABLED=False
111116

112117
# DVV integration
113118
DVV_PERSONAL_INFO_URL=

CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [1.4.0] - 2024-11-25
11+
12+
### Added
13+
14+
- Allow draft permit creation in admin resolvers ([be80a24](https://github.com/City-of-Helsinki/parking-permits/commit/be80a2403783b471658240323aa15756f75f758f))
15+
16+
### Changed
17+
18+
- Keycloak backend integration ([d8ed26d](https://github.com/City-of-Helsinki/parking-permits/commit/d8ed26d01e5fe0d403270226e87be59d96e2b60b))
19+
- Enable helusers migration ([8e3bc92](https://github.com/City-of-Helsinki/parking-permits/commit/8e3bc92cf2089f0c5b0fcf8f1fff6f2db38abb70))
20+
21+
### Fixed
22+
23+
- Update helsinki profile to use POST requests ([0b10293](https://github.com/City-of-Helsinki/parking-permits/commit/0b10293f3239f255f2beaa256eeab950f0801dac))
24+
- Send email to customer when extension is created ([24b6adf](https://github.com/City-of-Helsinki/parking-permits/commit/24b6adfe03a9e4f7518f9f3e5ed4b1b013c6b098))
25+
1026
## [1.3.0] - 2024-11-14
1127

1228
### Added

locale/fi/LC_MESSAGES/django.po

Lines changed: 56 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2024-06-19 11:02+0300\n"
11+
"POT-Creation-Date: 2024-11-22 08:50+0200\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -92,7 +92,7 @@ msgstr ""
9292
"voimassa oleva jatkuvaveloitteinen tunnus"
9393

9494
msgid "Vehicle registration number is mandatory for the permit"
95-
msgstr "Ajoneuvon rekisterinumero on pakollinen tietd"
95+
msgstr "Ajoneuvon rekisterinumero on pakollinen tieto"
9696

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

344-
msgid "incl. VAT"
345-
msgstr "sis. ALV"
346-
347344
msgid "Extra info"
348345
msgstr "Lisätiedot"
349346

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

626+
msgid "Preliminary"
627+
msgstr "Alustava"
628+
629629
msgid "Payment in progress"
630630
msgstr "Maksussa"
631631

@@ -645,7 +645,10 @@ msgid "Bypass Traficom validation"
645645
msgstr "Ohita Traficom-tarkistus"
646646

647647
msgid "Vehicle changed date"
648-
msgstr "Ajoneuvon tietojen muuttamispäivä"
648+
msgstr "Ajoneuvon tietojen muutospäivä"
649+
650+
msgid "Address changed date"
651+
msgstr "Osoitteen vaihdon muutospäivä"
649652

650653
msgid "Contract type"
651654
msgstr "Sopimustyyppi"
@@ -724,6 +727,14 @@ msgstr "Tunnuksen jatko #%(ext_request_id)s peruutettu"
724727
msgid "Permit #%(permit_id)s created"
725728
msgstr "Tunnus #%(permit_id)s luotu"
726729

730+
#, python-format
731+
msgid "Permit #%(permit_id)s draft created"
732+
msgstr "Tunnuksen #%(permit_id)s luonnos luotu"
733+
734+
#, python-format
735+
msgid "Permit #%(permit_id)s draft updated"
736+
msgstr "Tunnuksen #%(permit_id)s luonnos päivitetty"
737+
727738
#, python-format
728739
msgid "Permit #%(permit_id)s updated"
729740
msgstr "Tunnus #%(permit_id)s päivitetty"
@@ -768,6 +779,39 @@ msgstr "Kuukausittainen"
768779
msgid "Pieces"
769780
msgstr "Osat"
770781

782+
msgid "Active from"
783+
msgstr "Voimassa alkaen"
784+
785+
msgid "Company code"
786+
msgstr "Yrityskoodi"
787+
788+
msgid "VAT code"
789+
msgstr "ALV-koodi"
790+
791+
msgid "Internal order"
792+
msgstr "Sisäinen tilaus"
793+
794+
msgid "Profit center"
795+
msgstr "Kustannuspaikka"
796+
797+
msgid "Balance profit center"
798+
msgstr "Tulosyksikkö"
799+
800+
msgid "Project"
801+
msgstr "Projekti"
802+
803+
msgid "Operation area"
804+
msgstr "Toiminta-alue"
805+
806+
msgid "Main ledger account"
807+
msgstr "Pääkirjan tili"
808+
809+
msgid "Accounting"
810+
msgstr "Kirjanpito"
811+
812+
msgid "Accountings"
813+
msgstr "Kirjanpidot"
814+
771815
msgid "Product catalog error, please report to admin"
772816
msgstr "Tuotetietojen virhe, raportoi ylläpitäjälle"
773817

@@ -780,6 +824,9 @@ msgstr "alue"
780824
msgid "Unit"
781825
msgstr "Yksikkö"
782826

827+
msgid "Next accounting"
828+
msgstr "Seuraava kirjanpito"
829+
783830
msgid "Products"
784831
msgstr "Tuotteet"
785832

@@ -1113,6 +1160,9 @@ msgstr ""
11131160
msgid "Total refundable amount"
11141161
msgstr "Palautettava summa yhteensä"
11151162

1163+
msgid "incl. VAT"
1164+
msgstr "sis. ALV"
1165+
11161166
msgid ""
11171167
"You are entitled to a refund and it has been registered. You will receive a "
11181168
"separate notification when the return has been approved."

locale/sv/LC_MESSAGES/django.po

Lines changed: 56 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2024-06-19 11:02+0300\n"
11+
"POT-Creation-Date: 2024-11-22 08:50+0200\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -337,9 +337,6 @@ msgstr "Återbetalning"
337337
msgid "Refund ID"
338338
msgstr "Återbetalning ID"
339339

340-
msgid "incl. VAT"
341-
msgstr "inkl. MOMS"
342-
343340
msgid "Extra info"
344341
msgstr "Ytterligare uppgifter"
345342

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

622+
msgid "Preliminary"
623+
msgstr "Preliminär"
624+
625625
msgid "Payment in progress"
626626
msgstr "Betalning pågår"
627627

@@ -643,6 +643,9 @@ msgstr "Bypass Traficom-validering"
643643
msgid "Vehicle changed date"
644644
msgstr "Fordonet ändringdatum"
645645

646+
msgid "Address changed date"
647+
msgstr "Adress ändringdatum"
648+
646649
msgid "Contract type"
647650
msgstr "Kontraktstyp"
648651

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

726+
#, python-format
727+
msgid "Permit #%(permit_id)s draft created"
728+
msgstr "Tillstånd #%(permit_id)s utkast skapat"
729+
730+
#, python-format
731+
msgid "Permit #%(permit_id)s draft updated"
732+
msgstr "Tillstånd #%(permit_id)s utkast uppdaterat"
733+
723734
#, python-format
724735
msgid "Permit #%(permit_id)s updated"
725-
msgstr "Tillstånd #%(permit_id)s har uppdaterats"
736+
msgstr "Tillstånd #%(permit_id)s uppdaterat"
726737

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

751762
msgid "Parking zones"
752-
msgstr "Parkeringzon"
763+
msgstr "Parkering zoner"
753764

754765
msgid "Pending"
755766
msgstr "Öppen"
@@ -766,6 +777,39 @@ msgstr "Månatlig"
766777
msgid "Pieces"
767778
msgstr "St"
768779

780+
msgid "Active from"
781+
msgstr "Aktiv från"
782+
783+
msgid "Company code"
784+
msgstr "Företagskod"
785+
786+
msgid "VAT code"
787+
msgstr "MOMS-kod"
788+
789+
msgid "Internal order"
790+
msgstr "Intern beställning"
791+
792+
msgid "Profit center"
793+
msgstr "Profit center"
794+
795+
msgid "Balance profit center"
796+
msgstr "Balans profit center"
797+
798+
msgid "Project"
799+
msgstr "Projekt"
800+
801+
msgid "Operation area"
802+
msgstr "Operation area"
803+
804+
msgid "Main ledger account"
805+
msgstr "Huvudbokskonto"
806+
807+
msgid "Accounting"
808+
msgstr "Redovisning"
809+
810+
msgid "Accountings"
811+
msgstr "Redovisningar"
812+
769813
msgid "Product catalog error, please report to admin"
770814
msgstr "Fel i produktinformation. Rapportera till underhåll tack."
771815

@@ -778,6 +822,9 @@ msgstr "zon"
778822
msgid "Unit"
779823
msgstr "Enhet"
780824

825+
msgid "Next accounting"
826+
msgstr "Nästa redovisning"
827+
781828
msgid "Products"
782829
msgstr "Produkter"
783830

@@ -1117,6 +1164,9 @@ msgstr ""
11171164
msgid "Total refundable amount"
11181165
msgstr "Totalt återbetalningsbart belopp"
11191166

1167+
msgid "incl. VAT"
1168+
msgstr "inkl. MOMS"
1169+
11201170
msgid ""
11211171
"You are entitled to a refund and it has been registered. You will receive a "
11221172
"separate notification when the return has been approved."

0 commit comments

Comments
 (0)