Skip to content

Commit c9ad5ad

Browse files
alima-grine-lyraalima-grine-lyra
committed
Merge branch 'release/4.0.0'
2 parents c3d379d + 3da9035 commit c9ad5ad

16 files changed

+270
-154
lines changed

‎CHANGELOG.md‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
1-
3.0.3, 2023-09-14
1+
4.0.0, 2024-05-30:
22
=============
3-
- Bug Fix: Fix client return to shop in case of multi-site.
4-
- Update list of supported payment means.
5-
6-
3.0.2, 2023-06-06
7-
=============
8-
- Add documentation management field.
9-
- Minor code fixes.
10-
11-
3.0.1, 2023-03-29
12-
=============
13-
- Bug fix: Fix arguments of the method _get_default_payment_method_id.
14-
- Update list of supported payment means.
15-
- Update list of supported currencies.
16-
17-
3.0.0, 2022-12-15
18-
=============
19-
- New plugin for Odoo 16.
3+
- New plugin for Odoo 17.

‎COPYING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright © 2017-2023 Lyra Network.
1+
Copyright © 2024 Lyra Network.
22

33
Lyra Collect plugin for Odoo is free software: you can redistribute it and/or modify
44
it under the terms of the GNU Affero General Public License as

‎payment_lyra/__init__.py‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,18 @@
99

1010
from . import controllers
1111
from . import models
12+
13+
from .helpers import constants
14+
from odoo.addons.payment import setup_provider, reset_payment_provider
15+
16+
def post_init_hook(env):
17+
setup_provider(env, 'lyra')
18+
19+
if constants.LYRA_PLUGIN_FEATURES.get('multi') == True:
20+
setup_provider(env, 'lyramulti')
21+
22+
def uninstall_hook(env):
23+
reset_payment_provider(env, 'lyra')
24+
25+
if constants.LYRA_PLUGIN_FEATURES.get('multi') == True:
26+
reset_payment_provider(env, 'lyramulti')

