From 82a90bc094fe2480528eb44ec3444291e5fe01d7 Mon Sep 17 00:00:00 2001 From: Joren Van Onder Date: Mon, 6 Nov 2017 19:00:13 -0800 Subject: [PATCH] [FIX] pos_mercury: decode bytes from ir.ui.view render and requests Due to switching to P3. opw-779720 --- addons/pos_mercury/models/pos_mercury_transaction.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/pos_mercury/models/pos_mercury_transaction.py b/addons/pos_mercury/models/pos_mercury_transaction.py index 993b119d4d8..ade1f15c729 100644 --- a/addons/pos_mercury/models/pos_mercury_transaction.py +++ b/addons/pos_mercury/models/pos_mercury_transaction.py @@ -45,7 +45,7 @@ class MercuryTransaction(models.Model): data['memo'] = "Odoo " + service.common.exp_version()['server_version'] def _do_request(self, template, data): - xml_transaction = self.env.ref(template).render(data) + xml_transaction = self.env.ref(template).render(data).decode() if not data['merchant_id'] or not data['merchant_pwd']: return "not setup" @@ -64,7 +64,7 @@ class MercuryTransaction(models.Model): try: r = requests.post('https://w1.mercurypay.com/ws/ws.asmx', data=xml_transaction, headers=headers, timeout=65) r.raise_for_status() - response = werkzeug.utils.unescape(r.content) + response = werkzeug.utils.unescape(r.content.decode()) except: response = "timeout"