Merge branch 'support/2.x/hotfix/2.0.5' into support/2.x/master

lyra · Sep 15, 2023 · 260ccde · 260ccde
2 parents 84218ac + 83b3ec2
commit 260ccde
Show file tree

Hide file tree

Showing 10 changed files with 177 additions and 61 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+2.0.5, 2023-09-15
+=============
+- Bug Fix: Fix client return to shop in case of multi-site.
+- Update list of supported payment means.
+- Added documentation management field.
+
 2.0.4, 2023-04-07
 =============
 - Fix return of method _process_feedback_data.

diff --git a/payment_lyra/__manifest__.py b/payment_lyra/__manifest__.py
@@ -9,7 +9,7 @@
 
 {
     'name': 'Lyra Collect Payment Acquirer',
-    'version': '2.0.4',
+    'version': '2.0.5',
     'summary': 'Accept payments with Lyra Collect secure payment gateway.',
     'category': 'Accounting/Payment Acquirers',
     'author': 'Lyra Network',

diff --git a/payment_lyra/helpers/constants.py b/payment_lyra/helpers/constants.py
@@ -31,7 +31,7 @@
     'LANGUAGE': 'en',
 
     'GATEWAY_VERSION': 'V2',
-    'PLUGIN_VERSION': '2.0.4',
+    'PLUGIN_VERSION': '2.0.5',
     'CMS_IDENTIFIER': 'Odoo_15',
 }
 
@@ -63,42 +63,50 @@
             'ACCORD_STORE': u'Cartes Enseignes Partenaires',
     'ACCORD_STORE_SB': u'Cartes Enseignes Partenaires (sandbox)',
             'ALINEA': u'Carte myalinea',
-    'ALINEA_CDX': u'Carte Cadeau Alinéa',
-    'ALINEA_CDX_SB': u'Carte Cadeau Alinéa (sandbox)',
+    'ALINEA_CDX': u'Carte Cadeau Alinéa',
+    'ALINEA_CDX_SB': u'Carte Cadeau Alinéa (sandbox)',
             'ALINEA_SB': u'Carte myalinea (sandbox)',
     'ALIPAY': u'Alipay',
-    'ALLOBEBE_CDX': u'Carte Cadeau Allobébé',
-            'ALLOBEBE_CDX_SB': u'Carte Cadeau Allobébé (sandbox)',
+    'ALLOBEBE_CDX': u'Carte Cadeau Allobébé',
+            'ALLOBEBE_CDX_SB': u'Carte Cadeau Allobébé (sandbox)',
+    'ALMA': u'Alma en 1 fois',
+    'ALMA_10X': u'Alma en 10 fois',
+            'ALMA_12X': u'Alma en 12 fois',
+    'ALMA_2X': u'Alma en 2 fois',
+    'ALMA_3X': u'Alma en 3 fois',
+            'ALMA_4X': u'Alma en 4 fois',
     'APETIZ': u'Apetiz',
-    'AUCHAN': u'Carte Auchan',
-            'AUCHAN_SB': u'Carte Auchan (sandbox)',
+    'APPLE_PAY': u'Apple Pay',
+            'AUCHAN': u'Carte Auchan',
+    'AUCHAN_SB': u'Carte Auchan (sandbox)',
     'AURORE-MULTI': u'Cpay Aurore',
-    'BANCONTACT': u'Bancontact Mistercash',
-            'BIZZBEE_CDX': u'Carte Cadeau Bizzbee',
-    'BIZZBEE_CDX_SB': u'Carte Cadeau Bizzbee (sandbox)',
-            'BOULANGER': u'Carte b+',
+            'BANCONTACT': u'Bancontact Mistercash',
+    'BIZUM': u'Bizum',
+    'BIZZBEE_CDX': u'Carte Cadeau Bizzbee',
+            'BIZZBEE_CDX_SB': u'Carte Cadeau Bizzbee (sandbox)',
+    'BOULANGER': u'Carte b+',
     'BOULANGER_SB': u'Carte b+ (sandbox)',
