-
Notifications
You must be signed in to change notification settings - Fork 147
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
group orders: display deposit, tolerance only if necessary #1076
Draft
mjavurek
wants to merge
15
commits into
foodcoops:master
Choose a base branch
from
mjavurek:patch-14
base: master
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.
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
Todos:
|
Actually, the markup is also calculated for the deposit included in the gross price:
At least there should be an option to exclude the deposit from the markup, like
|
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.
In the current foodsoft version, it is not visible for ordergroups during ordering, if articles contain a deposit and ordergroups may think the article is more expensive. Tolerances are currently shown for all articles, even for articles without tolerance, which makes the view unnecessarily complex. This PR resolves both issues:
Tolerances and deposit are not shown if there is none of them:
An additional column is displayed for the deposit if there is at least one article in the order with deposit. This is important for the ordergroups so that they know that the price shown includes a deposit.
If there is at least one article with tolerance (unit quantity > 1), additional columns appear with tolerance information only at corresponding articles.