-
-
Notifications
You must be signed in to change notification settings - Fork 671
[FIX] duplicate container_deposit products in history #1448
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
Open
gfcapalbo
wants to merge
2
commits into
OCA:16.0
Choose a base branch
from
gfcapalbo:16.0-duplicate_container-products
base: 16.0
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -40,7 +40,14 @@ odoo.define("pos_container_deposit.models", function (require) { | |
| * When adding a product with container deposit, add its container deposit product | ||
| **/ | ||
| super.add_orderline(...arguments); | ||
| if (line.container_deposit_product && !line.container_deposit_line) { | ||
| // Get unpayed orders orders from db.pos | ||
| const all_unpaid = this.pos.get_order_list().map((x) => x.cid); | ||
| const is_unpaid = all_unpaid.includes(line.order.cid); | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This looks like it is a good criterium, I tested on Runboat and it seems like this is indeed a measure of which orders are open in the current session and not paid yet. |
||
| if ( | ||
| line.container_deposit_product && | ||
| !line.container_deposit_line && | ||
| is_unpaid | ||
| ) { | ||
thomaspaulb marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| this.add_product(line.container_deposit_product, { | ||
| quantity: line.get_quantity(), | ||
| }); | ||
|
|
||
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.
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.
If anything this would be
pos.db, butget_order_listdoes not get frompos.db(=localStorage), but directly fromthis.orders, which as far as I can see is just a list of all orders that have been touched since this particular browser tab was opened. So the claim that this comment does is false.Uh oh!
There was an error while loading. Please reload this page.
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.
@thomaspaulb
pos.db.. i will correct my typo now. but get_orders is connected to pos.db
You can see that the orders attribute of the pos object is taken from pos.db: https://github.com/odoo/odoo/blob/16.0/addons/point_of_sale/static/src/js/models.js#L246
get_orders fetches pos.orders, pos.orders is taken on session load from pos.db.orders
the comment is true.