-    'BRICE_CDX': u'Carte Cadeau Brice',
-            'BRICE_CDX_SB': u'Carte Cadeau Brice (sandbox)',
+            'BRICE_CDX': u'Carte Cadeau Brice',
+    'BRICE_CDX_SB': u'Carte Cadeau Brice (sandbox)',
     'BUT': u'But',
+            'CABAL': u'Cabal',
+    'CARNET': u'Carnet',
     'CA_DO_CARTE': u'CA DO Carte',
-    'CABAL': u'Cabal',
-            'CARNET': u'Carnet',
-    'CHQ_DEJ': u'Chèque Déjeuner',
-    'COM_BARRY_CDX': u'Carte Cadeau Comtesse du Barry',
-            'COM_BARRY_CDX_SB': u'Carte Cadeau Comtesse du Barry (sandbox)',
-    'CONECS': u'Conecs',
+    'CHQ_DEJ': u'Chèque Déjeuner',
+            'COM_BARRY_CDX': u'Carte Cadeau Comtesse du Barry',
+    'COM_BARRY_CDX_SB': u'Carte Cadeau Comtesse du Barry (sandbox)',
+            'CONECS': u'Conecs',
     'CONFORAMA': u'Conforama',
-            'CORA': u'Cora',
+    'CORA': u'Cora',
     'CORA_BLANCHE': u'Cora blanche',
-    'CORA_PREM': u'Cora Visa Premier',
+            'CORA_PREM': u'Cora Visa Premier',
     'CORA_VISA': u'Cora Visa',
-            'CVCO': u'Chèque-Vacances Connect',
-    'DINERS': u'Diners',
+    'CVCO': u'Chèque-Vacances Connect',
+            'DINERS': u'Diners',
     'DISCOVER': u'Discover',
     'ECCARD': u'EC Card',
-            'EDENRED': u'Ticket Restaurant',
-    'EDENRED_EC': u'Ticket EcoCheque',
+    'EDENRED': u'Ticket Restaurant',
+            'EDENRED_EC': u'Ticket EcoCheque',
     'EDENRED_SC': u'Ticket Sport & Culture',
             'EDENRED_TC': u'Ticket Compliments',
     'EDENRED_TR': u'Ticket Restaurant',
@@ -107,48 +115,57 @@
     'FRANFINANCE_4X': u'Paiement en 4 fois',
             'FULLCB3X': u'Paiement en 3 fois CB',
     'FULLCB4X': u'Paiement en 4 fois CB',
-    'GEMO_CDX': u'Carte Cadeau Gémo',
-            'GEMO_CDX_SB': u'Carte Cadeau Gémo (sandbox)',
+    'GEMO_CDX': u'Carte Cadeau Gémo',
+            'GEMO_CDX_SB': u'Carte Cadeau Gémo (sandbox)',
     'GIROPAY': u'Giropay',
-    'GOOGLEPAY': u'Google Pay',
-            'HIPER': u'Hiper',
-    'HIPERCARD': u'Hipercard',
+    'HIPER': u'Hiper',
+            'HIPERCARD': u'Hipercard',
     'IDEAL': u'iDEAL',
     'ILLICADO': u'Carte Illicado',
             'ILLICADO_SB': u'Carte Illicado (sandbox)',
