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
3283 [Enterprise Fee Summary] Receiver as "Fee Calc on Transfer Through" for incoming exchange fees #3319
Conversation
21765e1
to
04024b8
Compare
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.
What you describe sounds logical. But I don't understand the label "Fee Calc on Transfer Through". What does that mean?
Ah, now I get the problem. Does that mean that a producer can effectively charge for items of other producers that are sold in the same order cycle by applying a fee for the whole order? Can we find the fee via Could another name for this column be "Charged by"? |
@mkllnk Yes this is currently the case.
@mkllnk Were you thinking about the recipient of the fee? This data is already in "Enterprise Owner". "Fee Calc on Transfer Through" I believe is to tell to which enterprise you'd want to attribute the fee... Still checking this in Issue #3319, and will address other scenarios in PR #3337. |
27f7e27
to
04024b8
Compare
@kristinalim I'm sorry, but I just stuffed up your branch for a bit. I tried to stage this pull request and it failed on merging master into it. I was surprised, because this pull request didn't indicate any merge conflicts. Anyway, I thought I should rebase it on master and I resolved the conflict. Now Github complained about a merge conflict and when I saw that I realised what I did. I forgot that this pull request is based on the feature branch. I think the feature branch has a merge conflict with master. Luckily there is |
@mkllnk I see. I don't have permission to force-push to a branch in this repository, unfortunately. Could you do it? I can take care of rebasing the open PRs upon this feature branch. I rebased and pushed to my fork: git remote add kristinalim git@github.com:kristinalim/openfoodnetwork.git
git fetch kristinalim
git checkout kristinalim/feature/enterprise_fee_summary
git push upstream +HEAD:feature/enterprise_fee_summary |
b7131b4
to
545d482
Compare
Done. Slightly different commands:
|
Add test for more complex scenario where there is a coordinator and distributor fee for an incoming exchange, and a producer and coordinator fee for an outgoing exchange.
04024b8
to
d466a4b
Compare
This has been rebased already, @mkllnk. Thank you! |
Hi. have been testing this. The report is still not showing the info in 'fee calc on transfer through' but as far as I can see everything is calculating correctly. So I'm going to call it and say that we will put the report in without the whole order transfer through fields showing. We've spent way too much time on this!! Let's see if it is a problem for people actually using it https://docs.google.com/document/d/1qdPDPIJACoGTv_9IcxUlf3cPw_J2CxMP-1dVhVkEsdk/edit# |
@kirstenalarsen This particular PR was not meant to fix the "Fee Calc on Transfer Through" issue. I pinged for a second review of #3337 which should fix this - hoping we can get merge that in the transitional branch before merging everything to master. |
What? Why?
Relates to #3283
As discussed in #3283, for enterprise fees added to an incoming exchange, "Fee Calc on Transfer Through" should be the name of the sender (the producer).
What should we test?
Release notes
No release notes needed as this would be packaged with the rest of the initial changes for the Enterprise Fee Summary.
Changelog Category: -
Dependencies
This requires #3312 to be merged to the transitional branch first.