[pull] master from TampereHacklab:master #124
Merged
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
![pull[bot]](https://avatars.githubusercontent.com/in/12910?s=60&v=4){kind=small}
* Custom invoice payment is carried by _service_paid_by_transaction function Custom invoice payment is carried by modified _service_paid_by_transaction function. Funcion has add_days input variable. Fixes issue: #270 Signed-off-by: Erkki Hietaranta <[email protected]> * Child subscription paid to date relate to Parent date 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 test cases for service payments Added testcases for servicepayments in monthly recurring way. Added testcases for custominvoice payments. * Childservice payment comments Added comments for childservice calultaion * Corrected spelling and layout Co-authored-by: Tatu Wikman <[email protected]> Signed-off-by: Erkki Hietaranta <[email protected]> * Makemessages 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]> --------- Signed-off-by: Erkki Hietaranta <[email protected]> Co-authored-by: Tatu Wikman <[email protected]>
[skip ci]
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.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.1)
Can you help keep this open source service alive? 💖 Please sponsor : )