Skip to content

Commit

Permalink
🔖(minor) bump to 2.3.0
Browse files Browse the repository at this point in the history
Added
- Add `payment_provider` attribute to `CreditCard` model
- Allow to tokenize a card endpoint for a user
- Add `state` field to NestedOrderSerializer

Changed
- Update certificate template to render logo of organization if
  it has a value.
- Add `currency` field to `OrderPaymentSerializer` serializer
- Allow an order with `no_payment` state to pay for failed installment
  on a payment schedule
- Order certificate filter now returns also legacy degree certificates
  linked to an enrollment

Fixed
- Ensure when API requests fails with payment provider, it raises
  an error for `create_payment`, `create_one_click_payment` and
  `create_zero_click_payment`
- Improve error management of `set_enrollment` method of
  MoodleBackend.
- Bind properly organizations in a certificate template sentence
  • Loading branch information
jbpenrath committed Jun 18, 2024
1 parent 1a137f0 commit 1059dec
Show file tree
Hide file tree
Showing 12 changed files with 123 additions and 96 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ and this project adheres to

## [Unreleased]

## [2.3.0] - 2024-06-18

### Added

- Add `payment_provider` attribute to `CreditCard` model
Expand Down Expand Up @@ -344,7 +346,8 @@ and this project adheres to
- First working version serving sellable micro-credentials for multiple
organizations synchronized to a remote catalog

[unreleased]: https://github.com/openfun/joanie/compare/v2.2.0...main
[unreleased]: https://github.com/openfun/joanie/compare/v2.3.0...main
[2.3.0]: https://github.com/openfun/joanie/compare/v2.2.0...v2.3.0
[2.2.0]: https://github.com/openfun/joanie/compare/v2.1.0...v2.2.0
[2.1.0]: https://github.com/openfun/joanie/compare/v2.0.1...v2.1.0
[2.0.1]: https://github.com/openfun/joanie/compare/v2.0.0...v2.0.1
Expand Down
2 changes: 1 addition & 1 deletion arnold.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# arnold.yml
metadata:
name: joanie
version: 2.2.0
version: 2.3.0
source:
path: src/tray
Binary file modified src/backend/locale/es_ES/LC_MESSAGES/django.mo
Binary file not shown.
62 changes: 35 additions & 27 deletions src/backend/locale/es_ES/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: joanie\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-06-05 17:49+0000\n"
"PO-Revision-Date: 2024-06-10 12:04\n"
"POT-Creation-Date: 2024-06-13 10:19+0000\n"
"PO-Revision-Date: 2024-06-18 08:41\n"
"Last-Translator: \n"
"Language-Team: Spanish\n"
"Language: es_ES\n"
Expand Down Expand Up @@ -412,7 +412,7 @@ msgstr ""
#: joanie/core/models/accounts.py:154 joanie/core/models/certifications.py:33
#: joanie/core/models/contracts.py:29 joanie/core/models/courses.py:170
#: joanie/core/models/courses.py:470 joanie/core/models/courses.py:783
#: joanie/core/models/products.py:68 joanie/payment/models.py:379
#: joanie/core/models/products.py:68 joanie/payment/models.py:394
msgid "title"
msgstr ""

Expand Down Expand Up @@ -442,7 +442,7 @@ msgstr ""

#: joanie/core/models/accounts.py:163 joanie/core/models/courses.py:357
#: joanie/core/models/courses.py:587 joanie/core/models/products.py:463
#: joanie/payment/models.py:388
#: joanie/payment/models.py:403
msgid "owner"
msgstr ""

Expand All @@ -451,7 +451,7 @@ msgstr ""
msgid "organization"
msgstr ""

#: joanie/core/models/accounts.py:177 joanie/payment/models.py:392
#: joanie/core/models/accounts.py:177 joanie/payment/models.py:407
msgid "main"
msgstr ""

Expand Down Expand Up @@ -572,7 +572,7 @@ msgid "Date of issuance"
msgstr ""

#: joanie/core/models/certifications.py:82 joanie/core/models/contracts.py:80
#: joanie/core/models/products.py:1140 joanie/payment/models.py:54
#: joanie/core/models/products.py:1141 joanie/payment/models.py:54
msgid "order"
msgstr ""

Expand Down Expand Up @@ -811,7 +811,7 @@ msgstr ""

#: joanie/core/models/courses.py:705 joanie/core/models/courses.py:777
#: joanie/core/models/products.py:275 joanie/core/models/products.py:421
#: joanie/core/models/products.py:1128
#: joanie/core/models/products.py:1129
msgid "course"
msgstr ""

Expand Down Expand Up @@ -960,19 +960,19 @@ msgstr ""
msgid "Certificate definition is only allowed for product kinds: "
msgstr ""

#: joanie/core/models/products.py:290 joanie/core/models/products.py:1134
#: joanie/core/models/products.py:290 joanie/core/models/products.py:1135
msgid "course runs"
msgstr ""

#: joanie/core/models/products.py:293
msgid "position in product"
msgstr ""

#: joanie/core/models/products.py:295 joanie/core/models/products.py:1146
#: joanie/core/models/products.py:295 joanie/core/models/products.py:1147
msgid "take into account for certification"
msgstr ""

#: joanie/core/models/products.py:296 joanie/core/models/products.py:1147
#: joanie/core/models/products.py:296 joanie/core/models/products.py:1148
msgid "Take into account the course grade for certification."
msgstr ""

Expand Down Expand Up @@ -1077,15 +1077,15 @@ msgstr ""
msgid "Course run "
msgstr ""

#: joanie/core/models/products.py:1144
#: joanie/core/models/products.py:1145
msgid "position in order"
msgstr ""

#: joanie/core/models/products.py:1155
#: joanie/core/models/products.py:1156
msgid "Course relation to an order with a position"
msgstr ""

#: joanie/core/models/products.py:1156
#: joanie/core/models/products.py:1157
msgid "Courses relations to orders with a position"
msgstr ""

Expand Down Expand Up @@ -1209,27 +1209,27 @@ msgstr ""
msgid "Licenses"
msgstr ""

#: joanie/core/templates/issuers/certificate.html:24
#: joanie/core/templates/issuers/certificate.html:26
msgid "Attestation of achievement"
msgstr ""

#: joanie/core/templates/issuers/certificate.html:30
#: joanie/core/templates/issuers/certificate.html:32
#, python-format
msgid "<strong class=\"details__student-name\">%(student)s</strong> <br/>has successfully completed the MOOC<sup>*</sup> <br/><strong class=\"details__course-name\">%(course)s</strong> <br/>proposed by <strong>%(organizations)s</strong> <br />and published on the platform <strong>%(site)s</strong>"
msgstr ""

#: joanie/core/templates/issuers/certificate.html:39
#: joanie/core/templates/issuers/certificate.html:41
#, python-format
msgid "On the %(creation_date)s."
msgstr ""

#: joanie/core/templates/issuers/certificate.html:51
#: joanie/core/templates/issuers/certificate.html:53
msgid "MOOC: Massive Open Online Course"
msgstr ""

#: joanie/core/templates/issuers/certificate.html:54
#: joanie/core/templates/issuers/certificate.html:56
#, python-format
msgid "The current document is not a degree or diploma and does not award credits (ECTS). <br />It does not certify that the learner was registered with %(organization)s. <br />The learner's identity has not been verified."
msgid "The current document is not a degree or diploma and does not award credits (ECTS). <br />It does not certify that the learner was registered with %(organizations)s. <br />The learner's identity has not been verified."
msgstr ""

#: joanie/core/templates/issuers/contract_definition.html:31
Expand Down Expand Up @@ -1346,7 +1346,7 @@ msgstr ""
msgid "<br> successfully completed the course <br> <strong class=\"coure-name\">%(course)s</strong>"
msgstr ""

#: joanie/core/templates/issuers/degree.html:62
#: joanie/core/templates/issuers/degree.html:64
#, python-format
msgid "\n"
" To verify the authenticity of this certificate, please visit:\n"
Expand Down Expand Up @@ -1599,7 +1599,7 @@ msgstr ""
msgid "<CONTRACT_DESCRIPTION>"
msgstr ""

#: joanie/payment/admin.py:229
#: joanie/payment/admin.py:230
msgid "To get results, choose an owner on the right"
msgstr ""

Expand Down Expand Up @@ -1683,27 +1683,35 @@ msgstr ""
msgid "Transactions"
msgstr ""

#: joanie/payment/models.py:373
#: joanie/payment/models.py:388
msgid "initial issuer transaction identifier"
msgstr ""

#: joanie/payment/models.py:380
#: joanie/payment/models.py:395
msgid "brand"
msgstr ""

#: joanie/payment/models.py:382
#: joanie/payment/models.py:397
msgid "expiration month"
msgstr ""

#: joanie/payment/models.py:384
#: joanie/payment/models.py:399
msgid "expiration year"
msgstr ""

#: joanie/payment/models.py:385
#: joanie/payment/models.py:400
msgid "last 4 numbers"
msgstr ""

#: joanie/payment/models.py:422
#: joanie/payment/models.py:409
msgid "payment provider"
msgstr ""

#: joanie/payment/models.py:432
msgid "Payment provider field cannot be None."
msgstr ""

#: joanie/payment/models.py:442
msgid "Demote a main credit card is forbidden"
msgstr ""

Expand Down
Binary file modified src/backend/locale/fr_CA/LC_MESSAGES/django.mo
Binary file not shown.
Loading

0 comments on commit 1059dec

Please sign in to comment.