-
Notifications
You must be signed in to change notification settings - Fork 13
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
Mulysa custom invoice paid by transaction #551
Merged
tswfi
merged 6 commits into
TampereHacklab:master
from
sbeach92:mulysa-custom-invoice-paid_by-transaction
Feb 12, 2025
Merged
Mulysa custom invoice paid by transaction #551
tswfi
merged 6 commits into
TampereHacklab:master
from
sbeach92:mulysa-custom-invoice-paid_by-transaction
Feb 12, 2025
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
68696d6
to
c7eeb1b
Compare
tswfi
reviewed
Feb 3, 2025
tswfi
reviewed
Feb 3, 2025
@vranki I'd like to get your comments on this (its initially your code) |
@sbeach92 could you rebase this and check the failing tests? |
63657c3
to
283be4b
Compare
283be4b
to
a9a9c0e
Compare
sorry, can you do another rebase. I fixed the CI run in #564 |
…ction Custom invoice payment is carried by modified _service_paid_by_transaction function. Funcion has add_days input variable. Fixes issue: TampereHacklab#270 Signed-off-by: Erkki Hietaranta <[email protected]>
Child subscription paid to date is calculated from days added to Parrent subscription so that multpile custominvoices wont break basic idea of child payments. Days that single payment adds are substracted from days to add to Parent subscription. This is "virtual" payment date. Single payment days of child subscription is added to virtual payment date. Child service is paid by calling funcion again. So now if child service has childs, they get paid. Prevent parent service to substract paid_to days Signed-off-by: Erkki Hietaranta <[email protected]>
Added testcases for servicepayments in monthly recurring way. Added testcases for custominvoice payments.
Added comments for childservice calultaion
Co-authored-by: Tatu Wikman <[email protected]> Signed-off-by: Erkki Hietaranta <[email protected]>
cccfe96
to
11389ea
Compare
Run of ./manage.py makemessages -l fi --no-obsolete, to update translation files, even only rownumbers has change. Signed-off-by: Erkki Hietaranta <[email protected]>
tswfi
approved these changes
Feb 12, 2025
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.
🎉
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.
Custom invoice payment logic has been carried out with its own function which will only move selected service paid_to date froward.
This PR change Custominvoice to use standard payment logic
Fixes issue of child subscriptions not get paid: #270