Skip to content
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

Feat(payment)/order listing #690

Closed
wants to merge 111 commits into from
Closed

Feat(payment)/order listing #690

wants to merge 111 commits into from

Conversation

MadsNyl
Copy link
Contributor

@MadsNyl MadsNyl commented Sep 6, 2023

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.

To list (with filtering) all payment orders from Vipps for admins.

Issue number: closes #

Pull request checklist

Please check if your PR fulfills the following requirements:

  • CHANGELOG.md has been updated. Guide
  • Tests for the changes have been added (for bug fixes / features)
  • Docs have been reviewed and added / updated if needed (for bug fixes / features)
  • The fixtures have been updated if needed (for migrations)

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...

zaimimr and others added 30 commits April 1, 2020 16:16
clear up 500 error in accept_form
hotfix(auth): update domain in url for password reset email
Weekly release to prod
hotfix(registration): Hotfix registration retrive (#174)
Weekly release to master 🎉
fix(dependencies): move sentry to required packages (#227)
First update of 2021! 🎉
Hotfix/update app names config
Weekly merge to master
Weekly release to prod
Weekly release to prod! 🎉
Weekly release to prod! 🎉
Weekly merge to master + celery version revert
Bug fixes in user and groups (#109)
fix(user-perm): fixed update permissions (#133)
MadsNyl and others added 29 commits September 6, 2023 09:42
…pesific order for admins. Made test for checking that only admins can list and check a spesific order
* 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]>
* 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)

* September Update 🎉 (#695)

* 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]>

* fix: pliz 💀

* chore: remove fucker file

---------

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]>
…pesific order for admins. Made test for checking that only admins can list and check a spesific order
@MadsNyl MadsNyl closed this Oct 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants