Burtiraven2/odoo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ Improve BTCPay IPN controller handler for avoiding uneeded API call to BTCPay.

Browse Source 
+ Add some logging/error messages.
This commit is contained in:
jofemodo
2022-04-02 20:31:06 +02:00
parent 25aecac922
commit bad3ea017b
1 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
payment_btcpay/controller/main.py
+32 -25
View File
@@ -45,41 +45,47 @@ _logger = logging.getLogger(__name__)
class BtcpayController(http.Controller): class BtcpayController(http.Controller):
_notify_url = '/payment/btcpay/ipn' _notify_url = '/payment/btcpay/ipn'
@http.route('/payment/btcpay/ipn', type='json', auth='public', methods=['POST'], csrf=False)
@http.route('/payment/btcpay/ipn', type='json', auth='none')
def btcpay_ipn(self, **post): def btcpay_ipn(self, **post):
""" BTCPay IPN. """ """ BTCPay IPN. """
_logger.info('BTCPAY IPN RECEIVED...')
cr, uid, context, env = request.cr, SUPERUSER_ID, request.context, request.env cr, uid, context, env = request.cr, SUPERUSER_ID, request.context, request.env
acquirer = request.env['payment.acquirer'].search([('provider', '=', 'btcpay')]) acquirer = env['payment.acquirer'].search([('provider', '=', 'btcpay')])
try: try:
#_logger.info('REQUEST JSONREQUEST %s',pprint.pformat(request.jsonrequest)) #for k in request.jsonrequest['data']:
# _logger.info('\t%s => %s', k, request.jsonrequest['data'][k])
invoiceId = request.jsonrequest['data']['id'] invoiceId = request.jsonrequest['data']['id']
client = BTCPayClient(host=acquirer.location, pem=acquirer.privateKey, tokens=acquirer.token) invoiceStatus = request.jsonrequest['data']['status']
self.invoice = client.get_invoice(invoiceId) orderId = request.jsonrequest['data']['orderId']
#_logger.info('SELF INVOICE IPN %s',pprint.pformat(self.invoice)) _logger.info('Invoice ID %s => %s (Order ID %s)', invoiceId, invoiceStatus, orderId)
#client = BTCPayClient(host=acquirer.location, pem=acquirer.privateKey, tokens=acquirer.token)
#self.invoice = client.get_invoice(invoiceId)
#_logger.info('SELF INVOICE IPN %s',self.invoice)
tx = None if invoiceId and orderId:
if self.invoice['orderId']: tx_ids = request.registry['payment.transaction'].search(cr, uid, [('reference', '=', orderId)], context=context)
tx_ids = request.registry['payment.transaction'].search(cr, uid, [('reference', '=', self.invoice['orderId'])], context=context)
if tx_ids: if tx_ids:
tx = request.registry['payment.transaction'].browse(cr, uid, tx_ids[0], context=context) tx = request.registry['payment.transaction'].browse(cr, uid, tx_ids[0], context=context)
tx.btcpay_status = self.invoice['status'] tx.btcpay_status = invoiceStatus
if self.invoice['status'] in ['confirmed']: if invoiceStatus in ['confirmed']:
tx.state = 'done' tx.state = 'done'
tx.sale_order_id.state = 'sale' tx.sale_order_id.state = 'sale'
if not tx.btcpay_buyerMailNotification and acquirer.buyerNotification: if not tx.btcpay_buyerMailNotification and acquirer.buyerNotification:
tx.sale_order_id.force_quotation_send() tx.sale_order_id.force_quotation_send()
tx.btcpay_buyerMailNotification = "Send" tx.btcpay_buyerMailNotification = "Send"
tx.sale_order_id.order_line._action_procurement_create() tx.sale_order_id.order_line._action_procurement_create()
elif self.invoice['status'] in ['paid']: elif invoiceStatus in ['paid']:
tx.state = 'pending' tx.state = 'pending'
tx.btcpay_invoiceId =self.invoice['id'] tx.btcpay_invoiceId = invoiceId
tx.btcpay_txid =((((self.invoice['cryptoInfo'])[0])['payments'])[0])['id'] tx.btcpay_txid = request.jsonrequest['data']['url']
except:
pass except Exception as e:
_logger.error(e)
return '' return ''
@http.route(['/btcpay/checkout'], type='http', auth='none', csrf=None, website=True) @http.route(['/btcpay/checkout'], type='http', auth='none', csrf=None, website=True)
def checkout(self, **post): def checkout(self, **post):
cr, uid, context, env = request.cr, SUPERUSER_ID, request.context, request.env cr, uid, context, env = request.cr, SUPERUSER_ID, request.context, request.env
@@ -107,4 +113,5 @@ class BtcpayController(http.Controller):
"notify": False}}) "notify": False}})
invoiceId = dict(acquirer.invoice)['id'] invoiceId = dict(acquirer.invoice)['id']
self.invoice = client.get_invoice(invoiceId) self.invoice = client.get_invoice(invoiceId)
return werkzeug.utils.redirect(self.invoice['url']) return werkzeug.utils.redirect(self.invoice['url'])