audrius/suite
1
0
Fork 1
mirror of https://gitlab.com/hibou-io/hibou-odoo/suite.git synced 2025-01-20 12:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

[FIX][H14427] website_sale_signifyd: allow confirming sale order without http request

Browse Source
This commit is contained in:
Milan Cosnefroy
2024-09-24 22:57:38 +02:00
parent 4f2049e976
commit 8358e8d747
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
website_sale_signifyd/models/sale_order.py
View File

@@ -8,9 +8,15 @@ from odoo.http import request
class SaleOrder(models.Model): class SaleOrder(models.Model):
_inherit = 'sale.order' _inherit = 'sale.order'
def _get_source_ip(self):
if request and request.env.user._is_public():
return request.httprequest.environ['REMOTE_ADDR']
return ''
signifyd_case_id = fields.Many2one('signifyd.case', readonly=1, copy=False) signifyd_case_id = fields.Many2one('signifyd.case', readonly=1, copy=False)
singifyd_score = fields.Float(related='signifyd_case_id.score') singifyd_score = fields.Float(related='signifyd_case_id.score')
signifyd_checkpoint_action = fields.Selection(string='Signifyd Action', related='signifyd_case_id.checkpoint_action') signifyd_checkpoint_action = fields.Selection(string='Signifyd Action', related='signifyd_case_id.checkpoint_action')
source_ip = fields.Char(default=_get_source_ip)
def action_view_signifyd_case(self): def action_view_signifyd_case(self):
self.ensure_one() self.ensure_one()
@@ -30,6 +36,8 @@ class SaleOrder(models.Model):
def action_confirm(self): def action_confirm(self):
res = super().action_confirm() res = super().action_confirm()
if not self.source_ip:
self.source_ip = self._get_source_ip()
for sale in self.filtered(lambda so: so._should_post_signifyd()): for sale in self.filtered(lambda so: so._should_post_signifyd()):
_case = sale.post_signifyd_case() _case = sale.post_signifyd_case()
return res return res
@@ -44,16 +52,16 @@ class SaleOrder(models.Model):
return self.state in ('sale', 'done') and not self.signifyd_case_id and case_required return self.state in ('sale', 'done') and not self.signifyd_case_id and case_required
def post_signifyd_case(self): def post_signifyd_case(self):
self.ensure_one()
if not self.website_id.signifyd_connector_id: if not self.website_id.signifyd_connector_id:
return return
browser_ip_address = request.httprequest.environ['REMOTE_ADDR'] if request and request.session:
if request.session:
checkout_token = request.session.session_token checkout_token = request.session.session_token
order_session_id = checkout_token order_session_id = checkout_token
else: else:
checkout_token = '' checkout_token = ''
# Session values for Signifyd post # Session values for Signifyd post
sig_vals = self._prepare_signifyd_case_values(order_session_id, checkout_token, browser_ip_address) sig_vals = self._prepare_signifyd_case_values(order_session_id, checkout_token, self.source_ip)
case = self.env['signifyd.case'].post_case(self.website_id.signifyd_connector_id, sig_vals) case = self.env['signifyd.case'].post_case(self.website_id.signifyd_connector_id, sig_vals)
@@ -101,7 +109,6 @@ class SaleOrder(models.Model):
"orderSessionId": order_session_id, "orderSessionId": order_session_id,
"orderId": self.id, "orderId": self.id,
"checkoutToken": checkout_token, "checkoutToken": checkout_token,
"browserIpAddress": browser_ip_address,
"currency": self.partner_id.currency_id.name, "currency": self.partner_id.currency_id.name,
"orderChannel": "WEB", "orderChannel": "WEB",
"totalPrice": self.amount_total, "totalPrice": self.amount_total,
@@ -171,4 +178,7 @@ class SaleOrder(models.Model):
], ],
} }
if browser_ip_address:
new_case_vals['purchase']['browserIpAddress'] = browser_ip_address,
return new_case_vals return new_case_vals