‎payment_lyra/__manifest__.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
{
1111
'name': 'Lyra Collect Payment Provider',
12-
'version': '3.0.3',
12+
'version': '4.0.0',
1313
'summary': 'Accept payments with Lyra Collect secure payment gateway.',
1414
'category': 'Accounting/Payment Providers',
1515
'author': 'Lyra Network',
@@ -19,10 +19,12 @@
1919
'data': [
2020
'views/payment_provider_views.xml',
2121
'views/payment_lyra_templates.xml',
22-
'data/payment_icon_data.xml',
22+
'data/payment_method_data.xml',
2323
'data/payment_provider_data.xml',
2424
'security/ir.model.access.csv',
2525
],
26+
'post_init_hook': 'post_init_hook',
27+
'uninstall_hook': 'uninstall_hook',
2628
'images': ['static/description/icon.png'],
2729
'application': True,
2830
'installable': True

‎payment_lyra/data/payment_icon_data.xml‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎payment_lyra/data/payment_method_data.xml‎

Lines changed: 148 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
# Copyright © Lyra Network.
4+
# This file is part of Lyra Collect plugin for Odoo. See COPYING.md for license details.
5+
#
6+
# Author: Lyra Network (https://www.lyra.com)
7+
# Copyright: Copyright © Lyra Network
8+
# License: http://www.gnu.org/licenses/agpl.html GNU Affero General Public License (AGPL v3)
9+
-->
10+
11+
<odoo noupdate="1">
12+
<record id="payment_method_lyra" model="payment.method">
13+
<field name="name"><![CDATA[Lyra Collect]]></field>
14+
<field name="code">lyra</field>
15+
<field name="sequence">1000</field>
16+
<field name="image" type="base64" file="payment/static/img/card.png" />
17+
<field name="support_tokenization">False</field>
18+
<field name="support_express_checkout">False</field>
19+
<field name="support_refund"></field>
20+
</record>
21+
22+
<record id="payment_method_lyramulti" model="payment.method">
23+
<field name="name"><![CDATA[Lyra Collect Multi]]></field>
24+
<field name="code">lyramulti</field>
25+
<field name="sequence">1000</field>
26+
<field name="image" type="base64" file="payment/static/img/card.png" />
27+
<field name="support_tokenization">False</field>
28+
<field name="support_express_checkout">False</field>
29+
<field name="support_refund"></field>
30+
</record>
31+
32+
<record id="payment_method_lyracb" model="payment.method">
33+
<field name="name">CB</field>
34+
<field name="code">lyracb</field>
35+
<field name="primary_payment_method_id" eval="ref('payment_method_lyra')" />
36+
<field name="sequence">1000</field>
37+
<field name="active">True</field>
38+
<field name="image" type="base64" file="payment_lyra/static/src/img/cb.png" />
39+
</record>
40+
41+
<record id="payment_method_lyravisa" model="payment.method">
42+
<field name="name">Visa</field>
43+
<field name="code">lyravisa</field>
44+
<field name="primary_payment_method_id" eval="ref('payment_method_lyra')" />
45+
<field name="sequence">1000</field>
46+
<field name="active">True</field>
47+
<field name="image" type="base64" file="payment/static/img/visa.png" />
48+
</record>
49+
50+
<record id="payment_method_lyramastercard" model="payment.method">
51+
<field name="name">Mastercard</field>
52+
<field name="code">lyramastercard</field>
53+
<field name="primary_payment_method_id" eval="ref('payment_method_lyra')" />
54+
<field name="sequence">1000</field>
55+
<field name="active">True</field>
56+
<field name="image" type="base64" file="payment/static/img/mastercard.png" />
57+
</record>
58+
59+
<record id="payment_method_lyraamex" model="payment.method">
60+
<field name="name">American Express</field>
61+
<field name="code">lyraamex</field>
62+
<field name="primary_payment_method_id" eval="ref('payment_method_lyra')" />
63+
<field name="sequence">1000</field>
64+
<field name="active">True</field>
65+
<field name="image" type="base64" file="payment/static/img/amex.png" />
66+
</record>
67+
68+
<record id="payment_method_lyraecardtebleue" model="payment.method">
69+
<field name="name">e-Carte Bleue</field>
70+
<field name="code">lyraecartebleue</field>
71+
<field name="primary_payment_method_id" eval="ref('payment_method_lyra')" />
72+
<field name="sequence">1000</field>
73+
<field name="active">False</field>
74+
<field name="image" type="base64" file="payment_lyra/static/src/img/e-cartebleue.png" />
75+
</record>
76+
77+
<record id="payment_method_lyravisaelectron" model="payment.method">
78+
<field name="name">Visa Electron</field>
79+
<field name="code">lyravisaelectron</field>
80+
<field name="primary_payment_method_id" eval="ref('payment_method_lyra')" />
81+
<field name="sequence">1000</field>
82+
<field name="active">False</field>
83+
<field name="image" type="base64" file="payment_lyra/static/src/img/visa_electron.png" />
84+
</record>
85+
86+
<record id="payment_method_lyravpay" model="payment.method">
87+
<field name="name">V PAY</field>
88+
<field name="code">lyravpay</field>
89+
<field name="primary_payment_method_id" eval="ref('payment_method_lyra')" />
90+
<field name="sequence">1000</field>
91+
<field name="active">False</field>
92+
<field name="image" type="base64" file="payment/static/img/vpay.png" />
93+
</record>
94+
95+
<record id="payment_method_lyraapplepay" model="payment.method">
96+
<field name="name">Apple Pay</field>
97+
<field name="code">lyraapplepay</field>
98+
<field name="primary_payment_method_id" eval="ref('payment_method_lyra')" />
99+
<field name="sequence">1000</field>
100+
<field name="active">False</field>
101+
<field name="image" type="base64" file="payment/static/img/apple_pay.png" />
102+
</record>
103+
104+
<record id="payment_method_lyrapaypal" model="payment.method">
105+
<field name="name">PayPal</field>
106+
<field name="code">lyrapaypal</field>
107+
<field name="primary_payment_method_id" eval="ref('payment_method_lyra')" />
108+
<field name="sequence">1000</field>
109+
<field name="active">False</field>
110+
<field name="image" type="base64" file="payment/static/img/paypal.png" />
111+
</record>
112+
113+
<record id="payment_method_lyramulticb" model="payment.method">
114+
<field name="name">CB</field>
115+
<field name="code">lyramulticb</field>
116+
<field name="primary_payment_method_id" eval="ref('payment_method_lyramulti')" />
117+
<field name="sequence">1000</field>
118+
<field name="active">True</field>
119+
<field name="image" type="base64" file="payment_lyra/static/src/img/cb.png" />
120+
</record>
121+
122+
<record id="payment_method_lyramultivisa" model="payment.method">
123+
<field name="name">Visa</field>
124+
<field name="code">lyramultivisa</field>
125+
<field name="primary_payment_method_id" eval="ref('payment_method_lyramulti')" />
126+
<field name="sequence">1000</field>
127+
<field name="active">True</field>
128+
<field name="image" type="base64" file="payment/static/img/visa.png" />
129+
</record>
130+
131+
<record id="payment_method_lyramultimastercard" model="payment.method">
132+
<field name="name">Mastercard</field>
133+
<field name="code">lyramultimastercard</field>
134+
<field name="primary_payment_method_id" eval="ref('payment_method_lyramulti')" />
135+
<field name="sequence">1000</field>
136+
<field name="active">True</field>
137+
<field name="image" type="base64" file="payment/static/img/mastercard.png" />
138+
</record>
139+
140+
<record id="payment_method_lyramultiamex" model="payment.method">
141+
<field name="name">American Express</field>
142+
<field name="code">lyramultiamex</field>
143+
<field name="primary_payment_method_id" eval="ref('payment_method_lyramulti')" />
144+
<field name="sequence">1000</field>
145+
<field name="active">True</field>
146+
<field name="image" type="base64" file="payment/static/img/amex.png" />
147+
</record>
148+
</odoo>

‎payment_lyra/data/payment_provider_data.xml‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,6 @@
1212
<data noupdate="1">
1313
<record id="payment_provider_lyra" model="payment.provider">
1414
<field name="name"><![CDATA[Lyra Collect - Standard payment]]></field>
15-
<field name="display_as">Payment by credit card</field>
16-
<field name="payment_icon_ids"
17-
eval="[(6, 0, [
18-
ref('payment_lyra.payment_icon_cc_lyracb'),
19-
ref('payment_lyra.payment_icon_cc_lyravisa'),
20-
ref('payment_lyra.payment_icon_cc_lyramastercard'),
21-
])]"/>
2215
<field name="image" type="base64" file="payment_lyra/static/src/img/logo.png" />
2316
<field name="image_128" type="base64" file="payment_lyra/static/src/img/logo.png" />
2417
<field name="code">lyra</field>
@@ -34,13 +27,12 @@
3427
<field name="lyra_redirect_enabled">0</field>
3528
<field name="lyra_redirect_success_timeout">5</field>
3629
<field name="lyra_redirect_error_timeout">5</field>
37-
<field name="lyra_return_mode">GET</field>
38-
</record>
39-
40-
<record id="payment_method_lyra" model="account.payment.method">
41-
<field name="name"><![CDATA[Lyra Collect]]></field>
42-
<field name="code">lyra</field>
43-
<field name="payment_type">inbound</field>
30+
<field name="lyra_return_mode">POST</field>
31+
<field name="payment_method_ids"
32+
eval="[Command.set([
33+
ref('payment_lyra.payment_method_lyra'),
34+
])]"
35+
/>
4436
</record>
4537
</data>
4638

