New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[IMP] website_sale_loyalty, sale_loyalty, pos_loyalty: one global discount (% or $) per order #144389
Closed
mathysPaul
wants to merge
2
commits into
odoo:master
from
odoo-dev:master-loyalty-combinable-programs-matp
Closed
[IMP] website_sale_loyalty, sale_loyalty, pos_loyalty: one global discount (% or $) per order #144389
mathysPaul
wants to merge
2
commits into
odoo:master
from
odoo-dev:master-loyalty-combinable-programs-matp
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
mathysPaul
force-pushed
the
master-loyalty-combinable-programs-matp
branch
2 times, most recently
from
December 6, 2023 15:36
d62ff01
to
25ae762
Compare
chevalierv
reviewed
Dec 6, 2023
mathysPaul
force-pushed
the
master-loyalty-combinable-programs-matp
branch
2 times, most recently
from
December 26, 2023 15:40
397dae9
to
73283c9
Compare
mathysPaul
changed the title
[IMP] sale_loyalty: add combinable property to loyalty programs
[IMP] ecommerce, pos: Limit to one global discount per order
Jan 12, 2024
mathysPaul
force-pushed
the
master-loyalty-combinable-programs-matp
branch
from
January 17, 2024 14:12
4757b9b
to
5f31f9b
Compare
mathysPaul
force-pushed
the
master-loyalty-combinable-programs-matp
branch
2 times, most recently
from
February 7, 2024 16:08
206ad58
to
c01d984
Compare
mathysPaul
force-pushed
the
master-loyalty-combinable-programs-matp
branch
3 times, most recently
from
March 7, 2024 11:12
7fb7800
to
2a0e7ee
Compare
mathysPaul
changed the title
[IMP] ecommerce, pos: Limit to one global discount per order
[IMP] website_sale, sale_loyalty: One global discount (% or $) per order
Mar 7, 2024
mathysPaul
changed the title
[IMP] website_sale, sale_loyalty: One global discount (% or $) per order
[IMP] website_sale, sale_loyalty: one global discount (% or $) per order
Mar 7, 2024
chevalierv
reviewed
Mar 7, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hello @mathysPaul
Thanks for your work on this!
Please find my review under 🦆
One last thing: Squash your commits and take some times to write a good commit message 😃
Have a nice day!
addons/sale_loyalty/wizard/sale_loyalty_reward_wizard_views.xml
Outdated
Show resolved
Hide resolved
mathysPaul
force-pushed
the
master-loyalty-combinable-programs-matp
branch
from
March 20, 2024 12:53
d4f7b5f
to
51ef24b
Compare
mathysPaul
force-pushed
the
master-loyalty-combinable-programs-matp
branch
from
March 21, 2024 13:54
d230d6f
to
09da2e4
Compare
mathysPaul
changed the title
[IMP] website_sale, sale_loyalty: one global discount (% or $) per order
[IMP] website_sale_loyalty, sale_loyalty, pos_loyalty: one global discount (% or $) per order
Mar 21, 2024
mathysPaul
force-pushed
the
master-loyalty-combinable-programs-matp
branch
3 times, most recently
from
March 27, 2024 13:39
5664df5
to
cc36402
Compare
mathysPaul
force-pushed
the
master-loyalty-combinable-programs-matp
branch
4 times, most recently
from
April 12, 2024 14:32
12fdac5
to
77c54f0
Compare
Feyensv
reviewed
Apr 23, 2024
addons/pos_loyalty/static/tests/tours/pos_loyalty_loyalty_program_tour.js
Show resolved
Hide resolved
Feyensv
reviewed
Apr 25, 2024
mathysPaul
force-pushed
the
master-loyalty-combinable-programs-matp
branch
2 times, most recently
from
April 26, 2024 08:25
38847fb
to
9f19529
Compare
Feyensv
force-pushed
the
master-loyalty-combinable-programs-matp
branch
2 times, most recently
from
April 30, 2024 08:47
2dd1001
to
489c928
Compare
Some guidelines/docstring improvements. Correct consideration of the currency decimal places when checking whether an amount is zero.
…rder Extends the existing restriction on global discounts to discounts of a specific amount on the order (globally, not on specific products/lines). Ensures that for auto-applied discounts, the most advantageous discount is selected for the customer. Backend sales configuration remains flexible. task-2596416
Feyensv
force-pushed
the
master-loyalty-combinable-programs-matp
branch
from
April 30, 2024 08:49
489c928
to
7e5f70f
Compare
@robodoo r+ rebase-ff |
Merge method set to rebase and fast-forward. |
robodoo
pushed a commit
that referenced
this pull request
Apr 30, 2024
Some guidelines/docstring improvements. Correct consideration of the currency decimal places when checking whether an amount is zero. Part-of: #144389
robodoo
pushed a commit
that referenced
this pull request
Apr 30, 2024
…rder Extends the existing restriction on global discounts to discounts of a specific amount on the order (globally, not on specific products/lines). Ensures that for auto-applied discounts, the most advantageous discount is selected for the customer. Backend sales configuration remains flexible. task-2596416 closes #144389 Related: odoo/enterprise#60144 Signed-off-by: Victor Feyens (vfe) <vfe@odoo.com>
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.
Implements a restriction for ecommerce and PoS transactions
to allow only one global discount (either % or $) per order.
Ensures that for auto-applied discounts, the most advantageous
discount is selected for the customer. Backend sales configuration
remains flexible, allowing manual addition of discounts as before.
Defines global discounts as having a type of 'discount', with
modes 'per_order' or 'percent', and applicability to 'order'.
Related: odoo/enterprise#60144
task-2596416