-    'JCB': u'JCB',
-    'JOUECLUB_CDX': u'Carte Cadeau Joué Club',
-            'JOUECLUB_CDX_SB': u'Carte Cadeau Joué Club (sandbox)',
-    'JULES_CDX': u'Carte Cadeau Jules',
-            'JULES_CDX_SB': u'Carte Cadeau Jules (sandbox)',
-    'LEROY-MERLIN': u'Carte Maison Financement',
-            'LEROY-MERLIN_SB': u'Carte Maison Financement (sandbox)',
-    'MASTERPASS': u'MasterPass',
-            'MC_CORDOBESA': u'Mastercard Cordobesa',
+    'IP_WIRE': u'Virement SEPA',
+    'IP_WIRE_INST': u'Virement SEPA Instantané',
+            'JCB': u'JCB',
+    'JOUECLUB_CDX': u'Carte Cadeau Joué Club',
+    'JOUECLUB_CDX_SB': u'Carte Cadeau Joué Club (sandbox)',
+            'JULES_CDX': u'Carte Cadeau Jules',
+    'JULES_CDX_SB': u'Carte Cadeau Jules (sandbox)',
+            'KADEOS_CULTURE': u'Carte Kadéos Culture',
+    'KADEOS_GIFT': u'Carte Kadéos Zénith',
+    'LECLERC': u'Carte Reglo',
+            'LEROY-MERLIN': u'Carte Maison Financement',
+    'LEROY-MERLIN_SB': u'Carte Maison Financement (sandbox)',
+            'MASTERPASS': u'MasterPass',
+    'MC_CORDOBESA': u'Mastercard Cordobesa',
     'MULTIBANCO': u'Multibanco',
-    'MYBANK': u'MyBank',
+            'MYBANK': u'MyBank',
     'NARANJA': u'Naranja',
-            'NORAUTO': u'Carte Norauto option Financement',
-    'NORAUTO_SB': u'Carte Norauto option Financement (sandbox)',
+    'NORAUTO': u'Carte Norauto option Financement',
+            'NORAUTO_SB': u'Carte Norauto option Financement (sandbox)',
+    'ONEY_10X_12X': u'Paiement en 10 ou 12 fois Oney',
             'ONEY_3X_4X': u'Paiement en 3 ou 4 fois Oney',
     'ONEY_ENSEIGNE': u'Cartes enseignes Oney',
-            'PAYDIREKT': u'Paydirekt',
-    'PAYLIB': u'Paylib',
+            'ONEY_PAYLATER': u'Pay Later Oney',
+    'PAYCONIQ': u'Payconiq',
+    'PAYDIREKT': u'Paydirekt',
     'PAYPAL': u'PayPal',
-    'PAYPAL_SB': u'PayPal Sandbox',
-            'PICWIC': u'Carte Picwic',
+            'PAYPAL_SB': u'PayPal Sandbox',
+    'PICWIC': u'Carte Picwic',
     'PICWIC_SB': u'Carte Picwic (sandbox)',
-    'POSTFINANCE': u'PostFinance Card',
-            'POSTFINANCE_EFIN': u'PostFinance E-Finance',
+            'POSTFINANCE': u'PostFinance Card',
+    'POSTFINANCE_EFIN': u'PostFinance E-Finance',
     'PRESTO': u'Presto',
-    'PRZELEWY24': u'Przelewy24',
-            'SDD': u'SEPA direct debit',
-    'SODEXO': u'Pass Restaurant',
+            'PRZELEWY24': u'Przelewy24',
+    'S-MONEY': u'S-money',
+    'SCT': u'Virement SEPA',
+    'SDD': u'SEPA direct debit',
+            'SODEXO': u'Pass Restaurant',
     'SOFORT_BANKING': u'Sofort',
-            'SOROCRED': u'Sorocred',
+    'SOROCRED': u'Sorocred',
     'UNION_PAY': u'UnionPay',
+            'UPI': u'UPI',
     'VILLAVERDE': u'Carte Cadeau VillaVerde',
-            'VILLAVERDE_SB': u'Carte Cadeau VillaVerde (sandbox)',
+    'VILLAVERDE_SB': u'Carte Cadeau VillaVerde (sandbox)',
     'WECHAT': u'WeChat Pay',
 }
 
@@ -159,9 +176,22 @@
     ['EUR', '978', 2],
             ['GBP', '826', 2],
     ['JPY', '392', 0],
-    ['DKK', '208', 2],
     ['NOK', '578', 2],