‎payment_lyra/data/payment_provider_data_multi.xml‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,6 @@
1212
<data noupdate="1">
1313
<record id="payment_provider_lyramulti" model="payment.provider">
1414
<field name="name"><![CDATA[Lyra Collect - Payment in installments]]></field>
15-
<field name="display_as">Payment by credit card in installments</field>
16-
<field name="payment_icon_ids"
17-
eval="[(6, 0, [
18-
ref('payment_lyra.payment_icon_cc_lyracb'),
19-
ref('payment_lyra.payment_icon_cc_lyravisa'),
20-
ref('payment_lyra.payment_icon_cc_lyramastercard'),
21-
])]"/>
2215
<field name="image" type="base64" file="payment_lyra/static/src/img/logo.png" />
2316
<field name="image_128" type="base64" file="payment_lyra/static/src/img/logo.png" />
2417
<field name="code">lyramulti</field>
@@ -37,13 +30,12 @@
3730
<field name="lyra_redirect_enabled">0</field>
3831
<field name="lyra_redirect_success_timeout">5</field>
3932
<field name="lyra_redirect_error_timeout">5</field>
40-
<field name="lyra_return_mode">GET</field>
41-
</record>
42-
43-
<record id="payment_method_lyramulti" model="account.payment.method">
44-
<field name="name"><![CDATA[Lyra Collect Multi]]></field>
45-
<field name="code">lyramulti</field>
46-
<field name="payment_type">inbound</field>
33+
<field name="lyra_return_mode">POST</field>
34+
<field name="payment_method_ids"
35+
eval="[Command.set([
36+
ref('payment_lyra.payment_method_lyramulti'),
37+
])]"
38+
/>
4739
</record>
4840
</data>
4941
</odoo>

0 commit comments

Comments
 (0)