Merge pull request #3801 from expsa/ENS-3555
add website id in return url
This commit is contained in:
commit
af629d53b4
|
|
@ -96,6 +96,9 @@ class HyperPayController(http.Controller):
|
|||
'data_brands': data_brands,
|
||||
'acq': acq.id
|
||||
}
|
||||
if 'force_website_id' in request.session:
|
||||
final_response.update({'website_id': request.session['force_website_id']})
|
||||
|
||||
return final_response
|
||||
|
||||
@http.route('/payment/hyperpay/result', type='http', auth='public', csrf=False, website=True, save_session=True)
|
||||
|
|
@ -121,5 +124,6 @@ class HyperPayController(http.Controller):
|
|||
res = request.env['payment.transaction'].sudo().form_feedback(resp, "hyperpay")
|
||||
ids = tx_id.sale_order_ids.sudo().ids
|
||||
request.session['sale_last_order_id'] = ids[0] if len(ids) else None
|
||||
request.session['force_website_id'] = int(post['website_id'])
|
||||
_logger.info('/payment/hyperpay/result--force_website_id = %d' % request.session.get('force_website_id'))
|
||||
return request.redirect('/payment/process')
|
||||
|
|
|
|||
|
|
@ -103,13 +103,13 @@ odoo.define("payment_hyperpay.payment_hyperpay", function (require) {
|
|||
txId: self.tx_id,
|
||||
}).then(function (result) {
|
||||
if (result) {
|
||||
self._renderHyperpayModal(result.checkoutId, result.domain, result.base_url, result.data_brands, result.acq);
|
||||
self._renderHyperpayModal(result.checkoutId, result.domain, result.base_url, result.data_brands, result.acq, result.website_id);
|
||||
} else {
|
||||
console.log("Error Occured");
|
||||
}
|
||||
});
|
||||
},
|
||||
_renderHyperpayModal: function (checkoutId, domain, base_url, data_brands, acq) {
|
||||
_renderHyperpayModal: function (checkoutId, domain, base_url, data_brands, acq, website_id) {
|
||||
var self = this;
|
||||
try {
|
||||
var $modal_html = $($(".payment_hyper_modal").get()[0]);
|
||||
|
|
@ -121,7 +121,7 @@ odoo.define("payment_hyperpay.payment_hyperpay", function (require) {
|
|||
'<form action="' +
|
||||
base_url +
|
||||
"/payment/hyperpay/result?acq=" +
|
||||
acq +
|
||||
acq + "website=" + website_id +
|
||||
'" class="paymentWidgets" data-brands="' +
|
||||
data_brands +
|
||||
'"></form>';
|
||||
|
|
|
|||
Loading…
Reference in New Issue