Midnight release 🌃 #700
Merged
Midnight release 🌃 #700
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
* altered Event model: contact_person with foregin key to an user added. Updated Event serializer and wrote a test for creating event with contact person * small changes in event serializer * formating
* Created model, started views * fixed merge * fixed merge * started on paid event factory and model test * added model tests and integration test for creating paid event * added field to Event serializer * Related Manager Error When testing * Paid Event Done, Order started on * Formatted * change * Order Done * removed print * added .env * debugging registration tests * added possibilty for adding a paid event without a price, test finished * Fixed test * started on update test of paid event * created update test for paid event * started on adding celery task for removing unpaid orders * A good days work * finished test_not_paid_order_is_kicked_of_event_after_timeout * added unit test for order task * started on vipps callback * made test for checking if vipps callback updates order status * started on test for forcing vipps payment * must change check of is_paid_event * fixed check for paid event in registration * fixed deletion of events such that the paid event also gets deleted, and made a test for it * bugfixes * changed event endpoint for deleting event. Now orders also get deleted * started on viewset for orders, and made test for retrieving order for an user at a given event * need to fix bug with payment tokens * fixed bug with expire date for orders * fixed new order bug * must fix config for celery always_eager * fixed elways eager * fixed update of order after payment * checks if user already has a paid order * fixed updating from paid event to not paid event and vice versa * fixed failing tests, and put all vipps urls and config variables in env so they are easy to change for production * removed secret keys etc... * Update CHANGELOG.md * Update CHANGELOG.md * Update CHANGELOG.md * removed conf update from celery.app * fixed paid_information property in event model * fixed .local file * fixed .local file * updated order model for cascade * formated * fixed flake8 errors * added migration * Fixed migrations * fixed migrations * fixed order factory * refactored code for PR * refactored code * altered order model to allow an order not to get deleted when a related event or user is deleted * small changes from PR * empty commit --------- Co-authored-by: Lea Raknes <[email protected]> Co-authored-by: Mads Nylund <[email protected]> Co-authored-by: Mads Nylund <[email protected]>
* Fixed flake8 (#672) * Added Event permissions to Jubkom temporarily (#680) * Feat(event)/contact person (#685) * altered Event model: contact_person with foregin key to an user added. Updated Event serializer and wrote a test for creating event with contact person * small changes in event serializer * formating * feat(payments): create payment system (#675) * Created model, started views * fixed merge * fixed merge * started on paid event factory and model test * added model tests and integration test for creating paid event * added field to Event serializer * Related Manager Error When testing * Paid Event Done, Order started on * Formatted * change * Order Done * removed print * added .env * debugging registration tests * added possibilty for adding a paid event without a price, test finished * Fixed test * started on update test of paid event * created update test for paid event * started on adding celery task for removing unpaid orders * A good days work * finished test_not_paid_order_is_kicked_of_event_after_timeout * added unit test for order task * started on vipps callback * made test for checking if vipps callback updates order status * started on test for forcing vipps payment * must change check of is_paid_event * fixed check for paid event in registration * fixed deletion of events such that the paid event also gets deleted, and made a test for it * bugfixes * changed event endpoint for deleting event. Now orders also get deleted * started on viewset for orders, and made test for retrieving order for an user at a given event * need to fix bug with payment tokens * fixed bug with expire date for orders * fixed new order bug * must fix config for celery always_eager * fixed elways eager * fixed update of order after payment * checks if user already has a paid order * fixed updating from paid event to not paid event and vice versa * fixed failing tests, and put all vipps urls and config variables in env so they are easy to change for production * removed secret keys etc... * Update CHANGELOG.md * Update CHANGELOG.md * Update CHANGELOG.md * removed conf update from celery.app * fixed paid_information property in event model * fixed .local file * fixed .local file * updated order model for cascade * formated * fixed flake8 errors * added migration * Fixed migrations * fixed migrations * fixed order factory * refactored code for PR * refactored code * altered order model to allow an order not to get deleted when a related event or user is deleted * small changes from PR * empty commit --------- Co-authored-by: Lea Raknes <[email protected]> Co-authored-by: Mads Nylund <[email protected]> Co-authored-by: Mads Nylund <[email protected]> * Added Fondet to allowed and fixed typo (#691) * removed celery task_always_eager local variable (#694) --------- Co-authored-by: Thomas Svendal <[email protected]> Co-authored-by: Mads Nylund <[email protected]> Co-authored-by: Lea Raknes <[email protected]> Co-authored-by: Mads Nylund <[email protected]>
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.
Proposed changes
Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request. If it fixes a bug or resolves a feature request, be sure to link to that issue.
Issue number: closes #
Pull request checklist
Please check if your PR fulfills the following requirements:
Further comments
If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc...