Skip to content

Commit

Permalink
Move changes to 2.11 (#6344)
Browse files Browse the repository at this point in the history
* Bump requirements (#6332)

* Fix order_updated not triggering on mutation orderupdate (#6336)

* Drop origin from Plugin configuration. Take it from the paymentData (#6341)

* Drop origin from configuration. Take it from the paymentData

* Handle the case when plugin drops configuration field

* Apply changes after review

Co-authored-by: Marcin Gębala <5421321+maarcingebala@users.noreply.github.com>

Co-authored-by: Marcin Gębala <5421321+maarcingebala@users.noreply.github.com>

* Fix uvicorn to use standard dependencies (#6345)

* Fix empty name and description in updatePlugin mutation response (#6346)

* Fix inccorect name and help text for 3D Secure field (#6350)

* Fix adyen notifications handling (#6343)

* Fix invalid payment_id in get_payment handling

* Add merchant account validation in webhooks

* Prevent breaking handle_webhook when request is a GET request

* Update saleor/payment/gateways/adyen/webhooks.py

Co-authored-by: Marcin Gębala <5421321+maarcingebala@users.noreply.github.com>

* Update handle_webhook - add logger warnings

* Add adyen webhooks get_payment method tests

Co-authored-by: Marcin Gębala <5421321+maarcingebala@users.noreply.github.com>

* Add order note that refund has been requested (#6347)

* Add order note that refund has been requested

* Add 'Adyen' at the begginig of the msg

* Fix failing saleor autocapture. Improve the handler for authorization (#6348)

* Fix failing saleor autocapture. Improve the webhook hanlder for authorization

* Handle cases when payment is already voided and when is still active

* Fix failing test after merged branches related to adyen (#6355)

* Fix failing test after merged branches related to adyen

* Fix assert condition

* Improve aproval rate for adyen requests (#6315)

* Improve aproval rate for adyen requests

* Improve the test coverage

* Make sure that gross_net is not 0

* Check if field contians data before we will add them to adyen paylaod

* Include line total to webhook payload (#6354)

* Include line total to webhook payload

* Update changelog

* Add validation for order update related mutations (#6324)

* Run order_updated on order update, secure order update mutations based on order status

* Error message fix on DraftOrderUpdate

* OrderUpdate mutation improvements and optimizations

* Fix for fulfilling an order when product quantity equals allocated quantity (#6333)

* Fix for fulfilling an order when product quantity equals allocated quantity

* Add tests, update the CHANGELOG.md, modify schema objects

* Style improvements

* Add data loader, add permission decorator, style changes

* Changes after code review

* Change aggregation of stock allocations to single allocation (#6362)

* Fix for updating product variant without providing an attributes (#6353)

* Fix for the ability to filter products on collection (#6363)

* Fix filters on collection

* Fix broken tests, update CHANGELOG.md

* Handle custom schemes (#6370)

* Update translations (#6379)

* Bump requirements (#6378)

* Fix product related dataloaders to be accessible by app (#6380)

Co-authored-by: Tomasz Szymański <tomasz.szymanski@stxnext.pl>
Co-authored-by: Maciej Korycinski <korycinski.maciej@gmail.com>
Co-authored-by: Iga Karbowiak <40886528+IKarbowiak@users.noreply.github.com>
Co-authored-by: Grzegorz Derdak <grzegorz.derdak@stxnext.pl>
  • Loading branch information
5 people committed Nov 3, 2020
1 parent 88584e6 commit de3844a
Show file tree
Hide file tree
Showing 89 changed files with 3,188 additions and 1,463 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Expand Up @@ -76,6 +76,9 @@ All notable, unreleased changes to this project will be documented in this file.
- Add attributes validation while creating/updating a product's variant - #6269 by @GrzegorzDerdak
- Add metadata to page model - #6292 by @dominik-zeglen
- Fix for unnecesary attributes validation while updating simple product - #6300 by @GrzegorzDerdak
- Include order line total price to webhook payload - #6354 by @korycins
- Fix for fulfilling an order when product quantity equals allocated quantity - #6333 by @GrzegorzDerdak
- Fix for the ability to filter products on collection - #6363 by @GrzegorzDerdak

## 2.10.2

Expand Down
Binary file modified locale/ar/LC_MESSAGES/django.mo
Binary file not shown.
Binary file modified locale/az/LC_MESSAGES/django.mo
Binary file not shown.
Binary file modified locale/bg/LC_MESSAGES/django.mo
Binary file not shown.
Binary file modified locale/bn/LC_MESSAGES/django.mo
Binary file not shown.
Binary file modified locale/ca/LC_MESSAGES/django.mo
Binary file not shown.
Binary file modified locale/cs/LC_MESSAGES/django.mo
Binary file not shown.
Binary file modified locale/da/LC_MESSAGES/django.mo
Binary file not shown.
Binary file modified locale/de/LC_MESSAGES/django.mo
Binary file not shown.
Binary file modified locale/el/LC_MESSAGES/django.mo
Binary file not shown.
Binary file modified locale/en/LC_MESSAGES/django.mo
Binary file not shown.
Binary file modified locale/es/LC_MESSAGES/django.mo
Binary file not shown.
Binary file modified locale/es_CO/LC_MESSAGES/django.mo
Binary file not shown.
Binary file modified locale/et/LC_MESSAGES/django.mo
Binary file not shown.
51 changes: 29 additions & 22 deletions locale/et/LC_MESSAGES/django.po
Expand Up @@ -7,15 +7,17 @@
# Carmel Vaher <carmelvaher@gmail.com>, 2020
# Henri Tamvere <henri.tamvere@magmatech.ee>, 2020
# Erlend Eelmets <debcf78e@opayq.com>, 2020
# Patryk Zawadzki <patrys@room-303.com>, 2020
# Marcin Gębala <maarcin.gebala@gmail.com>, 2020
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: master\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-09-11 12:15+0000\n"
"POT-Creation-Date: 2020-10-23 07:04+0000\n"
"PO-Revision-Date: 2017-02-08 11:00+0000\n"
"Last-Translator: Erlend Eelmets <debcf78e@opayq.com>, 2020\n"
"Last-Translator: Marcin Gębala <maarcin.gebala@gmail.com>, 2020\n"
"Language-Team: Estonian (https://www.transifex.com/mirumee/teams/34782/et/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand All @@ -27,7 +29,7 @@ msgstr ""
#, python-format
msgctxt "Address data"
msgid "%(first_name)s %(last_name)s"
msgstr "% (eesnimi) s% (perenimi) s"
msgstr "%(first_name)s %(last_name)s"

#: saleor/account/templatetags/i18n_address_tags.py:16
#, python-format
Expand All @@ -36,56 +38,60 @@ msgid ""
"%(street_address_1)s\n"
"%(street_address_2)s"
msgstr ""
"% (tänava_adress_1) s \n"
"% (tänava_adress_2) s%(street_address_1)s\n"
"%(street_address_1)s\n"
"%(street_address_2)s"

#: templates/invoices/invoice.html:218
#: templates/invoices/invoice.html:210
msgctxt "Invoice PDF header"
msgid "INVOICE INFORMATION"
msgstr "ARVETE TEAVE"

#: templates/invoices/invoice.html:221
#: templates/invoices/invoice.html:213
msgctxt "Invoice PDF header: Invoice number"
msgid "Invoice number:"
msgstr "Arve number:"

#: templates/invoices/invoice.html:227
#: templates/invoices/invoice.html:219
msgctxt "Invoice PDF header: order number"
msgid "Order:"
msgstr "Tellimus:"

#: templates/invoices/invoice.html:233
#: templates/invoices/invoice.html:225
msgctxt "Invoice PDF header"
msgid "Date:"
msgstr "Kuupäev:"

#: templates/invoices/invoice.html:239
#: templates/invoices/invoice.html:231
msgctxt "Invoice PDF amount (price)"
msgid "Amount:"
msgstr "Summa:"

#: templates/invoices/invoice.html:248
#: templates/invoices/invoice.html:240
msgctxt "Invoice PDF"
msgid "BILLING ADDRESS"
msgstr "ARVE AADRESS"

#: templates/invoices/invoice.html:277
#: templates/invoices/invoice.html:269
msgctxt "Invoice PDF"
msgid "SHIPMENT ADDRESS"
msgstr "SAADETE AADRESS"

#: templates/invoices/invoice.html:308
#: templates/invoices/invoice.html:300
msgctxt "Invoice PDF"
msgid "PAYMENT METHOD"
msgstr "MAKSEVIIS"

#: templates/invoices/invoice.html:316
#: templates/invoices/invoice.html:306
msgctxt "Invoice PDF: Payment method value"
msgid "Unpaid"
msgstr "Maksmata"

#: templates/invoices/invoice.html:314
msgctxt "Invoice PDF"
msgid "SHIPMENT METHOD"
msgstr "SAATMISVIIS"

#: templates/invoices/invoice.html:326
#: templates/invoices/invoice.html:324
msgctxt "Invoice PDF table header"
msgid "ITEMS ORDERED"
msgstr "TELLITUD PUNKTID"
Expand Down Expand Up @@ -165,7 +171,7 @@ msgid ""
"Please click the link below to do so and log into your account.\n"
msgstr ""
"\n"
"% (Saidi_nimi) s sisselogimiseks peate kõigepealt kinnitama oma e-posti aadressi.\n"
"%(site_name)s sisselogimiseks peate kõigepealt kinnitama oma e-posti aadressi.\n"
"Selleks klõpsake alloleval lingil ja logige sisse oma kontole.\n"

#: templates/templated_email/account/email_changed_notification.email:4
Expand Down Expand Up @@ -326,7 +332,7 @@ msgid ""
msgstr ""
"\n"
"Makseandmete nägemiseks külastage palun: \n"
"% (order_details_url) s \n"
"%(order_details_url)s \n"

#: templates/templated_email/order/confirm_order.email:25
#: templates/templated_email/order/staff_confirm_order.email:25
Expand Down Expand Up @@ -406,7 +412,7 @@ msgstr "Saatmine pole vajalik"
#, python-format
msgctxt "Order cancel e-mail subject"
msgid "Order %(order)s canceled"
msgstr "Tellimus% (tellimus) on tühistatud"
msgstr "Tellimus %(order)s on tühistatud"

#: templates/templated_email/order/order_cancel.email:11
msgctxt "Order cancel e-mail text"
Expand All @@ -421,7 +427,7 @@ msgstr ""
#, python-format
msgctxt "Order refund e-mail subject"
msgid "Order %(order)s refunded"
msgstr "Tellimus% (tellimus) tagastati"
msgstr "Tellimus %(order)s tagastati"

#: templates/templated_email/order/order_refund.email:11
#, python-format
Expand Down Expand Up @@ -504,7 +510,7 @@ msgstr "See on automaatselt genereeritud e-kiri, palun ärge vastake."
#, python-format
msgctxt "Base email footer"
msgid "Sincerely, %(site_name)s"
msgstr "Lugupidamisega% (saidi_nimi) s"
msgstr "Lugupidamisega %(site_name)s"

#: templates/templated_email/shared/_header.email:2
#: templates/templated_email/source/account_delete.mjml:13
Expand Down Expand Up @@ -549,7 +555,7 @@ msgid ""
"In order to log into %(site_name)s, you have to confirm your email address "
"first. Please click the link below to do so and log into your account."
msgstr ""
"% (Saidi_nimi) s sisselogimiseks peate kinnitama oma e-posti "
"%(site_name)s sisselogimiseks peate kinnitama oma e-posti "
"aadressikõigepealt. Selleks klõpsake palun allolevat linki ja logige sisse "
"oma kontole."

Expand Down Expand Up @@ -765,7 +771,8 @@ msgid ""
" <a href=\"%(order_details_url)s\">%(order_details_url)s</a>"
msgstr ""
"Keegi esitas teie poes uue tellimuse. Tellimuse üksikasjade nägemiseks "
"külastage palun:<a href = \\"
"külastage palun: <a "
"href=\\\"%(order_details_url)s\\\">%(order_details_url)s</a>"

#: templates/templated_email/source/update_fulfillment.mjml:16
msgctxt "Fulfillment update email text"
Expand Down
Binary file modified locale/fa/LC_MESSAGES/django.mo
Binary file not shown.
Binary file modified locale/fi/LC_MESSAGES/django.mo
Binary file not shown.
Binary file modified locale/fr/LC_MESSAGES/django.mo
Binary file not shown.
Binary file modified locale/hi/LC_MESSAGES/django.mo
Binary file not shown.
Binary file modified locale/hu/LC_MESSAGES/django.mo
Binary file not shown.
Binary file modified locale/hy/LC_MESSAGES/django.mo
Binary file not shown.
Binary file modified locale/id/LC_MESSAGES/django.mo
Binary file not shown.
Binary file modified locale/is/LC_MESSAGES/django.mo
Binary file not shown.
Binary file modified locale/it/LC_MESSAGES/django.mo
Binary file not shown.
Binary file modified locale/ja/LC_MESSAGES/django.mo
Binary file not shown.
Binary file added locale/ka/LC_MESSAGES/django.mo
Binary file not shown.

0 comments on commit de3844a

Please sign in to comment.