[FIX] website_sale, website_quote: display payment acquirers per country #24416
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tbe-odoo
approved these changes
Apr 25, 2018
nim-odoo
requested changes
Apr 25, 2018
| @@ -89,7 +89,7 @@ def view(self, order_id, pdf=None, token=None, message=False, **post): | |||
| } | |||
|
|
|||
| if order_sudo.require_payment or values['need_payment']: | |||
| acquirers = request.env['payment.acquirer'].sudo().search([('website_published', '=', True), ('company_id', '=', order_sudo.company_id.id)]) | |||
| acquirers = request.env['payment.acquirer'].sudo().search([('website_published', '=', True), ('company_id', '=', order_sudo.company_id.id), '|', ('specific_countries', '=', False), ('country_ids', '=', order_sudo.partner_id.country_id.id)]) | |||
There was a problem hiding this comment.
I think you should use in: ('country_ids', 'in', [order_sudo.partner_id.country_id.id])
e.g. https://github.com/odoo/odoo/blob/11.0/addons/mail/controllers/bus.py#L27
len-foss
force-pushed
the
11.0-opw1837819-webpayc-len
branch
from
7f503c6
to
69636ef
Compare
nim-odoo
reviewed
Apr 26, 2018
| @@ -89,7 +89,7 @@ def view(self, order_id, pdf=None, token=None, message=False, **post): | |||
| } | |||
|
|
|||
| if order_sudo.require_payment or values['need_payment']: | |||
| acquirers = request.env['payment.acquirer'].sudo().search([('website_published', '=', True), ('company_id', '=', order_sudo.company_id.id)]) | |||
| acquirers = request.env['payment.acquirer'].sudo().search([('website_published', '=', True), ('company_id', '=', order_sudo.company_id.id), '|', ('specific_countries', '=', False), ('country_ids', 'in', [order_sudo.partner_id.country_id.id])]) | |||
There was a problem hiding this comment.
domain = expression.AND([
['&', ('website_published', '=', True), ('company_id', '=', order_sudo.company_id.id)],
['|', ('specific_countries', '=', False), ('country_ids', 'in', [order_sudo.partner_id.country_id.id])]
])
len-foss
force-pushed
the
11.0-opw1837819-webpayc-len
branch
from
69636ef
to
17d27a1
Compare
nim-odoo
approved these changes
Apr 27, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Commit 542201e added the possibility to configure a set of countries for a
given payment acquirer.
Commit 194d52e refactored the payment form, but forgot to take the country
into acount.
opw 1837819
Description of the issue/feature this PR addresses:
Current behavior before PR:
Desired behavior after PR is merged:
--
I confirm I have signed the CLA and read the PR guidelines at www.odoo.com/submit-pr