[payment] Add extra fee to payment form #31730
Closed
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
mba-odoo
force-pushed
the
master-payment-extra-fees-jso
branch
from
910cdc7
to
a70cda1
Compare
robodoo
added
CI 🤖
mba-odoo
force-pushed
the
master-payment-extra-fees-jso
branch
from
ec3a93e
to
ff32fe7
Compare
jso-odoo
force-pushed
the
master-payment-extra-fees-jso
branch
from
ff32fe7
to
4f4c99e
Compare
robodoo
added
CI 🤖
jso-odoo
force-pushed
the
master-payment-extra-fees-jso
branch
from
4f4c99e
to
5f2e772
Compare
robodoo
added
CI 🤖
rdeodoo
reviewed
Apr 8, 2019
There was a problem hiding this comment.
Could you rebase the branch + extract the text from the font awesome <i> tag on those 2 lignes?
I know it is not related to your PR but since you are modifying the payment_tokens_list template that would be nice to have.
Other than that it seems OK, I tested most flows
| @@ -63,6 +63,12 @@ | |||
| t-att-checked="acquirers_count==1 and pms_count==0 or acquirers[0] == acq"/> | |||
| </t> | |||
| <span class="payment_option_name" t-esc="acq.name"/> | |||
| <t t-if="acq_extra_fees and acq_extra_fees.get(acq)"> | |||
| <span class="badge badge-primary"> + <t t-esc="acq_extra_fees[acq]" t-options='{"widget": "monetary", "display_currency": acq_extra_fees["currency_id"]}'/> Fee </span> | |||
There was a problem hiding this comment.
badge-secondary to fit other badge price style (eg variant extra on product page)
| <t t-if="acq_extra_fees and acq_extra_fees.get(acq)"> | ||
| <span class="badge badge-primary"> + <t t-esc="acq_extra_fees[acq]" t-options='{"widget": "monetary", "display_currency": acq_extra_fees["currency_id"]}'/> Fee </span> | ||
| </t> | ||
| <t t-elif="acq.fees_active"> |
There was a problem hiding this comment.
This elif case was a bit mysterious when reading at first, can you confirm that it is needed for:
- Either special controller that would not set
acq_extra_feesinvaluesdict to render like the `/website_payment/pay' (that probably can't do it anyway since no currency). - Either for
payment.acquirerthat activatedfeesbut did not overrideXX_compute_fees, but such a case do not exists in standard Odoo code.
| @@ -789,10 +789,6 @@ def extra_info(self, **post): | |||
| # ------------------------------------------------------ | |||
|
|
|||
| def _get_shop_payment_values(self, order, **kwargs): | |||
| shipping_partner_id = False | |||
jso-odoo
force-pushed
the
master-payment-extra-fees-jso
branch
from
5f2e772
to
47b0029
Compare
jso-odoo
force-pushed
the
master-payment-extra-fees-jso
branch
from
47b0029
to
f283d05
Compare
Purpose of the task is when extra fee is activated on the payment acquirer, the customer is no warned about extra cost when choosing the payment acquirer. so display the extra fees on payment acquirer when doing the payment. Related Task ID : 1845815 Closes : odoo#31730
rdeodoo
force-pushed
the
master-payment-extra-fees-jso
branch
from
f283d05
to
a5f4181
Compare
So text do not inherit from font awesome font style
rdeodoo
force-pushed
the
master-payment-extra-fees-jso
branch
from
a5f4181
to
7532249
Compare
|
@robodoo r+ |
|
@robodoo r+ rebase-ff |
|
Merge method set to rebase and fast-forward |
|
I'm sorry, @JKE-be. This PR is already reviewed, reviewing it again is useless. |
robodoo
pushed a commit
that referenced
this pull request
Apr 9, 2019
Purpose of the task is when extra fee is activated on the payment acquirer, the customer is no warned about extra cost when choosing the payment acquirer. so display the extra fees on payment acquirer when doing the payment. Related Task ID : 1845815 Closes : #31730
robodoo
pushed a commit
that referenced
this pull request
Apr 9, 2019
So text do not inherit from font awesome font style closes #31730 Signed-off-by: Jérémy Kersten (jke) <jke@openerp.com>
|
Merged, thanks! |
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.
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