-            ['PLN', '985', 2],
-    ['SEK', '752', 2],
+    ['PLN', '985', 2],
+            ['SEK', '752', 2],
     ['USD', '840', 2],
 ]
+
+LYRA_ONLINE_DOC_URI = {
+            'fr': 'https://docs.lyra.com/fr/collect/plugins/',
+            'en': 'https://docs.lyra.com/en/collect/plugins/',
+            'es': 'https://docs.lyra.com/es-ES/collect/plugins/',
+}
+
+LYRA_DOCUMENTATION = {
+    'fr': 'Français',
+    'en': 'English',
+    'es': 'Español',
+    'de': 'Deutsch',
+    'pt': 'Português'
+}
diff --git a/payment_lyra/i18n/de.po b/payment_lyra/i18n/de.po
@@ -508,6 +508,11 @@ msgstr ""
 msgid "NO"
 msgstr "NEIN"
 
+#. module: payment_lyra
+#: model_terms:ir.ui.view,arch_db:payment_lyra.acquirer_form_lyra
+msgid "MODULE INFORMATION"
+msgstr "MODULINFORMATIONEN"
+
 #. module: payment_lyra
 #: model_terms:ir.ui.view,arch_db:payment_lyra.acquirer_form_lyra
 msgid "PAYMENT GATEWAY ACCESS"
@@ -630,6 +635,14 @@ msgstr ""
 msgid "See the transaction details for more information ({})."
 msgstr "Weitere Informationen finden Sie in den Transaktionsdetails ({})."
 
+#. module: payment_lyra
+#: code:addons/payment_lyra/models/payment_acquirer.py:0
+#: code:addons/payment_lyra/models/payment_acquirer.py:0
+#: model:ir.model.fields,field_description:payment_lyra.field_payment_acquirer__lyra_doc
+#, python-format
+msgid "Click to view the module configuration documentation"
+msgstr "Klicken Sie, um die Modul-Konfigurationsdokumentation zu finden"
+
 #. module: payment_lyra
 #: code:addons/payment_lyra/models/payment_acquirer.py:0
 #: code:addons/payment_lyra/models/payment_acquirer.py:0

diff --git a/payment_lyra/i18n/en.po b/payment_lyra/i18n/en.po
@@ -509,6 +509,11 @@ msgstr ""
 msgid "NO"
 msgstr "NO"
 
+#. module: payment_lyra
+#: model_terms:ir.ui.view,arch_db:payment_lyra.acquirer_form_lyra
+msgid "MODULE INFORMATION"
+msgstr "MODULE INFORMATION"
+
 #. module: payment_lyra
 #: model_terms:ir.ui.view,arch_db:payment_lyra.acquirer_form_lyra
 msgid "PAYMENT GATEWAY ACCESS"
@@ -631,6 +636,14 @@ msgstr ""
 msgid "See the transaction details for more information ({})."
 msgstr "See the transaction details for more information ({})."
 
+#. module: payment_lyra
+#: code:addons/payment_lyra/models/payment_acquirer.py:0
+#: code:addons/payment_lyra/models/payment_acquirer.py:0
+#: model:ir.model.fields,field_description:payment_lyra.field_payment_acquirer__lyra_doc
+#, python-format
+msgid "Click to view the module configuration documentation"
+msgstr "Click to view the module configuration documentation"
+
 #. module: payment_lyra
 #: code:addons/payment_lyra/models/payment_acquirer.py:0
 #: code:addons/payment_lyra/models/payment_acquirer.py:0

diff --git a/payment_lyra/i18n/es.po b/payment_lyra/i18n/es.po
@@ -507,6 +507,11 @@ msgstr ""
 msgid "NO"
 msgstr "NO"
 
+#. module: payment_lyra
+#: model_terms:ir.ui.view,arch_db:payment_lyra.acquirer_form_lyra
+msgid "MODULE INFORMATION"
+msgstr "INFORMACIÓN DEL MÓDULO"
+
 #. module: payment_lyra
 #: model_terms:ir.ui.view,arch_db:payment_lyra.acquirer_form_lyra
 msgid "PAYMENT GATEWAY ACCESS"
