From b935000fdadfe9c693f225af0a5ff40a55c8038d Mon Sep 17 00:00:00 2001 From: ndeet Date: Mon, 27 Jan 2025 14:50:53 +0100 Subject: [PATCH] Odoo 18.0 compatibility. --- README.md | 5 +++-- payment_btcpayserver/README.md | 16 ++++++++-------- payment_btcpayserver/__manifest__.py | 4 ++-- .../models/payment_transaction.py | 1 - 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 4383888..64f4791 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,12 @@ -# BTCPay Server payment gateway for Odoo 16 and 17 +# BTCPay Server payment gateway for Odoo 16, 17 and 18 -## Accept bitcoin payments on Odoo 16 and 17 +## Accept bitcoin payments on Odoo 16, 17 and 18 This odoo addon allows you to accept bitcoin and Lightning Network (and other cryptocurrency) payments in your Odoo e-commerce store. ![BTCPay Server Banner](https://raw.githubusercontent.com/btcpayserver/odoo/17.0/payment_btcpayserver/static/description/BTCPay-Odoo-17-featured.png) ## How to install Please find the installation instructions here: +- [Odoo 18 documentation](https://github.com/btcpayserver/odoo/blob/18.0/payment_btcpayserver/README.md) - [Odoo 17 documentation](https://github.com/btcpayserver/odoo/blob/17.0/payment_btcpayserver/README.md) - [Odoo 16 documentation](https://github.com/btcpayserver/odoo/blob/16.0/payment_btcpayserver/README.md) \ No newline at end of file diff --git a/payment_btcpayserver/README.md b/payment_btcpayserver/README.md index 73dfb40..06f4343 100644 --- a/payment_btcpayserver/README.md +++ b/payment_btcpayserver/README.md @@ -1,16 +1,16 @@ -# BTCPay Server payment gateway for Odoo 17 +# BTCPay Server payment gateway for Odoo 18 -## This is the module to connect Odoo 17 and BTCPay Server +## This is the module to connect Odoo 18 and BTCPay Server This module allows you to accept bitcoin (and other cryptocurrency) payments in your Odoo e-commerce store. -![BTCPay Server Banner](https://raw.githubusercontent.com/btcpayserver/odoo/17.0/payment_btcpayserver/static/description/BTCPay-Odoo-17-featured.png) +![BTCPay Server Banner](https://raw.githubusercontent.com/btcpayserver/odoo/18.0/payment_btcpayserver/static/description/BTCPay-Odoo-17-featured.png) :::tip -If you use Odoo 16 you can find the documentation [here](https://github.com/btcpayserver/odoo/blob/16.0/payment_btcpayserver/README.md). +If you use Odoo 16 you can find the documentation [here](https://github.com/btcpayserver/odoo/blob/16.0/payment_btcpayserver/README.md) and for Odoo 17 [here](https://github.com/btcpayserver/odoo/blob/17.0/payment_btcpayserver/README.md). ::: ## Install the module * Clone our [repository](https://github.com/btcpayserver/odoo) or download the .zip from the [releases page](https://github.com/btcpayserver/odoo/releases) -* Make sure you are on branch `17.0` or downloaded a release tagged with version v17.x +* Make sure you are on branch `18.0` or downloaded a release tagged with version v18.x * Place the `payment_btcpayserver` directory in your Odoo addons directory * Install dependencies by running `pip install -r requirements.txt` (from inside the `payment_btcpayserver` directory) * Restart Odoo @@ -46,13 +46,13 @@ Check the payment method is enabled: Congrats, all done. Do some testing to be sure all works. -![Payment Provider Settings](https://raw.githubusercontent.com/btcpayserver/odoo/17.0/payment_btcpayserver/static/description/BTCPayPaymentSettings.png) +![Payment Provider Settings](https://raw.githubusercontent.com/btcpayserver/odoo/18.0/payment_btcpayserver/static/description/BTCPayPaymentSettings.png) ## How does the payment page look? During the checkout the customers will have the option to select the payment method "Pay with Bitcoin / Lightning Network". After selecting they will be redirected to the BTCPay checkout page as shown below. -![Checkout page example](https://raw.githubusercontent.com/btcpayserver/odoo/17.0/payment_btcpayserver/static/description/BTCPayLooksLike.png) +![Checkout page example](https://raw.githubusercontent.com/btcpayserver/odoo/18.0/payment_btcpayserver/static/description/BTCPayLooksLike.png) ## Transaction BTCPay Details @@ -61,7 +61,7 @@ In transaction object, you will find more technical information about this metho * Invoice Id: the id of the invoice for which you want to fetch an event token * Transaction Status: That indicates state of transaction -![Transaction details of BTCPay](https://raw.githubusercontent.com/btcpayserver/odoo/17.0/payment_btcpayserver/static/description/BtcpayTxDetails.png) +![Transaction details of BTCPay](https://raw.githubusercontent.com/btcpayserver/odoo/18.0/payment_btcpayserver/static/description/BtcpayTxDetails.png) ## Troubleshooting ### The order and transaction status does not get updated to "paid" diff --git a/payment_btcpayserver/__manifest__.py b/payment_btcpayserver/__manifest__.py index 474a03c..aceb90a 100644 --- a/payment_btcpayserver/__manifest__.py +++ b/payment_btcpayserver/__manifest__.py @@ -21,11 +21,11 @@ { 'name': 'Payment Provider: BTCPay Server', - 'summary': 'This module integrates BTCPAY - pay with Bitcoin - with Odoo v17.0', + 'summary': 'This module integrates BTCPAY - pay with Bitcoin - with Odoo v18.0', 'author': 'BTCPay Server team and contributors', 'website': 'https://github.com/btcpayserver/odoo', 'category': 'Accounting/Payment Providers', - 'version': '17.0.2.0', + 'version': '18.0.1.0', 'license': 'GPL-3', 'currency': 'USD', 'application': False, diff --git a/payment_btcpayserver/models/payment_transaction.py b/payment_btcpayserver/models/payment_transaction.py index e74640a..2f0a964 100644 --- a/payment_btcpayserver/models/payment_transaction.py +++ b/payment_btcpayserver/models/payment_transaction.py @@ -89,7 +89,6 @@ class PaymentTransaction(models.Model): """ tx = self._get_tx_from_notification_data(provider_code, notification_data) tx._process_notification_data(notification_data) - tx._execute_callback() return tx def _process_notification_data(self, notification_data):