Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

16.0 pre commit fixes mark #39

Merged
merged 2 commits into from
Apr 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ exclude: |
readme/.*\.(rst|md)$|
# You don't usually want a bot to modify your legal texts
(LICENSE.*|COPYING.*)|
# Emesa: prevent "not used from manifest" for indirectly loaded test data
custom/addons/([^/]+)/test_data/
# Temporary modules
nextcloud_odoo_sync/
default_language_version:
python: python3
node: "16.17.0"
Expand Down
Empty file modified website_payment_recurring_donations/__init__.py
100755 → 100644
Empty file.
2 changes: 2 additions & 0 deletions website_payment_recurring_donations/__manifest__.py
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
{
"name": "Recurring donations",
"version": "16.0.1.0.0",
"author": "Onestein",
"website": "https://www.onestein.nl",
"category": "Website",
"license": "LGPL-3",
"summary": "Recurring donations",
Expand Down
Empty file modified website_payment_recurring_donations/controllers/__init__.py
100755 → 100644
Empty file.
Empty file modified website_payment_recurring_donations/controllers/portal.py
100755 → 100644
Empty file.
Empty file modified website_payment_recurring_donations/data/donation_data.xml
100755 → 100644
Empty file.
Empty file modified website_payment_recurring_donations/i18n/nl.po
100755 → 100644
Empty file.
Empty file modified website_payment_recurring_donations/models/__init__.py
100755 → 100644
Empty file.
6 changes: 2 additions & 4 deletions website_payment_recurring_donations/models/payment_transaction.py
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,12 @@ class PaymentTransaction(models.Model):
_inherit = "payment.transaction"

donation_frequency = fields.Selection(
[("onetime", "One Time"), ("monthly", "Monthly")], string="Donation Frequency"
[("onetime", "One Time"), ("monthly", "Monthly")]
)
recurring_donation_provider_reference = fields.Char(
"Provider Reference For Recurring Donation"
)
is_recurring_donation_terminated = fields.Boolean(
"Is Recurring Donation Terminated"
)
is_recurring_donation_terminated = fields.Boolean()

def _send_donation_email(
self, is_internal_notification=False, comment=None, recipient_email=None
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import checkoutForm from 'payment.checkout_form';

checkoutForm.include({
// eslint-disable-next-line no-unused-vars
_prepareTransactionRouteParams: function (code, paymentOptionId, flow) {
const transactionRouteParams = this._super(...arguments);
return $('.o_donation_payment_form').length ? {
Expand Down
File renamed without changes.
Empty file.
Empty file.
Empty file.
Empty file modified website_payment_recurring_donations/views/res_partner_view.xml
100755 → 100644
Empty file.
6 changes: 3 additions & 3 deletions website_payment_recurring_donations/views/snippets/s_donation.xml
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
</xpath>
</template>

<record id="website_payment_recurring_donations.s_donation_000_js" model="ir.asset">
<record id="s_donation_000_js" model="ir.asset">
<field name="name">Donation 000 JS</field>
<field name="bundle">web.assets_frontend</field>
<field name="path">website_payment_recurring_donations/static/src/snippets/s_donation/000.js</field>
<field name="path">website_payment_recurring_donations/static/src/snippets/s_donation/000.esm.js</field>
</record>

<record id="website_payment_recurring_donations.s_donation_000_scss" model="ir.asset">
<record id="s_donation_000_scss" model="ir.asset">
<field name="name">Donation 000 SCSS</field>
<field name="bundle">web.assets_frontend</field>
<field name="path">website_payment_recurring_donations/static/src/snippets/s_donation/000.scss</field>
Expand Down
Empty file modified website_payment_recurring_donations_mollie/__init__.py
100755 → 100644
Empty file.
2 changes: 2 additions & 0 deletions website_payment_recurring_donations_mollie/__manifest__.py
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
{
"name": "Recurring donations using Mollie Subscriptions",
"version": "16.0.1.0.0",
"author": "Onestein",
"website": "https://www.onestein.nl",
"category": "Website",
"license": "LGPL-3",
"summary": "Recurring donations using Mollie Subscriptions",
Expand Down
41 changes: 38 additions & 3 deletions website_payment_recurring_donations_mollie/i18n/nl.po
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 15.0\n"
"Project-Id-Version: Odoo Server 16.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-09-22 13:53+0000\n"
"PO-Revision-Date: 2023-09-22 13:53+0000\n"
"POT-Creation-Date: 2024-04-22 07:13+0000\n"
"PO-Revision-Date: 2024-04-22 07:13+0000\n"
"Last-Translator: \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
Expand All @@ -16,18 +16,53 @@ msgstr ""
"Plural-Forms: \n"

#. module: website_payment_recurring_donations_mollie
#: model:ir.model,name:website_payment_recurring_donations_mollie.model_res_partner
msgid "Contact"
msgstr ""

#. module: website_payment_recurring_donations_mollie
#: model:ir.model.fields,field_description:website_payment_recurring_donations_mollie.field_res_partner__mollie_customer_id
msgid "Mollie Customer ID"
msgstr "Mollie Klant ID"

#. module: website_payment_recurring_donations_mollie
#. odoo-python
#: code:addons/website_payment_recurring_donations_mollie/models/payment_transaction.py:0
#: code:addons/website_payment_recurring_donations_mollie/models/payment_transaction.py:0
#, python-format
msgid "Mollie customer or subscription not found"
msgstr "Mollie klant of abonnement niet gevonden"

#. module: website_payment_recurring_donations_mollie
#. odoo-python
#: code:addons/website_payment_recurring_donations_mollie/models/payment_transaction.py:0
#: code:addons/website_payment_recurring_donations_mollie/models/payment_transaction.py:0
#, python-format
msgid "Mollie: canceled due to status: %s"
msgstr "Mollie: geannuleerd vanwege status: %s"

#. module: website_payment_recurring_donations_mollie
#: model:ir.model,name:website_payment_recurring_donations_mollie.model_payment_provider
msgid "Payment Provider"
msgstr "Betaaldienstaanbieder"

#. module: website_payment_recurring_donations_mollie
#: model:ir.model,name:website_payment_recurring_donations_mollie.model_payment_transaction
msgid "Payment Transaction"
msgstr "Betalingstransactie"

#. module: website_payment_recurring_donations_mollie
#. odoo-python
#: code:addons/website_payment_recurring_donations_mollie/models/payment_transaction.py:0
#: code:addons/website_payment_recurring_donations_mollie/models/payment_transaction.py:0
#, python-format
msgid "Received data with invalid payment status: %s"
msgstr "Gegevens ontvangen met ongeldige betalingsstatus: %s"

#. module: website_payment_recurring_donations_mollie
#. odoo-python
#: code:addons/website_payment_recurring_donations_mollie/models/payment_transaction.py:0
#: code:addons/website_payment_recurring_donations_mollie/models/payment_transaction.py:0
#, python-format
msgid "The recurring donation on mollie has been terminated on %s."
msgstr "The herhalende donatie via Mollie is gestopt op %s."
Empty file modified website_payment_recurring_donations_mollie/models/__init__.py
100755 → 100644
Empty file.
Empty file.
6 changes: 3 additions & 3 deletions website_payment_recurring_donations_mollie/models/payment_transaction.py
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -170,10 +170,10 @@ def action_terminate_recurring_donation(self):
subscription.get("canceledAt")[0:19], "%Y-%m-%dT%H:%M:%S"
)
msg = _(
"<b>The recurring donation on mollie has been terminated on %s"
% (canceled_date)
"The recurring donation on mollie has been terminated on %s.",
canceled_date,
)
self.sudo().message_post(body=msg)
self.sudo().message_post(body=f"<b>{msg}</b>")
except Exception:
_logger.info(_("Mollie customer or subscription not found"))
# marking all related payment transactions for recurring donations having same provider reference as terminated.
Expand Down
Empty file.
Empty file.
Loading