@@ -629,6 +634,14 @@ msgstr ""
 msgid "See the transaction details for more information ({})."
 msgstr "Vea los detalles de la transacción para más información ({})."
 
+#. module: payment_lyra
+#: code:addons/payment_lyra/models/payment_acquirer.py:0
+#: code:addons/payment_lyra/models/payment_acquirer.py:0
+#: model:ir.model.fields,field_description:payment_lyra.field_payment_acquirer__lyra_doc
+#, python-format
+msgid "Click to view the module configuration documentation"
+msgstr "Haga clic para ver la documentación de la configuración del módulo"
+
 #. module: payment_lyra
 #: code:addons/payment_lyra/models/payment_acquirer.py:0
 #: code:addons/payment_lyra/models/payment_acquirer.py:0

diff --git a/payment_lyra/i18n/fr.po b/payment_lyra/i18n/fr.po
@@ -503,6 +503,11 @@ msgstr ""
 msgid "NO"
 msgstr "NON"
 
+#. module: payment_lyra
+#: model_terms:ir.ui.view,arch_db:payment_lyra.acquirer_form_lyra
+msgid "MODULE INFORMATION"
+msgstr "INFORMATIONS SUR LE MODULE"
+
 #. module: payment_lyra
 #: model_terms:ir.ui.view,arch_db:payment_lyra.acquirer_form_lyra
 msgid "PAYMENT GATEWAY ACCESS"
@@ -625,6 +630,15 @@ msgstr ""
 msgid "See the transaction details for more information ({})."
 msgstr "Voir le détail de la transaction pour plus d'information ({})."
 
+#. module: payment_lyra
+#: code:addons/payment_lyra/models/payment_acquirer.py:0
+#: code:addons/payment_lyra/models/payment_acquirer.py:0
+#: model:ir.model.fields,field_description:payment_lyra.field_payment_acquirer__lyra_doc
+#, python-format
+msgid "Click to view the module configuration documentation"
+msgstr "Cliquer pour accéder à la documentation de configuration du module"
+
+
 #. module: payment_lyra
 #: code:addons/payment_lyra/models/payment_acquirer.py:0
 #: code:addons/payment_lyra/models/payment_acquirer.py:0

diff --git a/payment_lyra/i18n/payment_lyra.pot b/payment_lyra/i18n/payment_lyra.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 15.0-20211124\n"
+"Project-Id-Version: Odoo Server 15.0-20230914\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-30 10:30+0000\n"
-"PO-Revision-Date: 2022-01-30 10:30+0000\n"
+"POT-Creation-Date: 2023-09-14 10:30+0000\n"
+"PO-Revision-Date: 2023-09-14 10:30+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -481,6 +481,11 @@ msgstr ""
 msgid "NO"
 msgstr ""
 
+#. module: payment_lyra
+#: model_terms:ir.ui.view,arch_db:payment_lyra.acquirer_form_lyra
+msgid "MODULE INFORMATION"
+msgstr ""
+
 #. module: payment_lyra
 #: model_terms:ir.ui.view,arch_db:payment_lyra.acquirer_form_lyra
 msgid "PAYMENT GATEWAY ACCESS"
@@ -603,6 +608,14 @@ msgstr ""
 msgid "See the transaction details for more information ({})."
 msgstr ""
 
+#. module: payment_lyra
+#: code:addons/payment_lyra/models/payment_acquirer.py:0
+#: code:addons/payment_lyra/models/payment_acquirer.py:0
+#: model:ir.model.fields,field_description:payment_lyra.field_payment_acquirer__lyra_doc
+#, python-format
+msgid "Click to view the module configuration documentation"
+msgstr ""
+
 #. module: payment_lyra
 #: code:addons/payment_lyra/models/payment_acquirer.py:0
 #: code:addons/payment_lyra/models/payment_acquirer.py:0